diff --git a/crates/jacquard-api/src/actor_rpg/master.rs b/crates/jacquard-api/src/actor_rpg/master.rs
index f6a71fbd..cb827066 100644
--- a/crates/jacquard-api/src/actor_rpg/master.rs
+++ b/crates/jacquard-api/src/actor_rpg/master.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -247,58 +250,58 @@ pub mod master_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Player;
-        type CreatedAt;
         type System;
+        type CreatedAt;
+        type Player;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Player = Unset;
-        type CreatedAt = Unset;
         type System = Unset;
+        type CreatedAt = Unset;
+        type Player = Unset;
     }
-    ///State transition - sets the `player` field to Set
-    pub struct SetPlayer<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPlayer<S> {}
-    impl<S: State> State for SetPlayer<S> {
-        type Player = Set<members::player>;
+    ///State transition - sets the `system` field to Set
+    pub struct SetSystem<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSystem<S> {}
+    impl<S: State> State for SetSystem<S> {
+        type System = Set<members::system>;
         type CreatedAt = S::CreatedAt;
-        type System = S::System;
+        type Player = S::Player;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Player = S::Player;
-        type CreatedAt = Set<members::created_at>;
         type System = S::System;
-    }
-    ///State transition - sets the `system` field to Set
-    pub struct SetSystem<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSystem<S> {}
-    impl<S: State> State for SetSystem<S> {
+        type CreatedAt = Set<members::created_at>;
         type Player = S::Player;
+    }
+    ///State transition - sets the `player` field to Set
+    pub struct SetPlayer<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPlayer<S> {}
+    impl<S: State> State for SetPlayer<S> {
+        type System = S::System;
         type CreatedAt = S::CreatedAt;
-        type System = Set<members::system>;
+        type Player = Set<members::player>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `player` field
-        pub struct player(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `system` field
         pub struct system(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `player` field
+        pub struct player(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MasterBuilder<'a, S: master_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<Did<'a>>,
@@ -308,7 +311,7 @@ pub struct MasterBuilder<'a, S: master_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Master<'a> {
@@ -322,9 +325,9 @@ impl<'a> MasterBuilder<'a, master_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MasterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -332,12 +335,12 @@ impl<'a> MasterBuilder<'a, master_state::Empty> {
 impl<'a, S: master_state::State> MasterBuilder<'a, S> {
     /// Set the `campaign` field (optional)
     pub fn campaign(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `campaign` field to an Option value (optional)
     pub fn maybe_campaign(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -352,11 +355,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MasterBuilder<'a, master_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MasterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -371,11 +374,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MasterBuilder<'a, master_state::SetPlayer<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         MasterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -386,7 +389,7 @@ impl<'a, S: master_state::State> MasterBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MasterSnapshotScope<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `snapshotScope` field to an Option value (optional)
@@ -394,7 +397,7 @@ impl<'a, S: master_state::State> MasterBuilder<'a, S> {
         mut self,
         value: Option<MasterSnapshotScope<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -402,12 +405,12 @@ impl<'a, S: master_state::State> MasterBuilder<'a, S> {
 impl<'a, S: master_state::State> MasterBuilder<'a, S> {
     /// Set the `spriteCid` field (optional)
     pub fn sprite_cid(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `spriteCid` field to an Option value (optional)
     pub fn maybe_sprite_cid(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -415,12 +418,12 @@ impl<'a, S: master_state::State> MasterBuilder<'a, S> {
 impl<'a, S: master_state::State> MasterBuilder<'a, S> {
     /// Set the `stats` field (optional)
     pub fn stats(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `stats` field to an Option value (optional)
     pub fn maybe_stats(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -435,11 +438,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MasterBuilder<'a, master_state::SetSystem<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         MasterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -447,12 +450,12 @@ where
 impl<'a, S: master_state::State> MasterBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -460,21 +463,21 @@ impl<'a, S: master_state::State> MasterBuilder<'a, S> {
 impl<'a, S> MasterBuilder<'a, S>
 where
     S: master_state::State,
-    S::Player: master_state::IsSet,
-    S::CreatedAt: master_state::IsSet,
     S::System: master_state::IsSet,
+    S::CreatedAt: master_state::IsSet,
+    S::Player: master_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Master<'a> {
         Master {
-            campaign: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            player: self.__unsafe_private_named.2.unwrap(),
-            snapshot_scope: self.__unsafe_private_named.3,
-            sprite_cid: self.__unsafe_private_named.4,
-            stats: self.__unsafe_private_named.5,
-            system: self.__unsafe_private_named.6.unwrap(),
-            updated_at: self.__unsafe_private_named.7,
+            campaign: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            player: self._fields.2.unwrap(),
+            snapshot_scope: self._fields.3,
+            sprite_cid: self._fields.4,
+            stats: self._fields.5,
+            system: self._fields.6.unwrap(),
+            updated_at: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -484,14 +487,14 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Master<'a> {
         Master {
-            campaign: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            player: self.__unsafe_private_named.2.unwrap(),
-            snapshot_scope: self.__unsafe_private_named.3,
-            sprite_cid: self.__unsafe_private_named.4,
-            stats: self.__unsafe_private_named.5,
-            system: self.__unsafe_private_named.6.unwrap(),
-            updated_at: self.__unsafe_private_named.7,
+            campaign: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            player: self._fields.2.unwrap(),
+            snapshot_scope: self._fields.3,
+            sprite_cid: self._fields.4,
+            stats: self._fields.5,
+            system: self._fields.6.unwrap(),
+            updated_at: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/actor_rpg/sprite.rs b/crates/jacquard-api/src/actor_rpg/sprite.rs
index c1c3930f..e15543f9 100644
--- a/crates/jacquard-api/src/actor_rpg/sprite.rs
+++ b/crates/jacquard-api/src/actor_rpg/sprite.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -456,58 +459,58 @@ pub mod sprite_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type SpriteSheet;
         type Engine;
         type CreatedAt;
+        type SpriteSheet;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type SpriteSheet = Unset;
         type Engine = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `sprite_sheet` field to Set
-    pub struct SetSpriteSheet<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSpriteSheet<S> {}
-    impl<S: State> State for SetSpriteSheet<S> {
-        type SpriteSheet = Set<members::sprite_sheet>;
-        type Engine = S::Engine;
-        type CreatedAt = S::CreatedAt;
+        type SpriteSheet = Unset;
     }
     ///State transition - sets the `engine` field to Set
     pub struct SetEngine<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEngine<S> {}
     impl<S: State> State for SetEngine<S> {
-        type SpriteSheet = S::SpriteSheet;
         type Engine = Set<members::engine>;
         type CreatedAt = S::CreatedAt;
+        type SpriteSheet = S::SpriteSheet;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type SpriteSheet = S::SpriteSheet;
         type Engine = S::Engine;
         type CreatedAt = Set<members::created_at>;
+        type SpriteSheet = S::SpriteSheet;
+    }
+    ///State transition - sets the `sprite_sheet` field to Set
+    pub struct SetSpriteSheet<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSpriteSheet<S> {}
+    impl<S: State> State for SetSpriteSheet<S> {
+        type Engine = S::Engine;
+        type CreatedAt = S::CreatedAt;
+        type SpriteSheet = Set<members::sprite_sheet>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `sprite_sheet` field
-        pub struct sprite_sheet(());
         ///Marker type for the `engine` field
         pub struct engine(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `sprite_sheet` field
+        pub struct sprite_sheet(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SpriteBuilder<'a, S: sprite_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<i64>,
         Option<Datetime>,
@@ -522,7 +525,7 @@ pub struct SpriteBuilder<'a, S: sprite_state::State> {
         Option<Datetime>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Sprite<'a> {
@@ -536,8 +539,8 @@ impl<'a> SpriteBuilder<'a, sprite_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SpriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -552,7 +555,7 @@ impl<'a> SpriteBuilder<'a, sprite_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -560,12 +563,12 @@ impl<'a> SpriteBuilder<'a, sprite_state::Empty> {
 impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
     /// Set the `animationSpeed` field (optional)
     pub fn animation_speed(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `animationSpeed` field to an Option value (optional)
     pub fn maybe_animation_speed(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -573,12 +576,12 @@ impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
 impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
     /// Set the `columns` field (optional)
     pub fn columns(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `columns` field to an Option value (optional)
     pub fn maybe_columns(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -593,11 +596,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SpriteBuilder<'a, sprite_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SpriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -612,11 +615,11 @@ where
         mut self,
         value: impl Into<SpriteEngine<'a>>,
     ) -> SpriteBuilder<'a, sprite_state::SetEngine<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SpriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -624,12 +627,12 @@ where
 impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
     /// Set the `frameHeight` field (optional)
     pub fn frame_height(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `frameHeight` field to an Option value (optional)
     pub fn maybe_frame_height(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -637,12 +640,12 @@ impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
 impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
     /// Set the `frameWidth` field (optional)
     pub fn frame_width(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `frameWidth` field to an Option value (optional)
     pub fn maybe_frame_width(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -650,12 +653,12 @@ impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
 impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
     /// Set the `frames` field (optional)
     pub fn frames(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `frames` field to an Option value (optional)
     pub fn maybe_frames(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -663,12 +666,12 @@ impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
 impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
     /// Set the `height` field (optional)
     pub fn height(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `height` field to an Option value (optional)
     pub fn maybe_height(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -676,12 +679,12 @@ impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
 impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -689,12 +692,12 @@ impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
 impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
     /// Set the `rows` field (optional)
     pub fn rows(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `rows` field to an Option value (optional)
     pub fn maybe_rows(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -709,11 +712,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> SpriteBuilder<'a, sprite_state::SetSpriteSheet<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         SpriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -721,12 +724,12 @@ where
 impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -734,12 +737,12 @@ impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
 impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
     /// Set the `width` field (optional)
     pub fn width(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `width` field to an Option value (optional)
     pub fn maybe_width(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -747,26 +750,26 @@ impl<'a, S: sprite_state::State> SpriteBuilder<'a, S> {
 impl<'a, S> SpriteBuilder<'a, S>
 where
     S: sprite_state::State,
-    S::SpriteSheet: sprite_state::IsSet,
     S::Engine: sprite_state::IsSet,
     S::CreatedAt: sprite_state::IsSet,
+    S::SpriteSheet: sprite_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Sprite<'a> {
         Sprite {
-            animation_speed: self.__unsafe_private_named.0.or_else(|| Some(200i64)),
-            columns: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            engine: self.__unsafe_private_named.3.unwrap(),
-            frame_height: self.__unsafe_private_named.4,
-            frame_width: self.__unsafe_private_named.5,
-            frames: self.__unsafe_private_named.6,
-            height: self.__unsafe_private_named.7,
-            name: self.__unsafe_private_named.8,
-            rows: self.__unsafe_private_named.9,
-            sprite_sheet: self.__unsafe_private_named.10.unwrap(),
-            updated_at: self.__unsafe_private_named.11,
-            width: self.__unsafe_private_named.12,
+            animation_speed: self._fields.0.or_else(|| Some(200i64)),
+            columns: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            engine: self._fields.3.unwrap(),
+            frame_height: self._fields.4,
+            frame_width: self._fields.5,
+            frames: self._fields.6,
+            height: self._fields.7,
+            name: self._fields.8,
+            rows: self._fields.9,
+            sprite_sheet: self._fields.10.unwrap(),
+            updated_at: self._fields.11,
+            width: self._fields.12,
             extra_data: Default::default(),
         }
     }
@@ -779,19 +782,19 @@ where
         >,
     ) -> Sprite<'a> {
         Sprite {
-            animation_speed: self.__unsafe_private_named.0.or_else(|| Some(200i64)),
-            columns: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            engine: self.__unsafe_private_named.3.unwrap(),
-            frame_height: self.__unsafe_private_named.4,
-            frame_width: self.__unsafe_private_named.5,
-            frames: self.__unsafe_private_named.6,
-            height: self.__unsafe_private_named.7,
-            name: self.__unsafe_private_named.8,
-            rows: self.__unsafe_private_named.9,
-            sprite_sheet: self.__unsafe_private_named.10.unwrap(),
-            updated_at: self.__unsafe_private_named.11,
-            width: self.__unsafe_private_named.12,
+            animation_speed: self._fields.0.or_else(|| Some(200i64)),
+            columns: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            engine: self._fields.3.unwrap(),
+            frame_height: self._fields.4,
+            frame_width: self._fields.5,
+            frames: self._fields.6,
+            height: self._fields.7,
+            name: self._fields.8,
+            rows: self._fields.9,
+            sprite_sheet: self._fields.10.unwrap(),
+            updated_at: self._fields.11,
+            width: self._fields.12,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/actor_rpg/stats.rs b/crates/jacquard-api/src/actor_rpg/stats.rs
index d8941b2d..8e01ea96 100644
--- a/crates/jacquard-api/src/actor_rpg/stats.rs
+++ b/crates/jacquard-api/src/actor_rpg/stats.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -7064,15 +7067,15 @@ pub mod custom_stat_state {
 
 /// Builder for constructing an instance of this type
 pub struct CustomStatBuilder<'a, S: custom_stat_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<i64>,
         Option<i64>,
         Option<CowStr<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CustomStat<'a> {
@@ -7086,9 +7089,9 @@ impl<'a> CustomStatBuilder<'a, custom_stat_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CustomStatBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7096,12 +7099,12 @@ impl<'a> CustomStatBuilder<'a, custom_stat_state::Empty> {
 impl<'a, S: custom_stat_state::State> CustomStatBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -7109,12 +7112,12 @@ impl<'a, S: custom_stat_state::State> CustomStatBuilder<'a, S> {
 impl<'a, S: custom_stat_state::State> CustomStatBuilder<'a, S> {
     /// Set the `max` field (optional)
     pub fn max(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `max` field to an Option value (optional)
     pub fn maybe_max(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -7122,12 +7125,12 @@ impl<'a, S: custom_stat_state::State> CustomStatBuilder<'a, S> {
 impl<'a, S: custom_stat_state::State> CustomStatBuilder<'a, S> {
     /// Set the `min` field (optional)
     pub fn min(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `min` field to an Option value (optional)
     pub fn maybe_min(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -7142,11 +7145,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CustomStatBuilder<'a, custom_stat_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CustomStatBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7161,11 +7164,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CustomStatBuilder<'a, custom_stat_state::SetValue<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         CustomStatBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7179,11 +7182,11 @@ where
     /// Build the final struct
     pub fn build(self) -> CustomStat<'a> {
         CustomStat {
-            category: self.__unsafe_private_named.0,
-            max: self.__unsafe_private_named.1,
-            min: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            value: self.__unsafe_private_named.4.unwrap(),
+            category: self._fields.0,
+            max: self._fields.1,
+            min: self._fields.2,
+            name: self._fields.3.unwrap(),
+            value: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -7196,11 +7199,11 @@ where
         >,
     ) -> CustomStat<'a> {
         CustomStat {
-            category: self.__unsafe_private_named.0,
-            max: self.__unsafe_private_named.1,
-            min: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            value: self.__unsafe_private_named.4.unwrap(),
+            category: self._fields.0,
+            max: self._fields.1,
+            min: self._fields.2,
+            name: self._fields.3.unwrap(),
+            value: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -7216,50 +7219,45 @@ pub mod dcc_cleric_spell_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Level;
         type Name;
+        type Level;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Level = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `level` field to Set
-    pub struct SetLevel<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLevel<S> {}
-    impl<S: State> State for SetLevel<S> {
-        type Level = Set<members::level>;
-        type Name = S::Name;
+        type Level = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Level = S::Level;
         type Name = Set<members::name>;
+        type Level = S::Level;
+    }
+    ///State transition - sets the `level` field to Set
+    pub struct SetLevel<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLevel<S> {}
+    impl<S: State> State for SetLevel<S> {
+        type Name = S::Name;
+        type Level = Set<members::level>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `level` field
-        pub struct level(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `level` field
+        pub struct level(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DccClericSpellBuilder<'a, S: dcc_cleric_spell_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<i64>,
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-        Option<bool>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<CowStr<'a>>, Option<CowStr<'a>>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DccClericSpell<'a> {
@@ -7273,9 +7271,9 @@ impl<'a> DccClericSpellBuilder<'a, dcc_cleric_spell_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DccClericSpellBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7290,11 +7288,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> DccClericSpellBuilder<'a, dcc_cleric_spell_state::SetLevel<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DccClericSpellBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7309,11 +7307,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DccClericSpellBuilder<'a, dcc_cleric_spell_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DccClericSpellBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7321,12 +7319,12 @@ where
 impl<'a, S: dcc_cleric_spell_state::State> DccClericSpellBuilder<'a, S> {
     /// Set the `notes` field (optional)
     pub fn notes(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `notes` field to an Option value (optional)
     pub fn maybe_notes(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -7334,12 +7332,12 @@ impl<'a, S: dcc_cleric_spell_state::State> DccClericSpellBuilder<'a, S> {
 impl<'a, S: dcc_cleric_spell_state::State> DccClericSpellBuilder<'a, S> {
     /// Set the `sinful` field (optional)
     pub fn sinful(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `sinful` field to an Option value (optional)
     pub fn maybe_sinful(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -7347,16 +7345,16 @@ impl<'a, S: dcc_cleric_spell_state::State> DccClericSpellBuilder<'a, S> {
 impl<'a, S> DccClericSpellBuilder<'a, S>
 where
     S: dcc_cleric_spell_state::State,
-    S::Level: dcc_cleric_spell_state::IsSet,
     S::Name: dcc_cleric_spell_state::IsSet,
+    S::Level: dcc_cleric_spell_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DccClericSpell<'a> {
         DccClericSpell {
-            level: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            notes: self.__unsafe_private_named.2,
-            sinful: self.__unsafe_private_named.3,
+            level: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            notes: self._fields.2,
+            sinful: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -7369,10 +7367,10 @@ where
         >,
     ) -> DccClericSpell<'a> {
         DccClericSpell {
-            level: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            notes: self.__unsafe_private_named.2,
-            sinful: self.__unsafe_private_named.3,
+            level: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            notes: self._fields.2,
+            sinful: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -7424,8 +7422,8 @@ pub mod dcc_wizard_spell_state {
 
 /// Builder for constructing an instance of this type
 pub struct DccWizardSpellBuilder<'a, S: dcc_wizard_spell_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<bool>,
         Option<CowStr<'a>>,
@@ -7433,7 +7431,7 @@ pub struct DccWizardSpellBuilder<'a, S: dcc_wizard_spell_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DccWizardSpell<'a> {
@@ -7447,9 +7445,9 @@ impl<'a> DccWizardSpellBuilder<'a, dcc_wizard_spell_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DccWizardSpellBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7464,11 +7462,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> DccWizardSpellBuilder<'a, dcc_wizard_spell_state::SetLevel<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DccWizardSpellBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7476,12 +7474,12 @@ where
 impl<'a, S: dcc_wizard_spell_state::State> DccWizardSpellBuilder<'a, S> {
     /// Set the `lost` field (optional)
     pub fn lost(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `lost` field to an Option value (optional)
     pub fn maybe_lost(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -7489,12 +7487,12 @@ impl<'a, S: dcc_wizard_spell_state::State> DccWizardSpellBuilder<'a, S> {
 impl<'a, S: dcc_wizard_spell_state::State> DccWizardSpellBuilder<'a, S> {
     /// Set the `mercurialMagic` field (optional)
     pub fn mercurial_magic(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `mercurialMagic` field to an Option value (optional)
     pub fn maybe_mercurial_magic(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -7502,12 +7500,12 @@ impl<'a, S: dcc_wizard_spell_state::State> DccWizardSpellBuilder<'a, S> {
 impl<'a, S: dcc_wizard_spell_state::State> DccWizardSpellBuilder<'a, S> {
     /// Set the `mercurialRoll` field (optional)
     pub fn mercurial_roll(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `mercurialRoll` field to an Option value (optional)
     pub fn maybe_mercurial_roll(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -7522,11 +7520,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DccWizardSpellBuilder<'a, dcc_wizard_spell_state::SetName<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         DccWizardSpellBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7534,12 +7532,12 @@ where
 impl<'a, S: dcc_wizard_spell_state::State> DccWizardSpellBuilder<'a, S> {
     /// Set the `notes` field (optional)
     pub fn notes(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `notes` field to an Option value (optional)
     pub fn maybe_notes(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -7553,12 +7551,12 @@ where
     /// Build the final struct
     pub fn build(self) -> DccWizardSpell<'a> {
         DccWizardSpell {
-            level: self.__unsafe_private_named.0.unwrap(),
-            lost: self.__unsafe_private_named.1,
-            mercurial_magic: self.__unsafe_private_named.2,
-            mercurial_roll: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            notes: self.__unsafe_private_named.5,
+            level: self._fields.0.unwrap(),
+            lost: self._fields.1,
+            mercurial_magic: self._fields.2,
+            mercurial_roll: self._fields.3,
+            name: self._fields.4.unwrap(),
+            notes: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -7571,12 +7569,12 @@ where
         >,
     ) -> DccWizardSpell<'a> {
         DccWizardSpell {
-            level: self.__unsafe_private_named.0.unwrap(),
-            lost: self.__unsafe_private_named.1,
-            mercurial_magic: self.__unsafe_private_named.2,
-            mercurial_roll: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            notes: self.__unsafe_private_named.5,
+            level: self._fields.0.unwrap(),
+            lost: self._fields.1,
+            mercurial_magic: self._fields.2,
+            mercurial_roll: self._fields.3,
+            name: self._fields.4.unwrap(),
+            notes: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
@@ -7616,8 +7614,8 @@ pub mod stats_state {
 
 /// Builder for constructing an instance of this type
 pub struct StatsBuilder<'a, S: stats_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<stats::CustomStats<'a>>,
         Option<stats::DccStats<'a>>,
@@ -7626,7 +7624,7 @@ pub struct StatsBuilder<'a, S: stats_state::State> {
         Option<stats::RmmzStats<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Stats<'a> {
@@ -7640,9 +7638,9 @@ impl<'a> StatsBuilder<'a, stats_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7657,11 +7655,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StatsBuilder<'a, stats_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7669,12 +7667,12 @@ where
 impl<'a, S: stats_state::State> StatsBuilder<'a, S> {
     /// Set the `custom` field (optional)
     pub fn custom(mut self, value: impl Into<Option<stats::CustomStats<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `custom` field to an Option value (optional)
     pub fn maybe_custom(mut self, value: Option<stats::CustomStats<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -7682,12 +7680,12 @@ impl<'a, S: stats_state::State> StatsBuilder<'a, S> {
 impl<'a, S: stats_state::State> StatsBuilder<'a, S> {
     /// Set the `dcc` field (optional)
     pub fn dcc(mut self, value: impl Into<Option<stats::DccStats<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `dcc` field to an Option value (optional)
     pub fn maybe_dcc(mut self, value: Option<stats::DccStats<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -7695,12 +7693,12 @@ impl<'a, S: stats_state::State> StatsBuilder<'a, S> {
 impl<'a, S: stats_state::State> StatsBuilder<'a, S> {
     /// Set the `dnd` field (optional)
     pub fn dnd(mut self, value: impl Into<Option<stats::DndStats<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `dnd` field to an Option value (optional)
     pub fn maybe_dnd(mut self, value: Option<stats::DndStats<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -7708,12 +7706,12 @@ impl<'a, S: stats_state::State> StatsBuilder<'a, S> {
 impl<'a, S: stats_state::State> StatsBuilder<'a, S> {
     /// Set the `reverie` field (optional)
     pub fn reverie(mut self, value: impl Into<Option<stats::ReverieStats<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `reverie` field to an Option value (optional)
     pub fn maybe_reverie(mut self, value: Option<stats::ReverieStats<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -7721,12 +7719,12 @@ impl<'a, S: stats_state::State> StatsBuilder<'a, S> {
 impl<'a, S: stats_state::State> StatsBuilder<'a, S> {
     /// Set the `rmmz` field (optional)
     pub fn rmmz(mut self, value: impl Into<Option<stats::RmmzStats<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `rmmz` field to an Option value (optional)
     pub fn maybe_rmmz(mut self, value: Option<stats::RmmzStats<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -7734,12 +7732,12 @@ impl<'a, S: stats_state::State> StatsBuilder<'a, S> {
 impl<'a, S: stats_state::State> StatsBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -7752,13 +7750,13 @@ where
     /// Build the final struct
     pub fn build(self) -> Stats<'a> {
         Stats {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            custom: self.__unsafe_private_named.1,
-            dcc: self.__unsafe_private_named.2,
-            dnd: self.__unsafe_private_named.3,
-            reverie: self.__unsafe_private_named.4,
-            rmmz: self.__unsafe_private_named.5,
-            updated_at: self.__unsafe_private_named.6,
+            created_at: self._fields.0.unwrap(),
+            custom: self._fields.1,
+            dcc: self._fields.2,
+            dnd: self._fields.3,
+            reverie: self._fields.4,
+            rmmz: self._fields.5,
+            updated_at: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -7771,13 +7769,13 @@ where
         >,
     ) -> Stats<'a> {
         Stats {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            custom: self.__unsafe_private_named.1,
-            dcc: self.__unsafe_private_named.2,
-            dnd: self.__unsafe_private_named.3,
-            reverie: self.__unsafe_private_named.4,
-            rmmz: self.__unsafe_private_named.5,
-            updated_at: self.__unsafe_private_named.6,
+            created_at: self._fields.0.unwrap(),
+            custom: self._fields.1,
+            dcc: self._fields.2,
+            dnd: self._fields.3,
+            reverie: self._fields.4,
+            rmmz: self._fields.5,
+            updated_at: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
@@ -7829,9 +7827,9 @@ pub mod spellslot_state {
 
 /// Builder for constructing an instance of this type
 pub struct SpellslotBuilder<'a, S: spellslot_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Spellslot<'a> {
@@ -7845,9 +7843,9 @@ impl<'a> SpellslotBuilder<'a, spellslot_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SpellslotBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7862,11 +7860,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SpellslotBuilder<'a, spellslot_state::SetLevel<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SpellslotBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7881,11 +7879,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SpellslotBuilder<'a, spellslot_state::SetTotal<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SpellslotBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7893,12 +7891,12 @@ where
 impl<'a, S: spellslot_state::State> SpellslotBuilder<'a, S> {
     /// Set the `used` field (optional)
     pub fn used(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `used` field to an Option value (optional)
     pub fn maybe_used(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -7912,9 +7910,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Spellslot<'a> {
         Spellslot {
-            level: self.__unsafe_private_named.0.unwrap(),
-            total: self.__unsafe_private_named.1.unwrap(),
-            used: self.__unsafe_private_named.2,
+            level: self._fields.0.unwrap(),
+            total: self._fields.1.unwrap(),
+            used: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -7927,9 +7925,9 @@ where
         >,
     ) -> Spellslot<'a> {
         Spellslot {
-            level: self.__unsafe_private_named.0.unwrap(),
-            total: self.__unsafe_private_named.1.unwrap(),
-            used: self.__unsafe_private_named.2,
+            level: self._fields.0.unwrap(),
+            total: self._fields.1.unwrap(),
+            used: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/ai_syui/at/link.rs b/crates/jacquard-api/src/ai_syui/at/link.rs
index f8608e59..69061a9e 100644
--- a/crates/jacquard-api/src/ai_syui/at/link.rs
+++ b/crates/jacquard-api/src/ai_syui/at/link.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -399,13 +402,9 @@ pub mod link_state {
 
 /// Builder for constructing an instance of this type
 pub struct LinkBuilder<'a, S: link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<Vec<link::LinkItem<'a>>>,
-        Option<Datetime>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Vec<link::LinkItem<'a>>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Link<'a> {
@@ -419,9 +418,9 @@ impl<'a> LinkBuilder<'a, link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -436,11 +435,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LinkBuilder<'a, link_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -455,11 +454,11 @@ where
         mut self,
         value: impl Into<Vec<link::LinkItem<'a>>>,
     ) -> LinkBuilder<'a, link_state::SetLinks<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -467,12 +466,12 @@ where
 impl<'a, S: link_state::State> LinkBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -486,9 +485,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Link<'a> {
         Link {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            links: self.__unsafe_private_named.1.unwrap(),
-            updated_at: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            links: self._fields.1.unwrap(),
+            updated_at: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -501,9 +500,9 @@ where
         >,
     ) -> Link<'a> {
         Link {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            links: self.__unsafe_private_named.1.unwrap(),
-            updated_at: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            links: self._fields.1.unwrap(),
+            updated_at: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/ai_syui/log/chat.rs b/crates/jacquard-api/src/ai_syui/log/chat.rs
index ec04c91b..f717aaa2 100644
--- a/crates/jacquard-api/src/ai_syui/log/chat.rs
+++ b/crates/jacquard-api/src/ai_syui/log/chat.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -458,8 +461,8 @@ pub mod chat_state {
 
 /// Builder for constructing an instance of this type
 pub struct ChatBuilder<'a, S: chat_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<StrongRef<'a>>,
         Option<chat::Markdown<'a>>,
         Option<BlobRef<'a>>,
@@ -476,7 +479,7 @@ pub struct ChatBuilder<'a, S: chat_state::State> {
         Option<chat::TranslationMap<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Chat<'a> {
@@ -490,8 +493,8 @@ impl<'a> ChatBuilder<'a, chat_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ChatBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -508,7 +511,7 @@ impl<'a> ChatBuilder<'a, chat_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -516,12 +519,12 @@ impl<'a> ChatBuilder<'a, chat_state::Empty> {
 impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
     /// Set the `bskyPostRef` field (optional)
     pub fn bsky_post_ref(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `bskyPostRef` field to an Option value (optional)
     pub fn maybe_bsky_post_ref(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -529,12 +532,12 @@ impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
 impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
     /// Set the `content` field (optional)
     pub fn content(mut self, value: impl Into<Option<chat::Markdown<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `content` field to an Option value (optional)
     pub fn maybe_content(mut self, value: Option<chat::Markdown<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -542,12 +545,12 @@ impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
 impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
     /// Set the `coverImage` field (optional)
     pub fn cover_image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `coverImage` field to an Option value (optional)
     pub fn maybe_cover_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -555,12 +558,12 @@ impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
 impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -568,12 +571,12 @@ impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
 impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
     /// Set the `langs` field (optional)
     pub fn langs(mut self, value: impl Into<Option<Vec<Language>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `langs` field to an Option value (optional)
     pub fn maybe_langs(mut self, value: Option<Vec<Language>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -581,12 +584,12 @@ impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
 impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -594,12 +597,12 @@ impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
 impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
     /// Set the `path` field (optional)
     pub fn path(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `path` field to an Option value (optional)
     pub fn maybe_path(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -614,11 +617,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ChatBuilder<'a, chat_state::SetPublishedAt<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ChatBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -626,12 +629,12 @@ where
 impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
     /// Set the `root` field (optional)
     pub fn root(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `root` field to an Option value (optional)
     pub fn maybe_root(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -646,11 +649,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ChatBuilder<'a, chat_state::SetSite<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ChatBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -658,12 +661,12 @@ where
 impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -671,12 +674,12 @@ impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
 impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
     /// Set the `textContent` field (optional)
     pub fn text_content(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `textContent` field to an Option value (optional)
     pub fn maybe_text_content(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -691,11 +694,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ChatBuilder<'a, chat_state::SetTitle<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         ChatBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -706,7 +709,7 @@ impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
         mut self,
         value: impl Into<Option<chat::TranslationMap<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `translations` field to an Option value (optional)
@@ -714,7 +717,7 @@ impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
         mut self,
         value: Option<chat::TranslationMap<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -722,12 +725,12 @@ impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
 impl<'a, S: chat_state::State> ChatBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -742,21 +745,21 @@ where
     /// Build the final struct
     pub fn build(self) -> Chat<'a> {
         Chat {
-            bsky_post_ref: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1,
-            cover_image: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            langs: self.__unsafe_private_named.4,
-            parent: self.__unsafe_private_named.5,
-            path: self.__unsafe_private_named.6,
-            published_at: self.__unsafe_private_named.7.unwrap(),
-            root: self.__unsafe_private_named.8,
-            site: self.__unsafe_private_named.9.unwrap(),
-            tags: self.__unsafe_private_named.10,
-            text_content: self.__unsafe_private_named.11,
-            title: self.__unsafe_private_named.12.unwrap(),
-            translations: self.__unsafe_private_named.13,
-            updated_at: self.__unsafe_private_named.14,
+            bsky_post_ref: self._fields.0,
+            content: self._fields.1,
+            cover_image: self._fields.2,
+            description: self._fields.3,
+            langs: self._fields.4,
+            parent: self._fields.5,
+            path: self._fields.6,
+            published_at: self._fields.7.unwrap(),
+            root: self._fields.8,
+            site: self._fields.9.unwrap(),
+            tags: self._fields.10,
+            text_content: self._fields.11,
+            title: self._fields.12.unwrap(),
+            translations: self._fields.13,
+            updated_at: self._fields.14,
             extra_data: Default::default(),
         }
     }
@@ -769,21 +772,21 @@ where
         >,
     ) -> Chat<'a> {
         Chat {
-            bsky_post_ref: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1,
-            cover_image: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            langs: self.__unsafe_private_named.4,
-            parent: self.__unsafe_private_named.5,
-            path: self.__unsafe_private_named.6,
-            published_at: self.__unsafe_private_named.7.unwrap(),
-            root: self.__unsafe_private_named.8,
-            site: self.__unsafe_private_named.9.unwrap(),
-            tags: self.__unsafe_private_named.10,
-            text_content: self.__unsafe_private_named.11,
-            title: self.__unsafe_private_named.12.unwrap(),
-            translations: self.__unsafe_private_named.13,
-            updated_at: self.__unsafe_private_named.14,
+            bsky_post_ref: self._fields.0,
+            content: self._fields.1,
+            cover_image: self._fields.2,
+            description: self._fields.3,
+            langs: self._fields.4,
+            parent: self._fields.5,
+            path: self._fields.6,
+            published_at: self._fields.7.unwrap(),
+            root: self._fields.8,
+            site: self._fields.9.unwrap(),
+            tags: self._fields.10,
+            text_content: self._fields.11,
+            title: self._fields.12.unwrap(),
+            translations: self._fields.13,
+            updated_at: self._fields.14,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/ai_syui/log/post.rs b/crates/jacquard-api/src/ai_syui/log/post.rs
index e016ac24..f6c3ffdd 100644
--- a/crates/jacquard-api/src/ai_syui/log/post.rs
+++ b/crates/jacquard-api/src/ai_syui/log/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -458,8 +461,8 @@ pub mod post_state {
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<StrongRef<'a>>,
         Option<post::Markdown<'a>>,
         Option<BlobRef<'a>>,
@@ -476,7 +479,7 @@ pub struct PostBuilder<'a, S: post_state::State> {
         Option<post::TranslationMap<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -490,8 +493,8 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -508,7 +511,7 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -516,12 +519,12 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `bskyPostRef` field (optional)
     pub fn bsky_post_ref(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `bskyPostRef` field to an Option value (optional)
     pub fn maybe_bsky_post_ref(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -529,12 +532,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `content` field (optional)
     pub fn content(mut self, value: impl Into<Option<post::Markdown<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `content` field to an Option value (optional)
     pub fn maybe_content(mut self, value: Option<post::Markdown<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -542,12 +545,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `coverImage` field (optional)
     pub fn cover_image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `coverImage` field to an Option value (optional)
     pub fn maybe_cover_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -555,12 +558,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -568,12 +571,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `langs` field (optional)
     pub fn langs(mut self, value: impl Into<Option<Vec<Language>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `langs` field to an Option value (optional)
     pub fn maybe_langs(mut self, value: Option<Vec<Language>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -581,12 +584,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -594,12 +597,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `path` field (optional)
     pub fn path(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `path` field to an Option value (optional)
     pub fn maybe_path(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -614,11 +617,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetPublishedAt<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -626,12 +629,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `root` field (optional)
     pub fn root(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `root` field to an Option value (optional)
     pub fn maybe_root(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -646,11 +649,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> PostBuilder<'a, post_state::SetSite<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -658,12 +661,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -671,12 +674,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `textContent` field (optional)
     pub fn text_content(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `textContent` field to an Option value (optional)
     pub fn maybe_text_content(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -691,11 +694,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetTitle<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -706,7 +709,7 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
         mut self,
         value: impl Into<Option<post::TranslationMap<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `translations` field to an Option value (optional)
@@ -714,7 +717,7 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
         mut self,
         value: Option<post::TranslationMap<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -722,12 +725,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -742,21 +745,21 @@ where
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            bsky_post_ref: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1,
-            cover_image: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            langs: self.__unsafe_private_named.4,
-            parent: self.__unsafe_private_named.5,
-            path: self.__unsafe_private_named.6,
-            published_at: self.__unsafe_private_named.7.unwrap(),
-            root: self.__unsafe_private_named.8,
-            site: self.__unsafe_private_named.9.unwrap(),
-            tags: self.__unsafe_private_named.10,
-            text_content: self.__unsafe_private_named.11,
-            title: self.__unsafe_private_named.12.unwrap(),
-            translations: self.__unsafe_private_named.13,
-            updated_at: self.__unsafe_private_named.14,
+            bsky_post_ref: self._fields.0,
+            content: self._fields.1,
+            cover_image: self._fields.2,
+            description: self._fields.3,
+            langs: self._fields.4,
+            parent: self._fields.5,
+            path: self._fields.6,
+            published_at: self._fields.7.unwrap(),
+            root: self._fields.8,
+            site: self._fields.9.unwrap(),
+            tags: self._fields.10,
+            text_content: self._fields.11,
+            title: self._fields.12.unwrap(),
+            translations: self._fields.13,
+            updated_at: self._fields.14,
             extra_data: Default::default(),
         }
     }
@@ -769,21 +772,21 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            bsky_post_ref: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1,
-            cover_image: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            langs: self.__unsafe_private_named.4,
-            parent: self.__unsafe_private_named.5,
-            path: self.__unsafe_private_named.6,
-            published_at: self.__unsafe_private_named.7.unwrap(),
-            root: self.__unsafe_private_named.8,
-            site: self.__unsafe_private_named.9.unwrap(),
-            tags: self.__unsafe_private_named.10,
-            text_content: self.__unsafe_private_named.11,
-            title: self.__unsafe_private_named.12.unwrap(),
-            translations: self.__unsafe_private_named.13,
-            updated_at: self.__unsafe_private_named.14,
+            bsky_post_ref: self._fields.0,
+            content: self._fields.1,
+            cover_image: self._fields.2,
+            description: self._fields.3,
+            langs: self._fields.4,
+            parent: self._fields.5,
+            path: self._fields.6,
+            published_at: self._fields.7.unwrap(),
+            root: self._fields.8,
+            site: self._fields.9.unwrap(),
+            tags: self._fields.10,
+            text_content: self._fields.11,
+            title: self._fields.12.unwrap(),
+            translations: self._fields.13,
+            updated_at: self._fields.14,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_beaconbits/beacon.rs b/crates/jacquard-api/src/app_beaconbits/beacon.rs
index 4687ee79..5f364e51 100644
--- a/crates/jacquard-api/src/app_beaconbits/beacon.rs
+++ b/crates/jacquard-api/src/app_beaconbits/beacon.rs
@@ -7,7 +7,11 @@
 
 pub mod like;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -389,73 +393,73 @@ pub mod beacon_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type VenueName;
-        type Visibility;
         type VenueUri;
         type CreatedAt;
+        type Visibility;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type VenueName = Unset;
-        type Visibility = Unset;
         type VenueUri = Unset;
         type CreatedAt = Unset;
+        type Visibility = Unset;
     }
     ///State transition - sets the `venue_name` field to Set
     pub struct SetVenueName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetVenueName<S> {}
     impl<S: State> State for SetVenueName<S> {
         type VenueName = Set<members::venue_name>;
-        type Visibility = S::Visibility;
-        type VenueUri = S::VenueUri;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `visibility` field to Set
-    pub struct SetVisibility<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetVisibility<S> {}
-    impl<S: State> State for SetVisibility<S> {
-        type VenueName = S::VenueName;
-        type Visibility = Set<members::visibility>;
         type VenueUri = S::VenueUri;
         type CreatedAt = S::CreatedAt;
+        type Visibility = S::Visibility;
     }
     ///State transition - sets the `venue_uri` field to Set
     pub struct SetVenueUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetVenueUri<S> {}
     impl<S: State> State for SetVenueUri<S> {
         type VenueName = S::VenueName;
-        type Visibility = S::Visibility;
         type VenueUri = Set<members::venue_uri>;
         type CreatedAt = S::CreatedAt;
+        type Visibility = S::Visibility;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type VenueName = S::VenueName;
-        type Visibility = S::Visibility;
         type VenueUri = S::VenueUri;
         type CreatedAt = Set<members::created_at>;
+        type Visibility = S::Visibility;
+    }
+    ///State transition - sets the `visibility` field to Set
+    pub struct SetVisibility<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetVisibility<S> {}
+    impl<S: State> State for SetVisibility<S> {
+        type VenueName = S::VenueName;
+        type VenueUri = S::VenueUri;
+        type CreatedAt = S::CreatedAt;
+        type Visibility = Set<members::visibility>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `venue_name` field
         pub struct venue_name(());
-        ///Marker type for the `visibility` field
-        pub struct visibility(());
         ///Marker type for the `venue_uri` field
         pub struct venue_uri(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `visibility` field
+        pub struct visibility(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BeaconBuilder<'a, S: beacon_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Address<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -474,7 +478,7 @@ pub struct BeaconBuilder<'a, S: beacon_state::State> {
         Option<CowStr<'a>>,
         Option<BeaconVisibility<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Beacon<'a> {
@@ -488,8 +492,8 @@ impl<'a> BeaconBuilder<'a, beacon_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BeaconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -508,7 +512,7 @@ impl<'a> BeaconBuilder<'a, beacon_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -516,12 +520,12 @@ impl<'a> BeaconBuilder<'a, beacon_state::Empty> {
 impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
     /// Set the `addressDetails` field (optional)
     pub fn address_details(mut self, value: impl Into<Option<Address<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `addressDetails` field to an Option value (optional)
     pub fn maybe_address_details(mut self, value: Option<Address<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -529,12 +533,12 @@ impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
 impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
     /// Set the `chainEmoji` field (optional)
     pub fn chain_emoji(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `chainEmoji` field to an Option value (optional)
     pub fn maybe_chain_emoji(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -542,12 +546,12 @@ impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
 impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
     /// Set the `chainName` field (optional)
     pub fn chain_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `chainName` field to an Option value (optional)
     pub fn maybe_chain_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -562,11 +566,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BeaconBuilder<'a, beacon_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BeaconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -574,12 +578,12 @@ where
 impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<Geo<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<Geo<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -587,12 +591,12 @@ impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
 impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
     /// Set the `mentions` field (optional)
     pub fn mentions(mut self, value: impl Into<Option<Vec<Did<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<Vec<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -600,12 +604,12 @@ impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
 impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
     /// Set the `parentBeacon` field (optional)
     pub fn parent_beacon(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `parentBeacon` field to an Option value (optional)
     pub fn maybe_parent_beacon(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -613,12 +617,12 @@ impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
 impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
     /// Set the `post` field (optional)
     pub fn post(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `post` field to an Option value (optional)
     pub fn maybe_post(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -626,12 +630,12 @@ impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
 impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
     /// Set the `rating` field (optional)
     pub fn rating(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `rating` field to an Option value (optional)
     pub fn maybe_rating(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -639,12 +643,12 @@ impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
 impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
     /// Set the `revealAt` field (optional)
     pub fn reveal_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `revealAt` field to an Option value (optional)
     pub fn maybe_reveal_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -652,12 +656,12 @@ impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
 impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
     /// Set the `shout` field (optional)
     pub fn shout(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `shout` field to an Option value (optional)
     pub fn maybe_shout(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -665,12 +669,12 @@ impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
 impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
     /// Set the `threadRoot` field (optional)
     pub fn thread_root(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `threadRoot` field to an Option value (optional)
     pub fn maybe_thread_root(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -678,12 +682,12 @@ impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
 impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
     /// Set the `venueAddress` field (optional)
     pub fn venue_address(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `venueAddress` field to an Option value (optional)
     pub fn maybe_venue_address(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -691,12 +695,12 @@ impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
 impl<'a, S: beacon_state::State> BeaconBuilder<'a, S> {
     /// Set the `venueCategory` field (optional)
     pub fn venue_category(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `venueCategory` field to an Option value (optional)
     pub fn maybe_venue_category(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -711,11 +715,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BeaconBuilder<'a, beacon_state::SetVenueName<S>> {
-        self.__unsafe_private_named.14 = Option::Some(value.into());
+        self._fields.14 = Option::Some(value.into());
         BeaconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -730,11 +734,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BeaconBuilder<'a, beacon_state::SetVenueUri<S>> {
-        self.__unsafe_private_named.15 = Option::Some(value.into());
+        self._fields.15 = Option::Some(value.into());
         BeaconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -749,11 +753,11 @@ where
         mut self,
         value: impl Into<BeaconVisibility<'a>>,
     ) -> BeaconBuilder<'a, beacon_state::SetVisibility<S>> {
-        self.__unsafe_private_named.16 = Option::Some(value.into());
+        self._fields.16 = Option::Some(value.into());
         BeaconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -762,30 +766,30 @@ impl<'a, S> BeaconBuilder<'a, S>
 where
     S: beacon_state::State,
     S::VenueName: beacon_state::IsSet,
-    S::Visibility: beacon_state::IsSet,
     S::VenueUri: beacon_state::IsSet,
     S::CreatedAt: beacon_state::IsSet,
+    S::Visibility: beacon_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Beacon<'a> {
         Beacon {
-            address_details: self.__unsafe_private_named.0,
-            chain_emoji: self.__unsafe_private_named.1,
-            chain_name: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            location: self.__unsafe_private_named.4,
-            mentions: self.__unsafe_private_named.5,
-            parent_beacon: self.__unsafe_private_named.6,
-            post: self.__unsafe_private_named.7,
-            rating: self.__unsafe_private_named.8,
-            reveal_at: self.__unsafe_private_named.9,
-            shout: self.__unsafe_private_named.10,
-            thread_root: self.__unsafe_private_named.11,
-            venue_address: self.__unsafe_private_named.12,
-            venue_category: self.__unsafe_private_named.13,
-            venue_name: self.__unsafe_private_named.14.unwrap(),
-            venue_uri: self.__unsafe_private_named.15.unwrap(),
-            visibility: self.__unsafe_private_named.16.unwrap(),
+            address_details: self._fields.0,
+            chain_emoji: self._fields.1,
+            chain_name: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            location: self._fields.4,
+            mentions: self._fields.5,
+            parent_beacon: self._fields.6,
+            post: self._fields.7,
+            rating: self._fields.8,
+            reveal_at: self._fields.9,
+            shout: self._fields.10,
+            thread_root: self._fields.11,
+            venue_address: self._fields.12,
+            venue_category: self._fields.13,
+            venue_name: self._fields.14.unwrap(),
+            venue_uri: self._fields.15.unwrap(),
+            visibility: self._fields.16.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -798,23 +802,23 @@ where
         >,
     ) -> Beacon<'a> {
         Beacon {
-            address_details: self.__unsafe_private_named.0,
-            chain_emoji: self.__unsafe_private_named.1,
-            chain_name: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            location: self.__unsafe_private_named.4,
-            mentions: self.__unsafe_private_named.5,
-            parent_beacon: self.__unsafe_private_named.6,
-            post: self.__unsafe_private_named.7,
-            rating: self.__unsafe_private_named.8,
-            reveal_at: self.__unsafe_private_named.9,
-            shout: self.__unsafe_private_named.10,
-            thread_root: self.__unsafe_private_named.11,
-            venue_address: self.__unsafe_private_named.12,
-            venue_category: self.__unsafe_private_named.13,
-            venue_name: self.__unsafe_private_named.14.unwrap(),
-            venue_uri: self.__unsafe_private_named.15.unwrap(),
-            visibility: self.__unsafe_private_named.16.unwrap(),
+            address_details: self._fields.0,
+            chain_emoji: self._fields.1,
+            chain_name: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            location: self._fields.4,
+            mentions: self._fields.5,
+            parent_beacon: self._fields.6,
+            post: self._fields.7,
+            rating: self._fields.8,
+            reveal_at: self._fields.9,
+            shout: self._fields.10,
+            thread_root: self._fields.11,
+            venue_address: self._fields.12,
+            venue_category: self._fields.13,
+            venue_name: self._fields.14.unwrap(),
+            venue_uri: self._fields.15.unwrap(),
+            visibility: self._fields.16.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_beaconbits/beacon/like.rs b/crates/jacquard-api/src/app_beaconbits/beacon/like.rs
index c0d7dbab..9420167e 100644
--- a/crates/jacquard-api/src/app_beaconbits/beacon/like.rs
+++ b/crates/jacquard-api/src/app_beaconbits/beacon/like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -150,9 +153,9 @@ pub mod like_state {
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<Datetime>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<Datetime>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -166,9 +169,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -176,12 +179,12 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
 impl<'a, S: like_state::State> LikeBuilder<'a, S> {
     /// Set the `bskyLikeUri` field (optional)
     pub fn bsky_like_uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `bskyLikeUri` field to an Option value (optional)
     pub fn maybe_bsky_like_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -233,9 +236,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            bsky_like_uri: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            bsky_like_uri: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -248,9 +251,9 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            bsky_like_uri: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            bsky_like_uri: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_beaconbits/bookmark/folder.rs b/crates/jacquard-api/src/app_beaconbits/bookmark/folder.rs
index a250d2cb..8d953e40 100644
--- a/crates/jacquard-api/src/app_beaconbits/bookmark/folder.rs
+++ b/crates/jacquard-api/src/app_beaconbits/bookmark/folder.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -282,44 +285,44 @@ pub mod folder_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Name;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Name = S::Name;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type CreatedAt = S::CreatedAt;
         type Name = Set<members::name>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Name = S::Name;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FolderBuilder<'a, S: folder_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -327,7 +330,7 @@ pub struct FolderBuilder<'a, S: folder_state::State> {
         Option<CowStr<'a>>,
         Option<FolderVisibility<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Folder<'a> {
@@ -341,9 +344,9 @@ impl<'a> FolderBuilder<'a, folder_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FolderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -351,12 +354,12 @@ impl<'a> FolderBuilder<'a, folder_state::Empty> {
 impl<'a, S: folder_state::State> FolderBuilder<'a, S> {
     /// Set the `color` field (optional)
     pub fn color(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `color` field to an Option value (optional)
     pub fn maybe_color(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -371,11 +374,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FolderBuilder<'a, folder_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FolderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -383,12 +386,12 @@ where
 impl<'a, S: folder_state::State> FolderBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -396,12 +399,12 @@ impl<'a, S: folder_state::State> FolderBuilder<'a, S> {
 impl<'a, S: folder_state::State> FolderBuilder<'a, S> {
     /// Set the `icon` field (optional)
     pub fn icon(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `icon` field to an Option value (optional)
     pub fn maybe_icon(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -416,11 +419,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> FolderBuilder<'a, folder_state::SetName<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         FolderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -428,12 +431,12 @@ where
 impl<'a, S: folder_state::State> FolderBuilder<'a, S> {
     /// Set the `visibility` field (optional)
     pub fn visibility(mut self, value: impl Into<Option<FolderVisibility<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `visibility` field to an Option value (optional)
     pub fn maybe_visibility(mut self, value: Option<FolderVisibility<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -441,18 +444,18 @@ impl<'a, S: folder_state::State> FolderBuilder<'a, S> {
 impl<'a, S> FolderBuilder<'a, S>
 where
     S: folder_state::State,
-    S::CreatedAt: folder_state::IsSet,
     S::Name: folder_state::IsSet,
+    S::CreatedAt: folder_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Folder<'a> {
         Folder {
-            color: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            icon: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            visibility: self.__unsafe_private_named.5,
+            color: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            icon: self._fields.3,
+            name: self._fields.4.unwrap(),
+            visibility: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -465,12 +468,12 @@ where
         >,
     ) -> Folder<'a> {
         Folder {
-            color: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            icon: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            visibility: self.__unsafe_private_named.5,
+            color: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            icon: self._fields.3,
+            name: self._fields.4.unwrap(),
+            visibility: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_beaconbits/bookmark/item.rs b/crates/jacquard-api/src/app_beaconbits/bookmark/item.rs
index 3a0c9f90..ce4bc6ef 100644
--- a/crates/jacquard-api/src/app_beaconbits/bookmark/item.rs
+++ b/crates/jacquard-api/src/app_beaconbits/bookmark/item.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -201,58 +204,58 @@ pub mod item_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type VenueName;
         type VenueUri;
+        type VenueName;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type VenueName = Unset;
         type VenueUri = Unset;
+        type VenueName = Unset;
+        type CreatedAt = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
+    ///State transition - sets the `venue_uri` field to Set
+    pub struct SetVenueUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetVenueUri<S> {}
+    impl<S: State> State for SetVenueUri<S> {
+        type VenueUri = Set<members::venue_uri>;
         type VenueName = S::VenueName;
-        type VenueUri = S::VenueUri;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `venue_name` field to Set
     pub struct SetVenueName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetVenueName<S> {}
     impl<S: State> State for SetVenueName<S> {
-        type CreatedAt = S::CreatedAt;
-        type VenueName = Set<members::venue_name>;
         type VenueUri = S::VenueUri;
-    }
-    ///State transition - sets the `venue_uri` field to Set
-    pub struct SetVenueUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetVenueUri<S> {}
-    impl<S: State> State for SetVenueUri<S> {
+        type VenueName = Set<members::venue_name>;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type VenueUri = S::VenueUri;
         type VenueName = S::VenueName;
-        type VenueUri = Set<members::venue_uri>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `venue_name` field
-        pub struct venue_name(());
         ///Marker type for the `venue_uri` field
         pub struct venue_uri(());
+        ///Marker type for the `venue_name` field
+        pub struct venue_name(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ItemBuilder<'a, S: item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Address<'a>>,
         Option<Datetime>,
         Option<AtUri<'a>>,
@@ -263,7 +266,7 @@ pub struct ItemBuilder<'a, S: item_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Item<'a> {
@@ -277,19 +280,9 @@ impl<'a> ItemBuilder<'a, item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -297,12 +290,12 @@ impl<'a> ItemBuilder<'a, item_state::Empty> {
 impl<'a, S: item_state::State> ItemBuilder<'a, S> {
     /// Set the `addressDetails` field (optional)
     pub fn address_details(mut self, value: impl Into<Option<Address<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `addressDetails` field to an Option value (optional)
     pub fn maybe_address_details(mut self, value: Option<Address<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -317,11 +310,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ItemBuilder<'a, item_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -329,12 +322,12 @@ where
 impl<'a, S: item_state::State> ItemBuilder<'a, S> {
     /// Set the `folderUri` field (optional)
     pub fn folder_uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `folderUri` field to an Option value (optional)
     pub fn maybe_folder_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -342,12 +335,12 @@ impl<'a, S: item_state::State> ItemBuilder<'a, S> {
 impl<'a, S: item_state::State> ItemBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<Geo<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<Geo<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -355,12 +348,12 @@ impl<'a, S: item_state::State> ItemBuilder<'a, S> {
 impl<'a, S: item_state::State> ItemBuilder<'a, S> {
     /// Set the `notes` field (optional)
     pub fn notes(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `notes` field to an Option value (optional)
     pub fn maybe_notes(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -368,12 +361,12 @@ impl<'a, S: item_state::State> ItemBuilder<'a, S> {
 impl<'a, S: item_state::State> ItemBuilder<'a, S> {
     /// Set the `venueAddress` field (optional)
     pub fn venue_address(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `venueAddress` field to an Option value (optional)
     pub fn maybe_venue_address(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -381,12 +374,12 @@ impl<'a, S: item_state::State> ItemBuilder<'a, S> {
 impl<'a, S: item_state::State> ItemBuilder<'a, S> {
     /// Set the `venueCategory` field (optional)
     pub fn venue_category(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `venueCategory` field to an Option value (optional)
     pub fn maybe_venue_category(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -401,11 +394,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ItemBuilder<'a, item_state::SetVenueName<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -420,11 +413,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ItemBuilder<'a, item_state::SetVenueUri<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         ItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -432,22 +425,22 @@ where
 impl<'a, S> ItemBuilder<'a, S>
 where
     S: item_state::State,
-    S::CreatedAt: item_state::IsSet,
-    S::VenueName: item_state::IsSet,
     S::VenueUri: item_state::IsSet,
+    S::VenueName: item_state::IsSet,
+    S::CreatedAt: item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Item<'a> {
         Item {
-            address_details: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            folder_uri: self.__unsafe_private_named.2,
-            location: self.__unsafe_private_named.3,
-            notes: self.__unsafe_private_named.4,
-            venue_address: self.__unsafe_private_named.5,
-            venue_category: self.__unsafe_private_named.6,
-            venue_name: self.__unsafe_private_named.7.unwrap(),
-            venue_uri: self.__unsafe_private_named.8.unwrap(),
+            address_details: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            folder_uri: self._fields.2,
+            location: self._fields.3,
+            notes: self._fields.4,
+            venue_address: self._fields.5,
+            venue_category: self._fields.6,
+            venue_name: self._fields.7.unwrap(),
+            venue_uri: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -460,15 +453,15 @@ where
         >,
     ) -> Item<'a> {
         Item {
-            address_details: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            folder_uri: self.__unsafe_private_named.2,
-            location: self.__unsafe_private_named.3,
-            notes: self.__unsafe_private_named.4,
-            venue_address: self.__unsafe_private_named.5,
-            venue_category: self.__unsafe_private_named.6,
-            venue_name: self.__unsafe_private_named.7.unwrap(),
-            venue_uri: self.__unsafe_private_named.8.unwrap(),
+            address_details: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            folder_uri: self._fields.2,
+            location: self._fields.3,
+            notes: self._fields.4,
+            venue_address: self._fields.5,
+            venue_category: self._fields.6,
+            venue_name: self._fields.7.unwrap(),
+            venue_uri: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_beaconbits/favorite.rs b/crates/jacquard-api/src/app_beaconbits/favorite.rs
index 84188fc9..4a02a8ae 100644
--- a/crates/jacquard-api/src/app_beaconbits/favorite.rs
+++ b/crates/jacquard-api/src/app_beaconbits/favorite.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,9 +149,9 @@ pub mod favorite_state {
 
 /// Builder for constructing an instance of this type
 pub struct FavoriteBuilder<'a, S: favorite_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Favorite<'a> {
@@ -162,9 +165,9 @@ impl<'a> FavoriteBuilder<'a, favorite_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FavoriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FavoriteBuilder<'a, favorite_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FavoriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> FavoriteBuilder<'a, favorite_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FavoriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,8 +219,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Favorite<'a> {
         Favorite {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Favorite<'a> {
         Favorite {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_beaconbits/favorites.rs b/crates/jacquard-api/src/app_beaconbits/favorites.rs
index 1004ef46..716738b1 100644
--- a/crates/jacquard-api/src/app_beaconbits/favorites.rs
+++ b/crates/jacquard-api/src/app_beaconbits/favorites.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -157,9 +160,9 @@ pub mod favorites_state {
 
 /// Builder for constructing an instance of this type
 pub struct FavoritesBuilder<'a, S: favorites_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<Did<'a>>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<Did<'a>>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Favorites<'a> {
@@ -173,9 +176,9 @@ impl<'a> FavoritesBuilder<'a, favorites_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FavoritesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -190,11 +193,11 @@ where
         mut self,
         value: impl Into<Vec<Did<'a>>>,
     ) -> FavoritesBuilder<'a, favorites_state::SetDids<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FavoritesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,11 +212,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FavoritesBuilder<'a, favorites_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FavoritesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -227,8 +230,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Favorites<'a> {
         Favorites {
-            dids: self.__unsafe_private_named.0.unwrap(),
-            updated_at: self.__unsafe_private_named.1.unwrap(),
+            dids: self._fields.0.unwrap(),
+            updated_at: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -241,8 +244,8 @@ where
         >,
     ) -> Favorites<'a> {
         Favorites {
-            dids: self.__unsafe_private_named.0.unwrap(),
-            updated_at: self.__unsafe_private_named.1.unwrap(),
+            dids: self._fields.0.unwrap(),
+            updated_at: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_beaconbits/profile.rs b/crates/jacquard-api/src/app_beaconbits/profile.rs
index d503a305..51f2fd50 100644
--- a/crates/jacquard-api/src/app_beaconbits/profile.rs
+++ b/crates/jacquard-api/src/app_beaconbits/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -765,8 +768,8 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileAllowTags<'a>>,
         Option<Datetime>,
         Option<ProfileDefaultDelayedReveal<'a>>,
@@ -778,7 +781,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<bool>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -792,20 +795,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -813,12 +805,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `allowTags` field (optional)
     pub fn allow_tags(mut self, value: impl Into<Option<ProfileAllowTags<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `allowTags` field to an Option value (optional)
     pub fn maybe_allow_tags(mut self, value: Option<ProfileAllowTags<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -826,12 +818,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -842,7 +834,7 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProfileDefaultDelayedReveal<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `defaultDelayedReveal` field to an Option value (optional)
@@ -850,7 +842,7 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: Option<ProfileDefaultDelayedReveal<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -861,7 +853,7 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProfileDefaultVisibility<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `defaultVisibility` field to an Option value (optional)
@@ -869,7 +861,7 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: Option<ProfileDefaultVisibility<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -880,7 +872,7 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProfileDistanceUnit<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `distanceUnit` field to an Option value (optional)
@@ -888,7 +880,7 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: Option<ProfileDistanceUnit<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -896,12 +888,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `hidePastBeacons` field (optional)
     pub fn hide_past_beacons(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `hidePastBeacons` field to an Option value (optional)
     pub fn maybe_hide_past_beacons(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -909,12 +901,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `language` field (optional)
     pub fn language(mut self, value: impl Into<Option<ProfileLanguage<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `language` field to an Option value (optional)
     pub fn maybe_language(mut self, value: Option<ProfileLanguage<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -922,12 +914,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `markerColor` field (optional)
     pub fn marker_color(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `markerColor` field to an Option value (optional)
     pub fn maybe_marker_color(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -935,12 +927,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `postBeaconLinks` field (optional)
     pub fn post_beacon_links(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `postBeaconLinks` field to an Option value (optional)
     pub fn maybe_post_beacon_links(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -955,11 +947,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ProfileBuilder<'a, profile_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -972,16 +964,16 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            allow_tags: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            default_delayed_reveal: self.__unsafe_private_named.2,
-            default_visibility: self.__unsafe_private_named.3,
-            distance_unit: self.__unsafe_private_named.4,
-            hide_past_beacons: self.__unsafe_private_named.5.or_else(|| Some(false)),
-            language: self.__unsafe_private_named.6,
-            marker_color: self.__unsafe_private_named.7,
-            post_beacon_links: self.__unsafe_private_named.8.or_else(|| Some(true)),
-            updated_at: self.__unsafe_private_named.9.unwrap(),
+            allow_tags: self._fields.0,
+            created_at: self._fields.1,
+            default_delayed_reveal: self._fields.2,
+            default_visibility: self._fields.3,
+            distance_unit: self._fields.4,
+            hide_past_beacons: self._fields.5.or_else(|| Some(false)),
+            language: self._fields.6,
+            marker_color: self._fields.7,
+            post_beacon_links: self._fields.8.or_else(|| Some(true)),
+            updated_at: self._fields.9.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -994,16 +986,16 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            allow_tags: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            default_delayed_reveal: self.__unsafe_private_named.2,
-            default_visibility: self.__unsafe_private_named.3,
-            distance_unit: self.__unsafe_private_named.4,
-            hide_past_beacons: self.__unsafe_private_named.5.or_else(|| Some(false)),
-            language: self.__unsafe_private_named.6,
-            marker_color: self.__unsafe_private_named.7,
-            post_beacon_links: self.__unsafe_private_named.8.or_else(|| Some(true)),
-            updated_at: self.__unsafe_private_named.9.unwrap(),
+            allow_tags: self._fields.0,
+            created_at: self._fields.1,
+            default_delayed_reveal: self._fields.2,
+            default_visibility: self._fields.3,
+            distance_unit: self._fields.4,
+            hide_past_beacons: self._fields.5.or_else(|| Some(false)),
+            language: self._fields.6,
+            marker_color: self._fields.7,
+            post_beacon_links: self._fields.8.or_else(|| Some(true)),
+            updated_at: self._fields.9.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_beaconbits/report.rs b/crates/jacquard-api/src/app_beaconbits/report.rs
index f2c736b0..af231e19 100644
--- a/crates/jacquard-api/src/app_beaconbits/report.rs
+++ b/crates/jacquard-api/src/app_beaconbits/report.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -253,63 +256,63 @@ pub mod report_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Reason;
-        type BeaconUri;
         type CreatedAt;
+        type BeaconUri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Reason = Unset;
-        type BeaconUri = Unset;
         type CreatedAt = Unset;
+        type BeaconUri = Unset;
     }
     ///State transition - sets the `reason` field to Set
     pub struct SetReason<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetReason<S> {}
     impl<S: State> State for SetReason<S> {
         type Reason = Set<members::reason>;
-        type BeaconUri = S::BeaconUri;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `beacon_uri` field to Set
-    pub struct SetBeaconUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBeaconUri<S> {}
-    impl<S: State> State for SetBeaconUri<S> {
-        type Reason = S::Reason;
-        type BeaconUri = Set<members::beacon_uri>;
         type CreatedAt = S::CreatedAt;
+        type BeaconUri = S::BeaconUri;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type Reason = S::Reason;
-        type BeaconUri = S::BeaconUri;
         type CreatedAt = Set<members::created_at>;
+        type BeaconUri = S::BeaconUri;
+    }
+    ///State transition - sets the `beacon_uri` field to Set
+    pub struct SetBeaconUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBeaconUri<S> {}
+    impl<S: State> State for SetBeaconUri<S> {
+        type Reason = S::Reason;
+        type CreatedAt = S::CreatedAt;
+        type BeaconUri = Set<members::beacon_uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `reason` field
         pub struct reason(());
-        ///Marker type for the `beacon_uri` field
-        pub struct beacon_uri(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `beacon_uri` field
+        pub struct beacon_uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReportBuilder<'a, S: report_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<ReportReason<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Report<'a> {
@@ -323,9 +326,9 @@ impl<'a> ReportBuilder<'a, report_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReportBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -340,11 +343,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ReportBuilder<'a, report_state::SetBeaconUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReportBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -359,11 +362,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReportBuilder<'a, report_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReportBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -371,12 +374,12 @@ where
 impl<'a, S: report_state::State> ReportBuilder<'a, S> {
     /// Set the `details` field (optional)
     pub fn details(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `details` field to an Option value (optional)
     pub fn maybe_details(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -391,11 +394,11 @@ where
         mut self,
         value: impl Into<ReportReason<'a>>,
     ) -> ReportBuilder<'a, report_state::SetReason<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ReportBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -404,16 +407,16 @@ impl<'a, S> ReportBuilder<'a, S>
 where
     S: report_state::State,
     S::Reason: report_state::IsSet,
-    S::BeaconUri: report_state::IsSet,
     S::CreatedAt: report_state::IsSet,
+    S::BeaconUri: report_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Report<'a> {
         Report {
-            beacon_uri: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            details: self.__unsafe_private_named.2,
-            reason: self.__unsafe_private_named.3.unwrap(),
+            beacon_uri: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            details: self._fields.2,
+            reason: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -426,10 +429,10 @@ where
         >,
     ) -> Report<'a> {
         Report {
-            beacon_uri: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            details: self.__unsafe_private_named.2,
-            reason: self.__unsafe_private_named.3.unwrap(),
+            beacon_uri: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            details: self._fields.2,
+            reason: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_beaconbits/venue.rs b/crates/jacquard-api/src/app_beaconbits/venue.rs
index e818b17d..43342927 100644
--- a/crates/jacquard-api/src/app_beaconbits/venue.rs
+++ b/crates/jacquard-api/src/app_beaconbits/venue.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -205,8 +208,8 @@ pub mod venue_state {
 
 /// Builder for constructing an instance of this type
 pub struct VenueBuilder<'a, S: venue_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Address<'a>>,
         Option<CowStr<'a>>,
@@ -215,7 +218,7 @@ pub struct VenueBuilder<'a, S: venue_state::State> {
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Venue<'a> {
@@ -229,9 +232,9 @@ impl<'a> VenueBuilder<'a, venue_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VenueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,12 +242,12 @@ impl<'a> VenueBuilder<'a, venue_state::Empty> {
 impl<'a, S: venue_state::State> VenueBuilder<'a, S> {
     /// Set the `address` field (optional)
     pub fn address(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `address` field to an Option value (optional)
     pub fn maybe_address(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -252,12 +255,12 @@ impl<'a, S: venue_state::State> VenueBuilder<'a, S> {
 impl<'a, S: venue_state::State> VenueBuilder<'a, S> {
     /// Set the `addressDetails` field (optional)
     pub fn address_details(mut self, value: impl Into<Option<Address<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `addressDetails` field to an Option value (optional)
     pub fn maybe_address_details(mut self, value: Option<Address<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -265,12 +268,12 @@ impl<'a, S: venue_state::State> VenueBuilder<'a, S> {
 impl<'a, S: venue_state::State> VenueBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -285,11 +288,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> VenueBuilder<'a, venue_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         VenueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -297,12 +300,12 @@ where
 impl<'a, S: venue_state::State> VenueBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<Geo<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<Geo<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -317,11 +320,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> VenueBuilder<'a, venue_state::SetName<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         VenueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -329,12 +332,12 @@ where
 impl<'a, S: venue_state::State> VenueBuilder<'a, S> {
     /// Set the `osmUri` field (optional)
     pub fn osm_uri(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `osmUri` field to an Option value (optional)
     pub fn maybe_osm_uri(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -348,13 +351,13 @@ where
     /// Build the final struct
     pub fn build(self) -> Venue<'a> {
         Venue {
-            address: self.__unsafe_private_named.0,
-            address_details: self.__unsafe_private_named.1,
-            category: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            location: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            osm_uri: self.__unsafe_private_named.6,
+            address: self._fields.0,
+            address_details: self._fields.1,
+            category: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            location: self._fields.4,
+            name: self._fields.5.unwrap(),
+            osm_uri: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -367,13 +370,13 @@ where
         >,
     ) -> Venue<'a> {
         Venue {
-            address: self.__unsafe_private_named.0,
-            address_details: self.__unsafe_private_named.1,
-            category: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            location: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            osm_uri: self.__unsafe_private_named.6,
+            address: self._fields.0,
+            address_details: self._fields.1,
+            category: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            location: self._fields.4,
+            name: self._fields.5.unwrap(),
+            osm_uri: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder.rs
index 31a590f0..0032e36c 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder_relationship.rs
index df039003..375c46b6 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder_relationship.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder_relationship.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/delete_folder.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/delete_folder.rs
index 1dc6f829..059dcb28 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/folder/delete_folder.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/folder/delete_folder.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -71,9 +72,9 @@ pub mod delete_folder_params_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeleteFolderParamsBuilder<'a, S: delete_folder_params_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeleteFolderParams<'a> {
@@ -87,9 +88,9 @@ impl<'a> DeleteFolderParamsBuilder<'a, delete_folder_params_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteFolderParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -97,12 +98,12 @@ impl<'a> DeleteFolderParamsBuilder<'a, delete_folder_params_state::Empty> {
 impl<'a, S: delete_folder_params_state::State> DeleteFolderParamsBuilder<'a, S> {
     /// Set the `id` field (optional)
     pub fn id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `id` field to an Option value (optional)
     pub fn maybe_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -114,7 +115,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DeleteFolderParams<'a> {
         DeleteFolderParams {
-            id: self.__unsafe_private_named.0,
+            id: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/delete_folder_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/delete_folder_relationship.rs
index 525b79dc..a95a80cc 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/folder/delete_folder_relationship.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/folder/delete_folder_relationship.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/get_folder.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/get_folder.rs
index 9dfbb7b3..b1830c02 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/folder/get_folder.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/folder/get_folder.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -91,9 +94,9 @@ pub mod get_folder_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFolderBuilder<'a, S: get_folder_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFolder<'a> {
@@ -107,9 +110,9 @@ impl<'a> GetFolderBuilder<'a, get_folder_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFolderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -124,11 +127,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetFolderBuilder<'a, get_folder_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetFolderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -141,7 +144,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFolder<'a> {
         GetFolder {
-            id: self.__unsafe_private_named.0.unwrap(),
+            id: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/get_folders.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/get_folders.rs
index af6dba42..d451a34e 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/folder/get_folders.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/folder/get_folders.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -77,9 +80,9 @@ pub mod get_folders_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFoldersBuilder<'a, S: get_folders_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFolders<'a> {
@@ -93,9 +96,9 @@ impl<'a> GetFoldersBuilder<'a, get_folders_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFoldersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -103,12 +106,12 @@ impl<'a> GetFoldersBuilder<'a, get_folders_state::Empty> {
 impl<'a, S: get_folders_state::State> GetFoldersBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -116,12 +119,12 @@ impl<'a, S: get_folders_state::State> GetFoldersBuilder<'a, S> {
 impl<'a, S: get_folders_state::State> GetFoldersBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -133,8 +136,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFolders<'a> {
         GetFolders {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/record.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/record.rs
index 548d7c7e..1f7e89d3 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/folder/record.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/folder/record.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -123,9 +126,9 @@ pub mod record_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordBuilder<'a, S: record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<bool>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Record<'a> {
@@ -139,9 +142,9 @@ impl<'a> RecordBuilder<'a, record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,12 +152,12 @@ impl<'a> RecordBuilder<'a, record_state::Empty> {
 impl<'a, S: record_state::State> RecordBuilder<'a, S> {
     /// Set the `cuid` field (optional)
     pub fn cuid(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cuid` field to an Option value (optional)
     pub fn maybe_cuid(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -162,12 +165,12 @@ impl<'a, S: record_state::State> RecordBuilder<'a, S> {
 impl<'a, S: record_state::State> RecordBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -175,12 +178,12 @@ impl<'a, S: record_state::State> RecordBuilder<'a, S> {
 impl<'a, S: record_state::State> RecordBuilder<'a, S> {
     /// Set the `public` field (optional)
     pub fn public(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `public` field to an Option value (optional)
     pub fn maybe_public(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -192,9 +195,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Record<'a> {
         Record {
-            cuid: self.__unsafe_private_named.0,
-            name: self.__unsafe_private_named.1,
-            public: self.__unsafe_private_named.2,
+            cuid: self._fields.0,
+            name: self._fields.1,
+            public: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -207,9 +210,9 @@ where
         >,
     ) -> Record<'a> {
         Record {
-            cuid: self.__unsafe_private_named.0,
-            name: self.__unsafe_private_named.1,
-            public: self.__unsafe_private_named.2,
+            cuid: self._fields.0,
+            name: self._fields.1,
+            public: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder.rs
index 6be8b7ea..21bb8972 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -95,9 +98,9 @@ pub mod update_folder_params_state {
 
 /// Builder for constructing an instance of this type
 pub struct UpdateFolderParamsBuilder<'a, S: update_folder_params_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateFolderParams<'a> {
@@ -111,9 +114,9 @@ impl<'a> UpdateFolderParamsBuilder<'a, update_folder_params_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateFolderParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -121,12 +124,12 @@ impl<'a> UpdateFolderParamsBuilder<'a, update_folder_params_state::Empty> {
 impl<'a, S: update_folder_params_state::State> UpdateFolderParamsBuilder<'a, S> {
     /// Set the `id` field (optional)
     pub fn id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `id` field to an Option value (optional)
     pub fn maybe_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -138,7 +141,7 @@ where
     /// Build the final struct
     pub fn build(self) -> UpdateFolderParams<'a> {
         UpdateFolderParams {
-            id: self.__unsafe_private_named.0,
+            id: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder_relationship.rs
index 09509981..bd94d157 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder_relationship.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder_relationship.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/create_group.rs b/crates/jacquard-api/src/app_blebbit/authr/group/create_group.rs
index 2fd4a8fc..f096dbc0 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/group/create_group.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/group/create_group.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/create_group_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/group/create_group_relationship.rs
index 8c09fd3b..f9724ea0 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/group/create_group_relationship.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/group/create_group_relationship.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/delete_group.rs b/crates/jacquard-api/src/app_blebbit/authr/group/delete_group.rs
index c5daa341..0dff4254 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/group/delete_group.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/group/delete_group.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -71,9 +72,9 @@ pub mod delete_group_params_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeleteGroupParamsBuilder<'a, S: delete_group_params_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeleteGroupParams<'a> {
@@ -87,9 +88,9 @@ impl<'a> DeleteGroupParamsBuilder<'a, delete_group_params_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteGroupParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -97,12 +98,12 @@ impl<'a> DeleteGroupParamsBuilder<'a, delete_group_params_state::Empty> {
 impl<'a, S: delete_group_params_state::State> DeleteGroupParamsBuilder<'a, S> {
     /// Set the `id` field (optional)
     pub fn id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `id` field to an Option value (optional)
     pub fn maybe_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -114,7 +115,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DeleteGroupParams<'a> {
         DeleteGroupParams {
-            id: self.__unsafe_private_named.0,
+            id: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/delete_group_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/group/delete_group_relationship.rs
index f022cbb0..fd3f4f16 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/group/delete_group_relationship.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/group/delete_group_relationship.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/get_group.rs b/crates/jacquard-api/src/app_blebbit/authr/group/get_group.rs
index 529ae6f5..8fbc4693 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/group/get_group.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/group/get_group.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -97,9 +100,9 @@ pub mod get_group_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetGroupBuilder<'a, S: get_group_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetGroup<'a> {
@@ -113,9 +116,9 @@ impl<'a> GetGroupBuilder<'a, get_group_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetGroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -130,11 +133,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetGroupBuilder<'a, get_group_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetGroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -147,7 +150,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetGroup<'a> {
         GetGroup {
-            id: self.__unsafe_private_named.0.unwrap(),
+            id: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/get_groups.rs b/crates/jacquard-api/src/app_blebbit/authr/group/get_groups.rs
index 2928256b..473daa97 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/group/get_groups.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/group/get_groups.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -77,9 +80,9 @@ pub mod get_groups_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetGroupsBuilder<'a, S: get_groups_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetGroups<'a> {
@@ -93,9 +96,9 @@ impl<'a> GetGroupsBuilder<'a, get_groups_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetGroupsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -103,12 +106,12 @@ impl<'a> GetGroupsBuilder<'a, get_groups_state::Empty> {
 impl<'a, S: get_groups_state::State> GetGroupsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -116,12 +119,12 @@ impl<'a, S: get_groups_state::State> GetGroupsBuilder<'a, S> {
 impl<'a, S: get_groups_state::State> GetGroupsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -133,8 +136,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetGroups<'a> {
         GetGroups {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/record.rs b/crates/jacquard-api/src/app_blebbit/authr/group/record.rs
index a688b777..36f1bce6 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/group/record.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/group/record.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -129,15 +132,15 @@ pub mod record_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordBuilder<'a, S: record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<bool>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Record<'a> {
@@ -151,9 +154,9 @@ impl<'a> RecordBuilder<'a, record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -161,12 +164,12 @@ impl<'a> RecordBuilder<'a, record_state::Empty> {
 impl<'a, S: record_state::State> RecordBuilder<'a, S> {
     /// Set the `cuid` field (optional)
     pub fn cuid(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cuid` field to an Option value (optional)
     pub fn maybe_cuid(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -174,12 +177,12 @@ impl<'a, S: record_state::State> RecordBuilder<'a, S> {
 impl<'a, S: record_state::State> RecordBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -187,12 +190,12 @@ impl<'a, S: record_state::State> RecordBuilder<'a, S> {
 impl<'a, S: record_state::State> RecordBuilder<'a, S> {
     /// Set the `display` field (optional)
     pub fn display(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `display` field to an Option value (optional)
     pub fn maybe_display(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -200,12 +203,12 @@ impl<'a, S: record_state::State> RecordBuilder<'a, S> {
 impl<'a, S: record_state::State> RecordBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -213,12 +216,12 @@ impl<'a, S: record_state::State> RecordBuilder<'a, S> {
 impl<'a, S: record_state::State> RecordBuilder<'a, S> {
     /// Set the `public` field (optional)
     pub fn public(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `public` field to an Option value (optional)
     pub fn maybe_public(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -230,11 +233,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Record<'a> {
         Record {
-            cuid: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            display: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3,
-            public: self.__unsafe_private_named.4,
+            cuid: self._fields.0,
+            description: self._fields.1,
+            display: self._fields.2,
+            name: self._fields.3,
+            public: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -247,11 +250,11 @@ where
         >,
     ) -> Record<'a> {
         Record {
-            cuid: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            display: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3,
-            public: self.__unsafe_private_named.4,
+            cuid: self._fields.0,
+            description: self._fields.1,
+            display: self._fields.2,
+            name: self._fields.3,
+            public: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/update_group.rs b/crates/jacquard-api/src/app_blebbit/authr/group/update_group.rs
index b0ea76cd..93d133ee 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/group/update_group.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/group/update_group.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -106,9 +109,9 @@ pub mod update_group_params_state {
 
 /// Builder for constructing an instance of this type
 pub struct UpdateGroupParamsBuilder<'a, S: update_group_params_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateGroupParams<'a> {
@@ -122,9 +125,9 @@ impl<'a> UpdateGroupParamsBuilder<'a, update_group_params_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateGroupParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -132,12 +135,12 @@ impl<'a> UpdateGroupParamsBuilder<'a, update_group_params_state::Empty> {
 impl<'a, S: update_group_params_state::State> UpdateGroupParamsBuilder<'a, S> {
     /// Set the `id` field (optional)
     pub fn id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `id` field to an Option value (optional)
     pub fn maybe_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -149,7 +152,7 @@ where
     /// Build the final struct
     pub fn build(self) -> UpdateGroupParams<'a> {
         UpdateGroupParams {
-            id: self.__unsafe_private_named.0,
+            id: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/update_group_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/group/update_group_relationship.rs
index b81a82f0..546857d2 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/group/update_group_relationship.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/group/update_group_relationship.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/create_page.rs b/crates/jacquard-api/src/app_blebbit/authr/page/create_page.rs
index 96e9912b..6437b991 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/page/create_page.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/page/create_page.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/create_page_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/page/create_page_relationship.rs
index 45ee3343..0e7360e3 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/page/create_page_relationship.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/page/create_page_relationship.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/delete_page.rs b/crates/jacquard-api/src/app_blebbit/authr/page/delete_page.rs
index dde52553..29af57a2 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/page/delete_page.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/page/delete_page.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -71,9 +72,9 @@ pub mod delete_page_params_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeletePageParamsBuilder<'a, S: delete_page_params_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeletePageParams<'a> {
@@ -87,9 +88,9 @@ impl<'a> DeletePageParamsBuilder<'a, delete_page_params_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeletePageParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -97,12 +98,12 @@ impl<'a> DeletePageParamsBuilder<'a, delete_page_params_state::Empty> {
 impl<'a, S: delete_page_params_state::State> DeletePageParamsBuilder<'a, S> {
     /// Set the `id` field (optional)
     pub fn id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `id` field to an Option value (optional)
     pub fn maybe_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -114,7 +115,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DeletePageParams<'a> {
         DeletePageParams {
-            id: self.__unsafe_private_named.0,
+            id: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/delete_page_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/page/delete_page_relationship.rs
index 1d30f290..2986dd6b 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/page/delete_page_relationship.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/page/delete_page_relationship.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/get_page.rs b/crates/jacquard-api/src/app_blebbit/authr/page/get_page.rs
index 60c72a8d..4d56b81a 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/page/get_page.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/page/get_page.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -94,9 +97,9 @@ pub mod get_page_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetPageBuilder<'a, S: get_page_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetPage<'a> {
@@ -110,9 +113,9 @@ impl<'a> GetPageBuilder<'a, get_page_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetPageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -127,11 +130,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetPageBuilder<'a, get_page_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetPageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -144,7 +147,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetPage<'a> {
         GetPage {
-            id: self.__unsafe_private_named.0.unwrap(),
+            id: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/get_pages.rs b/crates/jacquard-api/src/app_blebbit/authr/page/get_pages.rs
index 3ce4a08e..81845841 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/page/get_pages.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/page/get_pages.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -77,9 +80,9 @@ pub mod get_pages_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetPagesBuilder<'a, S: get_pages_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetPages<'a> {
@@ -93,9 +96,9 @@ impl<'a> GetPagesBuilder<'a, get_pages_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetPagesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -103,12 +106,12 @@ impl<'a> GetPagesBuilder<'a, get_pages_state::Empty> {
 impl<'a, S: get_pages_state::State> GetPagesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -116,12 +119,12 @@ impl<'a, S: get_pages_state::State> GetPagesBuilder<'a, S> {
 impl<'a, S: get_pages_state::State> GetPagesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -133,8 +136,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetPages<'a> {
         GetPages {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/record.rs b/crates/jacquard-api/src/app_blebbit/authr/page/record.rs
index b1ff2e67..539e7375 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/page/record.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/page/record.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -126,14 +129,9 @@ pub mod record_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordBuilder<'a, S: record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-        Option<bool>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Record<'a> {
@@ -147,9 +145,9 @@ impl<'a> RecordBuilder<'a, record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -157,12 +155,12 @@ impl<'a> RecordBuilder<'a, record_state::Empty> {
 impl<'a, S: record_state::State> RecordBuilder<'a, S> {
     /// Set the `content` field (optional)
     pub fn content(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `content` field to an Option value (optional)
     pub fn maybe_content(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -170,12 +168,12 @@ impl<'a, S: record_state::State> RecordBuilder<'a, S> {
 impl<'a, S: record_state::State> RecordBuilder<'a, S> {
     /// Set the `cuid` field (optional)
     pub fn cuid(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cuid` field to an Option value (optional)
     pub fn maybe_cuid(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -183,12 +181,12 @@ impl<'a, S: record_state::State> RecordBuilder<'a, S> {
 impl<'a, S: record_state::State> RecordBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -196,12 +194,12 @@ impl<'a, S: record_state::State> RecordBuilder<'a, S> {
 impl<'a, S: record_state::State> RecordBuilder<'a, S> {
     /// Set the `public` field (optional)
     pub fn public(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `public` field to an Option value (optional)
     pub fn maybe_public(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -213,10 +211,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Record<'a> {
         Record {
-            content: self.__unsafe_private_named.0,
-            cuid: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2,
-            public: self.__unsafe_private_named.3,
+            content: self._fields.0,
+            cuid: self._fields.1,
+            name: self._fields.2,
+            public: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -229,10 +227,10 @@ where
         >,
     ) -> Record<'a> {
         Record {
-            content: self.__unsafe_private_named.0,
-            cuid: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2,
-            public: self.__unsafe_private_named.3,
+            content: self._fields.0,
+            cuid: self._fields.1,
+            name: self._fields.2,
+            public: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/update_page.rs b/crates/jacquard-api/src/app_blebbit/authr/page/update_page.rs
index a31fa43d..adead341 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/page/update_page.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/page/update_page.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -98,9 +101,9 @@ pub mod update_page_params_state {
 
 /// Builder for constructing an instance of this type
 pub struct UpdatePageParamsBuilder<'a, S: update_page_params_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdatePageParams<'a> {
@@ -114,9 +117,9 @@ impl<'a> UpdatePageParamsBuilder<'a, update_page_params_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdatePageParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -124,12 +127,12 @@ impl<'a> UpdatePageParamsBuilder<'a, update_page_params_state::Empty> {
 impl<'a, S: update_page_params_state::State> UpdatePageParamsBuilder<'a, S> {
     /// Set the `id` field (optional)
     pub fn id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `id` field to an Option value (optional)
     pub fn maybe_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -141,7 +144,7 @@ where
     /// Build the final struct
     pub fn build(self) -> UpdatePageParams<'a> {
         UpdatePageParams {
-            id: self.__unsafe_private_named.0,
+            id: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/update_page_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/page/update_page_relationship.rs
index 62daff07..5c7aa855 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/page/update_page_relationship.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/page/update_page_relationship.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_bsky/actor.rs b/crates/jacquard-api/src/app_bsky/actor.rs
index 57813b07..ef419c60 100644
--- a/crates/jacquard-api/src/app_bsky/actor.rs
+++ b/crates/jacquard-api/src/app_bsky/actor.rs
@@ -15,7 +15,11 @@ pub mod search_actors;
 pub mod search_actors_typeahead;
 pub mod status;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -2573,9 +2577,9 @@ pub mod adult_content_pref_state {
 
 /// Builder for constructing an instance of this type
 pub struct AdultContentPrefBuilder<'a, S: adult_content_pref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AdultContentPref<'a> {
@@ -2589,9 +2593,9 @@ impl<'a> AdultContentPrefBuilder<'a, adult_content_pref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AdultContentPrefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2606,11 +2610,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> AdultContentPrefBuilder<'a, adult_content_pref_state::SetEnabled<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AdultContentPrefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2623,7 +2627,7 @@ where
     /// Build the final struct
     pub fn build(self) -> AdultContentPref<'a> {
         AdultContentPref {
-            enabled: self.__unsafe_private_named.0.unwrap(),
+            enabled: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2633,7 +2637,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> AdultContentPref<'a> {
         AdultContentPref {
-            enabled: self.__unsafe_private_named.0.unwrap(),
+            enabled: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -4270,9 +4274,9 @@ pub mod hidden_posts_pref_state {
 
 /// Builder for constructing an instance of this type
 pub struct HiddenPostsPrefBuilder<'a, S: hidden_posts_pref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<AtUri<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<AtUri<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> HiddenPostsPref<'a> {
@@ -4286,9 +4290,9 @@ impl<'a> HiddenPostsPrefBuilder<'a, hidden_posts_pref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HiddenPostsPrefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4303,11 +4307,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> HiddenPostsPrefBuilder<'a, hidden_posts_pref_state::SetItems<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         HiddenPostsPrefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4320,7 +4324,7 @@ where
     /// Build the final struct
     pub fn build(self) -> HiddenPostsPref<'a> {
         HiddenPostsPref {
-            items: self.__unsafe_private_named.0.unwrap(),
+            items: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -4330,7 +4334,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> HiddenPostsPref<'a> {
         HiddenPostsPref {
-            items: self.__unsafe_private_named.0.unwrap(),
+            items: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -4370,9 +4374,9 @@ pub mod interests_pref_state {
 
 /// Builder for constructing an instance of this type
 pub struct InterestsPrefBuilder<'a, S: interests_pref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<CowStr<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<CowStr<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> InterestsPref<'a> {
@@ -4386,9 +4390,9 @@ impl<'a> InterestsPrefBuilder<'a, interests_pref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         InterestsPrefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4403,11 +4407,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> InterestsPrefBuilder<'a, interests_pref_state::SetTags<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         InterestsPrefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4420,7 +4424,7 @@ where
     /// Build the final struct
     pub fn build(self) -> InterestsPref<'a> {
         InterestsPref {
-            tags: self.__unsafe_private_named.0.unwrap(),
+            tags: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -4430,7 +4434,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> InterestsPref<'a> {
         InterestsPref {
-            tags: self.__unsafe_private_named.0.unwrap(),
+            tags: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -4446,45 +4450,45 @@ pub mod known_followers_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Followers;
         type Count;
+        type Followers;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Followers = Unset;
         type Count = Unset;
-    }
-    ///State transition - sets the `followers` field to Set
-    pub struct SetFollowers<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetFollowers<S> {}
-    impl<S: State> State for SetFollowers<S> {
-        type Followers = Set<members::followers>;
-        type Count = S::Count;
+        type Followers = Unset;
     }
     ///State transition - sets the `count` field to Set
     pub struct SetCount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCount<S> {}
     impl<S: State> State for SetCount<S> {
-        type Followers = S::Followers;
         type Count = Set<members::count>;
+        type Followers = S::Followers;
+    }
+    ///State transition - sets the `followers` field to Set
+    pub struct SetFollowers<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetFollowers<S> {}
+    impl<S: State> State for SetFollowers<S> {
+        type Count = S::Count;
+        type Followers = Set<members::followers>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `followers` field
-        pub struct followers(());
         ///Marker type for the `count` field
         pub struct count(());
+        ///Marker type for the `followers` field
+        pub struct followers(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct KnownFollowersBuilder<'a, S: known_followers_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Vec<actor::ProfileViewBasic<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Vec<actor::ProfileViewBasic<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> KnownFollowers<'a> {
@@ -4498,9 +4502,9 @@ impl<'a> KnownFollowersBuilder<'a, known_followers_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         KnownFollowersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4515,11 +4519,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> KnownFollowersBuilder<'a, known_followers_state::SetCount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         KnownFollowersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4534,11 +4538,11 @@ where
         mut self,
         value: impl Into<Vec<actor::ProfileViewBasic<'a>>>,
     ) -> KnownFollowersBuilder<'a, known_followers_state::SetFollowers<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         KnownFollowersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4546,14 +4550,14 @@ where
 impl<'a, S> KnownFollowersBuilder<'a, S>
 where
     S: known_followers_state::State,
-    S::Followers: known_followers_state::IsSet,
     S::Count: known_followers_state::IsSet,
+    S::Followers: known_followers_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> KnownFollowers<'a> {
         KnownFollowers {
-            count: self.__unsafe_private_named.0.unwrap(),
-            followers: self.__unsafe_private_named.1.unwrap(),
+            count: self._fields.0.unwrap(),
+            followers: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -4563,8 +4567,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> KnownFollowers<'a> {
         KnownFollowers {
-            count: self.__unsafe_private_named.0.unwrap(),
-            followers: self.__unsafe_private_named.1.unwrap(),
+            count: self._fields.0.unwrap(),
+            followers: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -4604,9 +4608,9 @@ pub mod labeler_pref_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct LabelerPrefItemBuilder<'a, S: labeler_pref_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LabelerPrefItem<'a> {
@@ -4620,9 +4624,9 @@ impl<'a> LabelerPrefItemBuilder<'a, labeler_pref_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LabelerPrefItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4637,11 +4641,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> LabelerPrefItemBuilder<'a, labeler_pref_item_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LabelerPrefItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4654,7 +4658,7 @@ where
     /// Build the final struct
     pub fn build(self) -> LabelerPrefItem<'a> {
         LabelerPrefItem {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -4664,7 +4668,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> LabelerPrefItem<'a> {
         LabelerPrefItem {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -4704,9 +4708,9 @@ pub mod labelers_pref_state {
 
 /// Builder for constructing an instance of this type
 pub struct LabelersPrefBuilder<'a, S: labelers_pref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<actor::LabelerPrefItem<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<actor::LabelerPrefItem<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LabelersPref<'a> {
@@ -4720,9 +4724,9 @@ impl<'a> LabelersPrefBuilder<'a, labelers_pref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LabelersPrefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4737,11 +4741,11 @@ where
         mut self,
         value: impl Into<Vec<actor::LabelerPrefItem<'a>>>,
     ) -> LabelersPrefBuilder<'a, labelers_pref_state::SetLabelers<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LabelersPrefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4754,7 +4758,7 @@ where
     /// Build the final struct
     pub fn build(self) -> LabelersPref<'a> {
         LabelersPref {
-            labelers: self.__unsafe_private_named.0.unwrap(),
+            labelers: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -4764,7 +4768,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> LabelersPref<'a> {
         LabelersPref {
-            labelers: self.__unsafe_private_named.0.unwrap(),
+            labelers: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -4830,15 +4834,15 @@ pub mod muted_word_state {
 
 /// Builder for constructing an instance of this type
 pub struct MutedWordBuilder<'a, S: muted_word_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<MutedWordActorTarget<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Vec<actor::MutedWordTarget<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MutedWord<'a> {
@@ -4852,9 +4856,9 @@ impl<'a> MutedWordBuilder<'a, muted_word_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MutedWordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4865,7 +4869,7 @@ impl<'a, S: muted_word_state::State> MutedWordBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MutedWordActorTarget<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `actorTarget` field to an Option value (optional)
@@ -4873,7 +4877,7 @@ impl<'a, S: muted_word_state::State> MutedWordBuilder<'a, S> {
         mut self,
         value: Option<MutedWordActorTarget<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -4881,12 +4885,12 @@ impl<'a, S: muted_word_state::State> MutedWordBuilder<'a, S> {
 impl<'a, S: muted_word_state::State> MutedWordBuilder<'a, S> {
     /// Set the `expiresAt` field (optional)
     pub fn expires_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `expiresAt` field to an Option value (optional)
     pub fn maybe_expires_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -4894,12 +4898,12 @@ impl<'a, S: muted_word_state::State> MutedWordBuilder<'a, S> {
 impl<'a, S: muted_word_state::State> MutedWordBuilder<'a, S> {
     /// Set the `id` field (optional)
     pub fn id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `id` field to an Option value (optional)
     pub fn maybe_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -4914,11 +4918,11 @@ where
         mut self,
         value: impl Into<Vec<actor::MutedWordTarget<'a>>>,
     ) -> MutedWordBuilder<'a, muted_word_state::SetTargets<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         MutedWordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4933,11 +4937,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MutedWordBuilder<'a, muted_word_state::SetValue<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         MutedWordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4951,11 +4955,11 @@ where
     /// Build the final struct
     pub fn build(self) -> MutedWord<'a> {
         MutedWord {
-            actor_target: self.__unsafe_private_named.0,
-            expires_at: self.__unsafe_private_named.1,
-            id: self.__unsafe_private_named.2,
-            targets: self.__unsafe_private_named.3.unwrap(),
-            value: self.__unsafe_private_named.4.unwrap(),
+            actor_target: self._fields.0,
+            expires_at: self._fields.1,
+            id: self._fields.2,
+            targets: self._fields.3.unwrap(),
+            value: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -4965,11 +4969,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> MutedWord<'a> {
         MutedWord {
-            actor_target: self.__unsafe_private_named.0,
-            expires_at: self.__unsafe_private_named.1,
-            id: self.__unsafe_private_named.2,
-            targets: self.__unsafe_private_named.3.unwrap(),
-            value: self.__unsafe_private_named.4.unwrap(),
+            actor_target: self._fields.0,
+            expires_at: self._fields.1,
+            id: self._fields.2,
+            targets: self._fields.3.unwrap(),
+            value: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -5009,9 +5013,9 @@ pub mod muted_words_pref_state {
 
 /// Builder for constructing an instance of this type
 pub struct MutedWordsPrefBuilder<'a, S: muted_words_pref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<actor::MutedWord<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<actor::MutedWord<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MutedWordsPref<'a> {
@@ -5025,9 +5029,9 @@ impl<'a> MutedWordsPrefBuilder<'a, muted_words_pref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MutedWordsPrefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5042,11 +5046,11 @@ where
         mut self,
         value: impl Into<Vec<actor::MutedWord<'a>>>,
     ) -> MutedWordsPrefBuilder<'a, muted_words_pref_state::SetItems<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MutedWordsPrefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5059,7 +5063,7 @@ where
     /// Build the final struct
     pub fn build(self) -> MutedWordsPref<'a> {
         MutedWordsPref {
-            items: self.__unsafe_private_named.0.unwrap(),
+            items: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -5069,7 +5073,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> MutedWordsPref<'a> {
         MutedWordsPref {
-            items: self.__unsafe_private_named.0.unwrap(),
+            items: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -5125,14 +5129,9 @@ pub mod nux_state {
 
 /// Builder for constructing an instance of this type
 pub struct NuxBuilder<'a, S: nux_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<bool>,
-        Option<CowStr<'a>>,
-        Option<Datetime>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<CowStr<'a>>, Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Nux<'a> {
@@ -5146,9 +5145,9 @@ impl<'a> NuxBuilder<'a, nux_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NuxBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5163,11 +5162,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> NuxBuilder<'a, nux_state::SetCompleted<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NuxBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5175,12 +5174,12 @@ where
 impl<'a, S: nux_state::State> NuxBuilder<'a, S> {
     /// Set the `data` field (optional)
     pub fn data(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `data` field to an Option value (optional)
     pub fn maybe_data(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -5188,12 +5187,12 @@ impl<'a, S: nux_state::State> NuxBuilder<'a, S> {
 impl<'a, S: nux_state::State> NuxBuilder<'a, S> {
     /// Set the `expiresAt` field (optional)
     pub fn expires_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `expiresAt` field to an Option value (optional)
     pub fn maybe_expires_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -5208,11 +5207,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> NuxBuilder<'a, nux_state::SetId<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         NuxBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5226,10 +5225,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Nux<'a> {
         Nux {
-            completed: self.__unsafe_private_named.0.unwrap(),
-            data: self.__unsafe_private_named.1,
-            expires_at: self.__unsafe_private_named.2,
-            id: self.__unsafe_private_named.3.unwrap(),
+            completed: self._fields.0.unwrap(),
+            data: self._fields.1,
+            expires_at: self._fields.2,
+            id: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -5239,10 +5238,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Nux<'a> {
         Nux {
-            completed: self.__unsafe_private_named.0.unwrap(),
-            data: self.__unsafe_private_named.1,
-            expires_at: self.__unsafe_private_named.2,
-            id: self.__unsafe_private_named.3.unwrap(),
+            completed: self._fields.0.unwrap(),
+            data: self._fields.1,
+            expires_at: self._fields.2,
+            id: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -5258,48 +5257,45 @@ pub mod profile_associated_germ_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ShowButtonTo;
         type MessageMeUrl;
+        type ShowButtonTo;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ShowButtonTo = Unset;
         type MessageMeUrl = Unset;
-    }
-    ///State transition - sets the `show_button_to` field to Set
-    pub struct SetShowButtonTo<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetShowButtonTo<S> {}
-    impl<S: State> State for SetShowButtonTo<S> {
-        type ShowButtonTo = Set<members::show_button_to>;
-        type MessageMeUrl = S::MessageMeUrl;
+        type ShowButtonTo = Unset;
     }
     ///State transition - sets the `message_me_url` field to Set
     pub struct SetMessageMeUrl<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMessageMeUrl<S> {}
     impl<S: State> State for SetMessageMeUrl<S> {
-        type ShowButtonTo = S::ShowButtonTo;
         type MessageMeUrl = Set<members::message_me_url>;
+        type ShowButtonTo = S::ShowButtonTo;
+    }
+    ///State transition - sets the `show_button_to` field to Set
+    pub struct SetShowButtonTo<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetShowButtonTo<S> {}
+    impl<S: State> State for SetShowButtonTo<S> {
+        type MessageMeUrl = S::MessageMeUrl;
+        type ShowButtonTo = Set<members::show_button_to>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `show_button_to` field
-        pub struct show_button_to(());
         ///Marker type for the `message_me_url` field
         pub struct message_me_url(());
+        ///Marker type for the `show_button_to` field
+        pub struct show_button_to(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ProfileAssociatedGermBuilder<'a, S: profile_associated_germ_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<UriValue<'a>>,
-        Option<ProfileAssociatedGermShowButtonTo<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>, Option<ProfileAssociatedGermShowButtonTo<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileAssociatedGerm<'a> {
@@ -5316,9 +5312,9 @@ impl<'a> ProfileAssociatedGermBuilder<'a, profile_associated_germ_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileAssociatedGermBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5336,11 +5332,11 @@ where
         'a,
         profile_associated_germ_state::SetMessageMeUrl<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ProfileAssociatedGermBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5358,11 +5354,11 @@ where
         'a,
         profile_associated_germ_state::SetShowButtonTo<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ProfileAssociatedGermBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5370,14 +5366,14 @@ where
 impl<'a, S> ProfileAssociatedGermBuilder<'a, S>
 where
     S: profile_associated_germ_state::State,
-    S::ShowButtonTo: profile_associated_germ_state::IsSet,
     S::MessageMeUrl: profile_associated_germ_state::IsSet,
+    S::ShowButtonTo: profile_associated_germ_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ProfileAssociatedGerm<'a> {
         ProfileAssociatedGerm {
-            message_me_url: self.__unsafe_private_named.0.unwrap(),
-            show_button_to: self.__unsafe_private_named.1.unwrap(),
+            message_me_url: self._fields.0.unwrap(),
+            show_button_to: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -5387,8 +5383,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ProfileAssociatedGerm<'a> {
         ProfileAssociatedGerm {
-            message_me_url: self.__unsafe_private_named.0.unwrap(),
-            show_button_to: self.__unsafe_private_named.1.unwrap(),
+            message_me_url: self._fields.0.unwrap(),
+            show_button_to: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -5404,44 +5400,44 @@ pub mod profile_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Did;
         type Handle;
+        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Did = Unset;
         type Handle = Unset;
-    }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Did = Set<members::did>;
-        type Handle = S::Handle;
+        type Did = Unset;
     }
     ///State transition - sets the `handle` field to Set
     pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHandle<S> {}
     impl<S: State> State for SetHandle<S> {
-        type Did = S::Did;
         type Handle = Set<members::handle>;
+        type Did = S::Did;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Handle = S::Handle;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `handle` field
         pub struct handle(());
+        ///Marker type for the `did` field
+        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ProfileViewBuilder<'a, S: profile_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<actor::ProfileAssociated<'a>>,
         Option<UriValue<'a>>,
         Option<Datetime>,
@@ -5457,7 +5453,7 @@ pub struct ProfileViewBuilder<'a, S: profile_view_state::State> {
         Option<actor::VerificationState<'a>>,
         Option<actor::ViewerState<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileView<'a> {
@@ -5471,8 +5467,8 @@ impl<'a> ProfileViewBuilder<'a, profile_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -5488,7 +5484,7 @@ impl<'a> ProfileViewBuilder<'a, profile_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5499,7 +5495,7 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<actor::ProfileAssociated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `associated` field to an Option value (optional)
@@ -5507,7 +5503,7 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
         mut self,
         value: Option<actor::ProfileAssociated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -5515,12 +5511,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -5528,12 +5524,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -5541,12 +5537,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `debug` field (optional)
     pub fn debug(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `debug` field to an Option value (optional)
     pub fn maybe_debug(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -5554,12 +5550,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -5574,11 +5570,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ProfileViewBuilder<'a, profile_view_state::SetDid<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5586,12 +5582,12 @@ where
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -5606,11 +5602,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> ProfileViewBuilder<'a, profile_view_state::SetHandle<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5618,12 +5614,12 @@ where
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `indexedAt` field (optional)
     pub fn indexed_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `indexedAt` field to an Option value (optional)
     pub fn maybe_indexed_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -5631,12 +5627,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -5644,12 +5640,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `pronouns` field (optional)
     pub fn pronouns(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `pronouns` field to an Option value (optional)
     pub fn maybe_pronouns(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -5657,12 +5653,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<actor::StatusView<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<actor::StatusView<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -5673,7 +5669,7 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<actor::VerificationState<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `verification` field to an Option value (optional)
@@ -5681,7 +5677,7 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
         mut self,
         value: Option<actor::VerificationState<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -5689,12 +5685,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<actor::ViewerState<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<actor::ViewerState<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -5702,26 +5698,26 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S> ProfileViewBuilder<'a, S>
 where
     S: profile_view_state::State,
-    S::Did: profile_view_state::IsSet,
     S::Handle: profile_view_state::IsSet,
+    S::Did: profile_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ProfileView<'a> {
         ProfileView {
-            associated: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            debug: self.__unsafe_private_named.3,
-            description: self.__unsafe_private_named.4,
-            did: self.__unsafe_private_named.5.unwrap(),
-            display_name: self.__unsafe_private_named.6,
-            handle: self.__unsafe_private_named.7.unwrap(),
-            indexed_at: self.__unsafe_private_named.8,
-            labels: self.__unsafe_private_named.9,
-            pronouns: self.__unsafe_private_named.10,
-            status: self.__unsafe_private_named.11,
-            verification: self.__unsafe_private_named.12,
-            viewer: self.__unsafe_private_named.13,
+            associated: self._fields.0,
+            avatar: self._fields.1,
+            created_at: self._fields.2,
+            debug: self._fields.3,
+            description: self._fields.4,
+            did: self._fields.5.unwrap(),
+            display_name: self._fields.6,
+            handle: self._fields.7.unwrap(),
+            indexed_at: self._fields.8,
+            labels: self._fields.9,
+            pronouns: self._fields.10,
+            status: self._fields.11,
+            verification: self._fields.12,
+            viewer: self._fields.13,
             extra_data: Default::default(),
         }
     }
@@ -5731,20 +5727,20 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ProfileView<'a> {
         ProfileView {
-            associated: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            debug: self.__unsafe_private_named.3,
-            description: self.__unsafe_private_named.4,
-            did: self.__unsafe_private_named.5.unwrap(),
-            display_name: self.__unsafe_private_named.6,
-            handle: self.__unsafe_private_named.7.unwrap(),
-            indexed_at: self.__unsafe_private_named.8,
-            labels: self.__unsafe_private_named.9,
-            pronouns: self.__unsafe_private_named.10,
-            status: self.__unsafe_private_named.11,
-            verification: self.__unsafe_private_named.12,
-            viewer: self.__unsafe_private_named.13,
+            associated: self._fields.0,
+            avatar: self._fields.1,
+            created_at: self._fields.2,
+            debug: self._fields.3,
+            description: self._fields.4,
+            did: self._fields.5.unwrap(),
+            display_name: self._fields.6,
+            handle: self._fields.7.unwrap(),
+            indexed_at: self._fields.8,
+            labels: self._fields.9,
+            pronouns: self._fields.10,
+            status: self._fields.11,
+            verification: self._fields.12,
+            viewer: self._fields.13,
             extra_data: Some(extra_data),
         }
     }
@@ -5760,44 +5756,44 @@ pub mod profile_view_basic_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Handle;
         type Did;
+        type Handle;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Handle = Unset;
         type Did = Unset;
-    }
-    ///State transition - sets the `handle` field to Set
-    pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHandle<S> {}
-    impl<S: State> State for SetHandle<S> {
-        type Handle = Set<members::handle>;
-        type Did = S::Did;
+        type Handle = Unset;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type Handle = S::Handle;
         type Did = Set<members::did>;
+        type Handle = S::Handle;
+    }
+    ///State transition - sets the `handle` field to Set
+    pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHandle<S> {}
+    impl<S: State> State for SetHandle<S> {
+        type Did = S::Did;
+        type Handle = Set<members::handle>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `handle` field
-        pub struct handle(());
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `handle` field
+        pub struct handle(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ProfileViewBasicBuilder<'a, S: profile_view_basic_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<actor::ProfileAssociated<'a>>,
         Option<UriValue<'a>>,
         Option<Datetime>,
@@ -5811,7 +5807,7 @@ pub struct ProfileViewBasicBuilder<'a, S: profile_view_basic_state::State> {
         Option<actor::VerificationState<'a>>,
         Option<actor::ViewerState<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileViewBasic<'a> {
@@ -5825,8 +5821,8 @@ impl<'a> ProfileViewBasicBuilder<'a, profile_view_basic_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -5840,7 +5836,7 @@ impl<'a> ProfileViewBasicBuilder<'a, profile_view_basic_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5851,7 +5847,7 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
         mut self,
         value: impl Into<Option<actor::ProfileAssociated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `associated` field to an Option value (optional)
@@ -5859,7 +5855,7 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
         mut self,
         value: Option<actor::ProfileAssociated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -5867,12 +5863,12 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -5880,12 +5876,12 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -5893,12 +5889,12 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `debug` field (optional)
     pub fn debug(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `debug` field to an Option value (optional)
     pub fn maybe_debug(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -5913,11 +5909,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ProfileViewBasicBuilder<'a, profile_view_basic_state::SetDid<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ProfileViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5925,12 +5921,12 @@ where
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -5945,11 +5941,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> ProfileViewBasicBuilder<'a, profile_view_basic_state::SetHandle<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ProfileViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5957,12 +5953,12 @@ where
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -5970,12 +5966,12 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `pronouns` field (optional)
     pub fn pronouns(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `pronouns` field to an Option value (optional)
     pub fn maybe_pronouns(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -5983,12 +5979,12 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<actor::StatusView<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<actor::StatusView<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -5999,7 +5995,7 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
         mut self,
         value: impl Into<Option<actor::VerificationState<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `verification` field to an Option value (optional)
@@ -6007,7 +6003,7 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
         mut self,
         value: Option<actor::VerificationState<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -6015,12 +6011,12 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<actor::ViewerState<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<actor::ViewerState<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -6028,24 +6024,24 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
 impl<'a, S> ProfileViewBasicBuilder<'a, S>
 where
     S: profile_view_basic_state::State,
-    S::Handle: profile_view_basic_state::IsSet,
     S::Did: profile_view_basic_state::IsSet,
+    S::Handle: profile_view_basic_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ProfileViewBasic<'a> {
         ProfileViewBasic {
-            associated: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            debug: self.__unsafe_private_named.3,
-            did: self.__unsafe_private_named.4.unwrap(),
-            display_name: self.__unsafe_private_named.5,
-            handle: self.__unsafe_private_named.6.unwrap(),
-            labels: self.__unsafe_private_named.7,
-            pronouns: self.__unsafe_private_named.8,
-            status: self.__unsafe_private_named.9,
-            verification: self.__unsafe_private_named.10,
-            viewer: self.__unsafe_private_named.11,
+            associated: self._fields.0,
+            avatar: self._fields.1,
+            created_at: self._fields.2,
+            debug: self._fields.3,
+            did: self._fields.4.unwrap(),
+            display_name: self._fields.5,
+            handle: self._fields.6.unwrap(),
+            labels: self._fields.7,
+            pronouns: self._fields.8,
+            status: self._fields.9,
+            verification: self._fields.10,
+            viewer: self._fields.11,
             extra_data: Default::default(),
         }
     }
@@ -6055,18 +6051,18 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ProfileViewBasic<'a> {
         ProfileViewBasic {
-            associated: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            debug: self.__unsafe_private_named.3,
-            did: self.__unsafe_private_named.4.unwrap(),
-            display_name: self.__unsafe_private_named.5,
-            handle: self.__unsafe_private_named.6.unwrap(),
-            labels: self.__unsafe_private_named.7,
-            pronouns: self.__unsafe_private_named.8,
-            status: self.__unsafe_private_named.9,
-            verification: self.__unsafe_private_named.10,
-            viewer: self.__unsafe_private_named.11,
+            associated: self._fields.0,
+            avatar: self._fields.1,
+            created_at: self._fields.2,
+            debug: self._fields.3,
+            did: self._fields.4.unwrap(),
+            display_name: self._fields.5,
+            handle: self._fields.6.unwrap(),
+            labels: self._fields.7,
+            pronouns: self._fields.8,
+            status: self._fields.9,
+            verification: self._fields.10,
+            viewer: self._fields.11,
             extra_data: Some(extra_data),
         }
     }
@@ -6082,44 +6078,44 @@ pub mod profile_view_detailed_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Did;
         type Handle;
+        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Did = Unset;
         type Handle = Unset;
-    }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Did = Set<members::did>;
-        type Handle = S::Handle;
+        type Did = Unset;
     }
     ///State transition - sets the `handle` field to Set
     pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHandle<S> {}
     impl<S: State> State for SetHandle<S> {
-        type Did = S::Did;
         type Handle = Set<members::handle>;
+        type Did = S::Did;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Handle = S::Handle;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `handle` field
         pub struct handle(());
+        ///Marker type for the `did` field
+        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ProfileViewDetailedBuilder<'a, S: profile_view_detailed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<actor::ProfileAssociated<'a>>,
         Option<UriValue<'a>>,
         Option<UriValue<'a>>,
@@ -6142,7 +6138,7 @@ pub struct ProfileViewDetailedBuilder<'a, S: profile_view_detailed_state::State>
         Option<actor::ViewerState<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileViewDetailed<'a> {
@@ -6156,8 +6152,8 @@ impl<'a> ProfileViewDetailedBuilder<'a, profile_view_detailed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileViewDetailedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -6180,7 +6176,7 @@ impl<'a> ProfileViewDetailedBuilder<'a, profile_view_detailed_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6191,7 +6187,7 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
         mut self,
         value: impl Into<Option<actor::ProfileAssociated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `associated` field to an Option value (optional)
@@ -6199,7 +6195,7 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
         mut self,
         value: Option<actor::ProfileAssociated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -6207,12 +6203,12 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
 impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -6220,12 +6216,12 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
 impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -6233,12 +6229,12 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
 impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -6246,12 +6242,12 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
 impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S> {
     /// Set the `debug` field (optional)
     pub fn debug(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `debug` field to an Option value (optional)
     pub fn maybe_debug(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -6259,12 +6255,12 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
 impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -6279,11 +6275,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ProfileViewDetailedBuilder<'a, profile_view_detailed_state::SetDid<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ProfileViewDetailedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6291,12 +6287,12 @@ where
 impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -6304,12 +6300,12 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
 impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S> {
     /// Set the `followersCount` field (optional)
     pub fn followers_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `followersCount` field to an Option value (optional)
     pub fn maybe_followers_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -6317,12 +6313,12 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
 impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S> {
     /// Set the `followsCount` field (optional)
     pub fn follows_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `followsCount` field to an Option value (optional)
     pub fn maybe_follows_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -6337,11 +6333,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> ProfileViewDetailedBuilder<'a, profile_view_detailed_state::SetHandle<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         ProfileViewDetailedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6349,12 +6345,12 @@ where
 impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S> {
     /// Set the `indexedAt` field (optional)
     pub fn indexed_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `indexedAt` field to an Option value (optional)
     pub fn maybe_indexed_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -6365,7 +6361,7 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
         mut self,
         value: impl Into<Option<StarterPackViewBasic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `joinedViaStarterPack` field to an Option value (optional)
@@ -6373,7 +6369,7 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
         mut self,
         value: Option<StarterPackViewBasic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -6381,12 +6377,12 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
 impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -6394,12 +6390,12 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
 impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S> {
     /// Set the `pinnedPost` field (optional)
     pub fn pinned_post(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `pinnedPost` field to an Option value (optional)
     pub fn maybe_pinned_post(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -6407,12 +6403,12 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
 impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S> {
     /// Set the `postsCount` field (optional)
     pub fn posts_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `postsCount` field to an Option value (optional)
     pub fn maybe_posts_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -6420,12 +6416,12 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
 impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S> {
     /// Set the `pronouns` field (optional)
     pub fn pronouns(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `pronouns` field to an Option value (optional)
     pub fn maybe_pronouns(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -6433,12 +6429,12 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
 impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<actor::StatusView<'a>>>) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<actor::StatusView<'a>>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -6449,7 +6445,7 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
         mut self,
         value: impl Into<Option<actor::VerificationState<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `verification` field to an Option value (optional)
@@ -6457,7 +6453,7 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
         mut self,
         value: Option<actor::VerificationState<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -6465,12 +6461,12 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
 impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<actor::ViewerState<'a>>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<actor::ViewerState<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -6478,12 +6474,12 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
 impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S> {
     /// Set the `website` field (optional)
     pub fn website(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `website` field to an Option value (optional)
     pub fn maybe_website(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -6491,33 +6487,33 @@ impl<'a, S: profile_view_detailed_state::State> ProfileViewDetailedBuilder<'a, S
 impl<'a, S> ProfileViewDetailedBuilder<'a, S>
 where
     S: profile_view_detailed_state::State,
-    S::Did: profile_view_detailed_state::IsSet,
     S::Handle: profile_view_detailed_state::IsSet,
+    S::Did: profile_view_detailed_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ProfileViewDetailed<'a> {
         ProfileViewDetailed {
-            associated: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            banner: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3,
-            debug: self.__unsafe_private_named.4,
-            description: self.__unsafe_private_named.5,
-            did: self.__unsafe_private_named.6.unwrap(),
-            display_name: self.__unsafe_private_named.7,
-            followers_count: self.__unsafe_private_named.8,
-            follows_count: self.__unsafe_private_named.9,
-            handle: self.__unsafe_private_named.10.unwrap(),
-            indexed_at: self.__unsafe_private_named.11,
-            joined_via_starter_pack: self.__unsafe_private_named.12,
-            labels: self.__unsafe_private_named.13,
-            pinned_post: self.__unsafe_private_named.14,
-            posts_count: self.__unsafe_private_named.15,
-            pronouns: self.__unsafe_private_named.16,
-            status: self.__unsafe_private_named.17,
-            verification: self.__unsafe_private_named.18,
-            viewer: self.__unsafe_private_named.19,
-            website: self.__unsafe_private_named.20,
+            associated: self._fields.0,
+            avatar: self._fields.1,
+            banner: self._fields.2,
+            created_at: self._fields.3,
+            debug: self._fields.4,
+            description: self._fields.5,
+            did: self._fields.6.unwrap(),
+            display_name: self._fields.7,
+            followers_count: self._fields.8,
+            follows_count: self._fields.9,
+            handle: self._fields.10.unwrap(),
+            indexed_at: self._fields.11,
+            joined_via_starter_pack: self._fields.12,
+            labels: self._fields.13,
+            pinned_post: self._fields.14,
+            posts_count: self._fields.15,
+            pronouns: self._fields.16,
+            status: self._fields.17,
+            verification: self._fields.18,
+            viewer: self._fields.19,
+            website: self._fields.20,
             extra_data: Default::default(),
         }
     }
@@ -6527,27 +6523,27 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ProfileViewDetailed<'a> {
         ProfileViewDetailed {
-            associated: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            banner: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3,
-            debug: self.__unsafe_private_named.4,
-            description: self.__unsafe_private_named.5,
-            did: self.__unsafe_private_named.6.unwrap(),
-            display_name: self.__unsafe_private_named.7,
-            followers_count: self.__unsafe_private_named.8,
-            follows_count: self.__unsafe_private_named.9,
-            handle: self.__unsafe_private_named.10.unwrap(),
-            indexed_at: self.__unsafe_private_named.11,
-            joined_via_starter_pack: self.__unsafe_private_named.12,
-            labels: self.__unsafe_private_named.13,
-            pinned_post: self.__unsafe_private_named.14,
-            posts_count: self.__unsafe_private_named.15,
-            pronouns: self.__unsafe_private_named.16,
-            status: self.__unsafe_private_named.17,
-            verification: self.__unsafe_private_named.18,
-            viewer: self.__unsafe_private_named.19,
-            website: self.__unsafe_private_named.20,
+            associated: self._fields.0,
+            avatar: self._fields.1,
+            banner: self._fields.2,
+            created_at: self._fields.3,
+            debug: self._fields.4,
+            description: self._fields.5,
+            did: self._fields.6.unwrap(),
+            display_name: self._fields.7,
+            followers_count: self._fields.8,
+            follows_count: self._fields.9,
+            handle: self._fields.10.unwrap(),
+            indexed_at: self._fields.11,
+            joined_via_starter_pack: self._fields.12,
+            labels: self._fields.13,
+            pinned_post: self._fields.14,
+            posts_count: self._fields.15,
+            pronouns: self._fields.16,
+            status: self._fields.17,
+            verification: self._fields.18,
+            viewer: self._fields.19,
+            website: self._fields.20,
             extra_data: Some(extra_data),
         }
     }
@@ -6563,65 +6559,65 @@ pub mod saved_feed_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Value;
         type Id;
         type Pinned;
-        type Value;
         type Type;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Value = Unset;
         type Id = Unset;
         type Pinned = Unset;
-        type Value = Unset;
         type Type = Unset;
     }
+    ///State transition - sets the `value` field to Set
+    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetValue<S> {}
+    impl<S: State> State for SetValue<S> {
+        type Value = Set<members::value>;
+        type Id = S::Id;
+        type Pinned = S::Pinned;
+        type Type = S::Type;
+    }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetId<S> {}
     impl<S: State> State for SetId<S> {
+        type Value = S::Value;
         type Id = Set<members::id>;
         type Pinned = S::Pinned;
-        type Value = S::Value;
         type Type = S::Type;
     }
     ///State transition - sets the `pinned` field to Set
     pub struct SetPinned<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPinned<S> {}
     impl<S: State> State for SetPinned<S> {
-        type Id = S::Id;
-        type Pinned = Set<members::pinned>;
         type Value = S::Value;
-        type Type = S::Type;
-    }
-    ///State transition - sets the `value` field to Set
-    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetValue<S> {}
-    impl<S: State> State for SetValue<S> {
         type Id = S::Id;
-        type Pinned = S::Pinned;
-        type Value = Set<members::value>;
+        type Pinned = Set<members::pinned>;
         type Type = S::Type;
     }
     ///State transition - sets the `type` field to Set
     pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetType<S> {}
     impl<S: State> State for SetType<S> {
+        type Value = S::Value;
         type Id = S::Id;
         type Pinned = S::Pinned;
-        type Value = S::Value;
         type Type = Set<members::r#type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `value` field
+        pub struct value(());
         ///Marker type for the `id` field
         pub struct id(());
         ///Marker type for the `pinned` field
         pub struct pinned(());
-        ///Marker type for the `value` field
-        pub struct value(());
         ///Marker type for the `type` field
         pub struct r#type(());
     }
@@ -6629,14 +6625,14 @@ pub mod saved_feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct SavedFeedBuilder<'a, S: saved_feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<bool>,
         Option<SavedFeedType<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SavedFeed<'a> {
@@ -6650,9 +6646,9 @@ impl<'a> SavedFeedBuilder<'a, saved_feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SavedFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6667,11 +6663,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SavedFeedBuilder<'a, saved_feed_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SavedFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6686,11 +6682,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> SavedFeedBuilder<'a, saved_feed_state::SetPinned<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SavedFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6705,11 +6701,11 @@ where
         mut self,
         value: impl Into<SavedFeedType<'a>>,
     ) -> SavedFeedBuilder<'a, saved_feed_state::SetType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SavedFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6724,11 +6720,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SavedFeedBuilder<'a, saved_feed_state::SetValue<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SavedFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6736,18 +6732,18 @@ where
 impl<'a, S> SavedFeedBuilder<'a, S>
 where
     S: saved_feed_state::State,
+    S::Value: saved_feed_state::IsSet,
     S::Id: saved_feed_state::IsSet,
     S::Pinned: saved_feed_state::IsSet,
-    S::Value: saved_feed_state::IsSet,
     S::Type: saved_feed_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SavedFeed<'a> {
         SavedFeed {
-            id: self.__unsafe_private_named.0.unwrap(),
-            pinned: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
-            value: self.__unsafe_private_named.3.unwrap(),
+            id: self._fields.0.unwrap(),
+            pinned: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
+            value: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -6757,10 +6753,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> SavedFeed<'a> {
         SavedFeed {
-            id: self.__unsafe_private_named.0.unwrap(),
-            pinned: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
-            value: self.__unsafe_private_named.3.unwrap(),
+            id: self._fields.0.unwrap(),
+            pinned: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
+            value: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -6776,49 +6772,45 @@ pub mod saved_feeds_pref_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Saved;
         type Pinned;
+        type Saved;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Saved = Unset;
         type Pinned = Unset;
-    }
-    ///State transition - sets the `saved` field to Set
-    pub struct SetSaved<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSaved<S> {}
-    impl<S: State> State for SetSaved<S> {
-        type Saved = Set<members::saved>;
-        type Pinned = S::Pinned;
+        type Saved = Unset;
     }
     ///State transition - sets the `pinned` field to Set
     pub struct SetPinned<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPinned<S> {}
     impl<S: State> State for SetPinned<S> {
-        type Saved = S::Saved;
         type Pinned = Set<members::pinned>;
+        type Saved = S::Saved;
+    }
+    ///State transition - sets the `saved` field to Set
+    pub struct SetSaved<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSaved<S> {}
+    impl<S: State> State for SetSaved<S> {
+        type Pinned = S::Pinned;
+        type Saved = Set<members::saved>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `saved` field
-        pub struct saved(());
         ///Marker type for the `pinned` field
         pub struct pinned(());
+        ///Marker type for the `saved` field
+        pub struct saved(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SavedFeedsPrefBuilder<'a, S: saved_feeds_pref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<AtUri<'a>>>,
-        Option<Vec<AtUri<'a>>>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<AtUri<'a>>>, Option<Vec<AtUri<'a>>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SavedFeedsPref<'a> {
@@ -6832,9 +6824,9 @@ impl<'a> SavedFeedsPrefBuilder<'a, saved_feeds_pref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SavedFeedsPrefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6849,11 +6841,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> SavedFeedsPrefBuilder<'a, saved_feeds_pref_state::SetPinned<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SavedFeedsPrefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6868,11 +6860,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> SavedFeedsPrefBuilder<'a, saved_feeds_pref_state::SetSaved<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SavedFeedsPrefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6880,12 +6872,12 @@ where
 impl<'a, S: saved_feeds_pref_state::State> SavedFeedsPrefBuilder<'a, S> {
     /// Set the `timelineIndex` field (optional)
     pub fn timeline_index(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `timelineIndex` field to an Option value (optional)
     pub fn maybe_timeline_index(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -6893,15 +6885,15 @@ impl<'a, S: saved_feeds_pref_state::State> SavedFeedsPrefBuilder<'a, S> {
 impl<'a, S> SavedFeedsPrefBuilder<'a, S>
 where
     S: saved_feeds_pref_state::State,
-    S::Saved: saved_feeds_pref_state::IsSet,
     S::Pinned: saved_feeds_pref_state::IsSet,
+    S::Saved: saved_feeds_pref_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SavedFeedsPref<'a> {
         SavedFeedsPref {
-            pinned: self.__unsafe_private_named.0.unwrap(),
-            saved: self.__unsafe_private_named.1.unwrap(),
-            timeline_index: self.__unsafe_private_named.2,
+            pinned: self._fields.0.unwrap(),
+            saved: self._fields.1.unwrap(),
+            timeline_index: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -6911,9 +6903,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> SavedFeedsPref<'a> {
         SavedFeedsPref {
-            pinned: self.__unsafe_private_named.0.unwrap(),
-            saved: self.__unsafe_private_named.1.unwrap(),
-            timeline_index: self.__unsafe_private_named.2,
+            pinned: self._fields.0.unwrap(),
+            saved: self._fields.1.unwrap(),
+            timeline_index: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -6953,9 +6945,9 @@ pub mod saved_feeds_pref_v2_state {
 
 /// Builder for constructing an instance of this type
 pub struct SavedFeedsPrefV2Builder<'a, S: saved_feeds_pref_v2_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<actor::SavedFeed<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<actor::SavedFeed<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SavedFeedsPrefV2<'a> {
@@ -6969,9 +6961,9 @@ impl<'a> SavedFeedsPrefV2Builder<'a, saved_feeds_pref_v2_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SavedFeedsPrefV2Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6986,11 +6978,11 @@ where
         mut self,
         value: impl Into<Vec<actor::SavedFeed<'a>>>,
     ) -> SavedFeedsPrefV2Builder<'a, saved_feeds_pref_v2_state::SetItems<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SavedFeedsPrefV2Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7003,7 +6995,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SavedFeedsPrefV2<'a> {
         SavedFeedsPrefV2 {
-            items: self.__unsafe_private_named.0.unwrap(),
+            items: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -7013,7 +7005,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> SavedFeedsPrefV2<'a> {
         SavedFeedsPrefV2 {
-            items: self.__unsafe_private_named.0.unwrap(),
+            items: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -7065,8 +7057,8 @@ pub mod status_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct StatusViewBuilder<'a, S: status_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<View<'a>>,
         Option<Datetime>,
@@ -7076,7 +7068,7 @@ pub struct StatusViewBuilder<'a, S: status_view_state::State> {
         Option<StatusViewStatus<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> StatusView<'a> {
@@ -7090,9 +7082,9 @@ impl<'a> StatusViewBuilder<'a, status_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StatusViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7100,12 +7092,12 @@ impl<'a> StatusViewBuilder<'a, status_view_state::Empty> {
 impl<'a, S: status_view_state::State> StatusViewBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -7113,12 +7105,12 @@ impl<'a, S: status_view_state::State> StatusViewBuilder<'a, S> {
 impl<'a, S: status_view_state::State> StatusViewBuilder<'a, S> {
     /// Set the `embed` field (optional)
     pub fn embed(mut self, value: impl Into<Option<View<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `embed` field to an Option value (optional)
     pub fn maybe_embed(mut self, value: Option<View<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -7126,12 +7118,12 @@ impl<'a, S: status_view_state::State> StatusViewBuilder<'a, S> {
 impl<'a, S: status_view_state::State> StatusViewBuilder<'a, S> {
     /// Set the `expiresAt` field (optional)
     pub fn expires_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `expiresAt` field to an Option value (optional)
     pub fn maybe_expires_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -7139,12 +7131,12 @@ impl<'a, S: status_view_state::State> StatusViewBuilder<'a, S> {
 impl<'a, S: status_view_state::State> StatusViewBuilder<'a, S> {
     /// Set the `isActive` field (optional)
     pub fn is_active(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `isActive` field to an Option value (optional)
     pub fn maybe_is_active(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -7152,12 +7144,12 @@ impl<'a, S: status_view_state::State> StatusViewBuilder<'a, S> {
 impl<'a, S: status_view_state::State> StatusViewBuilder<'a, S> {
     /// Set the `isDisabled` field (optional)
     pub fn is_disabled(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `isDisabled` field to an Option value (optional)
     pub fn maybe_is_disabled(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -7172,11 +7164,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> StatusViewBuilder<'a, status_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         StatusViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7191,11 +7183,11 @@ where
         mut self,
         value: impl Into<StatusViewStatus<'a>>,
     ) -> StatusViewBuilder<'a, status_view_state::SetStatus<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         StatusViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7203,12 +7195,12 @@ where
 impl<'a, S: status_view_state::State> StatusViewBuilder<'a, S> {
     /// Set the `uri` field (optional)
     pub fn uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `uri` field to an Option value (optional)
     pub fn maybe_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -7222,14 +7214,14 @@ where
     /// Build the final struct
     pub fn build(self) -> StatusView<'a> {
         StatusView {
-            cid: self.__unsafe_private_named.0,
-            embed: self.__unsafe_private_named.1,
-            expires_at: self.__unsafe_private_named.2,
-            is_active: self.__unsafe_private_named.3,
-            is_disabled: self.__unsafe_private_named.4,
-            record: self.__unsafe_private_named.5.unwrap(),
-            status: self.__unsafe_private_named.6.unwrap(),
-            uri: self.__unsafe_private_named.7,
+            cid: self._fields.0,
+            embed: self._fields.1,
+            expires_at: self._fields.2,
+            is_active: self._fields.3,
+            is_disabled: self._fields.4,
+            record: self._fields.5.unwrap(),
+            status: self._fields.6.unwrap(),
+            uri: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -7239,14 +7231,14 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> StatusView<'a> {
         StatusView {
-            cid: self.__unsafe_private_named.0,
-            embed: self.__unsafe_private_named.1,
-            expires_at: self.__unsafe_private_named.2,
-            is_active: self.__unsafe_private_named.3,
-            is_disabled: self.__unsafe_private_named.4,
-            record: self.__unsafe_private_named.5.unwrap(),
-            status: self.__unsafe_private_named.6.unwrap(),
-            uri: self.__unsafe_private_named.7,
+            cid: self._fields.0,
+            embed: self._fields.1,
+            expires_at: self._fields.2,
+            is_active: self._fields.3,
+            is_disabled: self._fields.4,
+            record: self._fields.5.unwrap(),
+            status: self._fields.6.unwrap(),
+            uri: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
@@ -7275,63 +7267,63 @@ pub mod verification_state_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Verifications;
         type VerifiedStatus;
         type TrustedVerifierStatus;
+        type Verifications;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Verifications = Unset;
         type VerifiedStatus = Unset;
         type TrustedVerifierStatus = Unset;
-    }
-    ///State transition - sets the `verifications` field to Set
-    pub struct SetVerifications<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetVerifications<S> {}
-    impl<S: State> State for SetVerifications<S> {
-        type Verifications = Set<members::verifications>;
-        type VerifiedStatus = S::VerifiedStatus;
-        type TrustedVerifierStatus = S::TrustedVerifierStatus;
+        type Verifications = Unset;
     }
     ///State transition - sets the `verified_status` field to Set
     pub struct SetVerifiedStatus<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetVerifiedStatus<S> {}
     impl<S: State> State for SetVerifiedStatus<S> {
-        type Verifications = S::Verifications;
         type VerifiedStatus = Set<members::verified_status>;
         type TrustedVerifierStatus = S::TrustedVerifierStatus;
+        type Verifications = S::Verifications;
     }
     ///State transition - sets the `trusted_verifier_status` field to Set
     pub struct SetTrustedVerifierStatus<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTrustedVerifierStatus<S> {}
     impl<S: State> State for SetTrustedVerifierStatus<S> {
-        type Verifications = S::Verifications;
         type VerifiedStatus = S::VerifiedStatus;
         type TrustedVerifierStatus = Set<members::trusted_verifier_status>;
+        type Verifications = S::Verifications;
+    }
+    ///State transition - sets the `verifications` field to Set
+    pub struct SetVerifications<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetVerifications<S> {}
+    impl<S: State> State for SetVerifications<S> {
+        type VerifiedStatus = S::VerifiedStatus;
+        type TrustedVerifierStatus = S::TrustedVerifierStatus;
+        type Verifications = Set<members::verifications>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `verifications` field
-        pub struct verifications(());
         ///Marker type for the `verified_status` field
         pub struct verified_status(());
         ///Marker type for the `trusted_verifier_status` field
         pub struct trusted_verifier_status(());
+        ///Marker type for the `verifications` field
+        pub struct verifications(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct VerificationStateBuilder<'a, S: verification_state_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<VerificationStateTrustedVerifierStatus<'a>>,
         Option<Vec<actor::VerificationView<'a>>>,
         Option<VerificationStateVerifiedStatus<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> VerificationState<'a> {
@@ -7345,9 +7337,9 @@ impl<'a> VerificationStateBuilder<'a, verification_state_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VerificationStateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7365,11 +7357,11 @@ where
         'a,
         verification_state_state::SetTrustedVerifierStatus<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         VerificationStateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7384,11 +7376,11 @@ where
         mut self,
         value: impl Into<Vec<actor::VerificationView<'a>>>,
     ) -> VerificationStateBuilder<'a, verification_state_state::SetVerifications<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VerificationStateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7403,11 +7395,11 @@ where
         mut self,
         value: impl Into<VerificationStateVerifiedStatus<'a>>,
     ) -> VerificationStateBuilder<'a, verification_state_state::SetVerifiedStatus<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         VerificationStateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7415,16 +7407,16 @@ where
 impl<'a, S> VerificationStateBuilder<'a, S>
 where
     S: verification_state_state::State,
-    S::Verifications: verification_state_state::IsSet,
     S::VerifiedStatus: verification_state_state::IsSet,
     S::TrustedVerifierStatus: verification_state_state::IsSet,
+    S::Verifications: verification_state_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> VerificationState<'a> {
         VerificationState {
-            trusted_verifier_status: self.__unsafe_private_named.0.unwrap(),
-            verifications: self.__unsafe_private_named.1.unwrap(),
-            verified_status: self.__unsafe_private_named.2.unwrap(),
+            trusted_verifier_status: self._fields.0.unwrap(),
+            verifications: self._fields.1.unwrap(),
+            verified_status: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -7434,9 +7426,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> VerificationState<'a> {
         VerificationState {
-            trusted_verifier_status: self.__unsafe_private_named.0.unwrap(),
-            verifications: self.__unsafe_private_named.1.unwrap(),
-            verified_status: self.__unsafe_private_named.2.unwrap(),
+            trusted_verifier_status: self._fields.0.unwrap(),
+            verifications: self._fields.1.unwrap(),
+            verified_status: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -7452,80 +7444,75 @@ pub mod verification_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type IsValid;
         type Issuer;
         type CreatedAt;
         type Uri;
+        type IsValid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type IsValid = Unset;
         type Issuer = Unset;
         type CreatedAt = Unset;
         type Uri = Unset;
-    }
-    ///State transition - sets the `is_valid` field to Set
-    pub struct SetIsValid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIsValid<S> {}
-    impl<S: State> State for SetIsValid<S> {
-        type IsValid = Set<members::is_valid>;
-        type Issuer = S::Issuer;
-        type CreatedAt = S::CreatedAt;
-        type Uri = S::Uri;
+        type IsValid = Unset;
     }
     ///State transition - sets the `issuer` field to Set
     pub struct SetIssuer<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIssuer<S> {}
     impl<S: State> State for SetIssuer<S> {
-        type IsValid = S::IsValid;
         type Issuer = Set<members::issuer>;
         type CreatedAt = S::CreatedAt;
         type Uri = S::Uri;
+        type IsValid = S::IsValid;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type IsValid = S::IsValid;
         type Issuer = S::Issuer;
         type CreatedAt = Set<members::created_at>;
         type Uri = S::Uri;
+        type IsValid = S::IsValid;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type IsValid = S::IsValid;
         type Issuer = S::Issuer;
         type CreatedAt = S::CreatedAt;
         type Uri = Set<members::uri>;
+        type IsValid = S::IsValid;
+    }
+    ///State transition - sets the `is_valid` field to Set
+    pub struct SetIsValid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIsValid<S> {}
+    impl<S: State> State for SetIsValid<S> {
+        type Issuer = S::Issuer;
+        type CreatedAt = S::CreatedAt;
+        type Uri = S::Uri;
+        type IsValid = Set<members::is_valid>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `is_valid` field
-        pub struct is_valid(());
         ///Marker type for the `issuer` field
         pub struct issuer(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `is_valid` field
+        pub struct is_valid(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct VerificationViewBuilder<'a, S: verification_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<bool>,
-        Option<Did<'a>>,
-        Option<AtUri<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<bool>, Option<Did<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> VerificationView<'a> {
@@ -7539,9 +7526,9 @@ impl<'a> VerificationViewBuilder<'a, verification_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VerificationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7556,11 +7543,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> VerificationViewBuilder<'a, verification_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         VerificationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7575,11 +7562,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> VerificationViewBuilder<'a, verification_view_state::SetIsValid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VerificationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7594,11 +7581,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> VerificationViewBuilder<'a, verification_view_state::SetIssuer<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         VerificationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7613,11 +7600,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> VerificationViewBuilder<'a, verification_view_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         VerificationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7625,18 +7612,18 @@ where
 impl<'a, S> VerificationViewBuilder<'a, S>
 where
     S: verification_view_state::State,
-    S::IsValid: verification_view_state::IsSet,
     S::Issuer: verification_view_state::IsSet,
     S::CreatedAt: verification_view_state::IsSet,
     S::Uri: verification_view_state::IsSet,
+    S::IsValid: verification_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> VerificationView<'a> {
         VerificationView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            is_valid: self.__unsafe_private_named.1.unwrap(),
-            issuer: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            is_valid: self._fields.1.unwrap(),
+            issuer: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -7646,10 +7633,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> VerificationView<'a> {
         VerificationView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            is_valid: self.__unsafe_private_named.1.unwrap(),
-            issuer: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            is_valid: self._fields.1.unwrap(),
+            issuer: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/actor/get_preferences.rs b/crates/jacquard-api/src/app_bsky/actor/get_preferences.rs
index 06cc2c6d..a74ccc84 100644
--- a/crates/jacquard-api/src/app_bsky/actor/get_preferences.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/get_preferences.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/app_bsky/actor/get_profile.rs b/crates/jacquard-api/src/app_bsky/actor/get_profile.rs
index 5f9a4737..7e141929 100644
--- a/crates/jacquard-api/src/app_bsky/actor/get_profile.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/get_profile.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetProfileBuilder<'a, S: get_profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetProfile<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetProfileBuilder<'a, get_profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetProfileBuilder<'a, get_profile_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetProfile<'a> {
         GetProfile {
-            actor: self.__unsafe_private_named.0.unwrap(),
+            actor: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/actor/get_profiles.rs b/crates/jacquard-api/src/app_bsky/actor/get_profiles.rs
index d2b7f387..cda57912 100644
--- a/crates/jacquard-api/src/app_bsky/actor/get_profiles.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/get_profiles.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_profiles_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetProfilesBuilder<'a, S: get_profiles_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<AtIdentifier<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<AtIdentifier<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetProfiles<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetProfilesBuilder<'a, get_profiles_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetProfilesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<Vec<AtIdentifier<'a>>>,
     ) -> GetProfilesBuilder<'a, get_profiles_state::SetActors<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetProfilesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetProfiles<'a> {
         GetProfiles {
-            actors: self.__unsafe_private_named.0.unwrap(),
+            actors: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/actor/get_suggestions.rs b/crates/jacquard-api/src/app_bsky/actor/get_suggestions.rs
index f927e89c..43116924 100644
--- a/crates/jacquard-api/src/app_bsky/actor/get_suggestions.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/get_suggestions.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -92,9 +95,9 @@ pub mod get_suggestions_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSuggestionsBuilder<'a, S: get_suggestions_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSuggestions<'a> {
@@ -108,9 +111,9 @@ impl<'a> GetSuggestionsBuilder<'a, get_suggestions_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSuggestionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -118,12 +121,12 @@ impl<'a> GetSuggestionsBuilder<'a, get_suggestions_state::Empty> {
 impl<'a, S: get_suggestions_state::State> GetSuggestionsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -131,12 +134,12 @@ impl<'a, S: get_suggestions_state::State> GetSuggestionsBuilder<'a, S> {
 impl<'a, S: get_suggestions_state::State> GetSuggestionsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -148,8 +151,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSuggestions<'a> {
         GetSuggestions {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/actor/profile.rs b/crates/jacquard-api/src/app_bsky/actor/profile.rs
index fbc55457..4841d3ff 100644
--- a/crates/jacquard-api/src/app_bsky/actor/profile.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -299,8 +302,8 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<BlobRef<'a>>,
         Option<Datetime>,
@@ -312,7 +315,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -326,20 +329,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -347,12 +339,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -360,12 +352,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -373,12 +365,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -386,12 +378,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -399,12 +391,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -415,7 +407,7 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StrongRef<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `joinedViaStarterPack` field to an Option value (optional)
@@ -423,7 +415,7 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: Option<StrongRef<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -431,12 +423,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -444,12 +436,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `pinnedPost` field (optional)
     pub fn pinned_post(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `pinnedPost` field to an Option value (optional)
     pub fn maybe_pinned_post(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -457,12 +449,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `pronouns` field (optional)
     pub fn pronouns(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `pronouns` field to an Option value (optional)
     pub fn maybe_pronouns(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -470,12 +462,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `website` field (optional)
     pub fn website(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `website` field to an Option value (optional)
     pub fn maybe_website(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -487,16 +479,16 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4,
-            joined_via_starter_pack: self.__unsafe_private_named.5,
-            labels: self.__unsafe_private_named.6,
-            pinned_post: self.__unsafe_private_named.7,
-            pronouns: self.__unsafe_private_named.8,
-            website: self.__unsafe_private_named.9,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            created_at: self._fields.2,
+            description: self._fields.3,
+            display_name: self._fields.4,
+            joined_via_starter_pack: self._fields.5,
+            labels: self._fields.6,
+            pinned_post: self._fields.7,
+            pronouns: self._fields.8,
+            website: self._fields.9,
             extra_data: Default::default(),
         }
     }
@@ -509,16 +501,16 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4,
-            joined_via_starter_pack: self.__unsafe_private_named.5,
-            labels: self.__unsafe_private_named.6,
-            pinned_post: self.__unsafe_private_named.7,
-            pronouns: self.__unsafe_private_named.8,
-            website: self.__unsafe_private_named.9,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            created_at: self._fields.2,
+            description: self._fields.3,
+            display_name: self._fields.4,
+            joined_via_starter_pack: self._fields.5,
+            labels: self._fields.6,
+            pinned_post: self._fields.7,
+            pronouns: self._fields.8,
+            website: self._fields.9,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/actor/put_preferences.rs b/crates/jacquard-api/src/app_bsky/actor/put_preferences.rs
index 2ff80cb3..db5cc33f 100644
--- a/crates/jacquard-api/src/app_bsky/actor/put_preferences.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/put_preferences.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
@@ -81,9 +84,9 @@ pub mod put_preferences_state {
 
 /// Builder for constructing an instance of this type
 pub struct PutPreferencesBuilder<'a, S: put_preferences_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Preferences<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Preferences<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PutPreferences<'a> {
@@ -97,9 +100,9 @@ impl<'a> PutPreferencesBuilder<'a, put_preferences_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PutPreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,11 +117,11 @@ where
         mut self,
         value: impl Into<Preferences<'a>>,
     ) -> PutPreferencesBuilder<'a, put_preferences_state::SetPreferences<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PutPreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -131,7 +134,7 @@ where
     /// Build the final struct
     pub fn build(self) -> PutPreferences<'a> {
         PutPreferences {
-            preferences: self.__unsafe_private_named.0.unwrap(),
+            preferences: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -144,7 +147,7 @@ where
         >,
     ) -> PutPreferences<'a> {
         PutPreferences {
-            preferences: self.__unsafe_private_named.0.unwrap(),
+            preferences: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/actor/search_actors.rs b/crates/jacquard-api/src/app_bsky/actor/search_actors.rs
index 6a6bdaee..85328c00 100644
--- a/crates/jacquard-api/src/app_bsky/actor/search_actors.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/search_actors.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -91,14 +94,9 @@ pub mod search_actors_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchActorsBuilder<'a, S: search_actors_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<i64>,
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchActors<'a> {
@@ -112,9 +110,9 @@ impl<'a> SearchActorsBuilder<'a, search_actors_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchActorsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -122,12 +120,12 @@ impl<'a> SearchActorsBuilder<'a, search_actors_state::Empty> {
 impl<'a, S: search_actors_state::State> SearchActorsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -135,12 +133,12 @@ impl<'a, S: search_actors_state::State> SearchActorsBuilder<'a, S> {
 impl<'a, S: search_actors_state::State> SearchActorsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -148,12 +146,12 @@ impl<'a, S: search_actors_state::State> SearchActorsBuilder<'a, S> {
 impl<'a, S: search_actors_state::State> SearchActorsBuilder<'a, S> {
     /// Set the `q` field (optional)
     pub fn q(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `q` field to an Option value (optional)
     pub fn maybe_q(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -161,12 +159,12 @@ impl<'a, S: search_actors_state::State> SearchActorsBuilder<'a, S> {
 impl<'a, S: search_actors_state::State> SearchActorsBuilder<'a, S> {
     /// Set the `term` field (optional)
     pub fn term(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `term` field to an Option value (optional)
     pub fn maybe_term(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -178,10 +176,10 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchActors<'a> {
         SearchActors {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            q: self.__unsafe_private_named.2,
-            term: self.__unsafe_private_named.3,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            q: self._fields.2,
+            term: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/actor/search_actors_typeahead.rs b/crates/jacquard-api/src/app_bsky/actor/search_actors_typeahead.rs
index 1169e6f4..9251125f 100644
--- a/crates/jacquard-api/src/app_bsky/actor/search_actors_typeahead.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/search_actors_typeahead.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -85,9 +88,9 @@ pub mod search_actors_typeahead_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchActorsTypeaheadBuilder<'a, S: search_actors_typeahead_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchActorsTypeahead<'a> {
@@ -104,9 +107,9 @@ impl<'a> SearchActorsTypeaheadBuilder<'a, search_actors_typeahead_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchActorsTypeaheadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,12 +117,12 @@ impl<'a> SearchActorsTypeaheadBuilder<'a, search_actors_typeahead_state::Empty>
 impl<'a, S: search_actors_typeahead_state::State> SearchActorsTypeaheadBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -127,12 +130,12 @@ impl<'a, S: search_actors_typeahead_state::State> SearchActorsTypeaheadBuilder<'
 impl<'a, S: search_actors_typeahead_state::State> SearchActorsTypeaheadBuilder<'a, S> {
     /// Set the `q` field (optional)
     pub fn q(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `q` field to an Option value (optional)
     pub fn maybe_q(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -140,12 +143,12 @@ impl<'a, S: search_actors_typeahead_state::State> SearchActorsTypeaheadBuilder<'
 impl<'a, S: search_actors_typeahead_state::State> SearchActorsTypeaheadBuilder<'a, S> {
     /// Set the `term` field (optional)
     pub fn term(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `term` field to an Option value (optional)
     pub fn maybe_term(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -157,9 +160,9 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchActorsTypeahead<'a> {
         SearchActorsTypeahead {
-            limit: self.__unsafe_private_named.0,
-            q: self.__unsafe_private_named.1,
-            term: self.__unsafe_private_named.2,
+            limit: self._fields.0,
+            q: self._fields.1,
+            term: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/actor/status.rs b/crates/jacquard-api/src/app_bsky/actor/status.rs
index 89d17fee..bba59635 100644
--- a/crates/jacquard-api/src/app_bsky/actor/status.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/status.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -257,14 +260,14 @@ pub mod status_state {
 
 /// Builder for constructing an instance of this type
 pub struct StatusBuilder<'a, S: status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<i64>,
         Option<ExternalRecord<'a>>,
         Option<StatusStatus<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Status<'a> {
@@ -278,9 +281,9 @@ impl<'a> StatusBuilder<'a, status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -295,11 +298,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StatusBuilder<'a, status_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -307,12 +310,12 @@ where
 impl<'a, S: status_state::State> StatusBuilder<'a, S> {
     /// Set the `durationMinutes` field (optional)
     pub fn duration_minutes(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `durationMinutes` field to an Option value (optional)
     pub fn maybe_duration_minutes(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -320,12 +323,12 @@ impl<'a, S: status_state::State> StatusBuilder<'a, S> {
 impl<'a, S: status_state::State> StatusBuilder<'a, S> {
     /// Set the `embed` field (optional)
     pub fn embed(mut self, value: impl Into<Option<ExternalRecord<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `embed` field to an Option value (optional)
     pub fn maybe_embed(mut self, value: Option<ExternalRecord<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -340,11 +343,11 @@ where
         mut self,
         value: impl Into<StatusStatus<'a>>,
     ) -> StatusBuilder<'a, status_state::SetStatus<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -358,10 +361,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Status<'a> {
         Status {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            duration_minutes: self.__unsafe_private_named.1,
-            embed: self.__unsafe_private_named.2,
-            status: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            duration_minutes: self._fields.1,
+            embed: self._fields.2,
+            status: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -374,10 +377,10 @@ where
         >,
     ) -> Status<'a> {
         Status {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            duration_minutes: self.__unsafe_private_named.1,
-            embed: self.__unsafe_private_named.2,
-            status: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            duration_minutes: self._fields.1,
+            embed: self._fields.2,
+            status: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/ageassurance.rs b/crates/jacquard-api/src/app_bsky/ageassurance.rs
index fd8d72e3..aff8fd3d 100644
--- a/crates/jacquard-api/src/app_bsky/ageassurance.rs
+++ b/crates/jacquard-api/src/app_bsky/ageassurance.rs
@@ -9,7 +9,11 @@ pub mod begin;
 pub mod get_config;
 pub mod get_state;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -845,9 +849,9 @@ pub mod config_state {
 
 /// Builder for constructing an instance of this type
 pub struct ConfigBuilder<'a, S: config_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<ageassurance::ConfigRegion<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<ageassurance::ConfigRegion<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Config<'a> {
@@ -861,9 +865,9 @@ impl<'a> ConfigBuilder<'a, config_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ConfigBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -878,11 +882,11 @@ where
         mut self,
         value: impl Into<Vec<ageassurance::ConfigRegion<'a>>>,
     ) -> ConfigBuilder<'a, config_state::SetRegions<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ConfigBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -895,7 +899,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Config<'a> {
         Config {
-            regions: self.__unsafe_private_named.0.unwrap(),
+            regions: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -908,7 +912,7 @@ where
         >,
     ) -> Config<'a> {
         Config {
-            regions: self.__unsafe_private_named.0.unwrap(),
+            regions: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1524,64 +1528,64 @@ pub mod config_region_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type MinAccessAge;
         type Rules;
         type CountryCode;
-        type MinAccessAge;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type MinAccessAge = Unset;
         type Rules = Unset;
         type CountryCode = Unset;
-        type MinAccessAge = Unset;
+    }
+    ///State transition - sets the `min_access_age` field to Set
+    pub struct SetMinAccessAge<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMinAccessAge<S> {}
+    impl<S: State> State for SetMinAccessAge<S> {
+        type MinAccessAge = Set<members::min_access_age>;
+        type Rules = S::Rules;
+        type CountryCode = S::CountryCode;
     }
     ///State transition - sets the `rules` field to Set
     pub struct SetRules<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRules<S> {}
     impl<S: State> State for SetRules<S> {
+        type MinAccessAge = S::MinAccessAge;
         type Rules = Set<members::rules>;
         type CountryCode = S::CountryCode;
-        type MinAccessAge = S::MinAccessAge;
     }
     ///State transition - sets the `country_code` field to Set
     pub struct SetCountryCode<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCountryCode<S> {}
     impl<S: State> State for SetCountryCode<S> {
-        type Rules = S::Rules;
-        type CountryCode = Set<members::country_code>;
         type MinAccessAge = S::MinAccessAge;
-    }
-    ///State transition - sets the `min_access_age` field to Set
-    pub struct SetMinAccessAge<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMinAccessAge<S> {}
-    impl<S: State> State for SetMinAccessAge<S> {
         type Rules = S::Rules;
-        type CountryCode = S::CountryCode;
-        type MinAccessAge = Set<members::min_access_age>;
+        type CountryCode = Set<members::country_code>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `min_access_age` field
+        pub struct min_access_age(());
         ///Marker type for the `rules` field
         pub struct rules(());
         ///Marker type for the `country_code` field
         pub struct country_code(());
-        ///Marker type for the `min_access_age` field
-        pub struct min_access_age(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ConfigRegionBuilder<'a, S: config_region_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<i64>,
         Option<CowStr<'a>>,
         Option<Vec<ConfigRegionRulesItem<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ConfigRegion<'a> {
@@ -1595,9 +1599,9 @@ impl<'a> ConfigRegionBuilder<'a, config_region_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ConfigRegionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1612,11 +1616,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ConfigRegionBuilder<'a, config_region_state::SetCountryCode<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ConfigRegionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1631,11 +1635,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ConfigRegionBuilder<'a, config_region_state::SetMinAccessAge<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ConfigRegionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1643,12 +1647,12 @@ where
 impl<'a, S: config_region_state::State> ConfigRegionBuilder<'a, S> {
     /// Set the `regionCode` field (optional)
     pub fn region_code(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `regionCode` field to an Option value (optional)
     pub fn maybe_region_code(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1663,11 +1667,11 @@ where
         mut self,
         value: impl Into<Vec<ConfigRegionRulesItem<'a>>>,
     ) -> ConfigRegionBuilder<'a, config_region_state::SetRules<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ConfigRegionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1675,17 +1679,17 @@ where
 impl<'a, S> ConfigRegionBuilder<'a, S>
 where
     S: config_region_state::State,
+    S::MinAccessAge: config_region_state::IsSet,
     S::Rules: config_region_state::IsSet,
     S::CountryCode: config_region_state::IsSet,
-    S::MinAccessAge: config_region_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ConfigRegion<'a> {
         ConfigRegion {
-            country_code: self.__unsafe_private_named.0.unwrap(),
-            min_access_age: self.__unsafe_private_named.1.unwrap(),
-            region_code: self.__unsafe_private_named.2,
-            rules: self.__unsafe_private_named.3.unwrap(),
+            country_code: self._fields.0.unwrap(),
+            min_access_age: self._fields.1.unwrap(),
+            region_code: self._fields.2,
+            rules: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1698,10 +1702,10 @@ where
         >,
     ) -> ConfigRegion<'a> {
         ConfigRegion {
-            country_code: self.__unsafe_private_named.0.unwrap(),
-            min_access_age: self.__unsafe_private_named.1.unwrap(),
-            region_code: self.__unsafe_private_named.2,
-            rules: self.__unsafe_private_named.3.unwrap(),
+            country_code: self._fields.0.unwrap(),
+            min_access_age: self._fields.1.unwrap(),
+            region_code: self._fields.2,
+            rules: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1744,9 +1748,9 @@ pub struct ConfigRegionRuleDefaultBuilder<
     'a,
     S: config_region_rule_default_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ageassurance::Access<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ageassurance::Access<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ConfigRegionRuleDefault<'a> {
@@ -1763,9 +1767,9 @@ impl<'a> ConfigRegionRuleDefaultBuilder<'a, config_region_rule_default_state::Em
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ConfigRegionRuleDefaultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1783,11 +1787,11 @@ where
         'a,
         config_region_rule_default_state::SetAccess<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ConfigRegionRuleDefaultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1800,7 +1804,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ConfigRegionRuleDefault<'a> {
         ConfigRegionRuleDefault {
-            access: self.__unsafe_private_named.0.unwrap(),
+            access: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1813,7 +1817,7 @@ where
         >,
     ) -> ConfigRegionRuleDefault<'a> {
         ConfigRegionRuleDefault {
-            access: self.__unsafe_private_named.0.unwrap(),
+            access: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1829,37 +1833,37 @@ pub mod config_region_rule_if_account_newer_than_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Date;
         type Access;
+        type Date;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Date = Unset;
         type Access = Unset;
-    }
-    ///State transition - sets the `date` field to Set
-    pub struct SetDate<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDate<S> {}
-    impl<S: State> State for SetDate<S> {
-        type Date = Set<members::date>;
-        type Access = S::Access;
+        type Date = Unset;
     }
     ///State transition - sets the `access` field to Set
     pub struct SetAccess<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAccess<S> {}
     impl<S: State> State for SetAccess<S> {
-        type Date = S::Date;
         type Access = Set<members::access>;
+        type Date = S::Date;
+    }
+    ///State transition - sets the `date` field to Set
+    pub struct SetDate<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDate<S> {}
+    impl<S: State> State for SetDate<S> {
+        type Access = S::Access;
+        type Date = Set<members::date>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `date` field
-        pub struct date(());
         ///Marker type for the `access` field
         pub struct access(());
+        ///Marker type for the `date` field
+        pub struct date(());
     }
 }
 
@@ -1868,9 +1872,9 @@ pub struct ConfigRegionRuleIfAccountNewerThanBuilder<
     'a,
     S: config_region_rule_if_account_newer_than_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ageassurance::Access<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ageassurance::Access<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ConfigRegionRuleIfAccountNewerThan<'a> {
@@ -1892,9 +1896,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ConfigRegionRuleIfAccountNewerThanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1912,11 +1916,11 @@ where
         'a,
         config_region_rule_if_account_newer_than_state::SetAccess<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ConfigRegionRuleIfAccountNewerThanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1934,11 +1938,11 @@ where
         'a,
         config_region_rule_if_account_newer_than_state::SetDate<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ConfigRegionRuleIfAccountNewerThanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1946,14 +1950,14 @@ where
 impl<'a, S> ConfigRegionRuleIfAccountNewerThanBuilder<'a, S>
 where
     S: config_region_rule_if_account_newer_than_state::State,
-    S::Date: config_region_rule_if_account_newer_than_state::IsSet,
     S::Access: config_region_rule_if_account_newer_than_state::IsSet,
+    S::Date: config_region_rule_if_account_newer_than_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ConfigRegionRuleIfAccountNewerThan<'a> {
         ConfigRegionRuleIfAccountNewerThan {
-            access: self.__unsafe_private_named.0.unwrap(),
-            date: self.__unsafe_private_named.1.unwrap(),
+            access: self._fields.0.unwrap(),
+            date: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1966,8 +1970,8 @@ where
         >,
     ) -> ConfigRegionRuleIfAccountNewerThan<'a> {
         ConfigRegionRuleIfAccountNewerThan {
-            access: self.__unsafe_private_named.0.unwrap(),
-            date: self.__unsafe_private_named.1.unwrap(),
+            access: self._fields.0.unwrap(),
+            date: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1983,37 +1987,37 @@ pub mod config_region_rule_if_account_older_than_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Date;
         type Access;
+        type Date;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Date = Unset;
         type Access = Unset;
-    }
-    ///State transition - sets the `date` field to Set
-    pub struct SetDate<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDate<S> {}
-    impl<S: State> State for SetDate<S> {
-        type Date = Set<members::date>;
-        type Access = S::Access;
+        type Date = Unset;
     }
     ///State transition - sets the `access` field to Set
     pub struct SetAccess<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAccess<S> {}
     impl<S: State> State for SetAccess<S> {
-        type Date = S::Date;
         type Access = Set<members::access>;
+        type Date = S::Date;
+    }
+    ///State transition - sets the `date` field to Set
+    pub struct SetDate<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDate<S> {}
+    impl<S: State> State for SetDate<S> {
+        type Access = S::Access;
+        type Date = Set<members::date>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `date` field
-        pub struct date(());
         ///Marker type for the `access` field
         pub struct access(());
+        ///Marker type for the `date` field
+        pub struct date(());
     }
 }
 
@@ -2022,9 +2026,9 @@ pub struct ConfigRegionRuleIfAccountOlderThanBuilder<
     'a,
     S: config_region_rule_if_account_older_than_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ageassurance::Access<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ageassurance::Access<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ConfigRegionRuleIfAccountOlderThan<'a> {
@@ -2046,9 +2050,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ConfigRegionRuleIfAccountOlderThanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2066,11 +2070,11 @@ where
         'a,
         config_region_rule_if_account_older_than_state::SetAccess<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ConfigRegionRuleIfAccountOlderThanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2088,11 +2092,11 @@ where
         'a,
         config_region_rule_if_account_older_than_state::SetDate<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ConfigRegionRuleIfAccountOlderThanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2100,14 +2104,14 @@ where
 impl<'a, S> ConfigRegionRuleIfAccountOlderThanBuilder<'a, S>
 where
     S: config_region_rule_if_account_older_than_state::State,
-    S::Date: config_region_rule_if_account_older_than_state::IsSet,
     S::Access: config_region_rule_if_account_older_than_state::IsSet,
+    S::Date: config_region_rule_if_account_older_than_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ConfigRegionRuleIfAccountOlderThan<'a> {
         ConfigRegionRuleIfAccountOlderThan {
-            access: self.__unsafe_private_named.0.unwrap(),
-            date: self.__unsafe_private_named.1.unwrap(),
+            access: self._fields.0.unwrap(),
+            date: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2120,8 +2124,8 @@ where
         >,
     ) -> ConfigRegionRuleIfAccountOlderThan<'a> {
         ConfigRegionRuleIfAccountOlderThan {
-            access: self.__unsafe_private_named.0.unwrap(),
-            date: self.__unsafe_private_named.1.unwrap(),
+            access: self._fields.0.unwrap(),
+            date: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2176,9 +2180,9 @@ pub struct ConfigRegionRuleIfAssuredOverAgeBuilder<
     'a,
     S: config_region_rule_if_assured_over_age_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ageassurance::Access<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ageassurance::Access<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ConfigRegionRuleIfAssuredOverAge<'a> {
@@ -2200,9 +2204,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ConfigRegionRuleIfAssuredOverAgeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2220,11 +2224,11 @@ where
         'a,
         config_region_rule_if_assured_over_age_state::SetAccess<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ConfigRegionRuleIfAssuredOverAgeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2242,11 +2246,11 @@ where
         'a,
         config_region_rule_if_assured_over_age_state::SetAge<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ConfigRegionRuleIfAssuredOverAgeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2260,8 +2264,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ConfigRegionRuleIfAssuredOverAge<'a> {
         ConfigRegionRuleIfAssuredOverAge {
-            access: self.__unsafe_private_named.0.unwrap(),
-            age: self.__unsafe_private_named.1.unwrap(),
+            access: self._fields.0.unwrap(),
+            age: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2274,8 +2278,8 @@ where
         >,
     ) -> ConfigRegionRuleIfAssuredOverAge<'a> {
         ConfigRegionRuleIfAssuredOverAge {
-            access: self.__unsafe_private_named.0.unwrap(),
-            age: self.__unsafe_private_named.1.unwrap(),
+            access: self._fields.0.unwrap(),
+            age: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2330,9 +2334,9 @@ pub struct ConfigRegionRuleIfAssuredUnderAgeBuilder<
     'a,
     S: config_region_rule_if_assured_under_age_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ageassurance::Access<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ageassurance::Access<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ConfigRegionRuleIfAssuredUnderAge<'a> {
@@ -2354,9 +2358,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ConfigRegionRuleIfAssuredUnderAgeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2374,11 +2378,11 @@ where
         'a,
         config_region_rule_if_assured_under_age_state::SetAccess<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ConfigRegionRuleIfAssuredUnderAgeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2396,11 +2400,11 @@ where
         'a,
         config_region_rule_if_assured_under_age_state::SetAge<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ConfigRegionRuleIfAssuredUnderAgeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2414,8 +2418,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ConfigRegionRuleIfAssuredUnderAge<'a> {
         ConfigRegionRuleIfAssuredUnderAge {
-            access: self.__unsafe_private_named.0.unwrap(),
-            age: self.__unsafe_private_named.1.unwrap(),
+            access: self._fields.0.unwrap(),
+            age: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2428,8 +2432,8 @@ where
         >,
     ) -> ConfigRegionRuleIfAssuredUnderAge<'a> {
         ConfigRegionRuleIfAssuredUnderAge {
-            access: self.__unsafe_private_named.0.unwrap(),
-            age: self.__unsafe_private_named.1.unwrap(),
+            access: self._fields.0.unwrap(),
+            age: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2484,9 +2488,9 @@ pub struct ConfigRegionRuleIfDeclaredOverAgeBuilder<
     'a,
     S: config_region_rule_if_declared_over_age_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ageassurance::Access<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ageassurance::Access<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ConfigRegionRuleIfDeclaredOverAge<'a> {
@@ -2508,9 +2512,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ConfigRegionRuleIfDeclaredOverAgeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2528,11 +2532,11 @@ where
         'a,
         config_region_rule_if_declared_over_age_state::SetAccess<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ConfigRegionRuleIfDeclaredOverAgeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2550,11 +2554,11 @@ where
         'a,
         config_region_rule_if_declared_over_age_state::SetAge<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ConfigRegionRuleIfDeclaredOverAgeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2568,8 +2572,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ConfigRegionRuleIfDeclaredOverAge<'a> {
         ConfigRegionRuleIfDeclaredOverAge {
-            access: self.__unsafe_private_named.0.unwrap(),
-            age: self.__unsafe_private_named.1.unwrap(),
+            access: self._fields.0.unwrap(),
+            age: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2582,8 +2586,8 @@ where
         >,
     ) -> ConfigRegionRuleIfDeclaredOverAge<'a> {
         ConfigRegionRuleIfDeclaredOverAge {
-            access: self.__unsafe_private_named.0.unwrap(),
-            age: self.__unsafe_private_named.1.unwrap(),
+            access: self._fields.0.unwrap(),
+            age: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2599,37 +2603,37 @@ pub mod config_region_rule_if_declared_under_age_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Age;
         type Access;
+        type Age;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Age = Unset;
         type Access = Unset;
-    }
-    ///State transition - sets the `age` field to Set
-    pub struct SetAge<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAge<S> {}
-    impl<S: State> State for SetAge<S> {
-        type Age = Set<members::age>;
-        type Access = S::Access;
+        type Age = Unset;
     }
     ///State transition - sets the `access` field to Set
     pub struct SetAccess<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAccess<S> {}
     impl<S: State> State for SetAccess<S> {
-        type Age = S::Age;
         type Access = Set<members::access>;
+        type Age = S::Age;
+    }
+    ///State transition - sets the `age` field to Set
+    pub struct SetAge<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAge<S> {}
+    impl<S: State> State for SetAge<S> {
+        type Access = S::Access;
+        type Age = Set<members::age>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `age` field
-        pub struct age(());
         ///Marker type for the `access` field
         pub struct access(());
+        ///Marker type for the `age` field
+        pub struct age(());
     }
 }
 
@@ -2638,9 +2642,9 @@ pub struct ConfigRegionRuleIfDeclaredUnderAgeBuilder<
     'a,
     S: config_region_rule_if_declared_under_age_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ageassurance::Access<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ageassurance::Access<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ConfigRegionRuleIfDeclaredUnderAge<'a> {
@@ -2662,9 +2666,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ConfigRegionRuleIfDeclaredUnderAgeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2682,11 +2686,11 @@ where
         'a,
         config_region_rule_if_declared_under_age_state::SetAccess<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ConfigRegionRuleIfDeclaredUnderAgeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2704,11 +2708,11 @@ where
         'a,
         config_region_rule_if_declared_under_age_state::SetAge<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ConfigRegionRuleIfDeclaredUnderAgeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2716,14 +2720,14 @@ where
 impl<'a, S> ConfigRegionRuleIfDeclaredUnderAgeBuilder<'a, S>
 where
     S: config_region_rule_if_declared_under_age_state::State,
-    S::Age: config_region_rule_if_declared_under_age_state::IsSet,
     S::Access: config_region_rule_if_declared_under_age_state::IsSet,
+    S::Age: config_region_rule_if_declared_under_age_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ConfigRegionRuleIfDeclaredUnderAge<'a> {
         ConfigRegionRuleIfDeclaredUnderAge {
-            access: self.__unsafe_private_named.0.unwrap(),
-            age: self.__unsafe_private_named.1.unwrap(),
+            access: self._fields.0.unwrap(),
+            age: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2736,8 +2740,8 @@ where
         >,
     ) -> ConfigRegionRuleIfDeclaredUnderAge<'a> {
         ConfigRegionRuleIfDeclaredUnderAge {
-            access: self.__unsafe_private_named.0.unwrap(),
-            age: self.__unsafe_private_named.1.unwrap(),
+            access: self._fields.0.unwrap(),
+            age: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2753,92 +2757,92 @@ pub mod event_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type CreatedAt;
+        type Access;
         type AttemptId;
         type CountryCode;
-        type CreatedAt;
         type Status;
-        type Access;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type CreatedAt = Unset;
+        type Access = Unset;
         type AttemptId = Unset;
         type CountryCode = Unset;
-        type CreatedAt = Unset;
         type Status = Unset;
-        type Access = Unset;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type Access = S::Access;
+        type AttemptId = S::AttemptId;
+        type CountryCode = S::CountryCode;
+        type Status = S::Status;
+    }
+    ///State transition - sets the `access` field to Set
+    pub struct SetAccess<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAccess<S> {}
+    impl<S: State> State for SetAccess<S> {
+        type CreatedAt = S::CreatedAt;
+        type Access = Set<members::access>;
+        type AttemptId = S::AttemptId;
+        type CountryCode = S::CountryCode;
+        type Status = S::Status;
     }
     ///State transition - sets the `attempt_id` field to Set
     pub struct SetAttemptId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAttemptId<S> {}
     impl<S: State> State for SetAttemptId<S> {
+        type CreatedAt = S::CreatedAt;
+        type Access = S::Access;
         type AttemptId = Set<members::attempt_id>;
         type CountryCode = S::CountryCode;
-        type CreatedAt = S::CreatedAt;
         type Status = S::Status;
-        type Access = S::Access;
     }
     ///State transition - sets the `country_code` field to Set
     pub struct SetCountryCode<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCountryCode<S> {}
     impl<S: State> State for SetCountryCode<S> {
-        type AttemptId = S::AttemptId;
-        type CountryCode = Set<members::country_code>;
         type CreatedAt = S::CreatedAt;
-        type Status = S::Status;
         type Access = S::Access;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type AttemptId = S::AttemptId;
-        type CountryCode = S::CountryCode;
-        type CreatedAt = Set<members::created_at>;
+        type CountryCode = Set<members::country_code>;
         type Status = S::Status;
-        type Access = S::Access;
     }
     ///State transition - sets the `status` field to Set
     pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStatus<S> {}
     impl<S: State> State for SetStatus<S> {
-        type AttemptId = S::AttemptId;
-        type CountryCode = S::CountryCode;
         type CreatedAt = S::CreatedAt;
-        type Status = Set<members::status>;
         type Access = S::Access;
-    }
-    ///State transition - sets the `access` field to Set
-    pub struct SetAccess<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAccess<S> {}
-    impl<S: State> State for SetAccess<S> {
         type AttemptId = S::AttemptId;
         type CountryCode = S::CountryCode;
-        type CreatedAt = S::CreatedAt;
-        type Status = S::Status;
-        type Access = Set<members::access>;
+        type Status = Set<members::status>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `access` field
+        pub struct access(());
         ///Marker type for the `attempt_id` field
         pub struct attempt_id(());
         ///Marker type for the `country_code` field
         pub struct country_code(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `status` field
         pub struct status(());
-        ///Marker type for the `access` field
-        pub struct access(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EventBuilder<'a, S: event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<EventAccess<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -2851,7 +2855,7 @@ pub struct EventBuilder<'a, S: event_state::State> {
         Option<CowStr<'a>>,
         Option<EventStatus<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Event<'a> {
@@ -2865,21 +2869,9 @@ impl<'a> EventBuilder<'a, event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2894,11 +2886,11 @@ where
         mut self,
         value: impl Into<EventAccess<'a>>,
     ) -> EventBuilder<'a, event_state::SetAccess<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2913,11 +2905,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EventBuilder<'a, event_state::SetAttemptId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2925,12 +2917,12 @@ where
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `completeIp` field (optional)
     pub fn complete_ip(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `completeIp` field to an Option value (optional)
     pub fn maybe_complete_ip(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -2938,12 +2930,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `completeUa` field (optional)
     pub fn complete_ua(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `completeUa` field to an Option value (optional)
     pub fn maybe_complete_ua(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -2958,11 +2950,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EventBuilder<'a, event_state::SetCountryCode<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2977,11 +2969,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EventBuilder<'a, event_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2989,12 +2981,12 @@ where
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `email` field (optional)
     pub fn email(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `email` field to an Option value (optional)
     pub fn maybe_email(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -3002,12 +2994,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `initIp` field (optional)
     pub fn init_ip(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `initIp` field to an Option value (optional)
     pub fn maybe_init_ip(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -3015,12 +3007,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `initUa` field (optional)
     pub fn init_ua(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `initUa` field to an Option value (optional)
     pub fn maybe_init_ua(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -3028,12 +3020,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `regionCode` field (optional)
     pub fn region_code(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `regionCode` field to an Option value (optional)
     pub fn maybe_region_code(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -3048,11 +3040,11 @@ where
         mut self,
         value: impl Into<EventStatus<'a>>,
     ) -> EventBuilder<'a, event_state::SetStatus<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3060,26 +3052,26 @@ where
 impl<'a, S> EventBuilder<'a, S>
 where
     S: event_state::State,
+    S::CreatedAt: event_state::IsSet,
+    S::Access: event_state::IsSet,
     S::AttemptId: event_state::IsSet,
     S::CountryCode: event_state::IsSet,
-    S::CreatedAt: event_state::IsSet,
     S::Status: event_state::IsSet,
-    S::Access: event_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Event<'a> {
         Event {
-            access: self.__unsafe_private_named.0.unwrap(),
-            attempt_id: self.__unsafe_private_named.1.unwrap(),
-            complete_ip: self.__unsafe_private_named.2,
-            complete_ua: self.__unsafe_private_named.3,
-            country_code: self.__unsafe_private_named.4.unwrap(),
-            created_at: self.__unsafe_private_named.5.unwrap(),
-            email: self.__unsafe_private_named.6,
-            init_ip: self.__unsafe_private_named.7,
-            init_ua: self.__unsafe_private_named.8,
-            region_code: self.__unsafe_private_named.9,
-            status: self.__unsafe_private_named.10.unwrap(),
+            access: self._fields.0.unwrap(),
+            attempt_id: self._fields.1.unwrap(),
+            complete_ip: self._fields.2,
+            complete_ua: self._fields.3,
+            country_code: self._fields.4.unwrap(),
+            created_at: self._fields.5.unwrap(),
+            email: self._fields.6,
+            init_ip: self._fields.7,
+            init_ua: self._fields.8,
+            region_code: self._fields.9,
+            status: self._fields.10.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3092,17 +3084,17 @@ where
         >,
     ) -> Event<'a> {
         Event {
-            access: self.__unsafe_private_named.0.unwrap(),
-            attempt_id: self.__unsafe_private_named.1.unwrap(),
-            complete_ip: self.__unsafe_private_named.2,
-            complete_ua: self.__unsafe_private_named.3,
-            country_code: self.__unsafe_private_named.4.unwrap(),
-            created_at: self.__unsafe_private_named.5.unwrap(),
-            email: self.__unsafe_private_named.6,
-            init_ip: self.__unsafe_private_named.7,
-            init_ua: self.__unsafe_private_named.8,
-            region_code: self.__unsafe_private_named.9,
-            status: self.__unsafe_private_named.10.unwrap(),
+            access: self._fields.0.unwrap(),
+            attempt_id: self._fields.1.unwrap(),
+            complete_ip: self._fields.2,
+            complete_ua: self._fields.3,
+            country_code: self._fields.4.unwrap(),
+            created_at: self._fields.5.unwrap(),
+            email: self._fields.6,
+            init_ip: self._fields.7,
+            init_ua: self._fields.8,
+            region_code: self._fields.9,
+            status: self._fields.10.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -3154,13 +3146,13 @@ pub mod state_state {
 
 /// Builder for constructing an instance of this type
 pub struct StateBuilder<'a, S: state_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ageassurance::Access<'a>>,
         Option<Datetime>,
         Option<ageassurance::Status<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> State<'a> {
@@ -3174,9 +3166,9 @@ impl<'a> StateBuilder<'a, state_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3191,11 +3183,11 @@ where
         mut self,
         value: impl Into<ageassurance::Access<'a>>,
     ) -> StateBuilder<'a, state_state::SetAccess<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3203,12 +3195,12 @@ where
 impl<'a, S: state_state::State> StateBuilder<'a, S> {
     /// Set the `lastInitiatedAt` field (optional)
     pub fn last_initiated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `lastInitiatedAt` field to an Option value (optional)
     pub fn maybe_last_initiated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3223,11 +3215,11 @@ where
         mut self,
         value: impl Into<ageassurance::Status<'a>>,
     ) -> StateBuilder<'a, state_state::SetStatus<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         StateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3241,9 +3233,9 @@ where
     /// Build the final struct
     pub fn build(self) -> State<'a> {
         State {
-            access: self.__unsafe_private_named.0.unwrap(),
-            last_initiated_at: self.__unsafe_private_named.1,
-            status: self.__unsafe_private_named.2.unwrap(),
+            access: self._fields.0.unwrap(),
+            last_initiated_at: self._fields.1,
+            status: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3256,9 +3248,9 @@ where
         >,
     ) -> State<'a> {
         State {
-            access: self.__unsafe_private_named.0.unwrap(),
-            last_initiated_at: self.__unsafe_private_named.1,
-            status: self.__unsafe_private_named.2.unwrap(),
+            access: self._fields.0.unwrap(),
+            last_initiated_at: self._fields.1,
+            status: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/ageassurance/begin.rs b/crates/jacquard-api/src/app_bsky/ageassurance/begin.rs
index a5086620..d2a09f65 100644
--- a/crates/jacquard-api/src/app_bsky/ageassurance/begin.rs
+++ b/crates/jacquard-api/src/app_bsky/ageassurance/begin.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/app_bsky/ageassurance/get_config.rs b/crates/jacquard-api/src/app_bsky/ageassurance/get_config.rs
index 886e8963..6ae8c453 100644
--- a/crates/jacquard-api/src/app_bsky/ageassurance/get_config.rs
+++ b/crates/jacquard-api/src/app_bsky/ageassurance/get_config.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::IntoStatic;
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/app_bsky/ageassurance/get_state.rs b/crates/jacquard-api/src/app_bsky/ageassurance/get_state.rs
index 89dea1c6..5f918a98 100644
--- a/crates/jacquard-api/src/app_bsky/ageassurance/get_state.rs
+++ b/crates/jacquard-api/src/app_bsky/ageassurance/get_state.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -92,9 +95,9 @@ pub mod get_state_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetStateBuilder<'a, S: get_state_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetState<'a> {
@@ -108,9 +111,9 @@ impl<'a> GetStateBuilder<'a, get_state_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetStateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -125,11 +128,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetStateBuilder<'a, get_state_state::SetCountryCode<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetStateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,12 +140,12 @@ where
 impl<'a, S: get_state_state::State> GetStateBuilder<'a, S> {
     /// Set the `regionCode` field (optional)
     pub fn region_code(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `regionCode` field to an Option value (optional)
     pub fn maybe_region_code(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -155,8 +158,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetState<'a> {
         GetState {
-            country_code: self.__unsafe_private_named.0.unwrap(),
-            region_code: self.__unsafe_private_named.1,
+            country_code: self._fields.0.unwrap(),
+            region_code: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/bookmark.rs b/crates/jacquard-api/src/app_bsky/bookmark.rs
index da1903e5..d02db9d6 100644
--- a/crates/jacquard-api/src/app_bsky/bookmark.rs
+++ b/crates/jacquard-api/src/app_bsky/bookmark.rs
@@ -9,7 +9,11 @@ pub mod create_bookmark;
 pub mod delete_bookmark;
 pub mod get_bookmarks;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -129,9 +133,9 @@ pub mod bookmark_state {
 
 /// Builder for constructing an instance of this type
 pub struct BookmarkBuilder<'a, S: bookmark_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Bookmark<'a> {
@@ -145,9 +149,9 @@ impl<'a> BookmarkBuilder<'a, bookmark_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -162,11 +166,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> BookmarkBuilder<'a, bookmark_state::SetSubject<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,7 +183,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Bookmark<'a> {
         Bookmark {
-            subject: self.__unsafe_private_named.0.unwrap(),
+            subject: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -192,7 +196,7 @@ where
         >,
     ) -> Bookmark<'a> {
         Bookmark {
-            subject: self.__unsafe_private_named.0.unwrap(),
+            subject: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -287,49 +291,45 @@ pub mod bookmark_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type Item;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type Item = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type Item = S::Item;
+        type Subject = Unset;
     }
     ///State transition - sets the `item` field to Set
     pub struct SetItem<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetItem<S> {}
     impl<S: State> State for SetItem<S> {
-        type Subject = S::Subject;
         type Item = Set<members::item>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type Item = S::Item;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `item` field
         pub struct item(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BookmarkViewBuilder<'a, S: bookmark_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<BookmarkViewItem<'a>>,
-        Option<StrongRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<BookmarkViewItem<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BookmarkView<'a> {
@@ -343,9 +343,9 @@ impl<'a> BookmarkViewBuilder<'a, bookmark_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BookmarkViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -353,12 +353,12 @@ impl<'a> BookmarkViewBuilder<'a, bookmark_view_state::Empty> {
 impl<'a, S: bookmark_view_state::State> BookmarkViewBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -373,11 +373,11 @@ where
         mut self,
         value: impl Into<BookmarkViewItem<'a>>,
     ) -> BookmarkViewBuilder<'a, bookmark_view_state::SetItem<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BookmarkViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -392,11 +392,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> BookmarkViewBuilder<'a, bookmark_view_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BookmarkViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -404,15 +404,15 @@ where
 impl<'a, S> BookmarkViewBuilder<'a, S>
 where
     S: bookmark_view_state::State,
-    S::Subject: bookmark_view_state::IsSet,
     S::Item: bookmark_view_state::IsSet,
+    S::Subject: bookmark_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> BookmarkView<'a> {
         BookmarkView {
-            created_at: self.__unsafe_private_named.0,
-            item: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0,
+            item: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -425,9 +425,9 @@ where
         >,
     ) -> BookmarkView<'a> {
         BookmarkView {
-            created_at: self.__unsafe_private_named.0,
-            item: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0,
+            item: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/bookmark/create_bookmark.rs b/crates/jacquard-api/src/app_bsky/bookmark/create_bookmark.rs
index e61f6a28..ecdd9606 100644
--- a/crates/jacquard-api/src/app_bsky/bookmark/create_bookmark.rs
+++ b/crates/jacquard-api/src/app_bsky/bookmark/create_bookmark.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{AtUri, Cid};
@@ -133,9 +136,9 @@ pub mod create_bookmark_state {
 
 /// Builder for constructing an instance of this type
 pub struct CreateBookmarkBuilder<'a, S: create_bookmark_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CreateBookmark<'a> {
@@ -149,9 +152,9 @@ impl<'a> CreateBookmarkBuilder<'a, create_bookmark_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreateBookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -166,11 +169,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> CreateBookmarkBuilder<'a, create_bookmark_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CreateBookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -185,11 +188,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CreateBookmarkBuilder<'a, create_bookmark_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CreateBookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,8 +206,8 @@ where
     /// Build the final struct
     pub fn build(self) -> CreateBookmark<'a> {
         CreateBookmark {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -217,8 +220,8 @@ where
         >,
     ) -> CreateBookmark<'a> {
         CreateBookmark {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/bookmark/delete_bookmark.rs b/crates/jacquard-api/src/app_bsky/bookmark/delete_bookmark.rs
index 9a7c1078..c545e804 100644
--- a/crates/jacquard-api/src/app_bsky/bookmark/delete_bookmark.rs
+++ b/crates/jacquard-api/src/app_bsky/bookmark/delete_bookmark.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -119,9 +122,9 @@ pub mod delete_bookmark_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeleteBookmarkBuilder<'a, S: delete_bookmark_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeleteBookmark<'a> {
@@ -135,9 +138,9 @@ impl<'a> DeleteBookmarkBuilder<'a, delete_bookmark_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteBookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -152,11 +155,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> DeleteBookmarkBuilder<'a, delete_bookmark_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeleteBookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -169,7 +172,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DeleteBookmark<'a> {
         DeleteBookmark {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -182,7 +185,7 @@ where
         >,
     ) -> DeleteBookmark<'a> {
         DeleteBookmark {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/bookmark/get_bookmarks.rs b/crates/jacquard-api/src/app_bsky/bookmark/get_bookmarks.rs
index 099af345..ee6257b2 100644
--- a/crates/jacquard-api/src/app_bsky/bookmark/get_bookmarks.rs
+++ b/crates/jacquard-api/src/app_bsky/bookmark/get_bookmarks.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -85,9 +88,9 @@ pub mod get_bookmarks_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetBookmarksBuilder<'a, S: get_bookmarks_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetBookmarks<'a> {
@@ -101,9 +104,9 @@ impl<'a> GetBookmarksBuilder<'a, get_bookmarks_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetBookmarksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -111,12 +114,12 @@ impl<'a> GetBookmarksBuilder<'a, get_bookmarks_state::Empty> {
 impl<'a, S: get_bookmarks_state::State> GetBookmarksBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -124,12 +127,12 @@ impl<'a, S: get_bookmarks_state::State> GetBookmarksBuilder<'a, S> {
 impl<'a, S: get_bookmarks_state::State> GetBookmarksBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -141,8 +144,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetBookmarks<'a> {
         GetBookmarks {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/contact.rs b/crates/jacquard-api/src/app_bsky/contact.rs
index e44a5fff..57710555 100644
--- a/crates/jacquard-api/src/app_bsky/contact.rs
+++ b/crates/jacquard-api/src/app_bsky/contact.rs
@@ -14,7 +14,11 @@ pub mod send_notification;
 pub mod start_phone_verification;
 pub mod verify_phone;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -187,9 +191,9 @@ pub mod match_and_contact_index_state {
 
 /// Builder for constructing an instance of this type
 pub struct MatchAndContactIndexBuilder<'a, S: match_and_contact_index_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<ProfileView<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<ProfileView<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MatchAndContactIndex<'a> {
@@ -206,9 +210,9 @@ impl<'a> MatchAndContactIndexBuilder<'a, match_and_contact_index_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MatchAndContactIndexBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -226,11 +230,11 @@ where
         'a,
         match_and_contact_index_state::SetContactIndex<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MatchAndContactIndexBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -245,11 +249,11 @@ where
         mut self,
         value: impl Into<ProfileView<'a>>,
     ) -> MatchAndContactIndexBuilder<'a, match_and_contact_index_state::SetMatch<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MatchAndContactIndexBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -263,8 +267,8 @@ where
     /// Build the final struct
     pub fn build(self) -> MatchAndContactIndex<'a> {
         MatchAndContactIndex {
-            contact_index: self.__unsafe_private_named.0.unwrap(),
-            r#match: self.__unsafe_private_named.1.unwrap(),
+            contact_index: self._fields.0.unwrap(),
+            r#match: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -277,8 +281,8 @@ where
         >,
     ) -> MatchAndContactIndex<'a> {
         MatchAndContactIndex {
-            contact_index: self.__unsafe_private_named.0.unwrap(),
-            r#match: self.__unsafe_private_named.1.unwrap(),
+            contact_index: self._fields.0.unwrap(),
+            r#match: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -464,9 +468,9 @@ pub mod notification_state {
 
 /// Builder for constructing an instance of this type
 pub struct NotificationBuilder<'a, S: notification_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Notification<'a> {
@@ -480,9 +484,9 @@ impl<'a> NotificationBuilder<'a, notification_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -497,11 +501,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> NotificationBuilder<'a, notification_state::SetFrom<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -516,11 +520,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> NotificationBuilder<'a, notification_state::SetTo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -534,8 +538,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Notification<'a> {
         Notification {
-            from: self.__unsafe_private_named.0.unwrap(),
-            to: self.__unsafe_private_named.1.unwrap(),
+            from: self._fields.0.unwrap(),
+            to: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -548,8 +552,8 @@ where
         >,
     ) -> Notification<'a> {
         Notification {
-            from: self.__unsafe_private_named.0.unwrap(),
-            to: self.__unsafe_private_named.1.unwrap(),
+            from: self._fields.0.unwrap(),
+            to: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -565,45 +569,45 @@ pub mod sync_status_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type SyncedAt;
         type MatchesCount;
+        type SyncedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type SyncedAt = Unset;
         type MatchesCount = Unset;
-    }
-    ///State transition - sets the `synced_at` field to Set
-    pub struct SetSyncedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSyncedAt<S> {}
-    impl<S: State> State for SetSyncedAt<S> {
-        type SyncedAt = Set<members::synced_at>;
-        type MatchesCount = S::MatchesCount;
+        type SyncedAt = Unset;
     }
     ///State transition - sets the `matches_count` field to Set
     pub struct SetMatchesCount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMatchesCount<S> {}
     impl<S: State> State for SetMatchesCount<S> {
-        type SyncedAt = S::SyncedAt;
         type MatchesCount = Set<members::matches_count>;
+        type SyncedAt = S::SyncedAt;
+    }
+    ///State transition - sets the `synced_at` field to Set
+    pub struct SetSyncedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSyncedAt<S> {}
+    impl<S: State> State for SetSyncedAt<S> {
+        type MatchesCount = S::MatchesCount;
+        type SyncedAt = Set<members::synced_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `synced_at` field
-        pub struct synced_at(());
         ///Marker type for the `matches_count` field
         pub struct matches_count(());
+        ///Marker type for the `synced_at` field
+        pub struct synced_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SyncStatusBuilder<'a, S: sync_status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SyncStatus<'a> {
@@ -617,9 +621,9 @@ impl<'a> SyncStatusBuilder<'a, sync_status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SyncStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -634,11 +638,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SyncStatusBuilder<'a, sync_status_state::SetMatchesCount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SyncStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -653,11 +657,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SyncStatusBuilder<'a, sync_status_state::SetSyncedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SyncStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -665,14 +669,14 @@ where
 impl<'a, S> SyncStatusBuilder<'a, S>
 where
     S: sync_status_state::State,
-    S::SyncedAt: sync_status_state::IsSet,
     S::MatchesCount: sync_status_state::IsSet,
+    S::SyncedAt: sync_status_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SyncStatus<'a> {
         SyncStatus {
-            matches_count: self.__unsafe_private_named.0.unwrap(),
-            synced_at: self.__unsafe_private_named.1.unwrap(),
+            matches_count: self._fields.0.unwrap(),
+            synced_at: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -685,8 +689,8 @@ where
         >,
     ) -> SyncStatus<'a> {
         SyncStatus {
-            matches_count: self.__unsafe_private_named.0.unwrap(),
-            synced_at: self.__unsafe_private_named.1.unwrap(),
+            matches_count: self._fields.0.unwrap(),
+            synced_at: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/contact/dismiss_match.rs b/crates/jacquard-api/src/app_bsky/contact/dismiss_match.rs
index c9127231..15557924 100644
--- a/crates/jacquard-api/src/app_bsky/contact/dismiss_match.rs
+++ b/crates/jacquard-api/src/app_bsky/contact/dismiss_match.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -133,9 +136,9 @@ pub mod dismiss_match_state {
 
 /// Builder for constructing an instance of this type
 pub struct DismissMatchBuilder<'a, S: dismiss_match_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DismissMatch<'a> {
@@ -149,9 +152,9 @@ impl<'a> DismissMatchBuilder<'a, dismiss_match_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DismissMatchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -166,11 +169,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> DismissMatchBuilder<'a, dismiss_match_state::SetSubject<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DismissMatchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,7 +186,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DismissMatch<'a> {
         DismissMatch {
-            subject: self.__unsafe_private_named.0.unwrap(),
+            subject: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -196,7 +199,7 @@ where
         >,
     ) -> DismissMatch<'a> {
         DismissMatch {
-            subject: self.__unsafe_private_named.0.unwrap(),
+            subject: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/contact/get_matches.rs b/crates/jacquard-api/src/app_bsky/contact/get_matches.rs
index 8aaa09ec..3d956b4c 100644
--- a/crates/jacquard-api/src/app_bsky/contact/get_matches.rs
+++ b/crates/jacquard-api/src/app_bsky/contact/get_matches.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -148,9 +151,9 @@ pub mod get_matches_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetMatchesBuilder<'a, S: get_matches_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetMatches<'a> {
@@ -164,9 +167,9 @@ impl<'a> GetMatchesBuilder<'a, get_matches_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetMatchesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -174,12 +177,12 @@ impl<'a> GetMatchesBuilder<'a, get_matches_state::Empty> {
 impl<'a, S: get_matches_state::State> GetMatchesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -187,12 +190,12 @@ impl<'a, S: get_matches_state::State> GetMatchesBuilder<'a, S> {
 impl<'a, S: get_matches_state::State> GetMatchesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -204,8 +207,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetMatches<'a> {
         GetMatches {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/contact/get_sync_status.rs b/crates/jacquard-api/src/app_bsky/contact/get_sync_status.rs
index 3f8670e5..e5840ddc 100644
--- a/crates/jacquard-api/src/app_bsky/contact/get_sync_status.rs
+++ b/crates/jacquard-api/src/app_bsky/contact/get_sync_status.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/app_bsky/contact/import_contacts.rs b/crates/jacquard-api/src/app_bsky/contact/import_contacts.rs
index e9db87c5..07d63049 100644
--- a/crates/jacquard-api/src/app_bsky/contact/import_contacts.rs
+++ b/crates/jacquard-api/src/app_bsky/contact/import_contacts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -144,45 +147,45 @@ pub mod import_contacts_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Contacts;
         type Token;
+        type Contacts;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Contacts = Unset;
         type Token = Unset;
-    }
-    ///State transition - sets the `contacts` field to Set
-    pub struct SetContacts<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContacts<S> {}
-    impl<S: State> State for SetContacts<S> {
-        type Contacts = Set<members::contacts>;
-        type Token = S::Token;
+        type Contacts = Unset;
     }
     ///State transition - sets the `token` field to Set
     pub struct SetToken<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetToken<S> {}
     impl<S: State> State for SetToken<S> {
-        type Contacts = S::Contacts;
         type Token = Set<members::token>;
+        type Contacts = S::Contacts;
+    }
+    ///State transition - sets the `contacts` field to Set
+    pub struct SetContacts<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContacts<S> {}
+    impl<S: State> State for SetContacts<S> {
+        type Token = S::Token;
+        type Contacts = Set<members::contacts>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `contacts` field
-        pub struct contacts(());
         ///Marker type for the `token` field
         pub struct token(());
+        ///Marker type for the `contacts` field
+        pub struct contacts(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ImportContactsBuilder<'a, S: import_contacts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<CowStr<'a>>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<CowStr<'a>>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ImportContacts<'a> {
@@ -196,9 +199,9 @@ impl<'a> ImportContactsBuilder<'a, import_contacts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImportContactsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,11 +216,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> ImportContactsBuilder<'a, import_contacts_state::SetContacts<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ImportContactsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,11 +235,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ImportContactsBuilder<'a, import_contacts_state::SetToken<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ImportContactsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,14 +247,14 @@ where
 impl<'a, S> ImportContactsBuilder<'a, S>
 where
     S: import_contacts_state::State,
-    S::Contacts: import_contacts_state::IsSet,
     S::Token: import_contacts_state::IsSet,
+    S::Contacts: import_contacts_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ImportContacts<'a> {
         ImportContacts {
-            contacts: self.__unsafe_private_named.0.unwrap(),
-            token: self.__unsafe_private_named.1.unwrap(),
+            contacts: self._fields.0.unwrap(),
+            token: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -264,8 +267,8 @@ where
         >,
     ) -> ImportContacts<'a> {
         ImportContacts {
-            contacts: self.__unsafe_private_named.0.unwrap(),
-            token: self.__unsafe_private_named.1.unwrap(),
+            contacts: self._fields.0.unwrap(),
+            token: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/contact/remove_data.rs b/crates/jacquard-api/src/app_bsky/contact/remove_data.rs
index 004d6bfe..4d8d1fe2 100644
--- a/crates/jacquard-api/src/app_bsky/contact/remove_data.rs
+++ b/crates/jacquard-api/src/app_bsky/contact/remove_data.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/app_bsky/contact/send_notification.rs b/crates/jacquard-api/src/app_bsky/contact/send_notification.rs
index e0b5ef2b..71f88715 100644
--- a/crates/jacquard-api/src/app_bsky/contact/send_notification.rs
+++ b/crates/jacquard-api/src/app_bsky/contact/send_notification.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -66,45 +69,45 @@ pub mod send_notification_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type From;
         type To;
+        type From;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type From = Unset;
         type To = Unset;
-    }
-    ///State transition - sets the `from` field to Set
-    pub struct SetFrom<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetFrom<S> {}
-    impl<S: State> State for SetFrom<S> {
-        type From = Set<members::from>;
-        type To = S::To;
+        type From = Unset;
     }
     ///State transition - sets the `to` field to Set
     pub struct SetTo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTo<S> {}
     impl<S: State> State for SetTo<S> {
-        type From = S::From;
         type To = Set<members::to>;
+        type From = S::From;
+    }
+    ///State transition - sets the `from` field to Set
+    pub struct SetFrom<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetFrom<S> {}
+    impl<S: State> State for SetFrom<S> {
+        type To = S::To;
+        type From = Set<members::from>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `from` field
-        pub struct from(());
         ///Marker type for the `to` field
         pub struct to(());
+        ///Marker type for the `from` field
+        pub struct from(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SendNotificationBuilder<'a, S: send_notification_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SendNotification<'a> {
@@ -118,9 +121,9 @@ impl<'a> SendNotificationBuilder<'a, send_notification_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SendNotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -135,11 +138,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> SendNotificationBuilder<'a, send_notification_state::SetFrom<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SendNotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -154,11 +157,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> SendNotificationBuilder<'a, send_notification_state::SetTo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SendNotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -166,14 +169,14 @@ where
 impl<'a, S> SendNotificationBuilder<'a, S>
 where
     S: send_notification_state::State,
-    S::From: send_notification_state::IsSet,
     S::To: send_notification_state::IsSet,
+    S::From: send_notification_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SendNotification<'a> {
         SendNotification {
-            from: self.__unsafe_private_named.0.unwrap(),
-            to: self.__unsafe_private_named.1.unwrap(),
+            from: self._fields.0.unwrap(),
+            to: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -186,8 +189,8 @@ where
         >,
     ) -> SendNotification<'a> {
         SendNotification {
-            from: self.__unsafe_private_named.0.unwrap(),
-            to: self.__unsafe_private_named.1.unwrap(),
+            from: self._fields.0.unwrap(),
+            to: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/contact/start_phone_verification.rs b/crates/jacquard-api/src/app_bsky/contact/start_phone_verification.rs
index 97fb7fe5..ed42c96c 100644
--- a/crates/jacquard-api/src/app_bsky/contact/start_phone_verification.rs
+++ b/crates/jacquard-api/src/app_bsky/contact/start_phone_verification.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/app_bsky/contact/verify_phone.rs b/crates/jacquard-api/src/app_bsky/contact/verify_phone.rs
index f65e0ceb..b2fdc03a 100644
--- a/crates/jacquard-api/src/app_bsky/contact/verify_phone.rs
+++ b/crates/jacquard-api/src/app_bsky/contact/verify_phone.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/app_bsky/draft.rs b/crates/jacquard-api/src/app_bsky/draft.rs
index a01fe9de..18afdee9 100644
--- a/crates/jacquard-api/src/app_bsky/draft.rs
+++ b/crates/jacquard-api/src/app_bsky/draft.rs
@@ -10,7 +10,11 @@ pub mod delete_draft;
 pub mod get_drafts;
 pub mod update_draft;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -585,8 +589,8 @@ pub mod draft_state {
 
 /// Builder for constructing an instance of this type
 pub struct DraftBuilder<'a, S: draft_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Vec<Language>>,
@@ -594,7 +598,7 @@ pub struct DraftBuilder<'a, S: draft_state::State> {
         Option<Vec<draft::DraftPost<'a>>>,
         Option<Vec<DraftThreadgateAllowItem<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Draft<'a> {
@@ -608,9 +612,9 @@ impl<'a> DraftBuilder<'a, draft_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DraftBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -618,12 +622,12 @@ impl<'a> DraftBuilder<'a, draft_state::Empty> {
 impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
     /// Set the `deviceId` field (optional)
     pub fn device_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `deviceId` field to an Option value (optional)
     pub fn maybe_device_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -631,12 +635,12 @@ impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
 impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
     /// Set the `deviceName` field (optional)
     pub fn device_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `deviceName` field to an Option value (optional)
     pub fn maybe_device_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -644,12 +648,12 @@ impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
 impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
     /// Set the `langs` field (optional)
     pub fn langs(mut self, value: impl Into<Option<Vec<Language>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `langs` field to an Option value (optional)
     pub fn maybe_langs(mut self, value: Option<Vec<Language>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -660,7 +664,7 @@ impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<DisableRule<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `postgateEmbeddingRules` field to an Option value (optional)
@@ -668,7 +672,7 @@ impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
         mut self,
         value: Option<Vec<DisableRule<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -683,11 +687,11 @@ where
         mut self,
         value: impl Into<Vec<draft::DraftPost<'a>>>,
     ) -> DraftBuilder<'a, draft_state::SetPosts<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         DraftBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -698,7 +702,7 @@ impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<DraftThreadgateAllowItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `threadgateAllow` field to an Option value (optional)
@@ -706,7 +710,7 @@ impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
         mut self,
         value: Option<Vec<DraftThreadgateAllowItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -719,12 +723,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Draft<'a> {
         Draft {
-            device_id: self.__unsafe_private_named.0,
-            device_name: self.__unsafe_private_named.1,
-            langs: self.__unsafe_private_named.2,
-            postgate_embedding_rules: self.__unsafe_private_named.3,
-            posts: self.__unsafe_private_named.4.unwrap(),
-            threadgate_allow: self.__unsafe_private_named.5,
+            device_id: self._fields.0,
+            device_name: self._fields.1,
+            langs: self._fields.2,
+            postgate_embedding_rules: self._fields.3,
+            posts: self._fields.4.unwrap(),
+            threadgate_allow: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -737,12 +741,12 @@ where
         >,
     ) -> Draft<'a> {
         Draft {
-            device_id: self.__unsafe_private_named.0,
-            device_name: self.__unsafe_private_named.1,
-            langs: self.__unsafe_private_named.2,
-            postgate_embedding_rules: self.__unsafe_private_named.3,
-            posts: self.__unsafe_private_named.4.unwrap(),
-            threadgate_allow: self.__unsafe_private_named.5,
+            device_id: self._fields.0,
+            device_name: self._fields.1,
+            langs: self._fields.2,
+            postgate_embedding_rules: self._fields.3,
+            posts: self._fields.4.unwrap(),
+            threadgate_allow: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
@@ -1223,45 +1227,45 @@ pub mod draft_embed_caption_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Lang;
         type Content;
+        type Lang;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Lang = Unset;
         type Content = Unset;
-    }
-    ///State transition - sets the `lang` field to Set
-    pub struct SetLang<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLang<S> {}
-    impl<S: State> State for SetLang<S> {
-        type Lang = Set<members::lang>;
-        type Content = S::Content;
+        type Lang = Unset;
     }
     ///State transition - sets the `content` field to Set
     pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContent<S> {}
     impl<S: State> State for SetContent<S> {
-        type Lang = S::Lang;
         type Content = Set<members::content>;
+        type Lang = S::Lang;
+    }
+    ///State transition - sets the `lang` field to Set
+    pub struct SetLang<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLang<S> {}
+    impl<S: State> State for SetLang<S> {
+        type Content = S::Content;
+        type Lang = Set<members::lang>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `lang` field
-        pub struct lang(());
         ///Marker type for the `content` field
         pub struct content(());
+        ///Marker type for the `lang` field
+        pub struct lang(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DraftEmbedCaptionBuilder<'a, S: draft_embed_caption_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Language>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Language>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DraftEmbedCaption<'a> {
@@ -1275,9 +1279,9 @@ impl<'a> DraftEmbedCaptionBuilder<'a, draft_embed_caption_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DraftEmbedCaptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1292,11 +1296,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DraftEmbedCaptionBuilder<'a, draft_embed_caption_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DraftEmbedCaptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1311,11 +1315,11 @@ where
         mut self,
         value: impl Into<Language>,
     ) -> DraftEmbedCaptionBuilder<'a, draft_embed_caption_state::SetLang<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DraftEmbedCaptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1323,14 +1327,14 @@ where
 impl<'a, S> DraftEmbedCaptionBuilder<'a, S>
 where
     S: draft_embed_caption_state::State,
-    S::Lang: draft_embed_caption_state::IsSet,
     S::Content: draft_embed_caption_state::IsSet,
+    S::Lang: draft_embed_caption_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DraftEmbedCaption<'a> {
         DraftEmbedCaption {
-            content: self.__unsafe_private_named.0.unwrap(),
-            lang: self.__unsafe_private_named.1.unwrap(),
+            content: self._fields.0.unwrap(),
+            lang: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1343,8 +1347,8 @@ where
         >,
     ) -> DraftEmbedCaption<'a> {
         DraftEmbedCaption {
-            content: self.__unsafe_private_named.0.unwrap(),
-            lang: self.__unsafe_private_named.1.unwrap(),
+            content: self._fields.0.unwrap(),
+            lang: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1384,9 +1388,9 @@ pub mod draft_embed_external_state {
 
 /// Builder for constructing an instance of this type
 pub struct DraftEmbedExternalBuilder<'a, S: draft_embed_external_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DraftEmbedExternal<'a> {
@@ -1400,9 +1404,9 @@ impl<'a> DraftEmbedExternalBuilder<'a, draft_embed_external_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DraftEmbedExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1417,11 +1421,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> DraftEmbedExternalBuilder<'a, draft_embed_external_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DraftEmbedExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1434,7 +1438,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DraftEmbedExternal<'a> {
         DraftEmbedExternal {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1447,7 +1451,7 @@ where
         >,
     ) -> DraftEmbedExternal<'a> {
         DraftEmbedExternal {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1487,9 +1491,9 @@ pub mod draft_embed_image_state {
 
 /// Builder for constructing an instance of this type
 pub struct DraftEmbedImageBuilder<'a, S: draft_embed_image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<draft::DraftEmbedLocalRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<draft::DraftEmbedLocalRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DraftEmbedImage<'a> {
@@ -1503,9 +1507,9 @@ impl<'a> DraftEmbedImageBuilder<'a, draft_embed_image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DraftEmbedImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1513,12 +1517,12 @@ impl<'a> DraftEmbedImageBuilder<'a, draft_embed_image_state::Empty> {
 impl<'a, S: draft_embed_image_state::State> DraftEmbedImageBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1533,11 +1537,11 @@ where
         mut self,
         value: impl Into<draft::DraftEmbedLocalRef<'a>>,
     ) -> DraftEmbedImageBuilder<'a, draft_embed_image_state::SetLocalRef<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DraftEmbedImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1550,8 +1554,8 @@ where
     /// Build the final struct
     pub fn build(self) -> DraftEmbedImage<'a> {
         DraftEmbedImage {
-            alt: self.__unsafe_private_named.0,
-            local_ref: self.__unsafe_private_named.1.unwrap(),
+            alt: self._fields.0,
+            local_ref: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1564,8 +1568,8 @@ where
         >,
     ) -> DraftEmbedImage<'a> {
         DraftEmbedImage {
-            alt: self.__unsafe_private_named.0,
-            local_ref: self.__unsafe_private_named.1.unwrap(),
+            alt: self._fields.0,
+            local_ref: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1605,9 +1609,9 @@ pub mod draft_embed_record_state {
 
 /// Builder for constructing an instance of this type
 pub struct DraftEmbedRecordBuilder<'a, S: draft_embed_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DraftEmbedRecord<'a> {
@@ -1621,9 +1625,9 @@ impl<'a> DraftEmbedRecordBuilder<'a, draft_embed_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DraftEmbedRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1638,11 +1642,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> DraftEmbedRecordBuilder<'a, draft_embed_record_state::SetRecord<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DraftEmbedRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1655,7 +1659,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DraftEmbedRecord<'a> {
         DraftEmbedRecord {
-            record: self.__unsafe_private_named.0.unwrap(),
+            record: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1668,7 +1672,7 @@ where
         >,
     ) -> DraftEmbedRecord<'a> {
         DraftEmbedRecord {
-            record: self.__unsafe_private_named.0.unwrap(),
+            record: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1708,13 +1712,13 @@ pub mod draft_embed_video_state {
 
 /// Builder for constructing an instance of this type
 pub struct DraftEmbedVideoBuilder<'a, S: draft_embed_video_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Vec<draft::DraftEmbedCaption<'a>>>,
         Option<draft::DraftEmbedLocalRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DraftEmbedVideo<'a> {
@@ -1728,9 +1732,9 @@ impl<'a> DraftEmbedVideoBuilder<'a, draft_embed_video_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DraftEmbedVideoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1738,12 +1742,12 @@ impl<'a> DraftEmbedVideoBuilder<'a, draft_embed_video_state::Empty> {
 impl<'a, S: draft_embed_video_state::State> DraftEmbedVideoBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1754,7 +1758,7 @@ impl<'a, S: draft_embed_video_state::State> DraftEmbedVideoBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<draft::DraftEmbedCaption<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `captions` field to an Option value (optional)
@@ -1762,7 +1766,7 @@ impl<'a, S: draft_embed_video_state::State> DraftEmbedVideoBuilder<'a, S> {
         mut self,
         value: Option<Vec<draft::DraftEmbedCaption<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1777,11 +1781,11 @@ where
         mut self,
         value: impl Into<draft::DraftEmbedLocalRef<'a>>,
     ) -> DraftEmbedVideoBuilder<'a, draft_embed_video_state::SetLocalRef<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         DraftEmbedVideoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1794,9 +1798,9 @@ where
     /// Build the final struct
     pub fn build(self) -> DraftEmbedVideo<'a> {
         DraftEmbedVideo {
-            alt: self.__unsafe_private_named.0,
-            captions: self.__unsafe_private_named.1,
-            local_ref: self.__unsafe_private_named.2.unwrap(),
+            alt: self._fields.0,
+            captions: self._fields.1,
+            local_ref: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1809,9 +1813,9 @@ where
         >,
     ) -> DraftEmbedVideo<'a> {
         DraftEmbedVideo {
-            alt: self.__unsafe_private_named.0,
-            captions: self.__unsafe_private_named.1,
-            local_ref: self.__unsafe_private_named.2.unwrap(),
+            alt: self._fields.0,
+            captions: self._fields.1,
+            local_ref: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1827,80 +1831,75 @@ pub mod draft_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Id;
+        type Draft;
         type CreatedAt;
+        type Id;
         type UpdatedAt;
-        type Draft;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Id = Unset;
+        type Draft = Unset;
         type CreatedAt = Unset;
+        type Id = Unset;
         type UpdatedAt = Unset;
-        type Draft = Unset;
     }
-    ///State transition - sets the `id` field to Set
-    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetId<S> {}
-    impl<S: State> State for SetId<S> {
-        type Id = Set<members::id>;
+    ///State transition - sets the `draft` field to Set
+    pub struct SetDraft<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDraft<S> {}
+    impl<S: State> State for SetDraft<S> {
+        type Draft = Set<members::draft>;
         type CreatedAt = S::CreatedAt;
+        type Id = S::Id;
         type UpdatedAt = S::UpdatedAt;
-        type Draft = S::Draft;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Id = S::Id;
+        type Draft = S::Draft;
         type CreatedAt = Set<members::created_at>;
+        type Id = S::Id;
         type UpdatedAt = S::UpdatedAt;
+    }
+    ///State transition - sets the `id` field to Set
+    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetId<S> {}
+    impl<S: State> State for SetId<S> {
         type Draft = S::Draft;
+        type CreatedAt = S::CreatedAt;
+        type Id = Set<members::id>;
+        type UpdatedAt = S::UpdatedAt;
     }
     ///State transition - sets the `updated_at` field to Set
     pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
     impl<S: State> State for SetUpdatedAt<S> {
-        type Id = S::Id;
-        type CreatedAt = S::CreatedAt;
-        type UpdatedAt = Set<members::updated_at>;
         type Draft = S::Draft;
-    }
-    ///State transition - sets the `draft` field to Set
-    pub struct SetDraft<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDraft<S> {}
-    impl<S: State> State for SetDraft<S> {
-        type Id = S::Id;
         type CreatedAt = S::CreatedAt;
-        type UpdatedAt = S::UpdatedAt;
-        type Draft = Set<members::draft>;
+        type Id = S::Id;
+        type UpdatedAt = Set<members::updated_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `id` field
-        pub struct id(());
+        ///Marker type for the `draft` field
+        pub struct draft(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `id` field
+        pub struct id(());
         ///Marker type for the `updated_at` field
         pub struct updated_at(());
-        ///Marker type for the `draft` field
-        pub struct draft(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DraftViewBuilder<'a, S: draft_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<draft::Draft<'a>>,
-        Option<Tid>,
-        Option<Datetime>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<draft::Draft<'a>>, Option<Tid>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DraftView<'a> {
@@ -1914,9 +1913,9 @@ impl<'a> DraftViewBuilder<'a, draft_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DraftViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1931,11 +1930,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DraftViewBuilder<'a, draft_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DraftViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1950,11 +1949,11 @@ where
         mut self,
         value: impl Into<draft::Draft<'a>>,
     ) -> DraftViewBuilder<'a, draft_view_state::SetDraft<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DraftViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1969,11 +1968,11 @@ where
         mut self,
         value: impl Into<Tid>,
     ) -> DraftViewBuilder<'a, draft_view_state::SetId<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         DraftViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1988,11 +1987,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DraftViewBuilder<'a, draft_view_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         DraftViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2000,18 +1999,18 @@ where
 impl<'a, S> DraftViewBuilder<'a, S>
 where
     S: draft_view_state::State,
-    S::Id: draft_view_state::IsSet,
+    S::Draft: draft_view_state::IsSet,
     S::CreatedAt: draft_view_state::IsSet,
+    S::Id: draft_view_state::IsSet,
     S::UpdatedAt: draft_view_state::IsSet,
-    S::Draft: draft_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DraftView<'a> {
         DraftView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            draft: self.__unsafe_private_named.1.unwrap(),
-            id: self.__unsafe_private_named.2.unwrap(),
-            updated_at: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            draft: self._fields.1.unwrap(),
+            id: self._fields.2.unwrap(),
+            updated_at: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2024,10 +2023,10 @@ where
         >,
     ) -> DraftView<'a> {
         DraftView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            draft: self.__unsafe_private_named.1.unwrap(),
-            id: self.__unsafe_private_named.2.unwrap(),
-            updated_at: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            draft: self._fields.1.unwrap(),
+            id: self._fields.2.unwrap(),
+            updated_at: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2079,9 +2078,9 @@ pub mod draft_with_id_state {
 
 /// Builder for constructing an instance of this type
 pub struct DraftWithIdBuilder<'a, S: draft_with_id_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<draft::Draft<'a>>, Option<Tid>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<draft::Draft<'a>>, Option<Tid>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DraftWithId<'a> {
@@ -2095,9 +2094,9 @@ impl<'a> DraftWithIdBuilder<'a, draft_with_id_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DraftWithIdBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2112,11 +2111,11 @@ where
         mut self,
         value: impl Into<draft::Draft<'a>>,
     ) -> DraftWithIdBuilder<'a, draft_with_id_state::SetDraft<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DraftWithIdBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2131,11 +2130,11 @@ where
         mut self,
         value: impl Into<Tid>,
     ) -> DraftWithIdBuilder<'a, draft_with_id_state::SetId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DraftWithIdBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2149,8 +2148,8 @@ where
     /// Build the final struct
     pub fn build(self) -> DraftWithId<'a> {
         DraftWithId {
-            draft: self.__unsafe_private_named.0.unwrap(),
-            id: self.__unsafe_private_named.1.unwrap(),
+            draft: self._fields.0.unwrap(),
+            id: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2163,8 +2162,8 @@ where
         >,
     ) -> DraftWithId<'a> {
         DraftWithId {
-            draft: self.__unsafe_private_named.0.unwrap(),
-            id: self.__unsafe_private_named.1.unwrap(),
+            draft: self._fields.0.unwrap(),
+            id: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/draft/create_draft.rs b/crates/jacquard-api/src/app_bsky/draft/create_draft.rs
index 3d452c10..4a347db7 100644
--- a/crates/jacquard-api/src/app_bsky/draft/create_draft.rs
+++ b/crates/jacquard-api/src/app_bsky/draft/create_draft.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -129,9 +132,9 @@ pub mod create_draft_state {
 
 /// Builder for constructing an instance of this type
 pub struct CreateDraftBuilder<'a, S: create_draft_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Draft<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Draft<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CreateDraft<'a> {
@@ -145,9 +148,9 @@ impl<'a> CreateDraftBuilder<'a, create_draft_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreateDraftBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -162,11 +165,11 @@ where
         mut self,
         value: impl Into<Draft<'a>>,
     ) -> CreateDraftBuilder<'a, create_draft_state::SetDraft<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CreateDraftBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,7 +182,7 @@ where
     /// Build the final struct
     pub fn build(self) -> CreateDraft<'a> {
         CreateDraft {
-            draft: self.__unsafe_private_named.0.unwrap(),
+            draft: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -192,7 +195,7 @@ where
         >,
     ) -> CreateDraft<'a> {
         CreateDraft {
-            draft: self.__unsafe_private_named.0.unwrap(),
+            draft: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/draft/delete_draft.rs b/crates/jacquard-api/src/app_bsky/draft/delete_draft.rs
index 1716aee1..75eb39dd 100644
--- a/crates/jacquard-api/src/app_bsky/draft/delete_draft.rs
+++ b/crates/jacquard-api/src/app_bsky/draft/delete_draft.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Tid;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -80,9 +83,9 @@ pub mod delete_draft_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeleteDraftBuilder<'a, S: delete_draft_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Tid>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Tid>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeleteDraft<'a> {
@@ -96,9 +99,9 @@ impl<'a> DeleteDraftBuilder<'a, delete_draft_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteDraftBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -113,11 +116,11 @@ where
         mut self,
         value: impl Into<Tid>,
     ) -> DeleteDraftBuilder<'a, delete_draft_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeleteDraftBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -130,7 +133,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DeleteDraft<'a> {
         DeleteDraft {
-            id: self.__unsafe_private_named.0.unwrap(),
+            id: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -143,7 +146,7 @@ where
         >,
     ) -> DeleteDraft<'a> {
         DeleteDraft {
-            id: self.__unsafe_private_named.0.unwrap(),
+            id: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/draft/get_drafts.rs b/crates/jacquard-api/src/app_bsky/draft/get_drafts.rs
index 20b11d0a..008a3e63 100644
--- a/crates/jacquard-api/src/app_bsky/draft/get_drafts.rs
+++ b/crates/jacquard-api/src/app_bsky/draft/get_drafts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -85,9 +88,9 @@ pub mod get_drafts_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetDraftsBuilder<'a, S: get_drafts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetDrafts<'a> {
@@ -101,9 +104,9 @@ impl<'a> GetDraftsBuilder<'a, get_drafts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetDraftsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -111,12 +114,12 @@ impl<'a> GetDraftsBuilder<'a, get_drafts_state::Empty> {
 impl<'a, S: get_drafts_state::State> GetDraftsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -124,12 +127,12 @@ impl<'a, S: get_drafts_state::State> GetDraftsBuilder<'a, S> {
 impl<'a, S: get_drafts_state::State> GetDraftsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -141,8 +144,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetDrafts<'a> {
         GetDrafts {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/draft/update_draft.rs b/crates/jacquard-api/src/app_bsky/draft/update_draft.rs
index 93d03d68..eb98a825 100644
--- a/crates/jacquard-api/src/app_bsky/draft/update_draft.rs
+++ b/crates/jacquard-api/src/app_bsky/draft/update_draft.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
@@ -81,9 +84,9 @@ pub mod update_draft_state {
 
 /// Builder for constructing an instance of this type
 pub struct UpdateDraftBuilder<'a, S: update_draft_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<DraftWithId<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<DraftWithId<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateDraft<'a> {
@@ -97,9 +100,9 @@ impl<'a> UpdateDraftBuilder<'a, update_draft_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateDraftBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,11 +117,11 @@ where
         mut self,
         value: impl Into<DraftWithId<'a>>,
     ) -> UpdateDraftBuilder<'a, update_draft_state::SetDraft<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UpdateDraftBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -131,7 +134,7 @@ where
     /// Build the final struct
     pub fn build(self) -> UpdateDraft<'a> {
         UpdateDraft {
-            draft: self.__unsafe_private_named.0.unwrap(),
+            draft: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -144,7 +147,7 @@ where
         >,
     ) -> UpdateDraft<'a> {
         UpdateDraft {
-            draft: self.__unsafe_private_named.0.unwrap(),
+            draft: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/embed.rs b/crates/jacquard-api/src/app_bsky/embed.rs
index d688b836..b22f0682 100644
--- a/crates/jacquard-api/src/app_bsky/embed.rs
+++ b/crates/jacquard-api/src/app_bsky/embed.rs
@@ -11,7 +11,11 @@ pub mod record;
 pub mod record_with_media;
 pub mod video;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -78,45 +82,45 @@ pub mod aspect_ratio_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Height;
         type Width;
+        type Height;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Height = Unset;
         type Width = Unset;
-    }
-    ///State transition - sets the `height` field to Set
-    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHeight<S> {}
-    impl<S: State> State for SetHeight<S> {
-        type Height = Set<members::height>;
-        type Width = S::Width;
+        type Height = Unset;
     }
     ///State transition - sets the `width` field to Set
     pub struct SetWidth<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWidth<S> {}
     impl<S: State> State for SetWidth<S> {
-        type Height = S::Height;
         type Width = Set<members::width>;
+        type Height = S::Height;
+    }
+    ///State transition - sets the `height` field to Set
+    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHeight<S> {}
+    impl<S: State> State for SetHeight<S> {
+        type Width = S::Width;
+        type Height = Set<members::height>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `height` field
-        pub struct height(());
         ///Marker type for the `width` field
         pub struct width(());
+        ///Marker type for the `height` field
+        pub struct height(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AspectRatioBuilder<'a, S: aspect_ratio_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AspectRatio<'a> {
@@ -130,9 +134,9 @@ impl<'a> AspectRatioBuilder<'a, aspect_ratio_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -147,11 +151,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -166,11 +170,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetWidth<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,14 +182,14 @@ where
 impl<'a, S> AspectRatioBuilder<'a, S>
 where
     S: aspect_ratio_state::State,
-    S::Height: aspect_ratio_state::IsSet,
     S::Width: aspect_ratio_state::IsSet,
+    S::Height: aspect_ratio_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -198,8 +202,8 @@ where
         >,
     ) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/embed/external.rs b/crates/jacquard-api/src/app_bsky/embed/external.rs
index 63fbef48..288b4cdb 100644
--- a/crates/jacquard-api/src/app_bsky/embed/external.rs
+++ b/crates/jacquard-api/src/app_bsky/embed/external.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -180,64 +183,64 @@ pub mod external_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Description;
         type Uri;
         type Title;
-        type Description;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Description = Unset;
         type Uri = Unset;
         type Title = Unset;
-        type Description = Unset;
+    }
+    ///State transition - sets the `description` field to Set
+    pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDescription<S> {}
+    impl<S: State> State for SetDescription<S> {
+        type Description = Set<members::description>;
+        type Uri = S::Uri;
+        type Title = S::Title;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
+        type Description = S::Description;
         type Uri = Set<members::uri>;
         type Title = S::Title;
-        type Description = S::Description;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Uri = S::Uri;
-        type Title = Set<members::title>;
         type Description = S::Description;
-    }
-    ///State transition - sets the `description` field to Set
-    pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDescription<S> {}
-    impl<S: State> State for SetDescription<S> {
         type Uri = S::Uri;
-        type Title = S::Title;
-        type Description = Set<members::description>;
+        type Title = Set<members::title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `description` field
+        pub struct description(());
         ///Marker type for the `uri` field
         pub struct uri(());
         ///Marker type for the `title` field
         pub struct title(());
-        ///Marker type for the `description` field
-        pub struct description(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ExternalBuilder<'a, S: external_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> External<'a> {
@@ -251,9 +254,9 @@ impl<'a> ExternalBuilder<'a, external_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -268,11 +271,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ExternalBuilder<'a, external_state::SetDescription<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -280,12 +283,12 @@ where
 impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
     /// Set the `thumb` field (optional)
     pub fn thumb(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `thumb` field to an Option value (optional)
     pub fn maybe_thumb(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -300,11 +303,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ExternalBuilder<'a, external_state::SetTitle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -319,11 +322,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ExternalBuilder<'a, external_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -331,17 +334,17 @@ where
 impl<'a, S> ExternalBuilder<'a, S>
 where
     S: external_state::State,
+    S::Description: external_state::IsSet,
     S::Uri: external_state::IsSet,
     S::Title: external_state::IsSet,
-    S::Description: external_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> External<'a> {
         External {
-            description: self.__unsafe_private_named.0.unwrap(),
-            thumb: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0.unwrap(),
+            thumb: self._fields.1,
+            title: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -354,10 +357,10 @@ where
         >,
     ) -> External<'a> {
         External {
-            description: self.__unsafe_private_named.0.unwrap(),
-            thumb: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0.unwrap(),
+            thumb: self._fields.1,
+            title: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -531,9 +534,9 @@ pub mod external_record_state {
 
 /// Builder for constructing an instance of this type
 pub struct ExternalRecordBuilder<'a, S: external_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<external::External<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<external::External<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ExternalRecord<'a> {
@@ -547,9 +550,9 @@ impl<'a> ExternalRecordBuilder<'a, external_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExternalRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -564,11 +567,11 @@ where
         mut self,
         value: impl Into<external::External<'a>>,
     ) -> ExternalRecordBuilder<'a, external_record_state::SetExternal<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ExternalRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -581,7 +584,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ExternalRecord<'a> {
         ExternalRecord {
-            external: self.__unsafe_private_named.0.unwrap(),
+            external: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -594,7 +597,7 @@ where
         >,
     ) -> ExternalRecord<'a> {
         ExternalRecord {
-            external: self.__unsafe_private_named.0.unwrap(),
+            external: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -634,9 +637,9 @@ pub mod view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewBuilder<'a, S: view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<external::ViewExternal<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<external::ViewExternal<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> View<'a> {
@@ -650,9 +653,9 @@ impl<'a> ViewBuilder<'a, view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -667,11 +670,11 @@ where
         mut self,
         value: impl Into<external::ViewExternal<'a>>,
     ) -> ViewBuilder<'a, view_state::SetExternal<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -684,7 +687,7 @@ where
     /// Build the final struct
     pub fn build(self) -> View<'a> {
         View {
-            external: self.__unsafe_private_named.0.unwrap(),
+            external: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -697,7 +700,7 @@ where
         >,
     ) -> View<'a> {
         View {
-            external: self.__unsafe_private_named.0.unwrap(),
+            external: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -713,64 +716,64 @@ pub mod view_external_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Title;
-        type Uri;
         type Description;
+        type Uri;
+        type Title;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Title = Unset;
-        type Uri = Unset;
         type Description = Unset;
+        type Uri = Unset;
+        type Title = Unset;
     }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Title = Set<members::title>;
+    ///State transition - sets the `description` field to Set
+    pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDescription<S> {}
+    impl<S: State> State for SetDescription<S> {
+        type Description = Set<members::description>;
         type Uri = S::Uri;
-        type Description = S::Description;
+        type Title = S::Title;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Title = S::Title;
-        type Uri = Set<members::uri>;
         type Description = S::Description;
-    }
-    ///State transition - sets the `description` field to Set
-    pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDescription<S> {}
-    impl<S: State> State for SetDescription<S> {
+        type Uri = Set<members::uri>;
         type Title = S::Title;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type Description = S::Description;
         type Uri = S::Uri;
-        type Description = Set<members::description>;
+        type Title = Set<members::title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `title` field
-        pub struct title(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `description` field
         pub struct description(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
+        ///Marker type for the `title` field
+        pub struct title(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ViewExternalBuilder<'a, S: view_external_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ViewExternal<'a> {
@@ -784,9 +787,9 @@ impl<'a> ViewExternalBuilder<'a, view_external_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -801,11 +804,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ViewExternalBuilder<'a, view_external_state::SetDescription<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -813,12 +816,12 @@ where
 impl<'a, S: view_external_state::State> ViewExternalBuilder<'a, S> {
     /// Set the `thumb` field (optional)
     pub fn thumb(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `thumb` field to an Option value (optional)
     pub fn maybe_thumb(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -833,11 +836,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ViewExternalBuilder<'a, view_external_state::SetTitle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ViewExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -852,11 +855,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ViewExternalBuilder<'a, view_external_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ViewExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -864,17 +867,17 @@ where
 impl<'a, S> ViewExternalBuilder<'a, S>
 where
     S: view_external_state::State,
-    S::Title: view_external_state::IsSet,
-    S::Uri: view_external_state::IsSet,
     S::Description: view_external_state::IsSet,
+    S::Uri: view_external_state::IsSet,
+    S::Title: view_external_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ViewExternal<'a> {
         ViewExternal {
-            description: self.__unsafe_private_named.0.unwrap(),
-            thumb: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0.unwrap(),
+            thumb: self._fields.1,
+            title: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -887,10 +890,10 @@ where
         >,
     ) -> ViewExternal<'a> {
         ViewExternal {
-            description: self.__unsafe_private_named.0.unwrap(),
-            thumb: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0.unwrap(),
+            thumb: self._fields.1,
+            title: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/embed/images.rs b/crates/jacquard-api/src/app_bsky/embed/images.rs
index d7b6bd7f..ea6b8331 100644
--- a/crates/jacquard-api/src/app_bsky/embed/images.rs
+++ b/crates/jacquard-api/src/app_bsky/embed/images.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -206,49 +209,45 @@ pub mod image_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Image;
         type Alt;
+        type Image;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Image = Unset;
         type Alt = Unset;
-    }
-    ///State transition - sets the `image` field to Set
-    pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetImage<S> {}
-    impl<S: State> State for SetImage<S> {
-        type Image = Set<members::image>;
-        type Alt = S::Alt;
+        type Image = Unset;
     }
     ///State transition - sets the `alt` field to Set
     pub struct SetAlt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAlt<S> {}
     impl<S: State> State for SetAlt<S> {
-        type Image = S::Image;
         type Alt = Set<members::alt>;
+        type Image = S::Image;
+    }
+    ///State transition - sets the `image` field to Set
+    pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetImage<S> {}
+    impl<S: State> State for SetImage<S> {
+        type Alt = S::Alt;
+        type Image = Set<members::image>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `image` field
-        pub struct image(());
         ///Marker type for the `alt` field
         pub struct alt(());
+        ///Marker type for the `image` field
+        pub struct image(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ImageBuilder<'a, S: image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<AspectRatio<'a>>,
-        Option<BlobRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AspectRatio<'a>>, Option<BlobRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Image<'a> {
@@ -262,9 +261,9 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -279,11 +278,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ImageBuilder<'a, image_state::SetAlt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -291,12 +290,12 @@ where
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `aspectRatio` field (optional)
     pub fn aspect_ratio(mut self, value: impl Into<Option<AspectRatio<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
     pub fn maybe_aspect_ratio(mut self, value: Option<AspectRatio<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -311,11 +310,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ImageBuilder<'a, image_state::SetImage<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -323,15 +322,15 @@ where
 impl<'a, S> ImageBuilder<'a, S>
 where
     S: image_state::State,
-    S::Image: image_state::IsSet,
     S::Alt: image_state::IsSet,
+    S::Image: image_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            aspect_ratio: self.__unsafe_private_named.1,
-            image: self.__unsafe_private_named.2.unwrap(),
+            alt: self._fields.0.unwrap(),
+            aspect_ratio: self._fields.1,
+            image: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -344,9 +343,9 @@ where
         >,
     ) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            aspect_ratio: self.__unsafe_private_named.1,
-            image: self.__unsafe_private_named.2.unwrap(),
+            alt: self._fields.0.unwrap(),
+            aspect_ratio: self._fields.1,
+            image: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -547,9 +546,9 @@ pub mod images_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImagesBuilder<'a, S: images_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<images::Image<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<images::Image<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Images<'a> {
@@ -563,9 +562,9 @@ impl<'a> ImagesBuilder<'a, images_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImagesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -580,11 +579,11 @@ where
         mut self,
         value: impl Into<Vec<images::Image<'a>>>,
     ) -> ImagesBuilder<'a, images_state::SetImages<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ImagesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -597,7 +596,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Images<'a> {
         Images {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -610,7 +609,7 @@ where
         >,
     ) -> Images<'a> {
         Images {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -650,9 +649,9 @@ pub mod view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewBuilder<'a, S: view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<images::ViewImage<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<images::ViewImage<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> View<'a> {
@@ -666,9 +665,9 @@ impl<'a> ViewBuilder<'a, view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -683,11 +682,11 @@ where
         mut self,
         value: impl Into<Vec<images::ViewImage<'a>>>,
     ) -> ViewBuilder<'a, view_state::SetImages<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -700,7 +699,7 @@ where
     /// Build the final struct
     pub fn build(self) -> View<'a> {
         View {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -713,7 +712,7 @@ where
         >,
     ) -> View<'a> {
         View {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -729,49 +728,49 @@ pub mod view_image_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Alt;
         type Fullsize;
+        type Alt;
         type Thumb;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Alt = Unset;
         type Fullsize = Unset;
+        type Alt = Unset;
         type Thumb = Unset;
     }
-    ///State transition - sets the `alt` field to Set
-    pub struct SetAlt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAlt<S> {}
-    impl<S: State> State for SetAlt<S> {
-        type Alt = Set<members::alt>;
-        type Fullsize = S::Fullsize;
-        type Thumb = S::Thumb;
-    }
     ///State transition - sets the `fullsize` field to Set
     pub struct SetFullsize<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetFullsize<S> {}
     impl<S: State> State for SetFullsize<S> {
-        type Alt = S::Alt;
         type Fullsize = Set<members::fullsize>;
+        type Alt = S::Alt;
+        type Thumb = S::Thumb;
+    }
+    ///State transition - sets the `alt` field to Set
+    pub struct SetAlt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAlt<S> {}
+    impl<S: State> State for SetAlt<S> {
+        type Fullsize = S::Fullsize;
+        type Alt = Set<members::alt>;
         type Thumb = S::Thumb;
     }
     ///State transition - sets the `thumb` field to Set
     pub struct SetThumb<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetThumb<S> {}
     impl<S: State> State for SetThumb<S> {
-        type Alt = S::Alt;
         type Fullsize = S::Fullsize;
+        type Alt = S::Alt;
         type Thumb = Set<members::thumb>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `alt` field
-        pub struct alt(());
         ///Marker type for the `fullsize` field
         pub struct fullsize(());
+        ///Marker type for the `alt` field
+        pub struct alt(());
         ///Marker type for the `thumb` field
         pub struct thumb(());
     }
@@ -779,14 +778,14 @@ pub mod view_image_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewImageBuilder<'a, S: view_image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<AspectRatio<'a>>,
         Option<UriValue<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ViewImage<'a> {
@@ -800,9 +799,9 @@ impl<'a> ViewImageBuilder<'a, view_image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -817,11 +816,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ViewImageBuilder<'a, view_image_state::SetAlt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -829,12 +828,12 @@ where
 impl<'a, S: view_image_state::State> ViewImageBuilder<'a, S> {
     /// Set the `aspectRatio` field (optional)
     pub fn aspect_ratio(mut self, value: impl Into<Option<AspectRatio<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
     pub fn maybe_aspect_ratio(mut self, value: Option<AspectRatio<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -849,11 +848,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ViewImageBuilder<'a, view_image_state::SetFullsize<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ViewImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -868,11 +867,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ViewImageBuilder<'a, view_image_state::SetThumb<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ViewImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -880,17 +879,17 @@ where
 impl<'a, S> ViewImageBuilder<'a, S>
 where
     S: view_image_state::State,
-    S::Alt: view_image_state::IsSet,
     S::Fullsize: view_image_state::IsSet,
+    S::Alt: view_image_state::IsSet,
     S::Thumb: view_image_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ViewImage<'a> {
         ViewImage {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            aspect_ratio: self.__unsafe_private_named.1,
-            fullsize: self.__unsafe_private_named.2.unwrap(),
-            thumb: self.__unsafe_private_named.3.unwrap(),
+            alt: self._fields.0.unwrap(),
+            aspect_ratio: self._fields.1,
+            fullsize: self._fields.2.unwrap(),
+            thumb: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -903,10 +902,10 @@ where
         >,
     ) -> ViewImage<'a> {
         ViewImage {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            aspect_ratio: self.__unsafe_private_named.1,
-            fullsize: self.__unsafe_private_named.2.unwrap(),
-            thumb: self.__unsafe_private_named.3.unwrap(),
+            alt: self._fields.0.unwrap(),
+            aspect_ratio: self._fields.1,
+            fullsize: self._fields.2.unwrap(),
+            thumb: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/embed/record.rs b/crates/jacquard-api/src/app_bsky/embed/record.rs
index ab03eb3f..d08ea26c 100644
--- a/crates/jacquard-api/src/app_bsky/embed/record.rs
+++ b/crates/jacquard-api/src/app_bsky/embed/record.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -279,9 +282,9 @@ pub mod record_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordBuilder<'a, S: record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Record<'a> {
@@ -295,9 +298,9 @@ impl<'a> RecordBuilder<'a, record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -312,11 +315,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> RecordBuilder<'a, record_state::SetRecord<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -329,7 +332,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Record<'a> {
         Record {
-            record: self.__unsafe_private_named.0.unwrap(),
+            record: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -339,7 +342,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Record<'a> {
         Record {
-            record: self.__unsafe_private_named.0.unwrap(),
+            record: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -639,9 +642,9 @@ pub mod view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewBuilder<'a, S: view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ViewUnionRecord<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ViewUnionRecord<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> View<'a> {
@@ -655,9 +658,9 @@ impl<'a> ViewBuilder<'a, view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -672,11 +675,11 @@ where
         mut self,
         value: impl Into<ViewUnionRecord<'a>>,
     ) -> ViewBuilder<'a, view_state::SetRecord<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -689,7 +692,7 @@ where
     /// Build the final struct
     pub fn build(self) -> View<'a> {
         View {
-            record: self.__unsafe_private_named.0.unwrap(),
+            record: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -699,7 +702,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> View<'a> {
         View {
-            record: self.__unsafe_private_named.0.unwrap(),
+            record: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -716,58 +719,58 @@ pub mod view_blocked_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Blocked;
-        type Uri;
         type Author;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Blocked = Unset;
-        type Uri = Unset;
         type Author = Unset;
+        type Uri = Unset;
     }
     ///State transition - sets the `blocked` field to Set
     pub struct SetBlocked<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBlocked<S> {}
     impl<S: State> State for SetBlocked<S> {
         type Blocked = Set<members::blocked>;
-        type Uri = S::Uri;
-        type Author = S::Author;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Blocked = S::Blocked;
-        type Uri = Set<members::uri>;
         type Author = S::Author;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `author` field to Set
     pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthor<S> {}
     impl<S: State> State for SetAuthor<S> {
         type Blocked = S::Blocked;
-        type Uri = S::Uri;
         type Author = Set<members::author>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Blocked = S::Blocked;
+        type Author = S::Author;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `blocked` field
         pub struct blocked(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `author` field
         pub struct author(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ViewBlockedBuilder<'a, S: view_blocked_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlockedAuthor<'a>>, Option<bool>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlockedAuthor<'a>>, Option<bool>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ViewBlocked<'a> {
@@ -781,9 +784,9 @@ impl<'a> ViewBlockedBuilder<'a, view_blocked_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewBlockedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -798,11 +801,11 @@ where
         mut self,
         value: impl Into<BlockedAuthor<'a>>,
     ) -> ViewBlockedBuilder<'a, view_blocked_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewBlockedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -817,11 +820,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ViewBlockedBuilder<'a, view_blocked_state::SetBlocked<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ViewBlockedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -836,11 +839,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ViewBlockedBuilder<'a, view_blocked_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ViewBlockedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -849,15 +852,15 @@ impl<'a, S> ViewBlockedBuilder<'a, S>
 where
     S: view_blocked_state::State,
     S::Blocked: view_blocked_state::IsSet,
-    S::Uri: view_blocked_state::IsSet,
     S::Author: view_blocked_state::IsSet,
+    S::Uri: view_blocked_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ViewBlocked<'a> {
         ViewBlocked {
-            author: self.__unsafe_private_named.0.unwrap(),
-            blocked: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            author: self._fields.0.unwrap(),
+            blocked: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -867,9 +870,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ViewBlocked<'a> {
         ViewBlocked {
-            author: self.__unsafe_private_named.0.unwrap(),
-            blocked: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            author: self._fields.0.unwrap(),
+            blocked: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -921,9 +924,9 @@ pub mod view_detached_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewDetachedBuilder<'a, S: view_detached_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ViewDetached<'a> {
@@ -937,9 +940,9 @@ impl<'a> ViewDetachedBuilder<'a, view_detached_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewDetachedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -954,11 +957,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ViewDetachedBuilder<'a, view_detached_state::SetDetached<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewDetachedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -973,11 +976,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ViewDetachedBuilder<'a, view_detached_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ViewDetachedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -991,8 +994,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ViewDetached<'a> {
         ViewDetached {
-            detached: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            detached: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1002,8 +1005,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ViewDetached<'a> {
         ViewDetached {
-            detached: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            detached: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1019,45 +1022,45 @@ pub mod view_not_found_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type NotFound;
         type Uri;
+        type NotFound;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type NotFound = Unset;
         type Uri = Unset;
-    }
-    ///State transition - sets the `not_found` field to Set
-    pub struct SetNotFound<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetNotFound<S> {}
-    impl<S: State> State for SetNotFound<S> {
-        type NotFound = Set<members::not_found>;
-        type Uri = S::Uri;
+        type NotFound = Unset;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type NotFound = S::NotFound;
         type Uri = Set<members::uri>;
+        type NotFound = S::NotFound;
+    }
+    ///State transition - sets the `not_found` field to Set
+    pub struct SetNotFound<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetNotFound<S> {}
+    impl<S: State> State for SetNotFound<S> {
+        type Uri = S::Uri;
+        type NotFound = Set<members::not_found>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `not_found` field
-        pub struct not_found(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `not_found` field
+        pub struct not_found(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ViewNotFoundBuilder<'a, S: view_not_found_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ViewNotFound<'a> {
@@ -1071,9 +1074,9 @@ impl<'a> ViewNotFoundBuilder<'a, view_not_found_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewNotFoundBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1088,11 +1091,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ViewNotFoundBuilder<'a, view_not_found_state::SetNotFound<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewNotFoundBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1107,11 +1110,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ViewNotFoundBuilder<'a, view_not_found_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ViewNotFoundBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1119,14 +1122,14 @@ where
 impl<'a, S> ViewNotFoundBuilder<'a, S>
 where
     S: view_not_found_state::State,
-    S::NotFound: view_not_found_state::IsSet,
     S::Uri: view_not_found_state::IsSet,
+    S::NotFound: view_not_found_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ViewNotFound<'a> {
         ViewNotFound {
-            not_found: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            not_found: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1136,8 +1139,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ViewNotFound<'a> {
         ViewNotFound {
-            not_found: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            not_found: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1153,92 +1156,92 @@ pub mod view_record_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Value;
-        type IndexedAt;
+        type Cid;
         type Author;
+        type Value;
         type Uri;
-        type Cid;
+        type IndexedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Value = Unset;
-        type IndexedAt = Unset;
+        type Cid = Unset;
         type Author = Unset;
+        type Value = Unset;
         type Uri = Unset;
-        type Cid = Unset;
+        type IndexedAt = Unset;
     }
-    ///State transition - sets the `value` field to Set
-    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetValue<S> {}
-    impl<S: State> State for SetValue<S> {
-        type Value = Set<members::value>;
-        type IndexedAt = S::IndexedAt;
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Cid = Set<members::cid>;
         type Author = S::Author;
-        type Uri = S::Uri;
-        type Cid = S::Cid;
-    }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
         type Value = S::Value;
-        type IndexedAt = Set<members::indexed_at>;
-        type Author = S::Author;
         type Uri = S::Uri;
-        type Cid = S::Cid;
+        type IndexedAt = S::IndexedAt;
     }
     ///State transition - sets the `author` field to Set
     pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthor<S> {}
     impl<S: State> State for SetAuthor<S> {
-        type Value = S::Value;
-        type IndexedAt = S::IndexedAt;
+        type Cid = S::Cid;
         type Author = Set<members::author>;
+        type Value = S::Value;
         type Uri = S::Uri;
+        type IndexedAt = S::IndexedAt;
+    }
+    ///State transition - sets the `value` field to Set
+    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetValue<S> {}
+    impl<S: State> State for SetValue<S> {
         type Cid = S::Cid;
+        type Author = S::Author;
+        type Value = Set<members::value>;
+        type Uri = S::Uri;
+        type IndexedAt = S::IndexedAt;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Value = S::Value;
-        type IndexedAt = S::IndexedAt;
-        type Author = S::Author;
-        type Uri = Set<members::uri>;
         type Cid = S::Cid;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
+        type Author = S::Author;
         type Value = S::Value;
+        type Uri = Set<members::uri>;
         type IndexedAt = S::IndexedAt;
+    }
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
+        type Cid = S::Cid;
         type Author = S::Author;
+        type Value = S::Value;
         type Uri = S::Uri;
-        type Cid = Set<members::cid>;
+        type IndexedAt = Set<members::indexed_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `value` field
-        pub struct value(());
-        ///Marker type for the `indexed_at` field
-        pub struct indexed_at(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
         ///Marker type for the `author` field
         pub struct author(());
+        ///Marker type for the `value` field
+        pub struct value(());
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
+        ///Marker type for the `indexed_at` field
+        pub struct indexed_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ViewRecordBuilder<'a, S: view_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<Cid<'a>>,
         Option<Vec<ViewRecordEmbedsItem<'a>>>,
@@ -1251,7 +1254,7 @@ pub struct ViewRecordBuilder<'a, S: view_record_state::State> {
         Option<AtUri<'a>>,
         Option<Data<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ViewRecord<'a> {
@@ -1265,21 +1268,9 @@ impl<'a> ViewRecordBuilder<'a, view_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1294,11 +1285,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> ViewRecordBuilder<'a, view_record_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1313,11 +1304,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> ViewRecordBuilder<'a, view_record_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ViewRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1328,12 +1319,12 @@ impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<ViewRecordEmbedsItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `embeds` field to an Option value (optional)
     pub fn maybe_embeds(mut self, value: Option<Vec<ViewRecordEmbedsItem<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1348,11 +1339,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ViewRecordBuilder<'a, view_record_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ViewRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1360,12 +1351,12 @@ where
 impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1373,12 +1364,12 @@ impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
 impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
     /// Set the `likeCount` field (optional)
     pub fn like_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `likeCount` field to an Option value (optional)
     pub fn maybe_like_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1386,12 +1377,12 @@ impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
 impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
     /// Set the `quoteCount` field (optional)
     pub fn quote_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `quoteCount` field to an Option value (optional)
     pub fn maybe_quote_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1399,12 +1390,12 @@ impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
 impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
     /// Set the `replyCount` field (optional)
     pub fn reply_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `replyCount` field to an Option value (optional)
     pub fn maybe_reply_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -1412,12 +1403,12 @@ impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
 impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
     /// Set the `repostCount` field (optional)
     pub fn repost_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `repostCount` field to an Option value (optional)
     pub fn maybe_repost_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -1432,11 +1423,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ViewRecordBuilder<'a, view_record_state::SetUri<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ViewRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1451,11 +1442,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> ViewRecordBuilder<'a, view_record_state::SetValue<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         ViewRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1463,26 +1454,26 @@ where
 impl<'a, S> ViewRecordBuilder<'a, S>
 where
     S: view_record_state::State,
-    S::Value: view_record_state::IsSet,
-    S::IndexedAt: view_record_state::IsSet,
+    S::Cid: view_record_state::IsSet,
     S::Author: view_record_state::IsSet,
+    S::Value: view_record_state::IsSet,
     S::Uri: view_record_state::IsSet,
-    S::Cid: view_record_state::IsSet,
+    S::IndexedAt: view_record_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ViewRecord<'a> {
         ViewRecord {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            embeds: self.__unsafe_private_named.2,
-            indexed_at: self.__unsafe_private_named.3.unwrap(),
-            labels: self.__unsafe_private_named.4,
-            like_count: self.__unsafe_private_named.5,
-            quote_count: self.__unsafe_private_named.6,
-            reply_count: self.__unsafe_private_named.7,
-            repost_count: self.__unsafe_private_named.8,
-            uri: self.__unsafe_private_named.9.unwrap(),
-            value: self.__unsafe_private_named.10.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            embeds: self._fields.2,
+            indexed_at: self._fields.3.unwrap(),
+            labels: self._fields.4,
+            like_count: self._fields.5,
+            quote_count: self._fields.6,
+            reply_count: self._fields.7,
+            repost_count: self._fields.8,
+            uri: self._fields.9.unwrap(),
+            value: self._fields.10.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1492,17 +1483,17 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ViewRecord<'a> {
         ViewRecord {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            embeds: self.__unsafe_private_named.2,
-            indexed_at: self.__unsafe_private_named.3.unwrap(),
-            labels: self.__unsafe_private_named.4,
-            like_count: self.__unsafe_private_named.5,
-            quote_count: self.__unsafe_private_named.6,
-            reply_count: self.__unsafe_private_named.7,
-            repost_count: self.__unsafe_private_named.8,
-            uri: self.__unsafe_private_named.9.unwrap(),
-            value: self.__unsafe_private_named.10.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            embeds: self._fields.2,
+            indexed_at: self._fields.3.unwrap(),
+            labels: self._fields.4,
+            like_count: self._fields.5,
+            quote_count: self._fields.6,
+            reply_count: self._fields.7,
+            repost_count: self._fields.8,
+            uri: self._fields.9.unwrap(),
+            value: self._fields.10.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/embed/record_with_media.rs b/crates/jacquard-api/src/app_bsky/embed/record_with_media.rs
index 6a02660c..9dda48f5 100644
--- a/crates/jacquard-api/src/app_bsky/embed/record_with_media.rs
+++ b/crates/jacquard-api/src/app_bsky/embed/record_with_media.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -151,9 +154,9 @@ pub mod record_with_media_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordWithMediaBuilder<'a, S: record_with_media_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<RecordWithMediaMedia<'a>>, Option<Record<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<RecordWithMediaMedia<'a>>, Option<Record<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RecordWithMedia<'a> {
@@ -167,9 +170,9 @@ impl<'a> RecordWithMediaBuilder<'a, record_with_media_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordWithMediaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -184,11 +187,11 @@ where
         mut self,
         value: impl Into<RecordWithMediaMedia<'a>>,
     ) -> RecordWithMediaBuilder<'a, record_with_media_state::SetMedia<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordWithMediaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,11 +206,11 @@ where
         mut self,
         value: impl Into<Record<'a>>,
     ) -> RecordWithMediaBuilder<'a, record_with_media_state::SetRecord<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RecordWithMediaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,8 +224,8 @@ where
     /// Build the final struct
     pub fn build(self) -> RecordWithMedia<'a> {
         RecordWithMedia {
-            media: self.__unsafe_private_named.0.unwrap(),
-            record: self.__unsafe_private_named.1.unwrap(),
+            media: self._fields.0.unwrap(),
+            record: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -235,8 +238,8 @@ where
         >,
     ) -> RecordWithMedia<'a> {
         RecordWithMedia {
-            media: self.__unsafe_private_named.0.unwrap(),
-            record: self.__unsafe_private_named.1.unwrap(),
+            media: self._fields.0.unwrap(),
+            record: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -368,9 +371,9 @@ pub mod view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewBuilder<'a, S: view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ViewMedia<'a>>, Option<record::View<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ViewMedia<'a>>, Option<record::View<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> View<'a> {
@@ -384,9 +387,9 @@ impl<'a> ViewBuilder<'a, view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -401,11 +404,11 @@ where
         mut self,
         value: impl Into<ViewMedia<'a>>,
     ) -> ViewBuilder<'a, view_state::SetMedia<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -420,11 +423,11 @@ where
         mut self,
         value: impl Into<record::View<'a>>,
     ) -> ViewBuilder<'a, view_state::SetRecord<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -438,8 +441,8 @@ where
     /// Build the final struct
     pub fn build(self) -> View<'a> {
         View {
-            media: self.__unsafe_private_named.0.unwrap(),
-            record: self.__unsafe_private_named.1.unwrap(),
+            media: self._fields.0.unwrap(),
+            record: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -452,8 +455,8 @@ where
         >,
     ) -> View<'a> {
         View {
-            media: self.__unsafe_private_named.0.unwrap(),
-            record: self.__unsafe_private_named.1.unwrap(),
+            media: self._fields.0.unwrap(),
+            record: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/embed/video.rs b/crates/jacquard-api/src/app_bsky/embed/video.rs
index 3b98ac5f..c7168044 100644
--- a/crates/jacquard-api/src/app_bsky/embed/video.rs
+++ b/crates/jacquard-api/src/app_bsky/embed/video.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -485,9 +488,9 @@ pub mod caption_state {
 
 /// Builder for constructing an instance of this type
 pub struct CaptionBuilder<'a, S: caption_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>, Option<Language>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>, Option<Language>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Caption<'a> {
@@ -501,9 +504,9 @@ impl<'a> CaptionBuilder<'a, caption_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CaptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -518,11 +521,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> CaptionBuilder<'a, caption_state::SetFile<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CaptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -537,11 +540,11 @@ where
         mut self,
         value: impl Into<Language>,
     ) -> CaptionBuilder<'a, caption_state::SetLang<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CaptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -555,8 +558,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Caption<'a> {
         Caption {
-            file: self.__unsafe_private_named.0.unwrap(),
-            lang: self.__unsafe_private_named.1.unwrap(),
+            file: self._fields.0.unwrap(),
+            lang: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -569,8 +572,8 @@ where
         >,
     ) -> Caption<'a> {
         Caption {
-            file: self.__unsafe_private_named.0.unwrap(),
-            lang: self.__unsafe_private_named.1.unwrap(),
+            file: self._fields.0.unwrap(),
+            lang: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -774,15 +777,15 @@ pub mod video_state {
 
 /// Builder for constructing an instance of this type
 pub struct VideoBuilder<'a, S: video_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<AspectRatio<'a>>,
         Option<Vec<video::Caption<'a>>>,
         Option<VideoPresentation<'a>>,
         Option<BlobRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Video<'a> {
@@ -796,9 +799,9 @@ impl<'a> VideoBuilder<'a, video_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VideoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -806,12 +809,12 @@ impl<'a> VideoBuilder<'a, video_state::Empty> {
 impl<'a, S: video_state::State> VideoBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -819,12 +822,12 @@ impl<'a, S: video_state::State> VideoBuilder<'a, S> {
 impl<'a, S: video_state::State> VideoBuilder<'a, S> {
     /// Set the `aspectRatio` field (optional)
     pub fn aspect_ratio(mut self, value: impl Into<Option<AspectRatio<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
     pub fn maybe_aspect_ratio(mut self, value: Option<AspectRatio<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -835,12 +838,12 @@ impl<'a, S: video_state::State> VideoBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<video::Caption<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `captions` field to an Option value (optional)
     pub fn maybe_captions(mut self, value: Option<Vec<video::Caption<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -851,12 +854,12 @@ impl<'a, S: video_state::State> VideoBuilder<'a, S> {
         mut self,
         value: impl Into<Option<VideoPresentation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `presentation` field to an Option value (optional)
     pub fn maybe_presentation(mut self, value: Option<VideoPresentation<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -871,11 +874,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> VideoBuilder<'a, video_state::SetVideo<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         VideoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -888,11 +891,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Video<'a> {
         Video {
-            alt: self.__unsafe_private_named.0,
-            aspect_ratio: self.__unsafe_private_named.1,
-            captions: self.__unsafe_private_named.2,
-            presentation: self.__unsafe_private_named.3,
-            video: self.__unsafe_private_named.4.unwrap(),
+            alt: self._fields.0,
+            aspect_ratio: self._fields.1,
+            captions: self._fields.2,
+            presentation: self._fields.3,
+            video: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -905,11 +908,11 @@ where
         >,
     ) -> Video<'a> {
         Video {
-            alt: self.__unsafe_private_named.0,
-            aspect_ratio: self.__unsafe_private_named.1,
-            captions: self.__unsafe_private_named.2,
-            presentation: self.__unsafe_private_named.3,
-            video: self.__unsafe_private_named.4.unwrap(),
+            alt: self._fields.0,
+            aspect_ratio: self._fields.1,
+            captions: self._fields.2,
+            presentation: self._fields.3,
+            video: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -961,8 +964,8 @@ pub mod view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewBuilder<'a, S: view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<AspectRatio<'a>>,
         Option<Cid<'a>>,
@@ -970,7 +973,7 @@ pub struct ViewBuilder<'a, S: view_state::State> {
         Option<ViewPresentation<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> View<'a> {
@@ -984,9 +987,9 @@ impl<'a> ViewBuilder<'a, view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -994,12 +997,12 @@ impl<'a> ViewBuilder<'a, view_state::Empty> {
 impl<'a, S: view_state::State> ViewBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1007,12 +1010,12 @@ impl<'a, S: view_state::State> ViewBuilder<'a, S> {
 impl<'a, S: view_state::State> ViewBuilder<'a, S> {
     /// Set the `aspectRatio` field (optional)
     pub fn aspect_ratio(mut self, value: impl Into<Option<AspectRatio<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
     pub fn maybe_aspect_ratio(mut self, value: Option<AspectRatio<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1027,11 +1030,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> ViewBuilder<'a, view_state::SetCid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1046,11 +1049,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ViewBuilder<'a, view_state::SetPlaylist<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1061,12 +1064,12 @@ impl<'a, S: view_state::State> ViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ViewPresentation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `presentation` field to an Option value (optional)
     pub fn maybe_presentation(mut self, value: Option<ViewPresentation<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1074,12 +1077,12 @@ impl<'a, S: view_state::State> ViewBuilder<'a, S> {
 impl<'a, S: view_state::State> ViewBuilder<'a, S> {
     /// Set the `thumbnail` field (optional)
     pub fn thumbnail(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1093,12 +1096,12 @@ where
     /// Build the final struct
     pub fn build(self) -> View<'a> {
         View {
-            alt: self.__unsafe_private_named.0,
-            aspect_ratio: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            playlist: self.__unsafe_private_named.3.unwrap(),
-            presentation: self.__unsafe_private_named.4,
-            thumbnail: self.__unsafe_private_named.5,
+            alt: self._fields.0,
+            aspect_ratio: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            playlist: self._fields.3.unwrap(),
+            presentation: self._fields.4,
+            thumbnail: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -1111,12 +1114,12 @@ where
         >,
     ) -> View<'a> {
         View {
-            alt: self.__unsafe_private_named.0,
-            aspect_ratio: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            playlist: self.__unsafe_private_named.3.unwrap(),
-            presentation: self.__unsafe_private_named.4,
-            thumbnail: self.__unsafe_private_named.5,
+            alt: self._fields.0,
+            aspect_ratio: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            playlist: self._fields.3.unwrap(),
+            presentation: self._fields.4,
+            thumbnail: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/feed.rs b/crates/jacquard-api/src/app_bsky/feed.rs
index dcc24f40..ac9d1881 100644
--- a/crates/jacquard-api/src/app_bsky/feed.rs
+++ b/crates/jacquard-api/src/app_bsky/feed.rs
@@ -30,7 +30,11 @@ pub mod search_posts;
 pub mod send_interactions;
 pub mod threadgate;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -1224,9 +1228,9 @@ pub mod blocked_author_state {
 
 /// Builder for constructing an instance of this type
 pub struct BlockedAuthorBuilder<'a, S: blocked_author_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<actor::ViewerState<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<actor::ViewerState<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BlockedAuthor<'a> {
@@ -1240,9 +1244,9 @@ impl<'a> BlockedAuthorBuilder<'a, blocked_author_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlockedAuthorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1257,11 +1261,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> BlockedAuthorBuilder<'a, blocked_author_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlockedAuthorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1269,12 +1273,12 @@ where
 impl<'a, S: blocked_author_state::State> BlockedAuthorBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<actor::ViewerState<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<actor::ViewerState<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1287,8 +1291,8 @@ where
     /// Build the final struct
     pub fn build(self) -> BlockedAuthor<'a> {
         BlockedAuthor {
-            did: self.__unsafe_private_named.0.unwrap(),
-            viewer: self.__unsafe_private_named.1,
+            did: self._fields.0.unwrap(),
+            viewer: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -1298,8 +1302,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> BlockedAuthor<'a> {
         BlockedAuthor {
-            did: self.__unsafe_private_named.0.unwrap(),
-            viewer: self.__unsafe_private_named.1,
+            did: self._fields.0.unwrap(),
+            viewer: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
@@ -2197,63 +2201,59 @@ pub mod blocked_post_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Author;
         type Blocked;
         type Uri;
-        type Author;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Author = Unset;
         type Blocked = Unset;
         type Uri = Unset;
-        type Author = Unset;
+    }
+    ///State transition - sets the `author` field to Set
+    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAuthor<S> {}
+    impl<S: State> State for SetAuthor<S> {
+        type Author = Set<members::author>;
+        type Blocked = S::Blocked;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `blocked` field to Set
     pub struct SetBlocked<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBlocked<S> {}
     impl<S: State> State for SetBlocked<S> {
+        type Author = S::Author;
         type Blocked = Set<members::blocked>;
         type Uri = S::Uri;
-        type Author = S::Author;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Blocked = S::Blocked;
-        type Uri = Set<members::uri>;
         type Author = S::Author;
-    }
-    ///State transition - sets the `author` field to Set
-    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAuthor<S> {}
-    impl<S: State> State for SetAuthor<S> {
         type Blocked = S::Blocked;
-        type Uri = S::Uri;
-        type Author = Set<members::author>;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `author` field
+        pub struct author(());
         ///Marker type for the `blocked` field
         pub struct blocked(());
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `author` field
-        pub struct author(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BlockedPostBuilder<'a, S: blocked_post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<feed::BlockedAuthor<'a>>,
-        Option<bool>,
-        Option<AtUri<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<feed::BlockedAuthor<'a>>, Option<bool>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BlockedPost<'a> {
@@ -2267,9 +2267,9 @@ impl<'a> BlockedPostBuilder<'a, blocked_post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlockedPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2284,11 +2284,11 @@ where
         mut self,
         value: impl Into<feed::BlockedAuthor<'a>>,
     ) -> BlockedPostBuilder<'a, blocked_post_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlockedPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2303,11 +2303,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> BlockedPostBuilder<'a, blocked_post_state::SetBlocked<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BlockedPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2322,11 +2322,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> BlockedPostBuilder<'a, blocked_post_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BlockedPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2334,16 +2334,16 @@ where
 impl<'a, S> BlockedPostBuilder<'a, S>
 where
     S: blocked_post_state::State,
+    S::Author: blocked_post_state::IsSet,
     S::Blocked: blocked_post_state::IsSet,
     S::Uri: blocked_post_state::IsSet,
-    S::Author: blocked_post_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> BlockedPost<'a> {
         BlockedPost {
-            author: self.__unsafe_private_named.0.unwrap(),
-            blocked: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            author: self._fields.0.unwrap(),
+            blocked: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2353,9 +2353,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> BlockedPost<'a> {
         BlockedPost {
-            author: self.__unsafe_private_named.0.unwrap(),
-            blocked: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            author: self._fields.0.unwrap(),
+            blocked: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2395,15 +2395,15 @@ pub mod feed_view_post_state {
 
 /// Builder for constructing an instance of this type
 pub struct FeedViewPostBuilder<'a, S: feed_view_post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<feed::PostView<'a>>,
         Option<FeedViewPostReason<'a>>,
         Option<feed::ReplyRef<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> FeedViewPost<'a> {
@@ -2417,9 +2417,9 @@ impl<'a> FeedViewPostBuilder<'a, feed_view_post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FeedViewPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2427,12 +2427,12 @@ impl<'a> FeedViewPostBuilder<'a, feed_view_post_state::Empty> {
 impl<'a, S: feed_view_post_state::State> FeedViewPostBuilder<'a, S> {
     /// Set the `feedContext` field (optional)
     pub fn feed_context(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `feedContext` field to an Option value (optional)
     pub fn maybe_feed_context(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -2447,11 +2447,11 @@ where
         mut self,
         value: impl Into<feed::PostView<'a>>,
     ) -> FeedViewPostBuilder<'a, feed_view_post_state::SetPost<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FeedViewPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2459,12 +2459,12 @@ where
 impl<'a, S: feed_view_post_state::State> FeedViewPostBuilder<'a, S> {
     /// Set the `reason` field (optional)
     pub fn reason(mut self, value: impl Into<Option<FeedViewPostReason<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `reason` field to an Option value (optional)
     pub fn maybe_reason(mut self, value: Option<FeedViewPostReason<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -2472,12 +2472,12 @@ impl<'a, S: feed_view_post_state::State> FeedViewPostBuilder<'a, S> {
 impl<'a, S: feed_view_post_state::State> FeedViewPostBuilder<'a, S> {
     /// Set the `reply` field (optional)
     pub fn reply(mut self, value: impl Into<Option<feed::ReplyRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `reply` field to an Option value (optional)
     pub fn maybe_reply(mut self, value: Option<feed::ReplyRef<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -2485,12 +2485,12 @@ impl<'a, S: feed_view_post_state::State> FeedViewPostBuilder<'a, S> {
 impl<'a, S: feed_view_post_state::State> FeedViewPostBuilder<'a, S> {
     /// Set the `reqId` field (optional)
     pub fn req_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `reqId` field to an Option value (optional)
     pub fn maybe_req_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -2503,11 +2503,11 @@ where
     /// Build the final struct
     pub fn build(self) -> FeedViewPost<'a> {
         FeedViewPost {
-            feed_context: self.__unsafe_private_named.0,
-            post: self.__unsafe_private_named.1.unwrap(),
-            reason: self.__unsafe_private_named.2,
-            reply: self.__unsafe_private_named.3,
-            req_id: self.__unsafe_private_named.4,
+            feed_context: self._fields.0,
+            post: self._fields.1.unwrap(),
+            reason: self._fields.2,
+            reply: self._fields.3,
+            req_id: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -2517,11 +2517,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> FeedViewPost<'a> {
         FeedViewPost {
-            feed_context: self.__unsafe_private_named.0,
-            post: self.__unsafe_private_named.1.unwrap(),
-            reason: self.__unsafe_private_named.2,
-            reply: self.__unsafe_private_named.3,
-            req_id: self.__unsafe_private_named.4,
+            feed_context: self._fields.0,
+            post: self._fields.1.unwrap(),
+            reason: self._fields.2,
+            reply: self._fields.3,
+            req_id: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
@@ -2538,10 +2538,10 @@ pub mod generator_view_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type IndexedAt;
+        type DisplayName;
         type Creator;
-        type Cid;
         type Did;
-        type DisplayName;
+        type Cid;
         type Uri;
     }
     /// Empty state - all required fields are unset
@@ -2549,10 +2549,10 @@ pub mod generator_view_state {
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type IndexedAt = Unset;
+        type DisplayName = Unset;
         type Creator = Unset;
-        type Cid = Unset;
         type Did = Unset;
-        type DisplayName = Unset;
+        type Cid = Unset;
         type Uri = Unset;
     }
     ///State transition - sets the `indexed_at` field to Set
@@ -2560,10 +2560,21 @@ pub mod generator_view_state {
     impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
     impl<S: State> State for SetIndexedAt<S> {
         type IndexedAt = Set<members::indexed_at>;
+        type DisplayName = S::DisplayName;
         type Creator = S::Creator;
+        type Did = S::Did;
         type Cid = S::Cid;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `display_name` field to Set
+    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
+    impl<S: State> State for SetDisplayName<S> {
+        type IndexedAt = S::IndexedAt;
+        type DisplayName = Set<members::display_name>;
+        type Creator = S::Creator;
         type Did = S::Did;
-        type DisplayName = S::DisplayName;
+        type Cid = S::Cid;
         type Uri = S::Uri;
     }
     ///State transition - sets the `creator` field to Set
@@ -2571,21 +2582,10 @@ pub mod generator_view_state {
     impl<S: State> sealed::Sealed for SetCreator<S> {}
     impl<S: State> State for SetCreator<S> {
         type IndexedAt = S::IndexedAt;
-        type Creator = Set<members::creator>;
-        type Cid = S::Cid;
-        type Did = S::Did;
         type DisplayName = S::DisplayName;
-        type Uri = S::Uri;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type IndexedAt = S::IndexedAt;
-        type Creator = S::Creator;
-        type Cid = Set<members::cid>;
+        type Creator = Set<members::creator>;
         type Did = S::Did;
-        type DisplayName = S::DisplayName;
+        type Cid = S::Cid;
         type Uri = S::Uri;
     }
     ///State transition - sets the `did` field to Set
@@ -2593,21 +2593,21 @@ pub mod generator_view_state {
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
         type IndexedAt = S::IndexedAt;
+        type DisplayName = S::DisplayName;
         type Creator = S::Creator;
-        type Cid = S::Cid;
         type Did = Set<members::did>;
-        type DisplayName = S::DisplayName;
+        type Cid = S::Cid;
         type Uri = S::Uri;
     }
-    ///State transition - sets the `display_name` field to Set
-    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
-    impl<S: State> State for SetDisplayName<S> {
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
         type IndexedAt = S::IndexedAt;
+        type DisplayName = S::DisplayName;
         type Creator = S::Creator;
-        type Cid = S::Cid;
         type Did = S::Did;
-        type DisplayName = Set<members::display_name>;
+        type Cid = Set<members::cid>;
         type Uri = S::Uri;
     }
     ///State transition - sets the `uri` field to Set
@@ -2615,10 +2615,10 @@ pub mod generator_view_state {
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
         type IndexedAt = S::IndexedAt;
+        type DisplayName = S::DisplayName;
         type Creator = S::Creator;
-        type Cid = S::Cid;
         type Did = S::Did;
-        type DisplayName = S::DisplayName;
+        type Cid = S::Cid;
         type Uri = Set<members::uri>;
     }
     /// Marker types for field names
@@ -2626,14 +2626,14 @@ pub mod generator_view_state {
     pub mod members {
         ///Marker type for the `indexed_at` field
         pub struct indexed_at(());
+        ///Marker type for the `display_name` field
+        pub struct display_name(());
         ///Marker type for the `creator` field
         pub struct creator(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `did` field
         pub struct did(());
-        ///Marker type for the `display_name` field
-        pub struct display_name(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
         ///Marker type for the `uri` field
         pub struct uri(());
     }
@@ -2641,8 +2641,8 @@ pub mod generator_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct GeneratorViewBuilder<'a, S: generator_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<UriValue<'a>>,
         Option<Cid<'a>>,
@@ -2658,7 +2658,7 @@ pub struct GeneratorViewBuilder<'a, S: generator_view_state::State> {
         Option<AtUri<'a>>,
         Option<feed::GeneratorViewerState<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GeneratorView<'a> {
@@ -2672,8 +2672,8 @@ impl<'a> GeneratorViewBuilder<'a, generator_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GeneratorViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -2689,7 +2689,7 @@ impl<'a> GeneratorViewBuilder<'a, generator_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2697,12 +2697,12 @@ impl<'a> GeneratorViewBuilder<'a, generator_view_state::Empty> {
 impl<'a, S: generator_view_state::State> GeneratorViewBuilder<'a, S> {
     /// Set the `acceptsInteractions` field (optional)
     pub fn accepts_interactions(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `acceptsInteractions` field to an Option value (optional)
     pub fn maybe_accepts_interactions(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -2710,12 +2710,12 @@ impl<'a, S: generator_view_state::State> GeneratorViewBuilder<'a, S> {
 impl<'a, S: generator_view_state::State> GeneratorViewBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -2730,11 +2730,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> GeneratorViewBuilder<'a, generator_view_state::SetCid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GeneratorViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2745,7 +2745,7 @@ impl<'a, S: generator_view_state::State> GeneratorViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<GeneratorViewContentMode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `contentMode` field to an Option value (optional)
@@ -2753,7 +2753,7 @@ impl<'a, S: generator_view_state::State> GeneratorViewBuilder<'a, S> {
         mut self,
         value: Option<GeneratorViewContentMode<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -2768,11 +2768,11 @@ where
         mut self,
         value: impl Into<ProfileView<'a>>,
     ) -> GeneratorViewBuilder<'a, generator_view_state::SetCreator<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         GeneratorViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2780,12 +2780,12 @@ where
 impl<'a, S: generator_view_state::State> GeneratorViewBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -2796,12 +2796,12 @@ impl<'a, S: generator_view_state::State> GeneratorViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `descriptionFacets` field to an Option value (optional)
     pub fn maybe_description_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -2816,11 +2816,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GeneratorViewBuilder<'a, generator_view_state::SetDid<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         GeneratorViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2835,11 +2835,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GeneratorViewBuilder<'a, generator_view_state::SetDisplayName<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         GeneratorViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2854,11 +2854,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> GeneratorViewBuilder<'a, generator_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         GeneratorViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2866,12 +2866,12 @@ where
 impl<'a, S: generator_view_state::State> GeneratorViewBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -2879,12 +2879,12 @@ impl<'a, S: generator_view_state::State> GeneratorViewBuilder<'a, S> {
 impl<'a, S: generator_view_state::State> GeneratorViewBuilder<'a, S> {
     /// Set the `likeCount` field (optional)
     pub fn like_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `likeCount` field to an Option value (optional)
     pub fn maybe_like_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -2899,11 +2899,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GeneratorViewBuilder<'a, generator_view_state::SetUri<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         GeneratorViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2914,7 +2914,7 @@ impl<'a, S: generator_view_state::State> GeneratorViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<feed::GeneratorViewerState<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
@@ -2922,7 +2922,7 @@ impl<'a, S: generator_view_state::State> GeneratorViewBuilder<'a, S> {
         mut self,
         value: Option<feed::GeneratorViewerState<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -2931,29 +2931,29 @@ impl<'a, S> GeneratorViewBuilder<'a, S>
 where
     S: generator_view_state::State,
     S::IndexedAt: generator_view_state::IsSet,
+    S::DisplayName: generator_view_state::IsSet,
     S::Creator: generator_view_state::IsSet,
-    S::Cid: generator_view_state::IsSet,
     S::Did: generator_view_state::IsSet,
-    S::DisplayName: generator_view_state::IsSet,
+    S::Cid: generator_view_state::IsSet,
     S::Uri: generator_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GeneratorView<'a> {
         GeneratorView {
-            accepts_interactions: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            content_mode: self.__unsafe_private_named.3,
-            creator: self.__unsafe_private_named.4.unwrap(),
-            description: self.__unsafe_private_named.5,
-            description_facets: self.__unsafe_private_named.6,
-            did: self.__unsafe_private_named.7.unwrap(),
-            display_name: self.__unsafe_private_named.8.unwrap(),
-            indexed_at: self.__unsafe_private_named.9.unwrap(),
-            labels: self.__unsafe_private_named.10,
-            like_count: self.__unsafe_private_named.11,
-            uri: self.__unsafe_private_named.12.unwrap(),
-            viewer: self.__unsafe_private_named.13,
+            accepts_interactions: self._fields.0,
+            avatar: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            content_mode: self._fields.3,
+            creator: self._fields.4.unwrap(),
+            description: self._fields.5,
+            description_facets: self._fields.6,
+            did: self._fields.7.unwrap(),
+            display_name: self._fields.8.unwrap(),
+            indexed_at: self._fields.9.unwrap(),
+            labels: self._fields.10,
+            like_count: self._fields.11,
+            uri: self._fields.12.unwrap(),
+            viewer: self._fields.13,
             extra_data: Default::default(),
         }
     }
@@ -2963,20 +2963,20 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> GeneratorView<'a> {
         GeneratorView {
-            accepts_interactions: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            content_mode: self.__unsafe_private_named.3,
-            creator: self.__unsafe_private_named.4.unwrap(),
-            description: self.__unsafe_private_named.5,
-            description_facets: self.__unsafe_private_named.6,
-            did: self.__unsafe_private_named.7.unwrap(),
-            display_name: self.__unsafe_private_named.8.unwrap(),
-            indexed_at: self.__unsafe_private_named.9.unwrap(),
-            labels: self.__unsafe_private_named.10,
-            like_count: self.__unsafe_private_named.11,
-            uri: self.__unsafe_private_named.12.unwrap(),
-            viewer: self.__unsafe_private_named.13,
+            accepts_interactions: self._fields.0,
+            avatar: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            content_mode: self._fields.3,
+            creator: self._fields.4.unwrap(),
+            description: self._fields.5,
+            description_facets: self._fields.6,
+            did: self._fields.7.unwrap(),
+            display_name: self._fields.8.unwrap(),
+            indexed_at: self._fields.9.unwrap(),
+            labels: self._fields.10,
+            like_count: self._fields.11,
+            uri: self._fields.12.unwrap(),
+            viewer: self._fields.13,
             extra_data: Some(extra_data),
         }
     }
@@ -3028,9 +3028,9 @@ pub mod not_found_post_state {
 
 /// Builder for constructing an instance of this type
 pub struct NotFoundPostBuilder<'a, S: not_found_post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> NotFoundPost<'a> {
@@ -3044,9 +3044,9 @@ impl<'a> NotFoundPostBuilder<'a, not_found_post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NotFoundPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3061,11 +3061,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> NotFoundPostBuilder<'a, not_found_post_state::SetNotFound<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NotFoundPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3080,11 +3080,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> NotFoundPostBuilder<'a, not_found_post_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         NotFoundPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3098,8 +3098,8 @@ where
     /// Build the final struct
     pub fn build(self) -> NotFoundPost<'a> {
         NotFoundPost {
-            not_found: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            not_found: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3109,8 +3109,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> NotFoundPost<'a> {
         NotFoundPost {
-            not_found: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            not_found: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -3126,92 +3126,92 @@ pub mod post_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type IndexedAt;
         type Record;
-        type Cid;
         type Uri;
+        type IndexedAt;
         type Author;
+        type Cid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type IndexedAt = Unset;
         type Record = Unset;
-        type Cid = Unset;
         type Uri = Unset;
+        type IndexedAt = Unset;
         type Author = Unset;
-    }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
-        type IndexedAt = Set<members::indexed_at>;
-        type Record = S::Record;
-        type Cid = S::Cid;
-        type Uri = S::Uri;
-        type Author = S::Author;
+        type Cid = Unset;
     }
     ///State transition - sets the `record` field to Set
     pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecord<S> {}
     impl<S: State> State for SetRecord<S> {
-        type IndexedAt = S::IndexedAt;
         type Record = Set<members::record>;
-        type Cid = S::Cid;
         type Uri = S::Uri;
-        type Author = S::Author;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
         type IndexedAt = S::IndexedAt;
-        type Record = S::Record;
-        type Cid = Set<members::cid>;
-        type Uri = S::Uri;
         type Author = S::Author;
+        type Cid = S::Cid;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type IndexedAt = S::IndexedAt;
         type Record = S::Record;
-        type Cid = S::Cid;
         type Uri = Set<members::uri>;
+        type IndexedAt = S::IndexedAt;
         type Author = S::Author;
+        type Cid = S::Cid;
+    }
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
+        type Record = S::Record;
+        type Uri = S::Uri;
+        type IndexedAt = Set<members::indexed_at>;
+        type Author = S::Author;
+        type Cid = S::Cid;
     }
     ///State transition - sets the `author` field to Set
     pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthor<S> {}
     impl<S: State> State for SetAuthor<S> {
-        type IndexedAt = S::IndexedAt;
         type Record = S::Record;
-        type Cid = S::Cid;
         type Uri = S::Uri;
+        type IndexedAt = S::IndexedAt;
         type Author = Set<members::author>;
+        type Cid = S::Cid;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Record = S::Record;
+        type Uri = S::Uri;
+        type IndexedAt = S::IndexedAt;
+        type Author = S::Author;
+        type Cid = Set<members::cid>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `indexed_at` field
-        pub struct indexed_at(());
         ///Marker type for the `record` field
         pub struct record(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `indexed_at` field
+        pub struct indexed_at(());
         ///Marker type for the `author` field
         pub struct author(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PostViewBuilder<'a, S: post_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<i64>,
         Option<Cid<'a>>,
@@ -3228,7 +3228,7 @@ pub struct PostViewBuilder<'a, S: post_view_state::State> {
         Option<AtUri<'a>>,
         Option<feed::ViewerState<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PostView<'a> {
@@ -3242,8 +3242,8 @@ impl<'a> PostViewBuilder<'a, post_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -3260,7 +3260,7 @@ impl<'a> PostViewBuilder<'a, post_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3275,11 +3275,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> PostViewBuilder<'a, post_view_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PostViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3287,12 +3287,12 @@ where
 impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
     /// Set the `bookmarkCount` field (optional)
     pub fn bookmark_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `bookmarkCount` field to an Option value (optional)
     pub fn maybe_bookmark_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3307,11 +3307,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> PostViewBuilder<'a, post_view_state::SetCid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PostViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3319,12 +3319,12 @@ where
 impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
     /// Set the `debug` field (optional)
     pub fn debug(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `debug` field to an Option value (optional)
     pub fn maybe_debug(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -3332,12 +3332,12 @@ impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
 impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
     /// Set the `embed` field (optional)
     pub fn embed(mut self, value: impl Into<Option<PostViewEmbed<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `embed` field to an Option value (optional)
     pub fn maybe_embed(mut self, value: Option<PostViewEmbed<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -3352,11 +3352,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostViewBuilder<'a, post_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         PostViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3364,12 +3364,12 @@ where
 impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -3377,12 +3377,12 @@ impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
 impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
     /// Set the `likeCount` field (optional)
     pub fn like_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `likeCount` field to an Option value (optional)
     pub fn maybe_like_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -3390,12 +3390,12 @@ impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
 impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
     /// Set the `quoteCount` field (optional)
     pub fn quote_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `quoteCount` field to an Option value (optional)
     pub fn maybe_quote_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -3410,11 +3410,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> PostViewBuilder<'a, post_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         PostViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3422,12 +3422,12 @@ where
 impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
     /// Set the `replyCount` field (optional)
     pub fn reply_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `replyCount` field to an Option value (optional)
     pub fn maybe_reply_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -3435,12 +3435,12 @@ impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
 impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
     /// Set the `repostCount` field (optional)
     pub fn repost_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `repostCount` field to an Option value (optional)
     pub fn maybe_repost_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -3451,12 +3451,12 @@ impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<feed::ThreadgateView<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `threadgate` field to an Option value (optional)
     pub fn maybe_threadgate(mut self, value: Option<feed::ThreadgateView<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -3471,11 +3471,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PostViewBuilder<'a, post_view_state::SetUri<S>> {
-        self.__unsafe_private_named.13 = Option::Some(value.into());
+        self._fields.13 = Option::Some(value.into());
         PostViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3483,12 +3483,12 @@ where
 impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<feed::ViewerState<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<feed::ViewerState<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -3496,30 +3496,30 @@ impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
 impl<'a, S> PostViewBuilder<'a, S>
 where
     S: post_view_state::State,
-    S::IndexedAt: post_view_state::IsSet,
     S::Record: post_view_state::IsSet,
-    S::Cid: post_view_state::IsSet,
     S::Uri: post_view_state::IsSet,
+    S::IndexedAt: post_view_state::IsSet,
     S::Author: post_view_state::IsSet,
+    S::Cid: post_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PostView<'a> {
         PostView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            bookmark_count: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            debug: self.__unsafe_private_named.3,
-            embed: self.__unsafe_private_named.4,
-            indexed_at: self.__unsafe_private_named.5.unwrap(),
-            labels: self.__unsafe_private_named.6,
-            like_count: self.__unsafe_private_named.7,
-            quote_count: self.__unsafe_private_named.8,
-            record: self.__unsafe_private_named.9.unwrap(),
-            reply_count: self.__unsafe_private_named.10,
-            repost_count: self.__unsafe_private_named.11,
-            threadgate: self.__unsafe_private_named.12,
-            uri: self.__unsafe_private_named.13.unwrap(),
-            viewer: self.__unsafe_private_named.14,
+            author: self._fields.0.unwrap(),
+            bookmark_count: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            debug: self._fields.3,
+            embed: self._fields.4,
+            indexed_at: self._fields.5.unwrap(),
+            labels: self._fields.6,
+            like_count: self._fields.7,
+            quote_count: self._fields.8,
+            record: self._fields.9.unwrap(),
+            reply_count: self._fields.10,
+            repost_count: self._fields.11,
+            threadgate: self._fields.12,
+            uri: self._fields.13.unwrap(),
+            viewer: self._fields.14,
             extra_data: Default::default(),
         }
     }
@@ -3529,21 +3529,21 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> PostView<'a> {
         PostView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            bookmark_count: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            debug: self.__unsafe_private_named.3,
-            embed: self.__unsafe_private_named.4,
-            indexed_at: self.__unsafe_private_named.5.unwrap(),
-            labels: self.__unsafe_private_named.6,
-            like_count: self.__unsafe_private_named.7,
-            quote_count: self.__unsafe_private_named.8,
-            record: self.__unsafe_private_named.9.unwrap(),
-            reply_count: self.__unsafe_private_named.10,
-            repost_count: self.__unsafe_private_named.11,
-            threadgate: self.__unsafe_private_named.12,
-            uri: self.__unsafe_private_named.13.unwrap(),
-            viewer: self.__unsafe_private_named.14,
+            author: self._fields.0.unwrap(),
+            bookmark_count: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            debug: self._fields.3,
+            embed: self._fields.4,
+            indexed_at: self._fields.5.unwrap(),
+            labels: self._fields.6,
+            like_count: self._fields.7,
+            quote_count: self._fields.8,
+            record: self._fields.9.unwrap(),
+            reply_count: self._fields.10,
+            repost_count: self._fields.11,
+            threadgate: self._fields.12,
+            uri: self._fields.13.unwrap(),
+            viewer: self._fields.14,
             extra_data: Some(extra_data),
         }
     }
@@ -3559,50 +3559,50 @@ pub mod reason_repost_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type By;
         type IndexedAt;
+        type By;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type By = Unset;
         type IndexedAt = Unset;
-    }
-    ///State transition - sets the `by` field to Set
-    pub struct SetBy<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBy<S> {}
-    impl<S: State> State for SetBy<S> {
-        type By = Set<members::by>;
-        type IndexedAt = S::IndexedAt;
+        type By = Unset;
     }
     ///State transition - sets the `indexed_at` field to Set
     pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
     impl<S: State> State for SetIndexedAt<S> {
-        type By = S::By;
         type IndexedAt = Set<members::indexed_at>;
+        type By = S::By;
+    }
+    ///State transition - sets the `by` field to Set
+    pub struct SetBy<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBy<S> {}
+    impl<S: State> State for SetBy<S> {
+        type IndexedAt = S::IndexedAt;
+        type By = Set<members::by>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `by` field
-        pub struct by(());
         ///Marker type for the `indexed_at` field
         pub struct indexed_at(());
+        ///Marker type for the `by` field
+        pub struct by(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReasonRepostBuilder<'a, S: reason_repost_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<Cid<'a>>,
         Option<Datetime>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReasonRepost<'a> {
@@ -3616,9 +3616,9 @@ impl<'a> ReasonRepostBuilder<'a, reason_repost_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReasonRepostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3633,11 +3633,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> ReasonRepostBuilder<'a, reason_repost_state::SetBy<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReasonRepostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3645,12 +3645,12 @@ where
 impl<'a, S: reason_repost_state::State> ReasonRepostBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3665,11 +3665,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReasonRepostBuilder<'a, reason_repost_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReasonRepostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3677,12 +3677,12 @@ where
 impl<'a, S: reason_repost_state::State> ReasonRepostBuilder<'a, S> {
     /// Set the `uri` field (optional)
     pub fn uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `uri` field to an Option value (optional)
     pub fn maybe_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -3690,16 +3690,16 @@ impl<'a, S: reason_repost_state::State> ReasonRepostBuilder<'a, S> {
 impl<'a, S> ReasonRepostBuilder<'a, S>
 where
     S: reason_repost_state::State,
-    S::By: reason_repost_state::IsSet,
     S::IndexedAt: reason_repost_state::IsSet,
+    S::By: reason_repost_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ReasonRepost<'a> {
         ReasonRepost {
-            by: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1,
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3,
+            by: self._fields.0.unwrap(),
+            cid: self._fields.1,
+            indexed_at: self._fields.2.unwrap(),
+            uri: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -3709,10 +3709,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ReasonRepost<'a> {
         ReasonRepost {
-            by: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1,
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3,
+            by: self._fields.0.unwrap(),
+            cid: self._fields.1,
+            indexed_at: self._fields.2.unwrap(),
+            uri: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -3764,13 +3764,13 @@ pub mod reply_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReplyRefBuilder<'a, S: reply_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<ReplyRefParent<'a>>,
         Option<ReplyRefRoot<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReplyRef<'a> {
@@ -3784,9 +3784,9 @@ impl<'a> ReplyRefBuilder<'a, reply_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3797,7 +3797,7 @@ impl<'a, S: reply_ref_state::State> ReplyRefBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProfileViewBasic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `grandparentAuthor` field to an Option value (optional)
@@ -3805,7 +3805,7 @@ impl<'a, S: reply_ref_state::State> ReplyRefBuilder<'a, S> {
         mut self,
         value: Option<ProfileViewBasic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -3820,11 +3820,11 @@ where
         mut self,
         value: impl Into<ReplyRefParent<'a>>,
     ) -> ReplyRefBuilder<'a, reply_ref_state::SetParent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3839,11 +3839,11 @@ where
         mut self,
         value: impl Into<ReplyRefRoot<'a>>,
     ) -> ReplyRefBuilder<'a, reply_ref_state::SetRoot<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3857,9 +3857,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ReplyRef<'a> {
         ReplyRef {
-            grandparent_author: self.__unsafe_private_named.0,
-            parent: self.__unsafe_private_named.1.unwrap(),
-            root: self.__unsafe_private_named.2.unwrap(),
+            grandparent_author: self._fields.0,
+            parent: self._fields.1.unwrap(),
+            root: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3869,9 +3869,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ReplyRef<'a> {
         ReplyRef {
-            grandparent_author: self.__unsafe_private_named.0,
-            parent: self.__unsafe_private_named.1.unwrap(),
-            root: self.__unsafe_private_named.2.unwrap(),
+            grandparent_author: self._fields.0,
+            parent: self._fields.1.unwrap(),
+            root: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -3911,13 +3911,9 @@ pub mod skeleton_feed_post_state {
 
 /// Builder for constructing an instance of this type
 pub struct SkeletonFeedPostBuilder<'a, S: skeleton_feed_post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<AtUri<'a>>,
-        Option<SkeletonFeedPostReason<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>, Option<SkeletonFeedPostReason<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SkeletonFeedPost<'a> {
@@ -3931,9 +3927,9 @@ impl<'a> SkeletonFeedPostBuilder<'a, skeleton_feed_post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SkeletonFeedPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3941,12 +3937,12 @@ impl<'a> SkeletonFeedPostBuilder<'a, skeleton_feed_post_state::Empty> {
 impl<'a, S: skeleton_feed_post_state::State> SkeletonFeedPostBuilder<'a, S> {
     /// Set the `feedContext` field (optional)
     pub fn feed_context(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `feedContext` field to an Option value (optional)
     pub fn maybe_feed_context(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -3961,11 +3957,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SkeletonFeedPostBuilder<'a, skeleton_feed_post_state::SetPost<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SkeletonFeedPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3976,12 +3972,12 @@ impl<'a, S: skeleton_feed_post_state::State> SkeletonFeedPostBuilder<'a, S> {
         mut self,
         value: impl Into<Option<SkeletonFeedPostReason<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `reason` field to an Option value (optional)
     pub fn maybe_reason(mut self, value: Option<SkeletonFeedPostReason<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -3994,9 +3990,9 @@ where
     /// Build the final struct
     pub fn build(self) -> SkeletonFeedPost<'a> {
         SkeletonFeedPost {
-            feed_context: self.__unsafe_private_named.0,
-            post: self.__unsafe_private_named.1.unwrap(),
-            reason: self.__unsafe_private_named.2,
+            feed_context: self._fields.0,
+            post: self._fields.1.unwrap(),
+            reason: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -4006,9 +4002,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> SkeletonFeedPost<'a> {
         SkeletonFeedPost {
-            feed_context: self.__unsafe_private_named.0,
-            post: self.__unsafe_private_named.1.unwrap(),
-            reason: self.__unsafe_private_named.2,
+            feed_context: self._fields.0,
+            post: self._fields.1.unwrap(),
+            reason: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -4048,9 +4044,9 @@ pub mod skeleton_reason_repost_state {
 
 /// Builder for constructing an instance of this type
 pub struct SkeletonReasonRepostBuilder<'a, S: skeleton_reason_repost_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SkeletonReasonRepost<'a> {
@@ -4067,9 +4063,9 @@ impl<'a> SkeletonReasonRepostBuilder<'a, skeleton_reason_repost_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SkeletonReasonRepostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4084,11 +4080,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SkeletonReasonRepostBuilder<'a, skeleton_reason_repost_state::SetRepost<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SkeletonReasonRepostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4101,7 +4097,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SkeletonReasonRepost<'a> {
         SkeletonReasonRepost {
-            repost: self.__unsafe_private_named.0.unwrap(),
+            repost: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -4111,7 +4107,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> SkeletonReasonRepost<'a> {
         SkeletonReasonRepost {
-            repost: self.__unsafe_private_named.0.unwrap(),
+            repost: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -4151,14 +4147,14 @@ pub mod thread_view_post_state {
 
 /// Builder for constructing an instance of this type
 pub struct ThreadViewPostBuilder<'a, S: thread_view_post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ThreadViewPostParent<'a>>,
         Option<feed::PostView<'a>>,
         Option<Vec<ThreadViewPostRepliesItem<'a>>>,
         Option<feed::ThreadContext<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ThreadViewPost<'a> {
@@ -4172,9 +4168,9 @@ impl<'a> ThreadViewPostBuilder<'a, thread_view_post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ThreadViewPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4182,12 +4178,12 @@ impl<'a> ThreadViewPostBuilder<'a, thread_view_post_state::Empty> {
 impl<'a, S: thread_view_post_state::State> ThreadViewPostBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<ThreadViewPostParent<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<ThreadViewPostParent<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -4202,11 +4198,11 @@ where
         mut self,
         value: impl Into<feed::PostView<'a>>,
     ) -> ThreadViewPostBuilder<'a, thread_view_post_state::SetPost<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ThreadViewPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4217,7 +4213,7 @@ impl<'a, S: thread_view_post_state::State> ThreadViewPostBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<ThreadViewPostRepliesItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `replies` field to an Option value (optional)
@@ -4225,7 +4221,7 @@ impl<'a, S: thread_view_post_state::State> ThreadViewPostBuilder<'a, S> {
         mut self,
         value: Option<Vec<ThreadViewPostRepliesItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -4236,7 +4232,7 @@ impl<'a, S: thread_view_post_state::State> ThreadViewPostBuilder<'a, S> {
         mut self,
         value: impl Into<Option<feed::ThreadContext<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `threadContext` field to an Option value (optional)
@@ -4244,7 +4240,7 @@ impl<'a, S: thread_view_post_state::State> ThreadViewPostBuilder<'a, S> {
         mut self,
         value: Option<feed::ThreadContext<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -4257,10 +4253,10 @@ where
     /// Build the final struct
     pub fn build(self) -> ThreadViewPost<'a> {
         ThreadViewPost {
-            parent: self.__unsafe_private_named.0,
-            post: self.__unsafe_private_named.1.unwrap(),
-            replies: self.__unsafe_private_named.2,
-            thread_context: self.__unsafe_private_named.3,
+            parent: self._fields.0,
+            post: self._fields.1.unwrap(),
+            replies: self._fields.2,
+            thread_context: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -4270,10 +4266,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ThreadViewPost<'a> {
         ThreadViewPost {
-            parent: self.__unsafe_private_named.0,
-            post: self.__unsafe_private_named.1.unwrap(),
-            replies: self.__unsafe_private_named.2,
-            thread_context: self.__unsafe_private_named.3,
+            parent: self._fields.0,
+            post: self._fields.1.unwrap(),
+            replies: self._fields.2,
+            thread_context: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/feed/describe_feed_generator.rs b/crates/jacquard-api/src/app_bsky/feed/describe_feed_generator.rs
index fea4fb05..a81355a7 100644
--- a/crates/jacquard-api/src/app_bsky/feed/describe_feed_generator.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/describe_feed_generator.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -148,9 +151,9 @@ pub mod feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct FeedBuilder<'a, S: feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Feed<'a> {
@@ -164,9 +167,9 @@ impl<'a> FeedBuilder<'a, feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,11 +184,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> FeedBuilder<'a, feed_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,7 +201,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Feed<'a> {
         Feed {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -211,7 +214,7 @@ where
         >,
     ) -> Feed<'a> {
         Feed {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/feed/generator.rs b/crates/jacquard-api/src/app_bsky/feed/generator.rs
index dea53812..91ae3ea1 100644
--- a/crates/jacquard-api/src/app_bsky/feed/generator.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/generator.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -313,49 +316,49 @@ pub mod generator_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Did;
+        type CreatedAt;
         type DisplayName;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Did = Unset;
+        type CreatedAt = Unset;
         type DisplayName = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Did = S::Did;
-        type DisplayName = S::DisplayName;
-    }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type CreatedAt = S::CreatedAt;
         type Did = Set<members::did>;
+        type CreatedAt = S::CreatedAt;
+        type DisplayName = S::DisplayName;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Did = S::Did;
+        type CreatedAt = Set<members::created_at>;
         type DisplayName = S::DisplayName;
     }
     ///State transition - sets the `display_name` field to Set
     pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDisplayName<S> {}
     impl<S: State> State for SetDisplayName<S> {
-        type CreatedAt = S::CreatedAt;
         type Did = S::Did;
+        type CreatedAt = S::CreatedAt;
         type DisplayName = Set<members::display_name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `display_name` field
         pub struct display_name(());
     }
@@ -363,8 +366,8 @@ pub mod generator_state {
 
 /// Builder for constructing an instance of this type
 pub struct GeneratorBuilder<'a, S: generator_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<BlobRef<'a>>,
         Option<GeneratorContentMode<'a>>,
@@ -375,7 +378,7 @@ pub struct GeneratorBuilder<'a, S: generator_state::State> {
         Option<CowStr<'a>>,
         Option<SelfLabels<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Generator<'a> {
@@ -389,19 +392,9 @@ impl<'a> GeneratorBuilder<'a, generator_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GeneratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -409,12 +402,12 @@ impl<'a> GeneratorBuilder<'a, generator_state::Empty> {
 impl<'a, S: generator_state::State> GeneratorBuilder<'a, S> {
     /// Set the `acceptsInteractions` field (optional)
     pub fn accepts_interactions(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `acceptsInteractions` field to an Option value (optional)
     pub fn maybe_accepts_interactions(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -422,12 +415,12 @@ impl<'a, S: generator_state::State> GeneratorBuilder<'a, S> {
 impl<'a, S: generator_state::State> GeneratorBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -438,7 +431,7 @@ impl<'a, S: generator_state::State> GeneratorBuilder<'a, S> {
         mut self,
         value: impl Into<Option<GeneratorContentMode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `contentMode` field to an Option value (optional)
@@ -446,7 +439,7 @@ impl<'a, S: generator_state::State> GeneratorBuilder<'a, S> {
         mut self,
         value: Option<GeneratorContentMode<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -461,11 +454,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> GeneratorBuilder<'a, generator_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         GeneratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -473,12 +466,12 @@ where
 impl<'a, S: generator_state::State> GeneratorBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -489,12 +482,12 @@ impl<'a, S: generator_state::State> GeneratorBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `descriptionFacets` field to an Option value (optional)
     pub fn maybe_description_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -509,11 +502,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GeneratorBuilder<'a, generator_state::SetDid<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         GeneratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -528,11 +521,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GeneratorBuilder<'a, generator_state::SetDisplayName<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         GeneratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -540,12 +533,12 @@ where
 impl<'a, S: generator_state::State> GeneratorBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -553,22 +546,22 @@ impl<'a, S: generator_state::State> GeneratorBuilder<'a, S> {
 impl<'a, S> GeneratorBuilder<'a, S>
 where
     S: generator_state::State,
-    S::CreatedAt: generator_state::IsSet,
     S::Did: generator_state::IsSet,
+    S::CreatedAt: generator_state::IsSet,
     S::DisplayName: generator_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Generator<'a> {
         Generator {
-            accepts_interactions: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            content_mode: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            description: self.__unsafe_private_named.4,
-            description_facets: self.__unsafe_private_named.5,
-            did: self.__unsafe_private_named.6.unwrap(),
-            display_name: self.__unsafe_private_named.7.unwrap(),
-            labels: self.__unsafe_private_named.8,
+            accepts_interactions: self._fields.0,
+            avatar: self._fields.1,
+            content_mode: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            description: self._fields.4,
+            description_facets: self._fields.5,
+            did: self._fields.6.unwrap(),
+            display_name: self._fields.7.unwrap(),
+            labels: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -581,15 +574,15 @@ where
         >,
     ) -> Generator<'a> {
         Generator {
-            accepts_interactions: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            content_mode: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            description: self.__unsafe_private_named.4,
-            description_facets: self.__unsafe_private_named.5,
-            did: self.__unsafe_private_named.6.unwrap(),
-            display_name: self.__unsafe_private_named.7.unwrap(),
-            labels: self.__unsafe_private_named.8,
+            accepts_interactions: self._fields.0,
+            avatar: self._fields.1,
+            content_mode: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            description: self._fields.4,
+            description_facets: self._fields.5,
+            did: self._fields.6.unwrap(),
+            display_name: self._fields.7.unwrap(),
+            labels: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_actor_feeds.rs b/crates/jacquard-api/src/app_bsky/feed/get_actor_feeds.rs
index 372ead51..1209e48b 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_actor_feeds.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_actor_feeds.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -101,9 +104,9 @@ pub mod get_actor_feeds_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorFeedsBuilder<'a, S: get_actor_feeds_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorFeeds<'a> {
@@ -117,9 +120,9 @@ impl<'a> GetActorFeedsBuilder<'a, get_actor_feeds_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorFeedsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -134,11 +137,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorFeedsBuilder<'a, get_actor_feeds_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorFeedsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -146,12 +149,12 @@ where
 impl<'a, S: get_actor_feeds_state::State> GetActorFeedsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -159,12 +162,12 @@ impl<'a, S: get_actor_feeds_state::State> GetActorFeedsBuilder<'a, S> {
 impl<'a, S: get_actor_feeds_state::State> GetActorFeedsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -177,9 +180,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorFeeds<'a> {
         GetActorFeeds {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_actor_likes.rs b/crates/jacquard-api/src/app_bsky/feed/get_actor_likes.rs
index b0772139..a7d8cb63 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_actor_likes.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_actor_likes.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -146,9 +149,9 @@ pub mod get_actor_likes_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorLikesBuilder<'a, S: get_actor_likes_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorLikes<'a> {
@@ -162,9 +165,9 @@ impl<'a> GetActorLikesBuilder<'a, get_actor_likes_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorLikesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorLikesBuilder<'a, get_actor_likes_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorLikesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -191,12 +194,12 @@ where
 impl<'a, S: get_actor_likes_state::State> GetActorLikesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -204,12 +207,12 @@ impl<'a, S: get_actor_likes_state::State> GetActorLikesBuilder<'a, S> {
 impl<'a, S: get_actor_likes_state::State> GetActorLikesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -222,9 +225,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorLikes<'a> {
         GetActorLikes {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_author_feed.rs b/crates/jacquard-api/src/app_bsky/feed/get_author_feed.rs
index 65157018..4ea4def2 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_author_feed.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_author_feed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -163,15 +166,15 @@ pub mod get_author_feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetAuthorFeedBuilder<'a, S: get_author_feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<bool>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetAuthorFeed<'a> {
@@ -185,9 +188,9 @@ impl<'a> GetAuthorFeedBuilder<'a, get_author_feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetAuthorFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -202,11 +205,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetAuthorFeedBuilder<'a, get_author_feed_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetAuthorFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -214,12 +217,12 @@ where
 impl<'a, S: get_author_feed_state::State> GetAuthorFeedBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -227,12 +230,12 @@ impl<'a, S: get_author_feed_state::State> GetAuthorFeedBuilder<'a, S> {
 impl<'a, S: get_author_feed_state::State> GetAuthorFeedBuilder<'a, S> {
     /// Set the `filter` field (optional)
     pub fn filter(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `filter` field to an Option value (optional)
     pub fn maybe_filter(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -240,12 +243,12 @@ impl<'a, S: get_author_feed_state::State> GetAuthorFeedBuilder<'a, S> {
 impl<'a, S: get_author_feed_state::State> GetAuthorFeedBuilder<'a, S> {
     /// Set the `includePins` field (optional)
     pub fn include_pins(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `includePins` field to an Option value (optional)
     pub fn maybe_include_pins(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -253,12 +256,12 @@ impl<'a, S: get_author_feed_state::State> GetAuthorFeedBuilder<'a, S> {
 impl<'a, S: get_author_feed_state::State> GetAuthorFeedBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -271,11 +274,11 @@ where
     /// Build the final struct
     pub fn build(self) -> GetAuthorFeed<'a> {
         GetAuthorFeed {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            filter: self.__unsafe_private_named.2,
-            include_pins: self.__unsafe_private_named.3,
-            limit: self.__unsafe_private_named.4,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            filter: self._fields.2,
+            include_pins: self._fields.3,
+            limit: self._fields.4,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_feed.rs b/crates/jacquard-api/src/app_bsky/feed/get_feed.rs
index 47fc8bd3..56867071 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_feed.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_feed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -137,9 +140,9 @@ pub mod get_feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFeedBuilder<'a, S: get_feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFeed<'a> {
@@ -153,9 +156,9 @@ impl<'a> GetFeedBuilder<'a, get_feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -163,12 +166,12 @@ impl<'a> GetFeedBuilder<'a, get_feed_state::Empty> {
 impl<'a, S: get_feed_state::State> GetFeedBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -183,11 +186,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetFeedBuilder<'a, get_feed_state::SetFeed<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -195,12 +198,12 @@ where
 impl<'a, S: get_feed_state::State> GetFeedBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -213,9 +216,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFeed<'a> {
         GetFeed {
-            cursor: self.__unsafe_private_named.0,
-            feed: self.__unsafe_private_named.1.unwrap(),
-            limit: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            feed: self._fields.1.unwrap(),
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_feed_generator.rs b/crates/jacquard-api/src/app_bsky/feed/get_feed_generator.rs
index 405e7b54..285f2cd9 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_feed_generator.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_feed_generator.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -90,9 +93,9 @@ pub mod get_feed_generator_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFeedGeneratorBuilder<'a, S: get_feed_generator_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFeedGenerator<'a> {
@@ -106,9 +109,9 @@ impl<'a> GetFeedGeneratorBuilder<'a, get_feed_generator_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFeedGeneratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -123,11 +126,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetFeedGeneratorBuilder<'a, get_feed_generator_state::SetFeed<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetFeedGeneratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -140,7 +143,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFeedGenerator<'a> {
         GetFeedGenerator {
-            feed: self.__unsafe_private_named.0.unwrap(),
+            feed: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_feed_generators.rs b/crates/jacquard-api/src/app_bsky/feed/get_feed_generators.rs
index fe014334..54b4de83 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_feed_generators.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_feed_generators.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_feed_generators_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFeedGeneratorsBuilder<'a, S: get_feed_generators_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<AtUri<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<AtUri<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFeedGenerators<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetFeedGeneratorsBuilder<'a, get_feed_generators_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFeedGeneratorsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> GetFeedGeneratorsBuilder<'a, get_feed_generators_state::SetFeeds<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetFeedGeneratorsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFeedGenerators<'a> {
         GetFeedGenerators {
-            feeds: self.__unsafe_private_named.0.unwrap(),
+            feeds: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_feed_skeleton.rs b/crates/jacquard-api/src/app_bsky/feed/get_feed_skeleton.rs
index f5983fa9..f4f8d799 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_feed_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_feed_skeleton.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -141,9 +144,9 @@ pub mod get_feed_skeleton_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFeedSkeletonBuilder<'a, S: get_feed_skeleton_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFeedSkeleton<'a> {
@@ -157,9 +160,9 @@ impl<'a> GetFeedSkeletonBuilder<'a, get_feed_skeleton_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFeedSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -167,12 +170,12 @@ impl<'a> GetFeedSkeletonBuilder<'a, get_feed_skeleton_state::Empty> {
 impl<'a, S: get_feed_skeleton_state::State> GetFeedSkeletonBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -187,11 +190,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetFeedSkeletonBuilder<'a, get_feed_skeleton_state::SetFeed<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetFeedSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -199,12 +202,12 @@ where
 impl<'a, S: get_feed_skeleton_state::State> GetFeedSkeletonBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -217,9 +220,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFeedSkeleton<'a> {
         GetFeedSkeleton {
-            cursor: self.__unsafe_private_named.0,
-            feed: self.__unsafe_private_named.1.unwrap(),
-            limit: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            feed: self._fields.1.unwrap(),
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_likes.rs b/crates/jacquard-api/src/app_bsky/feed/get_likes.rs
index 7984e438..6ebcb02c 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_likes.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_likes.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -116,63 +119,59 @@ pub mod like_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type IndexedAt;
         type Actor;
+        type IndexedAt;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type IndexedAt = Unset;
         type Actor = Unset;
+        type IndexedAt = Unset;
+        type CreatedAt = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
+    ///State transition - sets the `actor` field to Set
+    pub struct SetActor<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetActor<S> {}
+    impl<S: State> State for SetActor<S> {
+        type Actor = Set<members::actor>;
         type IndexedAt = S::IndexedAt;
-        type Actor = S::Actor;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `indexed_at` field to Set
     pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
     impl<S: State> State for SetIndexedAt<S> {
-        type CreatedAt = S::CreatedAt;
-        type IndexedAt = Set<members::indexed_at>;
         type Actor = S::Actor;
-    }
-    ///State transition - sets the `actor` field to Set
-    pub struct SetActor<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetActor<S> {}
-    impl<S: State> State for SetActor<S> {
+        type IndexedAt = Set<members::indexed_at>;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Actor = S::Actor;
         type IndexedAt = S::IndexedAt;
-        type Actor = Set<members::actor>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `indexed_at` field
-        pub struct indexed_at(());
         ///Marker type for the `actor` field
         pub struct actor(());
+        ///Marker type for the `indexed_at` field
+        pub struct indexed_at(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<ProfileView<'a>>,
-        Option<Datetime>,
-        Option<Datetime>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ProfileView<'a>>, Option<Datetime>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -186,9 +185,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,11 +202,11 @@ where
         mut self,
         value: impl Into<ProfileView<'a>>,
     ) -> LikeBuilder<'a, like_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -222,11 +221,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -241,11 +240,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,16 +252,16 @@ where
 impl<'a, S> LikeBuilder<'a, S>
 where
     S: like_state::State,
-    S::CreatedAt: like_state::IsSet,
-    S::IndexedAt: like_state::IsSet,
     S::Actor: like_state::IsSet,
+    S::IndexedAt: like_state::IsSet,
+    S::CreatedAt: like_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
+            actor: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -275,9 +274,9 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
+            actor: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -431,14 +430,9 @@ pub mod get_likes_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetLikesBuilder<'a, S: get_likes_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Cid<'a>>,
-        Option<CowStr<'a>>,
-        Option<i64>,
-        Option<AtUri<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetLikes<'a> {
@@ -452,9 +446,9 @@ impl<'a> GetLikesBuilder<'a, get_likes_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetLikesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -462,12 +456,12 @@ impl<'a> GetLikesBuilder<'a, get_likes_state::Empty> {
 impl<'a, S: get_likes_state::State> GetLikesBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -475,12 +469,12 @@ impl<'a, S: get_likes_state::State> GetLikesBuilder<'a, S> {
 impl<'a, S: get_likes_state::State> GetLikesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -488,12 +482,12 @@ impl<'a, S: get_likes_state::State> GetLikesBuilder<'a, S> {
 impl<'a, S: get_likes_state::State> GetLikesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -508,11 +502,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetLikesBuilder<'a, get_likes_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         GetLikesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -525,10 +519,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetLikes<'a> {
         GetLikes {
-            cid: self.__unsafe_private_named.0,
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            cid: self._fields.0,
+            cursor: self._fields.1,
+            limit: self._fields.2,
+            uri: self._fields.3.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_list_feed.rs b/crates/jacquard-api/src/app_bsky/feed/get_list_feed.rs
index d5308577..002fab84 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_list_feed.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_list_feed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -137,9 +140,9 @@ pub mod get_list_feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetListFeedBuilder<'a, S: get_list_feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetListFeed<'a> {
@@ -153,9 +156,9 @@ impl<'a> GetListFeedBuilder<'a, get_list_feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetListFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -163,12 +166,12 @@ impl<'a> GetListFeedBuilder<'a, get_list_feed_state::Empty> {
 impl<'a, S: get_list_feed_state::State> GetListFeedBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -176,12 +179,12 @@ impl<'a, S: get_list_feed_state::State> GetListFeedBuilder<'a, S> {
 impl<'a, S: get_list_feed_state::State> GetListFeedBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetListFeedBuilder<'a, get_list_feed_state::SetList<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetListFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,9 +216,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetListFeed<'a> {
         GetListFeed {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            list: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            list: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_post_thread.rs b/crates/jacquard-api/src/app_bsky/feed/get_post_thread.rs
index d536417c..6f258fe9 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_post_thread.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_post_thread.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -159,9 +162,9 @@ pub mod get_post_thread_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetPostThreadBuilder<'a, S: get_post_thread_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetPostThread<'a> {
@@ -175,9 +178,9 @@ impl<'a> GetPostThreadBuilder<'a, get_post_thread_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetPostThreadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -185,12 +188,12 @@ impl<'a> GetPostThreadBuilder<'a, get_post_thread_state::Empty> {
 impl<'a, S: get_post_thread_state::State> GetPostThreadBuilder<'a, S> {
     /// Set the `depth` field (optional)
     pub fn depth(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `depth` field to an Option value (optional)
     pub fn maybe_depth(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -198,12 +201,12 @@ impl<'a, S: get_post_thread_state::State> GetPostThreadBuilder<'a, S> {
 impl<'a, S: get_post_thread_state::State> GetPostThreadBuilder<'a, S> {
     /// Set the `parentHeight` field (optional)
     pub fn parent_height(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `parentHeight` field to an Option value (optional)
     pub fn maybe_parent_height(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -218,11 +221,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetPostThreadBuilder<'a, get_post_thread_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetPostThreadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -235,9 +238,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetPostThread<'a> {
         GetPostThread {
-            depth: self.__unsafe_private_named.0,
-            parent_height: self.__unsafe_private_named.1,
-            uri: self.__unsafe_private_named.2.unwrap(),
+            depth: self._fields.0,
+            parent_height: self._fields.1,
+            uri: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_posts.rs b/crates/jacquard-api/src/app_bsky/feed/get_posts.rs
index 6cd2e78e..56d9ff9a 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_posts.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_posts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_posts_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetPostsBuilder<'a, S: get_posts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<AtUri<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<AtUri<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetPosts<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetPostsBuilder<'a, get_posts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetPostsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> GetPostsBuilder<'a, get_posts_state::SetUris<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetPostsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetPosts<'a> {
         GetPosts {
-            uris: self.__unsafe_private_named.0.unwrap(),
+            uris: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_quotes.rs b/crates/jacquard-api/src/app_bsky/feed/get_quotes.rs
index c3272897..789c7bae 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_quotes.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_quotes.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{AtUri, Cid};
@@ -109,14 +112,9 @@ pub mod get_quotes_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetQuotesBuilder<'a, S: get_quotes_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Cid<'a>>,
-        Option<CowStr<'a>>,
-        Option<i64>,
-        Option<AtUri<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetQuotes<'a> {
@@ -130,9 +128,9 @@ impl<'a> GetQuotesBuilder<'a, get_quotes_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetQuotesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -140,12 +138,12 @@ impl<'a> GetQuotesBuilder<'a, get_quotes_state::Empty> {
 impl<'a, S: get_quotes_state::State> GetQuotesBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -153,12 +151,12 @@ impl<'a, S: get_quotes_state::State> GetQuotesBuilder<'a, S> {
 impl<'a, S: get_quotes_state::State> GetQuotesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -166,12 +164,12 @@ impl<'a, S: get_quotes_state::State> GetQuotesBuilder<'a, S> {
 impl<'a, S: get_quotes_state::State> GetQuotesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -186,11 +184,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetQuotesBuilder<'a, get_quotes_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         GetQuotesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,10 +201,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetQuotes<'a> {
         GetQuotes {
-            cid: self.__unsafe_private_named.0,
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            cid: self._fields.0,
+            cursor: self._fields.1,
+            limit: self._fields.2,
+            uri: self._fields.3.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_reposted_by.rs b/crates/jacquard-api/src/app_bsky/feed/get_reposted_by.rs
index c254f02b..fe759780 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_reposted_by.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_reposted_by.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{AtUri, Cid};
@@ -109,14 +112,9 @@ pub mod get_reposted_by_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetRepostedByBuilder<'a, S: get_reposted_by_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Cid<'a>>,
-        Option<CowStr<'a>>,
-        Option<i64>,
-        Option<AtUri<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetRepostedBy<'a> {
@@ -130,9 +128,9 @@ impl<'a> GetRepostedByBuilder<'a, get_reposted_by_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetRepostedByBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -140,12 +138,12 @@ impl<'a> GetRepostedByBuilder<'a, get_reposted_by_state::Empty> {
 impl<'a, S: get_reposted_by_state::State> GetRepostedByBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -153,12 +151,12 @@ impl<'a, S: get_reposted_by_state::State> GetRepostedByBuilder<'a, S> {
 impl<'a, S: get_reposted_by_state::State> GetRepostedByBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -166,12 +164,12 @@ impl<'a, S: get_reposted_by_state::State> GetRepostedByBuilder<'a, S> {
 impl<'a, S: get_reposted_by_state::State> GetRepostedByBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -186,11 +184,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetRepostedByBuilder<'a, get_reposted_by_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         GetRepostedByBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,10 +201,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetRepostedBy<'a> {
         GetRepostedBy {
-            cid: self.__unsafe_private_named.0,
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            cid: self._fields.0,
+            cursor: self._fields.1,
+            limit: self._fields.2,
+            uri: self._fields.3.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_suggested_feeds.rs b/crates/jacquard-api/src/app_bsky/feed/get_suggested_feeds.rs
index 9665c0cf..3afb2977 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_suggested_feeds.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_suggested_feeds.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -85,9 +88,9 @@ pub mod get_suggested_feeds_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSuggestedFeedsBuilder<'a, S: get_suggested_feeds_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSuggestedFeeds<'a> {
@@ -101,9 +104,9 @@ impl<'a> GetSuggestedFeedsBuilder<'a, get_suggested_feeds_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSuggestedFeedsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -111,12 +114,12 @@ impl<'a> GetSuggestedFeedsBuilder<'a, get_suggested_feeds_state::Empty> {
 impl<'a, S: get_suggested_feeds_state::State> GetSuggestedFeedsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -124,12 +127,12 @@ impl<'a, S: get_suggested_feeds_state::State> GetSuggestedFeedsBuilder<'a, S> {
 impl<'a, S: get_suggested_feeds_state::State> GetSuggestedFeedsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -141,8 +144,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSuggestedFeeds<'a> {
         GetSuggestedFeeds {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_timeline.rs b/crates/jacquard-api/src/app_bsky/feed/get_timeline.rs
index 89a88e37..ca12b5f4 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_timeline.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_timeline.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -88,9 +91,9 @@ pub mod get_timeline_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTimelineBuilder<'a, S: get_timeline_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetTimeline<'a> {
@@ -104,9 +107,9 @@ impl<'a> GetTimelineBuilder<'a, get_timeline_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTimelineBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,12 +117,12 @@ impl<'a> GetTimelineBuilder<'a, get_timeline_state::Empty> {
 impl<'a, S: get_timeline_state::State> GetTimelineBuilder<'a, S> {
     /// Set the `algorithm` field (optional)
     pub fn algorithm(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `algorithm` field to an Option value (optional)
     pub fn maybe_algorithm(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -127,12 +130,12 @@ impl<'a, S: get_timeline_state::State> GetTimelineBuilder<'a, S> {
 impl<'a, S: get_timeline_state::State> GetTimelineBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -140,12 +143,12 @@ impl<'a, S: get_timeline_state::State> GetTimelineBuilder<'a, S> {
 impl<'a, S: get_timeline_state::State> GetTimelineBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -157,9 +160,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetTimeline<'a> {
         GetTimeline {
-            algorithm: self.__unsafe_private_named.0,
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            algorithm: self._fields.0,
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/like.rs b/crates/jacquard-api/src/app_bsky/feed/like.rs
index 46be3bdd..70ca02d9 100644
--- a/crates/jacquard-api/src/app_bsky/feed/like.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -148,13 +151,9 @@ pub mod like_state {
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<StrongRef<'a>>,
-        Option<StrongRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -168,9 +167,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -185,11 +184,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,11 +203,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,12 +215,12 @@ where
 impl<'a, S: like_state::State> LikeBuilder<'a, S> {
     /// Set the `via` field (optional)
     pub fn via(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `via` field to an Option value (optional)
     pub fn maybe_via(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -235,9 +234,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            via: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            via: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -250,9 +249,9 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            via: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            via: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/feed/post.rs b/crates/jacquard-api/src/app_bsky/feed/post.rs
index e73f1063..e4690229 100644
--- a/crates/jacquard-api/src/app_bsky/feed/post.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -307,63 +310,59 @@ pub mod entity_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Index;
         type Type;
         type Value;
-        type Index;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Index = Unset;
         type Type = Unset;
         type Value = Unset;
-        type Index = Unset;
+    }
+    ///State transition - sets the `index` field to Set
+    pub struct SetIndex<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndex<S> {}
+    impl<S: State> State for SetIndex<S> {
+        type Index = Set<members::index>;
+        type Type = S::Type;
+        type Value = S::Value;
     }
     ///State transition - sets the `type` field to Set
     pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetType<S> {}
     impl<S: State> State for SetType<S> {
+        type Index = S::Index;
         type Type = Set<members::r#type>;
         type Value = S::Value;
-        type Index = S::Index;
     }
     ///State transition - sets the `value` field to Set
     pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetValue<S> {}
     impl<S: State> State for SetValue<S> {
-        type Type = S::Type;
-        type Value = Set<members::value>;
         type Index = S::Index;
-    }
-    ///State transition - sets the `index` field to Set
-    pub struct SetIndex<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndex<S> {}
-    impl<S: State> State for SetIndex<S> {
         type Type = S::Type;
-        type Value = S::Value;
-        type Index = Set<members::index>;
+        type Value = Set<members::value>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `index` field
+        pub struct index(());
         ///Marker type for the `type` field
         pub struct r#type(());
         ///Marker type for the `value` field
         pub struct value(());
-        ///Marker type for the `index` field
-        pub struct index(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EntityBuilder<'a, S: entity_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<post::TextSlice<'a>>,
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<post::TextSlice<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Entity<'a> {
@@ -377,9 +376,9 @@ impl<'a> EntityBuilder<'a, entity_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EntityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -394,11 +393,11 @@ where
         mut self,
         value: impl Into<post::TextSlice<'a>>,
     ) -> EntityBuilder<'a, entity_state::SetIndex<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EntityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -413,11 +412,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EntityBuilder<'a, entity_state::SetType<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EntityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -432,11 +431,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EntityBuilder<'a, entity_state::SetValue<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EntityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -444,16 +443,16 @@ where
 impl<'a, S> EntityBuilder<'a, S>
 where
     S: entity_state::State,
+    S::Index: entity_state::IsSet,
     S::Type: entity_state::IsSet,
     S::Value: entity_state::IsSet,
-    S::Index: entity_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Entity<'a> {
         Entity {
-            index: self.__unsafe_private_named.0.unwrap(),
-            r#type: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            index: self._fields.0.unwrap(),
+            r#type: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -466,9 +465,9 @@ where
         >,
     ) -> Entity<'a> {
         Entity {
-            index: self.__unsafe_private_named.0.unwrap(),
-            r#type: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            index: self._fields.0.unwrap(),
+            r#type: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -749,44 +748,44 @@ pub mod post_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Text;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Text = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Text = S::Text;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `text` field to Set
     pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetText<S> {}
     impl<S: State> State for SetText<S> {
-        type CreatedAt = S::CreatedAt;
         type Text = Set<members::text>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Text = S::Text;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `text` field
         pub struct text(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<PostEmbed<'a>>,
         Option<Vec<post::Entity<'a>>>,
@@ -797,7 +796,7 @@ pub struct PostBuilder<'a, S: post_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -811,19 +810,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -838,11 +827,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -850,12 +839,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `embed` field (optional)
     pub fn embed(mut self, value: impl Into<Option<PostEmbed<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `embed` field to an Option value (optional)
     pub fn maybe_embed(mut self, value: Option<PostEmbed<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -863,12 +852,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `entities` field (optional)
     pub fn entities(mut self, value: impl Into<Option<Vec<post::Entity<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `entities` field to an Option value (optional)
     pub fn maybe_entities(mut self, value: Option<Vec<post::Entity<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -876,12 +865,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -889,12 +878,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -902,12 +891,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `langs` field (optional)
     pub fn langs(mut self, value: impl Into<Option<Vec<Language>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `langs` field to an Option value (optional)
     pub fn maybe_langs(mut self, value: Option<Vec<Language>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -915,12 +904,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `reply` field (optional)
     pub fn reply(mut self, value: impl Into<Option<post::ReplyRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `reply` field to an Option value (optional)
     pub fn maybe_reply(mut self, value: Option<post::ReplyRef<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -928,12 +917,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -948,11 +937,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetText<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -960,21 +949,21 @@ where
 impl<'a, S> PostBuilder<'a, S>
 where
     S: post_state::State,
-    S::CreatedAt: post_state::IsSet,
     S::Text: post_state::IsSet,
+    S::CreatedAt: post_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            embed: self.__unsafe_private_named.1,
-            entities: self.__unsafe_private_named.2,
-            facets: self.__unsafe_private_named.3,
-            labels: self.__unsafe_private_named.4,
-            langs: self.__unsafe_private_named.5,
-            reply: self.__unsafe_private_named.6,
-            tags: self.__unsafe_private_named.7,
-            text: self.__unsafe_private_named.8.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            embed: self._fields.1,
+            entities: self._fields.2,
+            facets: self._fields.3,
+            labels: self._fields.4,
+            langs: self._fields.5,
+            reply: self._fields.6,
+            tags: self._fields.7,
+            text: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -987,15 +976,15 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            embed: self.__unsafe_private_named.1,
-            entities: self.__unsafe_private_named.2,
-            facets: self.__unsafe_private_named.3,
-            labels: self.__unsafe_private_named.4,
-            langs: self.__unsafe_private_named.5,
-            reply: self.__unsafe_private_named.6,
-            tags: self.__unsafe_private_named.7,
-            text: self.__unsafe_private_named.8.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            embed: self._fields.1,
+            entities: self._fields.2,
+            facets: self._fields.3,
+            labels: self._fields.4,
+            langs: self._fields.5,
+            reply: self._fields.6,
+            tags: self._fields.7,
+            text: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1047,9 +1036,9 @@ pub mod reply_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReplyRefBuilder<'a, S: reply_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReplyRef<'a> {
@@ -1063,9 +1052,9 @@ impl<'a> ReplyRefBuilder<'a, reply_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1080,11 +1069,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ReplyRefBuilder<'a, reply_ref_state::SetParent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1099,11 +1088,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ReplyRefBuilder<'a, reply_ref_state::SetRoot<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1117,8 +1106,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ReplyRef<'a> {
         ReplyRef {
-            parent: self.__unsafe_private_named.0.unwrap(),
-            root: self.__unsafe_private_named.1.unwrap(),
+            parent: self._fields.0.unwrap(),
+            root: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1131,8 +1120,8 @@ where
         >,
     ) -> ReplyRef<'a> {
         ReplyRef {
-            parent: self.__unsafe_private_named.0.unwrap(),
-            root: self.__unsafe_private_named.1.unwrap(),
+            parent: self._fields.0.unwrap(),
+            root: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1148,45 +1137,45 @@ pub mod text_slice_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type End;
         type Start;
+        type End;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type End = Unset;
         type Start = Unset;
-    }
-    ///State transition - sets the `end` field to Set
-    pub struct SetEnd<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetEnd<S> {}
-    impl<S: State> State for SetEnd<S> {
-        type End = Set<members::end>;
-        type Start = S::Start;
+        type End = Unset;
     }
     ///State transition - sets the `start` field to Set
     pub struct SetStart<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStart<S> {}
     impl<S: State> State for SetStart<S> {
-        type End = S::End;
         type Start = Set<members::start>;
+        type End = S::End;
+    }
+    ///State transition - sets the `end` field to Set
+    pub struct SetEnd<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetEnd<S> {}
+    impl<S: State> State for SetEnd<S> {
+        type Start = S::Start;
+        type End = Set<members::end>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `end` field
-        pub struct end(());
         ///Marker type for the `start` field
         pub struct start(());
+        ///Marker type for the `end` field
+        pub struct end(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TextSliceBuilder<'a, S: text_slice_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TextSlice<'a> {
@@ -1200,9 +1189,9 @@ impl<'a> TextSliceBuilder<'a, text_slice_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TextSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1217,11 +1206,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> TextSliceBuilder<'a, text_slice_state::SetEnd<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TextSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1236,11 +1225,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> TextSliceBuilder<'a, text_slice_state::SetStart<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TextSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1248,14 +1237,14 @@ where
 impl<'a, S> TextSliceBuilder<'a, S>
 where
     S: text_slice_state::State,
-    S::End: text_slice_state::IsSet,
     S::Start: text_slice_state::IsSet,
+    S::End: text_slice_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TextSlice<'a> {
         TextSlice {
-            end: self.__unsafe_private_named.0.unwrap(),
-            start: self.__unsafe_private_named.1.unwrap(),
+            end: self._fields.0.unwrap(),
+            start: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1268,8 +1257,8 @@ where
         >,
     ) -> TextSlice<'a> {
         TextSlice {
-            end: self.__unsafe_private_named.0.unwrap(),
-            start: self.__unsafe_private_named.1.unwrap(),
+            end: self._fields.0.unwrap(),
+            start: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/feed/postgate.rs b/crates/jacquard-api/src/app_bsky/feed/postgate.rs
index 1dfac4ff..00077489 100644
--- a/crates/jacquard-api/src/app_bsky/feed/postgate.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/postgate.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -300,14 +303,14 @@ pub mod postgate_state {
 
 /// Builder for constructing an instance of this type
 pub struct PostgateBuilder<'a, S: postgate_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Vec<AtUri<'a>>>,
         Option<Vec<postgate::DisableRule<'a>>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Postgate<'a> {
@@ -321,9 +324,9 @@ impl<'a> PostgateBuilder<'a, postgate_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostgateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -338,11 +341,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostgateBuilder<'a, postgate_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PostgateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -353,7 +356,7 @@ impl<'a, S: postgate_state::State> PostgateBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<AtUri<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `detachedEmbeddingUris` field to an Option value (optional)
@@ -361,7 +364,7 @@ impl<'a, S: postgate_state::State> PostgateBuilder<'a, S> {
         mut self,
         value: Option<Vec<AtUri<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -372,7 +375,7 @@ impl<'a, S: postgate_state::State> PostgateBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<postgate::DisableRule<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `embeddingRules` field to an Option value (optional)
@@ -380,7 +383,7 @@ impl<'a, S: postgate_state::State> PostgateBuilder<'a, S> {
         mut self,
         value: Option<Vec<postgate::DisableRule<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -395,11 +398,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PostgateBuilder<'a, postgate_state::SetPost<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PostgateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -413,10 +416,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Postgate<'a> {
         Postgate {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            detached_embedding_uris: self.__unsafe_private_named.1,
-            embedding_rules: self.__unsafe_private_named.2,
-            post: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            detached_embedding_uris: self._fields.1,
+            embedding_rules: self._fields.2,
+            post: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -429,10 +432,10 @@ where
         >,
     ) -> Postgate<'a> {
         Postgate {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            detached_embedding_uris: self.__unsafe_private_named.1,
-            embedding_rules: self.__unsafe_private_named.2,
-            post: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            detached_embedding_uris: self._fields.1,
+            embedding_rules: self._fields.2,
+            post: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/feed/repost.rs b/crates/jacquard-api/src/app_bsky/feed/repost.rs
index e066dd92..5757e40f 100644
--- a/crates/jacquard-api/src/app_bsky/feed/repost.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/repost.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -148,13 +151,9 @@ pub mod repost_state {
 
 /// Builder for constructing an instance of this type
 pub struct RepostBuilder<'a, S: repost_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<StrongRef<'a>>,
-        Option<StrongRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Repost<'a> {
@@ -168,9 +167,9 @@ impl<'a> RepostBuilder<'a, repost_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RepostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -185,11 +184,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RepostBuilder<'a, repost_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RepostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,11 +203,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> RepostBuilder<'a, repost_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RepostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,12 +215,12 @@ where
 impl<'a, S: repost_state::State> RepostBuilder<'a, S> {
     /// Set the `via` field (optional)
     pub fn via(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `via` field to an Option value (optional)
     pub fn maybe_via(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -235,9 +234,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Repost<'a> {
         Repost {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            via: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            via: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -250,9 +249,9 @@ where
         >,
     ) -> Repost<'a> {
         Repost {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            via: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            via: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/feed/search_posts.rs b/crates/jacquard-api/src/app_bsky/feed/search_posts.rs
index d6b3c17b..1fa77790 100644
--- a/crates/jacquard-api/src/app_bsky/feed/search_posts.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/search_posts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -173,8 +176,8 @@ pub mod search_posts_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchPostsBuilder<'a, S: search_posts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -188,7 +191,7 @@ pub struct SearchPostsBuilder<'a, S: search_posts_state::State> {
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchPosts<'a> {
@@ -202,8 +205,8 @@ impl<'a> SearchPostsBuilder<'a, search_posts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchPostsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -217,7 +220,7 @@ impl<'a> SearchPostsBuilder<'a, search_posts_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -225,12 +228,12 @@ impl<'a> SearchPostsBuilder<'a, search_posts_state::Empty> {
 impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<AtIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<AtIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -238,12 +241,12 @@ impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
 impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -251,12 +254,12 @@ impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
 impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
     /// Set the `domain` field (optional)
     pub fn domain(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `domain` field to an Option value (optional)
     pub fn maybe_domain(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -264,12 +267,12 @@ impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
 impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
     /// Set the `lang` field (optional)
     pub fn lang(mut self, value: impl Into<Option<Language>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `lang` field to an Option value (optional)
     pub fn maybe_lang(mut self, value: Option<Language>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -277,12 +280,12 @@ impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
 impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -290,12 +293,12 @@ impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
 impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
     /// Set the `mentions` field (optional)
     pub fn mentions(mut self, value: impl Into<Option<AtIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<AtIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -310,11 +313,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SearchPostsBuilder<'a, search_posts_state::SetQ<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         SearchPostsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -322,12 +325,12 @@ where
 impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
     /// Set the `since` field (optional)
     pub fn since(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `since` field to an Option value (optional)
     pub fn maybe_since(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -335,12 +338,12 @@ impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
 impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
     /// Set the `sort` field (optional)
     pub fn sort(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `sort` field to an Option value (optional)
     pub fn maybe_sort(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -348,12 +351,12 @@ impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
 impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
     /// Set the `tag` field (optional)
     pub fn tag(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `tag` field to an Option value (optional)
     pub fn maybe_tag(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -361,12 +364,12 @@ impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
 impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
     /// Set the `until` field (optional)
     pub fn until(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `until` field to an Option value (optional)
     pub fn maybe_until(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -374,12 +377,12 @@ impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
 impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -392,18 +395,18 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchPosts<'a> {
         SearchPosts {
-            author: self.__unsafe_private_named.0,
-            cursor: self.__unsafe_private_named.1,
-            domain: self.__unsafe_private_named.2,
-            lang: self.__unsafe_private_named.3,
-            limit: self.__unsafe_private_named.4,
-            mentions: self.__unsafe_private_named.5,
-            q: self.__unsafe_private_named.6.unwrap(),
-            since: self.__unsafe_private_named.7,
-            sort: self.__unsafe_private_named.8,
-            tag: self.__unsafe_private_named.9,
-            until: self.__unsafe_private_named.10,
-            url: self.__unsafe_private_named.11,
+            author: self._fields.0,
+            cursor: self._fields.1,
+            domain: self._fields.2,
+            lang: self._fields.3,
+            limit: self._fields.4,
+            mentions: self._fields.5,
+            q: self._fields.6.unwrap(),
+            since: self._fields.7,
+            sort: self._fields.8,
+            tag: self._fields.9,
+            until: self._fields.10,
+            url: self._fields.11,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/send_interactions.rs b/crates/jacquard-api/src/app_bsky/feed/send_interactions.rs
index 5e387ca3..4f3607eb 100644
--- a/crates/jacquard-api/src/app_bsky/feed/send_interactions.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/send_interactions.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -90,9 +93,9 @@ pub mod send_interactions_state {
 
 /// Builder for constructing an instance of this type
 pub struct SendInteractionsBuilder<'a, S: send_interactions_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<Vec<Interaction<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<Vec<Interaction<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SendInteractions<'a> {
@@ -106,9 +109,9 @@ impl<'a> SendInteractionsBuilder<'a, send_interactions_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SendInteractionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -116,12 +119,12 @@ impl<'a> SendInteractionsBuilder<'a, send_interactions_state::Empty> {
 impl<'a, S: send_interactions_state::State> SendInteractionsBuilder<'a, S> {
     /// Set the `feed` field (optional)
     pub fn feed(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `feed` field to an Option value (optional)
     pub fn maybe_feed(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -136,11 +139,11 @@ where
         mut self,
         value: impl Into<Vec<Interaction<'a>>>,
     ) -> SendInteractionsBuilder<'a, send_interactions_state::SetInteractions<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SendInteractionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -153,8 +156,8 @@ where
     /// Build the final struct
     pub fn build(self) -> SendInteractions<'a> {
         SendInteractions {
-            feed: self.__unsafe_private_named.0,
-            interactions: self.__unsafe_private_named.1.unwrap(),
+            feed: self._fields.0,
+            interactions: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -167,8 +170,8 @@ where
         >,
     ) -> SendInteractions<'a> {
         SendInteractions {
-            feed: self.__unsafe_private_named.0,
-            interactions: self.__unsafe_private_named.1.unwrap(),
+            feed: self._fields.0,
+            interactions: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/feed/threadgate.rs b/crates/jacquard-api/src/app_bsky/feed/threadgate.rs
index be7e1e1e..51302bd7 100644
--- a/crates/jacquard-api/src/app_bsky/feed/threadgate.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/threadgate.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -426,9 +429,9 @@ pub mod list_rule_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListRuleBuilder<'a, S: list_rule_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListRule<'a> {
@@ -442,9 +445,9 @@ impl<'a> ListRuleBuilder<'a, list_rule_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -459,11 +462,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListRuleBuilder<'a, list_rule_state::SetList<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -476,7 +479,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ListRule<'a> {
         ListRule {
-            list: self.__unsafe_private_named.0.unwrap(),
+            list: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -489,7 +492,7 @@ where
         >,
     ) -> ListRule<'a> {
         ListRule {
-            list: self.__unsafe_private_named.0.unwrap(),
+            list: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -541,14 +544,14 @@ pub mod threadgate_state {
 
 /// Builder for constructing an instance of this type
 pub struct ThreadgateBuilder<'a, S: threadgate_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<ThreadgateAllowItem<'a>>>,
         Option<Datetime>,
         Option<Vec<AtUri<'a>>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Threadgate<'a> {
@@ -562,9 +565,9 @@ impl<'a> ThreadgateBuilder<'a, threadgate_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ThreadgateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -575,12 +578,12 @@ impl<'a, S: threadgate_state::State> ThreadgateBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<ThreadgateAllowItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `allow` field to an Option value (optional)
     pub fn maybe_allow(mut self, value: Option<Vec<ThreadgateAllowItem<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -595,11 +598,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ThreadgateBuilder<'a, threadgate_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ThreadgateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -607,12 +610,12 @@ where
 impl<'a, S: threadgate_state::State> ThreadgateBuilder<'a, S> {
     /// Set the `hiddenReplies` field (optional)
     pub fn hidden_replies(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `hiddenReplies` field to an Option value (optional)
     pub fn maybe_hidden_replies(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -627,11 +630,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ThreadgateBuilder<'a, threadgate_state::SetPost<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ThreadgateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -645,10 +648,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Threadgate<'a> {
         Threadgate {
-            allow: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            hidden_replies: self.__unsafe_private_named.2,
-            post: self.__unsafe_private_named.3.unwrap(),
+            allow: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            hidden_replies: self._fields.2,
+            post: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -661,10 +664,10 @@ where
         >,
     ) -> Threadgate<'a> {
         Threadgate {
-            allow: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            hidden_replies: self.__unsafe_private_named.2,
-            post: self.__unsafe_private_named.3.unwrap(),
+            allow: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            hidden_replies: self._fields.2,
+            post: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/graph.rs b/crates/jacquard-api/src/app_bsky/graph.rs
index 31f2d59c..e0cabc10 100644
--- a/crates/jacquard-api/src/app_bsky/graph.rs
+++ b/crates/jacquard-api/src/app_bsky/graph.rs
@@ -36,7 +36,11 @@ pub mod unmute_actor_list;
 pub mod unmute_thread;
 pub mod verification;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -647,45 +651,45 @@ pub mod list_item_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type Subject;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Subject = S::Subject;
+        type Uri = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type Uri = S::Uri;
         type Subject = Set<members::subject>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Subject = S::Subject;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ListItemViewBuilder<'a, S: list_item_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ProfileView<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ProfileView<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListItemView<'a> {
@@ -699,9 +703,9 @@ impl<'a> ListItemViewBuilder<'a, list_item_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListItemViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -716,11 +720,11 @@ where
         mut self,
         value: impl Into<ProfileView<'a>>,
     ) -> ListItemViewBuilder<'a, list_item_view_state::SetSubject<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListItemViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -735,11 +739,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListItemViewBuilder<'a, list_item_view_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListItemViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -747,14 +751,14 @@ where
 impl<'a, S> ListItemViewBuilder<'a, S>
 where
     S: list_item_view_state::State,
-    S::Uri: list_item_view_state::IsSet,
     S::Subject: list_item_view_state::IsSet,
+    S::Uri: list_item_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ListItemView<'a> {
         ListItemView {
-            subject: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            subject: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -764,8 +768,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ListItemView<'a> {
         ListItemView {
-            subject: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            subject: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1390,112 +1394,112 @@ pub mod list_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Purpose;
         type Uri;
+        type IndexedAt;
         type Cid;
         type Creator;
         type Name;
-        type IndexedAt;
-        type Purpose;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Purpose = Unset;
         type Uri = Unset;
+        type IndexedAt = Unset;
         type Cid = Unset;
         type Creator = Unset;
         type Name = Unset;
-        type IndexedAt = Unset;
-        type Purpose = Unset;
+    }
+    ///State transition - sets the `purpose` field to Set
+    pub struct SetPurpose<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPurpose<S> {}
+    impl<S: State> State for SetPurpose<S> {
+        type Purpose = Set<members::purpose>;
+        type Uri = S::Uri;
+        type IndexedAt = S::IndexedAt;
+        type Cid = S::Cid;
+        type Creator = S::Creator;
+        type Name = S::Name;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
+        type Purpose = S::Purpose;
         type Uri = Set<members::uri>;
+        type IndexedAt = S::IndexedAt;
         type Cid = S::Cid;
         type Creator = S::Creator;
         type Name = S::Name;
-        type IndexedAt = S::IndexedAt;
+    }
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
         type Purpose = S::Purpose;
+        type Uri = S::Uri;
+        type IndexedAt = Set<members::indexed_at>;
+        type Cid = S::Cid;
+        type Creator = S::Creator;
+        type Name = S::Name;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
+        type Purpose = S::Purpose;
         type Uri = S::Uri;
+        type IndexedAt = S::IndexedAt;
         type Cid = Set<members::cid>;
         type Creator = S::Creator;
         type Name = S::Name;
-        type IndexedAt = S::IndexedAt;
-        type Purpose = S::Purpose;
     }
     ///State transition - sets the `creator` field to Set
     pub struct SetCreator<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreator<S> {}
     impl<S: State> State for SetCreator<S> {
+        type Purpose = S::Purpose;
         type Uri = S::Uri;
+        type IndexedAt = S::IndexedAt;
         type Cid = S::Cid;
         type Creator = Set<members::creator>;
         type Name = S::Name;
-        type IndexedAt = S::IndexedAt;
-        type Purpose = S::Purpose;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Uri = S::Uri;
-        type Cid = S::Cid;
-        type Creator = S::Creator;
-        type Name = Set<members::name>;
-        type IndexedAt = S::IndexedAt;
-        type Purpose = S::Purpose;
-    }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
-        type Uri = S::Uri;
-        type Cid = S::Cid;
-        type Creator = S::Creator;
-        type Name = S::Name;
-        type IndexedAt = Set<members::indexed_at>;
         type Purpose = S::Purpose;
-    }
-    ///State transition - sets the `purpose` field to Set
-    pub struct SetPurpose<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPurpose<S> {}
-    impl<S: State> State for SetPurpose<S> {
         type Uri = S::Uri;
+        type IndexedAt = S::IndexedAt;
         type Cid = S::Cid;
         type Creator = S::Creator;
-        type Name = S::Name;
-        type IndexedAt = S::IndexedAt;
-        type Purpose = Set<members::purpose>;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `purpose` field
+        pub struct purpose(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `indexed_at` field
+        pub struct indexed_at(());
         ///Marker type for the `cid` field
         pub struct cid(());
         ///Marker type for the `creator` field
         pub struct creator(());
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `indexed_at` field
-        pub struct indexed_at(());
-        ///Marker type for the `purpose` field
-        pub struct purpose(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ListViewBuilder<'a, S: list_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<UriValue<'a>>,
         Option<Cid<'a>>,
         Option<ProfileView<'a>>,
@@ -1509,7 +1513,7 @@ pub struct ListViewBuilder<'a, S: list_view_state::State> {
         Option<AtUri<'a>>,
         Option<graph::ListViewerState<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListView<'a> {
@@ -1523,8 +1527,8 @@ impl<'a> ListViewBuilder<'a, list_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -1538,7 +1542,7 @@ impl<'a> ListViewBuilder<'a, list_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1546,12 +1550,12 @@ impl<'a> ListViewBuilder<'a, list_view_state::Empty> {
 impl<'a, S: list_view_state::State> ListViewBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1566,11 +1570,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> ListViewBuilder<'a, list_view_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1585,11 +1589,11 @@ where
         mut self,
         value: impl Into<ProfileView<'a>>,
     ) -> ListViewBuilder<'a, list_view_state::SetCreator<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1597,12 +1601,12 @@ where
 impl<'a, S: list_view_state::State> ListViewBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1613,12 +1617,12 @@ impl<'a, S: list_view_state::State> ListViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `descriptionFacets` field to an Option value (optional)
     pub fn maybe_description_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1633,11 +1637,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListViewBuilder<'a, list_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1645,12 +1649,12 @@ where
 impl<'a, S: list_view_state::State> ListViewBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1658,12 +1662,12 @@ impl<'a, S: list_view_state::State> ListViewBuilder<'a, S> {
 impl<'a, S: list_view_state::State> ListViewBuilder<'a, S> {
     /// Set the `listItemCount` field (optional)
     pub fn list_item_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `listItemCount` field to an Option value (optional)
     pub fn maybe_list_item_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -1678,11 +1682,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ListViewBuilder<'a, list_view_state::SetName<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         ListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1697,11 +1701,11 @@ where
         mut self,
         value: impl Into<graph::ListPurpose<'a>>,
     ) -> ListViewBuilder<'a, list_view_state::SetPurpose<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1716,11 +1720,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListViewBuilder<'a, list_view_state::SetUri<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         ListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1731,12 +1735,12 @@ impl<'a, S: list_view_state::State> ListViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<graph::ListViewerState<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<graph::ListViewerState<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -1744,28 +1748,28 @@ impl<'a, S: list_view_state::State> ListViewBuilder<'a, S> {
 impl<'a, S> ListViewBuilder<'a, S>
 where
     S: list_view_state::State,
+    S::Purpose: list_view_state::IsSet,
     S::Uri: list_view_state::IsSet,
+    S::IndexedAt: list_view_state::IsSet,
     S::Cid: list_view_state::IsSet,
     S::Creator: list_view_state::IsSet,
     S::Name: list_view_state::IsSet,
-    S::IndexedAt: list_view_state::IsSet,
-    S::Purpose: list_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ListView<'a> {
         ListView {
-            avatar: self.__unsafe_private_named.0,
-            cid: self.__unsafe_private_named.1.unwrap(),
-            creator: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            description_facets: self.__unsafe_private_named.4,
-            indexed_at: self.__unsafe_private_named.5.unwrap(),
-            labels: self.__unsafe_private_named.6,
-            list_item_count: self.__unsafe_private_named.7,
-            name: self.__unsafe_private_named.8.unwrap(),
-            purpose: self.__unsafe_private_named.9.unwrap(),
-            uri: self.__unsafe_private_named.10.unwrap(),
-            viewer: self.__unsafe_private_named.11,
+            avatar: self._fields.0,
+            cid: self._fields.1.unwrap(),
+            creator: self._fields.2.unwrap(),
+            description: self._fields.3,
+            description_facets: self._fields.4,
+            indexed_at: self._fields.5.unwrap(),
+            labels: self._fields.6,
+            list_item_count: self._fields.7,
+            name: self._fields.8.unwrap(),
+            purpose: self._fields.9.unwrap(),
+            uri: self._fields.10.unwrap(),
+            viewer: self._fields.11,
             extra_data: Default::default(),
         }
     }
@@ -1775,18 +1779,18 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ListView<'a> {
         ListView {
-            avatar: self.__unsafe_private_named.0,
-            cid: self.__unsafe_private_named.1.unwrap(),
-            creator: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            description_facets: self.__unsafe_private_named.4,
-            indexed_at: self.__unsafe_private_named.5.unwrap(),
-            labels: self.__unsafe_private_named.6,
-            list_item_count: self.__unsafe_private_named.7,
-            name: self.__unsafe_private_named.8.unwrap(),
-            purpose: self.__unsafe_private_named.9.unwrap(),
-            uri: self.__unsafe_private_named.10.unwrap(),
-            viewer: self.__unsafe_private_named.11,
+            avatar: self._fields.0,
+            cid: self._fields.1.unwrap(),
+            creator: self._fields.2.unwrap(),
+            description: self._fields.3,
+            description_facets: self._fields.4,
+            indexed_at: self._fields.5.unwrap(),
+            labels: self._fields.6,
+            list_item_count: self._fields.7,
+            name: self._fields.8.unwrap(),
+            purpose: self._fields.9.unwrap(),
+            uri: self._fields.10.unwrap(),
+            viewer: self._fields.11,
             extra_data: Some(extra_data),
         }
     }
@@ -1802,74 +1806,74 @@ pub mod list_view_basic_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Cid;
         type Name;
-        type Purpose;
         type Uri;
+        type Cid;
+        type Purpose;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Cid = Unset;
         type Name = Unset;
-        type Purpose = Unset;
         type Uri = Unset;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type Cid = Set<members::cid>;
-        type Name = S::Name;
-        type Purpose = S::Purpose;
-        type Uri = S::Uri;
+        type Cid = Unset;
+        type Purpose = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Cid = S::Cid;
         type Name = Set<members::name>;
-        type Purpose = S::Purpose;
         type Uri = S::Uri;
-    }
-    ///State transition - sets the `purpose` field to Set
-    pub struct SetPurpose<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPurpose<S> {}
-    impl<S: State> State for SetPurpose<S> {
         type Cid = S::Cid;
-        type Name = S::Name;
-        type Purpose = Set<members::purpose>;
-        type Uri = S::Uri;
+        type Purpose = S::Purpose;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
+        type Name = S::Name;
+        type Uri = Set<members::uri>;
         type Cid = S::Cid;
+        type Purpose = S::Purpose;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
         type Name = S::Name;
+        type Uri = S::Uri;
+        type Cid = Set<members::cid>;
         type Purpose = S::Purpose;
-        type Uri = Set<members::uri>;
+    }
+    ///State transition - sets the `purpose` field to Set
+    pub struct SetPurpose<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPurpose<S> {}
+    impl<S: State> State for SetPurpose<S> {
+        type Name = S::Name;
+        type Uri = S::Uri;
+        type Cid = S::Cid;
+        type Purpose = Set<members::purpose>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `purpose` field
-        pub struct purpose(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
+        ///Marker type for the `purpose` field
+        pub struct purpose(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ListViewBasicBuilder<'a, S: list_view_basic_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<UriValue<'a>>,
         Option<Cid<'a>>,
         Option<Datetime>,
@@ -1880,7 +1884,7 @@ pub struct ListViewBasicBuilder<'a, S: list_view_basic_state::State> {
         Option<AtUri<'a>>,
         Option<graph::ListViewerState<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListViewBasic<'a> {
@@ -1894,19 +1898,9 @@ impl<'a> ListViewBasicBuilder<'a, list_view_basic_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1914,12 +1908,12 @@ impl<'a> ListViewBasicBuilder<'a, list_view_basic_state::Empty> {
 impl<'a, S: list_view_basic_state::State> ListViewBasicBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1934,11 +1928,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> ListViewBasicBuilder<'a, list_view_basic_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1946,12 +1940,12 @@ where
 impl<'a, S: list_view_basic_state::State> ListViewBasicBuilder<'a, S> {
     /// Set the `indexedAt` field (optional)
     pub fn indexed_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `indexedAt` field to an Option value (optional)
     pub fn maybe_indexed_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1959,12 +1953,12 @@ impl<'a, S: list_view_basic_state::State> ListViewBasicBuilder<'a, S> {
 impl<'a, S: list_view_basic_state::State> ListViewBasicBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1972,12 +1966,12 @@ impl<'a, S: list_view_basic_state::State> ListViewBasicBuilder<'a, S> {
 impl<'a, S: list_view_basic_state::State> ListViewBasicBuilder<'a, S> {
     /// Set the `listItemCount` field (optional)
     pub fn list_item_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `listItemCount` field to an Option value (optional)
     pub fn maybe_list_item_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1992,11 +1986,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ListViewBasicBuilder<'a, list_view_basic_state::SetName<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ListViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2011,11 +2005,11 @@ where
         mut self,
         value: impl Into<graph::ListPurpose<'a>>,
     ) -> ListViewBasicBuilder<'a, list_view_basic_state::SetPurpose<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ListViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2030,11 +2024,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListViewBasicBuilder<'a, list_view_basic_state::SetUri<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ListViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2045,12 +2039,12 @@ impl<'a, S: list_view_basic_state::State> ListViewBasicBuilder<'a, S> {
         mut self,
         value: impl Into<Option<graph::ListViewerState<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<graph::ListViewerState<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -2058,23 +2052,23 @@ impl<'a, S: list_view_basic_state::State> ListViewBasicBuilder<'a, S> {
 impl<'a, S> ListViewBasicBuilder<'a, S>
 where
     S: list_view_basic_state::State,
-    S::Cid: list_view_basic_state::IsSet,
     S::Name: list_view_basic_state::IsSet,
-    S::Purpose: list_view_basic_state::IsSet,
     S::Uri: list_view_basic_state::IsSet,
+    S::Cid: list_view_basic_state::IsSet,
+    S::Purpose: list_view_basic_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ListViewBasic<'a> {
         ListViewBasic {
-            avatar: self.__unsafe_private_named.0,
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2,
-            labels: self.__unsafe_private_named.3,
-            list_item_count: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            purpose: self.__unsafe_private_named.6.unwrap(),
-            uri: self.__unsafe_private_named.7.unwrap(),
-            viewer: self.__unsafe_private_named.8,
+            avatar: self._fields.0,
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2,
+            labels: self._fields.3,
+            list_item_count: self._fields.4,
+            name: self._fields.5.unwrap(),
+            purpose: self._fields.6.unwrap(),
+            uri: self._fields.7.unwrap(),
+            viewer: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -2084,15 +2078,15 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ListViewBasic<'a> {
         ListViewBasic {
-            avatar: self.__unsafe_private_named.0,
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2,
-            labels: self.__unsafe_private_named.3,
-            list_item_count: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            purpose: self.__unsafe_private_named.6.unwrap(),
-            uri: self.__unsafe_private_named.7.unwrap(),
-            viewer: self.__unsafe_private_named.8,
+            avatar: self._fields.0,
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2,
+            labels: self._fields.3,
+            list_item_count: self._fields.4,
+            name: self._fields.5.unwrap(),
+            purpose: self._fields.6.unwrap(),
+            uri: self._fields.7.unwrap(),
+            viewer: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
@@ -2108,45 +2102,45 @@ pub mod not_found_actor_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type NotFound;
         type Actor;
+        type NotFound;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type NotFound = Unset;
         type Actor = Unset;
-    }
-    ///State transition - sets the `not_found` field to Set
-    pub struct SetNotFound<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetNotFound<S> {}
-    impl<S: State> State for SetNotFound<S> {
-        type NotFound = Set<members::not_found>;
-        type Actor = S::Actor;
+        type NotFound = Unset;
     }
     ///State transition - sets the `actor` field to Set
     pub struct SetActor<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetActor<S> {}
     impl<S: State> State for SetActor<S> {
-        type NotFound = S::NotFound;
         type Actor = Set<members::actor>;
+        type NotFound = S::NotFound;
+    }
+    ///State transition - sets the `not_found` field to Set
+    pub struct SetNotFound<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetNotFound<S> {}
+    impl<S: State> State for SetNotFound<S> {
+        type Actor = S::Actor;
+        type NotFound = Set<members::not_found>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `not_found` field
-        pub struct not_found(());
         ///Marker type for the `actor` field
         pub struct actor(());
+        ///Marker type for the `not_found` field
+        pub struct not_found(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct NotFoundActorBuilder<'a, S: not_found_actor_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<bool>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> NotFoundActor<'a> {
@@ -2160,9 +2154,9 @@ impl<'a> NotFoundActorBuilder<'a, not_found_actor_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NotFoundActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2177,11 +2171,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> NotFoundActorBuilder<'a, not_found_actor_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NotFoundActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2196,11 +2190,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> NotFoundActorBuilder<'a, not_found_actor_state::SetNotFound<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         NotFoundActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2208,14 +2202,14 @@ where
 impl<'a, S> NotFoundActorBuilder<'a, S>
 where
     S: not_found_actor_state::State,
-    S::NotFound: not_found_actor_state::IsSet,
     S::Actor: not_found_actor_state::IsSet,
+    S::NotFound: not_found_actor_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> NotFoundActor<'a> {
         NotFoundActor {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            not_found: self.__unsafe_private_named.1.unwrap(),
+            actor: self._fields.0.unwrap(),
+            not_found: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2225,8 +2219,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> NotFoundActor<'a> {
         NotFoundActor {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            not_found: self.__unsafe_private_named.1.unwrap(),
+            actor: self._fields.0.unwrap(),
+            not_found: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2266,8 +2260,8 @@ pub mod relationship_state {
 
 /// Builder for constructing an instance of this type
 pub struct RelationshipBuilder<'a, S: relationship_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<AtUri<'a>>,
         Option<AtUri<'a>>,
@@ -2276,7 +2270,7 @@ pub struct RelationshipBuilder<'a, S: relationship_state::State> {
         Option<AtUri<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Relationship<'a> {
@@ -2290,9 +2284,9 @@ impl<'a> RelationshipBuilder<'a, relationship_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RelationshipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2300,12 +2294,12 @@ impl<'a> RelationshipBuilder<'a, relationship_state::Empty> {
 impl<'a, S: relationship_state::State> RelationshipBuilder<'a, S> {
     /// Set the `blockedBy` field (optional)
     pub fn blocked_by(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `blockedBy` field to an Option value (optional)
     pub fn maybe_blocked_by(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -2313,12 +2307,12 @@ impl<'a, S: relationship_state::State> RelationshipBuilder<'a, S> {
 impl<'a, S: relationship_state::State> RelationshipBuilder<'a, S> {
     /// Set the `blockedByList` field (optional)
     pub fn blocked_by_list(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `blockedByList` field to an Option value (optional)
     pub fn maybe_blocked_by_list(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -2326,12 +2320,12 @@ impl<'a, S: relationship_state::State> RelationshipBuilder<'a, S> {
 impl<'a, S: relationship_state::State> RelationshipBuilder<'a, S> {
     /// Set the `blocking` field (optional)
     pub fn blocking(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `blocking` field to an Option value (optional)
     pub fn maybe_blocking(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -2339,12 +2333,12 @@ impl<'a, S: relationship_state::State> RelationshipBuilder<'a, S> {
 impl<'a, S: relationship_state::State> RelationshipBuilder<'a, S> {
     /// Set the `blockingByList` field (optional)
     pub fn blocking_by_list(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `blockingByList` field to an Option value (optional)
     pub fn maybe_blocking_by_list(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -2359,11 +2353,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> RelationshipBuilder<'a, relationship_state::SetDid<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RelationshipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2371,12 +2365,12 @@ where
 impl<'a, S: relationship_state::State> RelationshipBuilder<'a, S> {
     /// Set the `followedBy` field (optional)
     pub fn followed_by(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `followedBy` field to an Option value (optional)
     pub fn maybe_followed_by(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -2384,12 +2378,12 @@ impl<'a, S: relationship_state::State> RelationshipBuilder<'a, S> {
 impl<'a, S: relationship_state::State> RelationshipBuilder<'a, S> {
     /// Set the `following` field (optional)
     pub fn following(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `following` field to an Option value (optional)
     pub fn maybe_following(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -2402,13 +2396,13 @@ where
     /// Build the final struct
     pub fn build(self) -> Relationship<'a> {
         Relationship {
-            blocked_by: self.__unsafe_private_named.0,
-            blocked_by_list: self.__unsafe_private_named.1,
-            blocking: self.__unsafe_private_named.2,
-            blocking_by_list: self.__unsafe_private_named.3,
-            did: self.__unsafe_private_named.4.unwrap(),
-            followed_by: self.__unsafe_private_named.5,
-            following: self.__unsafe_private_named.6,
+            blocked_by: self._fields.0,
+            blocked_by_list: self._fields.1,
+            blocking: self._fields.2,
+            blocking_by_list: self._fields.3,
+            did: self._fields.4.unwrap(),
+            followed_by: self._fields.5,
+            following: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -2418,13 +2412,13 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Relationship<'a> {
         Relationship {
-            blocked_by: self.__unsafe_private_named.0,
-            blocked_by_list: self.__unsafe_private_named.1,
-            blocking: self.__unsafe_private_named.2,
-            blocking_by_list: self.__unsafe_private_named.3,
-            did: self.__unsafe_private_named.4.unwrap(),
-            followed_by: self.__unsafe_private_named.5,
-            following: self.__unsafe_private_named.6,
+            blocked_by: self._fields.0,
+            blocked_by_list: self._fields.1,
+            blocking: self._fields.2,
+            blocking_by_list: self._fields.3,
+            did: self._fields.4.unwrap(),
+            followed_by: self._fields.5,
+            following: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
@@ -2440,92 +2434,92 @@ pub mod starter_pack_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Creator;
+        type IndexedAt;
         type Cid;
         type Record;
         type Uri;
-        type IndexedAt;
+        type Creator;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Creator = Unset;
+        type IndexedAt = Unset;
         type Cid = Unset;
         type Record = Unset;
         type Uri = Unset;
-        type IndexedAt = Unset;
+        type Creator = Unset;
     }
-    ///State transition - sets the `creator` field to Set
-    pub struct SetCreator<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreator<S> {}
-    impl<S: State> State for SetCreator<S> {
-        type Creator = Set<members::creator>;
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
+        type IndexedAt = Set<members::indexed_at>;
         type Cid = S::Cid;
         type Record = S::Record;
         type Uri = S::Uri;
-        type IndexedAt = S::IndexedAt;
+        type Creator = S::Creator;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type Creator = S::Creator;
+        type IndexedAt = S::IndexedAt;
         type Cid = Set<members::cid>;
         type Record = S::Record;
         type Uri = S::Uri;
-        type IndexedAt = S::IndexedAt;
+        type Creator = S::Creator;
     }
     ///State transition - sets the `record` field to Set
     pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecord<S> {}
     impl<S: State> State for SetRecord<S> {
-        type Creator = S::Creator;
+        type IndexedAt = S::IndexedAt;
         type Cid = S::Cid;
         type Record = Set<members::record>;
         type Uri = S::Uri;
-        type IndexedAt = S::IndexedAt;
+        type Creator = S::Creator;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Creator = S::Creator;
+        type IndexedAt = S::IndexedAt;
         type Cid = S::Cid;
         type Record = S::Record;
         type Uri = Set<members::uri>;
-        type IndexedAt = S::IndexedAt;
-    }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
         type Creator = S::Creator;
+    }
+    ///State transition - sets the `creator` field to Set
+    pub struct SetCreator<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreator<S> {}
+    impl<S: State> State for SetCreator<S> {
+        type IndexedAt = S::IndexedAt;
         type Cid = S::Cid;
         type Record = S::Record;
         type Uri = S::Uri;
-        type IndexedAt = Set<members::indexed_at>;
+        type Creator = Set<members::creator>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `creator` field
-        pub struct creator(());
+        ///Marker type for the `indexed_at` field
+        pub struct indexed_at(());
         ///Marker type for the `cid` field
         pub struct cid(());
         ///Marker type for the `record` field
         pub struct record(());
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `indexed_at` field
-        pub struct indexed_at(());
+        ///Marker type for the `creator` field
+        pub struct creator(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct StarterPackViewBuilder<'a, S: starter_pack_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<ProfileViewBasic<'a>>,
         Option<Vec<GeneratorView<'a>>>,
@@ -2538,7 +2532,7 @@ pub struct StarterPackViewBuilder<'a, S: starter_pack_view_state::State> {
         Option<Data<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> StarterPackView<'a> {
@@ -2552,21 +2546,9 @@ impl<'a> StarterPackViewBuilder<'a, starter_pack_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StarterPackViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2581,11 +2563,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> StarterPackViewBuilder<'a, starter_pack_view_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StarterPackViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2600,11 +2582,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> StarterPackViewBuilder<'a, starter_pack_view_state::SetCreator<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StarterPackViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2612,12 +2594,12 @@ where
 impl<'a, S: starter_pack_view_state::State> StarterPackViewBuilder<'a, S> {
     /// Set the `feeds` field (optional)
     pub fn feeds(mut self, value: impl Into<Option<Vec<GeneratorView<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `feeds` field to an Option value (optional)
     pub fn maybe_feeds(mut self, value: Option<Vec<GeneratorView<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -2632,11 +2614,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StarterPackViewBuilder<'a, starter_pack_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         StarterPackViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2644,12 +2626,12 @@ where
 impl<'a, S: starter_pack_view_state::State> StarterPackViewBuilder<'a, S> {
     /// Set the `joinedAllTimeCount` field (optional)
     pub fn joined_all_time_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `joinedAllTimeCount` field to an Option value (optional)
     pub fn maybe_joined_all_time_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -2657,12 +2639,12 @@ impl<'a, S: starter_pack_view_state::State> StarterPackViewBuilder<'a, S> {
 impl<'a, S: starter_pack_view_state::State> StarterPackViewBuilder<'a, S> {
     /// Set the `joinedWeekCount` field (optional)
     pub fn joined_week_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `joinedWeekCount` field to an Option value (optional)
     pub fn maybe_joined_week_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -2670,12 +2652,12 @@ impl<'a, S: starter_pack_view_state::State> StarterPackViewBuilder<'a, S> {
 impl<'a, S: starter_pack_view_state::State> StarterPackViewBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -2683,12 +2665,12 @@ impl<'a, S: starter_pack_view_state::State> StarterPackViewBuilder<'a, S> {
 impl<'a, S: starter_pack_view_state::State> StarterPackViewBuilder<'a, S> {
     /// Set the `list` field (optional)
     pub fn list(mut self, value: impl Into<Option<graph::ListViewBasic<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `list` field to an Option value (optional)
     pub fn maybe_list(mut self, value: Option<graph::ListViewBasic<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -2699,7 +2681,7 @@ impl<'a, S: starter_pack_view_state::State> StarterPackViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<graph::ListItemView<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `listItemsSample` field to an Option value (optional)
@@ -2707,7 +2689,7 @@ impl<'a, S: starter_pack_view_state::State> StarterPackViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<graph::ListItemView<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -2722,11 +2704,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> StarterPackViewBuilder<'a, starter_pack_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         StarterPackViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2741,11 +2723,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> StarterPackViewBuilder<'a, starter_pack_view_state::SetUri<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         StarterPackViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2753,26 +2735,26 @@ where
 impl<'a, S> StarterPackViewBuilder<'a, S>
 where
     S: starter_pack_view_state::State,
-    S::Creator: starter_pack_view_state::IsSet,
+    S::IndexedAt: starter_pack_view_state::IsSet,
     S::Cid: starter_pack_view_state::IsSet,
     S::Record: starter_pack_view_state::IsSet,
     S::Uri: starter_pack_view_state::IsSet,
-    S::IndexedAt: starter_pack_view_state::IsSet,
+    S::Creator: starter_pack_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> StarterPackView<'a> {
         StarterPackView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            creator: self.__unsafe_private_named.1.unwrap(),
-            feeds: self.__unsafe_private_named.2,
-            indexed_at: self.__unsafe_private_named.3.unwrap(),
-            joined_all_time_count: self.__unsafe_private_named.4,
-            joined_week_count: self.__unsafe_private_named.5,
-            labels: self.__unsafe_private_named.6,
-            list: self.__unsafe_private_named.7,
-            list_items_sample: self.__unsafe_private_named.8,
-            record: self.__unsafe_private_named.9.unwrap(),
-            uri: self.__unsafe_private_named.10.unwrap(),
+            cid: self._fields.0.unwrap(),
+            creator: self._fields.1.unwrap(),
+            feeds: self._fields.2,
+            indexed_at: self._fields.3.unwrap(),
+            joined_all_time_count: self._fields.4,
+            joined_week_count: self._fields.5,
+            labels: self._fields.6,
+            list: self._fields.7,
+            list_items_sample: self._fields.8,
+            record: self._fields.9.unwrap(),
+            uri: self._fields.10.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2782,17 +2764,17 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> StarterPackView<'a> {
         StarterPackView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            creator: self.__unsafe_private_named.1.unwrap(),
-            feeds: self.__unsafe_private_named.2,
-            indexed_at: self.__unsafe_private_named.3.unwrap(),
-            joined_all_time_count: self.__unsafe_private_named.4,
-            joined_week_count: self.__unsafe_private_named.5,
-            labels: self.__unsafe_private_named.6,
-            list: self.__unsafe_private_named.7,
-            list_items_sample: self.__unsafe_private_named.8,
-            record: self.__unsafe_private_named.9.unwrap(),
-            uri: self.__unsafe_private_named.10.unwrap(),
+            cid: self._fields.0.unwrap(),
+            creator: self._fields.1.unwrap(),
+            feeds: self._fields.2,
+            indexed_at: self._fields.3.unwrap(),
+            joined_all_time_count: self._fields.4,
+            joined_week_count: self._fields.5,
+            labels: self._fields.6,
+            list: self._fields.7,
+            list_items_sample: self._fields.8,
+            record: self._fields.9.unwrap(),
+            uri: self._fields.10.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2809,91 +2791,91 @@ pub mod starter_pack_view_basic_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type IndexedAt;
-        type Record;
         type Uri;
         type Cid;
         type Creator;
+        type Record;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type IndexedAt = Unset;
-        type Record = Unset;
         type Uri = Unset;
         type Cid = Unset;
         type Creator = Unset;
+        type Record = Unset;
     }
     ///State transition - sets the `indexed_at` field to Set
     pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
     impl<S: State> State for SetIndexedAt<S> {
         type IndexedAt = Set<members::indexed_at>;
-        type Record = S::Record;
-        type Uri = S::Uri;
-        type Cid = S::Cid;
-        type Creator = S::Creator;
-    }
-    ///State transition - sets the `record` field to Set
-    pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRecord<S> {}
-    impl<S: State> State for SetRecord<S> {
-        type IndexedAt = S::IndexedAt;
-        type Record = Set<members::record>;
         type Uri = S::Uri;
         type Cid = S::Cid;
         type Creator = S::Creator;
+        type Record = S::Record;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
         type IndexedAt = S::IndexedAt;
-        type Record = S::Record;
         type Uri = Set<members::uri>;
         type Cid = S::Cid;
         type Creator = S::Creator;
+        type Record = S::Record;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
         type IndexedAt = S::IndexedAt;
-        type Record = S::Record;
         type Uri = S::Uri;
         type Cid = Set<members::cid>;
         type Creator = S::Creator;
+        type Record = S::Record;
     }
     ///State transition - sets the `creator` field to Set
     pub struct SetCreator<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreator<S> {}
     impl<S: State> State for SetCreator<S> {
         type IndexedAt = S::IndexedAt;
-        type Record = S::Record;
         type Uri = S::Uri;
         type Cid = S::Cid;
         type Creator = Set<members::creator>;
+        type Record = S::Record;
+    }
+    ///State transition - sets the `record` field to Set
+    pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRecord<S> {}
+    impl<S: State> State for SetRecord<S> {
+        type IndexedAt = S::IndexedAt;
+        type Uri = S::Uri;
+        type Cid = S::Cid;
+        type Creator = S::Creator;
+        type Record = Set<members::record>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `indexed_at` field
         pub struct indexed_at(());
-        ///Marker type for the `record` field
-        pub struct record(());
         ///Marker type for the `uri` field
         pub struct uri(());
         ///Marker type for the `cid` field
         pub struct cid(());
         ///Marker type for the `creator` field
         pub struct creator(());
+        ///Marker type for the `record` field
+        pub struct record(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct StarterPackViewBasicBuilder<'a, S: starter_pack_view_basic_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<ProfileViewBasic<'a>>,
         Option<Datetime>,
@@ -2904,7 +2886,7 @@ pub struct StarterPackViewBasicBuilder<'a, S: starter_pack_view_basic_state::Sta
         Option<Data<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> StarterPackViewBasic<'a> {
@@ -2921,19 +2903,9 @@ impl<'a> StarterPackViewBasicBuilder<'a, starter_pack_view_basic_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StarterPackViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2948,11 +2920,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> StarterPackViewBasicBuilder<'a, starter_pack_view_basic_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StarterPackViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2967,11 +2939,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> StarterPackViewBasicBuilder<'a, starter_pack_view_basic_state::SetCreator<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StarterPackViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2989,11 +2961,11 @@ where
         'a,
         starter_pack_view_basic_state::SetIndexedAt<S>,
     > {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         StarterPackViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3001,12 +2973,12 @@ where
 impl<'a, S: starter_pack_view_basic_state::State> StarterPackViewBasicBuilder<'a, S> {
     /// Set the `joinedAllTimeCount` field (optional)
     pub fn joined_all_time_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `joinedAllTimeCount` field to an Option value (optional)
     pub fn maybe_joined_all_time_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -3014,12 +2986,12 @@ impl<'a, S: starter_pack_view_basic_state::State> StarterPackViewBasicBuilder<'a
 impl<'a, S: starter_pack_view_basic_state::State> StarterPackViewBasicBuilder<'a, S> {
     /// Set the `joinedWeekCount` field (optional)
     pub fn joined_week_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `joinedWeekCount` field to an Option value (optional)
     pub fn maybe_joined_week_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -3027,12 +2999,12 @@ impl<'a, S: starter_pack_view_basic_state::State> StarterPackViewBasicBuilder<'a
 impl<'a, S: starter_pack_view_basic_state::State> StarterPackViewBasicBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -3040,12 +3012,12 @@ impl<'a, S: starter_pack_view_basic_state::State> StarterPackViewBasicBuilder<'a
 impl<'a, S: starter_pack_view_basic_state::State> StarterPackViewBasicBuilder<'a, S> {
     /// Set the `listItemCount` field (optional)
     pub fn list_item_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `listItemCount` field to an Option value (optional)
     pub fn maybe_list_item_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -3060,11 +3032,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> StarterPackViewBasicBuilder<'a, starter_pack_view_basic_state::SetRecord<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         StarterPackViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3079,11 +3051,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> StarterPackViewBasicBuilder<'a, starter_pack_view_basic_state::SetUri<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         StarterPackViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3092,23 +3064,23 @@ impl<'a, S> StarterPackViewBasicBuilder<'a, S>
 where
     S: starter_pack_view_basic_state::State,
     S::IndexedAt: starter_pack_view_basic_state::IsSet,
-    S::Record: starter_pack_view_basic_state::IsSet,
     S::Uri: starter_pack_view_basic_state::IsSet,
     S::Cid: starter_pack_view_basic_state::IsSet,
     S::Creator: starter_pack_view_basic_state::IsSet,
+    S::Record: starter_pack_view_basic_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> StarterPackViewBasic<'a> {
         StarterPackViewBasic {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            creator: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            joined_all_time_count: self.__unsafe_private_named.3,
-            joined_week_count: self.__unsafe_private_named.4,
-            labels: self.__unsafe_private_named.5,
-            list_item_count: self.__unsafe_private_named.6,
-            record: self.__unsafe_private_named.7.unwrap(),
-            uri: self.__unsafe_private_named.8.unwrap(),
+            cid: self._fields.0.unwrap(),
+            creator: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            joined_all_time_count: self._fields.3,
+            joined_week_count: self._fields.4,
+            labels: self._fields.5,
+            list_item_count: self._fields.6,
+            record: self._fields.7.unwrap(),
+            uri: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3118,15 +3090,15 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> StarterPackViewBasic<'a> {
         StarterPackViewBasic {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            creator: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            joined_all_time_count: self.__unsafe_private_named.3,
-            joined_week_count: self.__unsafe_private_named.4,
-            labels: self.__unsafe_private_named.5,
-            list_item_count: self.__unsafe_private_named.6,
-            record: self.__unsafe_private_named.7.unwrap(),
-            uri: self.__unsafe_private_named.8.unwrap(),
+            cid: self._fields.0.unwrap(),
+            creator: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            joined_all_time_count: self._fields.3,
+            joined_week_count: self._fields.4,
+            labels: self._fields.5,
+            list_item_count: self._fields.6,
+            record: self._fields.7.unwrap(),
+            uri: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/graph/block.rs b/crates/jacquard-api/src/app_bsky/graph/block.rs
index 5acb9d83..0385372d 100644
--- a/crates/jacquard-api/src/app_bsky/graph/block.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/block.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -109,45 +112,45 @@ pub mod block_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type CreatedAt;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
+        type Subject = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BlockBuilder<'a, S: block_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Block<'a> {
@@ -161,9 +164,9 @@ impl<'a> BlockBuilder<'a, block_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BlockBuilder<'a, block_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> BlockBuilder<'a, block_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,14 +212,14 @@ where
 impl<'a, S> BlockBuilder<'a, S>
 where
     S: block_state::State,
-    S::Subject: block_state::IsSet,
     S::CreatedAt: block_state::IsSet,
+    S::Subject: block_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Block<'a> {
         Block {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -229,8 +232,8 @@ where
         >,
     ) -> Block<'a> {
         Block {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/graph/follow.rs b/crates/jacquard-api/src/app_bsky/graph/follow.rs
index 0346965a..e03d3d40 100644
--- a/crates/jacquard-api/src/app_bsky/graph/follow.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/follow.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -112,45 +115,45 @@ pub mod follow_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subject;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subject = S::Subject;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FollowBuilder<'a, S: follow_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Follow<'a> {
@@ -164,9 +167,9 @@ impl<'a> FollowBuilder<'a, follow_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,11 +184,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FollowBuilder<'a, follow_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,11 +203,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> FollowBuilder<'a, follow_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,12 +215,12 @@ where
 impl<'a, S: follow_state::State> FollowBuilder<'a, S> {
     /// Set the `via` field (optional)
     pub fn via(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `via` field to an Option value (optional)
     pub fn maybe_via(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -225,15 +228,15 @@ impl<'a, S: follow_state::State> FollowBuilder<'a, S> {
 impl<'a, S> FollowBuilder<'a, S>
 where
     S: follow_state::State,
-    S::CreatedAt: follow_state::IsSet,
     S::Subject: follow_state::IsSet,
+    S::CreatedAt: follow_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            via: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            via: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -246,9 +249,9 @@ where
         >,
     ) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            via: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            via: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_actor_starter_packs.rs b/crates/jacquard-api/src/app_bsky/graph/get_actor_starter_packs.rs
index cecb5957..8d4f7467 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_actor_starter_packs.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_actor_starter_packs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -101,9 +104,9 @@ pub mod get_actor_starter_packs_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorStarterPacksBuilder<'a, S: get_actor_starter_packs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorStarterPacks<'a> {
@@ -120,9 +123,9 @@ impl<'a> GetActorStarterPacksBuilder<'a, get_actor_starter_packs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorStarterPacksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,11 +140,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorStarterPacksBuilder<'a, get_actor_starter_packs_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorStarterPacksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,12 +152,12 @@ where
 impl<'a, S: get_actor_starter_packs_state::State> GetActorStarterPacksBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -162,12 +165,12 @@ impl<'a, S: get_actor_starter_packs_state::State> GetActorStarterPacksBuilder<'a
 impl<'a, S: get_actor_starter_packs_state::State> GetActorStarterPacksBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -180,9 +183,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorStarterPacks<'a> {
         GetActorStarterPacks {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_blocks.rs b/crates/jacquard-api/src/app_bsky/graph/get_blocks.rs
index fad9a3f1..a4a4cbfc 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_blocks.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_blocks.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -85,9 +88,9 @@ pub mod get_blocks_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetBlocksBuilder<'a, S: get_blocks_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetBlocks<'a> {
@@ -101,9 +104,9 @@ impl<'a> GetBlocksBuilder<'a, get_blocks_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetBlocksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -111,12 +114,12 @@ impl<'a> GetBlocksBuilder<'a, get_blocks_state::Empty> {
 impl<'a, S: get_blocks_state::State> GetBlocksBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -124,12 +127,12 @@ impl<'a, S: get_blocks_state::State> GetBlocksBuilder<'a, S> {
 impl<'a, S: get_blocks_state::State> GetBlocksBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -141,8 +144,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetBlocks<'a> {
         GetBlocks {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_followers.rs b/crates/jacquard-api/src/app_bsky/graph/get_followers.rs
index ab7ec6d9..53d5d644 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_followers.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_followers.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -103,9 +106,9 @@ pub mod get_followers_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFollowersBuilder<'a, S: get_followers_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFollowers<'a> {
@@ -119,9 +122,9 @@ impl<'a> GetFollowersBuilder<'a, get_followers_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFollowersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,11 +139,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetFollowersBuilder<'a, get_followers_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetFollowersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,12 +151,12 @@ where
 impl<'a, S: get_followers_state::State> GetFollowersBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -161,12 +164,12 @@ impl<'a, S: get_followers_state::State> GetFollowersBuilder<'a, S> {
 impl<'a, S: get_followers_state::State> GetFollowersBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -179,9 +182,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFollowers<'a> {
         GetFollowers {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_follows.rs b/crates/jacquard-api/src/app_bsky/graph/get_follows.rs
index 0ddb4c99..d9e4e6cb 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_follows.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_follows.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -103,9 +106,9 @@ pub mod get_follows_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFollowsBuilder<'a, S: get_follows_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFollows<'a> {
@@ -119,9 +122,9 @@ impl<'a> GetFollowsBuilder<'a, get_follows_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFollowsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,11 +139,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetFollowsBuilder<'a, get_follows_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetFollowsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,12 +151,12 @@ where
 impl<'a, S: get_follows_state::State> GetFollowsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -161,12 +164,12 @@ impl<'a, S: get_follows_state::State> GetFollowsBuilder<'a, S> {
 impl<'a, S: get_follows_state::State> GetFollowsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -179,9 +182,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFollows<'a> {
         GetFollows {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_known_followers.rs b/crates/jacquard-api/src/app_bsky/graph/get_known_followers.rs
index 5e51d581..03ba3019 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_known_followers.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_known_followers.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -103,9 +106,9 @@ pub mod get_known_followers_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetKnownFollowersBuilder<'a, S: get_known_followers_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetKnownFollowers<'a> {
@@ -119,9 +122,9 @@ impl<'a> GetKnownFollowersBuilder<'a, get_known_followers_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetKnownFollowersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,11 +139,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetKnownFollowersBuilder<'a, get_known_followers_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetKnownFollowersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,12 +151,12 @@ where
 impl<'a, S: get_known_followers_state::State> GetKnownFollowersBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -161,12 +164,12 @@ impl<'a, S: get_known_followers_state::State> GetKnownFollowersBuilder<'a, S> {
 impl<'a, S: get_known_followers_state::State> GetKnownFollowersBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -179,9 +182,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetKnownFollowers<'a> {
         GetKnownFollowers {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_list.rs b/crates/jacquard-api/src/app_bsky/graph/get_list.rs
index d50e0576..0f694ca9 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_list.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -104,9 +107,9 @@ pub mod get_list_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetListBuilder<'a, S: get_list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetList<'a> {
@@ -120,9 +123,9 @@ impl<'a> GetListBuilder<'a, get_list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -130,12 +133,12 @@ impl<'a> GetListBuilder<'a, get_list_state::Empty> {
 impl<'a, S: get_list_state::State> GetListBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -143,12 +146,12 @@ impl<'a, S: get_list_state::State> GetListBuilder<'a, S> {
 impl<'a, S: get_list_state::State> GetListBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -163,11 +166,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetListBuilder<'a, get_list_state::SetList<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,9 +183,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetList<'a> {
         GetList {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            list: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            list: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_list_blocks.rs b/crates/jacquard-api/src/app_bsky/graph/get_list_blocks.rs
index 5adeeb75..b441a5ff 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_list_blocks.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_list_blocks.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -85,9 +88,9 @@ pub mod get_list_blocks_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetListBlocksBuilder<'a, S: get_list_blocks_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetListBlocks<'a> {
@@ -101,9 +104,9 @@ impl<'a> GetListBlocksBuilder<'a, get_list_blocks_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetListBlocksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -111,12 +114,12 @@ impl<'a> GetListBlocksBuilder<'a, get_list_blocks_state::Empty> {
 impl<'a, S: get_list_blocks_state::State> GetListBlocksBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -124,12 +127,12 @@ impl<'a, S: get_list_blocks_state::State> GetListBlocksBuilder<'a, S> {
 impl<'a, S: get_list_blocks_state::State> GetListBlocksBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -141,8 +144,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetListBlocks<'a> {
         GetListBlocks {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_list_mutes.rs b/crates/jacquard-api/src/app_bsky/graph/get_list_mutes.rs
index 650fd59d..4ddec405 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_list_mutes.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_list_mutes.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -85,9 +88,9 @@ pub mod get_list_mutes_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetListMutesBuilder<'a, S: get_list_mutes_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetListMutes<'a> {
@@ -101,9 +104,9 @@ impl<'a> GetListMutesBuilder<'a, get_list_mutes_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetListMutesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -111,12 +114,12 @@ impl<'a> GetListMutesBuilder<'a, get_list_mutes_state::Empty> {
 impl<'a, S: get_list_mutes_state::State> GetListMutesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -124,12 +127,12 @@ impl<'a, S: get_list_mutes_state::State> GetListMutesBuilder<'a, S> {
 impl<'a, S: get_list_mutes_state::State> GetListMutesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -141,8 +144,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetListMutes<'a> {
         GetListMutes {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_lists.rs b/crates/jacquard-api/src/app_bsky/graph/get_lists.rs
index 6403a566..97705e3c 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_lists.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_lists.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -104,14 +107,14 @@ pub mod get_lists_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetListsBuilder<'a, S: get_lists_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetLists<'a> {
@@ -125,9 +128,9 @@ impl<'a> GetListsBuilder<'a, get_lists_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetListsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,11 +145,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetListsBuilder<'a, get_lists_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetListsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -154,12 +157,12 @@ where
 impl<'a, S: get_lists_state::State> GetListsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -167,12 +170,12 @@ impl<'a, S: get_lists_state::State> GetListsBuilder<'a, S> {
 impl<'a, S: get_lists_state::State> GetListsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -180,12 +183,12 @@ impl<'a, S: get_lists_state::State> GetListsBuilder<'a, S> {
 impl<'a, S: get_lists_state::State> GetListsBuilder<'a, S> {
     /// Set the `purposes` field (optional)
     pub fn purposes(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `purposes` field to an Option value (optional)
     pub fn maybe_purposes(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -198,10 +201,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetLists<'a> {
         GetLists {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            purposes: self.__unsafe_private_named.3,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
+            purposes: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs b/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs
index 34f96d5c..54292aa7 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -138,9 +141,9 @@ pub mod list_with_membership_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListWithMembershipBuilder<'a, S: list_with_membership_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ListView<'a>>, Option<ListItemView<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ListView<'a>>, Option<ListItemView<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListWithMembership<'a> {
@@ -154,9 +157,9 @@ impl<'a> ListWithMembershipBuilder<'a, list_with_membership_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListWithMembershipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -171,11 +174,11 @@ where
         mut self,
         value: impl Into<ListView<'a>>,
     ) -> ListWithMembershipBuilder<'a, list_with_membership_state::SetList<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListWithMembershipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,12 +186,12 @@ where
 impl<'a, S: list_with_membership_state::State> ListWithMembershipBuilder<'a, S> {
     /// Set the `listItem` field (optional)
     pub fn list_item(mut self, value: impl Into<Option<ListItemView<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `listItem` field to an Option value (optional)
     pub fn maybe_list_item(mut self, value: Option<ListItemView<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -201,8 +204,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ListWithMembership<'a> {
         ListWithMembership {
-            list: self.__unsafe_private_named.0.unwrap(),
-            list_item: self.__unsafe_private_named.1,
+            list: self._fields.0.unwrap(),
+            list_item: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -215,8 +218,8 @@ where
         >,
     ) -> ListWithMembership<'a> {
         ListWithMembership {
-            list: self.__unsafe_private_named.0.unwrap(),
-            list_item: self.__unsafe_private_named.1,
+            list: self._fields.0.unwrap(),
+            list_item: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
@@ -359,14 +362,14 @@ pub mod get_lists_with_membership_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetListsWithMembershipBuilder<'a, S: get_lists_with_membership_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetListsWithMembership<'a> {
@@ -383,9 +386,9 @@ impl<'a> GetListsWithMembershipBuilder<'a, get_lists_with_membership_state::Empt
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetListsWithMembershipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -403,11 +406,11 @@ where
         'a,
         get_lists_with_membership_state::SetActor<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetListsWithMembershipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -418,12 +421,12 @@ impl<
 > GetListsWithMembershipBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -434,12 +437,12 @@ impl<
 > GetListsWithMembershipBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -450,12 +453,12 @@ impl<
 > GetListsWithMembershipBuilder<'a, S> {
     /// Set the `purposes` field (optional)
     pub fn purposes(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `purposes` field to an Option value (optional)
     pub fn maybe_purposes(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -468,10 +471,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetListsWithMembership<'a> {
         GetListsWithMembership {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            purposes: self.__unsafe_private_named.3,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
+            purposes: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_mutes.rs b/crates/jacquard-api/src/app_bsky/graph/get_mutes.rs
index 3e4acac5..a1861ef4 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_mutes.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_mutes.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -85,9 +88,9 @@ pub mod get_mutes_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetMutesBuilder<'a, S: get_mutes_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetMutes<'a> {
@@ -101,9 +104,9 @@ impl<'a> GetMutesBuilder<'a, get_mutes_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetMutesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -111,12 +114,12 @@ impl<'a> GetMutesBuilder<'a, get_mutes_state::Empty> {
 impl<'a, S: get_mutes_state::State> GetMutesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -124,12 +127,12 @@ impl<'a, S: get_mutes_state::State> GetMutesBuilder<'a, S> {
 impl<'a, S: get_mutes_state::State> GetMutesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -141,8 +144,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetMutes<'a> {
         GetMutes {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_relationships.rs b/crates/jacquard-api/src/app_bsky/graph/get_relationships.rs
index a34a71ae..c10d3c39 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_relationships.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_relationships.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -144,9 +147,9 @@ pub mod get_relationships_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetRelationshipsBuilder<'a, S: get_relationships_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<Vec<AtIdentifier<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<Vec<AtIdentifier<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetRelationships<'a> {
@@ -160,9 +163,9 @@ impl<'a> GetRelationshipsBuilder<'a, get_relationships_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetRelationshipsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -177,11 +180,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetRelationshipsBuilder<'a, get_relationships_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetRelationshipsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -189,12 +192,12 @@ where
 impl<'a, S: get_relationships_state::State> GetRelationshipsBuilder<'a, S> {
     /// Set the `others` field (optional)
     pub fn others(mut self, value: impl Into<Option<Vec<AtIdentifier<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `others` field to an Option value (optional)
     pub fn maybe_others(mut self, value: Option<Vec<AtIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -207,8 +210,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetRelationships<'a> {
         GetRelationships {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            others: self.__unsafe_private_named.1,
+            actor: self._fields.0.unwrap(),
+            others: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_starter_pack.rs b/crates/jacquard-api/src/app_bsky/graph/get_starter_pack.rs
index 1a4ab9f4..4df30efb 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_starter_pack.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_starter_pack.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_starter_pack_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetStarterPackBuilder<'a, S: get_starter_pack_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetStarterPack<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetStarterPackBuilder<'a, get_starter_pack_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetStarterPackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetStarterPackBuilder<'a, get_starter_pack_state::SetStarterPack<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetStarterPackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetStarterPack<'a> {
         GetStarterPack {
-            starter_pack: self.__unsafe_private_named.0.unwrap(),
+            starter_pack: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_starter_packs.rs b/crates/jacquard-api/src/app_bsky/graph/get_starter_packs.rs
index 8004dccf..40a0de2e 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_starter_packs.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_starter_packs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_starter_packs_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetStarterPacksBuilder<'a, S: get_starter_packs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<AtUri<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<AtUri<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetStarterPacks<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetStarterPacksBuilder<'a, get_starter_packs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetStarterPacksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> GetStarterPacksBuilder<'a, get_starter_packs_state::SetUris<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetStarterPacksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetStarterPacks<'a> {
         GetStarterPacks {
-            uris: self.__unsafe_private_named.0.unwrap(),
+            uris: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs b/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs
index 767c27ba..f11ea3e0 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -144,9 +147,9 @@ pub struct GetStarterPacksWithMembershipBuilder<
     'a,
     S: get_starter_packs_with_membership_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetStarterPacksWithMembership<'a> {
@@ -168,9 +171,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetStarterPacksWithMembershipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -188,11 +191,11 @@ where
         'a,
         get_starter_packs_with_membership_state::SetActor<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetStarterPacksWithMembershipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,12 +206,12 @@ impl<
 > GetStarterPacksWithMembershipBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -219,12 +222,12 @@ impl<
 > GetStarterPacksWithMembershipBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -237,9 +240,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetStarterPacksWithMembership<'a> {
         GetStarterPacksWithMembership {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
@@ -281,9 +284,9 @@ pub struct StarterPackWithMembershipBuilder<
     'a,
     S: starter_pack_with_membership_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ListItemView<'a>>, Option<StarterPackView<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ListItemView<'a>>, Option<StarterPackView<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> StarterPackWithMembership<'a> {
@@ -302,9 +305,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StarterPackWithMembershipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -315,12 +318,12 @@ impl<
 > StarterPackWithMembershipBuilder<'a, S> {
     /// Set the `listItem` field (optional)
     pub fn list_item(mut self, value: impl Into<Option<ListItemView<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `listItem` field to an Option value (optional)
     pub fn maybe_list_item(mut self, value: Option<ListItemView<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -338,11 +341,11 @@ where
         'a,
         starter_pack_with_membership_state::SetStarterPack<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StarterPackWithMembershipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -355,8 +358,8 @@ where
     /// Build the final struct
     pub fn build(self) -> StarterPackWithMembership<'a> {
         StarterPackWithMembership {
-            list_item: self.__unsafe_private_named.0,
-            starter_pack: self.__unsafe_private_named.1.unwrap(),
+            list_item: self._fields.0,
+            starter_pack: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -369,8 +372,8 @@ where
         >,
     ) -> StarterPackWithMembership<'a> {
         StarterPackWithMembership {
-            list_item: self.__unsafe_private_named.0,
-            starter_pack: self.__unsafe_private_named.1.unwrap(),
+            list_item: self._fields.0,
+            starter_pack: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_suggested_follows_by_actor.rs b/crates/jacquard-api/src/app_bsky/graph/get_suggested_follows_by_actor.rs
index 1d6bf8b1..4520ded4 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_suggested_follows_by_actor.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_suggested_follows_by_actor.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -101,9 +104,9 @@ pub struct GetSuggestedFollowsByActorBuilder<
     'a,
     S: get_suggested_follows_by_actor_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSuggestedFollowsByActor<'a> {
@@ -122,9 +125,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSuggestedFollowsByActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,11 +145,11 @@ where
         'a,
         get_suggested_follows_by_actor_state::SetActor<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetSuggestedFollowsByActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -159,7 +162,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSuggestedFollowsByActor<'a> {
         GetSuggestedFollowsByActor {
-            actor: self.__unsafe_private_named.0.unwrap(),
+            actor: self._fields.0.unwrap(),
         }
     }
 }
diff --git a/crates/jacquard-api/src/app_bsky/graph/list.rs b/crates/jacquard-api/src/app_bsky/graph/list.rs
index 6a8ed3d5..b849dbab 100644
--- a/crates/jacquard-api/src/app_bsky/graph/list.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -212,58 +215,58 @@ pub mod list_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
-        type Purpose;
         type CreatedAt;
+        type Purpose;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
-        type Purpose = Unset;
         type CreatedAt = Unset;
+        type Purpose = Unset;
+        type Name = Unset;
     }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
         type Purpose = S::Purpose;
-        type CreatedAt = S::CreatedAt;
+        type Name = S::Name;
     }
     ///State transition - sets the `purpose` field to Set
     pub struct SetPurpose<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPurpose<S> {}
     impl<S: State> State for SetPurpose<S> {
-        type Name = S::Name;
-        type Purpose = Set<members::purpose>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+        type Purpose = Set<members::purpose>;
         type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type CreatedAt = S::CreatedAt;
         type Purpose = S::Purpose;
-        type CreatedAt = Set<members::created_at>;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
-        ///Marker type for the `purpose` field
-        pub struct purpose(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `purpose` field
+        pub struct purpose(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ListBuilder<'a, S: list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -272,7 +275,7 @@ pub struct ListBuilder<'a, S: list_state::State> {
         Option<CowStr<'a>>,
         Option<ListPurpose<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> List<'a> {
@@ -286,9 +289,9 @@ impl<'a> ListBuilder<'a, list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -296,12 +299,12 @@ impl<'a> ListBuilder<'a, list_state::Empty> {
 impl<'a, S: list_state::State> ListBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -316,11 +319,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListBuilder<'a, list_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -328,12 +331,12 @@ where
 impl<'a, S: list_state::State> ListBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -344,12 +347,12 @@ impl<'a, S: list_state::State> ListBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `descriptionFacets` field to an Option value (optional)
     pub fn maybe_description_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -357,12 +360,12 @@ impl<'a, S: list_state::State> ListBuilder<'a, S> {
 impl<'a, S: list_state::State> ListBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -377,11 +380,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ListBuilder<'a, list_state::SetName<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -396,11 +399,11 @@ where
         mut self,
         value: impl Into<ListPurpose<'a>>,
     ) -> ListBuilder<'a, list_state::SetPurpose<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -408,20 +411,20 @@ where
 impl<'a, S> ListBuilder<'a, S>
 where
     S: list_state::State,
-    S::Name: list_state::IsSet,
-    S::Purpose: list_state::IsSet,
     S::CreatedAt: list_state::IsSet,
+    S::Purpose: list_state::IsSet,
+    S::Name: list_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> List<'a> {
         List {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            description_facets: self.__unsafe_private_named.3,
-            labels: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            purpose: self.__unsafe_private_named.6.unwrap(),
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            description_facets: self._fields.3,
+            labels: self._fields.4,
+            name: self._fields.5.unwrap(),
+            purpose: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -434,13 +437,13 @@ where
         >,
     ) -> List<'a> {
         List {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            description_facets: self.__unsafe_private_named.3,
-            labels: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            purpose: self.__unsafe_private_named.6.unwrap(),
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            description_facets: self._fields.3,
+            labels: self._fields.4,
+            name: self._fields.5.unwrap(),
+            purpose: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/graph/listblock.rs b/crates/jacquard-api/src/app_bsky/graph/listblock.rs
index 7a62e174..e7a7dbde 100644
--- a/crates/jacquard-api/src/app_bsky/graph/listblock.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/listblock.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -145,9 +148,9 @@ pub mod listblock_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListblockBuilder<'a, S: listblock_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Listblock<'a> {
@@ -161,9 +164,9 @@ impl<'a> ListblockBuilder<'a, listblock_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListblockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListblockBuilder<'a, listblock_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListblockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListblockBuilder<'a, listblock_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListblockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,8 +218,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Listblock<'a> {
         Listblock {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -229,8 +232,8 @@ where
         >,
     ) -> Listblock<'a> {
         Listblock {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/graph/listitem.rs b/crates/jacquard-api/src/app_bsky/graph/listitem.rs
index e3ae3fb3..32856e11 100644
--- a/crates/jacquard-api/src/app_bsky/graph/listitem.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/listitem.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -112,59 +115,59 @@ pub mod listitem_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
-        type List;
         type CreatedAt;
+        type List;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
-        type List = Unset;
         type CreatedAt = Unset;
+        type List = Unset;
+        type Subject = Unset;
     }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
         type List = S::List;
-        type CreatedAt = S::CreatedAt;
+        type Subject = S::Subject;
     }
     ///State transition - sets the `list` field to Set
     pub struct SetList<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetList<S> {}
     impl<S: State> State for SetList<S> {
-        type Subject = S::Subject;
-        type List = Set<members::list>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+        type List = Set<members::list>;
         type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
         type List = S::List;
-        type CreatedAt = Set<members::created_at>;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
-        ///Marker type for the `list` field
-        pub struct list(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `list` field
+        pub struct list(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ListitemBuilder<'a, S: listitem_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Listitem<'a> {
@@ -178,9 +181,9 @@ impl<'a> ListitemBuilder<'a, listitem_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListitemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -195,11 +198,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListitemBuilder<'a, listitem_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListitemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -214,11 +217,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListitemBuilder<'a, listitem_state::SetList<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListitemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -233,11 +236,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ListitemBuilder<'a, listitem_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ListitemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -245,16 +248,16 @@ where
 impl<'a, S> ListitemBuilder<'a, S>
 where
     S: listitem_state::State,
-    S::Subject: listitem_state::IsSet,
-    S::List: listitem_state::IsSet,
     S::CreatedAt: listitem_state::IsSet,
+    S::List: listitem_state::IsSet,
+    S::Subject: listitem_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Listitem<'a> {
         Listitem {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            list: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            list: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -267,9 +270,9 @@ where
         >,
     ) -> Listitem<'a> {
         Listitem {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            list: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            list: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/graph/mute_actor.rs b/crates/jacquard-api/src/app_bsky/graph/mute_actor.rs
index 30e11ef4..a331d4aa 100644
--- a/crates/jacquard-api/src/app_bsky/graph/mute_actor.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/mute_actor.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -81,9 +84,9 @@ pub mod mute_actor_state {
 
 /// Builder for constructing an instance of this type
 pub struct MuteActorBuilder<'a, S: mute_actor_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MuteActor<'a> {
@@ -97,9 +100,9 @@ impl<'a> MuteActorBuilder<'a, mute_actor_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MuteActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,11 +117,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> MuteActorBuilder<'a, mute_actor_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MuteActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -131,7 +134,7 @@ where
     /// Build the final struct
     pub fn build(self) -> MuteActor<'a> {
         MuteActor {
-            actor: self.__unsafe_private_named.0.unwrap(),
+            actor: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -144,7 +147,7 @@ where
         >,
     ) -> MuteActor<'a> {
         MuteActor {
-            actor: self.__unsafe_private_named.0.unwrap(),
+            actor: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/graph/mute_actor_list.rs b/crates/jacquard-api/src/app_bsky/graph/mute_actor_list.rs
index ada10dc3..c1351781 100644
--- a/crates/jacquard-api/src/app_bsky/graph/mute_actor_list.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/mute_actor_list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -81,9 +84,9 @@ pub mod mute_actor_list_state {
 
 /// Builder for constructing an instance of this type
 pub struct MuteActorListBuilder<'a, S: mute_actor_list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MuteActorList<'a> {
@@ -97,9 +100,9 @@ impl<'a> MuteActorListBuilder<'a, mute_actor_list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MuteActorListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,11 +117,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> MuteActorListBuilder<'a, mute_actor_list_state::SetList<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MuteActorListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -131,7 +134,7 @@ where
     /// Build the final struct
     pub fn build(self) -> MuteActorList<'a> {
         MuteActorList {
-            list: self.__unsafe_private_named.0.unwrap(),
+            list: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -144,7 +147,7 @@ where
         >,
     ) -> MuteActorList<'a> {
         MuteActorList {
-            list: self.__unsafe_private_named.0.unwrap(),
+            list: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/graph/mute_thread.rs b/crates/jacquard-api/src/app_bsky/graph/mute_thread.rs
index b97c6570..98ab162e 100644
--- a/crates/jacquard-api/src/app_bsky/graph/mute_thread.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/mute_thread.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -81,9 +84,9 @@ pub mod mute_thread_state {
 
 /// Builder for constructing an instance of this type
 pub struct MuteThreadBuilder<'a, S: mute_thread_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MuteThread<'a> {
@@ -97,9 +100,9 @@ impl<'a> MuteThreadBuilder<'a, mute_thread_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MuteThreadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,11 +117,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> MuteThreadBuilder<'a, mute_thread_state::SetRoot<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MuteThreadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -131,7 +134,7 @@ where
     /// Build the final struct
     pub fn build(self) -> MuteThread<'a> {
         MuteThread {
-            root: self.__unsafe_private_named.0.unwrap(),
+            root: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -144,7 +147,7 @@ where
         >,
     ) -> MuteThread<'a> {
         MuteThread {
-            root: self.__unsafe_private_named.0.unwrap(),
+            root: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/graph/search_starter_packs.rs b/crates/jacquard-api/src/app_bsky/graph/search_starter_packs.rs
index b1d46e13..4491904e 100644
--- a/crates/jacquard-api/src/app_bsky/graph/search_starter_packs.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/search_starter_packs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -100,9 +103,9 @@ pub mod search_starter_packs_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchStarterPacksBuilder<'a, S: search_starter_packs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchStarterPacks<'a> {
@@ -116,9 +119,9 @@ impl<'a> SearchStarterPacksBuilder<'a, search_starter_packs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchStarterPacksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -126,12 +129,12 @@ impl<'a> SearchStarterPacksBuilder<'a, search_starter_packs_state::Empty> {
 impl<'a, S: search_starter_packs_state::State> SearchStarterPacksBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -139,12 +142,12 @@ impl<'a, S: search_starter_packs_state::State> SearchStarterPacksBuilder<'a, S>
 impl<'a, S: search_starter_packs_state::State> SearchStarterPacksBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -159,11 +162,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SearchStarterPacksBuilder<'a, search_starter_packs_state::SetQ<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SearchStarterPacksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -176,9 +179,9 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchStarterPacks<'a> {
         SearchStarterPacks {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            q: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            q: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/starterpack.rs b/crates/jacquard-api/src/app_bsky/graph/starterpack.rs
index 97effd64..524b1e6c 100644
--- a/crates/jacquard-api/src/app_bsky/graph/starterpack.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/starterpack.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -238,9 +241,9 @@ pub mod feed_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct FeedItemBuilder<'a, S: feed_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> FeedItem<'a> {
@@ -254,9 +257,9 @@ impl<'a> FeedItemBuilder<'a, feed_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FeedItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -271,11 +274,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> FeedItemBuilder<'a, feed_item_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FeedItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -288,7 +291,7 @@ where
     /// Build the final struct
     pub fn build(self) -> FeedItem<'a> {
         FeedItem {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -301,7 +304,7 @@ where
         >,
     ) -> FeedItem<'a> {
         FeedItem {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -438,49 +441,49 @@ pub mod starterpack_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type List;
+        type Name;
         type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type List = Unset;
+        type Name = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type List = S::List;
-        type CreatedAt = S::CreatedAt;
-    }
     ///State transition - sets the `list` field to Set
     pub struct SetList<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetList<S> {}
     impl<S: State> State for SetList<S> {
-        type Name = S::Name;
         type List = Set<members::list>;
+        type Name = S::Name;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type List = S::List;
+        type Name = Set<members::name>;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Name = S::Name;
         type List = S::List;
+        type Name = S::Name;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `list` field
         pub struct list(());
+        ///Marker type for the `name` field
+        pub struct name(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
     }
@@ -488,8 +491,8 @@ pub mod starterpack_state {
 
 /// Builder for constructing an instance of this type
 pub struct StarterpackBuilder<'a, S: starterpack_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Vec<Facet<'a>>>,
@@ -497,7 +500,7 @@ pub struct StarterpackBuilder<'a, S: starterpack_state::State> {
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Starterpack<'a> {
@@ -511,9 +514,9 @@ impl<'a> StarterpackBuilder<'a, starterpack_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StarterpackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -528,11 +531,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StarterpackBuilder<'a, starterpack_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StarterpackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -540,12 +543,12 @@ where
 impl<'a, S: starterpack_state::State> StarterpackBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -556,12 +559,12 @@ impl<'a, S: starterpack_state::State> StarterpackBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `descriptionFacets` field to an Option value (optional)
     pub fn maybe_description_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -572,12 +575,12 @@ impl<'a, S: starterpack_state::State> StarterpackBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<starterpack::FeedItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `feeds` field to an Option value (optional)
     pub fn maybe_feeds(mut self, value: Option<Vec<starterpack::FeedItem<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -592,11 +595,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> StarterpackBuilder<'a, starterpack_state::SetList<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         StarterpackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -611,11 +614,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> StarterpackBuilder<'a, starterpack_state::SetName<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         StarterpackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -623,19 +626,19 @@ where
 impl<'a, S> StarterpackBuilder<'a, S>
 where
     S: starterpack_state::State,
-    S::Name: starterpack_state::IsSet,
     S::List: starterpack_state::IsSet,
+    S::Name: starterpack_state::IsSet,
     S::CreatedAt: starterpack_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Starterpack<'a> {
         Starterpack {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            description_facets: self.__unsafe_private_named.2,
-            feeds: self.__unsafe_private_named.3,
-            list: self.__unsafe_private_named.4.unwrap(),
-            name: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            description_facets: self._fields.2,
+            feeds: self._fields.3,
+            list: self._fields.4.unwrap(),
+            name: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -648,12 +651,12 @@ where
         >,
     ) -> Starterpack<'a> {
         Starterpack {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            description_facets: self.__unsafe_private_named.2,
-            feeds: self.__unsafe_private_named.3,
-            list: self.__unsafe_private_named.4.unwrap(),
-            name: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            description_facets: self._fields.2,
+            feeds: self._fields.3,
+            list: self._fields.4.unwrap(),
+            name: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/graph/unmute_actor.rs b/crates/jacquard-api/src/app_bsky/graph/unmute_actor.rs
index c3b5619a..18982b0d 100644
--- a/crates/jacquard-api/src/app_bsky/graph/unmute_actor.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/unmute_actor.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -81,9 +84,9 @@ pub mod unmute_actor_state {
 
 /// Builder for constructing an instance of this type
 pub struct UnmuteActorBuilder<'a, S: unmute_actor_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UnmuteActor<'a> {
@@ -97,9 +100,9 @@ impl<'a> UnmuteActorBuilder<'a, unmute_actor_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UnmuteActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,11 +117,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> UnmuteActorBuilder<'a, unmute_actor_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UnmuteActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -131,7 +134,7 @@ where
     /// Build the final struct
     pub fn build(self) -> UnmuteActor<'a> {
         UnmuteActor {
-            actor: self.__unsafe_private_named.0.unwrap(),
+            actor: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -144,7 +147,7 @@ where
         >,
     ) -> UnmuteActor<'a> {
         UnmuteActor {
-            actor: self.__unsafe_private_named.0.unwrap(),
+            actor: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/graph/unmute_actor_list.rs b/crates/jacquard-api/src/app_bsky/graph/unmute_actor_list.rs
index 686797bf..36836e6b 100644
--- a/crates/jacquard-api/src/app_bsky/graph/unmute_actor_list.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/unmute_actor_list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -81,9 +84,9 @@ pub mod unmute_actor_list_state {
 
 /// Builder for constructing an instance of this type
 pub struct UnmuteActorListBuilder<'a, S: unmute_actor_list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UnmuteActorList<'a> {
@@ -97,9 +100,9 @@ impl<'a> UnmuteActorListBuilder<'a, unmute_actor_list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UnmuteActorListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,11 +117,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> UnmuteActorListBuilder<'a, unmute_actor_list_state::SetList<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UnmuteActorListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -131,7 +134,7 @@ where
     /// Build the final struct
     pub fn build(self) -> UnmuteActorList<'a> {
         UnmuteActorList {
-            list: self.__unsafe_private_named.0.unwrap(),
+            list: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -144,7 +147,7 @@ where
         >,
     ) -> UnmuteActorList<'a> {
         UnmuteActorList {
-            list: self.__unsafe_private_named.0.unwrap(),
+            list: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/graph/unmute_thread.rs b/crates/jacquard-api/src/app_bsky/graph/unmute_thread.rs
index 721cb20d..2d61bc55 100644
--- a/crates/jacquard-api/src/app_bsky/graph/unmute_thread.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/unmute_thread.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -81,9 +84,9 @@ pub mod unmute_thread_state {
 
 /// Builder for constructing an instance of this type
 pub struct UnmuteThreadBuilder<'a, S: unmute_thread_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UnmuteThread<'a> {
@@ -97,9 +100,9 @@ impl<'a> UnmuteThreadBuilder<'a, unmute_thread_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UnmuteThreadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,11 +117,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> UnmuteThreadBuilder<'a, unmute_thread_state::SetRoot<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UnmuteThreadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -131,7 +134,7 @@ where
     /// Build the final struct
     pub fn build(self) -> UnmuteThread<'a> {
         UnmuteThread {
-            root: self.__unsafe_private_named.0.unwrap(),
+            root: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -144,7 +147,7 @@ where
         >,
     ) -> UnmuteThread<'a> {
         UnmuteThread {
-            root: self.__unsafe_private_named.0.unwrap(),
+            root: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/graph/verification.rs b/crates/jacquard-api/src/app_bsky/graph/verification.rs
index dfd4bc2c..d58d5957 100644
--- a/crates/jacquard-api/src/app_bsky/graph/verification.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/verification.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -116,80 +119,75 @@ pub mod verification_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type DisplayName;
         type Subject;
         type Handle;
+        type CreatedAt;
+        type DisplayName;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type DisplayName = Unset;
         type Subject = Unset;
         type Handle = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type DisplayName = S::DisplayName;
-        type Subject = S::Subject;
-        type Handle = S::Handle;
-    }
-    ///State transition - sets the `display_name` field to Set
-    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
-    impl<S: State> State for SetDisplayName<S> {
-        type CreatedAt = S::CreatedAt;
-        type DisplayName = Set<members::display_name>;
-        type Subject = S::Subject;
-        type Handle = S::Handle;
+        type CreatedAt = Unset;
+        type DisplayName = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
-        type DisplayName = S::DisplayName;
         type Subject = Set<members::subject>;
         type Handle = S::Handle;
+        type CreatedAt = S::CreatedAt;
+        type DisplayName = S::DisplayName;
     }
     ///State transition - sets the `handle` field to Set
     pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHandle<S> {}
     impl<S: State> State for SetHandle<S> {
+        type Subject = S::Subject;
+        type Handle = Set<members::handle>;
         type CreatedAt = S::CreatedAt;
         type DisplayName = S::DisplayName;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
         type Subject = S::Subject;
-        type Handle = Set<members::handle>;
+        type Handle = S::Handle;
+        type CreatedAt = Set<members::created_at>;
+        type DisplayName = S::DisplayName;
+    }
+    ///State transition - sets the `display_name` field to Set
+    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
+    impl<S: State> State for SetDisplayName<S> {
+        type Subject = S::Subject;
+        type Handle = S::Handle;
+        type CreatedAt = S::CreatedAt;
+        type DisplayName = Set<members::display_name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `display_name` field
-        pub struct display_name(());
         ///Marker type for the `subject` field
         pub struct subject(());
         ///Marker type for the `handle` field
         pub struct handle(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `display_name` field
+        pub struct display_name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct VerificationBuilder<'a, S: verification_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<CowStr<'a>>,
-        Option<Handle<'a>>,
-        Option<Did<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<Handle<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Verification<'a> {
@@ -203,9 +201,9 @@ impl<'a> VerificationBuilder<'a, verification_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VerificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -220,11 +218,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> VerificationBuilder<'a, verification_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         VerificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,11 +237,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> VerificationBuilder<'a, verification_state::SetDisplayName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VerificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -258,11 +256,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> VerificationBuilder<'a, verification_state::SetHandle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         VerificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -277,11 +275,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> VerificationBuilder<'a, verification_state::SetSubject<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         VerificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -289,18 +287,18 @@ where
 impl<'a, S> VerificationBuilder<'a, S>
 where
     S: verification_state::State,
-    S::CreatedAt: verification_state::IsSet,
-    S::DisplayName: verification_state::IsSet,
     S::Subject: verification_state::IsSet,
     S::Handle: verification_state::IsSet,
+    S::CreatedAt: verification_state::IsSet,
+    S::DisplayName: verification_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Verification<'a> {
         Verification {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            display_name: self.__unsafe_private_named.1.unwrap(),
-            handle: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            display_name: self._fields.1.unwrap(),
+            handle: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -313,10 +311,10 @@ where
         >,
     ) -> Verification<'a> {
         Verification {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            display_name: self.__unsafe_private_named.1.unwrap(),
-            handle: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            display_name: self._fields.1.unwrap(),
+            handle: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/labeler.rs b/crates/jacquard-api/src/app_bsky/labeler.rs
index a5191894..417d188a 100644
--- a/crates/jacquard-api/src/app_bsky/labeler.rs
+++ b/crates/jacquard-api/src/app_bsky/labeler.rs
@@ -8,7 +8,11 @@
 pub mod get_services;
 pub mod service;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -222,12 +226,9 @@ pub mod labeler_policies_state {
 
 /// Builder for constructing an instance of this type
 pub struct LabelerPoliciesBuilder<'a, S: labeler_policies_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<LabelValueDefinition<'a>>>,
-        Option<Vec<LabelValue<'a>>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<LabelValueDefinition<'a>>>, Option<Vec<LabelValue<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LabelerPolicies<'a> {
@@ -241,9 +242,9 @@ impl<'a> LabelerPoliciesBuilder<'a, labeler_policies_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LabelerPoliciesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -254,7 +255,7 @@ impl<'a, S: labeler_policies_state::State> LabelerPoliciesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<LabelValueDefinition<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `labelValueDefinitions` field to an Option value (optional)
@@ -262,7 +263,7 @@ impl<'a, S: labeler_policies_state::State> LabelerPoliciesBuilder<'a, S> {
         mut self,
         value: Option<Vec<LabelValueDefinition<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -277,11 +278,11 @@ where
         mut self,
         value: impl Into<Vec<LabelValue<'a>>>,
     ) -> LabelerPoliciesBuilder<'a, labeler_policies_state::SetLabelValues<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LabelerPoliciesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -294,8 +295,8 @@ where
     /// Build the final struct
     pub fn build(self) -> LabelerPolicies<'a> {
         LabelerPolicies {
-            label_value_definitions: self.__unsafe_private_named.0,
-            label_values: self.__unsafe_private_named.1.unwrap(),
+            label_value_definitions: self._fields.0,
+            label_values: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -308,8 +309,8 @@ where
         >,
     ) -> LabelerPolicies<'a> {
         LabelerPolicies {
-            label_value_definitions: self.__unsafe_private_named.0,
-            label_values: self.__unsafe_private_named.1.unwrap(),
+            label_value_definitions: self._fields.0,
+            label_values: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -610,8 +611,8 @@ pub mod labeler_view_state {
     pub trait State: sealed::Sealed {
         type Uri;
         type Cid;
-        type Creator;
         type IndexedAt;
+        type Creator;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
@@ -619,8 +620,8 @@ pub mod labeler_view_state {
     impl State for Empty {
         type Uri = Unset;
         type Cid = Unset;
-        type Creator = Unset;
         type IndexedAt = Unset;
+        type Creator = Unset;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
@@ -628,8 +629,8 @@ pub mod labeler_view_state {
     impl<S: State> State for SetUri<S> {
         type Uri = Set<members::uri>;
         type Cid = S::Cid;
-        type Creator = S::Creator;
         type IndexedAt = S::IndexedAt;
+        type Creator = S::Creator;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
@@ -637,17 +638,8 @@ pub mod labeler_view_state {
     impl<S: State> State for SetCid<S> {
         type Uri = S::Uri;
         type Cid = Set<members::cid>;
-        type Creator = S::Creator;
-        type IndexedAt = S::IndexedAt;
-    }
-    ///State transition - sets the `creator` field to Set
-    pub struct SetCreator<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreator<S> {}
-    impl<S: State> State for SetCreator<S> {
-        type Uri = S::Uri;
-        type Cid = S::Cid;
-        type Creator = Set<members::creator>;
         type IndexedAt = S::IndexedAt;
+        type Creator = S::Creator;
     }
     ///State transition - sets the `indexed_at` field to Set
     pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
@@ -655,8 +647,17 @@ pub mod labeler_view_state {
     impl<S: State> State for SetIndexedAt<S> {
         type Uri = S::Uri;
         type Cid = S::Cid;
-        type Creator = S::Creator;
         type IndexedAt = Set<members::indexed_at>;
+        type Creator = S::Creator;
+    }
+    ///State transition - sets the `creator` field to Set
+    pub struct SetCreator<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreator<S> {}
+    impl<S: State> State for SetCreator<S> {
+        type Uri = S::Uri;
+        type Cid = S::Cid;
+        type IndexedAt = S::IndexedAt;
+        type Creator = Set<members::creator>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
@@ -665,17 +666,17 @@ pub mod labeler_view_state {
         pub struct uri(());
         ///Marker type for the `cid` field
         pub struct cid(());
-        ///Marker type for the `creator` field
-        pub struct creator(());
         ///Marker type for the `indexed_at` field
         pub struct indexed_at(());
+        ///Marker type for the `creator` field
+        pub struct creator(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LabelerViewBuilder<'a, S: labeler_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<ProfileView<'a>>,
         Option<Datetime>,
@@ -684,7 +685,7 @@ pub struct LabelerViewBuilder<'a, S: labeler_view_state::State> {
         Option<AtUri<'a>>,
         Option<labeler::LabelerViewerState<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LabelerView<'a> {
@@ -698,9 +699,9 @@ impl<'a> LabelerViewBuilder<'a, labeler_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LabelerViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -715,11 +716,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> LabelerViewBuilder<'a, labeler_view_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LabelerViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -734,11 +735,11 @@ where
         mut self,
         value: impl Into<ProfileView<'a>>,
     ) -> LabelerViewBuilder<'a, labeler_view_state::SetCreator<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LabelerViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -753,11 +754,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LabelerViewBuilder<'a, labeler_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LabelerViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -765,12 +766,12 @@ where
 impl<'a, S: labeler_view_state::State> LabelerViewBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -778,12 +779,12 @@ impl<'a, S: labeler_view_state::State> LabelerViewBuilder<'a, S> {
 impl<'a, S: labeler_view_state::State> LabelerViewBuilder<'a, S> {
     /// Set the `likeCount` field (optional)
     pub fn like_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `likeCount` field to an Option value (optional)
     pub fn maybe_like_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -798,11 +799,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> LabelerViewBuilder<'a, labeler_view_state::SetUri<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         LabelerViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -813,7 +814,7 @@ impl<'a, S: labeler_view_state::State> LabelerViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<labeler::LabelerViewerState<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
@@ -821,7 +822,7 @@ impl<'a, S: labeler_view_state::State> LabelerViewBuilder<'a, S> {
         mut self,
         value: Option<labeler::LabelerViewerState<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -831,19 +832,19 @@ where
     S: labeler_view_state::State,
     S::Uri: labeler_view_state::IsSet,
     S::Cid: labeler_view_state::IsSet,
-    S::Creator: labeler_view_state::IsSet,
     S::IndexedAt: labeler_view_state::IsSet,
+    S::Creator: labeler_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LabelerView<'a> {
         LabelerView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            creator: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            labels: self.__unsafe_private_named.3,
-            like_count: self.__unsafe_private_named.4,
-            uri: self.__unsafe_private_named.5.unwrap(),
-            viewer: self.__unsafe_private_named.6,
+            cid: self._fields.0.unwrap(),
+            creator: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            labels: self._fields.3,
+            like_count: self._fields.4,
+            uri: self._fields.5.unwrap(),
+            viewer: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -856,13 +857,13 @@ where
         >,
     ) -> LabelerView<'a> {
         LabelerView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            creator: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            labels: self.__unsafe_private_named.3,
-            like_count: self.__unsafe_private_named.4,
-            uri: self.__unsafe_private_named.5.unwrap(),
-            viewer: self.__unsafe_private_named.6,
+            cid: self._fields.0.unwrap(),
+            creator: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            labels: self._fields.3,
+            like_count: self._fields.4,
+            uri: self._fields.5.unwrap(),
+            viewer: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
@@ -879,91 +880,91 @@ pub mod labeler_view_detailed_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Uri;
-        type IndexedAt;
-        type Cid;
         type Creator;
         type Policies;
+        type Cid;
+        type IndexedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Uri = Unset;
-        type IndexedAt = Unset;
-        type Cid = Unset;
         type Creator = Unset;
         type Policies = Unset;
+        type Cid = Unset;
+        type IndexedAt = Unset;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
         type Uri = Set<members::uri>;
-        type IndexedAt = S::IndexedAt;
-        type Cid = S::Cid;
         type Creator = S::Creator;
         type Policies = S::Policies;
-    }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
-        type Uri = S::Uri;
-        type IndexedAt = Set<members::indexed_at>;
         type Cid = S::Cid;
-        type Creator = S::Creator;
-        type Policies = S::Policies;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type Uri = S::Uri;
         type IndexedAt = S::IndexedAt;
-        type Cid = Set<members::cid>;
-        type Creator = S::Creator;
-        type Policies = S::Policies;
     }
     ///State transition - sets the `creator` field to Set
     pub struct SetCreator<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreator<S> {}
     impl<S: State> State for SetCreator<S> {
         type Uri = S::Uri;
-        type IndexedAt = S::IndexedAt;
-        type Cid = S::Cid;
         type Creator = Set<members::creator>;
         type Policies = S::Policies;
+        type Cid = S::Cid;
+        type IndexedAt = S::IndexedAt;
     }
     ///State transition - sets the `policies` field to Set
     pub struct SetPolicies<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPolicies<S> {}
     impl<S: State> State for SetPolicies<S> {
         type Uri = S::Uri;
-        type IndexedAt = S::IndexedAt;
-        type Cid = S::Cid;
         type Creator = S::Creator;
         type Policies = Set<members::policies>;
+        type Cid = S::Cid;
+        type IndexedAt = S::IndexedAt;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Uri = S::Uri;
+        type Creator = S::Creator;
+        type Policies = S::Policies;
+        type Cid = Set<members::cid>;
+        type IndexedAt = S::IndexedAt;
+    }
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
+        type Uri = S::Uri;
+        type Creator = S::Creator;
+        type Policies = S::Policies;
+        type Cid = S::Cid;
+        type IndexedAt = Set<members::indexed_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `indexed_at` field
-        pub struct indexed_at(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `creator` field
         pub struct creator(());
         ///Marker type for the `policies` field
         pub struct policies(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
+        ///Marker type for the `indexed_at` field
+        pub struct indexed_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LabelerViewDetailedBuilder<'a, S: labeler_view_detailed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<ProfileView<'a>>,
         Option<Datetime>,
@@ -976,7 +977,7 @@ pub struct LabelerViewDetailedBuilder<'a, S: labeler_view_detailed_state::State>
         Option<AtUri<'a>>,
         Option<labeler::LabelerViewerState<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LabelerViewDetailed<'a> {
@@ -990,21 +991,9 @@ impl<'a> LabelerViewDetailedBuilder<'a, labeler_view_detailed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LabelerViewDetailedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1019,11 +1008,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> LabelerViewDetailedBuilder<'a, labeler_view_detailed_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LabelerViewDetailedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1038,11 +1027,11 @@ where
         mut self,
         value: impl Into<ProfileView<'a>>,
     ) -> LabelerViewDetailedBuilder<'a, labeler_view_detailed_state::SetCreator<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LabelerViewDetailedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1057,11 +1046,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LabelerViewDetailedBuilder<'a, labeler_view_detailed_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LabelerViewDetailedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1069,12 +1058,12 @@ where
 impl<'a, S: labeler_view_detailed_state::State> LabelerViewDetailedBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1082,12 +1071,12 @@ impl<'a, S: labeler_view_detailed_state::State> LabelerViewDetailedBuilder<'a, S
 impl<'a, S: labeler_view_detailed_state::State> LabelerViewDetailedBuilder<'a, S> {
     /// Set the `likeCount` field (optional)
     pub fn like_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `likeCount` field to an Option value (optional)
     pub fn maybe_like_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1102,11 +1091,11 @@ where
         mut self,
         value: impl Into<labeler::LabelerPolicies<'a>>,
     ) -> LabelerViewDetailedBuilder<'a, labeler_view_detailed_state::SetPolicies<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         LabelerViewDetailedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1117,12 +1106,12 @@ impl<'a, S: labeler_view_detailed_state::State> LabelerViewDetailedBuilder<'a, S
         mut self,
         value: impl Into<Option<Vec<ReasonType<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `reasonTypes` field to an Option value (optional)
     pub fn maybe_reason_types(mut self, value: Option<Vec<ReasonType<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1133,12 +1122,12 @@ impl<'a, S: labeler_view_detailed_state::State> LabelerViewDetailedBuilder<'a, S
         mut self,
         value: impl Into<Option<Vec<Nsid<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `subjectCollections` field to an Option value (optional)
     pub fn maybe_subject_collections(mut self, value: Option<Vec<Nsid<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -1149,12 +1138,12 @@ impl<'a, S: labeler_view_detailed_state::State> LabelerViewDetailedBuilder<'a, S
         mut self,
         value: impl Into<Option<Vec<SubjectType<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `subjectTypes` field to an Option value (optional)
     pub fn maybe_subject_types(mut self, value: Option<Vec<SubjectType<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -1169,11 +1158,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> LabelerViewDetailedBuilder<'a, labeler_view_detailed_state::SetUri<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         LabelerViewDetailedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1184,7 +1173,7 @@ impl<'a, S: labeler_view_detailed_state::State> LabelerViewDetailedBuilder<'a, S
         mut self,
         value: impl Into<Option<labeler::LabelerViewerState<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
@@ -1192,7 +1181,7 @@ impl<'a, S: labeler_view_detailed_state::State> LabelerViewDetailedBuilder<'a, S
         mut self,
         value: Option<labeler::LabelerViewerState<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -1201,25 +1190,25 @@ impl<'a, S> LabelerViewDetailedBuilder<'a, S>
 where
     S: labeler_view_detailed_state::State,
     S::Uri: labeler_view_detailed_state::IsSet,
-    S::IndexedAt: labeler_view_detailed_state::IsSet,
-    S::Cid: labeler_view_detailed_state::IsSet,
     S::Creator: labeler_view_detailed_state::IsSet,
     S::Policies: labeler_view_detailed_state::IsSet,
+    S::Cid: labeler_view_detailed_state::IsSet,
+    S::IndexedAt: labeler_view_detailed_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LabelerViewDetailed<'a> {
         LabelerViewDetailed {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            creator: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            labels: self.__unsafe_private_named.3,
-            like_count: self.__unsafe_private_named.4,
-            policies: self.__unsafe_private_named.5.unwrap(),
-            reason_types: self.__unsafe_private_named.6,
-            subject_collections: self.__unsafe_private_named.7,
-            subject_types: self.__unsafe_private_named.8,
-            uri: self.__unsafe_private_named.9.unwrap(),
-            viewer: self.__unsafe_private_named.10,
+            cid: self._fields.0.unwrap(),
+            creator: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            labels: self._fields.3,
+            like_count: self._fields.4,
+            policies: self._fields.5.unwrap(),
+            reason_types: self._fields.6,
+            subject_collections: self._fields.7,
+            subject_types: self._fields.8,
+            uri: self._fields.9.unwrap(),
+            viewer: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -1232,17 +1221,17 @@ where
         >,
     ) -> LabelerViewDetailed<'a> {
         LabelerViewDetailed {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            creator: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            labels: self.__unsafe_private_named.3,
-            like_count: self.__unsafe_private_named.4,
-            policies: self.__unsafe_private_named.5.unwrap(),
-            reason_types: self.__unsafe_private_named.6,
-            subject_collections: self.__unsafe_private_named.7,
-            subject_types: self.__unsafe_private_named.8,
-            uri: self.__unsafe_private_named.9.unwrap(),
-            viewer: self.__unsafe_private_named.10,
+            cid: self._fields.0.unwrap(),
+            creator: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            labels: self._fields.3,
+            like_count: self._fields.4,
+            policies: self._fields.5.unwrap(),
+            reason_types: self._fields.6,
+            subject_collections: self._fields.7,
+            subject_types: self._fields.8,
+            uri: self._fields.9.unwrap(),
+            viewer: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/labeler/get_services.rs b/crates/jacquard-api/src/app_bsky/labeler/get_services.rs
index 178bb617..4ef6939c 100644
--- a/crates/jacquard-api/src/app_bsky/labeler/get_services.rs
+++ b/crates/jacquard-api/src/app_bsky/labeler/get_services.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -107,9 +110,9 @@ pub mod get_services_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetServicesBuilder<'a, S: get_services_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<Vec<Did<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<Vec<Did<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetServices<'a> {
@@ -123,9 +126,9 @@ impl<'a> GetServicesBuilder<'a, get_services_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetServicesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -133,12 +136,12 @@ impl<'a> GetServicesBuilder<'a, get_services_state::Empty> {
 impl<'a, S: get_services_state::State> GetServicesBuilder<'a, S> {
     /// Set the `detailed` field (optional)
     pub fn detailed(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `detailed` field to an Option value (optional)
     pub fn maybe_detailed(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -153,11 +156,11 @@ where
         mut self,
         value: impl Into<Vec<Did<'a>>>,
     ) -> GetServicesBuilder<'a, get_services_state::SetDids<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetServicesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -170,8 +173,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetServices<'a> {
         GetServices {
-            detailed: self.__unsafe_private_named.0,
-            dids: self.__unsafe_private_named.1.unwrap(),
+            detailed: self._fields.0,
+            dids: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/labeler/service.rs b/crates/jacquard-api/src/app_bsky/labeler/service.rs
index 40d35cbb..25f3ca16 100644
--- a/crates/jacquard-api/src/app_bsky/labeler/service.rs
+++ b/crates/jacquard-api/src/app_bsky/labeler/service.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -163,8 +166,8 @@ pub mod service_state {
 
 /// Builder for constructing an instance of this type
 pub struct ServiceBuilder<'a, S: service_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<SelfLabels<'a>>,
         Option<LabelerPolicies<'a>>,
@@ -172,7 +175,7 @@ pub struct ServiceBuilder<'a, S: service_state::State> {
         Option<Vec<Nsid<'a>>>,
         Option<Vec<SubjectType<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Service<'a> {
@@ -186,9 +189,9 @@ impl<'a> ServiceBuilder<'a, service_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ServiceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,11 +206,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ServiceBuilder<'a, service_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ServiceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,12 +218,12 @@ where
 impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -235,11 +238,11 @@ where
         mut self,
         value: impl Into<LabelerPolicies<'a>>,
     ) -> ServiceBuilder<'a, service_state::SetPolicies<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ServiceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -250,12 +253,12 @@ impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<ReasonType<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `reasonTypes` field to an Option value (optional)
     pub fn maybe_reason_types(mut self, value: Option<Vec<ReasonType<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -266,12 +269,12 @@ impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Nsid<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `subjectCollections` field to an Option value (optional)
     pub fn maybe_subject_collections(mut self, value: Option<Vec<Nsid<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -282,12 +285,12 @@ impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<SubjectType<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `subjectTypes` field to an Option value (optional)
     pub fn maybe_subject_types(mut self, value: Option<Vec<SubjectType<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -301,12 +304,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Service<'a> {
         Service {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            labels: self.__unsafe_private_named.1,
-            policies: self.__unsafe_private_named.2.unwrap(),
-            reason_types: self.__unsafe_private_named.3,
-            subject_collections: self.__unsafe_private_named.4,
-            subject_types: self.__unsafe_private_named.5,
+            created_at: self._fields.0.unwrap(),
+            labels: self._fields.1,
+            policies: self._fields.2.unwrap(),
+            reason_types: self._fields.3,
+            subject_collections: self._fields.4,
+            subject_types: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -319,12 +322,12 @@ where
         >,
     ) -> Service<'a> {
         Service {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            labels: self.__unsafe_private_named.1,
-            policies: self.__unsafe_private_named.2.unwrap(),
-            reason_types: self.__unsafe_private_named.3,
-            subject_collections: self.__unsafe_private_named.4,
-            subject_types: self.__unsafe_private_named.5,
+            created_at: self._fields.0.unwrap(),
+            labels: self._fields.1,
+            policies: self._fields.2.unwrap(),
+            reason_types: self._fields.3,
+            subject_collections: self._fields.4,
+            subject_types: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/notification.rs b/crates/jacquard-api/src/app_bsky/notification.rs
index eeec5c2f..302364a2 100644
--- a/crates/jacquard-api/src/app_bsky/notification.rs
+++ b/crates/jacquard-api/src/app_bsky/notification.rs
@@ -17,7 +17,11 @@ pub mod register_push;
 pub mod unregister_push;
 pub mod update_seen;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -454,9 +458,9 @@ pub mod activity_subscription_state {
 
 /// Builder for constructing an instance of this type
 pub struct ActivitySubscriptionBuilder<'a, S: activity_subscription_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<bool>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ActivitySubscription<'a> {
@@ -470,9 +474,9 @@ impl<'a> ActivitySubscriptionBuilder<'a, activity_subscription_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ActivitySubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -487,11 +491,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ActivitySubscriptionBuilder<'a, activity_subscription_state::SetPost<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ActivitySubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -506,11 +510,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ActivitySubscriptionBuilder<'a, activity_subscription_state::SetReply<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ActivitySubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -524,8 +528,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ActivitySubscription<'a> {
         ActivitySubscription {
-            post: self.__unsafe_private_named.0.unwrap(),
-            reply: self.__unsafe_private_named.1.unwrap(),
+            post: self._fields.0.unwrap(),
+            reply: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -538,8 +542,8 @@ where
         >,
     ) -> ActivitySubscription<'a> {
         ActivitySubscription {
-            post: self.__unsafe_private_named.0.unwrap(),
-            reply: self.__unsafe_private_named.1.unwrap(),
+            post: self._fields.0.unwrap(),
+            reply: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -843,45 +847,45 @@ pub mod chat_preference_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Include;
         type Push;
+        type Include;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Include = Unset;
         type Push = Unset;
-    }
-    ///State transition - sets the `include` field to Set
-    pub struct SetInclude<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetInclude<S> {}
-    impl<S: State> State for SetInclude<S> {
-        type Include = Set<members::include>;
-        type Push = S::Push;
+        type Include = Unset;
     }
     ///State transition - sets the `push` field to Set
     pub struct SetPush<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPush<S> {}
     impl<S: State> State for SetPush<S> {
-        type Include = S::Include;
         type Push = Set<members::push>;
+        type Include = S::Include;
+    }
+    ///State transition - sets the `include` field to Set
+    pub struct SetInclude<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetInclude<S> {}
+    impl<S: State> State for SetInclude<S> {
+        type Push = S::Push;
+        type Include = Set<members::include>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `include` field
-        pub struct include(());
         ///Marker type for the `push` field
         pub struct push(());
+        ///Marker type for the `include` field
+        pub struct include(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ChatPreferenceBuilder<'a, S: chat_preference_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ChatPreferenceInclude<'a>>, Option<bool>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ChatPreferenceInclude<'a>>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ChatPreference<'a> {
@@ -895,9 +899,9 @@ impl<'a> ChatPreferenceBuilder<'a, chat_preference_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ChatPreferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -912,11 +916,11 @@ where
         mut self,
         value: impl Into<ChatPreferenceInclude<'a>>,
     ) -> ChatPreferenceBuilder<'a, chat_preference_state::SetInclude<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ChatPreferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -931,11 +935,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ChatPreferenceBuilder<'a, chat_preference_state::SetPush<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ChatPreferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -943,14 +947,14 @@ where
 impl<'a, S> ChatPreferenceBuilder<'a, S>
 where
     S: chat_preference_state::State,
-    S::Include: chat_preference_state::IsSet,
     S::Push: chat_preference_state::IsSet,
+    S::Include: chat_preference_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ChatPreference<'a> {
         ChatPreference {
-            include: self.__unsafe_private_named.0.unwrap(),
-            push: self.__unsafe_private_named.1.unwrap(),
+            include: self._fields.0.unwrap(),
+            push: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -963,8 +967,8 @@ where
         >,
     ) -> ChatPreference<'a> {
         ChatPreference {
-            include: self.__unsafe_private_named.0.unwrap(),
-            push: self.__unsafe_private_named.1.unwrap(),
+            include: self._fields.0.unwrap(),
+            push: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -980,63 +984,59 @@ pub mod filterable_preference_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Push;
-        type Include;
         type List;
+        type Include;
+        type Push;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Push = Unset;
-        type Include = Unset;
         type List = Unset;
+        type Include = Unset;
+        type Push = Unset;
     }
-    ///State transition - sets the `push` field to Set
-    pub struct SetPush<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPush<S> {}
-    impl<S: State> State for SetPush<S> {
-        type Push = Set<members::push>;
+    ///State transition - sets the `list` field to Set
+    pub struct SetList<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetList<S> {}
+    impl<S: State> State for SetList<S> {
+        type List = Set<members::list>;
         type Include = S::Include;
-        type List = S::List;
+        type Push = S::Push;
     }
     ///State transition - sets the `include` field to Set
     pub struct SetInclude<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetInclude<S> {}
     impl<S: State> State for SetInclude<S> {
-        type Push = S::Push;
-        type Include = Set<members::include>;
         type List = S::List;
-    }
-    ///State transition - sets the `list` field to Set
-    pub struct SetList<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetList<S> {}
-    impl<S: State> State for SetList<S> {
+        type Include = Set<members::include>;
         type Push = S::Push;
+    }
+    ///State transition - sets the `push` field to Set
+    pub struct SetPush<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPush<S> {}
+    impl<S: State> State for SetPush<S> {
+        type List = S::List;
         type Include = S::Include;
-        type List = Set<members::list>;
+        type Push = Set<members::push>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `push` field
-        pub struct push(());
-        ///Marker type for the `include` field
-        pub struct include(());
         ///Marker type for the `list` field
         pub struct list(());
+        ///Marker type for the `include` field
+        pub struct include(());
+        ///Marker type for the `push` field
+        pub struct push(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FilterablePreferenceBuilder<'a, S: filterable_preference_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<FilterablePreferenceInclude<'a>>,
-        Option<bool>,
-        Option<bool>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<FilterablePreferenceInclude<'a>>, Option<bool>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> FilterablePreference<'a> {
@@ -1050,9 +1050,9 @@ impl<'a> FilterablePreferenceBuilder<'a, filterable_preference_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FilterablePreferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1067,11 +1067,11 @@ where
         mut self,
         value: impl Into<FilterablePreferenceInclude<'a>>,
     ) -> FilterablePreferenceBuilder<'a, filterable_preference_state::SetInclude<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FilterablePreferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1086,11 +1086,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> FilterablePreferenceBuilder<'a, filterable_preference_state::SetList<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FilterablePreferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1105,11 +1105,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> FilterablePreferenceBuilder<'a, filterable_preference_state::SetPush<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         FilterablePreferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1117,16 +1117,16 @@ where
 impl<'a, S> FilterablePreferenceBuilder<'a, S>
 where
     S: filterable_preference_state::State,
-    S::Push: filterable_preference_state::IsSet,
-    S::Include: filterable_preference_state::IsSet,
     S::List: filterable_preference_state::IsSet,
+    S::Include: filterable_preference_state::IsSet,
+    S::Push: filterable_preference_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> FilterablePreference<'a> {
         FilterablePreference {
-            include: self.__unsafe_private_named.0.unwrap(),
-            list: self.__unsafe_private_named.1.unwrap(),
-            push: self.__unsafe_private_named.2.unwrap(),
+            include: self._fields.0.unwrap(),
+            list: self._fields.1.unwrap(),
+            push: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1139,9 +1139,9 @@ where
         >,
     ) -> FilterablePreference<'a> {
         FilterablePreference {
-            include: self.__unsafe_private_named.0.unwrap(),
-            list: self.__unsafe_private_named.1.unwrap(),
-            push: self.__unsafe_private_named.2.unwrap(),
+            include: self._fields.0.unwrap(),
+            list: self._fields.1.unwrap(),
+            push: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1157,45 +1157,45 @@ pub mod preference_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type List;
         type Push;
+        type List;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type List = Unset;
         type Push = Unset;
-    }
-    ///State transition - sets the `list` field to Set
-    pub struct SetList<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetList<S> {}
-    impl<S: State> State for SetList<S> {
-        type List = Set<members::list>;
-        type Push = S::Push;
+        type List = Unset;
     }
     ///State transition - sets the `push` field to Set
     pub struct SetPush<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPush<S> {}
     impl<S: State> State for SetPush<S> {
-        type List = S::List;
         type Push = Set<members::push>;
+        type List = S::List;
+    }
+    ///State transition - sets the `list` field to Set
+    pub struct SetList<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetList<S> {}
+    impl<S: State> State for SetList<S> {
+        type Push = S::Push;
+        type List = Set<members::list>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `list` field
-        pub struct list(());
         ///Marker type for the `push` field
         pub struct push(());
+        ///Marker type for the `list` field
+        pub struct list(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PreferenceBuilder<'a, S: preference_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<bool>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Preference<'a> {
@@ -1209,9 +1209,9 @@ impl<'a> PreferenceBuilder<'a, preference_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PreferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1226,11 +1226,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> PreferenceBuilder<'a, preference_state::SetList<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PreferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1245,11 +1245,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> PreferenceBuilder<'a, preference_state::SetPush<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PreferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1257,14 +1257,14 @@ where
 impl<'a, S> PreferenceBuilder<'a, S>
 where
     S: preference_state::State,
-    S::List: preference_state::IsSet,
     S::Push: preference_state::IsSet,
+    S::List: preference_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Preference<'a> {
         Preference {
-            list: self.__unsafe_private_named.0.unwrap(),
-            push: self.__unsafe_private_named.1.unwrap(),
+            list: self._fields.0.unwrap(),
+            push: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1277,8 +1277,8 @@ where
         >,
     ) -> Preference<'a> {
         Preference {
-            list: self.__unsafe_private_named.0.unwrap(),
-            push: self.__unsafe_private_named.1.unwrap(),
+            list: self._fields.0.unwrap(),
+            push: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1294,308 +1294,308 @@ pub mod preferences_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Unverified;
         type Quote;
-        type LikeViaRepost;
-        type Chat;
-        type RepostViaRepost;
-        type StarterpackJoined;
-        type SubscribedPost;
         type Verified;
-        type Mention;
         type Repost;
         type Follow;
+        type StarterpackJoined;
+        type Mention;
+        type SubscribedPost;
         type Reply;
+        type RepostViaRepost;
+        type Chat;
+        type LikeViaRepost;
         type Like;
-        type Unverified;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Unverified = Unset;
         type Quote = Unset;
-        type LikeViaRepost = Unset;
-        type Chat = Unset;
-        type RepostViaRepost = Unset;
-        type StarterpackJoined = Unset;
-        type SubscribedPost = Unset;
         type Verified = Unset;
-        type Mention = Unset;
         type Repost = Unset;
         type Follow = Unset;
+        type StarterpackJoined = Unset;
+        type Mention = Unset;
+        type SubscribedPost = Unset;
         type Reply = Unset;
+        type RepostViaRepost = Unset;
+        type Chat = Unset;
+        type LikeViaRepost = Unset;
         type Like = Unset;
-        type Unverified = Unset;
+    }
+    ///State transition - sets the `unverified` field to Set
+    pub struct SetUnverified<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUnverified<S> {}
+    impl<S: State> State for SetUnverified<S> {
+        type Unverified = Set<members::unverified>;
+        type Quote = S::Quote;
+        type Verified = S::Verified;
+        type Repost = S::Repost;
+        type Follow = S::Follow;
+        type StarterpackJoined = S::StarterpackJoined;
+        type Mention = S::Mention;
+        type SubscribedPost = S::SubscribedPost;
+        type Reply = S::Reply;
+        type RepostViaRepost = S::RepostViaRepost;
+        type Chat = S::Chat;
+        type LikeViaRepost = S::LikeViaRepost;
+        type Like = S::Like;
     }
     ///State transition - sets the `quote` field to Set
     pub struct SetQuote<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetQuote<S> {}
     impl<S: State> State for SetQuote<S> {
+        type Unverified = S::Unverified;
         type Quote = Set<members::quote>;
-        type LikeViaRepost = S::LikeViaRepost;
-        type Chat = S::Chat;
-        type RepostViaRepost = S::RepostViaRepost;
-        type StarterpackJoined = S::StarterpackJoined;
-        type SubscribedPost = S::SubscribedPost;
         type Verified = S::Verified;
-        type Mention = S::Mention;
         type Repost = S::Repost;
         type Follow = S::Follow;
+        type StarterpackJoined = S::StarterpackJoined;
+        type Mention = S::Mention;
+        type SubscribedPost = S::SubscribedPost;
         type Reply = S::Reply;
+        type RepostViaRepost = S::RepostViaRepost;
+        type Chat = S::Chat;
+        type LikeViaRepost = S::LikeViaRepost;
         type Like = S::Like;
-        type Unverified = S::Unverified;
     }
-    ///State transition - sets the `like_via_repost` field to Set
-    pub struct SetLikeViaRepost<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLikeViaRepost<S> {}
-    impl<S: State> State for SetLikeViaRepost<S> {
+    ///State transition - sets the `verified` field to Set
+    pub struct SetVerified<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetVerified<S> {}
+    impl<S: State> State for SetVerified<S> {
+        type Unverified = S::Unverified;
         type Quote = S::Quote;
-        type LikeViaRepost = Set<members::like_via_repost>;
-        type Chat = S::Chat;
-        type RepostViaRepost = S::RepostViaRepost;
-        type StarterpackJoined = S::StarterpackJoined;
-        type SubscribedPost = S::SubscribedPost;
-        type Verified = S::Verified;
-        type Mention = S::Mention;
+        type Verified = Set<members::verified>;
         type Repost = S::Repost;
         type Follow = S::Follow;
+        type StarterpackJoined = S::StarterpackJoined;
+        type Mention = S::Mention;
+        type SubscribedPost = S::SubscribedPost;
         type Reply = S::Reply;
+        type RepostViaRepost = S::RepostViaRepost;
+        type Chat = S::Chat;
+        type LikeViaRepost = S::LikeViaRepost;
         type Like = S::Like;
-        type Unverified = S::Unverified;
     }
-    ///State transition - sets the `chat` field to Set
-    pub struct SetChat<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetChat<S> {}
-    impl<S: State> State for SetChat<S> {
+    ///State transition - sets the `repost` field to Set
+    pub struct SetRepost<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepost<S> {}
+    impl<S: State> State for SetRepost<S> {
+        type Unverified = S::Unverified;
         type Quote = S::Quote;
-        type LikeViaRepost = S::LikeViaRepost;
-        type Chat = Set<members::chat>;
-        type RepostViaRepost = S::RepostViaRepost;
-        type StarterpackJoined = S::StarterpackJoined;
-        type SubscribedPost = S::SubscribedPost;
         type Verified = S::Verified;
-        type Mention = S::Mention;
-        type Repost = S::Repost;
+        type Repost = Set<members::repost>;
         type Follow = S::Follow;
+        type StarterpackJoined = S::StarterpackJoined;
+        type Mention = S::Mention;
+        type SubscribedPost = S::SubscribedPost;
         type Reply = S::Reply;
+        type RepostViaRepost = S::RepostViaRepost;
+        type Chat = S::Chat;
+        type LikeViaRepost = S::LikeViaRepost;
         type Like = S::Like;
-        type Unverified = S::Unverified;
     }
-    ///State transition - sets the `repost_via_repost` field to Set
-    pub struct SetRepostViaRepost<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepostViaRepost<S> {}
-    impl<S: State> State for SetRepostViaRepost<S> {
+    ///State transition - sets the `follow` field to Set
+    pub struct SetFollow<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetFollow<S> {}
+    impl<S: State> State for SetFollow<S> {
+        type Unverified = S::Unverified;
         type Quote = S::Quote;
-        type LikeViaRepost = S::LikeViaRepost;
-        type Chat = S::Chat;
-        type RepostViaRepost = Set<members::repost_via_repost>;
-        type StarterpackJoined = S::StarterpackJoined;
-        type SubscribedPost = S::SubscribedPost;
         type Verified = S::Verified;
-        type Mention = S::Mention;
         type Repost = S::Repost;
-        type Follow = S::Follow;
+        type Follow = Set<members::follow>;
+        type StarterpackJoined = S::StarterpackJoined;
+        type Mention = S::Mention;
+        type SubscribedPost = S::SubscribedPost;
         type Reply = S::Reply;
+        type RepostViaRepost = S::RepostViaRepost;
+        type Chat = S::Chat;
+        type LikeViaRepost = S::LikeViaRepost;
         type Like = S::Like;
-        type Unverified = S::Unverified;
     }
     ///State transition - sets the `starterpack_joined` field to Set
     pub struct SetStarterpackJoined<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStarterpackJoined<S> {}
     impl<S: State> State for SetStarterpackJoined<S> {
+        type Unverified = S::Unverified;
         type Quote = S::Quote;
-        type LikeViaRepost = S::LikeViaRepost;
-        type Chat = S::Chat;
-        type RepostViaRepost = S::RepostViaRepost;
+        type Verified = S::Verified;
+        type Repost = S::Repost;
+        type Follow = S::Follow;
         type StarterpackJoined = Set<members::starterpack_joined>;
+        type Mention = S::Mention;
         type SubscribedPost = S::SubscribedPost;
+        type Reply = S::Reply;
+        type RepostViaRepost = S::RepostViaRepost;
+        type Chat = S::Chat;
+        type LikeViaRepost = S::LikeViaRepost;
+        type Like = S::Like;
+    }
+    ///State transition - sets the `mention` field to Set
+    pub struct SetMention<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMention<S> {}
+    impl<S: State> State for SetMention<S> {
+        type Unverified = S::Unverified;
+        type Quote = S::Quote;
         type Verified = S::Verified;
-        type Mention = S::Mention;
         type Repost = S::Repost;
         type Follow = S::Follow;
+        type StarterpackJoined = S::StarterpackJoined;
+        type Mention = Set<members::mention>;
+        type SubscribedPost = S::SubscribedPost;
         type Reply = S::Reply;
+        type RepostViaRepost = S::RepostViaRepost;
+        type Chat = S::Chat;
+        type LikeViaRepost = S::LikeViaRepost;
         type Like = S::Like;
-        type Unverified = S::Unverified;
     }
     ///State transition - sets the `subscribed_post` field to Set
     pub struct SetSubscribedPost<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubscribedPost<S> {}
     impl<S: State> State for SetSubscribedPost<S> {
+        type Unverified = S::Unverified;
         type Quote = S::Quote;
-        type LikeViaRepost = S::LikeViaRepost;
-        type Chat = S::Chat;
-        type RepostViaRepost = S::RepostViaRepost;
-        type StarterpackJoined = S::StarterpackJoined;
-        type SubscribedPost = Set<members::subscribed_post>;
         type Verified = S::Verified;
-        type Mention = S::Mention;
         type Repost = S::Repost;
         type Follow = S::Follow;
-        type Reply = S::Reply;
-        type Like = S::Like;
-        type Unverified = S::Unverified;
-    }
-    ///State transition - sets the `verified` field to Set
-    pub struct SetVerified<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetVerified<S> {}
-    impl<S: State> State for SetVerified<S> {
-        type Quote = S::Quote;
-        type LikeViaRepost = S::LikeViaRepost;
-        type Chat = S::Chat;
-        type RepostViaRepost = S::RepostViaRepost;
         type StarterpackJoined = S::StarterpackJoined;
-        type SubscribedPost = S::SubscribedPost;
-        type Verified = Set<members::verified>;
         type Mention = S::Mention;
-        type Repost = S::Repost;
-        type Follow = S::Follow;
+        type SubscribedPost = Set<members::subscribed_post>;
         type Reply = S::Reply;
+        type RepostViaRepost = S::RepostViaRepost;
+        type Chat = S::Chat;
+        type LikeViaRepost = S::LikeViaRepost;
         type Like = S::Like;
-        type Unverified = S::Unverified;
     }
-    ///State transition - sets the `mention` field to Set
-    pub struct SetMention<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMention<S> {}
-    impl<S: State> State for SetMention<S> {
+    ///State transition - sets the `reply` field to Set
+    pub struct SetReply<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetReply<S> {}
+    impl<S: State> State for SetReply<S> {
+        type Unverified = S::Unverified;
         type Quote = S::Quote;
-        type LikeViaRepost = S::LikeViaRepost;
-        type Chat = S::Chat;
-        type RepostViaRepost = S::RepostViaRepost;
-        type StarterpackJoined = S::StarterpackJoined;
-        type SubscribedPost = S::SubscribedPost;
         type Verified = S::Verified;
-        type Mention = Set<members::mention>;
         type Repost = S::Repost;
         type Follow = S::Follow;
-        type Reply = S::Reply;
+        type StarterpackJoined = S::StarterpackJoined;
+        type Mention = S::Mention;
+        type SubscribedPost = S::SubscribedPost;
+        type Reply = Set<members::reply>;
+        type RepostViaRepost = S::RepostViaRepost;
+        type Chat = S::Chat;
+        type LikeViaRepost = S::LikeViaRepost;
         type Like = S::Like;
-        type Unverified = S::Unverified;
     }
-    ///State transition - sets the `repost` field to Set
-    pub struct SetRepost<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepost<S> {}
-    impl<S: State> State for SetRepost<S> {
+    ///State transition - sets the `repost_via_repost` field to Set
+    pub struct SetRepostViaRepost<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepostViaRepost<S> {}
+    impl<S: State> State for SetRepostViaRepost<S> {
+        type Unverified = S::Unverified;
         type Quote = S::Quote;
-        type LikeViaRepost = S::LikeViaRepost;
-        type Chat = S::Chat;
-        type RepostViaRepost = S::RepostViaRepost;
-        type StarterpackJoined = S::StarterpackJoined;
-        type SubscribedPost = S::SubscribedPost;
         type Verified = S::Verified;
-        type Mention = S::Mention;
-        type Repost = Set<members::repost>;
+        type Repost = S::Repost;
         type Follow = S::Follow;
+        type StarterpackJoined = S::StarterpackJoined;
+        type Mention = S::Mention;
+        type SubscribedPost = S::SubscribedPost;
         type Reply = S::Reply;
+        type RepostViaRepost = Set<members::repost_via_repost>;
+        type Chat = S::Chat;
+        type LikeViaRepost = S::LikeViaRepost;
         type Like = S::Like;
-        type Unverified = S::Unverified;
     }
-    ///State transition - sets the `follow` field to Set
-    pub struct SetFollow<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetFollow<S> {}
-    impl<S: State> State for SetFollow<S> {
+    ///State transition - sets the `chat` field to Set
+    pub struct SetChat<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetChat<S> {}
+    impl<S: State> State for SetChat<S> {
+        type Unverified = S::Unverified;
         type Quote = S::Quote;
-        type LikeViaRepost = S::LikeViaRepost;
-        type Chat = S::Chat;
-        type RepostViaRepost = S::RepostViaRepost;
-        type StarterpackJoined = S::StarterpackJoined;
-        type SubscribedPost = S::SubscribedPost;
         type Verified = S::Verified;
-        type Mention = S::Mention;
         type Repost = S::Repost;
-        type Follow = Set<members::follow>;
+        type Follow = S::Follow;
+        type StarterpackJoined = S::StarterpackJoined;
+        type Mention = S::Mention;
+        type SubscribedPost = S::SubscribedPost;
         type Reply = S::Reply;
+        type RepostViaRepost = S::RepostViaRepost;
+        type Chat = Set<members::chat>;
+        type LikeViaRepost = S::LikeViaRepost;
         type Like = S::Like;
-        type Unverified = S::Unverified;
     }
-    ///State transition - sets the `reply` field to Set
-    pub struct SetReply<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetReply<S> {}
-    impl<S: State> State for SetReply<S> {
+    ///State transition - sets the `like_via_repost` field to Set
+    pub struct SetLikeViaRepost<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLikeViaRepost<S> {}
+    impl<S: State> State for SetLikeViaRepost<S> {
+        type Unverified = S::Unverified;
         type Quote = S::Quote;
-        type LikeViaRepost = S::LikeViaRepost;
-        type Chat = S::Chat;
-        type RepostViaRepost = S::RepostViaRepost;
-        type StarterpackJoined = S::StarterpackJoined;
-        type SubscribedPost = S::SubscribedPost;
         type Verified = S::Verified;
-        type Mention = S::Mention;
         type Repost = S::Repost;
         type Follow = S::Follow;
-        type Reply = Set<members::reply>;
+        type StarterpackJoined = S::StarterpackJoined;
+        type Mention = S::Mention;
+        type SubscribedPost = S::SubscribedPost;
+        type Reply = S::Reply;
+        type RepostViaRepost = S::RepostViaRepost;
+        type Chat = S::Chat;
+        type LikeViaRepost = Set<members::like_via_repost>;
         type Like = S::Like;
-        type Unverified = S::Unverified;
     }
     ///State transition - sets the `like` field to Set
     pub struct SetLike<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLike<S> {}
     impl<S: State> State for SetLike<S> {
+        type Unverified = S::Unverified;
         type Quote = S::Quote;
-        type LikeViaRepost = S::LikeViaRepost;
-        type Chat = S::Chat;
-        type RepostViaRepost = S::RepostViaRepost;
-        type StarterpackJoined = S::StarterpackJoined;
-        type SubscribedPost = S::SubscribedPost;
         type Verified = S::Verified;
-        type Mention = S::Mention;
         type Repost = S::Repost;
         type Follow = S::Follow;
-        type Reply = S::Reply;
-        type Like = Set<members::like>;
-        type Unverified = S::Unverified;
-    }
-    ///State transition - sets the `unverified` field to Set
-    pub struct SetUnverified<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUnverified<S> {}
-    impl<S: State> State for SetUnverified<S> {
-        type Quote = S::Quote;
-        type LikeViaRepost = S::LikeViaRepost;
-        type Chat = S::Chat;
-        type RepostViaRepost = S::RepostViaRepost;
         type StarterpackJoined = S::StarterpackJoined;
-        type SubscribedPost = S::SubscribedPost;
-        type Verified = S::Verified;
         type Mention = S::Mention;
-        type Repost = S::Repost;
-        type Follow = S::Follow;
+        type SubscribedPost = S::SubscribedPost;
         type Reply = S::Reply;
-        type Like = S::Like;
-        type Unverified = Set<members::unverified>;
+        type RepostViaRepost = S::RepostViaRepost;
+        type Chat = S::Chat;
+        type LikeViaRepost = S::LikeViaRepost;
+        type Like = Set<members::like>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `unverified` field
+        pub struct unverified(());
         ///Marker type for the `quote` field
         pub struct quote(());
-        ///Marker type for the `like_via_repost` field
-        pub struct like_via_repost(());
-        ///Marker type for the `chat` field
-        pub struct chat(());
-        ///Marker type for the `repost_via_repost` field
-        pub struct repost_via_repost(());
-        ///Marker type for the `starterpack_joined` field
-        pub struct starterpack_joined(());
-        ///Marker type for the `subscribed_post` field
-        pub struct subscribed_post(());
         ///Marker type for the `verified` field
         pub struct verified(());
-        ///Marker type for the `mention` field
-        pub struct mention(());
         ///Marker type for the `repost` field
         pub struct repost(());
         ///Marker type for the `follow` field
         pub struct follow(());
+        ///Marker type for the `starterpack_joined` field
+        pub struct starterpack_joined(());
+        ///Marker type for the `mention` field
+        pub struct mention(());
+        ///Marker type for the `subscribed_post` field
+        pub struct subscribed_post(());
         ///Marker type for the `reply` field
         pub struct reply(());
+        ///Marker type for the `repost_via_repost` field
+        pub struct repost_via_repost(());
+        ///Marker type for the `chat` field
+        pub struct chat(());
+        ///Marker type for the `like_via_repost` field
+        pub struct like_via_repost(());
         ///Marker type for the `like` field
         pub struct like(());
-        ///Marker type for the `unverified` field
-        pub struct unverified(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PreferencesBuilder<'a, S: preferences_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<notification::ChatPreference<'a>>,
         Option<notification::FilterablePreference<'a>>,
         Option<notification::FilterablePreference<'a>>,
@@ -1610,7 +1610,7 @@ pub struct PreferencesBuilder<'a, S: preferences_state::State> {
         Option<notification::Preference<'a>>,
         Option<notification::Preference<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Preferences<'a> {
@@ -1624,8 +1624,8 @@ impl<'a> PreferencesBuilder<'a, preferences_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -1640,7 +1640,7 @@ impl<'a> PreferencesBuilder<'a, preferences_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1655,11 +1655,11 @@ where
         mut self,
         value: impl Into<notification::ChatPreference<'a>>,
     ) -> PreferencesBuilder<'a, preferences_state::SetChat<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1674,11 +1674,11 @@ where
         mut self,
         value: impl Into<notification::FilterablePreference<'a>>,
     ) -> PreferencesBuilder<'a, preferences_state::SetFollow<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1693,11 +1693,11 @@ where
         mut self,
         value: impl Into<notification::FilterablePreference<'a>>,
     ) -> PreferencesBuilder<'a, preferences_state::SetLike<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1712,11 +1712,11 @@ where
         mut self,
         value: impl Into<notification::FilterablePreference<'a>>,
     ) -> PreferencesBuilder<'a, preferences_state::SetLikeViaRepost<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1731,11 +1731,11 @@ where
         mut self,
         value: impl Into<notification::FilterablePreference<'a>>,
     ) -> PreferencesBuilder<'a, preferences_state::SetMention<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1750,11 +1750,11 @@ where
         mut self,
         value: impl Into<notification::FilterablePreference<'a>>,
     ) -> PreferencesBuilder<'a, preferences_state::SetQuote<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1769,11 +1769,11 @@ where
         mut self,
         value: impl Into<notification::FilterablePreference<'a>>,
     ) -> PreferencesBuilder<'a, preferences_state::SetReply<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1788,11 +1788,11 @@ where
         mut self,
         value: impl Into<notification::FilterablePreference<'a>>,
     ) -> PreferencesBuilder<'a, preferences_state::SetRepost<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1807,11 +1807,11 @@ where
         mut self,
         value: impl Into<notification::FilterablePreference<'a>>,
     ) -> PreferencesBuilder<'a, preferences_state::SetRepostViaRepost<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1826,11 +1826,11 @@ where
         mut self,
         value: impl Into<notification::Preference<'a>>,
     ) -> PreferencesBuilder<'a, preferences_state::SetStarterpackJoined<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1845,11 +1845,11 @@ where
         mut self,
         value: impl Into<notification::Preference<'a>>,
     ) -> PreferencesBuilder<'a, preferences_state::SetSubscribedPost<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1864,11 +1864,11 @@ where
         mut self,
         value: impl Into<notification::Preference<'a>>,
     ) -> PreferencesBuilder<'a, preferences_state::SetUnverified<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1883,11 +1883,11 @@ where
         mut self,
         value: impl Into<notification::Preference<'a>>,
     ) -> PreferencesBuilder<'a, preferences_state::SetVerified<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1895,36 +1895,36 @@ where
 impl<'a, S> PreferencesBuilder<'a, S>
 where
     S: preferences_state::State,
+    S::Unverified: preferences_state::IsSet,
     S::Quote: preferences_state::IsSet,
-    S::LikeViaRepost: preferences_state::IsSet,
-    S::Chat: preferences_state::IsSet,
-    S::RepostViaRepost: preferences_state::IsSet,
-    S::StarterpackJoined: preferences_state::IsSet,
-    S::SubscribedPost: preferences_state::IsSet,
     S::Verified: preferences_state::IsSet,
-    S::Mention: preferences_state::IsSet,
     S::Repost: preferences_state::IsSet,
     S::Follow: preferences_state::IsSet,
+    S::StarterpackJoined: preferences_state::IsSet,
+    S::Mention: preferences_state::IsSet,
+    S::SubscribedPost: preferences_state::IsSet,
     S::Reply: preferences_state::IsSet,
+    S::RepostViaRepost: preferences_state::IsSet,
+    S::Chat: preferences_state::IsSet,
+    S::LikeViaRepost: preferences_state::IsSet,
     S::Like: preferences_state::IsSet,
-    S::Unverified: preferences_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Preferences<'a> {
         Preferences {
-            chat: self.__unsafe_private_named.0.unwrap(),
-            follow: self.__unsafe_private_named.1.unwrap(),
-            like: self.__unsafe_private_named.2.unwrap(),
-            like_via_repost: self.__unsafe_private_named.3.unwrap(),
-            mention: self.__unsafe_private_named.4.unwrap(),
-            quote: self.__unsafe_private_named.5.unwrap(),
-            reply: self.__unsafe_private_named.6.unwrap(),
-            repost: self.__unsafe_private_named.7.unwrap(),
-            repost_via_repost: self.__unsafe_private_named.8.unwrap(),
-            starterpack_joined: self.__unsafe_private_named.9.unwrap(),
-            subscribed_post: self.__unsafe_private_named.10.unwrap(),
-            unverified: self.__unsafe_private_named.11.unwrap(),
-            verified: self.__unsafe_private_named.12.unwrap(),
+            chat: self._fields.0.unwrap(),
+            follow: self._fields.1.unwrap(),
+            like: self._fields.2.unwrap(),
+            like_via_repost: self._fields.3.unwrap(),
+            mention: self._fields.4.unwrap(),
+            quote: self._fields.5.unwrap(),
+            reply: self._fields.6.unwrap(),
+            repost: self._fields.7.unwrap(),
+            repost_via_repost: self._fields.8.unwrap(),
+            starterpack_joined: self._fields.9.unwrap(),
+            subscribed_post: self._fields.10.unwrap(),
+            unverified: self._fields.11.unwrap(),
+            verified: self._fields.12.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1937,19 +1937,19 @@ where
         >,
     ) -> Preferences<'a> {
         Preferences {
-            chat: self.__unsafe_private_named.0.unwrap(),
-            follow: self.__unsafe_private_named.1.unwrap(),
-            like: self.__unsafe_private_named.2.unwrap(),
-            like_via_repost: self.__unsafe_private_named.3.unwrap(),
-            mention: self.__unsafe_private_named.4.unwrap(),
-            quote: self.__unsafe_private_named.5.unwrap(),
-            reply: self.__unsafe_private_named.6.unwrap(),
-            repost: self.__unsafe_private_named.7.unwrap(),
-            repost_via_repost: self.__unsafe_private_named.8.unwrap(),
-            starterpack_joined: self.__unsafe_private_named.9.unwrap(),
-            subscribed_post: self.__unsafe_private_named.10.unwrap(),
-            unverified: self.__unsafe_private_named.11.unwrap(),
-            verified: self.__unsafe_private_named.12.unwrap(),
+            chat: self._fields.0.unwrap(),
+            follow: self._fields.1.unwrap(),
+            like: self._fields.2.unwrap(),
+            like_via_repost: self._fields.3.unwrap(),
+            mention: self._fields.4.unwrap(),
+            quote: self._fields.5.unwrap(),
+            reply: self._fields.6.unwrap(),
+            repost: self._fields.7.unwrap(),
+            repost_via_repost: self._fields.8.unwrap(),
+            starterpack_joined: self._fields.9.unwrap(),
+            subscribed_post: self._fields.10.unwrap(),
+            unverified: self._fields.11.unwrap(),
+            verified: self._fields.12.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1965,37 +1965,37 @@ pub mod subject_activity_subscription_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ActivitySubscription;
         type Subject;
+        type ActivitySubscription;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ActivitySubscription = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `activity_subscription` field to Set
-    pub struct SetActivitySubscription<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetActivitySubscription<S> {}
-    impl<S: State> State for SetActivitySubscription<S> {
-        type ActivitySubscription = Set<members::activity_subscription>;
-        type Subject = S::Subject;
+        type ActivitySubscription = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type ActivitySubscription = S::ActivitySubscription;
         type Subject = Set<members::subject>;
+        type ActivitySubscription = S::ActivitySubscription;
+    }
+    ///State transition - sets the `activity_subscription` field to Set
+    pub struct SetActivitySubscription<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetActivitySubscription<S> {}
+    impl<S: State> State for SetActivitySubscription<S> {
+        type Subject = S::Subject;
+        type ActivitySubscription = Set<members::activity_subscription>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `activity_subscription` field
-        pub struct activity_subscription(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `activity_subscription` field
+        pub struct activity_subscription(());
     }
 }
 
@@ -2004,12 +2004,9 @@ pub struct SubjectActivitySubscriptionBuilder<
     'a,
     S: subject_activity_subscription_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<notification::ActivitySubscription<'a>>,
-        Option<Did<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<notification::ActivitySubscription<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SubjectActivitySubscription<'a> {
@@ -2028,9 +2025,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubjectActivitySubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2048,11 +2045,11 @@ where
         'a,
         subject_activity_subscription_state::SetActivitySubscription<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SubjectActivitySubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2070,11 +2067,11 @@ where
         'a,
         subject_activity_subscription_state::SetSubject<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SubjectActivitySubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2082,14 +2079,14 @@ where
 impl<'a, S> SubjectActivitySubscriptionBuilder<'a, S>
 where
     S: subject_activity_subscription_state::State,
-    S::ActivitySubscription: subject_activity_subscription_state::IsSet,
     S::Subject: subject_activity_subscription_state::IsSet,
+    S::ActivitySubscription: subject_activity_subscription_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SubjectActivitySubscription<'a> {
         SubjectActivitySubscription {
-            activity_subscription: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            activity_subscription: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2102,8 +2099,8 @@ where
         >,
     ) -> SubjectActivitySubscription<'a> {
         SubjectActivitySubscription {
-            activity_subscription: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            activity_subscription: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/notification/declaration.rs b/crates/jacquard-api/src/app_bsky/notification/declaration.rs
index 86801e17..5da3ee75 100644
--- a/crates/jacquard-api/src/app_bsky/notification/declaration.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/declaration.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -233,9 +236,9 @@ pub mod declaration_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeclarationBuilder<'a, S: declaration_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<DeclarationAllowSubscriptions<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<DeclarationAllowSubscriptions<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Declaration<'a> {
@@ -249,9 +252,9 @@ impl<'a> DeclarationBuilder<'a, declaration_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeclarationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -266,11 +269,11 @@ where
         mut self,
         value: impl Into<DeclarationAllowSubscriptions<'a>>,
     ) -> DeclarationBuilder<'a, declaration_state::SetAllowSubscriptions<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeclarationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -283,7 +286,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Declaration<'a> {
         Declaration {
-            allow_subscriptions: self.__unsafe_private_named.0.unwrap(),
+            allow_subscriptions: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -296,7 +299,7 @@ where
         >,
     ) -> Declaration<'a> {
         Declaration {
-            allow_subscriptions: self.__unsafe_private_named.0.unwrap(),
+            allow_subscriptions: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/notification/get_preferences.rs b/crates/jacquard-api/src/app_bsky/notification/get_preferences.rs
index ea2296f2..43b17675 100644
--- a/crates/jacquard-api/src/app_bsky/notification/get_preferences.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/get_preferences.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/app_bsky/notification/get_unread_count.rs b/crates/jacquard-api/src/app_bsky/notification/get_unread_count.rs
index 03f7c90c..fb9d7dce 100644
--- a/crates/jacquard-api/src/app_bsky/notification/get_unread_count.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/get_unread_count.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Datetime;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -73,8 +76,8 @@ pub mod get_unread_count_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetUnreadCountBuilder<S: get_unread_count_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<Datetime>),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<Datetime>),
 }
 
 impl GetUnreadCount {
@@ -88,8 +91,8 @@ impl GetUnreadCountBuilder<get_unread_count_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetUnreadCountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
+            _state: PhantomData,
+            _fields: (None, None),
         }
     }
 }
@@ -97,12 +100,12 @@ impl GetUnreadCountBuilder<get_unread_count_state::Empty> {
 impl<S: get_unread_count_state::State> GetUnreadCountBuilder<S> {
     /// Set the `priority` field (optional)
     pub fn priority(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `priority` field to an Option value (optional)
     pub fn maybe_priority(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -110,12 +113,12 @@ impl<S: get_unread_count_state::State> GetUnreadCountBuilder<S> {
 impl<S: get_unread_count_state::State> GetUnreadCountBuilder<S> {
     /// Set the `seenAt` field (optional)
     pub fn seen_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `seenAt` field to an Option value (optional)
     pub fn maybe_seen_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -127,8 +130,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetUnreadCount {
         GetUnreadCount {
-            priority: self.__unsafe_private_named.0,
-            seen_at: self.__unsafe_private_named.1,
+            priority: self._fields.0,
+            seen_at: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/notification/list_activity_subscriptions.rs b/crates/jacquard-api/src/app_bsky/notification/list_activity_subscriptions.rs
index 34aff421..2aa5b940 100644
--- a/crates/jacquard-api/src/app_bsky/notification/list_activity_subscriptions.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/list_activity_subscriptions.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -88,9 +91,9 @@ pub struct ListActivitySubscriptionsBuilder<
     'a,
     S: list_activity_subscriptions_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListActivitySubscriptions<'a> {
@@ -107,9 +110,9 @@ impl<'a> ListActivitySubscriptionsBuilder<'a, list_activity_subscriptions_state:
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListActivitySubscriptionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,12 +123,12 @@ impl<
 > ListActivitySubscriptionsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -136,12 +139,12 @@ impl<
 > ListActivitySubscriptionsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -153,8 +156,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ListActivitySubscriptions<'a> {
         ListActivitySubscriptions {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs b/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs
index a23bde38..d0e2b9d8 100644
--- a/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -296,15 +299,15 @@ pub mod list_notifications_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListNotificationsBuilder<'a, S: list_notifications_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<i64>,
         Option<bool>,
         Option<Vec<CowStr<'a>>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListNotifications<'a> {
@@ -318,9 +321,9 @@ impl<'a> ListNotificationsBuilder<'a, list_notifications_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListNotificationsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -328,12 +331,12 @@ impl<'a> ListNotificationsBuilder<'a, list_notifications_state::Empty> {
 impl<'a, S: list_notifications_state::State> ListNotificationsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -341,12 +344,12 @@ impl<'a, S: list_notifications_state::State> ListNotificationsBuilder<'a, S> {
 impl<'a, S: list_notifications_state::State> ListNotificationsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -354,12 +357,12 @@ impl<'a, S: list_notifications_state::State> ListNotificationsBuilder<'a, S> {
 impl<'a, S: list_notifications_state::State> ListNotificationsBuilder<'a, S> {
     /// Set the `priority` field (optional)
     pub fn priority(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `priority` field to an Option value (optional)
     pub fn maybe_priority(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -367,12 +370,12 @@ impl<'a, S: list_notifications_state::State> ListNotificationsBuilder<'a, S> {
 impl<'a, S: list_notifications_state::State> ListNotificationsBuilder<'a, S> {
     /// Set the `reasons` field (optional)
     pub fn reasons(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `reasons` field to an Option value (optional)
     pub fn maybe_reasons(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -380,12 +383,12 @@ impl<'a, S: list_notifications_state::State> ListNotificationsBuilder<'a, S> {
 impl<'a, S: list_notifications_state::State> ListNotificationsBuilder<'a, S> {
     /// Set the `seenAt` field (optional)
     pub fn seen_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `seenAt` field to an Option value (optional)
     pub fn maybe_seen_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -397,11 +400,11 @@ where
     /// Build the final struct
     pub fn build(self) -> ListNotifications<'a> {
         ListNotifications {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            priority: self.__unsafe_private_named.2,
-            reasons: self.__unsafe_private_named.3,
-            seen_at: self.__unsafe_private_named.4,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            priority: self._fields.2,
+            reasons: self._fields.3,
+            seen_at: self._fields.4,
         }
     }
 }
@@ -416,134 +419,134 @@ pub mod notification_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Record;
-        type IndexedAt;
-        type Cid;
         type Uri;
-        type Reason;
+        type Record;
         type IsRead;
+        type Cid;
         type Author;
+        type Reason;
+        type IndexedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Record = Unset;
-        type IndexedAt = Unset;
-        type Cid = Unset;
         type Uri = Unset;
-        type Reason = Unset;
+        type Record = Unset;
         type IsRead = Unset;
+        type Cid = Unset;
         type Author = Unset;
+        type Reason = Unset;
+        type IndexedAt = Unset;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Uri = Set<members::uri>;
+        type Record = S::Record;
+        type IsRead = S::IsRead;
+        type Cid = S::Cid;
+        type Author = S::Author;
+        type Reason = S::Reason;
+        type IndexedAt = S::IndexedAt;
     }
     ///State transition - sets the `record` field to Set
     pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecord<S> {}
     impl<S: State> State for SetRecord<S> {
-        type Record = Set<members::record>;
-        type IndexedAt = S::IndexedAt;
-        type Cid = S::Cid;
         type Uri = S::Uri;
-        type Reason = S::Reason;
+        type Record = Set<members::record>;
         type IsRead = S::IsRead;
+        type Cid = S::Cid;
         type Author = S::Author;
+        type Reason = S::Reason;
+        type IndexedAt = S::IndexedAt;
     }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
+    ///State transition - sets the `is_read` field to Set
+    pub struct SetIsRead<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIsRead<S> {}
+    impl<S: State> State for SetIsRead<S> {
+        type Uri = S::Uri;
         type Record = S::Record;
-        type IndexedAt = Set<members::indexed_at>;
+        type IsRead = Set<members::is_read>;
         type Cid = S::Cid;
-        type Uri = S::Uri;
-        type Reason = S::Reason;
-        type IsRead = S::IsRead;
         type Author = S::Author;
+        type Reason = S::Reason;
+        type IndexedAt = S::IndexedAt;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type Record = S::Record;
-        type IndexedAt = S::IndexedAt;
-        type Cid = Set<members::cid>;
         type Uri = S::Uri;
-        type Reason = S::Reason;
+        type Record = S::Record;
         type IsRead = S::IsRead;
+        type Cid = Set<members::cid>;
         type Author = S::Author;
+        type Reason = S::Reason;
+        type IndexedAt = S::IndexedAt;
     }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
+    ///State transition - sets the `author` field to Set
+    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAuthor<S> {}
+    impl<S: State> State for SetAuthor<S> {
+        type Uri = S::Uri;
         type Record = S::Record;
-        type IndexedAt = S::IndexedAt;
+        type IsRead = S::IsRead;
         type Cid = S::Cid;
-        type Uri = Set<members::uri>;
+        type Author = Set<members::author>;
         type Reason = S::Reason;
-        type IsRead = S::IsRead;
-        type Author = S::Author;
+        type IndexedAt = S::IndexedAt;
     }
     ///State transition - sets the `reason` field to Set
     pub struct SetReason<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetReason<S> {}
     impl<S: State> State for SetReason<S> {
-        type Record = S::Record;
-        type IndexedAt = S::IndexedAt;
-        type Cid = S::Cid;
         type Uri = S::Uri;
-        type Reason = Set<members::reason>;
-        type IsRead = S::IsRead;
-        type Author = S::Author;
-    }
-    ///State transition - sets the `is_read` field to Set
-    pub struct SetIsRead<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIsRead<S> {}
-    impl<S: State> State for SetIsRead<S> {
         type Record = S::Record;
-        type IndexedAt = S::IndexedAt;
+        type IsRead = S::IsRead;
         type Cid = S::Cid;
-        type Uri = S::Uri;
-        type Reason = S::Reason;
-        type IsRead = Set<members::is_read>;
         type Author = S::Author;
+        type Reason = Set<members::reason>;
+        type IndexedAt = S::IndexedAt;
     }
-    ///State transition - sets the `author` field to Set
-    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAuthor<S> {}
-    impl<S: State> State for SetAuthor<S> {
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
+        type Uri = S::Uri;
         type Record = S::Record;
-        type IndexedAt = S::IndexedAt;
+        type IsRead = S::IsRead;
         type Cid = S::Cid;
-        type Uri = S::Uri;
+        type Author = S::Author;
         type Reason = S::Reason;
-        type IsRead = S::IsRead;
-        type Author = Set<members::author>;
+        type IndexedAt = Set<members::indexed_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `record` field
-        pub struct record(());
-        ///Marker type for the `indexed_at` field
-        pub struct indexed_at(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `reason` field
-        pub struct reason(());
+        ///Marker type for the `record` field
+        pub struct record(());
         ///Marker type for the `is_read` field
         pub struct is_read(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
         ///Marker type for the `author` field
         pub struct author(());
+        ///Marker type for the `reason` field
+        pub struct reason(());
+        ///Marker type for the `indexed_at` field
+        pub struct indexed_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct NotificationBuilder<'a, S: notification_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileView<'a>>,
         Option<Cid<'a>>,
         Option<Datetime>,
@@ -554,7 +557,7 @@ pub struct NotificationBuilder<'a, S: notification_state::State> {
         Option<Data<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Notification<'a> {
@@ -568,19 +571,9 @@ impl<'a> NotificationBuilder<'a, notification_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -595,11 +588,11 @@ where
         mut self,
         value: impl Into<ProfileView<'a>>,
     ) -> NotificationBuilder<'a, notification_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -614,11 +607,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> NotificationBuilder<'a, notification_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -633,11 +626,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> NotificationBuilder<'a, notification_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -652,11 +645,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> NotificationBuilder<'a, notification_state::SetIsRead<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -664,12 +657,12 @@ where
 impl<'a, S: notification_state::State> NotificationBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -684,11 +677,11 @@ where
         mut self,
         value: impl Into<NotificationReason<'a>>,
     ) -> NotificationBuilder<'a, notification_state::SetReason<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -696,12 +689,12 @@ where
 impl<'a, S: notification_state::State> NotificationBuilder<'a, S> {
     /// Set the `reasonSubject` field (optional)
     pub fn reason_subject(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `reasonSubject` field to an Option value (optional)
     pub fn maybe_reason_subject(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -716,11 +709,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> NotificationBuilder<'a, notification_state::SetRecord<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -735,11 +728,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> NotificationBuilder<'a, notification_state::SetUri<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -747,26 +740,26 @@ where
 impl<'a, S> NotificationBuilder<'a, S>
 where
     S: notification_state::State,
-    S::Record: notification_state::IsSet,
-    S::IndexedAt: notification_state::IsSet,
-    S::Cid: notification_state::IsSet,
     S::Uri: notification_state::IsSet,
-    S::Reason: notification_state::IsSet,
+    S::Record: notification_state::IsSet,
     S::IsRead: notification_state::IsSet,
+    S::Cid: notification_state::IsSet,
     S::Author: notification_state::IsSet,
+    S::Reason: notification_state::IsSet,
+    S::IndexedAt: notification_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Notification<'a> {
         Notification {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            is_read: self.__unsafe_private_named.3.unwrap(),
-            labels: self.__unsafe_private_named.4,
-            reason: self.__unsafe_private_named.5.unwrap(),
-            reason_subject: self.__unsafe_private_named.6,
-            record: self.__unsafe_private_named.7.unwrap(),
-            uri: self.__unsafe_private_named.8.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            is_read: self._fields.3.unwrap(),
+            labels: self._fields.4,
+            reason: self._fields.5.unwrap(),
+            reason_subject: self._fields.6,
+            record: self._fields.7.unwrap(),
+            uri: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -776,15 +769,15 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Notification<'a> {
         Notification {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            is_read: self.__unsafe_private_named.3.unwrap(),
-            labels: self.__unsafe_private_named.4,
-            reason: self.__unsafe_private_named.5.unwrap(),
-            reason_subject: self.__unsafe_private_named.6,
-            record: self.__unsafe_private_named.7.unwrap(),
-            uri: self.__unsafe_private_named.8.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            is_read: self._fields.3.unwrap(),
+            labels: self._fields.4,
+            reason: self._fields.5.unwrap(),
+            reason_subject: self._fields.6,
+            record: self._fields.7.unwrap(),
+            uri: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/notification/put_activity_subscription.rs b/crates/jacquard-api/src/app_bsky/notification/put_activity_subscription.rs
index 521973de..1242a99c 100644
--- a/crates/jacquard-api/src/app_bsky/notification/put_activity_subscription.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/put_activity_subscription.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -111,9 +114,9 @@ pub struct PutActivitySubscriptionBuilder<
     'a,
     S: put_activity_subscription_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ActivitySubscription<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ActivitySubscription<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PutActivitySubscription<'a> {
@@ -130,9 +133,9 @@ impl<'a> PutActivitySubscriptionBuilder<'a, put_activity_subscription_state::Emp
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PutActivitySubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -150,11 +153,11 @@ where
         'a,
         put_activity_subscription_state::SetActivitySubscription<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PutActivitySubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -172,11 +175,11 @@ where
         'a,
         put_activity_subscription_state::SetSubject<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PutActivitySubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -190,8 +193,8 @@ where
     /// Build the final struct
     pub fn build(self) -> PutActivitySubscription<'a> {
         PutActivitySubscription {
-            activity_subscription: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            activity_subscription: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -204,8 +207,8 @@ where
         >,
     ) -> PutActivitySubscription<'a> {
         PutActivitySubscription {
-            activity_subscription: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            activity_subscription: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/notification/put_preferences.rs b/crates/jacquard-api/src/app_bsky/notification/put_preferences.rs
index b272ee57..771d3c85 100644
--- a/crates/jacquard-api/src/app_bsky/notification/put_preferences.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/put_preferences.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
@@ -79,9 +82,9 @@ pub mod put_preferences_state {
 
 /// Builder for constructing an instance of this type
 pub struct PutPreferencesBuilder<'a, S: put_preferences_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PutPreferences<'a> {
@@ -95,9 +98,9 @@ impl<'a> PutPreferencesBuilder<'a, put_preferences_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PutPreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -112,11 +115,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> PutPreferencesBuilder<'a, put_preferences_state::SetPriority<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PutPreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -129,7 +132,7 @@ where
     /// Build the final struct
     pub fn build(self) -> PutPreferences<'a> {
         PutPreferences {
-            priority: self.__unsafe_private_named.0.unwrap(),
+            priority: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -142,7 +145,7 @@ where
         >,
     ) -> PutPreferences<'a> {
         PutPreferences {
-            priority: self.__unsafe_private_named.0.unwrap(),
+            priority: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/notification/put_preferences_v2.rs b/crates/jacquard-api/src/app_bsky/notification/put_preferences_v2.rs
index aa620891..94ed5706 100644
--- a/crates/jacquard-api/src/app_bsky/notification/put_preferences_v2.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/put_preferences_v2.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/app_bsky/notification/register_push.rs b/crates/jacquard-api/src/app_bsky/notification/register_push.rs
index 04eeffd6..f5ee0f61 100644
--- a/crates/jacquard-api/src/app_bsky/notification/register_push.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/register_push.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -165,8 +168,8 @@ pub mod register_push_state {
     pub trait State: sealed::Sealed {
         type Token;
         type Platform;
-        type ServiceDid;
         type AppId;
+        type ServiceDid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
@@ -174,8 +177,8 @@ pub mod register_push_state {
     impl State for Empty {
         type Token = Unset;
         type Platform = Unset;
-        type ServiceDid = Unset;
         type AppId = Unset;
+        type ServiceDid = Unset;
     }
     ///State transition - sets the `token` field to Set
     pub struct SetToken<S: State = Empty>(PhantomData<fn() -> S>);
@@ -183,8 +186,8 @@ pub mod register_push_state {
     impl<S: State> State for SetToken<S> {
         type Token = Set<members::token>;
         type Platform = S::Platform;
-        type ServiceDid = S::ServiceDid;
         type AppId = S::AppId;
+        type ServiceDid = S::ServiceDid;
     }
     ///State transition - sets the `platform` field to Set
     pub struct SetPlatform<S: State = Empty>(PhantomData<fn() -> S>);
@@ -192,17 +195,8 @@ pub mod register_push_state {
     impl<S: State> State for SetPlatform<S> {
         type Token = S::Token;
         type Platform = Set<members::platform>;
-        type ServiceDid = S::ServiceDid;
-        type AppId = S::AppId;
-    }
-    ///State transition - sets the `service_did` field to Set
-    pub struct SetServiceDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetServiceDid<S> {}
-    impl<S: State> State for SetServiceDid<S> {
-        type Token = S::Token;
-        type Platform = S::Platform;
-        type ServiceDid = Set<members::service_did>;
         type AppId = S::AppId;
+        type ServiceDid = S::ServiceDid;
     }
     ///State transition - sets the `app_id` field to Set
     pub struct SetAppId<S: State = Empty>(PhantomData<fn() -> S>);
@@ -210,8 +204,17 @@ pub mod register_push_state {
     impl<S: State> State for SetAppId<S> {
         type Token = S::Token;
         type Platform = S::Platform;
-        type ServiceDid = S::ServiceDid;
         type AppId = Set<members::app_id>;
+        type ServiceDid = S::ServiceDid;
+    }
+    ///State transition - sets the `service_did` field to Set
+    pub struct SetServiceDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetServiceDid<S> {}
+    impl<S: State> State for SetServiceDid<S> {
+        type Token = S::Token;
+        type Platform = S::Platform;
+        type AppId = S::AppId;
+        type ServiceDid = Set<members::service_did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
@@ -220,24 +223,24 @@ pub mod register_push_state {
         pub struct token(());
         ///Marker type for the `platform` field
         pub struct platform(());
-        ///Marker type for the `service_did` field
-        pub struct service_did(());
         ///Marker type for the `app_id` field
         pub struct app_id(());
+        ///Marker type for the `service_did` field
+        pub struct service_did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RegisterPushBuilder<'a, S: register_push_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<CowStr<'a>>,
         Option<RegisterPushPlatform<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RegisterPush<'a> {
@@ -251,9 +254,9 @@ impl<'a> RegisterPushBuilder<'a, register_push_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RegisterPushBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -261,12 +264,12 @@ impl<'a> RegisterPushBuilder<'a, register_push_state::Empty> {
 impl<'a, S: register_push_state::State> RegisterPushBuilder<'a, S> {
     /// Set the `ageRestricted` field (optional)
     pub fn age_restricted(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `ageRestricted` field to an Option value (optional)
     pub fn maybe_age_restricted(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -281,11 +284,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RegisterPushBuilder<'a, register_push_state::SetAppId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RegisterPushBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -300,11 +303,11 @@ where
         mut self,
         value: impl Into<RegisterPushPlatform<'a>>,
     ) -> RegisterPushBuilder<'a, register_push_state::SetPlatform<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RegisterPushBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -319,11 +322,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> RegisterPushBuilder<'a, register_push_state::SetServiceDid<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RegisterPushBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -338,11 +341,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RegisterPushBuilder<'a, register_push_state::SetToken<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RegisterPushBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -352,17 +355,17 @@ where
     S: register_push_state::State,
     S::Token: register_push_state::IsSet,
     S::Platform: register_push_state::IsSet,
-    S::ServiceDid: register_push_state::IsSet,
     S::AppId: register_push_state::IsSet,
+    S::ServiceDid: register_push_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RegisterPush<'a> {
         RegisterPush {
-            age_restricted: self.__unsafe_private_named.0,
-            app_id: self.__unsafe_private_named.1.unwrap(),
-            platform: self.__unsafe_private_named.2.unwrap(),
-            service_did: self.__unsafe_private_named.3.unwrap(),
-            token: self.__unsafe_private_named.4.unwrap(),
+            age_restricted: self._fields.0,
+            app_id: self._fields.1.unwrap(),
+            platform: self._fields.2.unwrap(),
+            service_did: self._fields.3.unwrap(),
+            token: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -375,11 +378,11 @@ where
         >,
     ) -> RegisterPush<'a> {
         RegisterPush {
-            age_restricted: self.__unsafe_private_named.0,
-            app_id: self.__unsafe_private_named.1.unwrap(),
-            platform: self.__unsafe_private_named.2.unwrap(),
-            service_did: self.__unsafe_private_named.3.unwrap(),
-            token: self.__unsafe_private_named.4.unwrap(),
+            age_restricted: self._fields.0,
+            app_id: self._fields.1.unwrap(),
+            platform: self._fields.2.unwrap(),
+            service_did: self._fields.3.unwrap(),
+            token: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/notification/unregister_push.rs b/crates/jacquard-api/src/app_bsky/notification/unregister_push.rs
index dc27aedb..a906163a 100644
--- a/crates/jacquard-api/src/app_bsky/notification/unregister_push.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/unregister_push.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -161,79 +164,79 @@ pub mod unregister_push_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Token;
+        type AppId;
         type ServiceDid;
         type Platform;
-        type AppId;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Token = Unset;
+        type AppId = Unset;
         type ServiceDid = Unset;
         type Platform = Unset;
-        type AppId = Unset;
     }
     ///State transition - sets the `token` field to Set
     pub struct SetToken<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetToken<S> {}
     impl<S: State> State for SetToken<S> {
         type Token = Set<members::token>;
+        type AppId = S::AppId;
+        type ServiceDid = S::ServiceDid;
+        type Platform = S::Platform;
+    }
+    ///State transition - sets the `app_id` field to Set
+    pub struct SetAppId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAppId<S> {}
+    impl<S: State> State for SetAppId<S> {
+        type Token = S::Token;
+        type AppId = Set<members::app_id>;
         type ServiceDid = S::ServiceDid;
         type Platform = S::Platform;
-        type AppId = S::AppId;
     }
     ///State transition - sets the `service_did` field to Set
     pub struct SetServiceDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetServiceDid<S> {}
     impl<S: State> State for SetServiceDid<S> {
         type Token = S::Token;
+        type AppId = S::AppId;
         type ServiceDid = Set<members::service_did>;
         type Platform = S::Platform;
-        type AppId = S::AppId;
     }
     ///State transition - sets the `platform` field to Set
     pub struct SetPlatform<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPlatform<S> {}
     impl<S: State> State for SetPlatform<S> {
         type Token = S::Token;
-        type ServiceDid = S::ServiceDid;
-        type Platform = Set<members::platform>;
         type AppId = S::AppId;
-    }
-    ///State transition - sets the `app_id` field to Set
-    pub struct SetAppId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAppId<S> {}
-    impl<S: State> State for SetAppId<S> {
-        type Token = S::Token;
         type ServiceDid = S::ServiceDid;
-        type Platform = S::Platform;
-        type AppId = Set<members::app_id>;
+        type Platform = Set<members::platform>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `token` field
         pub struct token(());
+        ///Marker type for the `app_id` field
+        pub struct app_id(());
         ///Marker type for the `service_did` field
         pub struct service_did(());
         ///Marker type for the `platform` field
         pub struct platform(());
-        ///Marker type for the `app_id` field
-        pub struct app_id(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct UnregisterPushBuilder<'a, S: unregister_push_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<UnregisterPushPlatform<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UnregisterPush<'a> {
@@ -247,9 +250,9 @@ impl<'a> UnregisterPushBuilder<'a, unregister_push_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UnregisterPushBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -264,11 +267,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> UnregisterPushBuilder<'a, unregister_push_state::SetAppId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UnregisterPushBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -283,11 +286,11 @@ where
         mut self,
         value: impl Into<UnregisterPushPlatform<'a>>,
     ) -> UnregisterPushBuilder<'a, unregister_push_state::SetPlatform<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UnregisterPushBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -302,11 +305,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> UnregisterPushBuilder<'a, unregister_push_state::SetServiceDid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         UnregisterPushBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -321,11 +324,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> UnregisterPushBuilder<'a, unregister_push_state::SetToken<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         UnregisterPushBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -334,17 +337,17 @@ impl<'a, S> UnregisterPushBuilder<'a, S>
 where
     S: unregister_push_state::State,
     S::Token: unregister_push_state::IsSet,
+    S::AppId: unregister_push_state::IsSet,
     S::ServiceDid: unregister_push_state::IsSet,
     S::Platform: unregister_push_state::IsSet,
-    S::AppId: unregister_push_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> UnregisterPush<'a> {
         UnregisterPush {
-            app_id: self.__unsafe_private_named.0.unwrap(),
-            platform: self.__unsafe_private_named.1.unwrap(),
-            service_did: self.__unsafe_private_named.2.unwrap(),
-            token: self.__unsafe_private_named.3.unwrap(),
+            app_id: self._fields.0.unwrap(),
+            platform: self._fields.1.unwrap(),
+            service_did: self._fields.2.unwrap(),
+            token: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -357,10 +360,10 @@ where
         >,
     ) -> UnregisterPush<'a> {
         UnregisterPush {
-            app_id: self.__unsafe_private_named.0.unwrap(),
-            platform: self.__unsafe_private_named.1.unwrap(),
-            service_did: self.__unsafe_private_named.2.unwrap(),
-            token: self.__unsafe_private_named.3.unwrap(),
+            app_id: self._fields.0.unwrap(),
+            platform: self._fields.1.unwrap(),
+            service_did: self._fields.2.unwrap(),
+            token: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/notification/update_seen.rs b/crates/jacquard-api/src/app_bsky/notification/update_seen.rs
index 2832f46f..002faadc 100644
--- a/crates/jacquard-api/src/app_bsky/notification/update_seen.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/update_seen.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Datetime;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -80,9 +83,9 @@ pub mod update_seen_state {
 
 /// Builder for constructing an instance of this type
 pub struct UpdateSeenBuilder<'a, S: update_seen_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateSeen<'a> {
@@ -96,9 +99,9 @@ impl<'a> UpdateSeenBuilder<'a, update_seen_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateSeenBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -113,11 +116,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> UpdateSeenBuilder<'a, update_seen_state::SetSeenAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UpdateSeenBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -130,7 +133,7 @@ where
     /// Build the final struct
     pub fn build(self) -> UpdateSeen<'a> {
         UpdateSeen {
-            seen_at: self.__unsafe_private_named.0.unwrap(),
+            seen_at: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -143,7 +146,7 @@ where
         >,
     ) -> UpdateSeen<'a> {
         UpdateSeen {
-            seen_at: self.__unsafe_private_named.0.unwrap(),
+            seen_at: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/richtext/facet.rs b/crates/jacquard-api/src/app_bsky/richtext/facet.rs
index a03e4472..6be1bbf1 100644
--- a/crates/jacquard-api/src/app_bsky/richtext/facet.rs
+++ b/crates/jacquard-api/src/app_bsky/richtext/facet.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -251,9 +254,9 @@ pub mod byte_slice_state {
 
 /// Builder for constructing an instance of this type
 pub struct ByteSliceBuilder<'a, S: byte_slice_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ByteSlice<'a> {
@@ -267,9 +270,9 @@ impl<'a> ByteSliceBuilder<'a, byte_slice_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -284,11 +287,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteEnd<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -303,11 +306,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteStart<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -321,8 +324,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -335,8 +338,8 @@ where
         >,
     ) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -542,9 +545,9 @@ pub mod link_state {
 
 /// Builder for constructing an instance of this type
 pub struct LinkBuilder<'a, S: link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Link<'a> {
@@ -558,9 +561,9 @@ impl<'a> LinkBuilder<'a, link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -575,11 +578,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LinkBuilder<'a, link_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -592,7 +595,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Link<'a> {
         Link {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -605,7 +608,7 @@ where
         >,
     ) -> Link<'a> {
         Link {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -657,12 +660,9 @@ pub mod facet_state {
 
 /// Builder for constructing an instance of this type
 pub struct FacetBuilder<'a, S: facet_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<FacetFeaturesItem<'a>>>,
-        Option<facet::ByteSlice<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<FacetFeaturesItem<'a>>>, Option<facet::ByteSlice<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Facet<'a> {
@@ -676,9 +676,9 @@ impl<'a> FacetBuilder<'a, facet_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -693,11 +693,11 @@ where
         mut self,
         value: impl Into<Vec<FacetFeaturesItem<'a>>>,
     ) -> FacetBuilder<'a, facet_state::SetFeatures<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -712,11 +712,11 @@ where
         mut self,
         value: impl Into<facet::ByteSlice<'a>>,
     ) -> FacetBuilder<'a, facet_state::SetIndex<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -730,8 +730,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -744,8 +744,8 @@ where
         >,
     ) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -785,9 +785,9 @@ pub mod mention_state {
 
 /// Builder for constructing an instance of this type
 pub struct MentionBuilder<'a, S: mention_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Mention<'a> {
@@ -801,9 +801,9 @@ impl<'a> MentionBuilder<'a, mention_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -818,11 +818,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MentionBuilder<'a, mention_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -835,7 +835,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Mention<'a> {
         Mention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -848,7 +848,7 @@ where
         >,
     ) -> Mention<'a> {
         Mention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/unspecced.rs b/crates/jacquard-api/src/app_bsky/unspecced.rs
index 6033863f..c93c15e2 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced.rs
@@ -30,7 +30,11 @@ pub mod search_actors_skeleton;
 pub mod search_posts_skeleton;
 pub mod search_starter_packs_skeleton;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -782,58 +786,58 @@ pub mod age_assurance_event_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Status;
         type AttemptId;
         type CreatedAt;
+        type Status;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Status = Unset;
         type AttemptId = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `status` field to Set
-    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStatus<S> {}
-    impl<S: State> State for SetStatus<S> {
-        type Status = Set<members::status>;
-        type AttemptId = S::AttemptId;
-        type CreatedAt = S::CreatedAt;
+        type Status = Unset;
     }
     ///State transition - sets the `attempt_id` field to Set
     pub struct SetAttemptId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAttemptId<S> {}
     impl<S: State> State for SetAttemptId<S> {
-        type Status = S::Status;
         type AttemptId = Set<members::attempt_id>;
         type CreatedAt = S::CreatedAt;
+        type Status = S::Status;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Status = S::Status;
         type AttemptId = S::AttemptId;
         type CreatedAt = Set<members::created_at>;
+        type Status = S::Status;
+    }
+    ///State transition - sets the `status` field to Set
+    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStatus<S> {}
+    impl<S: State> State for SetStatus<S> {
+        type AttemptId = S::AttemptId;
+        type CreatedAt = S::CreatedAt;
+        type Status = Set<members::status>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `status` field
-        pub struct status(());
         ///Marker type for the `attempt_id` field
         pub struct attempt_id(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `status` field
+        pub struct status(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AgeAssuranceEventBuilder<'a, S: age_assurance_event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -843,7 +847,7 @@ pub struct AgeAssuranceEventBuilder<'a, S: age_assurance_event_state::State> {
         Option<CowStr<'a>>,
         Option<AgeAssuranceEventStatus<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AgeAssuranceEvent<'a> {
@@ -857,9 +861,9 @@ impl<'a> AgeAssuranceEventBuilder<'a, age_assurance_event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AgeAssuranceEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -874,11 +878,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AgeAssuranceEventBuilder<'a, age_assurance_event_state::SetAttemptId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AgeAssuranceEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -886,12 +890,12 @@ where
 impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
     /// Set the `completeIp` field (optional)
     pub fn complete_ip(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `completeIp` field to an Option value (optional)
     pub fn maybe_complete_ip(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -899,12 +903,12 @@ impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
 impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
     /// Set the `completeUa` field (optional)
     pub fn complete_ua(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `completeUa` field to an Option value (optional)
     pub fn maybe_complete_ua(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -919,11 +923,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AgeAssuranceEventBuilder<'a, age_assurance_event_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         AgeAssuranceEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -931,12 +935,12 @@ where
 impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
     /// Set the `email` field (optional)
     pub fn email(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `email` field to an Option value (optional)
     pub fn maybe_email(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -944,12 +948,12 @@ impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
 impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
     /// Set the `initIp` field (optional)
     pub fn init_ip(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `initIp` field to an Option value (optional)
     pub fn maybe_init_ip(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -957,12 +961,12 @@ impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
 impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
     /// Set the `initUa` field (optional)
     pub fn init_ua(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `initUa` field to an Option value (optional)
     pub fn maybe_init_ua(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -977,11 +981,11 @@ where
         mut self,
         value: impl Into<AgeAssuranceEventStatus<'a>>,
     ) -> AgeAssuranceEventBuilder<'a, age_assurance_event_state::SetStatus<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         AgeAssuranceEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -989,21 +993,21 @@ where
 impl<'a, S> AgeAssuranceEventBuilder<'a, S>
 where
     S: age_assurance_event_state::State,
-    S::Status: age_assurance_event_state::IsSet,
     S::AttemptId: age_assurance_event_state::IsSet,
     S::CreatedAt: age_assurance_event_state::IsSet,
+    S::Status: age_assurance_event_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AgeAssuranceEvent<'a> {
         AgeAssuranceEvent {
-            attempt_id: self.__unsafe_private_named.0.unwrap(),
-            complete_ip: self.__unsafe_private_named.1,
-            complete_ua: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            email: self.__unsafe_private_named.4,
-            init_ip: self.__unsafe_private_named.5,
-            init_ua: self.__unsafe_private_named.6,
-            status: self.__unsafe_private_named.7.unwrap(),
+            attempt_id: self._fields.0.unwrap(),
+            complete_ip: self._fields.1,
+            complete_ua: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            email: self._fields.4,
+            init_ip: self._fields.5,
+            init_ua: self._fields.6,
+            status: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1016,14 +1020,14 @@ where
         >,
     ) -> AgeAssuranceEvent<'a> {
         AgeAssuranceEvent {
-            attempt_id: self.__unsafe_private_named.0.unwrap(),
-            complete_ip: self.__unsafe_private_named.1,
-            complete_ua: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            email: self.__unsafe_private_named.4,
-            init_ip: self.__unsafe_private_named.5,
-            init_ua: self.__unsafe_private_named.6,
-            status: self.__unsafe_private_named.7.unwrap(),
+            attempt_id: self._fields.0.unwrap(),
+            complete_ip: self._fields.1,
+            complete_ua: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            email: self._fields.4,
+            init_ip: self._fields.5,
+            init_ua: self._fields.6,
+            status: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1546,9 +1550,9 @@ pub mod skeleton_search_actor_state {
 
 /// Builder for constructing an instance of this type
 pub struct SkeletonSearchActorBuilder<'a, S: skeleton_search_actor_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SkeletonSearchActor<'a> {
@@ -1562,9 +1566,9 @@ impl<'a> SkeletonSearchActorBuilder<'a, skeleton_search_actor_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SkeletonSearchActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1579,11 +1583,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> SkeletonSearchActorBuilder<'a, skeleton_search_actor_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SkeletonSearchActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1596,7 +1600,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SkeletonSearchActor<'a> {
         SkeletonSearchActor {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1609,7 +1613,7 @@ where
         >,
     ) -> SkeletonSearchActor<'a> {
         SkeletonSearchActor {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1649,9 +1653,9 @@ pub mod skeleton_search_post_state {
 
 /// Builder for constructing an instance of this type
 pub struct SkeletonSearchPostBuilder<'a, S: skeleton_search_post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SkeletonSearchPost<'a> {
@@ -1665,9 +1669,9 @@ impl<'a> SkeletonSearchPostBuilder<'a, skeleton_search_post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SkeletonSearchPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1682,11 +1686,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SkeletonSearchPostBuilder<'a, skeleton_search_post_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SkeletonSearchPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1699,7 +1703,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SkeletonSearchPost<'a> {
         SkeletonSearchPost {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1712,7 +1716,7 @@ where
         >,
     ) -> SkeletonSearchPost<'a> {
         SkeletonSearchPost {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1755,9 +1759,9 @@ pub struct SkeletonSearchStarterPackBuilder<
     'a,
     S: skeleton_search_starter_pack_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SkeletonSearchStarterPack<'a> {
@@ -1776,9 +1780,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SkeletonSearchStarterPackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1796,11 +1800,11 @@ where
         'a,
         skeleton_search_starter_pack_state::SetUri<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SkeletonSearchStarterPackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1813,7 +1817,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SkeletonSearchStarterPack<'a> {
         SkeletonSearchStarterPack {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1826,7 +1830,7 @@ where
         >,
     ) -> SkeletonSearchStarterPack<'a> {
         SkeletonSearchStarterPack {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1842,112 +1846,112 @@ pub mod skeleton_trend_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type StartedAt;
-        type DisplayName;
         type Dids;
         type Topic;
+        type DisplayName;
         type Link;
         type PostCount;
+        type StartedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type StartedAt = Unset;
-        type DisplayName = Unset;
         type Dids = Unset;
         type Topic = Unset;
+        type DisplayName = Unset;
         type Link = Unset;
         type PostCount = Unset;
-    }
-    ///State transition - sets the `started_at` field to Set
-    pub struct SetStartedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStartedAt<S> {}
-    impl<S: State> State for SetStartedAt<S> {
-        type StartedAt = Set<members::started_at>;
-        type DisplayName = S::DisplayName;
-        type Dids = S::Dids;
-        type Topic = S::Topic;
-        type Link = S::Link;
-        type PostCount = S::PostCount;
-    }
-    ///State transition - sets the `display_name` field to Set
-    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
-    impl<S: State> State for SetDisplayName<S> {
-        type StartedAt = S::StartedAt;
-        type DisplayName = Set<members::display_name>;
-        type Dids = S::Dids;
-        type Topic = S::Topic;
-        type Link = S::Link;
-        type PostCount = S::PostCount;
+        type StartedAt = Unset;
     }
     ///State transition - sets the `dids` field to Set
     pub struct SetDids<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDids<S> {}
     impl<S: State> State for SetDids<S> {
-        type StartedAt = S::StartedAt;
-        type DisplayName = S::DisplayName;
         type Dids = Set<members::dids>;
         type Topic = S::Topic;
+        type DisplayName = S::DisplayName;
         type Link = S::Link;
         type PostCount = S::PostCount;
+        type StartedAt = S::StartedAt;
     }
     ///State transition - sets the `topic` field to Set
     pub struct SetTopic<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTopic<S> {}
     impl<S: State> State for SetTopic<S> {
-        type StartedAt = S::StartedAt;
-        type DisplayName = S::DisplayName;
         type Dids = S::Dids;
         type Topic = Set<members::topic>;
+        type DisplayName = S::DisplayName;
+        type Link = S::Link;
+        type PostCount = S::PostCount;
+        type StartedAt = S::StartedAt;
+    }
+    ///State transition - sets the `display_name` field to Set
+    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
+    impl<S: State> State for SetDisplayName<S> {
+        type Dids = S::Dids;
+        type Topic = S::Topic;
+        type DisplayName = Set<members::display_name>;
         type Link = S::Link;
         type PostCount = S::PostCount;
+        type StartedAt = S::StartedAt;
     }
     ///State transition - sets the `link` field to Set
     pub struct SetLink<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLink<S> {}
     impl<S: State> State for SetLink<S> {
-        type StartedAt = S::StartedAt;
-        type DisplayName = S::DisplayName;
         type Dids = S::Dids;
         type Topic = S::Topic;
+        type DisplayName = S::DisplayName;
         type Link = Set<members::link>;
         type PostCount = S::PostCount;
+        type StartedAt = S::StartedAt;
     }
     ///State transition - sets the `post_count` field to Set
     pub struct SetPostCount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPostCount<S> {}
     impl<S: State> State for SetPostCount<S> {
-        type StartedAt = S::StartedAt;
-        type DisplayName = S::DisplayName;
         type Dids = S::Dids;
         type Topic = S::Topic;
+        type DisplayName = S::DisplayName;
         type Link = S::Link;
         type PostCount = Set<members::post_count>;
+        type StartedAt = S::StartedAt;
+    }
+    ///State transition - sets the `started_at` field to Set
+    pub struct SetStartedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStartedAt<S> {}
+    impl<S: State> State for SetStartedAt<S> {
+        type Dids = S::Dids;
+        type Topic = S::Topic;
+        type DisplayName = S::DisplayName;
+        type Link = S::Link;
+        type PostCount = S::PostCount;
+        type StartedAt = Set<members::started_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `started_at` field
-        pub struct started_at(());
-        ///Marker type for the `display_name` field
-        pub struct display_name(());
         ///Marker type for the `dids` field
         pub struct dids(());
         ///Marker type for the `topic` field
         pub struct topic(());
+        ///Marker type for the `display_name` field
+        pub struct display_name(());
         ///Marker type for the `link` field
         pub struct link(());
         ///Marker type for the `post_count` field
         pub struct post_count(());
+        ///Marker type for the `started_at` field
+        pub struct started_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SkeletonTrendBuilder<'a, S: skeleton_trend_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Vec<Did<'a>>>,
         Option<CowStr<'a>>,
@@ -1957,7 +1961,7 @@ pub struct SkeletonTrendBuilder<'a, S: skeleton_trend_state::State> {
         Option<SkeletonTrendStatus<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SkeletonTrend<'a> {
@@ -1971,9 +1975,9 @@ impl<'a> SkeletonTrendBuilder<'a, skeleton_trend_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SkeletonTrendBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1981,12 +1985,12 @@ impl<'a> SkeletonTrendBuilder<'a, skeleton_trend_state::Empty> {
 impl<'a, S: skeleton_trend_state::State> SkeletonTrendBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -2001,11 +2005,11 @@ where
         mut self,
         value: impl Into<Vec<Did<'a>>>,
     ) -> SkeletonTrendBuilder<'a, skeleton_trend_state::SetDids<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SkeletonTrendBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2020,11 +2024,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SkeletonTrendBuilder<'a, skeleton_trend_state::SetDisplayName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SkeletonTrendBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2039,11 +2043,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SkeletonTrendBuilder<'a, skeleton_trend_state::SetLink<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SkeletonTrendBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2058,11 +2062,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SkeletonTrendBuilder<'a, skeleton_trend_state::SetPostCount<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         SkeletonTrendBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2077,11 +2081,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SkeletonTrendBuilder<'a, skeleton_trend_state::SetStartedAt<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         SkeletonTrendBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2089,12 +2093,12 @@ where
 impl<'a, S: skeleton_trend_state::State> SkeletonTrendBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<SkeletonTrendStatus<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<SkeletonTrendStatus<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -2109,11 +2113,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SkeletonTrendBuilder<'a, skeleton_trend_state::SetTopic<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         SkeletonTrendBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2121,24 +2125,24 @@ where
 impl<'a, S> SkeletonTrendBuilder<'a, S>
 where
     S: skeleton_trend_state::State,
-    S::StartedAt: skeleton_trend_state::IsSet,
-    S::DisplayName: skeleton_trend_state::IsSet,
     S::Dids: skeleton_trend_state::IsSet,
     S::Topic: skeleton_trend_state::IsSet,
+    S::DisplayName: skeleton_trend_state::IsSet,
     S::Link: skeleton_trend_state::IsSet,
     S::PostCount: skeleton_trend_state::IsSet,
+    S::StartedAt: skeleton_trend_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SkeletonTrend<'a> {
         SkeletonTrend {
-            category: self.__unsafe_private_named.0,
-            dids: self.__unsafe_private_named.1.unwrap(),
-            display_name: self.__unsafe_private_named.2.unwrap(),
-            link: self.__unsafe_private_named.3.unwrap(),
-            post_count: self.__unsafe_private_named.4.unwrap(),
-            started_at: self.__unsafe_private_named.5.unwrap(),
-            status: self.__unsafe_private_named.6,
-            topic: self.__unsafe_private_named.7.unwrap(),
+            category: self._fields.0,
+            dids: self._fields.1.unwrap(),
+            display_name: self._fields.2.unwrap(),
+            link: self._fields.3.unwrap(),
+            post_count: self._fields.4.unwrap(),
+            started_at: self._fields.5.unwrap(),
+            status: self._fields.6,
+            topic: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2151,14 +2155,14 @@ where
         >,
     ) -> SkeletonTrend<'a> {
         SkeletonTrend {
-            category: self.__unsafe_private_named.0,
-            dids: self.__unsafe_private_named.1.unwrap(),
-            display_name: self.__unsafe_private_named.2.unwrap(),
-            link: self.__unsafe_private_named.3.unwrap(),
-            post_count: self.__unsafe_private_named.4.unwrap(),
-            started_at: self.__unsafe_private_named.5.unwrap(),
-            status: self.__unsafe_private_named.6,
-            topic: self.__unsafe_private_named.7.unwrap(),
+            category: self._fields.0,
+            dids: self._fields.1.unwrap(),
+            display_name: self._fields.2.unwrap(),
+            link: self._fields.3.unwrap(),
+            post_count: self._fields.4.unwrap(),
+            started_at: self._fields.5.unwrap(),
+            status: self._fields.6,
+            topic: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2198,9 +2202,9 @@ pub mod thread_item_blocked_state {
 
 /// Builder for constructing an instance of this type
 pub struct ThreadItemBlockedBuilder<'a, S: thread_item_blocked_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlockedAuthor<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlockedAuthor<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ThreadItemBlocked<'a> {
@@ -2214,9 +2218,9 @@ impl<'a> ThreadItemBlockedBuilder<'a, thread_item_blocked_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ThreadItemBlockedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2231,11 +2235,11 @@ where
         mut self,
         value: impl Into<BlockedAuthor<'a>>,
     ) -> ThreadItemBlockedBuilder<'a, thread_item_blocked_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ThreadItemBlockedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2248,7 +2252,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ThreadItemBlocked<'a> {
         ThreadItemBlocked {
-            author: self.__unsafe_private_named.0.unwrap(),
+            author: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2261,7 +2265,7 @@ where
         >,
     ) -> ThreadItemBlocked<'a> {
         ThreadItemBlocked {
-            author: self.__unsafe_private_named.0.unwrap(),
+            author: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2277,112 +2281,112 @@ pub mod thread_item_post_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type MoreParents;
-        type Post;
         type OpThread;
+        type MoreReplies;
         type HiddenByThreadgate;
+        type MoreParents;
+        type Post;
         type MutedByViewer;
-        type MoreReplies;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type MoreParents = Unset;
-        type Post = Unset;
         type OpThread = Unset;
+        type MoreReplies = Unset;
         type HiddenByThreadgate = Unset;
+        type MoreParents = Unset;
+        type Post = Unset;
         type MutedByViewer = Unset;
-        type MoreReplies = Unset;
-    }
-    ///State transition - sets the `more_parents` field to Set
-    pub struct SetMoreParents<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMoreParents<S> {}
-    impl<S: State> State for SetMoreParents<S> {
-        type MoreParents = Set<members::more_parents>;
-        type Post = S::Post;
-        type OpThread = S::OpThread;
-        type HiddenByThreadgate = S::HiddenByThreadgate;
-        type MutedByViewer = S::MutedByViewer;
-        type MoreReplies = S::MoreReplies;
-    }
-    ///State transition - sets the `post` field to Set
-    pub struct SetPost<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPost<S> {}
-    impl<S: State> State for SetPost<S> {
-        type MoreParents = S::MoreParents;
-        type Post = Set<members::post>;
-        type OpThread = S::OpThread;
-        type HiddenByThreadgate = S::HiddenByThreadgate;
-        type MutedByViewer = S::MutedByViewer;
-        type MoreReplies = S::MoreReplies;
     }
     ///State transition - sets the `op_thread` field to Set
     pub struct SetOpThread<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetOpThread<S> {}
     impl<S: State> State for SetOpThread<S> {
+        type OpThread = Set<members::op_thread>;
+        type MoreReplies = S::MoreReplies;
+        type HiddenByThreadgate = S::HiddenByThreadgate;
         type MoreParents = S::MoreParents;
         type Post = S::Post;
-        type OpThread = Set<members::op_thread>;
+        type MutedByViewer = S::MutedByViewer;
+    }
+    ///State transition - sets the `more_replies` field to Set
+    pub struct SetMoreReplies<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMoreReplies<S> {}
+    impl<S: State> State for SetMoreReplies<S> {
+        type OpThread = S::OpThread;
+        type MoreReplies = Set<members::more_replies>;
         type HiddenByThreadgate = S::HiddenByThreadgate;
+        type MoreParents = S::MoreParents;
+        type Post = S::Post;
         type MutedByViewer = S::MutedByViewer;
-        type MoreReplies = S::MoreReplies;
     }
     ///State transition - sets the `hidden_by_threadgate` field to Set
     pub struct SetHiddenByThreadgate<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHiddenByThreadgate<S> {}
     impl<S: State> State for SetHiddenByThreadgate<S> {
+        type OpThread = S::OpThread;
+        type MoreReplies = S::MoreReplies;
+        type HiddenByThreadgate = Set<members::hidden_by_threadgate>;
         type MoreParents = S::MoreParents;
         type Post = S::Post;
+        type MutedByViewer = S::MutedByViewer;
+    }
+    ///State transition - sets the `more_parents` field to Set
+    pub struct SetMoreParents<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMoreParents<S> {}
+    impl<S: State> State for SetMoreParents<S> {
         type OpThread = S::OpThread;
-        type HiddenByThreadgate = Set<members::hidden_by_threadgate>;
+        type MoreReplies = S::MoreReplies;
+        type HiddenByThreadgate = S::HiddenByThreadgate;
+        type MoreParents = Set<members::more_parents>;
+        type Post = S::Post;
         type MutedByViewer = S::MutedByViewer;
+    }
+    ///State transition - sets the `post` field to Set
+    pub struct SetPost<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPost<S> {}
+    impl<S: State> State for SetPost<S> {
+        type OpThread = S::OpThread;
         type MoreReplies = S::MoreReplies;
+        type HiddenByThreadgate = S::HiddenByThreadgate;
+        type MoreParents = S::MoreParents;
+        type Post = Set<members::post>;
+        type MutedByViewer = S::MutedByViewer;
     }
     ///State transition - sets the `muted_by_viewer` field to Set
     pub struct SetMutedByViewer<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMutedByViewer<S> {}
     impl<S: State> State for SetMutedByViewer<S> {
-        type MoreParents = S::MoreParents;
-        type Post = S::Post;
         type OpThread = S::OpThread;
-        type HiddenByThreadgate = S::HiddenByThreadgate;
-        type MutedByViewer = Set<members::muted_by_viewer>;
         type MoreReplies = S::MoreReplies;
-    }
-    ///State transition - sets the `more_replies` field to Set
-    pub struct SetMoreReplies<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMoreReplies<S> {}
-    impl<S: State> State for SetMoreReplies<S> {
+        type HiddenByThreadgate = S::HiddenByThreadgate;
         type MoreParents = S::MoreParents;
         type Post = S::Post;
-        type OpThread = S::OpThread;
-        type HiddenByThreadgate = S::HiddenByThreadgate;
-        type MutedByViewer = S::MutedByViewer;
-        type MoreReplies = Set<members::more_replies>;
+        type MutedByViewer = Set<members::muted_by_viewer>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `more_parents` field
-        pub struct more_parents(());
-        ///Marker type for the `post` field
-        pub struct post(());
         ///Marker type for the `op_thread` field
         pub struct op_thread(());
+        ///Marker type for the `more_replies` field
+        pub struct more_replies(());
         ///Marker type for the `hidden_by_threadgate` field
         pub struct hidden_by_threadgate(());
+        ///Marker type for the `more_parents` field
+        pub struct more_parents(());
+        ///Marker type for the `post` field
+        pub struct post(());
         ///Marker type for the `muted_by_viewer` field
         pub struct muted_by_viewer(());
-        ///Marker type for the `more_replies` field
-        pub struct more_replies(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ThreadItemPostBuilder<'a, S: thread_item_post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<bool>,
         Option<i64>,
@@ -2390,7 +2394,7 @@ pub struct ThreadItemPostBuilder<'a, S: thread_item_post_state::State> {
         Option<bool>,
         Option<PostView<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ThreadItemPost<'a> {
@@ -2404,9 +2408,9 @@ impl<'a> ThreadItemPostBuilder<'a, thread_item_post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ThreadItemPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2421,11 +2425,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ThreadItemPostBuilder<'a, thread_item_post_state::SetHiddenByThreadgate<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ThreadItemPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2440,11 +2444,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ThreadItemPostBuilder<'a, thread_item_post_state::SetMoreParents<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ThreadItemPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2459,11 +2463,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ThreadItemPostBuilder<'a, thread_item_post_state::SetMoreReplies<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ThreadItemPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2478,11 +2482,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ThreadItemPostBuilder<'a, thread_item_post_state::SetMutedByViewer<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ThreadItemPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2497,11 +2501,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ThreadItemPostBuilder<'a, thread_item_post_state::SetOpThread<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ThreadItemPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2516,11 +2520,11 @@ where
         mut self,
         value: impl Into<PostView<'a>>,
     ) -> ThreadItemPostBuilder<'a, thread_item_post_state::SetPost<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ThreadItemPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2528,22 +2532,22 @@ where
 impl<'a, S> ThreadItemPostBuilder<'a, S>
 where
     S: thread_item_post_state::State,
-    S::MoreParents: thread_item_post_state::IsSet,
-    S::Post: thread_item_post_state::IsSet,
     S::OpThread: thread_item_post_state::IsSet,
+    S::MoreReplies: thread_item_post_state::IsSet,
     S::HiddenByThreadgate: thread_item_post_state::IsSet,
+    S::MoreParents: thread_item_post_state::IsSet,
+    S::Post: thread_item_post_state::IsSet,
     S::MutedByViewer: thread_item_post_state::IsSet,
-    S::MoreReplies: thread_item_post_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ThreadItemPost<'a> {
         ThreadItemPost {
-            hidden_by_threadgate: self.__unsafe_private_named.0.unwrap(),
-            more_parents: self.__unsafe_private_named.1.unwrap(),
-            more_replies: self.__unsafe_private_named.2.unwrap(),
-            muted_by_viewer: self.__unsafe_private_named.3.unwrap(),
-            op_thread: self.__unsafe_private_named.4.unwrap(),
-            post: self.__unsafe_private_named.5.unwrap(),
+            hidden_by_threadgate: self._fields.0.unwrap(),
+            more_parents: self._fields.1.unwrap(),
+            more_replies: self._fields.2.unwrap(),
+            muted_by_viewer: self._fields.3.unwrap(),
+            op_thread: self._fields.4.unwrap(),
+            post: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2556,12 +2560,12 @@ where
         >,
     ) -> ThreadItemPost<'a> {
         ThreadItemPost {
-            hidden_by_threadgate: self.__unsafe_private_named.0.unwrap(),
-            more_parents: self.__unsafe_private_named.1.unwrap(),
-            more_replies: self.__unsafe_private_named.2.unwrap(),
-            muted_by_viewer: self.__unsafe_private_named.3.unwrap(),
-            op_thread: self.__unsafe_private_named.4.unwrap(),
-            post: self.__unsafe_private_named.5.unwrap(),
+            hidden_by_threadgate: self._fields.0.unwrap(),
+            more_parents: self._fields.1.unwrap(),
+            more_replies: self._fields.2.unwrap(),
+            muted_by_viewer: self._fields.3.unwrap(),
+            op_thread: self._fields.4.unwrap(),
+            post: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2577,112 +2581,112 @@ pub mod trend_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type PostCount;
-        type Topic;
         type DisplayName;
-        type Actors;
+        type PostCount;
         type Link;
+        type Actors;
         type StartedAt;
+        type Topic;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type PostCount = Unset;
-        type Topic = Unset;
         type DisplayName = Unset;
-        type Actors = Unset;
+        type PostCount = Unset;
         type Link = Unset;
+        type Actors = Unset;
         type StartedAt = Unset;
+        type Topic = Unset;
+    }
+    ///State transition - sets the `display_name` field to Set
+    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
+    impl<S: State> State for SetDisplayName<S> {
+        type DisplayName = Set<members::display_name>;
+        type PostCount = S::PostCount;
+        type Link = S::Link;
+        type Actors = S::Actors;
+        type StartedAt = S::StartedAt;
+        type Topic = S::Topic;
     }
     ///State transition - sets the `post_count` field to Set
     pub struct SetPostCount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPostCount<S> {}
     impl<S: State> State for SetPostCount<S> {
-        type PostCount = Set<members::post_count>;
-        type Topic = S::Topic;
         type DisplayName = S::DisplayName;
-        type Actors = S::Actors;
+        type PostCount = Set<members::post_count>;
         type Link = S::Link;
-        type StartedAt = S::StartedAt;
-    }
-    ///State transition - sets the `topic` field to Set
-    pub struct SetTopic<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTopic<S> {}
-    impl<S: State> State for SetTopic<S> {
-        type PostCount = S::PostCount;
-        type Topic = Set<members::topic>;
-        type DisplayName = S::DisplayName;
         type Actors = S::Actors;
-        type Link = S::Link;
         type StartedAt = S::StartedAt;
+        type Topic = S::Topic;
     }
-    ///State transition - sets the `display_name` field to Set
-    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
-    impl<S: State> State for SetDisplayName<S> {
+    ///State transition - sets the `link` field to Set
+    pub struct SetLink<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLink<S> {}
+    impl<S: State> State for SetLink<S> {
+        type DisplayName = S::DisplayName;
         type PostCount = S::PostCount;
-        type Topic = S::Topic;
-        type DisplayName = Set<members::display_name>;
+        type Link = Set<members::link>;
         type Actors = S::Actors;
-        type Link = S::Link;
         type StartedAt = S::StartedAt;
+        type Topic = S::Topic;
     }
     ///State transition - sets the `actors` field to Set
     pub struct SetActors<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetActors<S> {}
     impl<S: State> State for SetActors<S> {
-        type PostCount = S::PostCount;
-        type Topic = S::Topic;
         type DisplayName = S::DisplayName;
-        type Actors = Set<members::actors>;
+        type PostCount = S::PostCount;
         type Link = S::Link;
+        type Actors = Set<members::actors>;
         type StartedAt = S::StartedAt;
-    }
-    ///State transition - sets the `link` field to Set
-    pub struct SetLink<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLink<S> {}
-    impl<S: State> State for SetLink<S> {
-        type PostCount = S::PostCount;
         type Topic = S::Topic;
-        type DisplayName = S::DisplayName;
-        type Actors = S::Actors;
-        type Link = Set<members::link>;
-        type StartedAt = S::StartedAt;
     }
     ///State transition - sets the `started_at` field to Set
     pub struct SetStartedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStartedAt<S> {}
     impl<S: State> State for SetStartedAt<S> {
+        type DisplayName = S::DisplayName;
         type PostCount = S::PostCount;
+        type Link = S::Link;
+        type Actors = S::Actors;
+        type StartedAt = Set<members::started_at>;
         type Topic = S::Topic;
+    }
+    ///State transition - sets the `topic` field to Set
+    pub struct SetTopic<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTopic<S> {}
+    impl<S: State> State for SetTopic<S> {
         type DisplayName = S::DisplayName;
-        type Actors = S::Actors;
+        type PostCount = S::PostCount;
         type Link = S::Link;
-        type StartedAt = Set<members::started_at>;
+        type Actors = S::Actors;
+        type StartedAt = S::StartedAt;
+        type Topic = Set<members::topic>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `post_count` field
-        pub struct post_count(());
-        ///Marker type for the `topic` field
-        pub struct topic(());
         ///Marker type for the `display_name` field
         pub struct display_name(());
-        ///Marker type for the `actors` field
-        pub struct actors(());
+        ///Marker type for the `post_count` field
+        pub struct post_count(());
         ///Marker type for the `link` field
         pub struct link(());
+        ///Marker type for the `actors` field
+        pub struct actors(());
         ///Marker type for the `started_at` field
         pub struct started_at(());
+        ///Marker type for the `topic` field
+        pub struct topic(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TrendViewBuilder<'a, S: trend_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<ProfileViewBasic<'a>>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -2692,7 +2696,7 @@ pub struct TrendViewBuilder<'a, S: trend_view_state::State> {
         Option<TrendViewStatus<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TrendView<'a> {
@@ -2706,9 +2710,9 @@ impl<'a> TrendViewBuilder<'a, trend_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TrendViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2723,11 +2727,11 @@ where
         mut self,
         value: impl Into<Vec<ProfileViewBasic<'a>>>,
     ) -> TrendViewBuilder<'a, trend_view_state::SetActors<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TrendViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2735,12 +2739,12 @@ where
 impl<'a, S: trend_view_state::State> TrendViewBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -2755,11 +2759,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TrendViewBuilder<'a, trend_view_state::SetDisplayName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TrendViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2774,11 +2778,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TrendViewBuilder<'a, trend_view_state::SetLink<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TrendViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2793,11 +2797,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> TrendViewBuilder<'a, trend_view_state::SetPostCount<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         TrendViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2812,11 +2816,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TrendViewBuilder<'a, trend_view_state::SetStartedAt<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         TrendViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2824,12 +2828,12 @@ where
 impl<'a, S: trend_view_state::State> TrendViewBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<TrendViewStatus<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<TrendViewStatus<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -2844,11 +2848,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TrendViewBuilder<'a, trend_view_state::SetTopic<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         TrendViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2856,24 +2860,24 @@ where
 impl<'a, S> TrendViewBuilder<'a, S>
 where
     S: trend_view_state::State,
-    S::PostCount: trend_view_state::IsSet,
-    S::Topic: trend_view_state::IsSet,
     S::DisplayName: trend_view_state::IsSet,
-    S::Actors: trend_view_state::IsSet,
+    S::PostCount: trend_view_state::IsSet,
     S::Link: trend_view_state::IsSet,
+    S::Actors: trend_view_state::IsSet,
     S::StartedAt: trend_view_state::IsSet,
+    S::Topic: trend_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TrendView<'a> {
         TrendView {
-            actors: self.__unsafe_private_named.0.unwrap(),
-            category: self.__unsafe_private_named.1,
-            display_name: self.__unsafe_private_named.2.unwrap(),
-            link: self.__unsafe_private_named.3.unwrap(),
-            post_count: self.__unsafe_private_named.4.unwrap(),
-            started_at: self.__unsafe_private_named.5.unwrap(),
-            status: self.__unsafe_private_named.6,
-            topic: self.__unsafe_private_named.7.unwrap(),
+            actors: self._fields.0.unwrap(),
+            category: self._fields.1,
+            display_name: self._fields.2.unwrap(),
+            link: self._fields.3.unwrap(),
+            post_count: self._fields.4.unwrap(),
+            started_at: self._fields.5.unwrap(),
+            status: self._fields.6,
+            topic: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2886,14 +2890,14 @@ where
         >,
     ) -> TrendView<'a> {
         TrendView {
-            actors: self.__unsafe_private_named.0.unwrap(),
-            category: self.__unsafe_private_named.1,
-            display_name: self.__unsafe_private_named.2.unwrap(),
-            link: self.__unsafe_private_named.3.unwrap(),
-            post_count: self.__unsafe_private_named.4.unwrap(),
-            started_at: self.__unsafe_private_named.5.unwrap(),
-            status: self.__unsafe_private_named.6,
-            topic: self.__unsafe_private_named.7.unwrap(),
+            actors: self._fields.0.unwrap(),
+            category: self._fields.1,
+            display_name: self._fields.2.unwrap(),
+            link: self._fields.3.unwrap(),
+            post_count: self._fields.4.unwrap(),
+            started_at: self._fields.5.unwrap(),
+            status: self._fields.6,
+            topic: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_age_assurance_state.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_age_assurance_state.rs
index 1ad51c94..4378584f 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_age_assurance_state.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_age_assurance_state.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::IntoStatic;
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs
index 337139ef..1ea84fc6 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -96,45 +99,45 @@ pub mod live_now_config_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Domains;
         type Did;
+        type Domains;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Domains = Unset;
         type Did = Unset;
-    }
-    ///State transition - sets the `domains` field to Set
-    pub struct SetDomains<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDomains<S> {}
-    impl<S: State> State for SetDomains<S> {
-        type Domains = Set<members::domains>;
-        type Did = S::Did;
+        type Domains = Unset;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type Domains = S::Domains;
         type Did = Set<members::did>;
+        type Domains = S::Domains;
+    }
+    ///State transition - sets the `domains` field to Set
+    pub struct SetDomains<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDomains<S> {}
+    impl<S: State> State for SetDomains<S> {
+        type Did = S::Did;
+        type Domains = Set<members::domains>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `domains` field
-        pub struct domains(());
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `domains` field
+        pub struct domains(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LiveNowConfigBuilder<'a, S: live_now_config_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Vec<CowStr<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Vec<CowStr<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LiveNowConfig<'a> {
@@ -148,9 +151,9 @@ impl<'a> LiveNowConfigBuilder<'a, live_now_config_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LiveNowConfigBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -165,11 +168,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> LiveNowConfigBuilder<'a, live_now_config_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LiveNowConfigBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -184,11 +187,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> LiveNowConfigBuilder<'a, live_now_config_state::SetDomains<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LiveNowConfigBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,14 +199,14 @@ where
 impl<'a, S> LiveNowConfigBuilder<'a, S>
 where
     S: live_now_config_state::State,
-    S::Domains: live_now_config_state::IsSet,
     S::Did: live_now_config_state::IsSet,
+    S::Domains: live_now_config_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LiveNowConfig<'a> {
         LiveNowConfig {
-            did: self.__unsafe_private_named.0.unwrap(),
-            domains: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            domains: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -216,8 +219,8 @@ where
         >,
     ) -> LiveNowConfig<'a> {
         LiveNowConfig {
-            did: self.__unsafe_private_named.0.unwrap(),
-            domains: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            domains: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_starter_packs.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_starter_packs.rs
index afaa7632..f80152ed 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_starter_packs.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_starter_packs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
@@ -80,8 +83,8 @@ pub mod get_onboarding_suggested_starter_packs_state {
 pub struct GetOnboardingSuggestedStarterPacksBuilder<
     S: get_onboarding_suggested_starter_packs_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
 }
 
 impl GetOnboardingSuggestedStarterPacks {
@@ -99,8 +102,8 @@ impl GetOnboardingSuggestedStarterPacksBuilder<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetOnboardingSuggestedStarterPacksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -110,12 +113,12 @@ impl<
 > GetOnboardingSuggestedStarterPacksBuilder<S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -127,7 +130,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetOnboardingSuggestedStarterPacks {
         GetOnboardingSuggestedStarterPacks {
-            limit: self.__unsafe_private_named.0,
+            limit: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_starter_packs_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_starter_packs_skeleton.rs
index a094b0cf..ce6a3471 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_starter_packs_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_starter_packs_skeleton.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::{Did, AtUri};
 use jacquard_derive::{IntoStatic, lexicon};
@@ -87,9 +90,9 @@ pub struct GetOnboardingSuggestedStarterPacksSkeletonBuilder<
     'a,
     S: get_onboarding_suggested_starter_packs_skeleton_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetOnboardingSuggestedStarterPacksSkeleton<'a> {
@@ -111,9 +114,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetOnboardingSuggestedStarterPacksSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -124,12 +127,12 @@ impl<
 > GetOnboardingSuggestedStarterPacksSkeletonBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -140,12 +143,12 @@ impl<
 > GetOnboardingSuggestedStarterPacksSkeletonBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -157,8 +160,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetOnboardingSuggestedStarterPacksSkeleton<'a> {
         GetOnboardingSuggestedStarterPacksSkeleton {
-            limit: self.__unsafe_private_named.0,
-            viewer: self.__unsafe_private_named.1,
+            limit: self._fields.0,
+            viewer: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_users_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_users_skeleton.rs
index b52fd46e..adb77ad1 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_users_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_users_skeleton.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -96,9 +99,9 @@ pub struct GetOnboardingSuggestedUsersSkeletonBuilder<
     'a,
     S: get_onboarding_suggested_users_skeleton_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetOnboardingSuggestedUsersSkeleton<'a> {
@@ -120,9 +123,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetOnboardingSuggestedUsersSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -133,12 +136,12 @@ impl<
 > GetOnboardingSuggestedUsersSkeletonBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -149,12 +152,12 @@ impl<
 > GetOnboardingSuggestedUsersSkeletonBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -165,12 +168,12 @@ impl<
 > GetOnboardingSuggestedUsersSkeletonBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -182,9 +185,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetOnboardingSuggestedUsersSkeleton<'a> {
         GetOnboardingSuggestedUsersSkeleton {
-            category: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            viewer: self.__unsafe_private_named.2,
+            category: self._fields.0,
+            limit: self._fields.1,
+            viewer: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_popular_feed_generators.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_popular_feed_generators.rs
index df1cf1b3..380a49c2 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_popular_feed_generators.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_popular_feed_generators.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -91,9 +94,9 @@ pub struct GetPopularFeedGeneratorsBuilder<
     'a,
     S: get_popular_feed_generators_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetPopularFeedGenerators<'a> {
@@ -110,9 +113,9 @@ impl<'a> GetPopularFeedGeneratorsBuilder<'a, get_popular_feed_generators_state::
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetPopularFeedGeneratorsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -123,12 +126,12 @@ impl<
 > GetPopularFeedGeneratorsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -139,12 +142,12 @@ impl<
 > GetPopularFeedGeneratorsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -155,12 +158,12 @@ impl<
 > GetPopularFeedGeneratorsBuilder<'a, S> {
     /// Set the `query` field (optional)
     pub fn query(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `query` field to an Option value (optional)
     pub fn maybe_query(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -172,9 +175,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetPopularFeedGenerators<'a> {
         GetPopularFeedGenerators {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            query: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            query: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_other_v2.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_other_v2.rs
index 7f4f40eb..89ff9c24 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_other_v2.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_other_v2.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -124,9 +127,9 @@ pub mod get_post_thread_other_v2_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetPostThreadOtherV2Builder<'a, S: get_post_thread_other_v2_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetPostThreadOtherV2<'a> {
@@ -143,9 +146,9 @@ impl<'a> GetPostThreadOtherV2Builder<'a, get_post_thread_other_v2_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetPostThreadOtherV2Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -160,11 +163,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetPostThreadOtherV2Builder<'a, get_post_thread_other_v2_state::SetAnchor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetPostThreadOtherV2Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -177,7 +180,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetPostThreadOtherV2<'a> {
         GetPostThreadOtherV2 {
-            anchor: self.__unsafe_private_named.0.unwrap(),
+            anchor: self._fields.0.unwrap(),
         }
     }
 }
@@ -192,59 +195,59 @@ pub mod thread_item_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
-        type Depth;
         type Value;
+        type Depth;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
-        type Depth = Unset;
         type Value = Unset;
+        type Depth = Unset;
+        type Uri = Unset;
     }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
+    ///State transition - sets the `value` field to Set
+    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetValue<S> {}
+    impl<S: State> State for SetValue<S> {
+        type Value = Set<members::value>;
         type Depth = S::Depth;
-        type Value = S::Value;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `depth` field to Set
     pub struct SetDepth<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDepth<S> {}
     impl<S: State> State for SetDepth<S> {
-        type Uri = S::Uri;
-        type Depth = Set<members::depth>;
         type Value = S::Value;
-    }
-    ///State transition - sets the `value` field to Set
-    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetValue<S> {}
-    impl<S: State> State for SetValue<S> {
+        type Depth = Set<members::depth>;
         type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Value = S::Value;
         type Depth = S::Depth;
-        type Value = Set<members::value>;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
-        ///Marker type for the `depth` field
-        pub struct depth(());
         ///Marker type for the `value` field
         pub struct value(());
+        ///Marker type for the `depth` field
+        pub struct depth(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ThreadItemBuilder<'a, S: thread_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<AtUri<'a>>, Option<ThreadItemPost<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<AtUri<'a>>, Option<ThreadItemPost<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ThreadItem<'a> {
@@ -258,9 +261,9 @@ impl<'a> ThreadItemBuilder<'a, thread_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ThreadItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -275,11 +278,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ThreadItemBuilder<'a, thread_item_state::SetDepth<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ThreadItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -294,11 +297,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ThreadItemBuilder<'a, thread_item_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ThreadItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -313,11 +316,11 @@ where
         mut self,
         value: impl Into<ThreadItemPost<'a>>,
     ) -> ThreadItemBuilder<'a, thread_item_state::SetValue<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ThreadItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -325,16 +328,16 @@ where
 impl<'a, S> ThreadItemBuilder<'a, S>
 where
     S: thread_item_state::State,
-    S::Uri: thread_item_state::IsSet,
-    S::Depth: thread_item_state::IsSet,
     S::Value: thread_item_state::IsSet,
+    S::Depth: thread_item_state::IsSet,
+    S::Uri: thread_item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ThreadItem<'a> {
         ThreadItem {
-            depth: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            depth: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -347,9 +350,9 @@ where
         >,
     ) -> ThreadItem<'a> {
         ThreadItem {
-            depth: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            depth: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_v2.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_v2.rs
index 99bfc261..0690387f 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_v2.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_v2.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -183,15 +186,15 @@ pub mod get_post_thread_v2_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetPostThreadV2Builder<'a, S: get_post_thread_v2_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<AtUri<'a>>,
         Option<i64>,
         Option<i64>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetPostThreadV2<'a> {
@@ -205,9 +208,9 @@ impl<'a> GetPostThreadV2Builder<'a, get_post_thread_v2_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetPostThreadV2Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,12 +218,12 @@ impl<'a> GetPostThreadV2Builder<'a, get_post_thread_v2_state::Empty> {
 impl<'a, S: get_post_thread_v2_state::State> GetPostThreadV2Builder<'a, S> {
     /// Set the `above` field (optional)
     pub fn above(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `above` field to an Option value (optional)
     pub fn maybe_above(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -235,11 +238,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetPostThreadV2Builder<'a, get_post_thread_v2_state::SetAnchor<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetPostThreadV2Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -247,12 +250,12 @@ where
 impl<'a, S: get_post_thread_v2_state::State> GetPostThreadV2Builder<'a, S> {
     /// Set the `below` field (optional)
     pub fn below(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `below` field to an Option value (optional)
     pub fn maybe_below(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -260,12 +263,12 @@ impl<'a, S: get_post_thread_v2_state::State> GetPostThreadV2Builder<'a, S> {
 impl<'a, S: get_post_thread_v2_state::State> GetPostThreadV2Builder<'a, S> {
     /// Set the `branchingFactor` field (optional)
     pub fn branching_factor(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `branchingFactor` field to an Option value (optional)
     pub fn maybe_branching_factor(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -273,12 +276,12 @@ impl<'a, S: get_post_thread_v2_state::State> GetPostThreadV2Builder<'a, S> {
 impl<'a, S: get_post_thread_v2_state::State> GetPostThreadV2Builder<'a, S> {
     /// Set the `sort` field (optional)
     pub fn sort(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `sort` field to an Option value (optional)
     pub fn maybe_sort(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -291,11 +294,11 @@ where
     /// Build the final struct
     pub fn build(self) -> GetPostThreadV2<'a> {
         GetPostThreadV2 {
-            above: self.__unsafe_private_named.0,
-            anchor: self.__unsafe_private_named.1.unwrap(),
-            below: self.__unsafe_private_named.2,
-            branching_factor: self.__unsafe_private_named.3,
-            sort: self.__unsafe_private_named.4,
+            above: self._fields.0,
+            anchor: self._fields.1.unwrap(),
+            below: self._fields.2,
+            branching_factor: self._fields.3,
+            sort: self._fields.4,
         }
     }
 }
@@ -310,49 +313,49 @@ pub mod thread_item_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type Depth;
+        type Uri;
         type Value;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type Depth = Unset;
+        type Uri = Unset;
         type Value = Unset;
     }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Depth = S::Depth;
-        type Value = S::Value;
-    }
     ///State transition - sets the `depth` field to Set
     pub struct SetDepth<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDepth<S> {}
     impl<S: State> State for SetDepth<S> {
-        type Uri = S::Uri;
         type Depth = Set<members::depth>;
+        type Uri = S::Uri;
+        type Value = S::Value;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Depth = S::Depth;
+        type Uri = Set<members::uri>;
         type Value = S::Value;
     }
     ///State transition - sets the `value` field to Set
     pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetValue<S> {}
     impl<S: State> State for SetValue<S> {
-        type Uri = S::Uri;
         type Depth = S::Depth;
+        type Uri = S::Uri;
         type Value = Set<members::value>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `depth` field
         pub struct depth(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
         ///Marker type for the `value` field
         pub struct value(());
     }
@@ -360,13 +363,9 @@ pub mod thread_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct ThreadItemBuilder<'a, S: thread_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<i64>,
-        Option<AtUri<'a>>,
-        Option<ThreadItemValue<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<AtUri<'a>>, Option<ThreadItemValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ThreadItem<'a> {
@@ -380,9 +379,9 @@ impl<'a> ThreadItemBuilder<'a, thread_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ThreadItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -397,11 +396,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ThreadItemBuilder<'a, thread_item_state::SetDepth<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ThreadItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -416,11 +415,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ThreadItemBuilder<'a, thread_item_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ThreadItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -435,11 +434,11 @@ where
         mut self,
         value: impl Into<ThreadItemValue<'a>>,
     ) -> ThreadItemBuilder<'a, thread_item_state::SetValue<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ThreadItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -447,16 +446,16 @@ where
 impl<'a, S> ThreadItemBuilder<'a, S>
 where
     S: thread_item_state::State,
-    S::Uri: thread_item_state::IsSet,
     S::Depth: thread_item_state::IsSet,
+    S::Uri: thread_item_state::IsSet,
     S::Value: thread_item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ThreadItem<'a> {
         ThreadItem {
-            depth: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            depth: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -469,9 +468,9 @@ where
         >,
     ) -> ThreadItem<'a> {
         ThreadItem {
-            depth: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            depth: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_feeds.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_feeds.rs
index 6fa3dcb4..037ef8e5 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_feeds.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_feeds.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
@@ -78,8 +81,8 @@ pub mod get_suggested_feeds_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSuggestedFeedsBuilder<S: get_suggested_feeds_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
 }
 
 impl GetSuggestedFeeds {
@@ -93,8 +96,8 @@ impl GetSuggestedFeedsBuilder<get_suggested_feeds_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSuggestedFeedsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -102,12 +105,12 @@ impl GetSuggestedFeedsBuilder<get_suggested_feeds_state::Empty> {
 impl<S: get_suggested_feeds_state::State> GetSuggestedFeedsBuilder<S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -119,7 +122,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSuggestedFeeds {
         GetSuggestedFeeds {
-            limit: self.__unsafe_private_named.0,
+            limit: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_feeds_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_feeds_skeleton.rs
index 08531b58..48dd8172 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_feeds_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_feeds_skeleton.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::{Did, AtUri};
 use jacquard_derive::{IntoStatic, lexicon};
@@ -84,9 +87,9 @@ pub struct GetSuggestedFeedsSkeletonBuilder<
     'a,
     S: get_suggested_feeds_skeleton_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSuggestedFeedsSkeleton<'a> {
@@ -105,9 +108,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSuggestedFeedsSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -118,12 +121,12 @@ impl<
 > GetSuggestedFeedsSkeletonBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -134,12 +137,12 @@ impl<
 > GetSuggestedFeedsSkeletonBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -151,8 +154,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSuggestedFeedsSkeleton<'a> {
         GetSuggestedFeedsSkeleton {
-            limit: self.__unsafe_private_named.0,
-            viewer: self.__unsafe_private_named.1,
+            limit: self._fields.0,
+            viewer: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_onboarding_users.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_onboarding_users.rs
index 04d29b7e..30706562 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_onboarding_users.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_onboarding_users.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -93,9 +96,9 @@ pub struct GetSuggestedOnboardingUsersBuilder<
     'a,
     S: get_suggested_onboarding_users_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSuggestedOnboardingUsers<'a> {
@@ -114,9 +117,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSuggestedOnboardingUsersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -127,12 +130,12 @@ impl<
 > GetSuggestedOnboardingUsersBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -143,12 +146,12 @@ impl<
 > GetSuggestedOnboardingUsersBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -160,8 +163,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSuggestedOnboardingUsers<'a> {
         GetSuggestedOnboardingUsers {
-            category: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            category: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_starter_packs.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_starter_packs.rs
index a3e005c6..16018c41 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_starter_packs.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_starter_packs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
@@ -78,8 +81,8 @@ pub mod get_suggested_starter_packs_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSuggestedStarterPacksBuilder<S: get_suggested_starter_packs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
 }
 
 impl GetSuggestedStarterPacks {
@@ -95,8 +98,8 @@ impl GetSuggestedStarterPacksBuilder<get_suggested_starter_packs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSuggestedStarterPacksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -104,12 +107,12 @@ impl GetSuggestedStarterPacksBuilder<get_suggested_starter_packs_state::Empty> {
 impl<S: get_suggested_starter_packs_state::State> GetSuggestedStarterPacksBuilder<S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -121,7 +124,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSuggestedStarterPacks {
         GetSuggestedStarterPacks {
-            limit: self.__unsafe_private_named.0,
+            limit: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_starter_packs_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_starter_packs_skeleton.rs
index f717b0ce..c0b31a8f 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_starter_packs_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_starter_packs_skeleton.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::{Did, AtUri};
 use jacquard_derive::{IntoStatic, lexicon};
@@ -84,9 +87,9 @@ pub struct GetSuggestedStarterPacksSkeletonBuilder<
     'a,
     S: get_suggested_starter_packs_skeleton_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSuggestedStarterPacksSkeleton<'a> {
@@ -108,9 +111,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSuggestedStarterPacksSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -121,12 +124,12 @@ impl<
 > GetSuggestedStarterPacksSkeletonBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -137,12 +140,12 @@ impl<
 > GetSuggestedStarterPacksSkeletonBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -154,8 +157,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSuggestedStarterPacksSkeleton<'a> {
         GetSuggestedStarterPacksSkeleton {
-            limit: self.__unsafe_private_named.0,
-            viewer: self.__unsafe_private_named.1,
+            limit: self._fields.0,
+            viewer: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_users.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_users.rs
index b073ff91..71b1f366 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_users.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_users.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -90,9 +93,9 @@ pub mod get_suggested_users_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSuggestedUsersBuilder<'a, S: get_suggested_users_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSuggestedUsers<'a> {
@@ -106,9 +109,9 @@ impl<'a> GetSuggestedUsersBuilder<'a, get_suggested_users_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSuggestedUsersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -116,12 +119,12 @@ impl<'a> GetSuggestedUsersBuilder<'a, get_suggested_users_state::Empty> {
 impl<'a, S: get_suggested_users_state::State> GetSuggestedUsersBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -129,12 +132,12 @@ impl<'a, S: get_suggested_users_state::State> GetSuggestedUsersBuilder<'a, S> {
 impl<'a, S: get_suggested_users_state::State> GetSuggestedUsersBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -146,8 +149,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSuggestedUsers<'a> {
         GetSuggestedUsers {
-            category: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            category: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_users_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_users_skeleton.rs
index bb8f604f..4ee91539 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_users_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_users_skeleton.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -96,9 +99,9 @@ pub struct GetSuggestedUsersSkeletonBuilder<
     'a,
     S: get_suggested_users_skeleton_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSuggestedUsersSkeleton<'a> {
@@ -117,9 +120,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSuggestedUsersSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -130,12 +133,12 @@ impl<
 > GetSuggestedUsersSkeletonBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -146,12 +149,12 @@ impl<
 > GetSuggestedUsersSkeletonBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -162,12 +165,12 @@ impl<
 > GetSuggestedUsersSkeletonBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -179,9 +182,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSuggestedUsersSkeleton<'a> {
         GetSuggestedUsersSkeleton {
-            category: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            viewer: self.__unsafe_private_named.2,
+            category: self._fields.0,
+            limit: self._fields.1,
+            viewer: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_suggestions_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_suggestions_skeleton.rs
index 738aff43..c01ad664 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_suggestions_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_suggestions_skeleton.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -103,14 +106,9 @@ pub mod get_suggestions_skeleton_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSuggestionsSkeletonBuilder<'a, S: get_suggestions_skeleton_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<i64>,
-        Option<Did<'a>>,
-        Option<Did<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<Did<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSuggestionsSkeleton<'a> {
@@ -127,9 +125,9 @@ impl<'a> GetSuggestionsSkeletonBuilder<'a, get_suggestions_skeleton_state::Empty
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSuggestionsSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,12 +135,12 @@ impl<'a> GetSuggestionsSkeletonBuilder<'a, get_suggestions_skeleton_state::Empty
 impl<'a, S: get_suggestions_skeleton_state::State> GetSuggestionsSkeletonBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -150,12 +148,12 @@ impl<'a, S: get_suggestions_skeleton_state::State> GetSuggestionsSkeletonBuilder
 impl<'a, S: get_suggestions_skeleton_state::State> GetSuggestionsSkeletonBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -163,12 +161,12 @@ impl<'a, S: get_suggestions_skeleton_state::State> GetSuggestionsSkeletonBuilder
 impl<'a, S: get_suggestions_skeleton_state::State> GetSuggestionsSkeletonBuilder<'a, S> {
     /// Set the `relativeToDid` field (optional)
     pub fn relative_to_did(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `relativeToDid` field to an Option value (optional)
     pub fn maybe_relative_to_did(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -176,12 +174,12 @@ impl<'a, S: get_suggestions_skeleton_state::State> GetSuggestionsSkeletonBuilder
 impl<'a, S: get_suggestions_skeleton_state::State> GetSuggestionsSkeletonBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -193,10 +191,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSuggestionsSkeleton<'a> {
         GetSuggestionsSkeleton {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            relative_to_did: self.__unsafe_private_named.2,
-            viewer: self.__unsafe_private_named.3,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            relative_to_did: self._fields.2,
+            viewer: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_tagged_suggestions.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_tagged_suggestions.rs
index fead4bfe..abefbc9c 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_tagged_suggestions.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_tagged_suggestions.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -186,63 +189,63 @@ pub mod suggestion_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Tag;
-        type Subject;
         type SubjectType;
+        type Subject;
+        type Tag;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Tag = Unset;
-        type Subject = Unset;
         type SubjectType = Unset;
+        type Subject = Unset;
+        type Tag = Unset;
     }
-    ///State transition - sets the `tag` field to Set
-    pub struct SetTag<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTag<S> {}
-    impl<S: State> State for SetTag<S> {
-        type Tag = Set<members::tag>;
+    ///State transition - sets the `subject_type` field to Set
+    pub struct SetSubjectType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubjectType<S> {}
+    impl<S: State> State for SetSubjectType<S> {
+        type SubjectType = Set<members::subject_type>;
         type Subject = S::Subject;
-        type SubjectType = S::SubjectType;
+        type Tag = S::Tag;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type Tag = S::Tag;
-        type Subject = Set<members::subject>;
         type SubjectType = S::SubjectType;
-    }
-    ///State transition - sets the `subject_type` field to Set
-    pub struct SetSubjectType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubjectType<S> {}
-    impl<S: State> State for SetSubjectType<S> {
+        type Subject = Set<members::subject>;
         type Tag = S::Tag;
+    }
+    ///State transition - sets the `tag` field to Set
+    pub struct SetTag<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTag<S> {}
+    impl<S: State> State for SetTag<S> {
+        type SubjectType = S::SubjectType;
         type Subject = S::Subject;
-        type SubjectType = Set<members::subject_type>;
+        type Tag = Set<members::tag>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `tag` field
-        pub struct tag(());
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `subject_type` field
         pub struct subject_type(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
+        ///Marker type for the `tag` field
+        pub struct tag(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SuggestionBuilder<'a, S: suggestion_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<UriValue<'a>>,
         Option<SuggestionSubjectType<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Suggestion<'a> {
@@ -256,9 +259,9 @@ impl<'a> SuggestionBuilder<'a, suggestion_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SuggestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -273,11 +276,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> SuggestionBuilder<'a, suggestion_state::SetSubject<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SuggestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -292,11 +295,11 @@ where
         mut self,
         value: impl Into<SuggestionSubjectType<'a>>,
     ) -> SuggestionBuilder<'a, suggestion_state::SetSubjectType<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SuggestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -311,11 +314,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SuggestionBuilder<'a, suggestion_state::SetTag<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SuggestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -323,16 +326,16 @@ where
 impl<'a, S> SuggestionBuilder<'a, S>
 where
     S: suggestion_state::State,
-    S::Tag: suggestion_state::IsSet,
-    S::Subject: suggestion_state::IsSet,
     S::SubjectType: suggestion_state::IsSet,
+    S::Subject: suggestion_state::IsSet,
+    S::Tag: suggestion_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Suggestion<'a> {
         Suggestion {
-            subject: self.__unsafe_private_named.0.unwrap(),
-            subject_type: self.__unsafe_private_named.1.unwrap(),
-            tag: self.__unsafe_private_named.2.unwrap(),
+            subject: self._fields.0.unwrap(),
+            subject_type: self._fields.1.unwrap(),
+            tag: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -345,9 +348,9 @@ where
         >,
     ) -> Suggestion<'a> {
         Suggestion {
-            subject: self.__unsafe_private_named.0.unwrap(),
-            subject_type: self.__unsafe_private_named.1.unwrap(),
-            tag: self.__unsafe_private_named.2.unwrap(),
+            subject: self._fields.0.unwrap(),
+            subject_type: self._fields.1.unwrap(),
+            tag: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_trending_topics.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_trending_topics.rs
index 10ca08ac..36f7e9bc 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_trending_topics.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_trending_topics.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -84,9 +87,9 @@ pub mod get_trending_topics_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTrendingTopicsBuilder<'a, S: get_trending_topics_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetTrendingTopics<'a> {
@@ -100,9 +103,9 @@ impl<'a> GetTrendingTopicsBuilder<'a, get_trending_topics_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTrendingTopicsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -110,12 +113,12 @@ impl<'a> GetTrendingTopicsBuilder<'a, get_trending_topics_state::Empty> {
 impl<'a, S: get_trending_topics_state::State> GetTrendingTopicsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -123,12 +126,12 @@ impl<'a, S: get_trending_topics_state::State> GetTrendingTopicsBuilder<'a, S> {
 impl<'a, S: get_trending_topics_state::State> GetTrendingTopicsBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -140,8 +143,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetTrendingTopics<'a> {
         GetTrendingTopics {
-            limit: self.__unsafe_private_named.0,
-            viewer: self.__unsafe_private_named.1,
+            limit: self._fields.0,
+            viewer: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_trends.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_trends.rs
index edfc4755..213681fd 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_trends.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_trends.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
@@ -78,8 +81,8 @@ pub mod get_trends_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTrendsBuilder<S: get_trends_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
 }
 
 impl GetTrends {
@@ -93,8 +96,8 @@ impl GetTrendsBuilder<get_trends_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTrendsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -102,12 +105,12 @@ impl GetTrendsBuilder<get_trends_state::Empty> {
 impl<S: get_trends_state::State> GetTrendsBuilder<S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -118,8 +121,6 @@ where
 {
     /// Build the final struct
     pub fn build(self) -> GetTrends {
-        GetTrends {
-            limit: self.__unsafe_private_named.0,
-        }
+        GetTrends { limit: self._fields.0 }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_trends_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_trends_skeleton.rs
index 41b9500d..b45814ef 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_trends_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_trends_skeleton.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -82,9 +85,9 @@ pub mod get_trends_skeleton_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTrendsSkeletonBuilder<'a, S: get_trends_skeleton_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetTrendsSkeleton<'a> {
@@ -98,9 +101,9 @@ impl<'a> GetTrendsSkeletonBuilder<'a, get_trends_skeleton_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTrendsSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -108,12 +111,12 @@ impl<'a> GetTrendsSkeletonBuilder<'a, get_trends_skeleton_state::Empty> {
 impl<'a, S: get_trends_skeleton_state::State> GetTrendsSkeletonBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -121,12 +124,12 @@ impl<'a, S: get_trends_skeleton_state::State> GetTrendsSkeletonBuilder<'a, S> {
 impl<'a, S: get_trends_skeleton_state::State> GetTrendsSkeletonBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -138,8 +141,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetTrendsSkeleton<'a> {
         GetTrendsSkeleton {
-            limit: self.__unsafe_private_named.0,
-            viewer: self.__unsafe_private_named.1,
+            limit: self._fields.0,
+            viewer: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/init_age_assurance.rs b/crates/jacquard-api/src/app_bsky/unspecced/init_age_assurance.rs
index 17344d40..2dfeb183 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/init_age_assurance.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/init_age_assurance.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/search_actors_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/search_actors_skeleton.rs
index 5e017518..dd488231 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/search_actors_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/search_actors_skeleton.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -145,15 +148,15 @@ pub mod search_actors_skeleton_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchActorsSkeletonBuilder<'a, S: search_actors_skeleton_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<i64>,
         Option<CowStr<'a>>,
         Option<bool>,
         Option<Did<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchActorsSkeleton<'a> {
@@ -170,9 +173,9 @@ impl<'a> SearchActorsSkeletonBuilder<'a, search_actors_skeleton_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchActorsSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,12 +183,12 @@ impl<'a> SearchActorsSkeletonBuilder<'a, search_actors_skeleton_state::Empty> {
 impl<'a, S: search_actors_skeleton_state::State> SearchActorsSkeletonBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -193,12 +196,12 @@ impl<'a, S: search_actors_skeleton_state::State> SearchActorsSkeletonBuilder<'a,
 impl<'a, S: search_actors_skeleton_state::State> SearchActorsSkeletonBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -213,11 +216,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SearchActorsSkeletonBuilder<'a, search_actors_skeleton_state::SetQ<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SearchActorsSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -225,12 +228,12 @@ where
 impl<'a, S: search_actors_skeleton_state::State> SearchActorsSkeletonBuilder<'a, S> {
     /// Set the `typeahead` field (optional)
     pub fn typeahead(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `typeahead` field to an Option value (optional)
     pub fn maybe_typeahead(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -238,12 +241,12 @@ impl<'a, S: search_actors_skeleton_state::State> SearchActorsSkeletonBuilder<'a,
 impl<'a, S: search_actors_skeleton_state::State> SearchActorsSkeletonBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -256,11 +259,11 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchActorsSkeleton<'a> {
         SearchActorsSkeleton {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            q: self.__unsafe_private_named.2.unwrap(),
-            typeahead: self.__unsafe_private_named.3,
-            viewer: self.__unsafe_private_named.4,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            q: self._fields.2.unwrap(),
+            typeahead: self._fields.3,
+            viewer: self._fields.4,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/search_posts_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/search_posts_skeleton.rs
index 835c42b5..8064e205 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/search_posts_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/search_posts_skeleton.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -176,8 +179,8 @@ pub mod search_posts_skeleton_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchPostsSkeletonBuilder<'a, S: search_posts_skeleton_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -192,7 +195,7 @@ pub struct SearchPostsSkeletonBuilder<'a, S: search_posts_skeleton_state::State>
         Option<UriValue<'a>>,
         Option<Did<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchPostsSkeleton<'a> {
@@ -206,8 +209,8 @@ impl<'a> SearchPostsSkeletonBuilder<'a, search_posts_skeleton_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchPostsSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -222,7 +225,7 @@ impl<'a> SearchPostsSkeletonBuilder<'a, search_posts_skeleton_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -230,12 +233,12 @@ impl<'a> SearchPostsSkeletonBuilder<'a, search_posts_skeleton_state::Empty> {
 impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<AtIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<AtIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -243,12 +246,12 @@ impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S
 impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -256,12 +259,12 @@ impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S
 impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S> {
     /// Set the `domain` field (optional)
     pub fn domain(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `domain` field to an Option value (optional)
     pub fn maybe_domain(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -269,12 +272,12 @@ impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S
 impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S> {
     /// Set the `lang` field (optional)
     pub fn lang(mut self, value: impl Into<Option<Language>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `lang` field to an Option value (optional)
     pub fn maybe_lang(mut self, value: Option<Language>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -282,12 +285,12 @@ impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S
 impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -295,12 +298,12 @@ impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S
 impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S> {
     /// Set the `mentions` field (optional)
     pub fn mentions(mut self, value: impl Into<Option<AtIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<AtIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -315,11 +318,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SearchPostsSkeletonBuilder<'a, search_posts_skeleton_state::SetQ<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         SearchPostsSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -327,12 +330,12 @@ where
 impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S> {
     /// Set the `since` field (optional)
     pub fn since(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `since` field to an Option value (optional)
     pub fn maybe_since(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -340,12 +343,12 @@ impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S
 impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S> {
     /// Set the `sort` field (optional)
     pub fn sort(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `sort` field to an Option value (optional)
     pub fn maybe_sort(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -353,12 +356,12 @@ impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S
 impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S> {
     /// Set the `tag` field (optional)
     pub fn tag(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `tag` field to an Option value (optional)
     pub fn maybe_tag(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -366,12 +369,12 @@ impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S
 impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S> {
     /// Set the `until` field (optional)
     pub fn until(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `until` field to an Option value (optional)
     pub fn maybe_until(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -379,12 +382,12 @@ impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S
 impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -392,12 +395,12 @@ impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S
 impl<'a, S: search_posts_skeleton_state::State> SearchPostsSkeletonBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -410,19 +413,19 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchPostsSkeleton<'a> {
         SearchPostsSkeleton {
-            author: self.__unsafe_private_named.0,
-            cursor: self.__unsafe_private_named.1,
-            domain: self.__unsafe_private_named.2,
-            lang: self.__unsafe_private_named.3,
-            limit: self.__unsafe_private_named.4,
-            mentions: self.__unsafe_private_named.5,
-            q: self.__unsafe_private_named.6.unwrap(),
-            since: self.__unsafe_private_named.7,
-            sort: self.__unsafe_private_named.8,
-            tag: self.__unsafe_private_named.9,
-            until: self.__unsafe_private_named.10,
-            url: self.__unsafe_private_named.11,
-            viewer: self.__unsafe_private_named.12,
+            author: self._fields.0,
+            cursor: self._fields.1,
+            domain: self._fields.2,
+            lang: self._fields.3,
+            limit: self._fields.4,
+            mentions: self._fields.5,
+            q: self._fields.6.unwrap(),
+            since: self._fields.7,
+            sort: self._fields.8,
+            tag: self._fields.9,
+            until: self._fields.10,
+            url: self._fields.11,
+            viewer: self._fields.12,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/search_starter_packs_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/search_starter_packs_skeleton.rs
index 28f0f510..067dea71 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/search_starter_packs_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/search_starter_packs_skeleton.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -146,14 +149,9 @@ pub struct SearchStarterPacksSkeletonBuilder<
     'a,
     S: search_starter_packs_skeleton_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<i64>,
-        Option<CowStr<'a>>,
-        Option<Did<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchStarterPacksSkeleton<'a> {
@@ -172,9 +170,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchStarterPacksSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -185,12 +183,12 @@ impl<
 > SearchStarterPacksSkeletonBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -201,12 +199,12 @@ impl<
 > SearchStarterPacksSkeletonBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -224,11 +222,11 @@ where
         'a,
         search_starter_packs_skeleton_state::SetQ<S>,
     > {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SearchStarterPacksSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,12 +237,12 @@ impl<
 > SearchStarterPacksSkeletonBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -257,10 +255,10 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchStarterPacksSkeleton<'a> {
         SearchStarterPacksSkeleton {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            q: self.__unsafe_private_named.2.unwrap(),
-            viewer: self.__unsafe_private_named.3,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            q: self._fields.2.unwrap(),
+            viewer: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/video.rs b/crates/jacquard-api/src/app_bsky/video.rs
index bfc84fbc..6a1e4584 100644
--- a/crates/jacquard-api/src/app_bsky/video.rs
+++ b/crates/jacquard-api/src/app_bsky/video.rs
@@ -9,7 +9,11 @@ pub mod get_job_status;
 pub mod get_upload_limits;
 pub mod upload_video;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -183,49 +187,49 @@ pub mod job_status_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Did;
         type JobId;
+        type Did;
         type State;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Did = Unset;
         type JobId = Unset;
+        type Did = Unset;
         type State = Unset;
     }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Did = Set<members::did>;
-        type JobId = S::JobId;
-        type State = S::State;
-    }
     ///State transition - sets the `job_id` field to Set
     pub struct SetJobId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetJobId<S> {}
     impl<S: State> State for SetJobId<S> {
-        type Did = S::Did;
         type JobId = Set<members::job_id>;
+        type Did = S::Did;
+        type State = S::State;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type JobId = S::JobId;
+        type Did = Set<members::did>;
         type State = S::State;
     }
     ///State transition - sets the `state` field to Set
     pub struct SetState<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetState<S> {}
     impl<S: State> State for SetState<S> {
-        type Did = S::Did;
         type JobId = S::JobId;
+        type Did = S::Did;
         type State = Set<members::state>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `job_id` field
         pub struct job_id(());
+        ///Marker type for the `did` field
+        pub struct did(());
         ///Marker type for the `state` field
         pub struct state(());
     }
@@ -233,8 +237,8 @@ pub mod job_status_state {
 
 /// Builder for constructing an instance of this type
 pub struct JobStatusBuilder<'a, S: job_status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
@@ -243,7 +247,7 @@ pub struct JobStatusBuilder<'a, S: job_status_state::State> {
         Option<i64>,
         Option<JobStatusState<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> JobStatus<'a> {
@@ -257,9 +261,9 @@ impl<'a> JobStatusBuilder<'a, job_status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         JobStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -267,12 +271,12 @@ impl<'a> JobStatusBuilder<'a, job_status_state::Empty> {
 impl<'a, S: job_status_state::State> JobStatusBuilder<'a, S> {
     /// Set the `blob` field (optional)
     pub fn blob(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `blob` field to an Option value (optional)
     pub fn maybe_blob(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -287,11 +291,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> JobStatusBuilder<'a, job_status_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         JobStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -299,12 +303,12 @@ where
 impl<'a, S: job_status_state::State> JobStatusBuilder<'a, S> {
     /// Set the `error` field (optional)
     pub fn error(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `error` field to an Option value (optional)
     pub fn maybe_error(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -319,11 +323,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> JobStatusBuilder<'a, job_status_state::SetJobId<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         JobStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -331,12 +335,12 @@ where
 impl<'a, S: job_status_state::State> JobStatusBuilder<'a, S> {
     /// Set the `message` field (optional)
     pub fn message(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `message` field to an Option value (optional)
     pub fn maybe_message(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -344,12 +348,12 @@ impl<'a, S: job_status_state::State> JobStatusBuilder<'a, S> {
 impl<'a, S: job_status_state::State> JobStatusBuilder<'a, S> {
     /// Set the `progress` field (optional)
     pub fn progress(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `progress` field to an Option value (optional)
     pub fn maybe_progress(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -364,11 +368,11 @@ where
         mut self,
         value: impl Into<JobStatusState<'a>>,
     ) -> JobStatusBuilder<'a, job_status_state::SetState<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         JobStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -376,20 +380,20 @@ where
 impl<'a, S> JobStatusBuilder<'a, S>
 where
     S: job_status_state::State,
-    S::Did: job_status_state::IsSet,
     S::JobId: job_status_state::IsSet,
+    S::Did: job_status_state::IsSet,
     S::State: job_status_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> JobStatus<'a> {
         JobStatus {
-            blob: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            error: self.__unsafe_private_named.2,
-            job_id: self.__unsafe_private_named.3.unwrap(),
-            message: self.__unsafe_private_named.4,
-            progress: self.__unsafe_private_named.5,
-            state: self.__unsafe_private_named.6.unwrap(),
+            blob: self._fields.0,
+            did: self._fields.1.unwrap(),
+            error: self._fields.2,
+            job_id: self._fields.3.unwrap(),
+            message: self._fields.4,
+            progress: self._fields.5,
+            state: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -402,13 +406,13 @@ where
         >,
     ) -> JobStatus<'a> {
         JobStatus {
-            blob: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            error: self.__unsafe_private_named.2,
-            job_id: self.__unsafe_private_named.3.unwrap(),
-            message: self.__unsafe_private_named.4,
-            progress: self.__unsafe_private_named.5,
-            state: self.__unsafe_private_named.6.unwrap(),
+            blob: self._fields.0,
+            did: self._fields.1.unwrap(),
+            error: self._fields.2,
+            job_id: self._fields.3.unwrap(),
+            message: self._fields.4,
+            progress: self._fields.5,
+            state: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_bsky/video/get_job_status.rs b/crates/jacquard-api/src/app_bsky/video/get_job_status.rs
index c48fc3e3..c8b27b56 100644
--- a/crates/jacquard-api/src/app_bsky/video/get_job_status.rs
+++ b/crates/jacquard-api/src/app_bsky/video/get_job_status.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_job_status_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetJobStatusBuilder<'a, S: get_job_status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetJobStatus<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetJobStatusBuilder<'a, get_job_status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetJobStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetJobStatusBuilder<'a, get_job_status_state::SetJobId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetJobStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetJobStatus<'a> {
         GetJobStatus {
-            job_id: self.__unsafe_private_named.0.unwrap(),
+            job_id: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/video/get_upload_limits.rs b/crates/jacquard-api/src/app_bsky/video/get_upload_limits.rs
index d873b30f..fec70bc0 100644
--- a/crates/jacquard-api/src/app_bsky/video/get_upload_limits.rs
+++ b/crates/jacquard-api/src/app_bsky/video/get_upload_limits.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_bsky/video/upload_video.rs b/crates/jacquard-api/src/app_bsky/video/upload_video.rs
index ca7c32bb..51458154 100644
--- a/crates/jacquard-api/src/app_bsky/video/upload_video.rs
+++ b/crates/jacquard-api/src/app_bsky/video/upload_video.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::deps::bytes::Bytes;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_certified.rs b/crates/jacquard-api/src/app_certified.rs
index 4bc5bf02..003b8d1f 100644
--- a/crates/jacquard-api/src/app_certified.rs
+++ b/crates/jacquard-api/src/app_certified.rs
@@ -9,7 +9,11 @@ pub mod actor;
 pub mod badge;
 pub mod location;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -92,9 +96,9 @@ pub mod did_state {
 
 /// Builder for constructing an instance of this type
 pub struct DidBuilder<'a, S: did_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<jacquard_common::types::string::Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<jacquard_common::types::string::Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Did<'a> {
@@ -108,9 +112,9 @@ impl<'a> DidBuilder<'a, did_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DidBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -125,11 +129,11 @@ where
         mut self,
         value: impl Into<jacquard_common::types::string::Did<'a>>,
     ) -> DidBuilder<'a, did_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DidBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,7 +146,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Did<'a> {
         Did {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -155,7 +159,7 @@ where
         >,
     ) -> Did<'a> {
         Did {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_certified/actor/organization.rs b/crates/jacquard-api/src/app_certified/actor/organization.rs
index 3079117d..7920c71a 100644
--- a/crates/jacquard-api/src/app_certified/actor/organization.rs
+++ b/crates/jacquard-api/src/app_certified/actor/organization.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -234,15 +237,15 @@ pub mod organization_state {
 
 /// Builder for constructing an instance of this type
 pub struct OrganizationBuilder<'a, S: organization_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<StrongRef<'a>>,
         Option<Vec<CowStr<'a>>>,
         Option<Vec<organization::UrlItem<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Organization<'a> {
@@ -256,9 +259,9 @@ impl<'a> OrganizationBuilder<'a, organization_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OrganizationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -273,11 +276,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> OrganizationBuilder<'a, organization_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         OrganizationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -285,12 +288,12 @@ where
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `foundedDate` field (optional)
     pub fn founded_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `foundedDate` field to an Option value (optional)
     pub fn maybe_founded_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -298,12 +301,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -314,12 +317,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<CowStr<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `organizationType` field to an Option value (optional)
     pub fn maybe_organization_type(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -330,12 +333,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<organization::UrlItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `urls` field to an Option value (optional)
     pub fn maybe_urls(mut self, value: Option<Vec<organization::UrlItem<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -348,11 +351,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Organization<'a> {
         Organization {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            founded_date: self.__unsafe_private_named.1,
-            location: self.__unsafe_private_named.2,
-            organization_type: self.__unsafe_private_named.3,
-            urls: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            founded_date: self._fields.1,
+            location: self._fields.2,
+            organization_type: self._fields.3,
+            urls: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -365,11 +368,11 @@ where
         >,
     ) -> Organization<'a> {
         Organization {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            founded_date: self.__unsafe_private_named.1,
-            location: self.__unsafe_private_named.2,
-            organization_type: self.__unsafe_private_named.3,
-            urls: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            founded_date: self._fields.1,
+            location: self._fields.2,
+            organization_type: self._fields.3,
+            urls: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
@@ -545,9 +548,9 @@ pub mod url_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct UrlItemBuilder<'a, S: url_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UrlItem<'a> {
@@ -561,9 +564,9 @@ impl<'a> UrlItemBuilder<'a, url_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UrlItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -571,12 +574,12 @@ impl<'a> UrlItemBuilder<'a, url_item_state::Empty> {
 impl<'a, S: url_item_state::State> UrlItemBuilder<'a, S> {
     /// Set the `label` field (optional)
     pub fn label(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `label` field to an Option value (optional)
     pub fn maybe_label(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -591,11 +594,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> UrlItemBuilder<'a, url_item_state::SetUrl<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UrlItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -608,8 +611,8 @@ where
     /// Build the final struct
     pub fn build(self) -> UrlItem<'a> {
         UrlItem {
-            label: self.__unsafe_private_named.0,
-            url: self.__unsafe_private_named.1.unwrap(),
+            label: self._fields.0,
+            url: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -622,8 +625,8 @@ where
         >,
     ) -> UrlItem<'a> {
         UrlItem {
-            label: self.__unsafe_private_named.0,
-            url: self.__unsafe_private_named.1.unwrap(),
+            label: self._fields.0,
+            url: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_certified/actor/profile.rs b/crates/jacquard-api/src/app_certified/actor/profile.rs
index f07abacf..74f33cdf 100644
--- a/crates/jacquard-api/src/app_certified/actor/profile.rs
+++ b/crates/jacquard-api/src/app_certified/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -248,8 +251,8 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileAvatar<'a>>,
         Option<ProfileBanner<'a>>,
         Option<Datetime>,
@@ -258,7 +261,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -272,9 +275,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -282,12 +285,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<ProfileAvatar<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<ProfileAvatar<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -295,12 +298,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<ProfileBanner<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<ProfileBanner<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -315,11 +318,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ProfileBuilder<'a, profile_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -327,12 +330,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -340,12 +343,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -353,12 +356,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `pronouns` field (optional)
     pub fn pronouns(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `pronouns` field to an Option value (optional)
     pub fn maybe_pronouns(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -366,12 +369,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `website` field (optional)
     pub fn website(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `website` field to an Option value (optional)
     pub fn maybe_website(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -384,13 +387,13 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4,
-            pronouns: self.__unsafe_private_named.5,
-            website: self.__unsafe_private_named.6,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            display_name: self._fields.4,
+            pronouns: self._fields.5,
+            website: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -403,13 +406,13 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4,
-            pronouns: self.__unsafe_private_named.5,
-            website: self.__unsafe_private_named.6,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            display_name: self._fields.4,
+            pronouns: self._fields.5,
+            website: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_certified/badge/award.rs b/crates/jacquard-api/src/app_certified/badge/award.rs
index 95c959e4..1d0144cb 100644
--- a/crates/jacquard-api/src/app_certified/badge/award.rs
+++ b/crates/jacquard-api/src/app_certified/badge/award.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -157,64 +160,64 @@ pub mod award_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Subject;
-        type CreatedAt;
         type Badge;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Subject = Unset;
-        type CreatedAt = Unset;
         type Badge = Unset;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
         type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
-        type Badge = S::Badge;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
-        type CreatedAt = Set<members::created_at>;
         type Badge = S::Badge;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `badge` field to Set
     pub struct SetBadge<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBadge<S> {}
     impl<S: State> State for SetBadge<S> {
         type Subject = S::Subject;
-        type CreatedAt = S::CreatedAt;
         type Badge = Set<members::badge>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type Badge = S::Badge;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `subject` field
         pub struct subject(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `badge` field
         pub struct badge(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AwardBuilder<'a, S: award_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Definition<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<AwardSubject<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Award<'a> {
@@ -228,9 +231,9 @@ impl<'a> AwardBuilder<'a, award_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AwardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -245,11 +248,11 @@ where
         mut self,
         value: impl Into<Definition<'a>>,
     ) -> AwardBuilder<'a, award_state::SetBadge<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AwardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -264,11 +267,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AwardBuilder<'a, award_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AwardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -276,12 +279,12 @@ where
 impl<'a, S: award_state::State> AwardBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -296,11 +299,11 @@ where
         mut self,
         value: impl Into<AwardSubject<'a>>,
     ) -> AwardBuilder<'a, award_state::SetSubject<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         AwardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -308,12 +311,12 @@ where
 impl<'a, S: award_state::State> AwardBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -322,17 +325,17 @@ impl<'a, S> AwardBuilder<'a, S>
 where
     S: award_state::State,
     S::Subject: award_state::IsSet,
-    S::CreatedAt: award_state::IsSet,
     S::Badge: award_state::IsSet,
+    S::CreatedAt: award_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Award<'a> {
         Award {
-            badge: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            note: self.__unsafe_private_named.2,
-            subject: self.__unsafe_private_named.3.unwrap(),
-            url: self.__unsafe_private_named.4,
+            badge: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            note: self._fields.2,
+            subject: self._fields.3.unwrap(),
+            url: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -345,11 +348,11 @@ where
         >,
     ) -> Award<'a> {
         Award {
-            badge: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            note: self.__unsafe_private_named.2,
-            subject: self.__unsafe_private_named.3.unwrap(),
-            url: self.__unsafe_private_named.4,
+            badge: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            note: self._fields.2,
+            subject: self._fields.3.unwrap(),
+            url: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_certified/badge/definition.rs b/crates/jacquard-api/src/app_certified/badge/definition.rs
index a5fc59e1..2644baf0 100644
--- a/crates/jacquard-api/src/app_certified/badge/definition.rs
+++ b/crates/jacquard-api/src/app_certified/badge/definition.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -228,65 +231,65 @@ pub mod definition_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type BadgeType;
-        type Icon;
         type CreatedAt;
+        type Icon;
+        type BadgeType;
         type Title;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type BadgeType = Unset;
-        type Icon = Unset;
         type CreatedAt = Unset;
+        type Icon = Unset;
+        type BadgeType = Unset;
         type Title = Unset;
     }
-    ///State transition - sets the `badge_type` field to Set
-    pub struct SetBadgeType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBadgeType<S> {}
-    impl<S: State> State for SetBadgeType<S> {
-        type BadgeType = Set<members::badge_type>;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
         type Icon = S::Icon;
-        type CreatedAt = S::CreatedAt;
+        type BadgeType = S::BadgeType;
         type Title = S::Title;
     }
     ///State transition - sets the `icon` field to Set
     pub struct SetIcon<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIcon<S> {}
     impl<S: State> State for SetIcon<S> {
-        type BadgeType = S::BadgeType;
-        type Icon = Set<members::icon>;
         type CreatedAt = S::CreatedAt;
+        type Icon = Set<members::icon>;
+        type BadgeType = S::BadgeType;
         type Title = S::Title;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type BadgeType = S::BadgeType;
+    ///State transition - sets the `badge_type` field to Set
+    pub struct SetBadgeType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBadgeType<S> {}
+    impl<S: State> State for SetBadgeType<S> {
+        type CreatedAt = S::CreatedAt;
         type Icon = S::Icon;
-        type CreatedAt = Set<members::created_at>;
+        type BadgeType = Set<members::badge_type>;
         type Title = S::Title;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type BadgeType = S::BadgeType;
-        type Icon = S::Icon;
         type CreatedAt = S::CreatedAt;
+        type Icon = S::Icon;
+        type BadgeType = S::BadgeType;
         type Title = Set<members::title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `badge_type` field
-        pub struct badge_type(());
-        ///Marker type for the `icon` field
-        pub struct icon(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `icon` field
+        pub struct icon(());
+        ///Marker type for the `badge_type` field
+        pub struct badge_type(());
         ///Marker type for the `title` field
         pub struct title(());
     }
@@ -294,8 +297,8 @@ pub mod definition_state {
 
 /// Builder for constructing an instance of this type
 pub struct DefinitionBuilder<'a, S: definition_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<Did<'a>>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -303,7 +306,7 @@ pub struct DefinitionBuilder<'a, S: definition_state::State> {
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Definition<'a> {
@@ -317,9 +320,9 @@ impl<'a> DefinitionBuilder<'a, definition_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -327,12 +330,12 @@ impl<'a> DefinitionBuilder<'a, definition_state::Empty> {
 impl<'a, S: definition_state::State> DefinitionBuilder<'a, S> {
     /// Set the `allowedIssuers` field (optional)
     pub fn allowed_issuers(mut self, value: impl Into<Option<Vec<Did<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `allowedIssuers` field to an Option value (optional)
     pub fn maybe_allowed_issuers(mut self, value: Option<Vec<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -347,11 +350,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DefinitionBuilder<'a, definition_state::SetBadgeType<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -366,11 +369,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DefinitionBuilder<'a, definition_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         DefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -378,12 +381,12 @@ where
 impl<'a, S: definition_state::State> DefinitionBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -398,11 +401,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> DefinitionBuilder<'a, definition_state::SetIcon<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         DefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -417,11 +420,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DefinitionBuilder<'a, definition_state::SetTitle<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         DefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -429,20 +432,20 @@ where
 impl<'a, S> DefinitionBuilder<'a, S>
 where
     S: definition_state::State,
-    S::BadgeType: definition_state::IsSet,
-    S::Icon: definition_state::IsSet,
     S::CreatedAt: definition_state::IsSet,
+    S::Icon: definition_state::IsSet,
+    S::BadgeType: definition_state::IsSet,
     S::Title: definition_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Definition<'a> {
         Definition {
-            allowed_issuers: self.__unsafe_private_named.0,
-            badge_type: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            icon: self.__unsafe_private_named.4.unwrap(),
-            title: self.__unsafe_private_named.5.unwrap(),
+            allowed_issuers: self._fields.0,
+            badge_type: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            icon: self._fields.4.unwrap(),
+            title: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -455,12 +458,12 @@ where
         >,
     ) -> Definition<'a> {
         Definition {
-            allowed_issuers: self.__unsafe_private_named.0,
-            badge_type: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            icon: self.__unsafe_private_named.4.unwrap(),
-            title: self.__unsafe_private_named.5.unwrap(),
+            allowed_issuers: self._fields.0,
+            badge_type: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            icon: self._fields.4.unwrap(),
+            title: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_certified/badge/response.rs b/crates/jacquard-api/src/app_certified/badge/response.rs
index 46e6cdd6..0c1025de 100644
--- a/crates/jacquard-api/src/app_certified/badge/response.rs
+++ b/crates/jacquard-api/src/app_certified/badge/response.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -218,64 +221,64 @@ pub mod response_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type BadgeAward;
-        type Response;
         type CreatedAt;
+        type Response;
+        type BadgeAward;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type BadgeAward = Unset;
-        type Response = Unset;
         type CreatedAt = Unset;
+        type Response = Unset;
+        type BadgeAward = Unset;
     }
-    ///State transition - sets the `badge_award` field to Set
-    pub struct SetBadgeAward<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBadgeAward<S> {}
-    impl<S: State> State for SetBadgeAward<S> {
-        type BadgeAward = Set<members::badge_award>;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
         type Response = S::Response;
-        type CreatedAt = S::CreatedAt;
+        type BadgeAward = S::BadgeAward;
     }
     ///State transition - sets the `response` field to Set
     pub struct SetResponse<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetResponse<S> {}
     impl<S: State> State for SetResponse<S> {
-        type BadgeAward = S::BadgeAward;
-        type Response = Set<members::response>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+        type Response = Set<members::response>;
         type BadgeAward = S::BadgeAward;
+    }
+    ///State transition - sets the `badge_award` field to Set
+    pub struct SetBadgeAward<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBadgeAward<S> {}
+    impl<S: State> State for SetBadgeAward<S> {
+        type CreatedAt = S::CreatedAt;
         type Response = S::Response;
-        type CreatedAt = Set<members::created_at>;
+        type BadgeAward = Set<members::badge_award>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `badge_award` field
-        pub struct badge_award(());
-        ///Marker type for the `response` field
-        pub struct response(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `response` field
+        pub struct response(());
+        ///Marker type for the `badge_award` field
+        pub struct badge_award(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ResponseBuilder<'a, S: response_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Award<'a>>,
         Option<Datetime>,
         Option<ResponseResponse<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Response<'a> {
@@ -289,9 +292,9 @@ impl<'a> ResponseBuilder<'a, response_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -306,11 +309,11 @@ where
         mut self,
         value: impl Into<Award<'a>>,
     ) -> ResponseBuilder<'a, response_state::SetBadgeAward<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -325,11 +328,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ResponseBuilder<'a, response_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -344,11 +347,11 @@ where
         mut self,
         value: impl Into<ResponseResponse<'a>>,
     ) -> ResponseBuilder<'a, response_state::SetResponse<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -356,12 +359,12 @@ where
 impl<'a, S: response_state::State> ResponseBuilder<'a, S> {
     /// Set the `weight` field (optional)
     pub fn weight(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `weight` field to an Option value (optional)
     pub fn maybe_weight(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -369,17 +372,17 @@ impl<'a, S: response_state::State> ResponseBuilder<'a, S> {
 impl<'a, S> ResponseBuilder<'a, S>
 where
     S: response_state::State,
-    S::BadgeAward: response_state::IsSet,
-    S::Response: response_state::IsSet,
     S::CreatedAt: response_state::IsSet,
+    S::Response: response_state::IsSet,
+    S::BadgeAward: response_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Response<'a> {
         Response {
-            badge_award: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            response: self.__unsafe_private_named.2.unwrap(),
-            weight: self.__unsafe_private_named.3,
+            badge_award: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            response: self._fields.2.unwrap(),
+            weight: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -392,10 +395,10 @@ where
         >,
     ) -> Response<'a> {
         Response {
-            badge_award: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            response: self.__unsafe_private_named.2.unwrap(),
-            weight: self.__unsafe_private_named.3,
+            badge_award: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            response: self._fields.2.unwrap(),
+            weight: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_certified/location.rs b/crates/jacquard-api/src/app_certified/location.rs
index 7e9e7d74..de6f0b46 100644
--- a/crates/jacquard-api/src/app_certified/location.rs
+++ b/crates/jacquard-api/src/app_certified/location.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -397,92 +400,92 @@ pub mod location_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Srs;
-        type CreatedAt;
         type Location;
-        type LocationType;
         type LpVersion;
+        type CreatedAt;
+        type LocationType;
+        type Srs;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Srs = Unset;
-        type CreatedAt = Unset;
         type Location = Unset;
-        type LocationType = Unset;
         type LpVersion = Unset;
+        type CreatedAt = Unset;
+        type LocationType = Unset;
+        type Srs = Unset;
     }
-    ///State transition - sets the `srs` field to Set
-    pub struct SetSrs<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSrs<S> {}
-    impl<S: State> State for SetSrs<S> {
-        type Srs = Set<members::srs>;
+    ///State transition - sets the `location` field to Set
+    pub struct SetLocation<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLocation<S> {}
+    impl<S: State> State for SetLocation<S> {
+        type Location = Set<members::location>;
+        type LpVersion = S::LpVersion;
         type CreatedAt = S::CreatedAt;
+        type LocationType = S::LocationType;
+        type Srs = S::Srs;
+    }
+    ///State transition - sets the `lp_version` field to Set
+    pub struct SetLpVersion<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLpVersion<S> {}
+    impl<S: State> State for SetLpVersion<S> {
         type Location = S::Location;
+        type LpVersion = Set<members::lp_version>;
+        type CreatedAt = S::CreatedAt;
         type LocationType = S::LocationType;
-        type LpVersion = S::LpVersion;
+        type Srs = S::Srs;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Srs = S::Srs;
-        type CreatedAt = Set<members::created_at>;
         type Location = S::Location;
-        type LocationType = S::LocationType;
         type LpVersion = S::LpVersion;
-    }
-    ///State transition - sets the `location` field to Set
-    pub struct SetLocation<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLocation<S> {}
-    impl<S: State> State for SetLocation<S> {
-        type Srs = S::Srs;
-        type CreatedAt = S::CreatedAt;
-        type Location = Set<members::location>;
+        type CreatedAt = Set<members::created_at>;
         type LocationType = S::LocationType;
-        type LpVersion = S::LpVersion;
+        type Srs = S::Srs;
     }
     ///State transition - sets the `location_type` field to Set
     pub struct SetLocationType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLocationType<S> {}
     impl<S: State> State for SetLocationType<S> {
-        type Srs = S::Srs;
-        type CreatedAt = S::CreatedAt;
         type Location = S::Location;
-        type LocationType = Set<members::location_type>;
         type LpVersion = S::LpVersion;
-    }
-    ///State transition - sets the `lp_version` field to Set
-    pub struct SetLpVersion<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLpVersion<S> {}
-    impl<S: State> State for SetLpVersion<S> {
-        type Srs = S::Srs;
         type CreatedAt = S::CreatedAt;
+        type LocationType = Set<members::location_type>;
+        type Srs = S::Srs;
+    }
+    ///State transition - sets the `srs` field to Set
+    pub struct SetSrs<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSrs<S> {}
+    impl<S: State> State for SetSrs<S> {
         type Location = S::Location;
+        type LpVersion = S::LpVersion;
+        type CreatedAt = S::CreatedAt;
         type LocationType = S::LocationType;
-        type LpVersion = Set<members::lp_version>;
+        type Srs = Set<members::srs>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `srs` field
-        pub struct srs(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `location` field
         pub struct location(());
-        ///Marker type for the `location_type` field
-        pub struct location_type(());
         ///Marker type for the `lp_version` field
         pub struct lp_version(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `location_type` field
+        pub struct location_type(());
+        ///Marker type for the `srs` field
+        pub struct srs(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LocationBuilder<'a, S: location_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<LocationLocation<'a>>,
@@ -491,7 +494,7 @@ pub struct LocationBuilder<'a, S: location_state::State> {
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Location<'a> {
@@ -505,9 +508,9 @@ impl<'a> LocationBuilder<'a, location_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LocationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -522,11 +525,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LocationBuilder<'a, location_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LocationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -534,12 +537,12 @@ where
 impl<'a, S: location_state::State> LocationBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -554,11 +557,11 @@ where
         mut self,
         value: impl Into<LocationLocation<'a>>,
     ) -> LocationBuilder<'a, location_state::SetLocation<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LocationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -573,11 +576,11 @@ where
         mut self,
         value: impl Into<LocationLocationType<'a>>,
     ) -> LocationBuilder<'a, location_state::SetLocationType<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LocationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -592,11 +595,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LocationBuilder<'a, location_state::SetLpVersion<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         LocationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -604,12 +607,12 @@ where
 impl<'a, S: location_state::State> LocationBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -624,11 +627,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LocationBuilder<'a, location_state::SetSrs<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         LocationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -636,22 +639,22 @@ where
 impl<'a, S> LocationBuilder<'a, S>
 where
     S: location_state::State,
-    S::Srs: location_state::IsSet,
-    S::CreatedAt: location_state::IsSet,
     S::Location: location_state::IsSet,
-    S::LocationType: location_state::IsSet,
     S::LpVersion: location_state::IsSet,
+    S::CreatedAt: location_state::IsSet,
+    S::LocationType: location_state::IsSet,
+    S::Srs: location_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Location<'a> {
         Location {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            location: self.__unsafe_private_named.2.unwrap(),
-            location_type: self.__unsafe_private_named.3.unwrap(),
-            lp_version: self.__unsafe_private_named.4.unwrap(),
-            name: self.__unsafe_private_named.5,
-            srs: self.__unsafe_private_named.6.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            location: self._fields.2.unwrap(),
+            location_type: self._fields.3.unwrap(),
+            lp_version: self._fields.4.unwrap(),
+            name: self._fields.5,
+            srs: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -664,13 +667,13 @@ where
         >,
     ) -> Location<'a> {
         Location {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            location: self.__unsafe_private_named.2.unwrap(),
-            location_type: self.__unsafe_private_named.3.unwrap(),
-            lp_version: self.__unsafe_private_named.4.unwrap(),
-            name: self.__unsafe_private_named.5,
-            srs: self.__unsafe_private_named.6.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            location: self._fields.2.unwrap(),
+            location_type: self._fields.3.unwrap(),
+            lp_version: self._fields.4.unwrap(),
+            name: self._fields.5,
+            srs: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_chavatar/avatar.rs b/crates/jacquard-api/src/app_chavatar/avatar.rs
index 6c215814..9d8ec37f 100644
--- a/crates/jacquard-api/src/app_chavatar/avatar.rs
+++ b/crates/jacquard-api/src/app_chavatar/avatar.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -152,45 +155,45 @@ pub mod avatar_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Avatar;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Avatar = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Avatar = S::Avatar;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `avatar` field to Set
     pub struct SetAvatar<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAvatar<S> {}
     impl<S: State> State for SetAvatar<S> {
-        type CreatedAt = S::CreatedAt;
         type Avatar = Set<members::avatar>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Avatar = S::Avatar;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `avatar` field
         pub struct avatar(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AvatarBuilder<'a, S: avatar_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Avatar<'a> {
@@ -204,9 +207,9 @@ impl<'a> AvatarBuilder<'a, avatar_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AvatarBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,11 +224,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> AvatarBuilder<'a, avatar_state::SetAvatar<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AvatarBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -240,11 +243,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AvatarBuilder<'a, avatar_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AvatarBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -252,14 +255,14 @@ where
 impl<'a, S> AvatarBuilder<'a, S>
 where
     S: avatar_state::State,
-    S::CreatedAt: avatar_state::IsSet,
     S::Avatar: avatar_state::IsSet,
+    S::CreatedAt: avatar_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Avatar<'a> {
         Avatar {
-            avatar: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
+            avatar: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -272,8 +275,8 @@ where
         >,
     ) -> Avatar<'a> {
         Avatar {
-            avatar: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
+            avatar: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_chavatar/settings.rs b/crates/jacquard-api/src/app_chavatar/settings.rs
index 4f58f752..13bf890d 100644
--- a/crates/jacquard-api/src/app_chavatar/settings.rs
+++ b/crates/jacquard-api/src/app_chavatar/settings.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -376,45 +379,45 @@ pub mod avatar_item_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Image;
         type Id;
+        type Image;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Image = Unset;
         type Id = Unset;
-    }
-    ///State transition - sets the `image` field to Set
-    pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetImage<S> {}
-    impl<S: State> State for SetImage<S> {
-        type Image = Set<members::image>;
-        type Id = S::Id;
+        type Image = Unset;
     }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetId<S> {}
     impl<S: State> State for SetId<S> {
-        type Image = S::Image;
         type Id = Set<members::id>;
+        type Image = S::Image;
+    }
+    ///State transition - sets the `image` field to Set
+    pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetImage<S> {}
+    impl<S: State> State for SetImage<S> {
+        type Id = S::Id;
+        type Image = Set<members::image>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `image` field
-        pub struct image(());
         ///Marker type for the `id` field
         pub struct id(());
+        ///Marker type for the `image` field
+        pub struct image(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AvatarItemBuilder<'a, S: avatar_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AvatarItem<'a> {
@@ -428,9 +431,9 @@ impl<'a> AvatarItemBuilder<'a, avatar_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AvatarItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -445,11 +448,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AvatarItemBuilder<'a, avatar_item_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AvatarItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -464,11 +467,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> AvatarItemBuilder<'a, avatar_item_state::SetImage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AvatarItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -476,14 +479,14 @@ where
 impl<'a, S> AvatarItemBuilder<'a, S>
 where
     S: avatar_item_state::State,
-    S::Image: avatar_item_state::IsSet,
     S::Id: avatar_item_state::IsSet,
+    S::Image: avatar_item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AvatarItem<'a> {
         AvatarItem {
-            id: self.__unsafe_private_named.0.unwrap(),
-            image: self.__unsafe_private_named.1.unwrap(),
+            id: self._fields.0.unwrap(),
+            image: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -496,8 +499,8 @@ where
         >,
     ) -> AvatarItem<'a> {
         AvatarItem {
-            id: self.__unsafe_private_named.0.unwrap(),
-            image: self.__unsafe_private_named.1.unwrap(),
+            id: self._fields.0.unwrap(),
+            image: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -612,80 +615,80 @@ pub mod settings_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Interval;
-        type Enabled;
         type Mode;
         type Avatars;
+        type Enabled;
+        type Interval;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Interval = Unset;
-        type Enabled = Unset;
         type Mode = Unset;
         type Avatars = Unset;
-    }
-    ///State transition - sets the `interval` field to Set
-    pub struct SetInterval<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetInterval<S> {}
-    impl<S: State> State for SetInterval<S> {
-        type Interval = Set<members::interval>;
-        type Enabled = S::Enabled;
-        type Mode = S::Mode;
-        type Avatars = S::Avatars;
-    }
-    ///State transition - sets the `enabled` field to Set
-    pub struct SetEnabled<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetEnabled<S> {}
-    impl<S: State> State for SetEnabled<S> {
-        type Interval = S::Interval;
-        type Enabled = Set<members::enabled>;
-        type Mode = S::Mode;
-        type Avatars = S::Avatars;
+        type Enabled = Unset;
+        type Interval = Unset;
     }
     ///State transition - sets the `mode` field to Set
     pub struct SetMode<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMode<S> {}
     impl<S: State> State for SetMode<S> {
-        type Interval = S::Interval;
-        type Enabled = S::Enabled;
         type Mode = Set<members::mode>;
         type Avatars = S::Avatars;
+        type Enabled = S::Enabled;
+        type Interval = S::Interval;
     }
     ///State transition - sets the `avatars` field to Set
     pub struct SetAvatars<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAvatars<S> {}
     impl<S: State> State for SetAvatars<S> {
-        type Interval = S::Interval;
-        type Enabled = S::Enabled;
         type Mode = S::Mode;
         type Avatars = Set<members::avatars>;
+        type Enabled = S::Enabled;
+        type Interval = S::Interval;
+    }
+    ///State transition - sets the `enabled` field to Set
+    pub struct SetEnabled<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetEnabled<S> {}
+    impl<S: State> State for SetEnabled<S> {
+        type Mode = S::Mode;
+        type Avatars = S::Avatars;
+        type Enabled = Set<members::enabled>;
+        type Interval = S::Interval;
+    }
+    ///State transition - sets the `interval` field to Set
+    pub struct SetInterval<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetInterval<S> {}
+    impl<S: State> State for SetInterval<S> {
+        type Mode = S::Mode;
+        type Avatars = S::Avatars;
+        type Enabled = S::Enabled;
+        type Interval = Set<members::interval>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `interval` field
-        pub struct interval(());
-        ///Marker type for the `enabled` field
-        pub struct enabled(());
         ///Marker type for the `mode` field
         pub struct mode(());
         ///Marker type for the `avatars` field
         pub struct avatars(());
+        ///Marker type for the `enabled` field
+        pub struct enabled(());
+        ///Marker type for the `interval` field
+        pub struct interval(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SettingsBuilder<'a, S: settings_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<settings::AvatarItem<'a>>>,
         Option<bool>,
         Option<SettingsInterval<'a>>,
         Option<SettingsMode<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Settings<'a> {
@@ -699,9 +702,9 @@ impl<'a> SettingsBuilder<'a, settings_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -716,11 +719,11 @@ where
         mut self,
         value: impl Into<Vec<settings::AvatarItem<'a>>>,
     ) -> SettingsBuilder<'a, settings_state::SetAvatars<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -735,11 +738,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> SettingsBuilder<'a, settings_state::SetEnabled<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -754,11 +757,11 @@ where
         mut self,
         value: impl Into<SettingsInterval<'a>>,
     ) -> SettingsBuilder<'a, settings_state::SetInterval<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -773,11 +776,11 @@ where
         mut self,
         value: impl Into<SettingsMode<'a>>,
     ) -> SettingsBuilder<'a, settings_state::SetMode<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -785,18 +788,18 @@ where
 impl<'a, S> SettingsBuilder<'a, S>
 where
     S: settings_state::State,
-    S::Interval: settings_state::IsSet,
-    S::Enabled: settings_state::IsSet,
     S::Mode: settings_state::IsSet,
     S::Avatars: settings_state::IsSet,
+    S::Enabled: settings_state::IsSet,
+    S::Interval: settings_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Settings<'a> {
         Settings {
-            avatars: self.__unsafe_private_named.0.unwrap(),
-            enabled: self.__unsafe_private_named.1.unwrap(),
-            interval: self.__unsafe_private_named.2.unwrap(),
-            mode: self.__unsafe_private_named.3.unwrap(),
+            avatars: self._fields.0.unwrap(),
+            enabled: self._fields.1.unwrap(),
+            interval: self._fields.2.unwrap(),
+            mode: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -809,10 +812,10 @@ where
         >,
     ) -> Settings<'a> {
         Settings {
-            avatars: self.__unsafe_private_named.0.unwrap(),
-            enabled: self.__unsafe_private_named.1.unwrap(),
-            interval: self.__unsafe_private_named.2.unwrap(),
-            mode: self.__unsafe_private_named.3.unwrap(),
+            avatars: self._fields.0.unwrap(),
+            enabled: self._fields.1.unwrap(),
+            interval: self._fields.2.unwrap(),
+            mode: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_chavatar/state.rs b/crates/jacquard-api/src/app_chavatar/state.rs
index b8682e0b..ec9e88e9 100644
--- a/crates/jacquard-api/src/app_chavatar/state.rs
+++ b/crates/jacquard-api/src/app_chavatar/state.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -157,9 +160,9 @@ pub mod state_state {
 
 /// Builder for constructing an instance of this type
 pub struct StateBuilder<'a, S: state_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> State<'a> {
@@ -173,9 +176,9 @@ impl<'a> StateBuilder<'a, state_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -190,11 +193,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> StateBuilder<'a, state_state::SetCursor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,11 +212,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StateBuilder<'a, state_state::SetLastUpdated<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -227,8 +230,8 @@ where
     /// Build the final struct
     pub fn build(self) -> State<'a> {
         State {
-            cursor: self.__unsafe_private_named.0.unwrap(),
-            last_updated: self.__unsafe_private_named.1.unwrap(),
+            cursor: self._fields.0.unwrap(),
+            last_updated: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -241,8 +244,8 @@ where
         >,
     ) -> State<'a> {
         State {
-            cursor: self.__unsafe_private_named.0.unwrap(),
-            last_updated: self.__unsafe_private_named.1.unwrap(),
+            cursor: self._fields.0.unwrap(),
+            last_updated: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_chronosky/media/get_blob.rs b/crates/jacquard-api/src/app_chronosky/media/get_blob.rs
index 527ac67d..864c2488 100644
--- a/crates/jacquard-api/src/app_chronosky/media/get_blob.rs
+++ b/crates/jacquard-api/src/app_chronosky/media/get_blob.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -145,9 +146,9 @@ pub mod get_blob_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetBlobBuilder<'a, S: get_blob_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetBlob<'a> {
@@ -161,9 +162,9 @@ impl<'a> GetBlobBuilder<'a, get_blob_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetBlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +179,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetBlobBuilder<'a, get_blob_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetBlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -195,7 +196,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetBlob<'a> {
         GetBlob {
-            cid: self.__unsafe_private_named.0.unwrap(),
+            cid: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_chronosky/media/upload_blob.rs b/crates/jacquard-api/src/app_chronosky/media/upload_blob.rs
index 6d20331a..829e661e 100644
--- a/crates/jacquard-api/src/app_chronosky/media/upload_blob.rs
+++ b/crates/jacquard-api/src/app_chronosky/media/upload_blob.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
diff --git a/crates/jacquard-api/src/app_chronosky/plan/get_assignment.rs b/crates/jacquard-api/src/app_chronosky/plan/get_assignment.rs
index 5b619ca8..9023c94f 100644
--- a/crates/jacquard-api/src/app_chronosky/plan/get_assignment.rs
+++ b/crates/jacquard-api/src/app_chronosky/plan/get_assignment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -282,112 +285,112 @@ pub mod plan_assignment_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Id;
-        type ActivatedAt;
-        type ExpiresAt;
         type Status;
+        type Id;
         type PlanId;
         type Plan;
+        type ActivatedAt;
+        type ExpiresAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Id = Unset;
-        type ActivatedAt = Unset;
-        type ExpiresAt = Unset;
         type Status = Unset;
+        type Id = Unset;
         type PlanId = Unset;
         type Plan = Unset;
-    }
-    ///State transition - sets the `id` field to Set
-    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetId<S> {}
-    impl<S: State> State for SetId<S> {
-        type Id = Set<members::id>;
-        type ActivatedAt = S::ActivatedAt;
-        type ExpiresAt = S::ExpiresAt;
-        type Status = S::Status;
-        type PlanId = S::PlanId;
-        type Plan = S::Plan;
-    }
-    ///State transition - sets the `activated_at` field to Set
-    pub struct SetActivatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetActivatedAt<S> {}
-    impl<S: State> State for SetActivatedAt<S> {
-        type Id = S::Id;
-        type ActivatedAt = Set<members::activated_at>;
-        type ExpiresAt = S::ExpiresAt;
-        type Status = S::Status;
-        type PlanId = S::PlanId;
-        type Plan = S::Plan;
-    }
-    ///State transition - sets the `expires_at` field to Set
-    pub struct SetExpiresAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetExpiresAt<S> {}
-    impl<S: State> State for SetExpiresAt<S> {
-        type Id = S::Id;
-        type ActivatedAt = S::ActivatedAt;
-        type ExpiresAt = Set<members::expires_at>;
-        type Status = S::Status;
-        type PlanId = S::PlanId;
-        type Plan = S::Plan;
+        type ActivatedAt = Unset;
+        type ExpiresAt = Unset;
     }
     ///State transition - sets the `status` field to Set
     pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStatus<S> {}
     impl<S: State> State for SetStatus<S> {
+        type Status = Set<members::status>;
         type Id = S::Id;
+        type PlanId = S::PlanId;
+        type Plan = S::Plan;
         type ActivatedAt = S::ActivatedAt;
         type ExpiresAt = S::ExpiresAt;
-        type Status = Set<members::status>;
+    }
+    ///State transition - sets the `id` field to Set
+    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetId<S> {}
+    impl<S: State> State for SetId<S> {
+        type Status = S::Status;
+        type Id = Set<members::id>;
         type PlanId = S::PlanId;
         type Plan = S::Plan;
+        type ActivatedAt = S::ActivatedAt;
+        type ExpiresAt = S::ExpiresAt;
     }
     ///State transition - sets the `plan_id` field to Set
     pub struct SetPlanId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPlanId<S> {}
     impl<S: State> State for SetPlanId<S> {
-        type Id = S::Id;
-        type ActivatedAt = S::ActivatedAt;
-        type ExpiresAt = S::ExpiresAt;
         type Status = S::Status;
+        type Id = S::Id;
         type PlanId = Set<members::plan_id>;
         type Plan = S::Plan;
+        type ActivatedAt = S::ActivatedAt;
+        type ExpiresAt = S::ExpiresAt;
     }
     ///State transition - sets the `plan` field to Set
     pub struct SetPlan<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPlan<S> {}
     impl<S: State> State for SetPlan<S> {
+        type Status = S::Status;
         type Id = S::Id;
+        type PlanId = S::PlanId;
+        type Plan = Set<members::plan>;
         type ActivatedAt = S::ActivatedAt;
         type ExpiresAt = S::ExpiresAt;
+    }
+    ///State transition - sets the `activated_at` field to Set
+    pub struct SetActivatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetActivatedAt<S> {}
+    impl<S: State> State for SetActivatedAt<S> {
         type Status = S::Status;
+        type Id = S::Id;
         type PlanId = S::PlanId;
-        type Plan = Set<members::plan>;
+        type Plan = S::Plan;
+        type ActivatedAt = Set<members::activated_at>;
+        type ExpiresAt = S::ExpiresAt;
+    }
+    ///State transition - sets the `expires_at` field to Set
+    pub struct SetExpiresAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetExpiresAt<S> {}
+    impl<S: State> State for SetExpiresAt<S> {
+        type Status = S::Status;
+        type Id = S::Id;
+        type PlanId = S::PlanId;
+        type Plan = S::Plan;
+        type ActivatedAt = S::ActivatedAt;
+        type ExpiresAt = Set<members::expires_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `id` field
-        pub struct id(());
-        ///Marker type for the `activated_at` field
-        pub struct activated_at(());
-        ///Marker type for the `expires_at` field
-        pub struct expires_at(());
         ///Marker type for the `status` field
         pub struct status(());
+        ///Marker type for the `id` field
+        pub struct id(());
         ///Marker type for the `plan_id` field
         pub struct plan_id(());
         ///Marker type for the `plan` field
         pub struct plan(());
+        ///Marker type for the `activated_at` field
+        pub struct activated_at(());
+        ///Marker type for the `expires_at` field
+        pub struct expires_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PlanAssignmentBuilder<'a, S: plan_assignment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -396,7 +399,7 @@ pub struct PlanAssignmentBuilder<'a, S: plan_assignment_state::State> {
         Option<CowStr<'a>>,
         Option<get_assignment::TicketInfo<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PlanAssignment<'a> {
@@ -410,9 +413,9 @@ impl<'a> PlanAssignmentBuilder<'a, plan_assignment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PlanAssignmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -427,11 +430,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PlanAssignmentBuilder<'a, plan_assignment_state::SetActivatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PlanAssignmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -446,11 +449,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PlanAssignmentBuilder<'a, plan_assignment_state::SetExpiresAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PlanAssignmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -465,11 +468,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PlanAssignmentBuilder<'a, plan_assignment_state::SetId<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PlanAssignmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -484,11 +487,11 @@ where
         mut self,
         value: impl Into<get_assignment::PlanInfo<'a>>,
     ) -> PlanAssignmentBuilder<'a, plan_assignment_state::SetPlan<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PlanAssignmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -503,11 +506,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PlanAssignmentBuilder<'a, plan_assignment_state::SetPlanId<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PlanAssignmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -522,11 +525,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PlanAssignmentBuilder<'a, plan_assignment_state::SetStatus<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         PlanAssignmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -537,7 +540,7 @@ impl<'a, S: plan_assignment_state::State> PlanAssignmentBuilder<'a, S> {
         mut self,
         value: impl Into<Option<get_assignment::TicketInfo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `ticket` field to an Option value (optional)
@@ -545,7 +548,7 @@ impl<'a, S: plan_assignment_state::State> PlanAssignmentBuilder<'a, S> {
         mut self,
         value: Option<get_assignment::TicketInfo<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -553,23 +556,23 @@ impl<'a, S: plan_assignment_state::State> PlanAssignmentBuilder<'a, S> {
 impl<'a, S> PlanAssignmentBuilder<'a, S>
 where
     S: plan_assignment_state::State,
-    S::Id: plan_assignment_state::IsSet,
-    S::ActivatedAt: plan_assignment_state::IsSet,
-    S::ExpiresAt: plan_assignment_state::IsSet,
     S::Status: plan_assignment_state::IsSet,
+    S::Id: plan_assignment_state::IsSet,
     S::PlanId: plan_assignment_state::IsSet,
     S::Plan: plan_assignment_state::IsSet,
+    S::ActivatedAt: plan_assignment_state::IsSet,
+    S::ExpiresAt: plan_assignment_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PlanAssignment<'a> {
         PlanAssignment {
-            activated_at: self.__unsafe_private_named.0.unwrap(),
-            expires_at: self.__unsafe_private_named.1.unwrap(),
-            id: self.__unsafe_private_named.2.unwrap(),
-            plan: self.__unsafe_private_named.3.unwrap(),
-            plan_id: self.__unsafe_private_named.4.unwrap(),
-            status: self.__unsafe_private_named.5.unwrap(),
-            ticket: self.__unsafe_private_named.6,
+            activated_at: self._fields.0.unwrap(),
+            expires_at: self._fields.1.unwrap(),
+            id: self._fields.2.unwrap(),
+            plan: self._fields.3.unwrap(),
+            plan_id: self._fields.4.unwrap(),
+            status: self._fields.5.unwrap(),
+            ticket: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -582,13 +585,13 @@ where
         >,
     ) -> PlanAssignment<'a> {
         PlanAssignment {
-            activated_at: self.__unsafe_private_named.0.unwrap(),
-            expires_at: self.__unsafe_private_named.1.unwrap(),
-            id: self.__unsafe_private_named.2.unwrap(),
-            plan: self.__unsafe_private_named.3.unwrap(),
-            plan_id: self.__unsafe_private_named.4.unwrap(),
-            status: self.__unsafe_private_named.5.unwrap(),
-            ticket: self.__unsafe_private_named.6,
+            activated_at: self._fields.0.unwrap(),
+            expires_at: self._fields.1.unwrap(),
+            id: self._fields.2.unwrap(),
+            plan: self._fields.3.unwrap(),
+            plan_id: self._fields.4.unwrap(),
+            status: self._fields.5.unwrap(),
+            ticket: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_chronosky/plan/get_usage.rs b/crates/jacquard-api/src/app_chronosky/plan/get_usage.rs
index dce6dd9c..1ae44ae8 100644
--- a/crates/jacquard-api/src/app_chronosky/plan/get_usage.rs
+++ b/crates/jacquard-api/src/app_chronosky/plan/get_usage.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -238,91 +241,91 @@ pub mod current_plan_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Name;
-        type DisplayName;
         type Tier;
-        type IsActive;
         type Id;
+        type DisplayName;
+        type IsActive;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Name = Unset;
-        type DisplayName = Unset;
         type Tier = Unset;
-        type IsActive = Unset;
         type Id = Unset;
+        type DisplayName = Unset;
+        type IsActive = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
         type Name = Set<members::name>;
-        type DisplayName = S::DisplayName;
         type Tier = S::Tier;
-        type IsActive = S::IsActive;
         type Id = S::Id;
-    }
-    ///State transition - sets the `display_name` field to Set
-    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
-    impl<S: State> State for SetDisplayName<S> {
-        type Name = S::Name;
-        type DisplayName = Set<members::display_name>;
-        type Tier = S::Tier;
+        type DisplayName = S::DisplayName;
         type IsActive = S::IsActive;
-        type Id = S::Id;
     }
     ///State transition - sets the `tier` field to Set
     pub struct SetTier<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTier<S> {}
     impl<S: State> State for SetTier<S> {
         type Name = S::Name;
-        type DisplayName = S::DisplayName;
         type Tier = Set<members::tier>;
-        type IsActive = S::IsActive;
         type Id = S::Id;
-    }
-    ///State transition - sets the `is_active` field to Set
-    pub struct SetIsActive<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIsActive<S> {}
-    impl<S: State> State for SetIsActive<S> {
-        type Name = S::Name;
         type DisplayName = S::DisplayName;
-        type Tier = S::Tier;
-        type IsActive = Set<members::is_active>;
-        type Id = S::Id;
+        type IsActive = S::IsActive;
     }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetId<S> {}
     impl<S: State> State for SetId<S> {
         type Name = S::Name;
+        type Tier = S::Tier;
+        type Id = Set<members::id>;
         type DisplayName = S::DisplayName;
+        type IsActive = S::IsActive;
+    }
+    ///State transition - sets the `display_name` field to Set
+    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
+    impl<S: State> State for SetDisplayName<S> {
+        type Name = S::Name;
         type Tier = S::Tier;
+        type Id = S::Id;
+        type DisplayName = Set<members::display_name>;
         type IsActive = S::IsActive;
-        type Id = Set<members::id>;
+    }
+    ///State transition - sets the `is_active` field to Set
+    pub struct SetIsActive<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIsActive<S> {}
+    impl<S: State> State for SetIsActive<S> {
+        type Name = S::Name;
+        type Tier = S::Tier;
+        type Id = S::Id;
+        type DisplayName = S::DisplayName;
+        type IsActive = Set<members::is_active>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `display_name` field
-        pub struct display_name(());
         ///Marker type for the `tier` field
         pub struct tier(());
-        ///Marker type for the `is_active` field
-        pub struct is_active(());
         ///Marker type for the `id` field
         pub struct id(());
+        ///Marker type for the `display_name` field
+        pub struct display_name(());
+        ///Marker type for the `is_active` field
+        pub struct is_active(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CurrentPlanBuilder<'a, S: current_plan_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Data<'a>>,
         Option<CowStr<'a>>,
         Option<bool>,
@@ -330,7 +333,7 @@ pub struct CurrentPlanBuilder<'a, S: current_plan_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CurrentPlan<'a> {
@@ -344,9 +347,9 @@ impl<'a> CurrentPlanBuilder<'a, current_plan_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CurrentPlanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -361,11 +364,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> CurrentPlanBuilder<'a, current_plan_state::SetDisplayName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CurrentPlanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -380,11 +383,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CurrentPlanBuilder<'a, current_plan_state::SetId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CurrentPlanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -399,11 +402,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> CurrentPlanBuilder<'a, current_plan_state::SetIsActive<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CurrentPlanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -418,11 +421,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CurrentPlanBuilder<'a, current_plan_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CurrentPlanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -437,11 +440,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CurrentPlanBuilder<'a, current_plan_state::SetTier<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         CurrentPlanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -449,12 +452,12 @@ where
 impl<'a, S: current_plan_state::State> CurrentPlanBuilder<'a, S> {
     /// Set the `validUntil` field (optional)
     pub fn valid_until(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `validUntil` field to an Option value (optional)
     pub fn maybe_valid_until(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -463,20 +466,20 @@ impl<'a, S> CurrentPlanBuilder<'a, S>
 where
     S: current_plan_state::State,
     S::Name: current_plan_state::IsSet,
-    S::DisplayName: current_plan_state::IsSet,
     S::Tier: current_plan_state::IsSet,
-    S::IsActive: current_plan_state::IsSet,
     S::Id: current_plan_state::IsSet,
+    S::DisplayName: current_plan_state::IsSet,
+    S::IsActive: current_plan_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CurrentPlan<'a> {
         CurrentPlan {
-            display_name: self.__unsafe_private_named.0.unwrap(),
-            id: self.__unsafe_private_named.1.unwrap(),
-            is_active: self.__unsafe_private_named.2.unwrap(),
-            name: self.__unsafe_private_named.3.unwrap(),
-            tier: self.__unsafe_private_named.4.unwrap(),
-            valid_until: self.__unsafe_private_named.5,
+            display_name: self._fields.0.unwrap(),
+            id: self._fields.1.unwrap(),
+            is_active: self._fields.2.unwrap(),
+            name: self._fields.3.unwrap(),
+            tier: self._fields.4.unwrap(),
+            valid_until: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -486,12 +489,12 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> CurrentPlan<'a> {
         CurrentPlan {
-            display_name: self.__unsafe_private_named.0.unwrap(),
-            id: self.__unsafe_private_named.1.unwrap(),
-            is_active: self.__unsafe_private_named.2.unwrap(),
-            name: self.__unsafe_private_named.3.unwrap(),
-            tier: self.__unsafe_private_named.4.unwrap(),
-            valid_until: self.__unsafe_private_named.5,
+            display_name: self._fields.0.unwrap(),
+            id: self._fields.1.unwrap(),
+            is_active: self._fields.2.unwrap(),
+            name: self._fields.3.unwrap(),
+            tier: self._fields.4.unwrap(),
+            valid_until: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
@@ -777,112 +780,112 @@ pub mod plan_limits_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type ThreadPostsLimit;
         type MonthlyPostsLimit;
-        type MaxImagesPerPost;
-        type MaxScheduleDays;
         type ScheduleIntervalMinutes;
         type PendingPostsLimit;
-        type ThreadPostsLimit;
+        type MaxScheduleDays;
+        type MaxImagesPerPost;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type ThreadPostsLimit = Unset;
         type MonthlyPostsLimit = Unset;
-        type MaxImagesPerPost = Unset;
-        type MaxScheduleDays = Unset;
         type ScheduleIntervalMinutes = Unset;
         type PendingPostsLimit = Unset;
-        type ThreadPostsLimit = Unset;
+        type MaxScheduleDays = Unset;
+        type MaxImagesPerPost = Unset;
+    }
+    ///State transition - sets the `thread_posts_limit` field to Set
+    pub struct SetThreadPostsLimit<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetThreadPostsLimit<S> {}
+    impl<S: State> State for SetThreadPostsLimit<S> {
+        type ThreadPostsLimit = Set<members::thread_posts_limit>;
+        type MonthlyPostsLimit = S::MonthlyPostsLimit;
+        type ScheduleIntervalMinutes = S::ScheduleIntervalMinutes;
+        type PendingPostsLimit = S::PendingPostsLimit;
+        type MaxScheduleDays = S::MaxScheduleDays;
+        type MaxImagesPerPost = S::MaxImagesPerPost;
     }
     ///State transition - sets the `monthly_posts_limit` field to Set
     pub struct SetMonthlyPostsLimit<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMonthlyPostsLimit<S> {}
     impl<S: State> State for SetMonthlyPostsLimit<S> {
+        type ThreadPostsLimit = S::ThreadPostsLimit;
         type MonthlyPostsLimit = Set<members::monthly_posts_limit>;
-        type MaxImagesPerPost = S::MaxImagesPerPost;
-        type MaxScheduleDays = S::MaxScheduleDays;
         type ScheduleIntervalMinutes = S::ScheduleIntervalMinutes;
         type PendingPostsLimit = S::PendingPostsLimit;
-        type ThreadPostsLimit = S::ThreadPostsLimit;
-    }
-    ///State transition - sets the `max_images_per_post` field to Set
-    pub struct SetMaxImagesPerPost<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMaxImagesPerPost<S> {}
-    impl<S: State> State for SetMaxImagesPerPost<S> {
-        type MonthlyPostsLimit = S::MonthlyPostsLimit;
-        type MaxImagesPerPost = Set<members::max_images_per_post>;
         type MaxScheduleDays = S::MaxScheduleDays;
-        type ScheduleIntervalMinutes = S::ScheduleIntervalMinutes;
-        type PendingPostsLimit = S::PendingPostsLimit;
-        type ThreadPostsLimit = S::ThreadPostsLimit;
-    }
-    ///State transition - sets the `max_schedule_days` field to Set
-    pub struct SetMaxScheduleDays<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMaxScheduleDays<S> {}
-    impl<S: State> State for SetMaxScheduleDays<S> {
-        type MonthlyPostsLimit = S::MonthlyPostsLimit;
         type MaxImagesPerPost = S::MaxImagesPerPost;
-        type MaxScheduleDays = Set<members::max_schedule_days>;
-        type ScheduleIntervalMinutes = S::ScheduleIntervalMinutes;
-        type PendingPostsLimit = S::PendingPostsLimit;
-        type ThreadPostsLimit = S::ThreadPostsLimit;
     }
     ///State transition - sets the `schedule_interval_minutes` field to Set
     pub struct SetScheduleIntervalMinutes<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetScheduleIntervalMinutes<S> {}
     impl<S: State> State for SetScheduleIntervalMinutes<S> {
+        type ThreadPostsLimit = S::ThreadPostsLimit;
         type MonthlyPostsLimit = S::MonthlyPostsLimit;
-        type MaxImagesPerPost = S::MaxImagesPerPost;
-        type MaxScheduleDays = S::MaxScheduleDays;
         type ScheduleIntervalMinutes = Set<members::schedule_interval_minutes>;
         type PendingPostsLimit = S::PendingPostsLimit;
-        type ThreadPostsLimit = S::ThreadPostsLimit;
+        type MaxScheduleDays = S::MaxScheduleDays;
+        type MaxImagesPerPost = S::MaxImagesPerPost;
     }
     ///State transition - sets the `pending_posts_limit` field to Set
     pub struct SetPendingPostsLimit<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPendingPostsLimit<S> {}
     impl<S: State> State for SetPendingPostsLimit<S> {
+        type ThreadPostsLimit = S::ThreadPostsLimit;
         type MonthlyPostsLimit = S::MonthlyPostsLimit;
-        type MaxImagesPerPost = S::MaxImagesPerPost;
-        type MaxScheduleDays = S::MaxScheduleDays;
         type ScheduleIntervalMinutes = S::ScheduleIntervalMinutes;
         type PendingPostsLimit = Set<members::pending_posts_limit>;
-        type ThreadPostsLimit = S::ThreadPostsLimit;
+        type MaxScheduleDays = S::MaxScheduleDays;
+        type MaxImagesPerPost = S::MaxImagesPerPost;
     }
-    ///State transition - sets the `thread_posts_limit` field to Set
-    pub struct SetThreadPostsLimit<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetThreadPostsLimit<S> {}
-    impl<S: State> State for SetThreadPostsLimit<S> {
+    ///State transition - sets the `max_schedule_days` field to Set
+    pub struct SetMaxScheduleDays<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMaxScheduleDays<S> {}
+    impl<S: State> State for SetMaxScheduleDays<S> {
+        type ThreadPostsLimit = S::ThreadPostsLimit;
         type MonthlyPostsLimit = S::MonthlyPostsLimit;
+        type ScheduleIntervalMinutes = S::ScheduleIntervalMinutes;
+        type PendingPostsLimit = S::PendingPostsLimit;
+        type MaxScheduleDays = Set<members::max_schedule_days>;
         type MaxImagesPerPost = S::MaxImagesPerPost;
-        type MaxScheduleDays = S::MaxScheduleDays;
+    }
+    ///State transition - sets the `max_images_per_post` field to Set
+    pub struct SetMaxImagesPerPost<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMaxImagesPerPost<S> {}
+    impl<S: State> State for SetMaxImagesPerPost<S> {
+        type ThreadPostsLimit = S::ThreadPostsLimit;
+        type MonthlyPostsLimit = S::MonthlyPostsLimit;
         type ScheduleIntervalMinutes = S::ScheduleIntervalMinutes;
         type PendingPostsLimit = S::PendingPostsLimit;
-        type ThreadPostsLimit = Set<members::thread_posts_limit>;
+        type MaxScheduleDays = S::MaxScheduleDays;
+        type MaxImagesPerPost = Set<members::max_images_per_post>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `thread_posts_limit` field
+        pub struct thread_posts_limit(());
         ///Marker type for the `monthly_posts_limit` field
         pub struct monthly_posts_limit(());
-        ///Marker type for the `max_images_per_post` field
-        pub struct max_images_per_post(());
-        ///Marker type for the `max_schedule_days` field
-        pub struct max_schedule_days(());
         ///Marker type for the `schedule_interval_minutes` field
         pub struct schedule_interval_minutes(());
         ///Marker type for the `pending_posts_limit` field
         pub struct pending_posts_limit(());
-        ///Marker type for the `thread_posts_limit` field
-        pub struct thread_posts_limit(());
+        ///Marker type for the `max_schedule_days` field
+        pub struct max_schedule_days(());
+        ///Marker type for the `max_images_per_post` field
+        pub struct max_images_per_post(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PlanLimitsBuilder<'a, S: plan_limits_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<i64>,
         Option<i64>,
@@ -896,7 +899,7 @@ pub struct PlanLimitsBuilder<'a, S: plan_limits_state::State> {
         Option<i64>,
         Option<bool>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PlanLimits<'a> {
@@ -910,8 +913,8 @@ impl<'a> PlanLimitsBuilder<'a, plan_limits_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PlanLimitsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -925,7 +928,7 @@ impl<'a> PlanLimitsBuilder<'a, plan_limits_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -933,12 +936,12 @@ impl<'a> PlanLimitsBuilder<'a, plan_limits_state::Empty> {
 impl<'a, S: plan_limits_state::State> PlanLimitsBuilder<'a, S> {
     /// Set the `markdownSupport` field (optional)
     pub fn markdown_support(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `markdownSupport` field to an Option value (optional)
     pub fn maybe_markdown_support(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -946,12 +949,12 @@ impl<'a, S: plan_limits_state::State> PlanLimitsBuilder<'a, S> {
 impl<'a, S: plan_limits_state::State> PlanLimitsBuilder<'a, S> {
     /// Set the `maxImageSizeMb` field (optional)
     pub fn max_image_size_mb(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `maxImageSizeMb` field to an Option value (optional)
     pub fn maybe_max_image_size_mb(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -966,11 +969,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PlanLimitsBuilder<'a, plan_limits_state::SetMaxImagesPerPost<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PlanLimitsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -985,11 +988,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PlanLimitsBuilder<'a, plan_limits_state::SetMaxScheduleDays<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PlanLimitsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -997,12 +1000,12 @@ where
 impl<'a, S: plan_limits_state::State> PlanLimitsBuilder<'a, S> {
     /// Set the `maxVideoSizeMb` field (optional)
     pub fn max_video_size_mb(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `maxVideoSizeMb` field to an Option value (optional)
     pub fn maybe_max_video_size_mb(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1017,11 +1020,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PlanLimitsBuilder<'a, plan_limits_state::SetMonthlyPostsLimit<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         PlanLimitsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1036,11 +1039,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PlanLimitsBuilder<'a, plan_limits_state::SetPendingPostsLimit<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         PlanLimitsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1055,11 +1058,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PlanLimitsBuilder<'a, plan_limits_state::SetScheduleIntervalMinutes<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         PlanLimitsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1067,12 +1070,12 @@ where
 impl<'a, S: plan_limits_state::State> PlanLimitsBuilder<'a, S> {
     /// Set the `threadPosts` field (optional)
     pub fn thread_posts(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `threadPosts` field to an Option value (optional)
     pub fn maybe_thread_posts(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -1087,11 +1090,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PlanLimitsBuilder<'a, plan_limits_state::SetThreadPostsLimit<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         PlanLimitsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1102,12 +1105,12 @@ impl<'a, S: plan_limits_state::State> PlanLimitsBuilder<'a, S> {
         mut self,
         value: impl Into<Option<i64>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `videoProcessingMinutesMonthly` field to an Option value (optional)
     pub fn maybe_video_processing_minutes_monthly(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -1115,12 +1118,12 @@ impl<'a, S: plan_limits_state::State> PlanLimitsBuilder<'a, S> {
 impl<'a, S: plan_limits_state::State> PlanLimitsBuilder<'a, S> {
     /// Set the `videoUpload` field (optional)
     pub fn video_upload(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `videoUpload` field to an Option value (optional)
     pub fn maybe_video_upload(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -1128,28 +1131,28 @@ impl<'a, S: plan_limits_state::State> PlanLimitsBuilder<'a, S> {
 impl<'a, S> PlanLimitsBuilder<'a, S>
 where
     S: plan_limits_state::State,
+    S::ThreadPostsLimit: plan_limits_state::IsSet,
     S::MonthlyPostsLimit: plan_limits_state::IsSet,
-    S::MaxImagesPerPost: plan_limits_state::IsSet,
-    S::MaxScheduleDays: plan_limits_state::IsSet,
     S::ScheduleIntervalMinutes: plan_limits_state::IsSet,
     S::PendingPostsLimit: plan_limits_state::IsSet,
-    S::ThreadPostsLimit: plan_limits_state::IsSet,
+    S::MaxScheduleDays: plan_limits_state::IsSet,
+    S::MaxImagesPerPost: plan_limits_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PlanLimits<'a> {
         PlanLimits {
-            markdown_support: self.__unsafe_private_named.0,
-            max_image_size_mb: self.__unsafe_private_named.1,
-            max_images_per_post: self.__unsafe_private_named.2.unwrap(),
-            max_schedule_days: self.__unsafe_private_named.3.unwrap(),
-            max_video_size_mb: self.__unsafe_private_named.4,
-            monthly_posts_limit: self.__unsafe_private_named.5.unwrap(),
-            pending_posts_limit: self.__unsafe_private_named.6.unwrap(),
-            schedule_interval_minutes: self.__unsafe_private_named.7.unwrap(),
-            thread_posts: self.__unsafe_private_named.8,
-            thread_posts_limit: self.__unsafe_private_named.9.unwrap(),
-            video_processing_minutes_monthly: self.__unsafe_private_named.10,
-            video_upload: self.__unsafe_private_named.11,
+            markdown_support: self._fields.0,
+            max_image_size_mb: self._fields.1,
+            max_images_per_post: self._fields.2.unwrap(),
+            max_schedule_days: self._fields.3.unwrap(),
+            max_video_size_mb: self._fields.4,
+            monthly_posts_limit: self._fields.5.unwrap(),
+            pending_posts_limit: self._fields.6.unwrap(),
+            schedule_interval_minutes: self._fields.7.unwrap(),
+            thread_posts: self._fields.8,
+            thread_posts_limit: self._fields.9.unwrap(),
+            video_processing_minutes_monthly: self._fields.10,
+            video_upload: self._fields.11,
             extra_data: Default::default(),
         }
     }
@@ -1159,18 +1162,18 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> PlanLimits<'a> {
         PlanLimits {
-            markdown_support: self.__unsafe_private_named.0,
-            max_image_size_mb: self.__unsafe_private_named.1,
-            max_images_per_post: self.__unsafe_private_named.2.unwrap(),
-            max_schedule_days: self.__unsafe_private_named.3.unwrap(),
-            max_video_size_mb: self.__unsafe_private_named.4,
-            monthly_posts_limit: self.__unsafe_private_named.5.unwrap(),
-            pending_posts_limit: self.__unsafe_private_named.6.unwrap(),
-            schedule_interval_minutes: self.__unsafe_private_named.7.unwrap(),
-            thread_posts: self.__unsafe_private_named.8,
-            thread_posts_limit: self.__unsafe_private_named.9.unwrap(),
-            video_processing_minutes_monthly: self.__unsafe_private_named.10,
-            video_upload: self.__unsafe_private_named.11,
+            markdown_support: self._fields.0,
+            max_image_size_mb: self._fields.1,
+            max_images_per_post: self._fields.2.unwrap(),
+            max_schedule_days: self._fields.3.unwrap(),
+            max_video_size_mb: self._fields.4,
+            monthly_posts_limit: self._fields.5.unwrap(),
+            pending_posts_limit: self._fields.6.unwrap(),
+            schedule_interval_minutes: self._fields.7.unwrap(),
+            thread_posts: self._fields.8,
+            thread_posts_limit: self._fields.9.unwrap(),
+            video_processing_minutes_monthly: self._fields.10,
+            video_upload: self._fields.11,
             extra_data: Some(extra_data),
         }
     }
@@ -1187,91 +1190,91 @@ pub mod usage_stats_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type PendingPostsCount;
-        type MonthlyPeriodStart;
-        type LastUpdated;
         type MonthlyPostsCount;
         type MonthlyPeriodEnd;
+        type LastUpdated;
+        type MonthlyPeriodStart;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type PendingPostsCount = Unset;
-        type MonthlyPeriodStart = Unset;
-        type LastUpdated = Unset;
         type MonthlyPostsCount = Unset;
         type MonthlyPeriodEnd = Unset;
+        type LastUpdated = Unset;
+        type MonthlyPeriodStart = Unset;
     }
     ///State transition - sets the `pending_posts_count` field to Set
     pub struct SetPendingPostsCount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPendingPostsCount<S> {}
     impl<S: State> State for SetPendingPostsCount<S> {
         type PendingPostsCount = Set<members::pending_posts_count>;
-        type MonthlyPeriodStart = S::MonthlyPeriodStart;
-        type LastUpdated = S::LastUpdated;
         type MonthlyPostsCount = S::MonthlyPostsCount;
         type MonthlyPeriodEnd = S::MonthlyPeriodEnd;
-    }
-    ///State transition - sets the `monthly_period_start` field to Set
-    pub struct SetMonthlyPeriodStart<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMonthlyPeriodStart<S> {}
-    impl<S: State> State for SetMonthlyPeriodStart<S> {
-        type PendingPostsCount = S::PendingPostsCount;
-        type MonthlyPeriodStart = Set<members::monthly_period_start>;
         type LastUpdated = S::LastUpdated;
-        type MonthlyPostsCount = S::MonthlyPostsCount;
-        type MonthlyPeriodEnd = S::MonthlyPeriodEnd;
-    }
-    ///State transition - sets the `last_updated` field to Set
-    pub struct SetLastUpdated<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLastUpdated<S> {}
-    impl<S: State> State for SetLastUpdated<S> {
-        type PendingPostsCount = S::PendingPostsCount;
         type MonthlyPeriodStart = S::MonthlyPeriodStart;
-        type LastUpdated = Set<members::last_updated>;
-        type MonthlyPostsCount = S::MonthlyPostsCount;
-        type MonthlyPeriodEnd = S::MonthlyPeriodEnd;
     }
     ///State transition - sets the `monthly_posts_count` field to Set
     pub struct SetMonthlyPostsCount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMonthlyPostsCount<S> {}
     impl<S: State> State for SetMonthlyPostsCount<S> {
         type PendingPostsCount = S::PendingPostsCount;
-        type MonthlyPeriodStart = S::MonthlyPeriodStart;
-        type LastUpdated = S::LastUpdated;
         type MonthlyPostsCount = Set<members::monthly_posts_count>;
         type MonthlyPeriodEnd = S::MonthlyPeriodEnd;
+        type LastUpdated = S::LastUpdated;
+        type MonthlyPeriodStart = S::MonthlyPeriodStart;
     }
     ///State transition - sets the `monthly_period_end` field to Set
     pub struct SetMonthlyPeriodEnd<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMonthlyPeriodEnd<S> {}
     impl<S: State> State for SetMonthlyPeriodEnd<S> {
         type PendingPostsCount = S::PendingPostsCount;
-        type MonthlyPeriodStart = S::MonthlyPeriodStart;
-        type LastUpdated = S::LastUpdated;
         type MonthlyPostsCount = S::MonthlyPostsCount;
         type MonthlyPeriodEnd = Set<members::monthly_period_end>;
+        type LastUpdated = S::LastUpdated;
+        type MonthlyPeriodStart = S::MonthlyPeriodStart;
+    }
+    ///State transition - sets the `last_updated` field to Set
+    pub struct SetLastUpdated<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLastUpdated<S> {}
+    impl<S: State> State for SetLastUpdated<S> {
+        type PendingPostsCount = S::PendingPostsCount;
+        type MonthlyPostsCount = S::MonthlyPostsCount;
+        type MonthlyPeriodEnd = S::MonthlyPeriodEnd;
+        type LastUpdated = Set<members::last_updated>;
+        type MonthlyPeriodStart = S::MonthlyPeriodStart;
+    }
+    ///State transition - sets the `monthly_period_start` field to Set
+    pub struct SetMonthlyPeriodStart<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMonthlyPeriodStart<S> {}
+    impl<S: State> State for SetMonthlyPeriodStart<S> {
+        type PendingPostsCount = S::PendingPostsCount;
+        type MonthlyPostsCount = S::MonthlyPostsCount;
+        type MonthlyPeriodEnd = S::MonthlyPeriodEnd;
+        type LastUpdated = S::LastUpdated;
+        type MonthlyPeriodStart = Set<members::monthly_period_start>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `pending_posts_count` field
         pub struct pending_posts_count(());
-        ///Marker type for the `monthly_period_start` field
-        pub struct monthly_period_start(());
-        ///Marker type for the `last_updated` field
-        pub struct last_updated(());
         ///Marker type for the `monthly_posts_count` field
         pub struct monthly_posts_count(());
         ///Marker type for the `monthly_period_end` field
         pub struct monthly_period_end(());
+        ///Marker type for the `last_updated` field
+        pub struct last_updated(());
+        ///Marker type for the `monthly_period_start` field
+        pub struct monthly_period_start(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct UsageStatsBuilder<'a, S: usage_stats_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<Datetime>,
         Option<Datetime>,
@@ -1280,7 +1283,7 @@ pub struct UsageStatsBuilder<'a, S: usage_stats_state::State> {
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UsageStats<'a> {
@@ -1294,9 +1297,9 @@ impl<'a> UsageStatsBuilder<'a, usage_stats_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UsageStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1304,12 +1307,12 @@ impl<'a> UsageStatsBuilder<'a, usage_stats_state::Empty> {
 impl<'a, S: usage_stats_state::State> UsageStatsBuilder<'a, S> {
     /// Set the `apiRequestsThisHour` field (optional)
     pub fn api_requests_this_hour(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `apiRequestsThisHour` field to an Option value (optional)
     pub fn maybe_api_requests_this_hour(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1324,11 +1327,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> UsageStatsBuilder<'a, usage_stats_state::SetLastUpdated<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UsageStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1343,11 +1346,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> UsageStatsBuilder<'a, usage_stats_state::SetMonthlyPeriodEnd<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         UsageStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1362,11 +1365,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> UsageStatsBuilder<'a, usage_stats_state::SetMonthlyPeriodStart<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         UsageStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1381,11 +1384,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> UsageStatsBuilder<'a, usage_stats_state::SetMonthlyPostsCount<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         UsageStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1400,11 +1403,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> UsageStatsBuilder<'a, usage_stats_state::SetPendingPostsCount<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         UsageStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1412,12 +1415,12 @@ where
 impl<'a, S: usage_stats_state::State> UsageStatsBuilder<'a, S> {
     /// Set the `storageUsedMb` field (optional)
     pub fn storage_used_mb(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `storageUsedMb` field to an Option value (optional)
     pub fn maybe_storage_used_mb(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1426,21 +1429,21 @@ impl<'a, S> UsageStatsBuilder<'a, S>
 where
     S: usage_stats_state::State,
     S::PendingPostsCount: usage_stats_state::IsSet,
-    S::MonthlyPeriodStart: usage_stats_state::IsSet,
-    S::LastUpdated: usage_stats_state::IsSet,
     S::MonthlyPostsCount: usage_stats_state::IsSet,
     S::MonthlyPeriodEnd: usage_stats_state::IsSet,
+    S::LastUpdated: usage_stats_state::IsSet,
+    S::MonthlyPeriodStart: usage_stats_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> UsageStats<'a> {
         UsageStats {
-            api_requests_this_hour: self.__unsafe_private_named.0,
-            last_updated: self.__unsafe_private_named.1.unwrap(),
-            monthly_period_end: self.__unsafe_private_named.2.unwrap(),
-            monthly_period_start: self.__unsafe_private_named.3.unwrap(),
-            monthly_posts_count: self.__unsafe_private_named.4.unwrap(),
-            pending_posts_count: self.__unsafe_private_named.5.unwrap(),
-            storage_used_mb: self.__unsafe_private_named.6,
+            api_requests_this_hour: self._fields.0,
+            last_updated: self._fields.1.unwrap(),
+            monthly_period_end: self._fields.2.unwrap(),
+            monthly_period_start: self._fields.3.unwrap(),
+            monthly_posts_count: self._fields.4.unwrap(),
+            pending_posts_count: self._fields.5.unwrap(),
+            storage_used_mb: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -1450,13 +1453,13 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> UsageStats<'a> {
         UsageStats {
-            api_requests_this_hour: self.__unsafe_private_named.0,
-            last_updated: self.__unsafe_private_named.1.unwrap(),
-            monthly_period_end: self.__unsafe_private_named.2.unwrap(),
-            monthly_period_start: self.__unsafe_private_named.3.unwrap(),
-            monthly_posts_count: self.__unsafe_private_named.4.unwrap(),
-            pending_posts_count: self.__unsafe_private_named.5.unwrap(),
-            storage_used_mb: self.__unsafe_private_named.6,
+            api_requests_this_hour: self._fields.0,
+            last_updated: self._fields.1.unwrap(),
+            monthly_period_end: self._fields.2.unwrap(),
+            monthly_period_start: self._fields.3.unwrap(),
+            monthly_posts_count: self._fields.4.unwrap(),
+            pending_posts_count: self._fields.5.unwrap(),
+            storage_used_mb: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_chronosky/plan/list_assignments.rs b/crates/jacquard-api/src/app_chronosky/plan/list_assignments.rs
index 23c6aa84..1b6a1415 100644
--- a/crates/jacquard-api/src/app_chronosky/plan/list_assignments.rs
+++ b/crates/jacquard-api/src/app_chronosky/plan/list_assignments.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/app_chronosky/plan/redeem_ticket.rs b/crates/jacquard-api/src/app_chronosky/plan/redeem_ticket.rs
index 9f0080d7..c3cc3681 100644
--- a/crates/jacquard-api/src/app_chronosky/plan/redeem_ticket.rs
+++ b/crates/jacquard-api/src/app_chronosky/plan/redeem_ticket.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -206,9 +209,9 @@ pub mod redeemed_assignment_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ExpiresAt;
         type Id;
         type Status;
+        type ExpiresAt;
         type ActivatedAt;
         type PlanId;
     }
@@ -216,29 +219,19 @@ pub mod redeemed_assignment_state {
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ExpiresAt = Unset;
         type Id = Unset;
         type Status = Unset;
+        type ExpiresAt = Unset;
         type ActivatedAt = Unset;
         type PlanId = Unset;
     }
-    ///State transition - sets the `expires_at` field to Set
-    pub struct SetExpiresAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetExpiresAt<S> {}
-    impl<S: State> State for SetExpiresAt<S> {
-        type ExpiresAt = Set<members::expires_at>;
-        type Id = S::Id;
-        type Status = S::Status;
-        type ActivatedAt = S::ActivatedAt;
-        type PlanId = S::PlanId;
-    }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetId<S> {}
     impl<S: State> State for SetId<S> {
-        type ExpiresAt = S::ExpiresAt;
         type Id = Set<members::id>;
         type Status = S::Status;
+        type ExpiresAt = S::ExpiresAt;
         type ActivatedAt = S::ActivatedAt;
         type PlanId = S::PlanId;
     }
@@ -246,9 +239,19 @@ pub mod redeemed_assignment_state {
     pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStatus<S> {}
     impl<S: State> State for SetStatus<S> {
-        type ExpiresAt = S::ExpiresAt;
         type Id = S::Id;
         type Status = Set<members::status>;
+        type ExpiresAt = S::ExpiresAt;
+        type ActivatedAt = S::ActivatedAt;
+        type PlanId = S::PlanId;
+    }
+    ///State transition - sets the `expires_at` field to Set
+    pub struct SetExpiresAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetExpiresAt<S> {}
+    impl<S: State> State for SetExpiresAt<S> {
+        type Id = S::Id;
+        type Status = S::Status;
+        type ExpiresAt = Set<members::expires_at>;
         type ActivatedAt = S::ActivatedAt;
         type PlanId = S::PlanId;
     }
@@ -256,9 +259,9 @@ pub mod redeemed_assignment_state {
     pub struct SetActivatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetActivatedAt<S> {}
     impl<S: State> State for SetActivatedAt<S> {
-        type ExpiresAt = S::ExpiresAt;
         type Id = S::Id;
         type Status = S::Status;
+        type ExpiresAt = S::ExpiresAt;
         type ActivatedAt = Set<members::activated_at>;
         type PlanId = S::PlanId;
     }
@@ -266,21 +269,21 @@ pub mod redeemed_assignment_state {
     pub struct SetPlanId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPlanId<S> {}
     impl<S: State> State for SetPlanId<S> {
-        type ExpiresAt = S::ExpiresAt;
         type Id = S::Id;
         type Status = S::Status;
+        type ExpiresAt = S::ExpiresAt;
         type ActivatedAt = S::ActivatedAt;
         type PlanId = Set<members::plan_id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `expires_at` field
-        pub struct expires_at(());
         ///Marker type for the `id` field
         pub struct id(());
         ///Marker type for the `status` field
         pub struct status(());
+        ///Marker type for the `expires_at` field
+        pub struct expires_at(());
         ///Marker type for the `activated_at` field
         pub struct activated_at(());
         ///Marker type for the `plan_id` field
@@ -290,15 +293,15 @@ pub mod redeemed_assignment_state {
 
 /// Builder for constructing an instance of this type
 pub struct RedeemedAssignmentBuilder<'a, S: redeemed_assignment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RedeemedAssignment<'a> {
@@ -312,9 +315,9 @@ impl<'a> RedeemedAssignmentBuilder<'a, redeemed_assignment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RedeemedAssignmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -329,11 +332,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RedeemedAssignmentBuilder<'a, redeemed_assignment_state::SetActivatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RedeemedAssignmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -348,11 +351,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RedeemedAssignmentBuilder<'a, redeemed_assignment_state::SetExpiresAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RedeemedAssignmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -367,11 +370,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RedeemedAssignmentBuilder<'a, redeemed_assignment_state::SetId<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RedeemedAssignmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -386,11 +389,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RedeemedAssignmentBuilder<'a, redeemed_assignment_state::SetPlanId<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RedeemedAssignmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -405,11 +408,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RedeemedAssignmentBuilder<'a, redeemed_assignment_state::SetStatus<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RedeemedAssignmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -417,20 +420,20 @@ where
 impl<'a, S> RedeemedAssignmentBuilder<'a, S>
 where
     S: redeemed_assignment_state::State,
-    S::ExpiresAt: redeemed_assignment_state::IsSet,
     S::Id: redeemed_assignment_state::IsSet,
     S::Status: redeemed_assignment_state::IsSet,
+    S::ExpiresAt: redeemed_assignment_state::IsSet,
     S::ActivatedAt: redeemed_assignment_state::IsSet,
     S::PlanId: redeemed_assignment_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RedeemedAssignment<'a> {
         RedeemedAssignment {
-            activated_at: self.__unsafe_private_named.0.unwrap(),
-            expires_at: self.__unsafe_private_named.1.unwrap(),
-            id: self.__unsafe_private_named.2.unwrap(),
-            plan_id: self.__unsafe_private_named.3.unwrap(),
-            status: self.__unsafe_private_named.4.unwrap(),
+            activated_at: self._fields.0.unwrap(),
+            expires_at: self._fields.1.unwrap(),
+            id: self._fields.2.unwrap(),
+            plan_id: self._fields.3.unwrap(),
+            status: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -443,11 +446,11 @@ where
         >,
     ) -> RedeemedAssignment<'a> {
         RedeemedAssignment {
-            activated_at: self.__unsafe_private_named.0.unwrap(),
-            expires_at: self.__unsafe_private_named.1.unwrap(),
-            id: self.__unsafe_private_named.2.unwrap(),
-            plan_id: self.__unsafe_private_named.3.unwrap(),
-            status: self.__unsafe_private_named.4.unwrap(),
+            activated_at: self._fields.0.unwrap(),
+            expires_at: self._fields.1.unwrap(),
+            id: self._fields.2.unwrap(),
+            plan_id: self._fields.3.unwrap(),
+            status: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_chronosky/schedule/create_post.rs b/crates/jacquard-api/src/app_chronosky/schedule/create_post.rs
index 73f33b3b..d4f0052b 100644
--- a/crates/jacquard-api/src/app_chronosky/schedule/create_post.rs
+++ b/crates/jacquard-api/src/app_chronosky/schedule/create_post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -264,15 +267,15 @@ pub mod create_post_state {
 
 /// Builder for constructing an instance of this type
 pub struct CreatePostBuilder<'a, S: create_post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<CowStr<'a>>,
         Option<Vec<create_post::ThreadPostInput<'a>>>,
         Option<Datetime>,
         Option<Vec<CreatePostThreadgateRulesItem<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CreatePost<'a> {
@@ -286,9 +289,9 @@ impl<'a> CreatePostBuilder<'a, create_post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreatePostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -296,12 +299,12 @@ impl<'a> CreatePostBuilder<'a, create_post_state::Empty> {
 impl<'a, S: create_post_state::State> CreatePostBuilder<'a, S> {
     /// Set the `disableQuotePosts` field (optional)
     pub fn disable_quote_posts(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `disableQuotePosts` field to an Option value (optional)
     pub fn maybe_disable_quote_posts(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -309,12 +312,12 @@ impl<'a, S: create_post_state::State> CreatePostBuilder<'a, S> {
 impl<'a, S: create_post_state::State> CreatePostBuilder<'a, S> {
     /// Set the `parentPostId` field (optional)
     pub fn parent_post_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `parentPostId` field to an Option value (optional)
     pub fn maybe_parent_post_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -329,11 +332,11 @@ where
         mut self,
         value: impl Into<Vec<create_post::ThreadPostInput<'a>>>,
     ) -> CreatePostBuilder<'a, create_post_state::SetPosts<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CreatePostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -348,11 +351,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CreatePostBuilder<'a, create_post_state::SetScheduledAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CreatePostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -363,7 +366,7 @@ impl<'a, S: create_post_state::State> CreatePostBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<CreatePostThreadgateRulesItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `threadgateRules` field to an Option value (optional)
@@ -371,7 +374,7 @@ impl<'a, S: create_post_state::State> CreatePostBuilder<'a, S> {
         mut self,
         value: Option<Vec<CreatePostThreadgateRulesItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -385,11 +388,11 @@ where
     /// Build the final struct
     pub fn build(self) -> CreatePost<'a> {
         CreatePost {
-            disable_quote_posts: self.__unsafe_private_named.0,
-            parent_post_id: self.__unsafe_private_named.1,
-            posts: self.__unsafe_private_named.2.unwrap(),
-            scheduled_at: self.__unsafe_private_named.3.unwrap(),
-            threadgate_rules: self.__unsafe_private_named.4,
+            disable_quote_posts: self._fields.0,
+            parent_post_id: self._fields.1,
+            posts: self._fields.2.unwrap(),
+            scheduled_at: self._fields.3.unwrap(),
+            threadgate_rules: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -402,11 +405,11 @@ where
         >,
     ) -> CreatePost<'a> {
         CreatePost {
-            disable_quote_posts: self.__unsafe_private_named.0,
-            parent_post_id: self.__unsafe_private_named.1,
-            posts: self.__unsafe_private_named.2.unwrap(),
-            scheduled_at: self.__unsafe_private_named.3.unwrap(),
-            threadgate_rules: self.__unsafe_private_named.4,
+            disable_quote_posts: self._fields.0,
+            parent_post_id: self._fields.1,
+            posts: self._fields.2.unwrap(),
+            scheduled_at: self._fields.3.unwrap(),
+            threadgate_rules: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_chronosky/schedule/delete_post.rs b/crates/jacquard-api/src/app_chronosky/schedule/delete_post.rs
index c2ee8afd..52d92551 100644
--- a/crates/jacquard-api/src/app_chronosky/schedule/delete_post.rs
+++ b/crates/jacquard-api/src/app_chronosky/schedule/delete_post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/app_chronosky/schedule/get_post.rs b/crates/jacquard-api/src/app_chronosky/schedule/get_post.rs
index 978efc81..4a630227 100644
--- a/crates/jacquard-api/src/app_chronosky/schedule/get_post.rs
+++ b/crates/jacquard-api/src/app_chronosky/schedule/get_post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -122,9 +125,9 @@ pub mod get_post_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetPostBuilder<'a, S: get_post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetPost<'a> {
@@ -138,9 +141,9 @@ impl<'a> GetPostBuilder<'a, get_post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -155,11 +158,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetPostBuilder<'a, get_post_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -172,7 +175,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetPost<'a> {
         GetPost {
-            id: self.__unsafe_private_named.0.unwrap(),
+            id: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_chronosky/schedule/list_posts.rs b/crates/jacquard-api/src/app_chronosky/schedule/list_posts.rs
index 4b29d274..d8e90aa7 100644
--- a/crates/jacquard-api/src/app_chronosky/schedule/list_posts.rs
+++ b/crates/jacquard-api/src/app_chronosky/schedule/list_posts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -603,9 +606,9 @@ pub mod image_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImageViewBuilder<'a, S: image_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<list_posts::ImageViewImage<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<list_posts::ImageViewImage<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ImageView<'a> {
@@ -619,9 +622,9 @@ impl<'a> ImageViewBuilder<'a, image_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -636,11 +639,11 @@ where
         mut self,
         value: impl Into<Vec<list_posts::ImageViewImage<'a>>>,
     ) -> ImageViewBuilder<'a, image_view_state::SetImages<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ImageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -653,7 +656,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ImageView<'a> {
         ImageView {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -666,7 +669,7 @@ where
         >,
     ) -> ImageView<'a> {
         ImageView {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1229,9 +1232,9 @@ pub mod list_posts_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListPostsBuilder<'a, S: list_posts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListPosts<'a> {
@@ -1245,9 +1248,9 @@ impl<'a> ListPostsBuilder<'a, list_posts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListPostsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1255,12 +1258,12 @@ impl<'a> ListPostsBuilder<'a, list_posts_state::Empty> {
 impl<'a, S: list_posts_state::State> ListPostsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1268,12 +1271,12 @@ impl<'a, S: list_posts_state::State> ListPostsBuilder<'a, S> {
 impl<'a, S: list_posts_state::State> ListPostsBuilder<'a, S> {
     /// Set the `page` field (optional)
     pub fn page(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `page` field to an Option value (optional)
     pub fn maybe_page(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1281,12 +1284,12 @@ impl<'a, S: list_posts_state::State> ListPostsBuilder<'a, S> {
 impl<'a, S: list_posts_state::State> ListPostsBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1298,9 +1301,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ListPosts<'a> {
         ListPosts {
-            limit: self.__unsafe_private_named.0,
-            page: self.__unsafe_private_named.1,
-            status: self.__unsafe_private_named.2,
+            limit: self._fields.0,
+            page: self._fields.1,
+            status: self._fields.2,
         }
     }
 }
@@ -1315,75 +1318,75 @@ pub mod pagination_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Limit;
-        type TotalPages;
         type Total;
         type Page;
+        type TotalPages;
+        type Limit;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Limit = Unset;
-        type TotalPages = Unset;
         type Total = Unset;
         type Page = Unset;
-    }
-    ///State transition - sets the `limit` field to Set
-    pub struct SetLimit<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLimit<S> {}
-    impl<S: State> State for SetLimit<S> {
-        type Limit = Set<members::limit>;
-        type TotalPages = S::TotalPages;
-        type Total = S::Total;
-        type Page = S::Page;
-    }
-    ///State transition - sets the `total_pages` field to Set
-    pub struct SetTotalPages<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTotalPages<S> {}
-    impl<S: State> State for SetTotalPages<S> {
-        type Limit = S::Limit;
-        type TotalPages = Set<members::total_pages>;
-        type Total = S::Total;
-        type Page = S::Page;
+        type TotalPages = Unset;
+        type Limit = Unset;
     }
     ///State transition - sets the `total` field to Set
     pub struct SetTotal<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTotal<S> {}
     impl<S: State> State for SetTotal<S> {
-        type Limit = S::Limit;
-        type TotalPages = S::TotalPages;
         type Total = Set<members::total>;
         type Page = S::Page;
+        type TotalPages = S::TotalPages;
+        type Limit = S::Limit;
     }
     ///State transition - sets the `page` field to Set
     pub struct SetPage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPage<S> {}
     impl<S: State> State for SetPage<S> {
-        type Limit = S::Limit;
-        type TotalPages = S::TotalPages;
         type Total = S::Total;
         type Page = Set<members::page>;
+        type TotalPages = S::TotalPages;
+        type Limit = S::Limit;
+    }
+    ///State transition - sets the `total_pages` field to Set
+    pub struct SetTotalPages<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTotalPages<S> {}
+    impl<S: State> State for SetTotalPages<S> {
+        type Total = S::Total;
+        type Page = S::Page;
+        type TotalPages = Set<members::total_pages>;
+        type Limit = S::Limit;
+    }
+    ///State transition - sets the `limit` field to Set
+    pub struct SetLimit<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLimit<S> {}
+    impl<S: State> State for SetLimit<S> {
+        type Total = S::Total;
+        type Page = S::Page;
+        type TotalPages = S::TotalPages;
+        type Limit = Set<members::limit>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `limit` field
-        pub struct limit(());
-        ///Marker type for the `total_pages` field
-        pub struct total_pages(());
         ///Marker type for the `total` field
         pub struct total(());
         ///Marker type for the `page` field
         pub struct page(());
+        ///Marker type for the `total_pages` field
+        pub struct total_pages(());
+        ///Marker type for the `limit` field
+        pub struct limit(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PaginationBuilder<'a, S: pagination_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Pagination<'a> {
@@ -1397,9 +1400,9 @@ impl<'a> PaginationBuilder<'a, pagination_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PaginationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1414,11 +1417,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PaginationBuilder<'a, pagination_state::SetLimit<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PaginationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1433,11 +1436,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PaginationBuilder<'a, pagination_state::SetPage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PaginationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1452,11 +1455,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PaginationBuilder<'a, pagination_state::SetTotal<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PaginationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1471,11 +1474,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PaginationBuilder<'a, pagination_state::SetTotalPages<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PaginationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1483,18 +1486,18 @@ where
 impl<'a, S> PaginationBuilder<'a, S>
 where
     S: pagination_state::State,
-    S::Limit: pagination_state::IsSet,
-    S::TotalPages: pagination_state::IsSet,
     S::Total: pagination_state::IsSet,
     S::Page: pagination_state::IsSet,
+    S::TotalPages: pagination_state::IsSet,
+    S::Limit: pagination_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Pagination<'a> {
         Pagination {
-            limit: self.__unsafe_private_named.0.unwrap(),
-            page: self.__unsafe_private_named.1.unwrap(),
-            total: self.__unsafe_private_named.2.unwrap(),
-            total_pages: self.__unsafe_private_named.3.unwrap(),
+            limit: self._fields.0.unwrap(),
+            page: self._fields.1.unwrap(),
+            total: self._fields.2.unwrap(),
+            total_pages: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1507,10 +1510,10 @@ where
         >,
     ) -> Pagination<'a> {
         Pagination {
-            limit: self.__unsafe_private_named.0.unwrap(),
-            page: self.__unsafe_private_named.1.unwrap(),
-            total: self.__unsafe_private_named.2.unwrap(),
-            total_pages: self.__unsafe_private_named.3.unwrap(),
+            limit: self._fields.0.unwrap(),
+            page: self._fields.1.unwrap(),
+            total: self._fields.2.unwrap(),
+            total_pages: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1526,184 +1529,184 @@ pub mod scheduled_post_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Langs;
-        type Status;
-        type CreatedAt;
-        type UserId;
-        type UpdatedAt;
-        type ScheduledAt;
         type Text;
+        type ScheduledAt;
         type Id;
+        type UpdatedAt;
+        type CreatedAt;
+        type Status;
+        type UserId;
         type RetryCount;
+        type Langs;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Langs = Unset;
-        type Status = Unset;
-        type CreatedAt = Unset;
-        type UserId = Unset;
-        type UpdatedAt = Unset;
-        type ScheduledAt = Unset;
         type Text = Unset;
+        type ScheduledAt = Unset;
         type Id = Unset;
+        type UpdatedAt = Unset;
+        type CreatedAt = Unset;
+        type Status = Unset;
+        type UserId = Unset;
         type RetryCount = Unset;
+        type Langs = Unset;
     }
-    ///State transition - sets the `langs` field to Set
-    pub struct SetLangs<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLangs<S> {}
-    impl<S: State> State for SetLangs<S> {
-        type Langs = Set<members::langs>;
-        type Status = S::Status;
+    ///State transition - sets the `text` field to Set
+    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetText<S> {}
+    impl<S: State> State for SetText<S> {
+        type Text = Set<members::text>;
+        type ScheduledAt = S::ScheduledAt;
+        type Id = S::Id;
+        type UpdatedAt = S::UpdatedAt;
         type CreatedAt = S::CreatedAt;
+        type Status = S::Status;
         type UserId = S::UserId;
-        type UpdatedAt = S::UpdatedAt;
-        type ScheduledAt = S::ScheduledAt;
+        type RetryCount = S::RetryCount;
+        type Langs = S::Langs;
+    }
+    ///State transition - sets the `scheduled_at` field to Set
+    pub struct SetScheduledAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetScheduledAt<S> {}
+    impl<S: State> State for SetScheduledAt<S> {
         type Text = S::Text;
+        type ScheduledAt = Set<members::scheduled_at>;
         type Id = S::Id;
+        type UpdatedAt = S::UpdatedAt;
+        type CreatedAt = S::CreatedAt;
+        type Status = S::Status;
+        type UserId = S::UserId;
         type RetryCount = S::RetryCount;
-    }
-    ///State transition - sets the `status` field to Set
-    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStatus<S> {}
-    impl<S: State> State for SetStatus<S> {
         type Langs = S::Langs;
-        type Status = Set<members::status>;
+    }
+    ///State transition - sets the `id` field to Set
+    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetId<S> {}
+    impl<S: State> State for SetId<S> {
+        type Text = S::Text;
+        type ScheduledAt = S::ScheduledAt;
+        type Id = Set<members::id>;
+        type UpdatedAt = S::UpdatedAt;
         type CreatedAt = S::CreatedAt;
+        type Status = S::Status;
         type UserId = S::UserId;
-        type UpdatedAt = S::UpdatedAt;
-        type ScheduledAt = S::ScheduledAt;
+        type RetryCount = S::RetryCount;
+        type Langs = S::Langs;
+    }
+    ///State transition - sets the `updated_at` field to Set
+    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
+    impl<S: State> State for SetUpdatedAt<S> {
         type Text = S::Text;
+        type ScheduledAt = S::ScheduledAt;
         type Id = S::Id;
+        type UpdatedAt = Set<members::updated_at>;
+        type CreatedAt = S::CreatedAt;
+        type Status = S::Status;
+        type UserId = S::UserId;
         type RetryCount = S::RetryCount;
+        type Langs = S::Langs;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Langs = S::Langs;
-        type Status = S::Status;
+        type Text = S::Text;
+        type ScheduledAt = S::ScheduledAt;
+        type Id = S::Id;
+        type UpdatedAt = S::UpdatedAt;
         type CreatedAt = Set<members::created_at>;
+        type Status = S::Status;
         type UserId = S::UserId;
-        type UpdatedAt = S::UpdatedAt;
-        type ScheduledAt = S::ScheduledAt;
+        type RetryCount = S::RetryCount;
+        type Langs = S::Langs;
+    }
+    ///State transition - sets the `status` field to Set
+    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStatus<S> {}
+    impl<S: State> State for SetStatus<S> {
         type Text = S::Text;
+        type ScheduledAt = S::ScheduledAt;
         type Id = S::Id;
+        type UpdatedAt = S::UpdatedAt;
+        type CreatedAt = S::CreatedAt;
+        type Status = Set<members::status>;
+        type UserId = S::UserId;
         type RetryCount = S::RetryCount;
+        type Langs = S::Langs;
     }
     ///State transition - sets the `user_id` field to Set
     pub struct SetUserId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUserId<S> {}
     impl<S: State> State for SetUserId<S> {
-        type Langs = S::Langs;
-        type Status = S::Status;
-        type CreatedAt = S::CreatedAt;
-        type UserId = Set<members::user_id>;
-        type UpdatedAt = S::UpdatedAt;
-        type ScheduledAt = S::ScheduledAt;
         type Text = S::Text;
-        type Id = S::Id;
-        type RetryCount = S::RetryCount;
-    }
-    ///State transition - sets the `updated_at` field to Set
-    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
-    impl<S: State> State for SetUpdatedAt<S> {
-        type Langs = S::Langs;
-        type Status = S::Status;
-        type CreatedAt = S::CreatedAt;
-        type UserId = S::UserId;
-        type UpdatedAt = Set<members::updated_at>;
         type ScheduledAt = S::ScheduledAt;
-        type Text = S::Text;
         type Id = S::Id;
-        type RetryCount = S::RetryCount;
-    }
-    ///State transition - sets the `scheduled_at` field to Set
-    pub struct SetScheduledAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetScheduledAt<S> {}
-    impl<S: State> State for SetScheduledAt<S> {
-        type Langs = S::Langs;
-        type Status = S::Status;
-        type CreatedAt = S::CreatedAt;
-        type UserId = S::UserId;
         type UpdatedAt = S::UpdatedAt;
-        type ScheduledAt = Set<members::scheduled_at>;
-        type Text = S::Text;
-        type Id = S::Id;
-        type RetryCount = S::RetryCount;
-    }
-    ///State transition - sets the `text` field to Set
-    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetText<S> {}
-    impl<S: State> State for SetText<S> {
-        type Langs = S::Langs;
-        type Status = S::Status;
         type CreatedAt = S::CreatedAt;
-        type UserId = S::UserId;
-        type UpdatedAt = S::UpdatedAt;
-        type ScheduledAt = S::ScheduledAt;
-        type Text = Set<members::text>;
-        type Id = S::Id;
-        type RetryCount = S::RetryCount;
-    }
-    ///State transition - sets the `id` field to Set
-    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetId<S> {}
-    impl<S: State> State for SetId<S> {
-        type Langs = S::Langs;
         type Status = S::Status;
-        type CreatedAt = S::CreatedAt;
-        type UserId = S::UserId;
-        type UpdatedAt = S::UpdatedAt;
-        type ScheduledAt = S::ScheduledAt;
-        type Text = S::Text;
-        type Id = Set<members::id>;
+        type UserId = Set<members::user_id>;
         type RetryCount = S::RetryCount;
+        type Langs = S::Langs;
     }
     ///State transition - sets the `retry_count` field to Set
     pub struct SetRetryCount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRetryCount<S> {}
     impl<S: State> State for SetRetryCount<S> {
-        type Langs = S::Langs;
-        type Status = S::Status;
+        type Text = S::Text;
+        type ScheduledAt = S::ScheduledAt;
+        type Id = S::Id;
+        type UpdatedAt = S::UpdatedAt;
         type CreatedAt = S::CreatedAt;
+        type Status = S::Status;
         type UserId = S::UserId;
-        type UpdatedAt = S::UpdatedAt;
-        type ScheduledAt = S::ScheduledAt;
+        type RetryCount = Set<members::retry_count>;
+        type Langs = S::Langs;
+    }
+    ///State transition - sets the `langs` field to Set
+    pub struct SetLangs<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLangs<S> {}
+    impl<S: State> State for SetLangs<S> {
         type Text = S::Text;
+        type ScheduledAt = S::ScheduledAt;
         type Id = S::Id;
-        type RetryCount = Set<members::retry_count>;
+        type UpdatedAt = S::UpdatedAt;
+        type CreatedAt = S::CreatedAt;
+        type Status = S::Status;
+        type UserId = S::UserId;
+        type RetryCount = S::RetryCount;
+        type Langs = Set<members::langs>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `langs` field
-        pub struct langs(());
-        ///Marker type for the `status` field
-        pub struct status(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `user_id` field
-        pub struct user_id(());
-        ///Marker type for the `updated_at` field
-        pub struct updated_at(());
-        ///Marker type for the `scheduled_at` field
-        pub struct scheduled_at(());
         ///Marker type for the `text` field
         pub struct text(());
+        ///Marker type for the `scheduled_at` field
+        pub struct scheduled_at(());
         ///Marker type for the `id` field
         pub struct id(());
+        ///Marker type for the `updated_at` field
+        pub struct updated_at(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `status` field
+        pub struct status(());
+        ///Marker type for the `user_id` field
+        pub struct user_id(());
         ///Marker type for the `retry_count` field
         pub struct retry_count(());
+        ///Marker type for the `langs` field
+        pub struct langs(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ScheduledPostBuilder<'a, S: scheduled_post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Vec<list_posts::ScheduledPost<'a>>>,
@@ -1731,7 +1734,7 @@ pub struct ScheduledPostBuilder<'a, S: scheduled_post_state::State> {
         Option<Datetime>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ScheduledPost<'a> {
@@ -1745,8 +1748,8 @@ impl<'a> ScheduledPostBuilder<'a, scheduled_post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ScheduledPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -1774,7 +1777,7 @@ impl<'a> ScheduledPostBuilder<'a, scheduled_post_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1782,12 +1785,12 @@ impl<'a> ScheduledPostBuilder<'a, scheduled_post_state::Empty> {
 impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
     /// Set the `atRkey` field (optional)
     pub fn at_rkey(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `atRkey` field to an Option value (optional)
     pub fn maybe_at_rkey(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1795,12 +1798,12 @@ impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
 impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
     /// Set the `atUri` field (optional)
     pub fn at_uri(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `atUri` field to an Option value (optional)
     pub fn maybe_at_uri(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1811,7 +1814,7 @@ impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<list_posts::ScheduledPost<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `children` field to an Option value (optional)
@@ -1819,7 +1822,7 @@ impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
         mut self,
         value: Option<Vec<list_posts::ScheduledPost<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1834,11 +1837,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ScheduledPostBuilder<'a, scheduled_post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ScheduledPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1846,12 +1849,12 @@ where
 impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
     /// Set the `embed` field (optional)
     pub fn embed(mut self, value: impl Into<Option<ScheduledPostEmbed<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `embed` field to an Option value (optional)
     pub fn maybe_embed(mut self, value: Option<ScheduledPostEmbed<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1859,12 +1862,12 @@ impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
 impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
     /// Set the `errorMsg` field (optional)
     pub fn error_msg(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `errorMsg` field to an Option value (optional)
     pub fn maybe_error_msg(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1872,12 +1875,12 @@ impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
 impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
     /// Set the `executedAt` field (optional)
     pub fn executed_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `executedAt` field to an Option value (optional)
     pub fn maybe_executed_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1885,12 +1888,12 @@ impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
 impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -1905,11 +1908,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ScheduledPostBuilder<'a, scheduled_post_state::SetId<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         ScheduledPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1917,12 +1920,12 @@ where
 impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -1937,11 +1940,11 @@ where
         mut self,
         value: impl Into<Vec<Language>>,
     ) -> ScheduledPostBuilder<'a, scheduled_post_state::SetLangs<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         ScheduledPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1949,12 +1952,12 @@ where
 impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
     /// Set the `parentPostId` field (optional)
     pub fn parent_post_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `parentPostId` field to an Option value (optional)
     pub fn maybe_parent_post_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -1962,12 +1965,12 @@ impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
 impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
     /// Set the `postgateCid` field (optional)
     pub fn postgate_cid(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `postgateCid` field to an Option value (optional)
     pub fn maybe_postgate_cid(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -1975,12 +1978,12 @@ impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
 impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
     /// Set the `postgateDisableEmbedding` field (optional)
     pub fn postgate_disable_embedding(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `postgateDisableEmbedding` field to an Option value (optional)
     pub fn maybe_postgate_disable_embedding(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -1988,12 +1991,12 @@ impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
 impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
     /// Set the `postgateUri` field (optional)
     pub fn postgate_uri(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `postgateUri` field to an Option value (optional)
     pub fn maybe_postgate_uri(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -2008,11 +2011,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ScheduledPostBuilder<'a, scheduled_post_state::SetRetryCount<S>> {
-        self.__unsafe_private_named.15 = Option::Some(value.into());
+        self._fields.15 = Option::Some(value.into());
         ScheduledPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2027,11 +2030,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ScheduledPostBuilder<'a, scheduled_post_state::SetScheduledAt<S>> {
-        self.__unsafe_private_named.16 = Option::Some(value.into());
+        self._fields.16 = Option::Some(value.into());
         ScheduledPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2046,11 +2049,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ScheduledPostBuilder<'a, scheduled_post_state::SetStatus<S>> {
-        self.__unsafe_private_named.17 = Option::Some(value.into());
+        self._fields.17 = Option::Some(value.into());
         ScheduledPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2065,11 +2068,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ScheduledPostBuilder<'a, scheduled_post_state::SetText<S>> {
-        self.__unsafe_private_named.18 = Option::Some(value.into());
+        self._fields.18 = Option::Some(value.into());
         ScheduledPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2077,12 +2080,12 @@ where
 impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
     /// Set the `threadDepth` field (optional)
     pub fn thread_depth(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `threadDepth` field to an Option value (optional)
     pub fn maybe_thread_depth(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -2090,12 +2093,12 @@ impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
 impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
     /// Set the `threadPosition` field (optional)
     pub fn thread_position(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `threadPosition` field to an Option value (optional)
     pub fn maybe_thread_position(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -2103,12 +2106,12 @@ impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
 impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
     /// Set the `threadgateCid` field (optional)
     pub fn threadgate_cid(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `threadgateCid` field to an Option value (optional)
     pub fn maybe_threadgate_cid(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -2119,7 +2122,7 @@ impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<ScheduledPostThreadgateRulesItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `threadgateRules` field to an Option value (optional)
@@ -2127,7 +2130,7 @@ impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
         mut self,
         value: Option<Vec<ScheduledPostThreadgateRulesItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -2135,12 +2138,12 @@ impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
 impl<'a, S: scheduled_post_state::State> ScheduledPostBuilder<'a, S> {
     /// Set the `threadgateUri` field (optional)
     pub fn threadgate_uri(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `threadgateUri` field to an Option value (optional)
     pub fn maybe_threadgate_uri(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -2155,11 +2158,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ScheduledPostBuilder<'a, scheduled_post_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.24 = Option::Some(value.into());
+        self._fields.24 = Option::Some(value.into());
         ScheduledPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2174,11 +2177,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ScheduledPostBuilder<'a, scheduled_post_state::SetUserId<S>> {
-        self.__unsafe_private_named.25 = Option::Some(value.into());
+        self._fields.25 = Option::Some(value.into());
         ScheduledPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2186,45 +2189,45 @@ where
 impl<'a, S> ScheduledPostBuilder<'a, S>
 where
     S: scheduled_post_state::State,
-    S::Langs: scheduled_post_state::IsSet,
-    S::Status: scheduled_post_state::IsSet,
-    S::CreatedAt: scheduled_post_state::IsSet,
-    S::UserId: scheduled_post_state::IsSet,
-    S::UpdatedAt: scheduled_post_state::IsSet,
-    S::ScheduledAt: scheduled_post_state::IsSet,
     S::Text: scheduled_post_state::IsSet,
+    S::ScheduledAt: scheduled_post_state::IsSet,
     S::Id: scheduled_post_state::IsSet,
+    S::UpdatedAt: scheduled_post_state::IsSet,
+    S::CreatedAt: scheduled_post_state::IsSet,
+    S::Status: scheduled_post_state::IsSet,
+    S::UserId: scheduled_post_state::IsSet,
     S::RetryCount: scheduled_post_state::IsSet,
+    S::Langs: scheduled_post_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ScheduledPost<'a> {
         ScheduledPost {
-            at_rkey: self.__unsafe_private_named.0,
-            at_uri: self.__unsafe_private_named.1,
-            children: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            embed: self.__unsafe_private_named.4,
-            error_msg: self.__unsafe_private_named.5,
-            executed_at: self.__unsafe_private_named.6,
-            facets: self.__unsafe_private_named.7,
-            id: self.__unsafe_private_named.8.unwrap(),
-            labels: self.__unsafe_private_named.9,
-            langs: self.__unsafe_private_named.10.unwrap(),
-            parent_post_id: self.__unsafe_private_named.11,
-            postgate_cid: self.__unsafe_private_named.12,
-            postgate_disable_embedding: self.__unsafe_private_named.13,
-            postgate_uri: self.__unsafe_private_named.14,
-            retry_count: self.__unsafe_private_named.15.unwrap(),
-            scheduled_at: self.__unsafe_private_named.16.unwrap(),
-            status: self.__unsafe_private_named.17.unwrap(),
-            text: self.__unsafe_private_named.18.unwrap(),
-            thread_depth: self.__unsafe_private_named.19,
-            thread_position: self.__unsafe_private_named.20,
-            threadgate_cid: self.__unsafe_private_named.21,
-            threadgate_rules: self.__unsafe_private_named.22,
-            threadgate_uri: self.__unsafe_private_named.23,
-            updated_at: self.__unsafe_private_named.24.unwrap(),
-            user_id: self.__unsafe_private_named.25.unwrap(),
+            at_rkey: self._fields.0,
+            at_uri: self._fields.1,
+            children: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            embed: self._fields.4,
+            error_msg: self._fields.5,
+            executed_at: self._fields.6,
+            facets: self._fields.7,
+            id: self._fields.8.unwrap(),
+            labels: self._fields.9,
+            langs: self._fields.10.unwrap(),
+            parent_post_id: self._fields.11,
+            postgate_cid: self._fields.12,
+            postgate_disable_embedding: self._fields.13,
+            postgate_uri: self._fields.14,
+            retry_count: self._fields.15.unwrap(),
+            scheduled_at: self._fields.16.unwrap(),
+            status: self._fields.17.unwrap(),
+            text: self._fields.18.unwrap(),
+            thread_depth: self._fields.19,
+            thread_position: self._fields.20,
+            threadgate_cid: self._fields.21,
+            threadgate_rules: self._fields.22,
+            threadgate_uri: self._fields.23,
+            updated_at: self._fields.24.unwrap(),
+            user_id: self._fields.25.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2237,32 +2240,32 @@ where
         >,
     ) -> ScheduledPost<'a> {
         ScheduledPost {
-            at_rkey: self.__unsafe_private_named.0,
-            at_uri: self.__unsafe_private_named.1,
-            children: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            embed: self.__unsafe_private_named.4,
-            error_msg: self.__unsafe_private_named.5,
-            executed_at: self.__unsafe_private_named.6,
-            facets: self.__unsafe_private_named.7,
-            id: self.__unsafe_private_named.8.unwrap(),
-            labels: self.__unsafe_private_named.9,
-            langs: self.__unsafe_private_named.10.unwrap(),
-            parent_post_id: self.__unsafe_private_named.11,
-            postgate_cid: self.__unsafe_private_named.12,
-            postgate_disable_embedding: self.__unsafe_private_named.13,
-            postgate_uri: self.__unsafe_private_named.14,
-            retry_count: self.__unsafe_private_named.15.unwrap(),
-            scheduled_at: self.__unsafe_private_named.16.unwrap(),
-            status: self.__unsafe_private_named.17.unwrap(),
-            text: self.__unsafe_private_named.18.unwrap(),
-            thread_depth: self.__unsafe_private_named.19,
-            thread_position: self.__unsafe_private_named.20,
-            threadgate_cid: self.__unsafe_private_named.21,
-            threadgate_rules: self.__unsafe_private_named.22,
-            threadgate_uri: self.__unsafe_private_named.23,
-            updated_at: self.__unsafe_private_named.24.unwrap(),
-            user_id: self.__unsafe_private_named.25.unwrap(),
+            at_rkey: self._fields.0,
+            at_uri: self._fields.1,
+            children: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            embed: self._fields.4,
+            error_msg: self._fields.5,
+            executed_at: self._fields.6,
+            facets: self._fields.7,
+            id: self._fields.8.unwrap(),
+            labels: self._fields.9,
+            langs: self._fields.10.unwrap(),
+            parent_post_id: self._fields.11,
+            postgate_cid: self._fields.12,
+            postgate_disable_embedding: self._fields.13,
+            postgate_uri: self._fields.14,
+            retry_count: self._fields.15.unwrap(),
+            scheduled_at: self._fields.16.unwrap(),
+            status: self._fields.17.unwrap(),
+            text: self._fields.18.unwrap(),
+            thread_depth: self._fields.19,
+            thread_position: self._fields.20,
+            threadgate_cid: self._fields.21,
+            threadgate_rules: self._fields.22,
+            threadgate_uri: self._fields.23,
+            updated_at: self._fields.24.unwrap(),
+            user_id: self._fields.25.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_chronosky/schedule/retry_failed_posts.rs b/crates/jacquard-api/src/app_chronosky/schedule/retry_failed_posts.rs
index 40add73b..f81bff37 100644
--- a/crates/jacquard-api/src/app_chronosky/schedule/retry_failed_posts.rs
+++ b/crates/jacquard-api/src/app_chronosky/schedule/retry_failed_posts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/app_chronosky/schedule/update_post.rs b/crates/jacquard-api/src/app_chronosky/schedule/update_post.rs
index 08f7a394..8ea2d755 100644
--- a/crates/jacquard-api/src/app_chronosky/schedule/update_post.rs
+++ b/crates/jacquard-api/src/app_chronosky/schedule/update_post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -594,9 +597,9 @@ pub mod images_embed_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImagesEmbedBuilder<'a, S: images_embed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<update_post::ImageRef<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<update_post::ImageRef<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ImagesEmbed<'a> {
@@ -610,9 +613,9 @@ impl<'a> ImagesEmbedBuilder<'a, images_embed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImagesEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -627,11 +630,11 @@ where
         mut self,
         value: impl Into<Vec<update_post::ImageRef<'a>>>,
     ) -> ImagesEmbedBuilder<'a, images_embed_state::SetImages<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ImagesEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -644,7 +647,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ImagesEmbed<'a> {
         ImagesEmbed {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -657,7 +660,7 @@ where
         >,
     ) -> ImagesEmbed<'a> {
         ImagesEmbed {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_dropanchor/checkin.rs b/crates/jacquard-api/src/app_dropanchor/checkin.rs
index a858817c..36e4171e 100644
--- a/crates/jacquard-api/src/app_dropanchor/checkin.rs
+++ b/crates/jacquard-api/src/app_dropanchor/checkin.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -983,13 +986,9 @@ pub mod checkin_image_state {
 
 /// Builder for constructing an instance of this type
 pub struct CheckinImageBuilder<'a, S: checkin_image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<BlobRef<'a>>,
-        Option<BlobRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<BlobRef<'a>>, Option<BlobRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CheckinImage<'a> {
@@ -1003,9 +1002,9 @@ impl<'a> CheckinImageBuilder<'a, checkin_image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CheckinImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1013,12 +1012,12 @@ impl<'a> CheckinImageBuilder<'a, checkin_image_state::Empty> {
 impl<'a, S: checkin_image_state::State> CheckinImageBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1033,11 +1032,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> CheckinImageBuilder<'a, checkin_image_state::SetFullsize<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CheckinImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1052,11 +1051,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> CheckinImageBuilder<'a, checkin_image_state::SetThumb<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CheckinImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1070,9 +1069,9 @@ where
     /// Build the final struct
     pub fn build(self) -> CheckinImage<'a> {
         CheckinImage {
-            alt: self.__unsafe_private_named.0,
-            fullsize: self.__unsafe_private_named.1.unwrap(),
-            thumb: self.__unsafe_private_named.2.unwrap(),
+            alt: self._fields.0,
+            fullsize: self._fields.1.unwrap(),
+            thumb: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1085,9 +1084,9 @@ where
         >,
     ) -> CheckinImage<'a> {
         CheckinImage {
-            alt: self.__unsafe_private_named.0,
-            fullsize: self.__unsafe_private_named.1.unwrap(),
-            thumb: self.__unsafe_private_named.2.unwrap(),
+            alt: self._fields.0,
+            fullsize: self._fields.1.unwrap(),
+            thumb: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1104,8 +1103,8 @@ pub mod checkin_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Text;
-        type Address;
         type CreatedAt;
+        type Address;
         type Geo;
     }
     /// Empty state - all required fields are unset
@@ -1113,8 +1112,8 @@ pub mod checkin_state {
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Text = Unset;
-        type Address = Unset;
         type CreatedAt = Unset;
+        type Address = Unset;
         type Geo = Unset;
     }
     ///State transition - sets the `text` field to Set
@@ -1122,17 +1121,8 @@ pub mod checkin_state {
     impl<S: State> sealed::Sealed for SetText<S> {}
     impl<S: State> State for SetText<S> {
         type Text = Set<members::text>;
-        type Address = S::Address;
-        type CreatedAt = S::CreatedAt;
-        type Geo = S::Geo;
-    }
-    ///State transition - sets the `address` field to Set
-    pub struct SetAddress<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAddress<S> {}
-    impl<S: State> State for SetAddress<S> {
-        type Text = S::Text;
-        type Address = Set<members::address>;
         type CreatedAt = S::CreatedAt;
+        type Address = S::Address;
         type Geo = S::Geo;
     }
     ///State transition - sets the `created_at` field to Set
@@ -1140,8 +1130,17 @@ pub mod checkin_state {
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type Text = S::Text;
-        type Address = S::Address;
         type CreatedAt = Set<members::created_at>;
+        type Address = S::Address;
+        type Geo = S::Geo;
+    }
+    ///State transition - sets the `address` field to Set
+    pub struct SetAddress<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAddress<S> {}
+    impl<S: State> State for SetAddress<S> {
+        type Text = S::Text;
+        type CreatedAt = S::CreatedAt;
+        type Address = Set<members::address>;
         type Geo = S::Geo;
     }
     ///State transition - sets the `geo` field to Set
@@ -1149,8 +1148,8 @@ pub mod checkin_state {
     impl<S: State> sealed::Sealed for SetGeo<S> {}
     impl<S: State> State for SetGeo<S> {
         type Text = S::Text;
-        type Address = S::Address;
         type CreatedAt = S::CreatedAt;
+        type Address = S::Address;
         type Geo = Set<members::geo>;
     }
     /// Marker types for field names
@@ -1158,10 +1157,10 @@ pub mod checkin_state {
     pub mod members {
         ///Marker type for the `text` field
         pub struct text(());
-        ///Marker type for the `address` field
-        pub struct address(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `address` field
+        pub struct address(());
         ///Marker type for the `geo` field
         pub struct geo(());
     }
@@ -1169,8 +1168,8 @@ pub mod checkin_state {
 
 /// Builder for constructing an instance of this type
 pub struct CheckinBuilder<'a, S: checkin_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<checkin::Address<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -1181,7 +1180,7 @@ pub struct CheckinBuilder<'a, S: checkin_state::State> {
         Option<checkin::CheckinImage<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Checkin<'a> {
@@ -1195,19 +1194,9 @@ impl<'a> CheckinBuilder<'a, checkin_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CheckinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1222,11 +1211,11 @@ where
         mut self,
         value: impl Into<checkin::Address<'a>>,
     ) -> CheckinBuilder<'a, checkin_state::SetAddress<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CheckinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1234,12 +1223,12 @@ where
 impl<'a, S: checkin_state::State> CheckinBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1247,12 +1236,12 @@ impl<'a, S: checkin_state::State> CheckinBuilder<'a, S> {
 impl<'a, S: checkin_state::State> CheckinBuilder<'a, S> {
     /// Set the `categoryGroup` field (optional)
     pub fn category_group(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `categoryGroup` field to an Option value (optional)
     pub fn maybe_category_group(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1260,12 +1249,12 @@ impl<'a, S: checkin_state::State> CheckinBuilder<'a, S> {
 impl<'a, S: checkin_state::State> CheckinBuilder<'a, S> {
     /// Set the `categoryIcon` field (optional)
     pub fn category_icon(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `categoryIcon` field to an Option value (optional)
     pub fn maybe_category_icon(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1280,11 +1269,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CheckinBuilder<'a, checkin_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         CheckinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1292,12 +1281,12 @@ where
 impl<'a, S: checkin_state::State> CheckinBuilder<'a, S> {
     /// Set the `fsq` field (optional)
     pub fn fsq(mut self, value: impl Into<Option<checkin::FsqPlace<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `fsq` field to an Option value (optional)
     pub fn maybe_fsq(mut self, value: Option<checkin::FsqPlace<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1312,11 +1301,11 @@ where
         mut self,
         value: impl Into<checkin::Geo<'a>>,
     ) -> CheckinBuilder<'a, checkin_state::SetGeo<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         CheckinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1324,12 +1313,12 @@ where
 impl<'a, S: checkin_state::State> CheckinBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<checkin::CheckinImage<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<checkin::CheckinImage<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -1344,11 +1333,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CheckinBuilder<'a, checkin_state::SetText<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         CheckinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1357,22 +1346,22 @@ impl<'a, S> CheckinBuilder<'a, S>
 where
     S: checkin_state::State,
     S::Text: checkin_state::IsSet,
-    S::Address: checkin_state::IsSet,
     S::CreatedAt: checkin_state::IsSet,
+    S::Address: checkin_state::IsSet,
     S::Geo: checkin_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Checkin<'a> {
         Checkin {
-            address: self.__unsafe_private_named.0.unwrap(),
-            category: self.__unsafe_private_named.1,
-            category_group: self.__unsafe_private_named.2,
-            category_icon: self.__unsafe_private_named.3,
-            created_at: self.__unsafe_private_named.4.unwrap(),
-            fsq: self.__unsafe_private_named.5,
-            geo: self.__unsafe_private_named.6.unwrap(),
-            image: self.__unsafe_private_named.7,
-            text: self.__unsafe_private_named.8.unwrap(),
+            address: self._fields.0.unwrap(),
+            category: self._fields.1,
+            category_group: self._fields.2,
+            category_icon: self._fields.3,
+            created_at: self._fields.4.unwrap(),
+            fsq: self._fields.5,
+            geo: self._fields.6.unwrap(),
+            image: self._fields.7,
+            text: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1385,15 +1374,15 @@ where
         >,
     ) -> Checkin<'a> {
         Checkin {
-            address: self.__unsafe_private_named.0.unwrap(),
-            category: self.__unsafe_private_named.1,
-            category_group: self.__unsafe_private_named.2,
-            category_icon: self.__unsafe_private_named.3,
-            created_at: self.__unsafe_private_named.4.unwrap(),
-            fsq: self.__unsafe_private_named.5,
-            geo: self.__unsafe_private_named.6.unwrap(),
-            image: self.__unsafe_private_named.7,
-            text: self.__unsafe_private_named.8.unwrap(),
+            address: self._fields.0.unwrap(),
+            category: self._fields.1,
+            category_group: self._fields.2,
+            category_icon: self._fields.3,
+            created_at: self._fields.4.unwrap(),
+            fsq: self._fields.5,
+            geo: self._fields.6.unwrap(),
+            image: self._fields.7,
+            text: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_dropanchor/comment.rs b/crates/jacquard-api/src/app_dropanchor/comment.rs
index 1d1f0403..ac3539bf 100644
--- a/crates/jacquard-api/src/app_dropanchor/comment.rs
+++ b/crates/jacquard-api/src/app_dropanchor/comment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -155,62 +158,58 @@ pub mod comment_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type CheckinRef;
-        type Text;
         type CreatedAt;
+        type Text;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type CheckinRef = Unset;
-        type Text = Unset;
         type CreatedAt = Unset;
+        type Text = Unset;
     }
     ///State transition - sets the `checkin_ref` field to Set
     pub struct SetCheckinRef<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCheckinRef<S> {}
     impl<S: State> State for SetCheckinRef<S> {
         type CheckinRef = Set<members::checkin_ref>;
-        type Text = S::Text;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `text` field to Set
-    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetText<S> {}
-    impl<S: State> State for SetText<S> {
-        type CheckinRef = S::CheckinRef;
-        type Text = Set<members::text>;
         type CreatedAt = S::CreatedAt;
+        type Text = S::Text;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type CheckinRef = S::CheckinRef;
-        type Text = S::Text;
         type CreatedAt = Set<members::created_at>;
+        type Text = S::Text;
+    }
+    ///State transition - sets the `text` field to Set
+    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetText<S> {}
+    impl<S: State> State for SetText<S> {
+        type CheckinRef = S::CheckinRef;
+        type CreatedAt = S::CreatedAt;
+        type Text = Set<members::text>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `checkin_ref` field
         pub struct checkin_ref(());
-        ///Marker type for the `text` field
-        pub struct text(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `text` field
+        pub struct text(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CommentBuilder<'a, S: comment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<comment::StrongRef<'a>>,
-        Option<Datetime>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<comment::StrongRef<'a>>, Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Comment<'a> {
@@ -224,9 +223,9 @@ impl<'a> CommentBuilder<'a, comment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -241,11 +240,11 @@ where
         mut self,
         value: impl Into<comment::StrongRef<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetCheckinRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -260,11 +259,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CommentBuilder<'a, comment_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -279,11 +278,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetText<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -292,15 +291,15 @@ impl<'a, S> CommentBuilder<'a, S>
 where
     S: comment_state::State,
     S::CheckinRef: comment_state::IsSet,
-    S::Text: comment_state::IsSet,
     S::CreatedAt: comment_state::IsSet,
+    S::Text: comment_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Comment<'a> {
         Comment {
-            checkin_ref: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            text: self.__unsafe_private_named.2.unwrap(),
+            checkin_ref: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            text: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -313,9 +312,9 @@ where
         >,
     ) -> Comment<'a> {
         Comment {
-            checkin_ref: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            text: self.__unsafe_private_named.2.unwrap(),
+            checkin_ref: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            text: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -478,9 +477,9 @@ pub mod strong_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct StrongRefBuilder<'a, S: strong_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> StrongRef<'a> {
@@ -494,9 +493,9 @@ impl<'a> StrongRefBuilder<'a, strong_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StrongRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -511,11 +510,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> StrongRefBuilder<'a, strong_ref_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StrongRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -530,11 +529,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> StrongRefBuilder<'a, strong_ref_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StrongRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -548,8 +547,8 @@ where
     /// Build the final struct
     pub fn build(self) -> StrongRef<'a> {
         StrongRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -562,8 +561,8 @@ where
         >,
     ) -> StrongRef<'a> {
         StrongRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_dropanchor/like.rs b/crates/jacquard-api/src/app_dropanchor/like.rs
index f8962874..a8b1161c 100644
--- a/crates/jacquard-api/src/app_dropanchor/like.rs
+++ b/crates/jacquard-api/src/app_dropanchor/like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -140,45 +143,45 @@ pub mod like_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CheckinRef;
         type CreatedAt;
+        type CheckinRef;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CheckinRef = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `checkin_ref` field to Set
-    pub struct SetCheckinRef<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCheckinRef<S> {}
-    impl<S: State> State for SetCheckinRef<S> {
-        type CheckinRef = Set<members::checkin_ref>;
-        type CreatedAt = S::CreatedAt;
+        type CheckinRef = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type CheckinRef = S::CheckinRef;
         type CreatedAt = Set<members::created_at>;
+        type CheckinRef = S::CheckinRef;
+    }
+    ///State transition - sets the `checkin_ref` field to Set
+    pub struct SetCheckinRef<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCheckinRef<S> {}
+    impl<S: State> State for SetCheckinRef<S> {
+        type CreatedAt = S::CreatedAt;
+        type CheckinRef = Set<members::checkin_ref>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `checkin_ref` field
-        pub struct checkin_ref(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `checkin_ref` field
+        pub struct checkin_ref(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<like::StrongRef<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<like::StrongRef<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -192,9 +195,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,11 +212,11 @@ where
         mut self,
         value: impl Into<like::StrongRef<'a>>,
     ) -> LikeBuilder<'a, like_state::SetCheckinRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -228,11 +231,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -240,14 +243,14 @@ where
 impl<'a, S> LikeBuilder<'a, S>
 where
     S: like_state::State,
-    S::CheckinRef: like_state::IsSet,
     S::CreatedAt: like_state::IsSet,
+    S::CheckinRef: like_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            checkin_ref: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
+            checkin_ref: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -260,8 +263,8 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            checkin_ref: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
+            checkin_ref: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -377,45 +380,45 @@ pub mod strong_ref_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type Cid;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type Cid = Unset;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Cid = S::Cid;
+        type Uri = Unset;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type Uri = S::Uri;
         type Cid = Set<members::cid>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Cid = S::Cid;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `cid` field
         pub struct cid(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct StrongRefBuilder<'a, S: strong_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> StrongRef<'a> {
@@ -429,9 +432,9 @@ impl<'a> StrongRefBuilder<'a, strong_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StrongRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -446,11 +449,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> StrongRefBuilder<'a, strong_ref_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StrongRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -465,11 +468,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> StrongRefBuilder<'a, strong_ref_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StrongRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -477,14 +480,14 @@ where
 impl<'a, S> StrongRefBuilder<'a, S>
 where
     S: strong_ref_state::State,
-    S::Uri: strong_ref_state::IsSet,
     S::Cid: strong_ref_state::IsSet,
+    S::Uri: strong_ref_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> StrongRef<'a> {
         StrongRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -497,8 +500,8 @@ where
         >,
     ) -> StrongRef<'a> {
         StrongRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_fitsky/bluesky_post.rs b/crates/jacquard-api/src/app_fitsky/bluesky_post.rs
index 51d049ef..ab74899b 100644
--- a/crates/jacquard-api/src/app_fitsky/bluesky_post.rs
+++ b/crates/jacquard-api/src/app_fitsky/bluesky_post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -110,49 +113,49 @@ pub mod bluesky_post_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type WorkoutUri;
         type PostUri;
+        type WorkoutUri;
         type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type WorkoutUri = Unset;
         type PostUri = Unset;
+        type WorkoutUri = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `workout_uri` field to Set
-    pub struct SetWorkoutUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetWorkoutUri<S> {}
-    impl<S: State> State for SetWorkoutUri<S> {
-        type WorkoutUri = Set<members::workout_uri>;
-        type PostUri = S::PostUri;
-        type CreatedAt = S::CreatedAt;
-    }
     ///State transition - sets the `post_uri` field to Set
     pub struct SetPostUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPostUri<S> {}
     impl<S: State> State for SetPostUri<S> {
-        type WorkoutUri = S::WorkoutUri;
         type PostUri = Set<members::post_uri>;
+        type WorkoutUri = S::WorkoutUri;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `workout_uri` field to Set
+    pub struct SetWorkoutUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetWorkoutUri<S> {}
+    impl<S: State> State for SetWorkoutUri<S> {
+        type PostUri = S::PostUri;
+        type WorkoutUri = Set<members::workout_uri>;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type WorkoutUri = S::WorkoutUri;
         type PostUri = S::PostUri;
+        type WorkoutUri = S::WorkoutUri;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `workout_uri` field
-        pub struct workout_uri(());
         ///Marker type for the `post_uri` field
         pub struct post_uri(());
+        ///Marker type for the `workout_uri` field
+        pub struct workout_uri(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
     }
@@ -160,9 +163,9 @@ pub mod bluesky_post_state {
 
 /// Builder for constructing an instance of this type
 pub struct BlueskyPostBuilder<'a, S: bluesky_post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BlueskyPost<'a> {
@@ -176,9 +179,9 @@ impl<'a> BlueskyPostBuilder<'a, bluesky_post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlueskyPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -193,11 +196,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BlueskyPostBuilder<'a, bluesky_post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlueskyPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,11 +215,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> BlueskyPostBuilder<'a, bluesky_post_state::SetPostUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BlueskyPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -231,11 +234,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> BlueskyPostBuilder<'a, bluesky_post_state::SetWorkoutUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BlueskyPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -243,16 +246,16 @@ where
 impl<'a, S> BlueskyPostBuilder<'a, S>
 where
     S: bluesky_post_state::State,
-    S::WorkoutUri: bluesky_post_state::IsSet,
     S::PostUri: bluesky_post_state::IsSet,
+    S::WorkoutUri: bluesky_post_state::IsSet,
     S::CreatedAt: bluesky_post_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> BlueskyPost<'a> {
         BlueskyPost {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            post_uri: self.__unsafe_private_named.1.unwrap(),
-            workout_uri: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            post_uri: self._fields.1.unwrap(),
+            workout_uri: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -265,9 +268,9 @@ where
         >,
     ) -> BlueskyPost<'a> {
         BlueskyPost {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            post_uri: self.__unsafe_private_named.1.unwrap(),
-            workout_uri: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            post_uri: self._fields.1.unwrap(),
+            workout_uri: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_fitsky/goal.rs b/crates/jacquard-api/src/app_fitsky/goal.rs
index 3c5b81b1..a918f14c 100644
--- a/crates/jacquard-api/src/app_fitsky/goal.rs
+++ b/crates/jacquard-api/src/app_fitsky/goal.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -341,9 +344,9 @@ pub mod goal_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Metric;
-        type StartDate;
         type CreatedAt;
         type TargetValue;
+        type StartDate;
         type Period;
     }
     /// Empty state - all required fields are unset
@@ -351,9 +354,9 @@ pub mod goal_state {
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Metric = Unset;
-        type StartDate = Unset;
         type CreatedAt = Unset;
         type TargetValue = Unset;
+        type StartDate = Unset;
         type Period = Unset;
     }
     ///State transition - sets the `metric` field to Set
@@ -361,19 +364,9 @@ pub mod goal_state {
     impl<S: State> sealed::Sealed for SetMetric<S> {}
     impl<S: State> State for SetMetric<S> {
         type Metric = Set<members::metric>;
-        type StartDate = S::StartDate;
-        type CreatedAt = S::CreatedAt;
-        type TargetValue = S::TargetValue;
-        type Period = S::Period;
-    }
-    ///State transition - sets the `start_date` field to Set
-    pub struct SetStartDate<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStartDate<S> {}
-    impl<S: State> State for SetStartDate<S> {
-        type Metric = S::Metric;
-        type StartDate = Set<members::start_date>;
         type CreatedAt = S::CreatedAt;
         type TargetValue = S::TargetValue;
+        type StartDate = S::StartDate;
         type Period = S::Period;
     }
     ///State transition - sets the `created_at` field to Set
@@ -381,9 +374,9 @@ pub mod goal_state {
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type Metric = S::Metric;
-        type StartDate = S::StartDate;
         type CreatedAt = Set<members::created_at>;
         type TargetValue = S::TargetValue;
+        type StartDate = S::StartDate;
         type Period = S::Period;
     }
     ///State transition - sets the `target_value` field to Set
@@ -391,9 +384,19 @@ pub mod goal_state {
     impl<S: State> sealed::Sealed for SetTargetValue<S> {}
     impl<S: State> State for SetTargetValue<S> {
         type Metric = S::Metric;
-        type StartDate = S::StartDate;
         type CreatedAt = S::CreatedAt;
         type TargetValue = Set<members::target_value>;
+        type StartDate = S::StartDate;
+        type Period = S::Period;
+    }
+    ///State transition - sets the `start_date` field to Set
+    pub struct SetStartDate<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStartDate<S> {}
+    impl<S: State> State for SetStartDate<S> {
+        type Metric = S::Metric;
+        type CreatedAt = S::CreatedAt;
+        type TargetValue = S::TargetValue;
+        type StartDate = Set<members::start_date>;
         type Period = S::Period;
     }
     ///State transition - sets the `period` field to Set
@@ -401,9 +404,9 @@ pub mod goal_state {
     impl<S: State> sealed::Sealed for SetPeriod<S> {}
     impl<S: State> State for SetPeriod<S> {
         type Metric = S::Metric;
-        type StartDate = S::StartDate;
         type CreatedAt = S::CreatedAt;
         type TargetValue = S::TargetValue;
+        type StartDate = S::StartDate;
         type Period = Set<members::period>;
     }
     /// Marker types for field names
@@ -411,12 +414,12 @@ pub mod goal_state {
     pub mod members {
         ///Marker type for the `metric` field
         pub struct metric(());
-        ///Marker type for the `start_date` field
-        pub struct start_date(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `target_value` field
         pub struct target_value(());
+        ///Marker type for the `start_date` field
+        pub struct start_date(());
         ///Marker type for the `period` field
         pub struct period(());
     }
@@ -424,8 +427,8 @@ pub mod goal_state {
 
 /// Builder for constructing an instance of this type
 pub struct GoalBuilder<'a, S: goal_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<GoalMetric<'a>>,
@@ -433,7 +436,7 @@ pub struct GoalBuilder<'a, S: goal_state::State> {
         Option<Datetime>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Goal<'a> {
@@ -447,9 +450,9 @@ impl<'a> GoalBuilder<'a, goal_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GoalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -464,11 +467,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> GoalBuilder<'a, goal_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GoalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -476,12 +479,12 @@ where
 impl<'a, S: goal_state::State> GoalBuilder<'a, S> {
     /// Set the `endDate` field (optional)
     pub fn end_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `endDate` field to an Option value (optional)
     pub fn maybe_end_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -496,11 +499,11 @@ where
         mut self,
         value: impl Into<GoalMetric<'a>>,
     ) -> GoalBuilder<'a, goal_state::SetMetric<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GoalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -515,11 +518,11 @@ where
         mut self,
         value: impl Into<GoalPeriod<'a>>,
     ) -> GoalBuilder<'a, goal_state::SetPeriod<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         GoalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -534,11 +537,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> GoalBuilder<'a, goal_state::SetStartDate<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         GoalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -553,11 +556,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> GoalBuilder<'a, goal_state::SetTargetValue<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         GoalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -566,20 +569,20 @@ impl<'a, S> GoalBuilder<'a, S>
 where
     S: goal_state::State,
     S::Metric: goal_state::IsSet,
-    S::StartDate: goal_state::IsSet,
     S::CreatedAt: goal_state::IsSet,
     S::TargetValue: goal_state::IsSet,
+    S::StartDate: goal_state::IsSet,
     S::Period: goal_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Goal<'a> {
         Goal {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            end_date: self.__unsafe_private_named.1,
-            metric: self.__unsafe_private_named.2.unwrap(),
-            period: self.__unsafe_private_named.3.unwrap(),
-            start_date: self.__unsafe_private_named.4.unwrap(),
-            target_value: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            end_date: self._fields.1,
+            metric: self._fields.2.unwrap(),
+            period: self._fields.3.unwrap(),
+            start_date: self._fields.4.unwrap(),
+            target_value: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -592,12 +595,12 @@ where
         >,
     ) -> Goal<'a> {
         Goal {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            end_date: self.__unsafe_private_named.1,
-            metric: self.__unsafe_private_named.2.unwrap(),
-            period: self.__unsafe_private_named.3.unwrap(),
-            start_date: self.__unsafe_private_named.4.unwrap(),
-            target_value: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            end_date: self._fields.1,
+            metric: self._fields.2.unwrap(),
+            period: self._fields.3.unwrap(),
+            start_date: self._fields.4.unwrap(),
+            target_value: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_fitsky/profile.rs b/crates/jacquard-api/src/app_fitsky/profile.rs
index 47e18719..7b38cd6d 100644
--- a/crates/jacquard-api/src/app_fitsky/profile.rs
+++ b/crates/jacquard-api/src/app_fitsky/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -324,8 +327,8 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -335,7 +338,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<ProfileUnitSystem<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -349,9 +352,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -359,12 +362,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -372,12 +375,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `bio` field (optional)
     pub fn bio(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `bio` field to an Option value (optional)
     pub fn maybe_bio(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -385,12 +388,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -398,12 +401,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `dateOfBirth` field (optional)
     pub fn date_of_birth(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `dateOfBirth` field to an Option value (optional)
     pub fn maybe_date_of_birth(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -411,12 +414,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `heightCm` field (optional)
     pub fn height_cm(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `heightCm` field to an Option value (optional)
     pub fn maybe_height_cm(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -424,12 +427,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `publicProfile` field (optional)
     pub fn public_profile(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `publicProfile` field to an Option value (optional)
     pub fn maybe_public_profile(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -440,12 +443,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProfileUnitSystem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `unitSystem` field to an Option value (optional)
     pub fn maybe_unit_system(mut self, value: Option<ProfileUnitSystem<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -453,12 +456,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `weightGrams` field (optional)
     pub fn weight_grams(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `weightGrams` field to an Option value (optional)
     pub fn maybe_weight_grams(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -470,14 +473,14 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            banner: self.__unsafe_private_named.0,
-            bio: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            date_of_birth: self.__unsafe_private_named.3,
-            height_cm: self.__unsafe_private_named.4,
-            public_profile: self.__unsafe_private_named.5,
-            unit_system: self.__unsafe_private_named.6,
-            weight_grams: self.__unsafe_private_named.7,
+            banner: self._fields.0,
+            bio: self._fields.1,
+            created_at: self._fields.2,
+            date_of_birth: self._fields.3,
+            height_cm: self._fields.4,
+            public_profile: self._fields.5,
+            unit_system: self._fields.6,
+            weight_grams: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -490,14 +493,14 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            banner: self.__unsafe_private_named.0,
-            bio: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            date_of_birth: self.__unsafe_private_named.3,
-            height_cm: self.__unsafe_private_named.4,
-            public_profile: self.__unsafe_private_named.5,
-            unit_system: self.__unsafe_private_named.6,
-            weight_grams: self.__unsafe_private_named.7,
+            banner: self._fields.0,
+            bio: self._fields.1,
+            created_at: self._fields.2,
+            date_of_birth: self._fields.3,
+            height_cm: self._fields.4,
+            public_profile: self._fields.5,
+            unit_system: self._fields.6,
+            weight_grams: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_fitsky/trend.rs b/crates/jacquard-api/src/app_fitsky/trend.rs
index 2998023a..89a2d070 100644
--- a/crates/jacquard-api/src/app_fitsky/trend.rs
+++ b/crates/jacquard-api/src/app_fitsky/trend.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -693,45 +696,45 @@ pub mod data_point_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Value;
         type Date;
+        type Value;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Value = Unset;
         type Date = Unset;
-    }
-    ///State transition - sets the `value` field to Set
-    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetValue<S> {}
-    impl<S: State> State for SetValue<S> {
-        type Value = Set<members::value>;
-        type Date = S::Date;
+        type Value = Unset;
     }
     ///State transition - sets the `date` field to Set
     pub struct SetDate<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDate<S> {}
     impl<S: State> State for SetDate<S> {
-        type Value = S::Value;
         type Date = Set<members::date>;
+        type Value = S::Value;
+    }
+    ///State transition - sets the `value` field to Set
+    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetValue<S> {}
+    impl<S: State> State for SetValue<S> {
+        type Date = S::Date;
+        type Value = Set<members::value>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `value` field
-        pub struct value(());
         ///Marker type for the `date` field
         pub struct date(());
+        ///Marker type for the `value` field
+        pub struct value(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DataPointBuilder<'a, S: data_point_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DataPoint<'a> {
@@ -745,9 +748,9 @@ impl<'a> DataPointBuilder<'a, data_point_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DataPointBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -762,11 +765,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DataPointBuilder<'a, data_point_state::SetDate<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DataPointBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -781,11 +784,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> DataPointBuilder<'a, data_point_state::SetValue<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DataPointBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -793,14 +796,14 @@ where
 impl<'a, S> DataPointBuilder<'a, S>
 where
     S: data_point_state::State,
-    S::Value: data_point_state::IsSet,
     S::Date: data_point_state::IsSet,
+    S::Value: data_point_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DataPoint<'a> {
         DataPoint {
-            date: self.__unsafe_private_named.0.unwrap(),
-            value: self.__unsafe_private_named.1.unwrap(),
+            date: self._fields.0.unwrap(),
+            value: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -813,8 +816,8 @@ where
         >,
     ) -> DataPoint<'a> {
         DataPoint {
-            date: self.__unsafe_private_named.0.unwrap(),
-            value: self.__unsafe_private_named.1.unwrap(),
+            date: self._fields.0.unwrap(),
+            value: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1007,91 +1010,91 @@ pub mod trend_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Metric;
-        type Period;
-        type Summary;
-        type CreatedAt;
         type WidgetType;
+        type CreatedAt;
+        type Summary;
+        type Period;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Metric = Unset;
-        type Period = Unset;
-        type Summary = Unset;
-        type CreatedAt = Unset;
         type WidgetType = Unset;
+        type CreatedAt = Unset;
+        type Summary = Unset;
+        type Period = Unset;
     }
     ///State transition - sets the `metric` field to Set
     pub struct SetMetric<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMetric<S> {}
     impl<S: State> State for SetMetric<S> {
         type Metric = Set<members::metric>;
-        type Period = S::Period;
-        type Summary = S::Summary;
-        type CreatedAt = S::CreatedAt;
         type WidgetType = S::WidgetType;
-    }
-    ///State transition - sets the `period` field to Set
-    pub struct SetPeriod<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPeriod<S> {}
-    impl<S: State> State for SetPeriod<S> {
-        type Metric = S::Metric;
-        type Period = Set<members::period>;
-        type Summary = S::Summary;
         type CreatedAt = S::CreatedAt;
-        type WidgetType = S::WidgetType;
+        type Summary = S::Summary;
+        type Period = S::Period;
     }
-    ///State transition - sets the `summary` field to Set
-    pub struct SetSummary<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSummary<S> {}
-    impl<S: State> State for SetSummary<S> {
+    ///State transition - sets the `widget_type` field to Set
+    pub struct SetWidgetType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetWidgetType<S> {}
+    impl<S: State> State for SetWidgetType<S> {
         type Metric = S::Metric;
-        type Period = S::Period;
-        type Summary = Set<members::summary>;
+        type WidgetType = Set<members::widget_type>;
         type CreatedAt = S::CreatedAt;
-        type WidgetType = S::WidgetType;
+        type Summary = S::Summary;
+        type Period = S::Period;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type Metric = S::Metric;
-        type Period = S::Period;
-        type Summary = S::Summary;
-        type CreatedAt = Set<members::created_at>;
         type WidgetType = S::WidgetType;
+        type CreatedAt = Set<members::created_at>;
+        type Summary = S::Summary;
+        type Period = S::Period;
     }
-    ///State transition - sets the `widget_type` field to Set
-    pub struct SetWidgetType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetWidgetType<S> {}
-    impl<S: State> State for SetWidgetType<S> {
+    ///State transition - sets the `summary` field to Set
+    pub struct SetSummary<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSummary<S> {}
+    impl<S: State> State for SetSummary<S> {
         type Metric = S::Metric;
+        type WidgetType = S::WidgetType;
+        type CreatedAt = S::CreatedAt;
+        type Summary = Set<members::summary>;
         type Period = S::Period;
-        type Summary = S::Summary;
+    }
+    ///State transition - sets the `period` field to Set
+    pub struct SetPeriod<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPeriod<S> {}
+    impl<S: State> State for SetPeriod<S> {
+        type Metric = S::Metric;
+        type WidgetType = S::WidgetType;
         type CreatedAt = S::CreatedAt;
-        type WidgetType = Set<members::widget_type>;
+        type Summary = S::Summary;
+        type Period = Set<members::period>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `metric` field
         pub struct metric(());
-        ///Marker type for the `period` field
-        pub struct period(());
-        ///Marker type for the `summary` field
-        pub struct summary(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `widget_type` field
         pub struct widget_type(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `summary` field
+        pub struct summary(());
+        ///Marker type for the `period` field
+        pub struct period(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TrendBuilder<'a, S: trend_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<TrendChartStyle<'a>>,
         Option<Datetime>,
@@ -1102,7 +1105,7 @@ pub struct TrendBuilder<'a, S: trend_state::State> {
         Option<trend::TrendSummary<'a>>,
         Option<TrendWidgetType<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Trend<'a> {
@@ -1116,19 +1119,9 @@ impl<'a> TrendBuilder<'a, trend_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TrendBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1136,12 +1129,12 @@ impl<'a> TrendBuilder<'a, trend_state::Empty> {
 impl<'a, S: trend_state::State> TrendBuilder<'a, S> {
     /// Set the `caption` field (optional)
     pub fn caption(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `caption` field to an Option value (optional)
     pub fn maybe_caption(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1149,12 +1142,12 @@ impl<'a, S: trend_state::State> TrendBuilder<'a, S> {
 impl<'a, S: trend_state::State> TrendBuilder<'a, S> {
     /// Set the `chartStyle` field (optional)
     pub fn chart_style(mut self, value: impl Into<Option<TrendChartStyle<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `chartStyle` field to an Option value (optional)
     pub fn maybe_chart_style(mut self, value: Option<TrendChartStyle<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1169,11 +1162,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TrendBuilder<'a, trend_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TrendBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1184,7 +1177,7 @@ impl<'a, S: trend_state::State> TrendBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<trend::DataPoint<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `dataPoints` field to an Option value (optional)
@@ -1192,7 +1185,7 @@ impl<'a, S: trend_state::State> TrendBuilder<'a, S> {
         mut self,
         value: Option<Vec<trend::DataPoint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1200,12 +1193,12 @@ impl<'a, S: trend_state::State> TrendBuilder<'a, S> {
 impl<'a, S: trend_state::State> TrendBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1220,11 +1213,11 @@ where
         mut self,
         value: impl Into<TrendMetric<'a>>,
     ) -> TrendBuilder<'a, trend_state::SetMetric<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         TrendBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1239,11 +1232,11 @@ where
         mut self,
         value: impl Into<TrendPeriod<'a>>,
     ) -> TrendBuilder<'a, trend_state::SetPeriod<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         TrendBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1258,11 +1251,11 @@ where
         mut self,
         value: impl Into<trend::TrendSummary<'a>>,
     ) -> TrendBuilder<'a, trend_state::SetSummary<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         TrendBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1277,11 +1270,11 @@ where
         mut self,
         value: impl Into<TrendWidgetType<'a>>,
     ) -> TrendBuilder<'a, trend_state::SetWidgetType<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         TrendBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1290,23 +1283,23 @@ impl<'a, S> TrendBuilder<'a, S>
 where
     S: trend_state::State,
     S::Metric: trend_state::IsSet,
-    S::Period: trend_state::IsSet,
-    S::Summary: trend_state::IsSet,
-    S::CreatedAt: trend_state::IsSet,
     S::WidgetType: trend_state::IsSet,
+    S::CreatedAt: trend_state::IsSet,
+    S::Summary: trend_state::IsSet,
+    S::Period: trend_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Trend<'a> {
         Trend {
-            caption: self.__unsafe_private_named.0,
-            chart_style: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            data_points: self.__unsafe_private_named.3,
-            image: self.__unsafe_private_named.4,
-            metric: self.__unsafe_private_named.5.unwrap(),
-            period: self.__unsafe_private_named.6.unwrap(),
-            summary: self.__unsafe_private_named.7.unwrap(),
-            widget_type: self.__unsafe_private_named.8.unwrap(),
+            caption: self._fields.0,
+            chart_style: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            data_points: self._fields.3,
+            image: self._fields.4,
+            metric: self._fields.5.unwrap(),
+            period: self._fields.6.unwrap(),
+            summary: self._fields.7.unwrap(),
+            widget_type: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1319,15 +1312,15 @@ where
         >,
     ) -> Trend<'a> {
         Trend {
-            caption: self.__unsafe_private_named.0,
-            chart_style: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            data_points: self.__unsafe_private_named.3,
-            image: self.__unsafe_private_named.4,
-            metric: self.__unsafe_private_named.5.unwrap(),
-            period: self.__unsafe_private_named.6.unwrap(),
-            summary: self.__unsafe_private_named.7.unwrap(),
-            widget_type: self.__unsafe_private_named.8.unwrap(),
+            caption: self._fields.0,
+            chart_style: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            data_points: self._fields.3,
+            image: self._fields.4,
+            metric: self._fields.5.unwrap(),
+            period: self._fields.6.unwrap(),
+            summary: self._fields.7.unwrap(),
+            widget_type: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_fitsky/workout.rs b/crates/jacquard-api/src/app_fitsky/workout.rs
index e4d74d6b..584a6300 100644
--- a/crates/jacquard-api/src/app_fitsky/workout.rs
+++ b/crates/jacquard-api/src/app_fitsky/workout.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -2666,45 +2669,45 @@ pub mod exercise_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type Sets;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type Sets = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Sets = S::Sets;
+        type Name = Unset;
     }
     ///State transition - sets the `sets` field to Set
     pub struct SetSets<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSets<S> {}
     impl<S: State> State for SetSets<S> {
-        type Name = S::Name;
         type Sets = Set<members::sets>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Sets = S::Sets;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `sets` field
         pub struct sets(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ExerciseBuilder<'a, S: exercise_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Vec<workout::ExerciseSet<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Vec<workout::ExerciseSet<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Exercise<'a> {
@@ -2718,9 +2721,9 @@ impl<'a> ExerciseBuilder<'a, exercise_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExerciseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2735,11 +2738,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ExerciseBuilder<'a, exercise_state::SetName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ExerciseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2754,11 +2757,11 @@ where
         mut self,
         value: impl Into<Vec<workout::ExerciseSet<'a>>>,
     ) -> ExerciseBuilder<'a, exercise_state::SetSets<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ExerciseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2766,14 +2769,14 @@ where
 impl<'a, S> ExerciseBuilder<'a, S>
 where
     S: exercise_state::State,
-    S::Name: exercise_state::IsSet,
     S::Sets: exercise_state::IsSet,
+    S::Name: exercise_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Exercise<'a> {
         Exercise {
-            name: self.__unsafe_private_named.0.unwrap(),
-            sets: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0.unwrap(),
+            sets: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2786,8 +2789,8 @@ where
         >,
     ) -> Exercise<'a> {
         Exercise {
-            name: self.__unsafe_private_named.0.unwrap(),
-            sets: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0.unwrap(),
+            sets: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2803,45 +2806,45 @@ pub mod heart_rate_sample_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Bpm;
         type Timestamp;
+        type Bpm;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Bpm = Unset;
         type Timestamp = Unset;
-    }
-    ///State transition - sets the `bpm` field to Set
-    pub struct SetBpm<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBpm<S> {}
-    impl<S: State> State for SetBpm<S> {
-        type Bpm = Set<members::bpm>;
-        type Timestamp = S::Timestamp;
+        type Bpm = Unset;
     }
     ///State transition - sets the `timestamp` field to Set
     pub struct SetTimestamp<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTimestamp<S> {}
     impl<S: State> State for SetTimestamp<S> {
-        type Bpm = S::Bpm;
         type Timestamp = Set<members::timestamp>;
+        type Bpm = S::Bpm;
+    }
+    ///State transition - sets the `bpm` field to Set
+    pub struct SetBpm<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBpm<S> {}
+    impl<S: State> State for SetBpm<S> {
+        type Timestamp = S::Timestamp;
+        type Bpm = Set<members::bpm>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `bpm` field
-        pub struct bpm(());
         ///Marker type for the `timestamp` field
         pub struct timestamp(());
+        ///Marker type for the `bpm` field
+        pub struct bpm(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct HeartRateSampleBuilder<'a, S: heart_rate_sample_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> HeartRateSample<'a> {
@@ -2855,9 +2858,9 @@ impl<'a> HeartRateSampleBuilder<'a, heart_rate_sample_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HeartRateSampleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2872,11 +2875,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> HeartRateSampleBuilder<'a, heart_rate_sample_state::SetBpm<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         HeartRateSampleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2891,11 +2894,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> HeartRateSampleBuilder<'a, heart_rate_sample_state::SetTimestamp<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         HeartRateSampleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2903,14 +2906,14 @@ where
 impl<'a, S> HeartRateSampleBuilder<'a, S>
 where
     S: heart_rate_sample_state::State,
-    S::Bpm: heart_rate_sample_state::IsSet,
     S::Timestamp: heart_rate_sample_state::IsSet,
+    S::Bpm: heart_rate_sample_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> HeartRateSample<'a> {
         HeartRateSample {
-            bpm: self.__unsafe_private_named.0.unwrap(),
-            timestamp: self.__unsafe_private_named.1.unwrap(),
+            bpm: self._fields.0.unwrap(),
+            timestamp: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2923,8 +2926,8 @@ where
         >,
     ) -> HeartRateSample<'a> {
         HeartRateSample {
-            bpm: self.__unsafe_private_named.0.unwrap(),
-            timestamp: self.__unsafe_private_named.1.unwrap(),
+            bpm: self._fields.0.unwrap(),
+            timestamp: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2940,92 +2943,92 @@ pub mod workout_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Duration;
+        type StartedAt;
         type Type;
         type Title;
-        type StartedAt;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Duration = Unset;
+        type StartedAt = Unset;
         type Type = Unset;
         type Title = Unset;
-        type StartedAt = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Duration = S::Duration;
-        type Type = S::Type;
-        type Title = S::Title;
-        type StartedAt = S::StartedAt;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `duration` field to Set
     pub struct SetDuration<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDuration<S> {}
     impl<S: State> State for SetDuration<S> {
-        type CreatedAt = S::CreatedAt;
         type Duration = Set<members::duration>;
+        type StartedAt = S::StartedAt;
         type Type = S::Type;
         type Title = S::Title;
-        type StartedAt = S::StartedAt;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `started_at` field to Set
+    pub struct SetStartedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStartedAt<S> {}
+    impl<S: State> State for SetStartedAt<S> {
+        type Duration = S::Duration;
+        type StartedAt = Set<members::started_at>;
+        type Type = S::Type;
+        type Title = S::Title;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `type` field to Set
     pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetType<S> {}
     impl<S: State> State for SetType<S> {
-        type CreatedAt = S::CreatedAt;
         type Duration = S::Duration;
+        type StartedAt = S::StartedAt;
         type Type = Set<members::r#type>;
         type Title = S::Title;
-        type StartedAt = S::StartedAt;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type CreatedAt = S::CreatedAt;
         type Duration = S::Duration;
+        type StartedAt = S::StartedAt;
         type Type = S::Type;
         type Title = Set<members::title>;
-        type StartedAt = S::StartedAt;
-    }
-    ///State transition - sets the `started_at` field to Set
-    pub struct SetStartedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStartedAt<S> {}
-    impl<S: State> State for SetStartedAt<S> {
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
         type Duration = S::Duration;
+        type StartedAt = S::StartedAt;
         type Type = S::Type;
         type Title = S::Title;
-        type StartedAt = Set<members::started_at>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `duration` field
         pub struct duration(());
+        ///Marker type for the `started_at` field
+        pub struct started_at(());
         ///Marker type for the `type` field
         pub struct r#type(());
         ///Marker type for the `title` field
         pub struct title(());
-        ///Marker type for the `started_at` field
-        pub struct started_at(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct WorkoutBuilder<'a, S: workout_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<WorkoutDetails<'a>>,
         Option<i64>,
@@ -3040,7 +3043,7 @@ pub struct WorkoutBuilder<'a, S: workout_state::State> {
         Option<WorkoutType<'a>>,
         Option<workout::VisibilitySettings<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Workout<'a> {
@@ -3054,8 +3057,8 @@ impl<'a> WorkoutBuilder<'a, workout_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WorkoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -3070,7 +3073,7 @@ impl<'a> WorkoutBuilder<'a, workout_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3085,11 +3088,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> WorkoutBuilder<'a, workout_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         WorkoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3097,12 +3100,12 @@ where
 impl<'a, S: workout_state::State> WorkoutBuilder<'a, S> {
     /// Set the `details` field (optional)
     pub fn details(mut self, value: impl Into<Option<WorkoutDetails<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `details` field to an Option value (optional)
     pub fn maybe_details(mut self, value: Option<WorkoutDetails<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3117,11 +3120,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> WorkoutBuilder<'a, workout_state::SetDuration<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         WorkoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3129,12 +3132,12 @@ where
 impl<'a, S: workout_state::State> WorkoutBuilder<'a, S> {
     /// Set the `endedAt` field (optional)
     pub fn ended_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `endedAt` field to an Option value (optional)
     pub fn maybe_ended_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -3145,7 +3148,7 @@ impl<'a, S: workout_state::State> WorkoutBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<workout::Milestone<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `milestones` field to an Option value (optional)
@@ -3153,7 +3156,7 @@ impl<'a, S: workout_state::State> WorkoutBuilder<'a, S> {
         mut self,
         value: Option<Vec<workout::Milestone<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -3161,12 +3164,12 @@ impl<'a, S: workout_state::State> WorkoutBuilder<'a, S> {
 impl<'a, S: workout_state::State> WorkoutBuilder<'a, S> {
     /// Set the `notes` field (optional)
     pub fn notes(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `notes` field to an Option value (optional)
     pub fn maybe_notes(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -3174,12 +3177,12 @@ impl<'a, S: workout_state::State> WorkoutBuilder<'a, S> {
 impl<'a, S: workout_state::State> WorkoutBuilder<'a, S> {
     /// Set the `ogImage` field (optional)
     pub fn og_image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `ogImage` field to an Option value (optional)
     pub fn maybe_og_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -3187,12 +3190,12 @@ impl<'a, S: workout_state::State> WorkoutBuilder<'a, S> {
 impl<'a, S: workout_state::State> WorkoutBuilder<'a, S> {
     /// Set the `planUri` field (optional)
     pub fn plan_uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `planUri` field to an Option value (optional)
     pub fn maybe_plan_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -3207,11 +3210,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> WorkoutBuilder<'a, workout_state::SetStartedAt<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         WorkoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3219,12 +3222,12 @@ where
 impl<'a, S: workout_state::State> WorkoutBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<WorkoutStatus<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<WorkoutStatus<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -3239,11 +3242,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WorkoutBuilder<'a, workout_state::SetTitle<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         WorkoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3258,11 +3261,11 @@ where
         mut self,
         value: impl Into<WorkoutType<'a>>,
     ) -> WorkoutBuilder<'a, workout_state::SetType<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         WorkoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3273,7 +3276,7 @@ impl<'a, S: workout_state::State> WorkoutBuilder<'a, S> {
         mut self,
         value: impl Into<Option<workout::VisibilitySettings<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `visibility` field to an Option value (optional)
@@ -3281,7 +3284,7 @@ impl<'a, S: workout_state::State> WorkoutBuilder<'a, S> {
         mut self,
         value: Option<workout::VisibilitySettings<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -3289,28 +3292,28 @@ impl<'a, S: workout_state::State> WorkoutBuilder<'a, S> {
 impl<'a, S> WorkoutBuilder<'a, S>
 where
     S: workout_state::State,
-    S::CreatedAt: workout_state::IsSet,
     S::Duration: workout_state::IsSet,
+    S::StartedAt: workout_state::IsSet,
     S::Type: workout_state::IsSet,
     S::Title: workout_state::IsSet,
-    S::StartedAt: workout_state::IsSet,
+    S::CreatedAt: workout_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Workout<'a> {
         Workout {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            details: self.__unsafe_private_named.1,
-            duration: self.__unsafe_private_named.2.unwrap(),
-            ended_at: self.__unsafe_private_named.3,
-            milestones: self.__unsafe_private_named.4,
-            notes: self.__unsafe_private_named.5,
-            og_image: self.__unsafe_private_named.6,
-            plan_uri: self.__unsafe_private_named.7,
-            started_at: self.__unsafe_private_named.8.unwrap(),
-            status: self.__unsafe_private_named.9,
-            title: self.__unsafe_private_named.10.unwrap(),
-            r#type: self.__unsafe_private_named.11.unwrap(),
-            visibility: self.__unsafe_private_named.12,
+            created_at: self._fields.0.unwrap(),
+            details: self._fields.1,
+            duration: self._fields.2.unwrap(),
+            ended_at: self._fields.3,
+            milestones: self._fields.4,
+            notes: self._fields.5,
+            og_image: self._fields.6,
+            plan_uri: self._fields.7,
+            started_at: self._fields.8.unwrap(),
+            status: self._fields.9,
+            title: self._fields.10.unwrap(),
+            r#type: self._fields.11.unwrap(),
+            visibility: self._fields.12,
             extra_data: Default::default(),
         }
     }
@@ -3323,19 +3326,19 @@ where
         >,
     ) -> Workout<'a> {
         Workout {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            details: self.__unsafe_private_named.1,
-            duration: self.__unsafe_private_named.2.unwrap(),
-            ended_at: self.__unsafe_private_named.3,
-            milestones: self.__unsafe_private_named.4,
-            notes: self.__unsafe_private_named.5,
-            og_image: self.__unsafe_private_named.6,
-            plan_uri: self.__unsafe_private_named.7,
-            started_at: self.__unsafe_private_named.8.unwrap(),
-            status: self.__unsafe_private_named.9,
-            title: self.__unsafe_private_named.10.unwrap(),
-            r#type: self.__unsafe_private_named.11.unwrap(),
-            visibility: self.__unsafe_private_named.12,
+            created_at: self._fields.0.unwrap(),
+            details: self._fields.1,
+            duration: self._fields.2.unwrap(),
+            ended_at: self._fields.3,
+            milestones: self._fields.4,
+            notes: self._fields.5,
+            og_image: self._fields.6,
+            plan_uri: self._fields.7,
+            started_at: self._fields.8.unwrap(),
+            status: self._fields.9,
+            title: self._fields.10.unwrap(),
+            r#type: self._fields.11.unwrap(),
+            visibility: self._fields.12,
             extra_data: Some(extra_data),
         }
     }
@@ -3387,14 +3390,14 @@ pub mod milestone_state {
 
 /// Builder for constructing an instance of this type
 pub struct MilestoneBuilder<'a, S: milestone_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<MilestoneType<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Milestone<'a> {
@@ -3408,9 +3411,9 @@ impl<'a> MilestoneBuilder<'a, milestone_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MilestoneBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3418,12 +3421,12 @@ impl<'a> MilestoneBuilder<'a, milestone_state::Empty> {
 impl<'a, S: milestone_state::State> MilestoneBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -3438,11 +3441,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MilestoneBuilder<'a, milestone_state::SetTimestamp<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MilestoneBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3457,11 +3460,11 @@ where
         mut self,
         value: impl Into<MilestoneType<'a>>,
     ) -> MilestoneBuilder<'a, milestone_state::SetType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         MilestoneBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3469,12 +3472,12 @@ where
 impl<'a, S: milestone_state::State> MilestoneBuilder<'a, S> {
     /// Set the `valueMeters` field (optional)
     pub fn value_meters(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `valueMeters` field to an Option value (optional)
     pub fn maybe_value_meters(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -3488,10 +3491,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Milestone<'a> {
         Milestone {
-            note: self.__unsafe_private_named.0,
-            timestamp: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
-            value_meters: self.__unsafe_private_named.3,
+            note: self._fields.0,
+            timestamp: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
+            value_meters: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -3504,10 +3507,10 @@ where
         >,
     ) -> Milestone<'a> {
         Milestone {
-            note: self.__unsafe_private_named.0,
-            timestamp: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
-            value_meters: self.__unsafe_private_named.3,
+            note: self._fields.0,
+            timestamp: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
+            value_meters: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -3523,59 +3526,59 @@ pub mod route_point_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Timestamp;
-        type LatE6;
         type LngE6;
+        type LatE6;
+        type Timestamp;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Timestamp = Unset;
-        type LatE6 = Unset;
         type LngE6 = Unset;
+        type LatE6 = Unset;
+        type Timestamp = Unset;
     }
-    ///State transition - sets the `timestamp` field to Set
-    pub struct SetTimestamp<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTimestamp<S> {}
-    impl<S: State> State for SetTimestamp<S> {
-        type Timestamp = Set<members::timestamp>;
+    ///State transition - sets the `lng_e6` field to Set
+    pub struct SetLngE6<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLngE6<S> {}
+    impl<S: State> State for SetLngE6<S> {
+        type LngE6 = Set<members::lng_e6>;
         type LatE6 = S::LatE6;
-        type LngE6 = S::LngE6;
+        type Timestamp = S::Timestamp;
     }
     ///State transition - sets the `lat_e6` field to Set
     pub struct SetLatE6<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLatE6<S> {}
     impl<S: State> State for SetLatE6<S> {
-        type Timestamp = S::Timestamp;
-        type LatE6 = Set<members::lat_e6>;
         type LngE6 = S::LngE6;
-    }
-    ///State transition - sets the `lng_e6` field to Set
-    pub struct SetLngE6<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLngE6<S> {}
-    impl<S: State> State for SetLngE6<S> {
+        type LatE6 = Set<members::lat_e6>;
         type Timestamp = S::Timestamp;
+    }
+    ///State transition - sets the `timestamp` field to Set
+    pub struct SetTimestamp<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTimestamp<S> {}
+    impl<S: State> State for SetTimestamp<S> {
+        type LngE6 = S::LngE6;
         type LatE6 = S::LatE6;
-        type LngE6 = Set<members::lng_e6>;
+        type Timestamp = Set<members::timestamp>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `timestamp` field
-        pub struct timestamp(());
-        ///Marker type for the `lat_e6` field
-        pub struct lat_e6(());
         ///Marker type for the `lng_e6` field
         pub struct lng_e6(());
+        ///Marker type for the `lat_e6` field
+        pub struct lat_e6(());
+        ///Marker type for the `timestamp` field
+        pub struct timestamp(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RoutePointBuilder<'a, S: route_point_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RoutePoint<'a> {
@@ -3589,9 +3592,9 @@ impl<'a> RoutePointBuilder<'a, route_point_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RoutePointBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3606,11 +3609,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RoutePointBuilder<'a, route_point_state::SetLatE6<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RoutePointBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3625,11 +3628,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RoutePointBuilder<'a, route_point_state::SetLngE6<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RoutePointBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3644,11 +3647,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RoutePointBuilder<'a, route_point_state::SetTimestamp<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RoutePointBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3656,16 +3659,16 @@ where
 impl<'a, S> RoutePointBuilder<'a, S>
 where
     S: route_point_state::State,
-    S::Timestamp: route_point_state::IsSet,
-    S::LatE6: route_point_state::IsSet,
     S::LngE6: route_point_state::IsSet,
+    S::LatE6: route_point_state::IsSet,
+    S::Timestamp: route_point_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RoutePoint<'a> {
         RoutePoint {
-            lat_e6: self.__unsafe_private_named.0.unwrap(),
-            lng_e6: self.__unsafe_private_named.1.unwrap(),
-            timestamp: self.__unsafe_private_named.2.unwrap(),
+            lat_e6: self._fields.0.unwrap(),
+            lng_e6: self._fields.1.unwrap(),
+            timestamp: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3678,9 +3681,9 @@ where
         >,
     ) -> RoutePoint<'a> {
         RoutePoint {
-            lat_e6: self.__unsafe_private_named.0.unwrap(),
-            lng_e6: self.__unsafe_private_named.1.unwrap(),
-            timestamp: self.__unsafe_private_named.2.unwrap(),
+            lat_e6: self._fields.0.unwrap(),
+            lng_e6: self._fields.1.unwrap(),
+            timestamp: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_fitsky/workout_plan.rs b/crates/jacquard-api/src/app_fitsky/workout_plan.rs
index 86ec53fc..b93d0b6b 100644
--- a/crates/jacquard-api/src/app_fitsky/workout_plan.rs
+++ b/crates/jacquard-api/src/app_fitsky/workout_plan.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -351,80 +354,80 @@ pub mod workout_plan_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type CreatedAt;
+        type Type;
         type Exercises;
         type Name;
-        type Type;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type CreatedAt = Unset;
+        type Type = Unset;
         type Exercises = Unset;
         type Name = Unset;
-        type Type = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type CreatedAt = Set<members::created_at>;
+        type Type = S::Type;
+        type Exercises = S::Exercises;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `type` field to Set
+    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetType<S> {}
+    impl<S: State> State for SetType<S> {
+        type CreatedAt = S::CreatedAt;
+        type Type = Set<members::r#type>;
         type Exercises = S::Exercises;
         type Name = S::Name;
-        type Type = S::Type;
     }
     ///State transition - sets the `exercises` field to Set
     pub struct SetExercises<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetExercises<S> {}
     impl<S: State> State for SetExercises<S> {
         type CreatedAt = S::CreatedAt;
+        type Type = S::Type;
         type Exercises = Set<members::exercises>;
         type Name = S::Name;
-        type Type = S::Type;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
         type CreatedAt = S::CreatedAt;
-        type Exercises = S::Exercises;
-        type Name = Set<members::name>;
         type Type = S::Type;
-    }
-    ///State transition - sets the `type` field to Set
-    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetType<S> {}
-    impl<S: State> State for SetType<S> {
-        type CreatedAt = S::CreatedAt;
         type Exercises = S::Exercises;
-        type Name = S::Name;
-        type Type = Set<members::r#type>;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `type` field
+        pub struct r#type(());
         ///Marker type for the `exercises` field
         pub struct exercises(());
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `type` field
-        pub struct r#type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct WorkoutPlanBuilder<'a, S: workout_plan_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Vec<workout_plan::PlanExercise<'a>>>,
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
         Option<WorkoutPlanType<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> WorkoutPlan<'a> {
@@ -438,9 +441,9 @@ impl<'a> WorkoutPlanBuilder<'a, workout_plan_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WorkoutPlanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -455,11 +458,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> WorkoutPlanBuilder<'a, workout_plan_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         WorkoutPlanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -474,11 +477,11 @@ where
         mut self,
         value: impl Into<Vec<workout_plan::PlanExercise<'a>>>,
     ) -> WorkoutPlanBuilder<'a, workout_plan_state::SetExercises<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         WorkoutPlanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -493,11 +496,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WorkoutPlanBuilder<'a, workout_plan_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         WorkoutPlanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -505,12 +508,12 @@ where
 impl<'a, S: workout_plan_state::State> WorkoutPlanBuilder<'a, S> {
     /// Set the `ogImage` field (optional)
     pub fn og_image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `ogImage` field to an Option value (optional)
     pub fn maybe_og_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -525,11 +528,11 @@ where
         mut self,
         value: impl Into<WorkoutPlanType<'a>>,
     ) -> WorkoutPlanBuilder<'a, workout_plan_state::SetType<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         WorkoutPlanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -538,18 +541,18 @@ impl<'a, S> WorkoutPlanBuilder<'a, S>
 where
     S: workout_plan_state::State,
     S::CreatedAt: workout_plan_state::IsSet,
+    S::Type: workout_plan_state::IsSet,
     S::Exercises: workout_plan_state::IsSet,
     S::Name: workout_plan_state::IsSet,
-    S::Type: workout_plan_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> WorkoutPlan<'a> {
         WorkoutPlan {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            exercises: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            og_image: self.__unsafe_private_named.3,
-            r#type: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            exercises: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            og_image: self._fields.3,
+            r#type: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -562,11 +565,11 @@ where
         >,
     ) -> WorkoutPlan<'a> {
         WorkoutPlan {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            exercises: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            og_image: self.__unsafe_private_named.3,
-            r#type: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            exercises: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            og_image: self._fields.3,
+            r#type: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -705,63 +708,58 @@ pub mod plan_exercise_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Name;
-        type TargetReps;
         type TargetSets;
+        type TargetReps;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Name = Unset;
-        type TargetReps = Unset;
         type TargetSets = Unset;
+        type TargetReps = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
         type Name = Set<members::name>;
-        type TargetReps = S::TargetReps;
-        type TargetSets = S::TargetSets;
-    }
-    ///State transition - sets the `target_reps` field to Set
-    pub struct SetTargetReps<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTargetReps<S> {}
-    impl<S: State> State for SetTargetReps<S> {
-        type Name = S::Name;
-        type TargetReps = Set<members::target_reps>;
         type TargetSets = S::TargetSets;
+        type TargetReps = S::TargetReps;
     }
     ///State transition - sets the `target_sets` field to Set
     pub struct SetTargetSets<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTargetSets<S> {}
     impl<S: State> State for SetTargetSets<S> {
         type Name = S::Name;
-        type TargetReps = S::TargetReps;
         type TargetSets = Set<members::target_sets>;
+        type TargetReps = S::TargetReps;
+    }
+    ///State transition - sets the `target_reps` field to Set
+    pub struct SetTargetReps<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTargetReps<S> {}
+    impl<S: State> State for SetTargetReps<S> {
+        type Name = S::Name;
+        type TargetSets = S::TargetSets;
+        type TargetReps = Set<members::target_reps>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `target_reps` field
-        pub struct target_reps(());
         ///Marker type for the `target_sets` field
         pub struct target_sets(());
+        ///Marker type for the `target_reps` field
+        pub struct target_reps(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PlanExerciseBuilder<'a, S: plan_exercise_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-        Option<i64>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PlanExercise<'a> {
@@ -775,9 +773,9 @@ impl<'a> PlanExerciseBuilder<'a, plan_exercise_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PlanExerciseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -792,11 +790,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PlanExerciseBuilder<'a, plan_exercise_state::SetName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PlanExerciseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -804,12 +802,12 @@ where
 impl<'a, S: plan_exercise_state::State> PlanExerciseBuilder<'a, S> {
     /// Set the `notes` field (optional)
     pub fn notes(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `notes` field to an Option value (optional)
     pub fn maybe_notes(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -824,11 +822,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PlanExerciseBuilder<'a, plan_exercise_state::SetTargetReps<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PlanExerciseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -843,11 +841,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PlanExerciseBuilder<'a, plan_exercise_state::SetTargetSets<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PlanExerciseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -856,16 +854,16 @@ impl<'a, S> PlanExerciseBuilder<'a, S>
 where
     S: plan_exercise_state::State,
     S::Name: plan_exercise_state::IsSet,
-    S::TargetReps: plan_exercise_state::IsSet,
     S::TargetSets: plan_exercise_state::IsSet,
+    S::TargetReps: plan_exercise_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PlanExercise<'a> {
         PlanExercise {
-            name: self.__unsafe_private_named.0.unwrap(),
-            notes: self.__unsafe_private_named.1,
-            target_reps: self.__unsafe_private_named.2.unwrap(),
-            target_sets: self.__unsafe_private_named.3.unwrap(),
+            name: self._fields.0.unwrap(),
+            notes: self._fields.1,
+            target_reps: self._fields.2.unwrap(),
+            target_sets: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -878,10 +876,10 @@ where
         >,
     ) -> PlanExercise<'a> {
         PlanExercise {
-            name: self.__unsafe_private_named.0.unwrap(),
-            notes: self.__unsafe_private_named.1,
-            target_reps: self.__unsafe_private_named.2.unwrap(),
-            target_sets: self.__unsafe_private_named.3.unwrap(),
+            name: self._fields.0.unwrap(),
+            notes: self._fields.1,
+            target_reps: self._fields.2.unwrap(),
+            target_sets: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_gainforest/dwc/event.rs b/crates/jacquard-api/src/app_gainforest/dwc/event.rs
index 163c6023..75985793 100644
--- a/crates/jacquard-api/src/app_gainforest/dwc/event.rs
+++ b/crates/jacquard-api/src/app_gainforest/dwc/event.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -489,58 +492,58 @@ pub mod event_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type EventId;
         type EventDate;
         type CreatedAt;
-        type EventId;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type EventId = Unset;
         type EventDate = Unset;
         type CreatedAt = Unset;
-        type EventId = Unset;
+    }
+    ///State transition - sets the `event_id` field to Set
+    pub struct SetEventId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetEventId<S> {}
+    impl<S: State> State for SetEventId<S> {
+        type EventId = Set<members::event_id>;
+        type EventDate = S::EventDate;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `event_date` field to Set
     pub struct SetEventDate<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEventDate<S> {}
     impl<S: State> State for SetEventDate<S> {
+        type EventId = S::EventId;
         type EventDate = Set<members::event_date>;
         type CreatedAt = S::CreatedAt;
-        type EventId = S::EventId;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type EventDate = S::EventDate;
-        type CreatedAt = Set<members::created_at>;
         type EventId = S::EventId;
-    }
-    ///State transition - sets the `event_id` field to Set
-    pub struct SetEventId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetEventId<S> {}
-    impl<S: State> State for SetEventId<S> {
         type EventDate = S::EventDate;
-        type CreatedAt = S::CreatedAt;
-        type EventId = Set<members::event_id>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `event_id` field
+        pub struct event_id(());
         ///Marker type for the `event_date` field
         pub struct event_date(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `event_id` field
-        pub struct event_id(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EventBuilder<'a, S: event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -569,7 +572,7 @@ pub struct EventBuilder<'a, S: event_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Event<'a> {
@@ -583,8 +586,8 @@ impl<'a> EventBuilder<'a, event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -613,7 +616,7 @@ impl<'a> EventBuilder<'a, event_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -624,12 +627,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<i64>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `coordinateUncertaintyInMeters` field to an Option value (optional)
     pub fn maybe_coordinate_uncertainty_in_meters(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -637,12 +640,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `country` field (optional)
     pub fn country(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `country` field to an Option value (optional)
     pub fn maybe_country(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -650,12 +653,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `countryCode` field (optional)
     pub fn country_code(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `countryCode` field to an Option value (optional)
     pub fn maybe_country_code(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -663,12 +666,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `county` field (optional)
     pub fn county(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `county` field to an Option value (optional)
     pub fn maybe_county(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -683,11 +686,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EventBuilder<'a, event_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -695,12 +698,12 @@ where
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `decimalLatitude` field (optional)
     pub fn decimal_latitude(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `decimalLatitude` field to an Option value (optional)
     pub fn maybe_decimal_latitude(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -708,12 +711,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `decimalLongitude` field (optional)
     pub fn decimal_longitude(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `decimalLongitude` field to an Option value (optional)
     pub fn maybe_decimal_longitude(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -728,11 +731,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EventBuilder<'a, event_state::SetEventDate<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -747,11 +750,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EventBuilder<'a, event_state::SetEventId<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -759,12 +762,12 @@ where
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `eventRemarks` field (optional)
     pub fn event_remarks(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `eventRemarks` field to an Option value (optional)
     pub fn maybe_event_remarks(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -772,12 +775,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `eventTime` field (optional)
     pub fn event_time(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `eventTime` field to an Option value (optional)
     pub fn maybe_event_time(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -785,12 +788,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `fieldNotes` field (optional)
     pub fn field_notes(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `fieldNotes` field to an Option value (optional)
     pub fn maybe_field_notes(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -798,12 +801,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `geodeticDatum` field (optional)
     pub fn geodetic_datum(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `geodeticDatum` field to an Option value (optional)
     pub fn maybe_geodetic_datum(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -811,12 +814,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `habitat` field (optional)
     pub fn habitat(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `habitat` field to an Option value (optional)
     pub fn maybe_habitat(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -824,12 +827,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `locality` field (optional)
     pub fn locality(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `locality` field to an Option value (optional)
     pub fn maybe_locality(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -837,12 +840,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `locationID` field (optional)
     pub fn location_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `locationID` field to an Option value (optional)
     pub fn maybe_location_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -850,12 +853,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `locationRemarks` field (optional)
     pub fn location_remarks(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `locationRemarks` field to an Option value (optional)
     pub fn maybe_location_remarks(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -863,12 +866,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `maximumElevationInMeters` field (optional)
     pub fn maximum_elevation_in_meters(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `maximumElevationInMeters` field to an Option value (optional)
     pub fn maybe_maximum_elevation_in_meters(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -876,12 +879,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `minimumElevationInMeters` field (optional)
     pub fn minimum_elevation_in_meters(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `minimumElevationInMeters` field to an Option value (optional)
     pub fn maybe_minimum_elevation_in_meters(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -889,12 +892,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `municipality` field (optional)
     pub fn municipality(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `municipality` field to an Option value (optional)
     pub fn maybe_municipality(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -902,12 +905,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `parentEventID` field (optional)
     pub fn parent_event_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `parentEventID` field to an Option value (optional)
     pub fn maybe_parent_event_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -915,12 +918,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `parentEventRef` field (optional)
     pub fn parent_event_ref(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `parentEventRef` field to an Option value (optional)
     pub fn maybe_parent_event_ref(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -928,12 +931,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `sampleSizeUnit` field (optional)
     pub fn sample_size_unit(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `sampleSizeUnit` field to an Option value (optional)
     pub fn maybe_sample_size_unit(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -941,12 +944,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `sampleSizeValue` field (optional)
     pub fn sample_size_value(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `sampleSizeValue` field to an Option value (optional)
     pub fn maybe_sample_size_value(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -954,12 +957,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `samplingEffort` field (optional)
     pub fn sampling_effort(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `samplingEffort` field to an Option value (optional)
     pub fn maybe_sampling_effort(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -967,12 +970,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `samplingProtocol` field (optional)
     pub fn sampling_protocol(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `samplingProtocol` field to an Option value (optional)
     pub fn maybe_sampling_protocol(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -980,12 +983,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `stateProvince` field (optional)
     pub fn state_province(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `stateProvince` field to an Option value (optional)
     pub fn maybe_state_province(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -993,40 +996,40 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S> EventBuilder<'a, S>
 where
     S: event_state::State,
+    S::EventId: event_state::IsSet,
     S::EventDate: event_state::IsSet,
     S::CreatedAt: event_state::IsSet,
-    S::EventId: event_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Event<'a> {
         Event {
-            coordinate_uncertainty_in_meters: self.__unsafe_private_named.0,
-            country: self.__unsafe_private_named.1,
-            country_code: self.__unsafe_private_named.2,
-            county: self.__unsafe_private_named.3,
-            created_at: self.__unsafe_private_named.4.unwrap(),
-            decimal_latitude: self.__unsafe_private_named.5,
-            decimal_longitude: self.__unsafe_private_named.6,
-            event_date: self.__unsafe_private_named.7.unwrap(),
-            event_id: self.__unsafe_private_named.8.unwrap(),
-            event_remarks: self.__unsafe_private_named.9,
-            event_time: self.__unsafe_private_named.10,
-            field_notes: self.__unsafe_private_named.11,
-            geodetic_datum: self.__unsafe_private_named.12,
-            habitat: self.__unsafe_private_named.13,
-            locality: self.__unsafe_private_named.14,
-            location_id: self.__unsafe_private_named.15,
-            location_remarks: self.__unsafe_private_named.16,
-            maximum_elevation_in_meters: self.__unsafe_private_named.17,
-            minimum_elevation_in_meters: self.__unsafe_private_named.18,
-            municipality: self.__unsafe_private_named.19,
-            parent_event_id: self.__unsafe_private_named.20,
-            parent_event_ref: self.__unsafe_private_named.21,
-            sample_size_unit: self.__unsafe_private_named.22,
-            sample_size_value: self.__unsafe_private_named.23,
-            sampling_effort: self.__unsafe_private_named.24,
-            sampling_protocol: self.__unsafe_private_named.25,
-            state_province: self.__unsafe_private_named.26,
+            coordinate_uncertainty_in_meters: self._fields.0,
+            country: self._fields.1,
+            country_code: self._fields.2,
+            county: self._fields.3,
+            created_at: self._fields.4.unwrap(),
+            decimal_latitude: self._fields.5,
+            decimal_longitude: self._fields.6,
+            event_date: self._fields.7.unwrap(),
+            event_id: self._fields.8.unwrap(),
+            event_remarks: self._fields.9,
+            event_time: self._fields.10,
+            field_notes: self._fields.11,
+            geodetic_datum: self._fields.12,
+            habitat: self._fields.13,
+            locality: self._fields.14,
+            location_id: self._fields.15,
+            location_remarks: self._fields.16,
+            maximum_elevation_in_meters: self._fields.17,
+            minimum_elevation_in_meters: self._fields.18,
+            municipality: self._fields.19,
+            parent_event_id: self._fields.20,
+            parent_event_ref: self._fields.21,
+            sample_size_unit: self._fields.22,
+            sample_size_value: self._fields.23,
+            sampling_effort: self._fields.24,
+            sampling_protocol: self._fields.25,
+            state_province: self._fields.26,
             extra_data: Default::default(),
         }
     }
@@ -1039,33 +1042,33 @@ where
         >,
     ) -> Event<'a> {
         Event {
-            coordinate_uncertainty_in_meters: self.__unsafe_private_named.0,
-            country: self.__unsafe_private_named.1,
-            country_code: self.__unsafe_private_named.2,
-            county: self.__unsafe_private_named.3,
-            created_at: self.__unsafe_private_named.4.unwrap(),
-            decimal_latitude: self.__unsafe_private_named.5,
-            decimal_longitude: self.__unsafe_private_named.6,
-            event_date: self.__unsafe_private_named.7.unwrap(),
-            event_id: self.__unsafe_private_named.8.unwrap(),
-            event_remarks: self.__unsafe_private_named.9,
-            event_time: self.__unsafe_private_named.10,
-            field_notes: self.__unsafe_private_named.11,
-            geodetic_datum: self.__unsafe_private_named.12,
-            habitat: self.__unsafe_private_named.13,
-            locality: self.__unsafe_private_named.14,
-            location_id: self.__unsafe_private_named.15,
-            location_remarks: self.__unsafe_private_named.16,
-            maximum_elevation_in_meters: self.__unsafe_private_named.17,
-            minimum_elevation_in_meters: self.__unsafe_private_named.18,
-            municipality: self.__unsafe_private_named.19,
-            parent_event_id: self.__unsafe_private_named.20,
-            parent_event_ref: self.__unsafe_private_named.21,
-            sample_size_unit: self.__unsafe_private_named.22,
-            sample_size_value: self.__unsafe_private_named.23,
-            sampling_effort: self.__unsafe_private_named.24,
-            sampling_protocol: self.__unsafe_private_named.25,
-            state_province: self.__unsafe_private_named.26,
+            coordinate_uncertainty_in_meters: self._fields.0,
+            country: self._fields.1,
+            country_code: self._fields.2,
+            county: self._fields.3,
+            created_at: self._fields.4.unwrap(),
+            decimal_latitude: self._fields.5,
+            decimal_longitude: self._fields.6,
+            event_date: self._fields.7.unwrap(),
+            event_id: self._fields.8.unwrap(),
+            event_remarks: self._fields.9,
+            event_time: self._fields.10,
+            field_notes: self._fields.11,
+            geodetic_datum: self._fields.12,
+            habitat: self._fields.13,
+            locality: self._fields.14,
+            location_id: self._fields.15,
+            location_remarks: self._fields.16,
+            maximum_elevation_in_meters: self._fields.17,
+            minimum_elevation_in_meters: self._fields.18,
+            municipality: self._fields.19,
+            parent_event_id: self._fields.20,
+            parent_event_ref: self._fields.21,
+            sample_size_unit: self._fields.22,
+            sample_size_value: self._fields.23,
+            sampling_effort: self._fields.24,
+            sampling_protocol: self._fields.25,
+            state_province: self._fields.26,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_gainforest/dwc/measurement.rs b/crates/jacquard-api/src/app_gainforest/dwc/measurement.rs
index 6227705b..6d30264e 100644
--- a/crates/jacquard-api/src/app_gainforest/dwc/measurement.rs
+++ b/crates/jacquard-api/src/app_gainforest/dwc/measurement.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -271,73 +274,73 @@ pub mod measurement_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type MeasurementValue;
-        type MeasurementType;
-        type OccurrenceRef;
         type CreatedAt;
+        type OccurrenceRef;
+        type MeasurementType;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type MeasurementValue = Unset;
-        type MeasurementType = Unset;
-        type OccurrenceRef = Unset;
         type CreatedAt = Unset;
+        type OccurrenceRef = Unset;
+        type MeasurementType = Unset;
     }
     ///State transition - sets the `measurement_value` field to Set
     pub struct SetMeasurementValue<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMeasurementValue<S> {}
     impl<S: State> State for SetMeasurementValue<S> {
         type MeasurementValue = Set<members::measurement_value>;
-        type MeasurementType = S::MeasurementType;
-        type OccurrenceRef = S::OccurrenceRef;
         type CreatedAt = S::CreatedAt;
+        type OccurrenceRef = S::OccurrenceRef;
+        type MeasurementType = S::MeasurementType;
     }
-    ///State transition - sets the `measurement_type` field to Set
-    pub struct SetMeasurementType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMeasurementType<S> {}
-    impl<S: State> State for SetMeasurementType<S> {
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
         type MeasurementValue = S::MeasurementValue;
-        type MeasurementType = Set<members::measurement_type>;
+        type CreatedAt = Set<members::created_at>;
         type OccurrenceRef = S::OccurrenceRef;
-        type CreatedAt = S::CreatedAt;
+        type MeasurementType = S::MeasurementType;
     }
     ///State transition - sets the `occurrence_ref` field to Set
     pub struct SetOccurrenceRef<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetOccurrenceRef<S> {}
     impl<S: State> State for SetOccurrenceRef<S> {
         type MeasurementValue = S::MeasurementValue;
-        type MeasurementType = S::MeasurementType;
-        type OccurrenceRef = Set<members::occurrence_ref>;
         type CreatedAt = S::CreatedAt;
+        type OccurrenceRef = Set<members::occurrence_ref>;
+        type MeasurementType = S::MeasurementType;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+    ///State transition - sets the `measurement_type` field to Set
+    pub struct SetMeasurementType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMeasurementType<S> {}
+    impl<S: State> State for SetMeasurementType<S> {
         type MeasurementValue = S::MeasurementValue;
-        type MeasurementType = S::MeasurementType;
+        type CreatedAt = S::CreatedAt;
         type OccurrenceRef = S::OccurrenceRef;
-        type CreatedAt = Set<members::created_at>;
+        type MeasurementType = Set<members::measurement_type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `measurement_value` field
         pub struct measurement_value(());
-        ///Marker type for the `measurement_type` field
-        pub struct measurement_type(());
-        ///Marker type for the `occurrence_ref` field
-        pub struct occurrence_ref(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `occurrence_ref` field
+        pub struct occurrence_ref(());
+        ///Marker type for the `measurement_type` field
+        pub struct measurement_type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MeasurementBuilder<'a, S: measurement_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -351,7 +354,7 @@ pub struct MeasurementBuilder<'a, S: measurement_state::State> {
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Measurement<'a> {
@@ -365,8 +368,8 @@ impl<'a> MeasurementBuilder<'a, measurement_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MeasurementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -380,7 +383,7 @@ impl<'a> MeasurementBuilder<'a, measurement_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -395,11 +398,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MeasurementBuilder<'a, measurement_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MeasurementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -407,12 +410,12 @@ where
 impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
     /// Set the `measurementAccuracy` field (optional)
     pub fn measurement_accuracy(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `measurementAccuracy` field to an Option value (optional)
     pub fn maybe_measurement_accuracy(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -423,12 +426,12 @@ impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `measurementDeterminedBy` field to an Option value (optional)
     pub fn maybe_measurement_determined_by(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -439,7 +442,7 @@ impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `measurementDeterminedDate` field to an Option value (optional)
@@ -447,7 +450,7 @@ impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
         mut self,
         value: Option<CowStr<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -455,12 +458,12 @@ impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
 impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
     /// Set the `measurementID` field (optional)
     pub fn measurement_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `measurementID` field to an Option value (optional)
     pub fn maybe_measurement_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -468,12 +471,12 @@ impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
 impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
     /// Set the `measurementMethod` field (optional)
     pub fn measurement_method(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `measurementMethod` field to an Option value (optional)
     pub fn maybe_measurement_method(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -481,12 +484,12 @@ impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
 impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
     /// Set the `measurementRemarks` field (optional)
     pub fn measurement_remarks(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `measurementRemarks` field to an Option value (optional)
     pub fn maybe_measurement_remarks(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -501,11 +504,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MeasurementBuilder<'a, measurement_state::SetMeasurementType<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         MeasurementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -513,12 +516,12 @@ where
 impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
     /// Set the `measurementUnit` field (optional)
     pub fn measurement_unit(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `measurementUnit` field to an Option value (optional)
     pub fn maybe_measurement_unit(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -533,11 +536,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MeasurementBuilder<'a, measurement_state::SetMeasurementValue<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         MeasurementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -545,12 +548,12 @@ where
 impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
     /// Set the `occurrenceID` field (optional)
     pub fn occurrence_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `occurrenceID` field to an Option value (optional)
     pub fn maybe_occurrence_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -565,11 +568,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> MeasurementBuilder<'a, measurement_state::SetOccurrenceRef<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         MeasurementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -578,25 +581,25 @@ impl<'a, S> MeasurementBuilder<'a, S>
 where
     S: measurement_state::State,
     S::MeasurementValue: measurement_state::IsSet,
-    S::MeasurementType: measurement_state::IsSet,
-    S::OccurrenceRef: measurement_state::IsSet,
     S::CreatedAt: measurement_state::IsSet,
+    S::OccurrenceRef: measurement_state::IsSet,
+    S::MeasurementType: measurement_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Measurement<'a> {
         Measurement {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            measurement_accuracy: self.__unsafe_private_named.1,
-            measurement_determined_by: self.__unsafe_private_named.2,
-            measurement_determined_date: self.__unsafe_private_named.3,
-            measurement_id: self.__unsafe_private_named.4,
-            measurement_method: self.__unsafe_private_named.5,
-            measurement_remarks: self.__unsafe_private_named.6,
-            measurement_type: self.__unsafe_private_named.7.unwrap(),
-            measurement_unit: self.__unsafe_private_named.8,
-            measurement_value: self.__unsafe_private_named.9.unwrap(),
-            occurrence_id: self.__unsafe_private_named.10,
-            occurrence_ref: self.__unsafe_private_named.11.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            measurement_accuracy: self._fields.1,
+            measurement_determined_by: self._fields.2,
+            measurement_determined_date: self._fields.3,
+            measurement_id: self._fields.4,
+            measurement_method: self._fields.5,
+            measurement_remarks: self._fields.6,
+            measurement_type: self._fields.7.unwrap(),
+            measurement_unit: self._fields.8,
+            measurement_value: self._fields.9.unwrap(),
+            occurrence_id: self._fields.10,
+            occurrence_ref: self._fields.11.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -609,18 +612,18 @@ where
         >,
     ) -> Measurement<'a> {
         Measurement {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            measurement_accuracy: self.__unsafe_private_named.1,
-            measurement_determined_by: self.__unsafe_private_named.2,
-            measurement_determined_date: self.__unsafe_private_named.3,
-            measurement_id: self.__unsafe_private_named.4,
-            measurement_method: self.__unsafe_private_named.5,
-            measurement_remarks: self.__unsafe_private_named.6,
-            measurement_type: self.__unsafe_private_named.7.unwrap(),
-            measurement_unit: self.__unsafe_private_named.8,
-            measurement_value: self.__unsafe_private_named.9.unwrap(),
-            occurrence_id: self.__unsafe_private_named.10,
-            occurrence_ref: self.__unsafe_private_named.11.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            measurement_accuracy: self._fields.1,
+            measurement_determined_by: self._fields.2,
+            measurement_determined_date: self._fields.3,
+            measurement_id: self._fields.4,
+            measurement_method: self._fields.5,
+            measurement_remarks: self._fields.6,
+            measurement_type: self._fields.7.unwrap(),
+            measurement_unit: self._fields.8,
+            measurement_value: self._fields.9.unwrap(),
+            occurrence_id: self._fields.10,
+            occurrence_ref: self._fields.11.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_gainforest/dwc/occurrence.rs b/crates/jacquard-api/src/app_gainforest/dwc/occurrence.rs
index 44781a4b..6b1baac8 100644
--- a/crates/jacquard-api/src/app_gainforest/dwc/occurrence.rs
+++ b/crates/jacquard-api/src/app_gainforest/dwc/occurrence.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -1250,74 +1253,74 @@ pub mod occurrence_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
+        type BasisOfRecord;
         type ScientificName;
         type EventDate;
-        type BasisOfRecord;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
+        type BasisOfRecord = Unset;
         type ScientificName = Unset;
         type EventDate = Unset;
-        type BasisOfRecord = Unset;
+        type CreatedAt = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
+    ///State transition - sets the `basis_of_record` field to Set
+    pub struct SetBasisOfRecord<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBasisOfRecord<S> {}
+    impl<S: State> State for SetBasisOfRecord<S> {
+        type BasisOfRecord = Set<members::basis_of_record>;
         type ScientificName = S::ScientificName;
         type EventDate = S::EventDate;
-        type BasisOfRecord = S::BasisOfRecord;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `scientific_name` field to Set
     pub struct SetScientificName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetScientificName<S> {}
     impl<S: State> State for SetScientificName<S> {
-        type CreatedAt = S::CreatedAt;
+        type BasisOfRecord = S::BasisOfRecord;
         type ScientificName = Set<members::scientific_name>;
         type EventDate = S::EventDate;
-        type BasisOfRecord = S::BasisOfRecord;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `event_date` field to Set
     pub struct SetEventDate<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEventDate<S> {}
     impl<S: State> State for SetEventDate<S> {
-        type CreatedAt = S::CreatedAt;
+        type BasisOfRecord = S::BasisOfRecord;
         type ScientificName = S::ScientificName;
         type EventDate = Set<members::event_date>;
-        type BasisOfRecord = S::BasisOfRecord;
-    }
-    ///State transition - sets the `basis_of_record` field to Set
-    pub struct SetBasisOfRecord<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBasisOfRecord<S> {}
-    impl<S: State> State for SetBasisOfRecord<S> {
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type BasisOfRecord = S::BasisOfRecord;
         type ScientificName = S::ScientificName;
         type EventDate = S::EventDate;
-        type BasisOfRecord = Set<members::basis_of_record>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
+        ///Marker type for the `basis_of_record` field
+        pub struct basis_of_record(());
         ///Marker type for the `scientific_name` field
         pub struct scientific_name(());
         ///Marker type for the `event_date` field
         pub struct event_date(());
-        ///Marker type for the `basis_of_record` field
-        pub struct basis_of_record(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct OccurrenceBuilder<'a, S: occurrence_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -1398,7 +1401,7 @@ pub struct OccurrenceBuilder<'a, S: occurrence_state::State> {
         Option<CowStr<'a>>,
         Option<Data<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Occurrence<'a> {
@@ -1412,8 +1415,8 @@ impl<'a> OccurrenceBuilder<'a, occurrence_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OccurrenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -1494,7 +1497,7 @@ impl<'a> OccurrenceBuilder<'a, occurrence_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1502,12 +1505,12 @@ impl<'a> OccurrenceBuilder<'a, occurrence_state::Empty> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `associatedMedia` field (optional)
     pub fn associated_media(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `associatedMedia` field to an Option value (optional)
     pub fn maybe_associated_media(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1518,12 +1521,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `associatedOccurrences` field to an Option value (optional)
     pub fn maybe_associated_occurrences(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1534,12 +1537,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `associatedReferences` field to an Option value (optional)
     pub fn maybe_associated_references(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1547,12 +1550,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `associatedSequences` field (optional)
     pub fn associated_sequences(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `associatedSequences` field to an Option value (optional)
     pub fn maybe_associated_sequences(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1560,12 +1563,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `audioEvidence` field (optional)
     pub fn audio_evidence(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `audioEvidence` field to an Option value (optional)
     pub fn maybe_audio_evidence(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1580,11 +1583,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> OccurrenceBuilder<'a, occurrence_state::SetBasisOfRecord<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         OccurrenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1592,12 +1595,12 @@ where
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `behavior` field (optional)
     pub fn behavior(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `behavior` field to an Option value (optional)
     pub fn maybe_behavior(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1605,12 +1608,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `class` field (optional)
     pub fn class(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `class` field to an Option value (optional)
     pub fn maybe_class(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -1618,12 +1621,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `collectionCode` field (optional)
     pub fn collection_code(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `collectionCode` field to an Option value (optional)
     pub fn maybe_collection_code(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -1634,12 +1637,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<i64>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `coordinateUncertaintyInMeters` field to an Option value (optional)
     pub fn maybe_coordinate_uncertainty_in_meters(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -1647,12 +1650,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `country` field (optional)
     pub fn country(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `country` field to an Option value (optional)
     pub fn maybe_country(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -1660,12 +1663,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `countryCode` field (optional)
     pub fn country_code(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `countryCode` field to an Option value (optional)
     pub fn maybe_country_code(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -1673,12 +1676,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `county` field (optional)
     pub fn county(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `county` field to an Option value (optional)
     pub fn maybe_county(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -1693,11 +1696,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> OccurrenceBuilder<'a, occurrence_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.13 = Option::Some(value.into());
+        self._fields.13 = Option::Some(value.into());
         OccurrenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1705,12 +1708,12 @@ where
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `dataGeneralizations` field (optional)
     pub fn data_generalizations(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `dataGeneralizations` field to an Option value (optional)
     pub fn maybe_data_generalizations(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -1718,12 +1721,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `datasetName` field (optional)
     pub fn dataset_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `datasetName` field to an Option value (optional)
     pub fn maybe_dataset_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -1731,12 +1734,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `dateIdentified` field (optional)
     pub fn date_identified(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `dateIdentified` field to an Option value (optional)
     pub fn maybe_date_identified(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -1744,12 +1747,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `dcType` field (optional)
     pub fn dc_type(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `dcType` field to an Option value (optional)
     pub fn maybe_dc_type(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -1757,12 +1760,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `decimalLatitude` field (optional)
     pub fn decimal_latitude(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `decimalLatitude` field to an Option value (optional)
     pub fn maybe_decimal_latitude(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -1770,12 +1773,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `decimalLongitude` field (optional)
     pub fn decimal_longitude(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `decimalLongitude` field to an Option value (optional)
     pub fn maybe_decimal_longitude(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -1783,12 +1786,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `dynamicProperties` field (optional)
     pub fn dynamic_properties(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `dynamicProperties` field to an Option value (optional)
     pub fn maybe_dynamic_properties(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -1803,11 +1806,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> OccurrenceBuilder<'a, occurrence_state::SetEventDate<S>> {
-        self.__unsafe_private_named.21 = Option::Some(value.into());
+        self._fields.21 = Option::Some(value.into());
         OccurrenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1815,12 +1818,12 @@ where
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `eventID` field (optional)
     pub fn event_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `eventID` field to an Option value (optional)
     pub fn maybe_event_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -1828,12 +1831,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `eventRef` field (optional)
     pub fn event_ref(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `eventRef` field to an Option value (optional)
     pub fn maybe_event_ref(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -1841,12 +1844,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `eventTime` field (optional)
     pub fn event_time(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `eventTime` field to an Option value (optional)
     pub fn maybe_event_time(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -1854,12 +1857,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `family` field (optional)
     pub fn family(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `family` field to an Option value (optional)
     pub fn maybe_family(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -1867,12 +1870,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `fieldNotes` field (optional)
     pub fn field_notes(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `fieldNotes` field to an Option value (optional)
     pub fn maybe_field_notes(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -1880,12 +1883,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `gbifTaxonKey` field (optional)
     pub fn gbif_taxon_key(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `gbifTaxonKey` field to an Option value (optional)
     pub fn maybe_gbif_taxon_key(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -1893,12 +1896,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `genus` field (optional)
     pub fn genus(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `genus` field to an Option value (optional)
     pub fn maybe_genus(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -1906,12 +1909,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `geodeticDatum` field (optional)
     pub fn geodetic_datum(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `geodeticDatum` field to an Option value (optional)
     pub fn maybe_geodetic_datum(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -1919,12 +1922,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `habitat` field (optional)
     pub fn habitat(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `habitat` field to an Option value (optional)
     pub fn maybe_habitat(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -1935,12 +1938,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `higherClassification` field to an Option value (optional)
     pub fn maybe_higher_classification(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -1951,12 +1954,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `identificationQualifier` field to an Option value (optional)
     pub fn maybe_identification_qualifier(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -1967,12 +1970,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `identificationRemarks` field to an Option value (optional)
     pub fn maybe_identification_remarks(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -1980,12 +1983,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `identifiedBy` field (optional)
     pub fn identified_by(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `identifiedBy` field to an Option value (optional)
     pub fn maybe_identified_by(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -1993,12 +1996,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `identifiedByID` field (optional)
     pub fn identified_by_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `identifiedByID` field to an Option value (optional)
     pub fn maybe_identified_by_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -2006,12 +2009,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `imageEvidence` field (optional)
     pub fn image_evidence(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `imageEvidence` field to an Option value (optional)
     pub fn maybe_image_evidence(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -2019,12 +2022,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `individualCount` field (optional)
     pub fn individual_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `individualCount` field to an Option value (optional)
     pub fn maybe_individual_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -2032,12 +2035,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `informationWithheld` field (optional)
     pub fn information_withheld(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `informationWithheld` field to an Option value (optional)
     pub fn maybe_information_withheld(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -2048,12 +2051,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `infraspecificEpithet` field to an Option value (optional)
     pub fn maybe_infraspecific_epithet(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -2061,12 +2064,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `institutionCode` field (optional)
     pub fn institution_code(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `institutionCode` field to an Option value (optional)
     pub fn maybe_institution_code(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -2074,12 +2077,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `kingdom` field (optional)
     pub fn kingdom(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `kingdom` field to an Option value (optional)
     pub fn maybe_kingdom(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -2087,12 +2090,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `license` field (optional)
     pub fn license(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `license` field to an Option value (optional)
     pub fn maybe_license(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -2100,12 +2103,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `lifeStage` field (optional)
     pub fn life_stage(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `lifeStage` field to an Option value (optional)
     pub fn maybe_life_stage(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -2113,12 +2116,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `locality` field (optional)
     pub fn locality(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `locality` field to an Option value (optional)
     pub fn maybe_locality(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -2126,12 +2129,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `locationID` field (optional)
     pub fn location_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `locationID` field to an Option value (optional)
     pub fn maybe_location_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -2139,12 +2142,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `locationRemarks` field (optional)
     pub fn location_remarks(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `locationRemarks` field to an Option value (optional)
     pub fn maybe_location_remarks(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -2152,12 +2155,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `maximumDepthInMeters` field (optional)
     pub fn maximum_depth_in_meters(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `maximumDepthInMeters` field to an Option value (optional)
     pub fn maybe_maximum_depth_in_meters(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -2165,12 +2168,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `maximumElevationInMeters` field (optional)
     pub fn maximum_elevation_in_meters(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `maximumElevationInMeters` field to an Option value (optional)
     pub fn maybe_maximum_elevation_in_meters(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -2178,12 +2181,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `minimumDepthInMeters` field (optional)
     pub fn minimum_depth_in_meters(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `minimumDepthInMeters` field to an Option value (optional)
     pub fn maybe_minimum_depth_in_meters(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -2191,12 +2194,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `minimumElevationInMeters` field (optional)
     pub fn minimum_elevation_in_meters(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `minimumElevationInMeters` field to an Option value (optional)
     pub fn maybe_minimum_elevation_in_meters(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -2204,12 +2207,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `municipality` field (optional)
     pub fn municipality(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `municipality` field to an Option value (optional)
     pub fn maybe_municipality(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -2217,12 +2220,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `nomenclaturalCode` field (optional)
     pub fn nomenclatural_code(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `nomenclaturalCode` field to an Option value (optional)
     pub fn maybe_nomenclatural_code(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -2230,12 +2233,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `occurrenceID` field (optional)
     pub fn occurrence_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `occurrenceID` field to an Option value (optional)
     pub fn maybe_occurrence_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -2243,12 +2246,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `occurrenceRemarks` field (optional)
     pub fn occurrence_remarks(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `occurrenceRemarks` field to an Option value (optional)
     pub fn maybe_occurrence_remarks(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -2256,12 +2259,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `occurrenceStatus` field (optional)
     pub fn occurrence_status(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `occurrenceStatus` field to an Option value (optional)
     pub fn maybe_occurrence_status(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -2269,12 +2272,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `order` field (optional)
     pub fn order(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `order` field to an Option value (optional)
     pub fn maybe_order(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -2282,12 +2285,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `organismQuantity` field (optional)
     pub fn organism_quantity(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `organismQuantity` field to an Option value (optional)
     pub fn maybe_organism_quantity(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -2298,12 +2301,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `organismQuantityType` field to an Option value (optional)
     pub fn maybe_organism_quantity_type(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -2311,12 +2314,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `phylum` field (optional)
     pub fn phylum(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `phylum` field to an Option value (optional)
     pub fn maybe_phylum(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -2327,12 +2330,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `previousIdentifications` field to an Option value (optional)
     pub fn maybe_previous_identifications(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -2340,12 +2343,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `recordedBy` field (optional)
     pub fn recorded_by(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `recordedBy` field to an Option value (optional)
     pub fn maybe_recorded_by(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -2353,12 +2356,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `recordedByID` field (optional)
     pub fn recorded_by_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `recordedByID` field to an Option value (optional)
     pub fn maybe_recorded_by_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -2366,12 +2369,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `references` field (optional)
     pub fn references(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `references` field to an Option value (optional)
     pub fn maybe_references(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -2382,12 +2385,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `reproductiveCondition` field to an Option value (optional)
     pub fn maybe_reproductive_condition(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -2395,12 +2398,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `rightsHolder` field (optional)
     pub fn rights_holder(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `rightsHolder` field to an Option value (optional)
     pub fn maybe_rights_holder(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -2408,12 +2411,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `samplingEffort` field (optional)
     pub fn sampling_effort(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `samplingEffort` field to an Option value (optional)
     pub fn maybe_sampling_effort(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -2421,12 +2424,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `samplingProtocol` field (optional)
     pub fn sampling_protocol(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `samplingProtocol` field to an Option value (optional)
     pub fn maybe_sampling_protocol(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -2441,11 +2444,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> OccurrenceBuilder<'a, occurrence_state::SetScientificName<S>> {
-        self.__unsafe_private_named.68 = Option::Some(value.into());
+        self._fields.68 = Option::Some(value.into());
         OccurrenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2456,7 +2459,7 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `scientificNameAuthorship` field to an Option value (optional)
@@ -2464,7 +2467,7 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
         mut self,
         value: Option<CowStr<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -2472,12 +2475,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `sex` field (optional)
     pub fn sex(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `sex` field to an Option value (optional)
     pub fn maybe_sex(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -2485,12 +2488,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `specificEpithet` field (optional)
     pub fn specific_epithet(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `specificEpithet` field to an Option value (optional)
     pub fn maybe_specific_epithet(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -2498,12 +2501,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `spectrogramEvidence` field (optional)
     pub fn spectrogram_evidence(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `spectrogramEvidence` field to an Option value (optional)
     pub fn maybe_spectrogram_evidence(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -2511,12 +2514,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `stateProvince` field (optional)
     pub fn state_province(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `stateProvince` field to an Option value (optional)
     pub fn maybe_state_province(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -2524,12 +2527,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `taxonRank` field (optional)
     pub fn taxon_rank(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `taxonRank` field to an Option value (optional)
     pub fn maybe_taxon_rank(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -2537,12 +2540,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `taxonomicStatus` field (optional)
     pub fn taxonomic_status(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `taxonomicStatus` field to an Option value (optional)
     pub fn maybe_taxonomic_status(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -2550,12 +2553,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `verbatimLocality` field (optional)
     pub fn verbatim_locality(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `verbatimLocality` field to an Option value (optional)
     pub fn maybe_verbatim_locality(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -2563,12 +2566,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `vernacularName` field (optional)
     pub fn vernacular_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `vernacularName` field to an Option value (optional)
     pub fn maybe_vernacular_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -2576,12 +2579,12 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
     /// Set the `videoEvidence` field (optional)
     pub fn video_evidence(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `videoEvidence` field to an Option value (optional)
     pub fn maybe_video_evidence(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -2589,93 +2592,93 @@ impl<'a, S: occurrence_state::State> OccurrenceBuilder<'a, S> {
 impl<'a, S> OccurrenceBuilder<'a, S>
 where
     S: occurrence_state::State,
-    S::CreatedAt: occurrence_state::IsSet,
+    S::BasisOfRecord: occurrence_state::IsSet,
     S::ScientificName: occurrence_state::IsSet,
     S::EventDate: occurrence_state::IsSet,
-    S::BasisOfRecord: occurrence_state::IsSet,
+    S::CreatedAt: occurrence_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Occurrence<'a> {
         Occurrence {
-            associated_media: self.__unsafe_private_named.0,
-            associated_occurrences: self.__unsafe_private_named.1,
-            associated_references: self.__unsafe_private_named.2,
-            associated_sequences: self.__unsafe_private_named.3,
-            audio_evidence: self.__unsafe_private_named.4,
-            basis_of_record: self.__unsafe_private_named.5.unwrap(),
-            behavior: self.__unsafe_private_named.6,
-            class: self.__unsafe_private_named.7,
-            collection_code: self.__unsafe_private_named.8,
-            coordinate_uncertainty_in_meters: self.__unsafe_private_named.9,
-            country: self.__unsafe_private_named.10,
-            country_code: self.__unsafe_private_named.11,
-            county: self.__unsafe_private_named.12,
-            created_at: self.__unsafe_private_named.13.unwrap(),
-            data_generalizations: self.__unsafe_private_named.14,
-            dataset_name: self.__unsafe_private_named.15,
-            date_identified: self.__unsafe_private_named.16,
-            dc_type: self.__unsafe_private_named.17,
-            decimal_latitude: self.__unsafe_private_named.18,
-            decimal_longitude: self.__unsafe_private_named.19,
-            dynamic_properties: self.__unsafe_private_named.20,
-            event_date: self.__unsafe_private_named.21.unwrap(),
-            event_id: self.__unsafe_private_named.22,
-            event_ref: self.__unsafe_private_named.23,
-            event_time: self.__unsafe_private_named.24,
-            family: self.__unsafe_private_named.25,
-            field_notes: self.__unsafe_private_named.26,
-            gbif_taxon_key: self.__unsafe_private_named.27,
-            genus: self.__unsafe_private_named.28,
-            geodetic_datum: self.__unsafe_private_named.29,
-            habitat: self.__unsafe_private_named.30,
-            higher_classification: self.__unsafe_private_named.31,
-            identification_qualifier: self.__unsafe_private_named.32,
-            identification_remarks: self.__unsafe_private_named.33,
-            identified_by: self.__unsafe_private_named.34,
-            identified_by_id: self.__unsafe_private_named.35,
-            image_evidence: self.__unsafe_private_named.36,
-            individual_count: self.__unsafe_private_named.37,
-            information_withheld: self.__unsafe_private_named.38,
-            infraspecific_epithet: self.__unsafe_private_named.39,
-            institution_code: self.__unsafe_private_named.40,
-            kingdom: self.__unsafe_private_named.41,
-            license: self.__unsafe_private_named.42,
-            life_stage: self.__unsafe_private_named.43,
-            locality: self.__unsafe_private_named.44,
-            location_id: self.__unsafe_private_named.45,
-            location_remarks: self.__unsafe_private_named.46,
-            maximum_depth_in_meters: self.__unsafe_private_named.47,
-            maximum_elevation_in_meters: self.__unsafe_private_named.48,
-            minimum_depth_in_meters: self.__unsafe_private_named.49,
-            minimum_elevation_in_meters: self.__unsafe_private_named.50,
-            municipality: self.__unsafe_private_named.51,
-            nomenclatural_code: self.__unsafe_private_named.52,
-            occurrence_id: self.__unsafe_private_named.53,
-            occurrence_remarks: self.__unsafe_private_named.54,
-            occurrence_status: self.__unsafe_private_named.55,
-            order: self.__unsafe_private_named.56,
-            organism_quantity: self.__unsafe_private_named.57,
-            organism_quantity_type: self.__unsafe_private_named.58,
-            phylum: self.__unsafe_private_named.59,
-            previous_identifications: self.__unsafe_private_named.60,
-            recorded_by: self.__unsafe_private_named.61,
-            recorded_by_id: self.__unsafe_private_named.62,
-            references: self.__unsafe_private_named.63,
-            reproductive_condition: self.__unsafe_private_named.64,
-            rights_holder: self.__unsafe_private_named.65,
-            sampling_effort: self.__unsafe_private_named.66,
-            sampling_protocol: self.__unsafe_private_named.67,
-            scientific_name: self.__unsafe_private_named.68.unwrap(),
-            scientific_name_authorship: self.__unsafe_private_named.69,
-            sex: self.__unsafe_private_named.70,
-            specific_epithet: self.__unsafe_private_named.71,
-            spectrogram_evidence: self.__unsafe_private_named.72,
-            state_province: self.__unsafe_private_named.73,
-            taxon_rank: self.__unsafe_private_named.74,
-            taxonomic_status: self.__unsafe_private_named.75,
-            verbatim_locality: self.__unsafe_private_named.76,
-            vernacular_name: self.__unsafe_private_named.77,
-            video_evidence: self.__unsafe_private_named.78,
+            associated_media: self._fields.0,
+            associated_occurrences: self._fields.1,
+            associated_references: self._fields.2,
+            associated_sequences: self._fields.3,
+            audio_evidence: self._fields.4,
+            basis_of_record: self._fields.5.unwrap(),
+            behavior: self._fields.6,
+            class: self._fields.7,
+            collection_code: self._fields.8,
+            coordinate_uncertainty_in_meters: self._fields.9,
+            country: self._fields.10,
+            country_code: self._fields.11,
+            county: self._fields.12,
+            created_at: self._fields.13.unwrap(),
+            data_generalizations: self._fields.14,
+            dataset_name: self._fields.15,
+            date_identified: self._fields.16,
+            dc_type: self._fields.17,
+            decimal_latitude: self._fields.18,
+            decimal_longitude: self._fields.19,
+            dynamic_properties: self._fields.20,
+            event_date: self._fields.21.unwrap(),
+            event_id: self._fields.22,
+            event_ref: self._fields.23,
+            event_time: self._fields.24,
+            family: self._fields.25,
+            field_notes: self._fields.26,
+            gbif_taxon_key: self._fields.27,
+            genus: self._fields.28,
+            geodetic_datum: self._fields.29,
+            habitat: self._fields.30,
+            higher_classification: self._fields.31,
+            identification_qualifier: self._fields.32,
+            identification_remarks: self._fields.33,
+            identified_by: self._fields.34,
+            identified_by_id: self._fields.35,
+            image_evidence: self._fields.36,
+            individual_count: self._fields.37,
+            information_withheld: self._fields.38,
+            infraspecific_epithet: self._fields.39,
+            institution_code: self._fields.40,
+            kingdom: self._fields.41,
+            license: self._fields.42,
+            life_stage: self._fields.43,
+            locality: self._fields.44,
+            location_id: self._fields.45,
+            location_remarks: self._fields.46,
+            maximum_depth_in_meters: self._fields.47,
+            maximum_elevation_in_meters: self._fields.48,
+            minimum_depth_in_meters: self._fields.49,
+            minimum_elevation_in_meters: self._fields.50,
+            municipality: self._fields.51,
+            nomenclatural_code: self._fields.52,
+            occurrence_id: self._fields.53,
+            occurrence_remarks: self._fields.54,
+            occurrence_status: self._fields.55,
+            order: self._fields.56,
+            organism_quantity: self._fields.57,
+            organism_quantity_type: self._fields.58,
+            phylum: self._fields.59,
+            previous_identifications: self._fields.60,
+            recorded_by: self._fields.61,
+            recorded_by_id: self._fields.62,
+            references: self._fields.63,
+            reproductive_condition: self._fields.64,
+            rights_holder: self._fields.65,
+            sampling_effort: self._fields.66,
+            sampling_protocol: self._fields.67,
+            scientific_name: self._fields.68.unwrap(),
+            scientific_name_authorship: self._fields.69,
+            sex: self._fields.70,
+            specific_epithet: self._fields.71,
+            spectrogram_evidence: self._fields.72,
+            state_province: self._fields.73,
+            taxon_rank: self._fields.74,
+            taxonomic_status: self._fields.75,
+            verbatim_locality: self._fields.76,
+            vernacular_name: self._fields.77,
+            video_evidence: self._fields.78,
             extra_data: Default::default(),
         }
     }
@@ -2685,85 +2688,85 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Occurrence<'a> {
         Occurrence {
-            associated_media: self.__unsafe_private_named.0,
-            associated_occurrences: self.__unsafe_private_named.1,
-            associated_references: self.__unsafe_private_named.2,
-            associated_sequences: self.__unsafe_private_named.3,
-            audio_evidence: self.__unsafe_private_named.4,
-            basis_of_record: self.__unsafe_private_named.5.unwrap(),
-            behavior: self.__unsafe_private_named.6,
-            class: self.__unsafe_private_named.7,
-            collection_code: self.__unsafe_private_named.8,
-            coordinate_uncertainty_in_meters: self.__unsafe_private_named.9,
-            country: self.__unsafe_private_named.10,
-            country_code: self.__unsafe_private_named.11,
-            county: self.__unsafe_private_named.12,
-            created_at: self.__unsafe_private_named.13.unwrap(),
-            data_generalizations: self.__unsafe_private_named.14,
-            dataset_name: self.__unsafe_private_named.15,
-            date_identified: self.__unsafe_private_named.16,
-            dc_type: self.__unsafe_private_named.17,
-            decimal_latitude: self.__unsafe_private_named.18,
-            decimal_longitude: self.__unsafe_private_named.19,
-            dynamic_properties: self.__unsafe_private_named.20,
-            event_date: self.__unsafe_private_named.21.unwrap(),
-            event_id: self.__unsafe_private_named.22,
-            event_ref: self.__unsafe_private_named.23,
-            event_time: self.__unsafe_private_named.24,
-            family: self.__unsafe_private_named.25,
-            field_notes: self.__unsafe_private_named.26,
-            gbif_taxon_key: self.__unsafe_private_named.27,
-            genus: self.__unsafe_private_named.28,
-            geodetic_datum: self.__unsafe_private_named.29,
-            habitat: self.__unsafe_private_named.30,
-            higher_classification: self.__unsafe_private_named.31,
-            identification_qualifier: self.__unsafe_private_named.32,
-            identification_remarks: self.__unsafe_private_named.33,
-            identified_by: self.__unsafe_private_named.34,
-            identified_by_id: self.__unsafe_private_named.35,
-            image_evidence: self.__unsafe_private_named.36,
-            individual_count: self.__unsafe_private_named.37,
-            information_withheld: self.__unsafe_private_named.38,
-            infraspecific_epithet: self.__unsafe_private_named.39,
-            institution_code: self.__unsafe_private_named.40,
-            kingdom: self.__unsafe_private_named.41,
-            license: self.__unsafe_private_named.42,
-            life_stage: self.__unsafe_private_named.43,
-            locality: self.__unsafe_private_named.44,
-            location_id: self.__unsafe_private_named.45,
-            location_remarks: self.__unsafe_private_named.46,
-            maximum_depth_in_meters: self.__unsafe_private_named.47,
-            maximum_elevation_in_meters: self.__unsafe_private_named.48,
-            minimum_depth_in_meters: self.__unsafe_private_named.49,
-            minimum_elevation_in_meters: self.__unsafe_private_named.50,
-            municipality: self.__unsafe_private_named.51,
-            nomenclatural_code: self.__unsafe_private_named.52,
-            occurrence_id: self.__unsafe_private_named.53,
-            occurrence_remarks: self.__unsafe_private_named.54,
-            occurrence_status: self.__unsafe_private_named.55,
-            order: self.__unsafe_private_named.56,
-            organism_quantity: self.__unsafe_private_named.57,
-            organism_quantity_type: self.__unsafe_private_named.58,
-            phylum: self.__unsafe_private_named.59,
-            previous_identifications: self.__unsafe_private_named.60,
-            recorded_by: self.__unsafe_private_named.61,
-            recorded_by_id: self.__unsafe_private_named.62,
-            references: self.__unsafe_private_named.63,
-            reproductive_condition: self.__unsafe_private_named.64,
-            rights_holder: self.__unsafe_private_named.65,
-            sampling_effort: self.__unsafe_private_named.66,
-            sampling_protocol: self.__unsafe_private_named.67,
-            scientific_name: self.__unsafe_private_named.68.unwrap(),
-            scientific_name_authorship: self.__unsafe_private_named.69,
-            sex: self.__unsafe_private_named.70,
-            specific_epithet: self.__unsafe_private_named.71,
-            spectrogram_evidence: self.__unsafe_private_named.72,
-            state_province: self.__unsafe_private_named.73,
-            taxon_rank: self.__unsafe_private_named.74,
-            taxonomic_status: self.__unsafe_private_named.75,
-            verbatim_locality: self.__unsafe_private_named.76,
-            vernacular_name: self.__unsafe_private_named.77,
-            video_evidence: self.__unsafe_private_named.78,
+            associated_media: self._fields.0,
+            associated_occurrences: self._fields.1,
+            associated_references: self._fields.2,
+            associated_sequences: self._fields.3,
+            audio_evidence: self._fields.4,
+            basis_of_record: self._fields.5.unwrap(),
+            behavior: self._fields.6,
+            class: self._fields.7,
+            collection_code: self._fields.8,
+            coordinate_uncertainty_in_meters: self._fields.9,
+            country: self._fields.10,
+            country_code: self._fields.11,
+            county: self._fields.12,
+            created_at: self._fields.13.unwrap(),
+            data_generalizations: self._fields.14,
+            dataset_name: self._fields.15,
+            date_identified: self._fields.16,
+            dc_type: self._fields.17,
+            decimal_latitude: self._fields.18,
+            decimal_longitude: self._fields.19,
+            dynamic_properties: self._fields.20,
+            event_date: self._fields.21.unwrap(),
+            event_id: self._fields.22,
+            event_ref: self._fields.23,
+            event_time: self._fields.24,
+            family: self._fields.25,
+            field_notes: self._fields.26,
+            gbif_taxon_key: self._fields.27,
+            genus: self._fields.28,
+            geodetic_datum: self._fields.29,
+            habitat: self._fields.30,
+            higher_classification: self._fields.31,
+            identification_qualifier: self._fields.32,
+            identification_remarks: self._fields.33,
+            identified_by: self._fields.34,
+            identified_by_id: self._fields.35,
+            image_evidence: self._fields.36,
+            individual_count: self._fields.37,
+            information_withheld: self._fields.38,
+            infraspecific_epithet: self._fields.39,
+            institution_code: self._fields.40,
+            kingdom: self._fields.41,
+            license: self._fields.42,
+            life_stage: self._fields.43,
+            locality: self._fields.44,
+            location_id: self._fields.45,
+            location_remarks: self._fields.46,
+            maximum_depth_in_meters: self._fields.47,
+            maximum_elevation_in_meters: self._fields.48,
+            minimum_depth_in_meters: self._fields.49,
+            minimum_elevation_in_meters: self._fields.50,
+            municipality: self._fields.51,
+            nomenclatural_code: self._fields.52,
+            occurrence_id: self._fields.53,
+            occurrence_remarks: self._fields.54,
+            occurrence_status: self._fields.55,
+            order: self._fields.56,
+            organism_quantity: self._fields.57,
+            organism_quantity_type: self._fields.58,
+            phylum: self._fields.59,
+            previous_identifications: self._fields.60,
+            recorded_by: self._fields.61,
+            recorded_by_id: self._fields.62,
+            references: self._fields.63,
+            reproductive_condition: self._fields.64,
+            rights_holder: self._fields.65,
+            sampling_effort: self._fields.66,
+            sampling_protocol: self._fields.67,
+            scientific_name: self._fields.68.unwrap(),
+            scientific_name_authorship: self._fields.69,
+            sex: self._fields.70,
+            specific_epithet: self._fields.71,
+            spectrogram_evidence: self._fields.72,
+            state_province: self._fields.73,
+            taxon_rank: self._fields.74,
+            taxonomic_status: self._fields.75,
+            verbatim_locality: self._fields.76,
+            vernacular_name: self._fields.77,
+            video_evidence: self._fields.78,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_gainforest/evaluator.rs b/crates/jacquard-api/src/app_gainforest/evaluator.rs
index bf5abdd0..43ca4921 100644
--- a/crates/jacquard-api/src/app_gainforest/evaluator.rs
+++ b/crates/jacquard-api/src/app_gainforest/evaluator.rs
@@ -9,7 +9,11 @@ pub mod evaluation;
 pub mod service;
 pub mod subscription;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -1006,58 +1010,58 @@ pub mod candidate_taxon_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Rank;
         type ScientificName;
         type Confidence;
-        type Rank;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Rank = Unset;
         type ScientificName = Unset;
         type Confidence = Unset;
-        type Rank = Unset;
+    }
+    ///State transition - sets the `rank` field to Set
+    pub struct SetRank<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRank<S> {}
+    impl<S: State> State for SetRank<S> {
+        type Rank = Set<members::rank>;
+        type ScientificName = S::ScientificName;
+        type Confidence = S::Confidence;
     }
     ///State transition - sets the `scientific_name` field to Set
     pub struct SetScientificName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetScientificName<S> {}
     impl<S: State> State for SetScientificName<S> {
+        type Rank = S::Rank;
         type ScientificName = Set<members::scientific_name>;
         type Confidence = S::Confidence;
-        type Rank = S::Rank;
     }
     ///State transition - sets the `confidence` field to Set
     pub struct SetConfidence<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetConfidence<S> {}
     impl<S: State> State for SetConfidence<S> {
-        type ScientificName = S::ScientificName;
-        type Confidence = Set<members::confidence>;
         type Rank = S::Rank;
-    }
-    ///State transition - sets the `rank` field to Set
-    pub struct SetRank<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRank<S> {}
-    impl<S: State> State for SetRank<S> {
         type ScientificName = S::ScientificName;
-        type Confidence = S::Confidence;
-        type Rank = Set<members::rank>;
+        type Confidence = Set<members::confidence>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `rank` field
+        pub struct rank(());
         ///Marker type for the `scientific_name` field
         pub struct scientific_name(());
         ///Marker type for the `confidence` field
         pub struct confidence(());
-        ///Marker type for the `rank` field
-        pub struct rank(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CandidateTaxonBuilder<'a, S: candidate_taxon_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -1066,7 +1070,7 @@ pub struct CandidateTaxonBuilder<'a, S: candidate_taxon_state::State> {
         Option<i64>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CandidateTaxon<'a> {
@@ -1080,9 +1084,9 @@ impl<'a> CandidateTaxonBuilder<'a, candidate_taxon_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CandidateTaxonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1097,11 +1101,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CandidateTaxonBuilder<'a, candidate_taxon_state::SetConfidence<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CandidateTaxonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1109,12 +1113,12 @@ where
 impl<'a, S: candidate_taxon_state::State> CandidateTaxonBuilder<'a, S> {
     /// Set the `family` field (optional)
     pub fn family(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `family` field to an Option value (optional)
     pub fn maybe_family(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1122,12 +1126,12 @@ impl<'a, S: candidate_taxon_state::State> CandidateTaxonBuilder<'a, S> {
 impl<'a, S: candidate_taxon_state::State> CandidateTaxonBuilder<'a, S> {
     /// Set the `gbifTaxonKey` field (optional)
     pub fn gbif_taxon_key(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `gbifTaxonKey` field to an Option value (optional)
     pub fn maybe_gbif_taxon_key(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1135,12 +1139,12 @@ impl<'a, S: candidate_taxon_state::State> CandidateTaxonBuilder<'a, S> {
 impl<'a, S: candidate_taxon_state::State> CandidateTaxonBuilder<'a, S> {
     /// Set the `genus` field (optional)
     pub fn genus(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `genus` field to an Option value (optional)
     pub fn maybe_genus(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1148,12 +1152,12 @@ impl<'a, S: candidate_taxon_state::State> CandidateTaxonBuilder<'a, S> {
 impl<'a, S: candidate_taxon_state::State> CandidateTaxonBuilder<'a, S> {
     /// Set the `kingdom` field (optional)
     pub fn kingdom(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `kingdom` field to an Option value (optional)
     pub fn maybe_kingdom(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1168,11 +1172,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CandidateTaxonBuilder<'a, candidate_taxon_state::SetRank<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         CandidateTaxonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1187,11 +1191,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CandidateTaxonBuilder<'a, candidate_taxon_state::SetScientificName<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         CandidateTaxonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1199,20 +1203,20 @@ where
 impl<'a, S> CandidateTaxonBuilder<'a, S>
 where
     S: candidate_taxon_state::State,
+    S::Rank: candidate_taxon_state::IsSet,
     S::ScientificName: candidate_taxon_state::IsSet,
     S::Confidence: candidate_taxon_state::IsSet,
-    S::Rank: candidate_taxon_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CandidateTaxon<'a> {
         CandidateTaxon {
-            confidence: self.__unsafe_private_named.0.unwrap(),
-            family: self.__unsafe_private_named.1,
-            gbif_taxon_key: self.__unsafe_private_named.2,
-            genus: self.__unsafe_private_named.3,
-            kingdom: self.__unsafe_private_named.4,
-            rank: self.__unsafe_private_named.5.unwrap(),
-            scientific_name: self.__unsafe_private_named.6.unwrap(),
+            confidence: self._fields.0.unwrap(),
+            family: self._fields.1,
+            gbif_taxon_key: self._fields.2,
+            genus: self._fields.3,
+            kingdom: self._fields.4,
+            rank: self._fields.5.unwrap(),
+            scientific_name: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1225,13 +1229,13 @@ where
         >,
     ) -> CandidateTaxon<'a> {
         CandidateTaxon {
-            confidence: self.__unsafe_private_named.0.unwrap(),
-            family: self.__unsafe_private_named.1,
-            gbif_taxon_key: self.__unsafe_private_named.2,
-            genus: self.__unsafe_private_named.3,
-            kingdom: self.__unsafe_private_named.4,
-            rank: self.__unsafe_private_named.5.unwrap(),
-            scientific_name: self.__unsafe_private_named.6.unwrap(),
+            confidence: self._fields.0.unwrap(),
+            family: self._fields.1,
+            gbif_taxon_key: self._fields.2,
+            genus: self._fields.3,
+            kingdom: self._fields.4,
+            rank: self._fields.5.unwrap(),
+            scientific_name: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1891,13 +1895,9 @@ pub mod data_quality_result_state {
 
 /// Builder for constructing an instance of this type
 pub struct DataQualityResultBuilder<'a, S: data_quality_result_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<i64>,
-        Option<Vec<evaluator::QualityFlag<'a>>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Vec<evaluator::QualityFlag<'a>>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DataQualityResult<'a> {
@@ -1911,9 +1911,9 @@ impl<'a> DataQualityResultBuilder<'a, data_quality_result_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DataQualityResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1921,12 +1921,12 @@ impl<'a> DataQualityResultBuilder<'a, data_quality_result_state::Empty> {
 impl<'a, S: data_quality_result_state::State> DataQualityResultBuilder<'a, S> {
     /// Set the `completenessScore` field (optional)
     pub fn completeness_score(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `completenessScore` field to an Option value (optional)
     pub fn maybe_completeness_score(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1941,11 +1941,11 @@ where
         mut self,
         value: impl Into<Vec<evaluator::QualityFlag<'a>>>,
     ) -> DataQualityResultBuilder<'a, data_quality_result_state::SetFlags<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DataQualityResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1953,12 +1953,12 @@ where
 impl<'a, S: data_quality_result_state::State> DataQualityResultBuilder<'a, S> {
     /// Set the `remarks` field (optional)
     pub fn remarks(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `remarks` field to an Option value (optional)
     pub fn maybe_remarks(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1971,9 +1971,9 @@ where
     /// Build the final struct
     pub fn build(self) -> DataQualityResult<'a> {
         DataQualityResult {
-            completeness_score: self.__unsafe_private_named.0,
-            flags: self.__unsafe_private_named.1.unwrap(),
-            remarks: self.__unsafe_private_named.2,
+            completeness_score: self._fields.0,
+            flags: self._fields.1.unwrap(),
+            remarks: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -1986,9 +1986,9 @@ where
         >,
     ) -> DataQualityResult<'a> {
         DataQualityResult {
-            completeness_score: self.__unsafe_private_named.0,
-            flags: self.__unsafe_private_named.1.unwrap(),
-            remarks: self.__unsafe_private_named.2,
+            completeness_score: self._fields.0,
+            flags: self._fields.1.unwrap(),
+            remarks: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -2028,12 +2028,9 @@ pub mod measurement_result_state {
 
 /// Builder for constructing an instance of this type
 pub struct MeasurementResultBuilder<'a, S: measurement_result_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<evaluator::DerivedMeasurement<'a>>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<evaluator::DerivedMeasurement<'a>>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MeasurementResult<'a> {
@@ -2047,9 +2044,9 @@ impl<'a> MeasurementResultBuilder<'a, measurement_result_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MeasurementResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2064,11 +2061,11 @@ where
         mut self,
         value: impl Into<Vec<evaluator::DerivedMeasurement<'a>>>,
     ) -> MeasurementResultBuilder<'a, measurement_result_state::SetMeasurements<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MeasurementResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2076,12 +2073,12 @@ where
 impl<'a, S: measurement_result_state::State> MeasurementResultBuilder<'a, S> {
     /// Set the `remarks` field (optional)
     pub fn remarks(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `remarks` field to an Option value (optional)
     pub fn maybe_remarks(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -2094,8 +2091,8 @@ where
     /// Build the final struct
     pub fn build(self) -> MeasurementResult<'a> {
         MeasurementResult {
-            measurements: self.__unsafe_private_named.0.unwrap(),
-            remarks: self.__unsafe_private_named.1,
+            measurements: self._fields.0.unwrap(),
+            remarks: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -2108,8 +2105,8 @@ where
         >,
     ) -> MeasurementResult<'a> {
         MeasurementResult {
-            measurements: self.__unsafe_private_named.0.unwrap(),
-            remarks: self.__unsafe_private_named.1,
+            measurements: self._fields.0.unwrap(),
+            remarks: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
@@ -2149,13 +2146,13 @@ pub mod species_id_result_state {
 
 /// Builder for constructing an instance of this type
 pub struct SpeciesIdResultBuilder<'a, S: species_id_result_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<evaluator::CandidateTaxon<'a>>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SpeciesIdResult<'a> {
@@ -2169,9 +2166,9 @@ impl<'a> SpeciesIdResultBuilder<'a, species_id_result_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SpeciesIdResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2186,11 +2183,11 @@ where
         mut self,
         value: impl Into<Vec<evaluator::CandidateTaxon<'a>>>,
     ) -> SpeciesIdResultBuilder<'a, species_id_result_state::SetCandidates<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SpeciesIdResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2198,12 +2195,12 @@ where
 impl<'a, S: species_id_result_state::State> SpeciesIdResultBuilder<'a, S> {
     /// Set the `inputFeature` field (optional)
     pub fn input_feature(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `inputFeature` field to an Option value (optional)
     pub fn maybe_input_feature(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -2211,12 +2208,12 @@ impl<'a, S: species_id_result_state::State> SpeciesIdResultBuilder<'a, S> {
 impl<'a, S: species_id_result_state::State> SpeciesIdResultBuilder<'a, S> {
     /// Set the `remarks` field (optional)
     pub fn remarks(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `remarks` field to an Option value (optional)
     pub fn maybe_remarks(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -2229,9 +2226,9 @@ where
     /// Build the final struct
     pub fn build(self) -> SpeciesIdResult<'a> {
         SpeciesIdResult {
-            candidates: self.__unsafe_private_named.0.unwrap(),
-            input_feature: self.__unsafe_private_named.1,
-            remarks: self.__unsafe_private_named.2,
+            candidates: self._fields.0.unwrap(),
+            input_feature: self._fields.1,
+            remarks: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -2244,9 +2241,9 @@ where
         >,
     ) -> SpeciesIdResult<'a> {
         SpeciesIdResult {
-            candidates: self.__unsafe_private_named.0.unwrap(),
-            input_feature: self.__unsafe_private_named.1,
-            remarks: self.__unsafe_private_named.2,
+            candidates: self._fields.0.unwrap(),
+            input_feature: self._fields.1,
+            remarks: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -2286,9 +2283,9 @@ pub mod subject_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct SubjectRefBuilder<'a, S: subject_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SubjectRef<'a> {
@@ -2302,9 +2299,9 @@ impl<'a> SubjectRefBuilder<'a, subject_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubjectRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2312,12 +2309,12 @@ impl<'a> SubjectRefBuilder<'a, subject_ref_state::Empty> {
 impl<'a, S: subject_ref_state::State> SubjectRefBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -2332,11 +2329,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SubjectRefBuilder<'a, subject_ref_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SubjectRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2349,8 +2346,8 @@ where
     /// Build the final struct
     pub fn build(self) -> SubjectRef<'a> {
         SubjectRef {
-            cid: self.__unsafe_private_named.0,
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0,
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2363,8 +2360,8 @@ where
         >,
     ) -> SubjectRef<'a> {
         SubjectRef {
-            cid: self.__unsafe_private_named.0,
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0,
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_gainforest/evaluator/evaluation.rs b/crates/jacquard-api/src/app_gainforest/evaluator/evaluation.rs
index 4ef1c97b..9cffcd9e 100644
--- a/crates/jacquard-api/src/app_gainforest/evaluator/evaluation.rs
+++ b/crates/jacquard-api/src/app_gainforest/evaluator/evaluation.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -218,44 +221,44 @@ pub mod evaluation_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type EvaluationType;
         type CreatedAt;
+        type EvaluationType;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type EvaluationType = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `evaluation_type` field to Set
-    pub struct SetEvaluationType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetEvaluationType<S> {}
-    impl<S: State> State for SetEvaluationType<S> {
-        type EvaluationType = Set<members::evaluation_type>;
-        type CreatedAt = S::CreatedAt;
+        type EvaluationType = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type EvaluationType = S::EvaluationType;
         type CreatedAt = Set<members::created_at>;
+        type EvaluationType = S::EvaluationType;
+    }
+    ///State transition - sets the `evaluation_type` field to Set
+    pub struct SetEvaluationType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetEvaluationType<S> {}
+    impl<S: State> State for SetEvaluationType<S> {
+        type CreatedAt = S::CreatedAt;
+        type EvaluationType = Set<members::evaluation_type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `evaluation_type` field
-        pub struct evaluation_type(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `evaluation_type` field
+        pub struct evaluation_type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EvaluationBuilder<'a, S: evaluation_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -267,7 +270,7 @@ pub struct EvaluationBuilder<'a, S: evaluation_state::State> {
         Option<Vec<SubjectRef<'a>>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Evaluation<'a> {
@@ -281,20 +284,9 @@ impl<'a> EvaluationBuilder<'a, evaluation_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EvaluationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -302,12 +294,12 @@ impl<'a> EvaluationBuilder<'a, evaluation_state::Empty> {
 impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
     /// Set the `confidence` field (optional)
     pub fn confidence(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `confidence` field to an Option value (optional)
     pub fn maybe_confidence(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -322,11 +314,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EvaluationBuilder<'a, evaluation_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EvaluationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -334,12 +326,12 @@ where
 impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
     /// Set the `dynamicProperties` field (optional)
     pub fn dynamic_properties(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `dynamicProperties` field to an Option value (optional)
     pub fn maybe_dynamic_properties(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -354,11 +346,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EvaluationBuilder<'a, evaluation_state::SetEvaluationType<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         EvaluationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -366,12 +358,12 @@ where
 impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
     /// Set the `method` field (optional)
     pub fn method(mut self, value: impl Into<Option<MethodInfo<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `method` field to an Option value (optional)
     pub fn maybe_method(mut self, value: Option<MethodInfo<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -379,12 +371,12 @@ impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
 impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
     /// Set the `neg` field (optional)
     pub fn neg(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `neg` field to an Option value (optional)
     pub fn maybe_neg(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -392,12 +384,12 @@ impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
 impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
     /// Set the `result` field (optional)
     pub fn result(mut self, value: impl Into<Option<EvaluationResult<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `result` field to an Option value (optional)
     pub fn maybe_result(mut self, value: Option<EvaluationResult<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -405,12 +397,12 @@ impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
 impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
     /// Set the `subject` field (optional)
     pub fn subject(mut self, value: impl Into<Option<SubjectRef<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `subject` field to an Option value (optional)
     pub fn maybe_subject(mut self, value: Option<SubjectRef<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -418,12 +410,12 @@ impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
 impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
     /// Set the `subjects` field (optional)
     pub fn subjects(mut self, value: impl Into<Option<Vec<SubjectRef<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `subjects` field to an Option value (optional)
     pub fn maybe_subjects(mut self, value: Option<Vec<SubjectRef<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -431,12 +423,12 @@ impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
 impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
     /// Set the `supersedes` field (optional)
     pub fn supersedes(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `supersedes` field to an Option value (optional)
     pub fn maybe_supersedes(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -444,22 +436,22 @@ impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
 impl<'a, S> EvaluationBuilder<'a, S>
 where
     S: evaluation_state::State,
-    S::EvaluationType: evaluation_state::IsSet,
     S::CreatedAt: evaluation_state::IsSet,
+    S::EvaluationType: evaluation_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Evaluation<'a> {
         Evaluation {
-            confidence: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            dynamic_properties: self.__unsafe_private_named.2,
-            evaluation_type: self.__unsafe_private_named.3.unwrap(),
-            method: self.__unsafe_private_named.4,
-            neg: self.__unsafe_private_named.5,
-            result: self.__unsafe_private_named.6,
-            subject: self.__unsafe_private_named.7,
-            subjects: self.__unsafe_private_named.8,
-            supersedes: self.__unsafe_private_named.9,
+            confidence: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            dynamic_properties: self._fields.2,
+            evaluation_type: self._fields.3.unwrap(),
+            method: self._fields.4,
+            neg: self._fields.5,
+            result: self._fields.6,
+            subject: self._fields.7,
+            subjects: self._fields.8,
+            supersedes: self._fields.9,
             extra_data: Default::default(),
         }
     }
@@ -472,16 +464,16 @@ where
         >,
     ) -> Evaluation<'a> {
         Evaluation {
-            confidence: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            dynamic_properties: self.__unsafe_private_named.2,
-            evaluation_type: self.__unsafe_private_named.3.unwrap(),
-            method: self.__unsafe_private_named.4,
-            neg: self.__unsafe_private_named.5,
-            result: self.__unsafe_private_named.6,
-            subject: self.__unsafe_private_named.7,
-            subjects: self.__unsafe_private_named.8,
-            supersedes: self.__unsafe_private_named.9,
+            confidence: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            dynamic_properties: self._fields.2,
+            evaluation_type: self._fields.3.unwrap(),
+            method: self._fields.4,
+            neg: self._fields.5,
+            result: self._fields.6,
+            subject: self._fields.7,
+            subjects: self._fields.8,
+            supersedes: self._fields.9,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_gainforest/evaluator/service.rs b/crates/jacquard-api/src/app_gainforest/evaluator/service.rs
index 3513a9df..bfa3bde8 100644
--- a/crates/jacquard-api/src/app_gainforest/evaluator/service.rs
+++ b/crates/jacquard-api/src/app_gainforest/evaluator/service.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -722,14 +725,14 @@ pub mod evaluator_policies_state {
 
 /// Builder for constructing an instance of this type
 pub struct EvaluatorPoliciesBuilder<'a, S: evaluator_policies_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<EvaluatorPoliciesAccessModel<'a>>,
         Option<Vec<service::EvaluationTypeDefinition<'a>>>,
         Option<Vec<CowStr<'a>>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> EvaluatorPolicies<'a> {
@@ -743,9 +746,9 @@ impl<'a> EvaluatorPoliciesBuilder<'a, evaluator_policies_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EvaluatorPoliciesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -756,7 +759,7 @@ impl<'a, S: evaluator_policies_state::State> EvaluatorPoliciesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EvaluatorPoliciesAccessModel<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `accessModel` field to an Option value (optional)
@@ -764,7 +767,7 @@ impl<'a, S: evaluator_policies_state::State> EvaluatorPoliciesBuilder<'a, S> {
         mut self,
         value: Option<EvaluatorPoliciesAccessModel<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -775,7 +778,7 @@ impl<'a, S: evaluator_policies_state::State> EvaluatorPoliciesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<service::EvaluationTypeDefinition<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `evaluationTypeDefinitions` field to an Option value (optional)
@@ -783,7 +786,7 @@ impl<'a, S: evaluator_policies_state::State> EvaluatorPoliciesBuilder<'a, S> {
         mut self,
         value: Option<Vec<service::EvaluationTypeDefinition<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -798,11 +801,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> EvaluatorPoliciesBuilder<'a, evaluator_policies_state::SetEvaluationTypes<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EvaluatorPoliciesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -813,12 +816,12 @@ impl<'a, S: evaluator_policies_state::State> EvaluatorPoliciesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<CowStr<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `subjectCollections` field to an Option value (optional)
     pub fn maybe_subject_collections(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -831,10 +834,10 @@ where
     /// Build the final struct
     pub fn build(self) -> EvaluatorPolicies<'a> {
         EvaluatorPolicies {
-            access_model: self.__unsafe_private_named.0,
-            evaluation_type_definitions: self.__unsafe_private_named.1,
-            evaluation_types: self.__unsafe_private_named.2.unwrap(),
-            subject_collections: self.__unsafe_private_named.3,
+            access_model: self._fields.0,
+            evaluation_type_definitions: self._fields.1,
+            evaluation_types: self._fields.2.unwrap(),
+            subject_collections: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -847,10 +850,10 @@ where
         >,
     ) -> EvaluatorPolicies<'a> {
         EvaluatorPolicies {
-            access_model: self.__unsafe_private_named.0,
-            evaluation_type_definitions: self.__unsafe_private_named.1,
-            evaluation_types: self.__unsafe_private_named.2.unwrap(),
-            subject_collections: self.__unsafe_private_named.3,
+            access_model: self._fields.0,
+            evaluation_type_definitions: self._fields.1,
+            evaluation_types: self._fields.2.unwrap(),
+            subject_collections: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -866,45 +869,45 @@ pub mod service_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Policies;
         type CreatedAt;
+        type Policies;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Policies = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `policies` field to Set
-    pub struct SetPolicies<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPolicies<S> {}
-    impl<S: State> State for SetPolicies<S> {
-        type Policies = Set<members::policies>;
-        type CreatedAt = S::CreatedAt;
+        type Policies = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Policies = S::Policies;
         type CreatedAt = Set<members::created_at>;
+        type Policies = S::Policies;
+    }
+    ///State transition - sets the `policies` field to Set
+    pub struct SetPolicies<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPolicies<S> {}
+    impl<S: State> State for SetPolicies<S> {
+        type CreatedAt = S::CreatedAt;
+        type Policies = Set<members::policies>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `policies` field
-        pub struct policies(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `policies` field
+        pub struct policies(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ServiceBuilder<'a, S: service_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<service::EvaluatorPolicies<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<service::EvaluatorPolicies<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Service<'a> {
@@ -918,9 +921,9 @@ impl<'a> ServiceBuilder<'a, service_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ServiceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -935,11 +938,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ServiceBuilder<'a, service_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ServiceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -954,11 +957,11 @@ where
         mut self,
         value: impl Into<service::EvaluatorPolicies<'a>>,
     ) -> ServiceBuilder<'a, service_state::SetPolicies<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ServiceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -966,14 +969,14 @@ where
 impl<'a, S> ServiceBuilder<'a, S>
 where
     S: service_state::State,
-    S::Policies: service_state::IsSet,
     S::CreatedAt: service_state::IsSet,
+    S::Policies: service_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Service<'a> {
         Service {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            policies: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            policies: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -986,8 +989,8 @@ where
         >,
     ) -> Service<'a> {
         Service {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            policies: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            policies: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_gainforest/evaluator/subscription.rs b/crates/jacquard-api/src/app_gainforest/evaluator/subscription.rs
index 61afd5eb..0f5e0c6a 100644
--- a/crates/jacquard-api/src/app_gainforest/evaluator/subscription.rs
+++ b/crates/jacquard-api/src/app_gainforest/evaluator/subscription.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -138,50 +141,50 @@ pub mod subscription_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Evaluator;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Evaluator = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Evaluator = S::Evaluator;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `evaluator` field to Set
     pub struct SetEvaluator<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEvaluator<S> {}
     impl<S: State> State for SetEvaluator<S> {
-        type CreatedAt = S::CreatedAt;
         type Evaluator = Set<members::evaluator>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Evaluator = S::Evaluator;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `evaluator` field
         pub struct evaluator(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SubscriptionBuilder<'a, S: subscription_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<CowStr<'a>>>,
         Option<Datetime>,
         Option<Vec<CowStr<'a>>>,
         Option<Did<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Subscription<'a> {
@@ -195,9 +198,9 @@ impl<'a> SubscriptionBuilder<'a, subscription_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -205,12 +208,12 @@ impl<'a> SubscriptionBuilder<'a, subscription_state::Empty> {
 impl<'a, S: subscription_state::State> SubscriptionBuilder<'a, S> {
     /// Set the `collections` field (optional)
     pub fn collections(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `collections` field to an Option value (optional)
     pub fn maybe_collections(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -225,11 +228,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SubscriptionBuilder<'a, subscription_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -240,12 +243,12 @@ impl<'a, S: subscription_state::State> SubscriptionBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<CowStr<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `evaluationTypes` field to an Option value (optional)
     pub fn maybe_evaluation_types(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -260,11 +263,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> SubscriptionBuilder<'a, subscription_state::SetEvaluator<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -272,16 +275,16 @@ where
 impl<'a, S> SubscriptionBuilder<'a, S>
 where
     S: subscription_state::State,
-    S::CreatedAt: subscription_state::IsSet,
     S::Evaluator: subscription_state::IsSet,
+    S::CreatedAt: subscription_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Subscription<'a> {
         Subscription {
-            collections: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            evaluation_types: self.__unsafe_private_named.2,
-            evaluator: self.__unsafe_private_named.3.unwrap(),
+            collections: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            evaluation_types: self._fields.2,
+            evaluator: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -294,10 +297,10 @@ where
         >,
     ) -> Subscription<'a> {
         Subscription {
-            collections: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            evaluation_types: self.__unsafe_private_named.2,
-            evaluator: self.__unsafe_private_named.3.unwrap(),
+            collections: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            evaluation_types: self._fields.2,
+            evaluator: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_gainforest/organization/default_site.rs b/crates/jacquard-api/src/app_gainforest/organization/default_site.rs
index 27a040c1..1bf41feb 100644
--- a/crates/jacquard-api/src/app_gainforest/organization/default_site.rs
+++ b/crates/jacquard-api/src/app_gainforest/organization/default_site.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -110,45 +113,45 @@ pub mod default_site_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Site;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Site = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Site = S::Site;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `site` field to Set
     pub struct SetSite<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSite<S> {}
     impl<S: State> State for SetSite<S> {
-        type CreatedAt = S::CreatedAt;
         type Site = Set<members::site>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Site = S::Site;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `site` field
         pub struct site(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DefaultSiteBuilder<'a, S: default_site_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DefaultSite<'a> {
@@ -162,9 +165,9 @@ impl<'a> DefaultSiteBuilder<'a, default_site_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DefaultSiteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DefaultSiteBuilder<'a, default_site_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DefaultSiteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> DefaultSiteBuilder<'a, default_site_state::SetSite<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DefaultSiteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,14 +213,14 @@ where
 impl<'a, S> DefaultSiteBuilder<'a, S>
 where
     S: default_site_state::State,
-    S::CreatedAt: default_site_state::IsSet,
     S::Site: default_site_state::IsSet,
+    S::CreatedAt: default_site_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DefaultSite<'a> {
         DefaultSite {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            site: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            site: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> DefaultSite<'a> {
         DefaultSite {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            site: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            site: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_gainforest/organization/get_indexed_organizations.rs b/crates/jacquard-api/src/app_gainforest/organization/get_indexed_organizations.rs
index d49618f6..23e8f8ba 100644
--- a/crates/jacquard-api/src/app_gainforest/organization/get_indexed_organizations.rs
+++ b/crates/jacquard-api/src/app_gainforest/organization/get_indexed_organizations.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::value::Data;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_gainforest/organization/info.rs b/crates/jacquard-api/src/app_gainforest/organization/info.rs
index ddd7e526..2e5321e2 100644
--- a/crates/jacquard-api/src/app_gainforest/organization/info.rs
+++ b/crates/jacquard-api/src/app_gainforest/organization/info.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -207,134 +210,134 @@ pub mod info_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ShortDescription;
+        type DisplayName;
         type Objectives;
+        type Country;
         type Visibility;
         type CreatedAt;
-        type DisplayName;
+        type ShortDescription;
         type LongDescription;
-        type Country;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ShortDescription = Unset;
+        type DisplayName = Unset;
         type Objectives = Unset;
+        type Country = Unset;
         type Visibility = Unset;
         type CreatedAt = Unset;
-        type DisplayName = Unset;
+        type ShortDescription = Unset;
         type LongDescription = Unset;
-        type Country = Unset;
     }
-    ///State transition - sets the `short_description` field to Set
-    pub struct SetShortDescription<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetShortDescription<S> {}
-    impl<S: State> State for SetShortDescription<S> {
-        type ShortDescription = Set<members::short_description>;
+    ///State transition - sets the `display_name` field to Set
+    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
+    impl<S: State> State for SetDisplayName<S> {
+        type DisplayName = Set<members::display_name>;
         type Objectives = S::Objectives;
+        type Country = S::Country;
         type Visibility = S::Visibility;
         type CreatedAt = S::CreatedAt;
-        type DisplayName = S::DisplayName;
+        type ShortDescription = S::ShortDescription;
         type LongDescription = S::LongDescription;
-        type Country = S::Country;
     }
     ///State transition - sets the `objectives` field to Set
     pub struct SetObjectives<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetObjectives<S> {}
     impl<S: State> State for SetObjectives<S> {
-        type ShortDescription = S::ShortDescription;
+        type DisplayName = S::DisplayName;
         type Objectives = Set<members::objectives>;
+        type Country = S::Country;
         type Visibility = S::Visibility;
         type CreatedAt = S::CreatedAt;
+        type ShortDescription = S::ShortDescription;
+        type LongDescription = S::LongDescription;
+    }
+    ///State transition - sets the `country` field to Set
+    pub struct SetCountry<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCountry<S> {}
+    impl<S: State> State for SetCountry<S> {
         type DisplayName = S::DisplayName;
+        type Objectives = S::Objectives;
+        type Country = Set<members::country>;
+        type Visibility = S::Visibility;
+        type CreatedAt = S::CreatedAt;
+        type ShortDescription = S::ShortDescription;
         type LongDescription = S::LongDescription;
-        type Country = S::Country;
     }
     ///State transition - sets the `visibility` field to Set
     pub struct SetVisibility<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetVisibility<S> {}
     impl<S: State> State for SetVisibility<S> {
-        type ShortDescription = S::ShortDescription;
+        type DisplayName = S::DisplayName;
         type Objectives = S::Objectives;
+        type Country = S::Country;
         type Visibility = Set<members::visibility>;
         type CreatedAt = S::CreatedAt;
-        type DisplayName = S::DisplayName;
+        type ShortDescription = S::ShortDescription;
         type LongDescription = S::LongDescription;
-        type Country = S::Country;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type ShortDescription = S::ShortDescription;
+        type DisplayName = S::DisplayName;
         type Objectives = S::Objectives;
+        type Country = S::Country;
         type Visibility = S::Visibility;
         type CreatedAt = Set<members::created_at>;
-        type DisplayName = S::DisplayName;
+        type ShortDescription = S::ShortDescription;
         type LongDescription = S::LongDescription;
-        type Country = S::Country;
     }
-    ///State transition - sets the `display_name` field to Set
-    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
-    impl<S: State> State for SetDisplayName<S> {
-        type ShortDescription = S::ShortDescription;
+    ///State transition - sets the `short_description` field to Set
+    pub struct SetShortDescription<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetShortDescription<S> {}
+    impl<S: State> State for SetShortDescription<S> {
+        type DisplayName = S::DisplayName;
         type Objectives = S::Objectives;
+        type Country = S::Country;
         type Visibility = S::Visibility;
         type CreatedAt = S::CreatedAt;
-        type DisplayName = Set<members::display_name>;
+        type ShortDescription = Set<members::short_description>;
         type LongDescription = S::LongDescription;
-        type Country = S::Country;
     }
     ///State transition - sets the `long_description` field to Set
     pub struct SetLongDescription<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLongDescription<S> {}
     impl<S: State> State for SetLongDescription<S> {
-        type ShortDescription = S::ShortDescription;
-        type Objectives = S::Objectives;
-        type Visibility = S::Visibility;
-        type CreatedAt = S::CreatedAt;
         type DisplayName = S::DisplayName;
-        type LongDescription = Set<members::long_description>;
-        type Country = S::Country;
-    }
-    ///State transition - sets the `country` field to Set
-    pub struct SetCountry<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCountry<S> {}
-    impl<S: State> State for SetCountry<S> {
-        type ShortDescription = S::ShortDescription;
         type Objectives = S::Objectives;
+        type Country = S::Country;
         type Visibility = S::Visibility;
         type CreatedAt = S::CreatedAt;
-        type DisplayName = S::DisplayName;
-        type LongDescription = S::LongDescription;
-        type Country = Set<members::country>;
+        type ShortDescription = S::ShortDescription;
+        type LongDescription = Set<members::long_description>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `short_description` field
-        pub struct short_description(());
+        ///Marker type for the `display_name` field
+        pub struct display_name(());
         ///Marker type for the `objectives` field
         pub struct objectives(());
+        ///Marker type for the `country` field
+        pub struct country(());
         ///Marker type for the `visibility` field
         pub struct visibility(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `display_name` field
-        pub struct display_name(());
+        ///Marker type for the `short_description` field
+        pub struct short_description(());
         ///Marker type for the `long_description` field
         pub struct long_description(());
-        ///Marker type for the `country` field
-        pub struct country(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct InfoBuilder<'a, S: info_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Data<'a>>,
         Option<Datetime>,
@@ -347,7 +350,7 @@ pub struct InfoBuilder<'a, S: info_state::State> {
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Info<'a> {
@@ -361,21 +364,9 @@ impl<'a> InfoBuilder<'a, info_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         InfoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -390,11 +381,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> InfoBuilder<'a, info_state::SetCountry<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         InfoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -402,12 +393,12 @@ where
 impl<'a, S: info_state::State> InfoBuilder<'a, S> {
     /// Set the `coverImage` field (optional)
     pub fn cover_image(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `coverImage` field to an Option value (optional)
     pub fn maybe_cover_image(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -422,11 +413,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> InfoBuilder<'a, info_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         InfoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -441,11 +432,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> InfoBuilder<'a, info_state::SetDisplayName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         InfoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -453,12 +444,12 @@ where
 impl<'a, S: info_state::State> InfoBuilder<'a, S> {
     /// Set the `logo` field (optional)
     pub fn logo(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `logo` field to an Option value (optional)
     pub fn maybe_logo(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -473,11 +464,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> InfoBuilder<'a, info_state::SetLongDescription<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         InfoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -492,11 +483,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> InfoBuilder<'a, info_state::SetObjectives<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         InfoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -511,11 +502,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> InfoBuilder<'a, info_state::SetShortDescription<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         InfoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -523,12 +514,12 @@ where
 impl<'a, S: info_state::State> InfoBuilder<'a, S> {
     /// Set the `startDate` field (optional)
     pub fn start_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `startDate` field to an Option value (optional)
     pub fn maybe_start_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -543,11 +534,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> InfoBuilder<'a, info_state::SetVisibility<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         InfoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -555,12 +546,12 @@ where
 impl<'a, S: info_state::State> InfoBuilder<'a, S> {
     /// Set the `website` field (optional)
     pub fn website(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `website` field to an Option value (optional)
     pub fn maybe_website(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -568,28 +559,28 @@ impl<'a, S: info_state::State> InfoBuilder<'a, S> {
 impl<'a, S> InfoBuilder<'a, S>
 where
     S: info_state::State,
-    S::ShortDescription: info_state::IsSet,
+    S::DisplayName: info_state::IsSet,
     S::Objectives: info_state::IsSet,
+    S::Country: info_state::IsSet,
     S::Visibility: info_state::IsSet,
     S::CreatedAt: info_state::IsSet,
-    S::DisplayName: info_state::IsSet,
+    S::ShortDescription: info_state::IsSet,
     S::LongDescription: info_state::IsSet,
-    S::Country: info_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Info<'a> {
         Info {
-            country: self.__unsafe_private_named.0.unwrap(),
-            cover_image: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            display_name: self.__unsafe_private_named.3.unwrap(),
-            logo: self.__unsafe_private_named.4,
-            long_description: self.__unsafe_private_named.5.unwrap(),
-            objectives: self.__unsafe_private_named.6.unwrap(),
-            short_description: self.__unsafe_private_named.7.unwrap(),
-            start_date: self.__unsafe_private_named.8,
-            visibility: self.__unsafe_private_named.9.unwrap(),
-            website: self.__unsafe_private_named.10,
+            country: self._fields.0.unwrap(),
+            cover_image: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            display_name: self._fields.3.unwrap(),
+            logo: self._fields.4,
+            long_description: self._fields.5.unwrap(),
+            objectives: self._fields.6.unwrap(),
+            short_description: self._fields.7.unwrap(),
+            start_date: self._fields.8,
+            visibility: self._fields.9.unwrap(),
+            website: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -599,17 +590,17 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Info<'a> {
         Info {
-            country: self.__unsafe_private_named.0.unwrap(),
-            cover_image: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            display_name: self.__unsafe_private_named.3.unwrap(),
-            logo: self.__unsafe_private_named.4,
-            long_description: self.__unsafe_private_named.5.unwrap(),
-            objectives: self.__unsafe_private_named.6.unwrap(),
-            short_description: self.__unsafe_private_named.7.unwrap(),
-            start_date: self.__unsafe_private_named.8,
-            visibility: self.__unsafe_private_named.9.unwrap(),
-            website: self.__unsafe_private_named.10,
+            country: self._fields.0.unwrap(),
+            cover_image: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            display_name: self._fields.3.unwrap(),
+            logo: self._fields.4,
+            long_description: self._fields.5.unwrap(),
+            objectives: self._fields.6.unwrap(),
+            short_description: self._fields.7.unwrap(),
+            start_date: self._fields.8,
+            visibility: self._fields.9.unwrap(),
+            website: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_gainforest/organization/layer.rs b/crates/jacquard-api/src/app_gainforest/organization/layer.rs
index 2c9a4eb5..feae4848 100644
--- a/crates/jacquard-api/src/app_gainforest/organization/layer.rs
+++ b/crates/jacquard-api/src/app_gainforest/organization/layer.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -120,81 +123,81 @@ pub mod layer_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Type;
-        type Uri;
         type Name;
+        type Type;
         type CreatedAt;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Type = Unset;
-        type Uri = Unset;
         type Name = Unset;
+        type Type = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `type` field to Set
-    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetType<S> {}
-    impl<S: State> State for SetType<S> {
-        type Type = Set<members::r#type>;
-        type Uri = S::Uri;
-        type Name = S::Name;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Type = S::Type;
-        type Uri = Set<members::uri>;
-        type Name = S::Name;
-        type CreatedAt = S::CreatedAt;
+        type Uri = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
+        type Name = Set<members::name>;
         type Type = S::Type;
+        type CreatedAt = S::CreatedAt;
         type Uri = S::Uri;
-        type Name = Set<members::name>;
+    }
+    ///State transition - sets the `type` field to Set
+    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetType<S> {}
+    impl<S: State> State for SetType<S> {
+        type Name = S::Name;
+        type Type = Set<members::r#type>;
         type CreatedAt = S::CreatedAt;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Name = S::Name;
         type Type = S::Type;
+        type CreatedAt = Set<members::created_at>;
         type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
         type Name = S::Name;
-        type CreatedAt = Set<members::created_at>;
+        type Type = S::Type;
+        type CreatedAt = S::CreatedAt;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `type` field
-        pub struct r#type(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `type` field
+        pub struct r#type(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LayerBuilder<'a, S: layer_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Layer<'a> {
@@ -208,9 +211,9 @@ impl<'a> LayerBuilder<'a, layer_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LayerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -225,11 +228,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LayerBuilder<'a, layer_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LayerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -237,12 +240,12 @@ where
 impl<'a, S: layer_state::State> LayerBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -257,11 +260,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LayerBuilder<'a, layer_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LayerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -276,11 +279,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LayerBuilder<'a, layer_state::SetType<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LayerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -295,11 +298,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LayerBuilder<'a, layer_state::SetUri<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         LayerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -307,19 +310,19 @@ where
 impl<'a, S> LayerBuilder<'a, S>
 where
     S: layer_state::State,
-    S::Type: layer_state::IsSet,
-    S::Uri: layer_state::IsSet,
     S::Name: layer_state::IsSet,
+    S::Type: layer_state::IsSet,
     S::CreatedAt: layer_state::IsSet,
+    S::Uri: layer_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Layer<'a> {
         Layer {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
-            r#type: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            name: self._fields.2.unwrap(),
+            r#type: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -332,11 +335,11 @@ where
         >,
     ) -> Layer<'a> {
         Layer {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
-            r#type: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            name: self._fields.2.unwrap(),
+            r#type: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_gainforest/organization/observations/dendogram.rs b/crates/jacquard-api/src/app_gainforest/organization/observations/dendogram.rs
index 7f990c88..a2fe1a0b 100644
--- a/crates/jacquard-api/src/app_gainforest/organization/observations/dendogram.rs
+++ b/crates/jacquard-api/src/app_gainforest/organization/observations/dendogram.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -111,45 +114,45 @@ pub mod dendogram_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Dendogram;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Dendogram = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Dendogram = S::Dendogram;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `dendogram` field to Set
     pub struct SetDendogram<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDendogram<S> {}
     impl<S: State> State for SetDendogram<S> {
-        type CreatedAt = S::CreatedAt;
         type Dendogram = Set<members::dendogram>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Dendogram = S::Dendogram;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `dendogram` field
         pub struct dendogram(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DendogramBuilder<'a, S: dendogram_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Data<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Data<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Dendogram<'a> {
@@ -163,9 +166,9 @@ impl<'a> DendogramBuilder<'a, dendogram_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DendogramBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,11 +183,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DendogramBuilder<'a, dendogram_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DendogramBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -199,11 +202,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> DendogramBuilder<'a, dendogram_state::SetDendogram<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DendogramBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -211,14 +214,14 @@ where
 impl<'a, S> DendogramBuilder<'a, S>
 where
     S: dendogram_state::State,
-    S::CreatedAt: dendogram_state::IsSet,
     S::Dendogram: dendogram_state::IsSet,
+    S::CreatedAt: dendogram_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Dendogram<'a> {
         Dendogram {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            dendogram: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            dendogram: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -228,8 +231,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Dendogram<'a> {
         Dendogram {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            dendogram: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            dendogram: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_gainforest/organization/observations/fauna.rs b/crates/jacquard-api/src/app_gainforest/organization/observations/fauna.rs
index 17b50453..26b0f162 100644
--- a/crates/jacquard-api/src/app_gainforest/organization/observations/fauna.rs
+++ b/crates/jacquard-api/src/app_gainforest/organization/observations/fauna.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,9 +149,9 @@ pub mod fauna_state {
 
 /// Builder for constructing an instance of this type
 pub struct FaunaBuilder<'a, S: fauna_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Vec<CowStr<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Vec<CowStr<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Fauna<'a> {
@@ -162,9 +165,9 @@ impl<'a> FaunaBuilder<'a, fauna_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FaunaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FaunaBuilder<'a, fauna_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FaunaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> FaunaBuilder<'a, fauna_state::SetGbifTaxonKeys<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FaunaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,8 +219,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Fauna<'a> {
         Fauna {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            gbif_taxon_keys: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            gbif_taxon_keys: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Fauna<'a> {
         Fauna {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            gbif_taxon_keys: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            gbif_taxon_keys: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_gainforest/organization/observations/flora.rs b/crates/jacquard-api/src/app_gainforest/organization/observations/flora.rs
index 0a7b80be..ca05cd85 100644
--- a/crates/jacquard-api/src/app_gainforest/organization/observations/flora.rs
+++ b/crates/jacquard-api/src/app_gainforest/organization/observations/flora.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -110,45 +113,45 @@ pub mod flora_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type GbifTaxonKeys;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type GbifTaxonKeys = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type GbifTaxonKeys = S::GbifTaxonKeys;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `gbif_taxon_keys` field to Set
     pub struct SetGbifTaxonKeys<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetGbifTaxonKeys<S> {}
     impl<S: State> State for SetGbifTaxonKeys<S> {
-        type CreatedAt = S::CreatedAt;
         type GbifTaxonKeys = Set<members::gbif_taxon_keys>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type GbifTaxonKeys = S::GbifTaxonKeys;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `gbif_taxon_keys` field
         pub struct gbif_taxon_keys(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FloraBuilder<'a, S: flora_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Vec<CowStr<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Vec<CowStr<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Flora<'a> {
@@ -162,9 +165,9 @@ impl<'a> FloraBuilder<'a, flora_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FloraBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FloraBuilder<'a, flora_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FloraBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> FloraBuilder<'a, flora_state::SetGbifTaxonKeys<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FloraBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,14 +213,14 @@ where
 impl<'a, S> FloraBuilder<'a, S>
 where
     S: flora_state::State,
-    S::CreatedAt: flora_state::IsSet,
     S::GbifTaxonKeys: flora_state::IsSet,
+    S::CreatedAt: flora_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Flora<'a> {
         Flora {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            gbif_taxon_keys: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            gbif_taxon_keys: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Flora<'a> {
         Flora {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            gbif_taxon_keys: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            gbif_taxon_keys: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_gainforest/organization/observations/measured_trees_cluster.rs b/crates/jacquard-api/src/app_gainforest/organization/observations/measured_trees_cluster.rs
index baa7a78a..223d1757 100644
--- a/crates/jacquard-api/src/app_gainforest/organization/observations/measured_trees_cluster.rs
+++ b/crates/jacquard-api/src/app_gainforest/organization/observations/measured_trees_cluster.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -147,9 +150,9 @@ pub mod measured_trees_cluster_state {
 
 /// Builder for constructing an instance of this type
 pub struct MeasuredTreesClusterBuilder<'a, S: measured_trees_cluster_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Data<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Data<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MeasuredTreesCluster<'a> {
@@ -166,9 +169,9 @@ impl<'a> MeasuredTreesClusterBuilder<'a, measured_trees_cluster_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MeasuredTreesClusterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,11 +186,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MeasuredTreesClusterBuilder<'a, measured_trees_cluster_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MeasuredTreesClusterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -202,11 +205,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> MeasuredTreesClusterBuilder<'a, measured_trees_cluster_state::SetShapefile<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MeasuredTreesClusterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -220,8 +223,8 @@ where
     /// Build the final struct
     pub fn build(self) -> MeasuredTreesCluster<'a> {
         MeasuredTreesCluster {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            shapefile: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            shapefile: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -231,8 +234,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> MeasuredTreesCluster<'a> {
         MeasuredTreesCluster {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            shapefile: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            shapefile: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_gainforest/organization/predictions/fauna.rs b/crates/jacquard-api/src/app_gainforest/organization/predictions/fauna.rs
index 760ebb21..61b4febf 100644
--- a/crates/jacquard-api/src/app_gainforest/organization/predictions/fauna.rs
+++ b/crates/jacquard-api/src/app_gainforest/organization/predictions/fauna.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -110,45 +113,45 @@ pub mod fauna_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type GbifTaxonKeys;
         type CreatedAt;
+        type GbifTaxonKeys;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type GbifTaxonKeys = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `gbif_taxon_keys` field to Set
-    pub struct SetGbifTaxonKeys<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetGbifTaxonKeys<S> {}
-    impl<S: State> State for SetGbifTaxonKeys<S> {
-        type GbifTaxonKeys = Set<members::gbif_taxon_keys>;
-        type CreatedAt = S::CreatedAt;
+        type GbifTaxonKeys = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type GbifTaxonKeys = S::GbifTaxonKeys;
         type CreatedAt = Set<members::created_at>;
+        type GbifTaxonKeys = S::GbifTaxonKeys;
+    }
+    ///State transition - sets the `gbif_taxon_keys` field to Set
+    pub struct SetGbifTaxonKeys<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetGbifTaxonKeys<S> {}
+    impl<S: State> State for SetGbifTaxonKeys<S> {
+        type CreatedAt = S::CreatedAt;
+        type GbifTaxonKeys = Set<members::gbif_taxon_keys>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `gbif_taxon_keys` field
-        pub struct gbif_taxon_keys(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `gbif_taxon_keys` field
+        pub struct gbif_taxon_keys(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FaunaBuilder<'a, S: fauna_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Vec<CowStr<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Vec<CowStr<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Fauna<'a> {
@@ -162,9 +165,9 @@ impl<'a> FaunaBuilder<'a, fauna_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FaunaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FaunaBuilder<'a, fauna_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FaunaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> FaunaBuilder<'a, fauna_state::SetGbifTaxonKeys<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FaunaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,14 +213,14 @@ where
 impl<'a, S> FaunaBuilder<'a, S>
 where
     S: fauna_state::State,
-    S::GbifTaxonKeys: fauna_state::IsSet,
     S::CreatedAt: fauna_state::IsSet,
+    S::GbifTaxonKeys: fauna_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Fauna<'a> {
         Fauna {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            gbif_taxon_keys: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            gbif_taxon_keys: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Fauna<'a> {
         Fauna {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            gbif_taxon_keys: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            gbif_taxon_keys: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_gainforest/organization/predictions/flora.rs b/crates/jacquard-api/src/app_gainforest/organization/predictions/flora.rs
index f71e8af7..d05ae7b2 100644
--- a/crates/jacquard-api/src/app_gainforest/organization/predictions/flora.rs
+++ b/crates/jacquard-api/src/app_gainforest/organization/predictions/flora.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,9 +149,9 @@ pub mod flora_state {
 
 /// Builder for constructing an instance of this type
 pub struct FloraBuilder<'a, S: flora_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Vec<CowStr<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Vec<CowStr<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Flora<'a> {
@@ -162,9 +165,9 @@ impl<'a> FloraBuilder<'a, flora_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FloraBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FloraBuilder<'a, flora_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FloraBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> FloraBuilder<'a, flora_state::SetGbifTaxonKeys<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FloraBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,8 +219,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Flora<'a> {
         Flora {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            gbif_taxon_keys: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            gbif_taxon_keys: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Flora<'a> {
         Flora {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            gbif_taxon_keys: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            gbif_taxon_keys: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_greengale/blog.rs b/crates/jacquard-api/src/app_greengale/blog.rs
index 18f2490a..086cb167 100644
--- a/crates/jacquard-api/src/app_greengale/blog.rs
+++ b/crates/jacquard-api/src/app_greengale/blog.rs
@@ -7,7 +7,11 @@
 
 pub mod entry;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -421,14 +425,14 @@ pub mod blob_metadata_state {
 
 /// Builder for constructing an instance of this type
 pub struct BlobMetadataBuilder<'a, S: blob_metadata_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
         Option<blog::SelfLabels<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BlobMetadata<'a> {
@@ -442,9 +446,9 @@ impl<'a> BlobMetadataBuilder<'a, blob_metadata_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlobMetadataBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -452,12 +456,12 @@ impl<'a> BlobMetadataBuilder<'a, blob_metadata_state::Empty> {
 impl<'a, S: blob_metadata_state::State> BlobMetadataBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -472,11 +476,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> BlobMetadataBuilder<'a, blob_metadata_state::SetBlobref<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BlobMetadataBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -484,12 +488,12 @@ where
 impl<'a, S: blob_metadata_state::State> BlobMetadataBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<blog::SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<blog::SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -497,12 +501,12 @@ impl<'a, S: blob_metadata_state::State> BlobMetadataBuilder<'a, S> {
 impl<'a, S: blob_metadata_state::State> BlobMetadataBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -515,10 +519,10 @@ where
     /// Build the final struct
     pub fn build(self) -> BlobMetadata<'a> {
         BlobMetadata {
-            alt: self.__unsafe_private_named.0,
-            blobref: self.__unsafe_private_named.1.unwrap(),
-            labels: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3,
+            alt: self._fields.0,
+            blobref: self._fields.1.unwrap(),
+            labels: self._fields.2,
+            name: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -531,10 +535,10 @@ where
         >,
     ) -> BlobMetadata<'a> {
         BlobMetadata {
-            alt: self.__unsafe_private_named.0,
-            blobref: self.__unsafe_private_named.1.unwrap(),
-            labels: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3,
+            alt: self._fields.0,
+            blobref: self._fields.1.unwrap(),
+            labels: self._fields.2,
+            name: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -848,9 +852,9 @@ pub mod ogp_state {
 
 /// Builder for constructing an instance of this type
 pub struct OgpBuilder<'a, S: ogp_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<UriValue<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<UriValue<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Ogp<'a> {
@@ -864,9 +868,9 @@ impl<'a> OgpBuilder<'a, ogp_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OgpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -874,12 +878,12 @@ impl<'a> OgpBuilder<'a, ogp_state::Empty> {
 impl<'a, S: ogp_state::State> OgpBuilder<'a, S> {
     /// Set the `height` field (optional)
     pub fn height(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `height` field to an Option value (optional)
     pub fn maybe_height(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -894,11 +898,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> OgpBuilder<'a, ogp_state::SetUrl<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         OgpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -906,12 +910,12 @@ where
 impl<'a, S: ogp_state::State> OgpBuilder<'a, S> {
     /// Set the `width` field (optional)
     pub fn width(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `width` field to an Option value (optional)
     pub fn maybe_width(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -924,9 +928,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Ogp<'a> {
         Ogp {
-            height: self.__unsafe_private_named.0,
-            url: self.__unsafe_private_named.1.unwrap(),
-            width: self.__unsafe_private_named.2,
+            height: self._fields.0,
+            url: self._fields.1.unwrap(),
+            width: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -939,9 +943,9 @@ where
         >,
     ) -> Ogp<'a> {
         Ogp {
-            height: self.__unsafe_private_named.0,
-            url: self.__unsafe_private_named.1.unwrap(),
-            width: self.__unsafe_private_named.2,
+            height: self._fields.0,
+            url: self._fields.1.unwrap(),
+            width: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -981,9 +985,9 @@ pub mod self_labels_state {
 
 /// Builder for constructing an instance of this type
 pub struct SelfLabelsBuilder<'a, S: self_labels_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<blog::SelfLabel<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<blog::SelfLabel<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SelfLabels<'a> {
@@ -997,9 +1001,9 @@ impl<'a> SelfLabelsBuilder<'a, self_labels_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SelfLabelsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1014,11 +1018,11 @@ where
         mut self,
         value: impl Into<Vec<blog::SelfLabel<'a>>>,
     ) -> SelfLabelsBuilder<'a, self_labels_state::SetValues<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SelfLabelsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1031,7 +1035,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SelfLabels<'a> {
         SelfLabels {
-            values: self.__unsafe_private_named.0.unwrap(),
+            values: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1044,7 +1048,7 @@ where
         >,
     ) -> SelfLabels<'a> {
         SelfLabels {
-            values: self.__unsafe_private_named.0.unwrap(),
+            values: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_greengale/blog/entry.rs b/crates/jacquard-api/src/app_greengale/blog/entry.rs
index 3690038b..026442a6 100644
--- a/crates/jacquard-api/src/app_greengale/blog/entry.rs
+++ b/crates/jacquard-api/src/app_greengale/blog/entry.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -210,8 +213,8 @@ pub mod entry_state {
 
 /// Builder for constructing an instance of this type
 pub struct EntryBuilder<'a, S: entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<BlobMetadata<'a>>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -222,7 +225,7 @@ pub struct EntryBuilder<'a, S: entry_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Entry<'a> {
@@ -236,19 +239,9 @@ impl<'a> EntryBuilder<'a, entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -256,12 +249,12 @@ impl<'a> EntryBuilder<'a, entry_state::Empty> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `blobs` field (optional)
     pub fn blobs(mut self, value: impl Into<Option<Vec<BlobMetadata<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `blobs` field to an Option value (optional)
     pub fn maybe_blobs(mut self, value: Option<Vec<BlobMetadata<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -276,11 +269,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EntryBuilder<'a, entry_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -288,12 +281,12 @@ where
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -301,12 +294,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `latex` field (optional)
     pub fn latex(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `latex` field to an Option value (optional)
     pub fn maybe_latex(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -314,12 +307,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `ogp` field (optional)
     pub fn ogp(mut self, value: impl Into<Option<Ogp<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `ogp` field to an Option value (optional)
     pub fn maybe_ogp(mut self, value: Option<Ogp<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -327,12 +320,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `subtitle` field (optional)
     pub fn subtitle(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `subtitle` field to an Option value (optional)
     pub fn maybe_subtitle(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -340,12 +333,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `theme` field (optional)
     pub fn theme(mut self, value: impl Into<Option<Theme<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `theme` field to an Option value (optional)
     pub fn maybe_theme(mut self, value: Option<Theme<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -353,12 +346,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -366,12 +359,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `visibility` field (optional)
     pub fn visibility(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `visibility` field to an Option value (optional)
     pub fn maybe_visibility(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -384,18 +377,15 @@ where
     /// Build the final struct
     pub fn build(self) -> Entry<'a> {
         Entry {
-            blobs: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2,
-            latex: self.__unsafe_private_named.3.or_else(|| Some(false)),
-            ogp: self.__unsafe_private_named.4,
-            subtitle: self.__unsafe_private_named.5,
-            theme: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7,
-            visibility: self
-                .__unsafe_private_named
-                .8
-                .or_else(|| Some(CowStr::from("public"))),
+            blobs: self._fields.0,
+            content: self._fields.1.unwrap(),
+            created_at: self._fields.2,
+            latex: self._fields.3.or_else(|| Some(false)),
+            ogp: self._fields.4,
+            subtitle: self._fields.5,
+            theme: self._fields.6,
+            title: self._fields.7,
+            visibility: self._fields.8.or_else(|| Some(CowStr::from("public"))),
             extra_data: Default::default(),
         }
     }
@@ -408,18 +398,15 @@ where
         >,
     ) -> Entry<'a> {
         Entry {
-            blobs: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2,
-            latex: self.__unsafe_private_named.3.or_else(|| Some(false)),
-            ogp: self.__unsafe_private_named.4,
-            subtitle: self.__unsafe_private_named.5,
-            theme: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7,
-            visibility: self
-                .__unsafe_private_named
-                .8
-                .or_else(|| Some(CowStr::from("public"))),
+            blobs: self._fields.0,
+            content: self._fields.1.unwrap(),
+            created_at: self._fields.2,
+            latex: self._fields.3.or_else(|| Some(false)),
+            ogp: self._fields.4,
+            subtitle: self._fields.5,
+            theme: self._fields.6,
+            title: self._fields.7,
+            visibility: self._fields.8.or_else(|| Some(CowStr::from("public"))),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_greengale/document.rs b/crates/jacquard-api/src/app_greengale/document.rs
index 7d3fc104..af0d0d24 100644
--- a/crates/jacquard-api/src/app_greengale/document.rs
+++ b/crates/jacquard-api/src/app_greengale/document.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -271,9 +274,9 @@ pub mod content_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct ContentRefBuilder<'a, S: content_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ContentRef<'a> {
@@ -287,9 +290,9 @@ impl<'a> ContentRefBuilder<'a, content_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ContentRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -304,11 +307,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ContentRefBuilder<'a, content_ref_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ContentRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -321,7 +324,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ContentRef<'a> {
         ContentRef {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -334,7 +337,7 @@ where
         >,
     ) -> ContentRef<'a> {
         ContentRef {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -549,92 +552,92 @@ pub mod document_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Url;
         type Title;
+        type Path;
         type Content;
         type PublishedAt;
-        type Path;
-        type Url;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Url = Unset;
         type Title = Unset;
+        type Path = Unset;
         type Content = Unset;
         type PublishedAt = Unset;
-        type Path = Unset;
-        type Url = Unset;
+    }
+    ///State transition - sets the `url` field to Set
+    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUrl<S> {}
+    impl<S: State> State for SetUrl<S> {
+        type Url = Set<members::url>;
+        type Title = S::Title;
+        type Path = S::Path;
+        type Content = S::Content;
+        type PublishedAt = S::PublishedAt;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
+        type Url = S::Url;
         type Title = Set<members::title>;
+        type Path = S::Path;
         type Content = S::Content;
         type PublishedAt = S::PublishedAt;
-        type Path = S::Path;
+    }
+    ///State transition - sets the `path` field to Set
+    pub struct SetPath<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPath<S> {}
+    impl<S: State> State for SetPath<S> {
         type Url = S::Url;
+        type Title = S::Title;
+        type Path = Set<members::path>;
+        type Content = S::Content;
+        type PublishedAt = S::PublishedAt;
     }
     ///State transition - sets the `content` field to Set
     pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContent<S> {}
     impl<S: State> State for SetContent<S> {
+        type Url = S::Url;
         type Title = S::Title;
+        type Path = S::Path;
         type Content = Set<members::content>;
         type PublishedAt = S::PublishedAt;
-        type Path = S::Path;
-        type Url = S::Url;
     }
     ///State transition - sets the `published_at` field to Set
     pub struct SetPublishedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPublishedAt<S> {}
     impl<S: State> State for SetPublishedAt<S> {
-        type Title = S::Title;
-        type Content = S::Content;
-        type PublishedAt = Set<members::published_at>;
-        type Path = S::Path;
-        type Url = S::Url;
-    }
-    ///State transition - sets the `path` field to Set
-    pub struct SetPath<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPath<S> {}
-    impl<S: State> State for SetPath<S> {
-        type Title = S::Title;
-        type Content = S::Content;
-        type PublishedAt = S::PublishedAt;
-        type Path = Set<members::path>;
         type Url = S::Url;
-    }
-    ///State transition - sets the `url` field to Set
-    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUrl<S> {}
-    impl<S: State> State for SetUrl<S> {
         type Title = S::Title;
-        type Content = S::Content;
-        type PublishedAt = S::PublishedAt;
         type Path = S::Path;
-        type Url = Set<members::url>;
+        type Content = S::Content;
+        type PublishedAt = Set<members::published_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `url` field
+        pub struct url(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `path` field
+        pub struct path(());
         ///Marker type for the `content` field
         pub struct content(());
         ///Marker type for the `published_at` field
         pub struct published_at(());
-        ///Marker type for the `path` field
-        pub struct path(());
-        ///Marker type for the `url` field
-        pub struct url(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DocumentBuilder<'a, S: document_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<BlobMetadata<'a>>>,
         Option<CowStr<'a>>,
         Option<bool>,
@@ -648,7 +651,7 @@ pub struct DocumentBuilder<'a, S: document_state::State> {
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Document<'a> {
@@ -662,8 +665,8 @@ impl<'a> DocumentBuilder<'a, document_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -677,7 +680,7 @@ impl<'a> DocumentBuilder<'a, document_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -685,12 +688,12 @@ impl<'a> DocumentBuilder<'a, document_state::Empty> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `blobs` field (optional)
     pub fn blobs(mut self, value: impl Into<Option<Vec<BlobMetadata<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `blobs` field to an Option value (optional)
     pub fn maybe_blobs(mut self, value: Option<Vec<BlobMetadata<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -705,11 +708,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DocumentBuilder<'a, document_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -717,12 +720,12 @@ where
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `latex` field (optional)
     pub fn latex(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `latex` field to an Option value (optional)
     pub fn maybe_latex(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -730,12 +733,12 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `ogp` field (optional)
     pub fn ogp(mut self, value: impl Into<Option<Ogp<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `ogp` field to an Option value (optional)
     pub fn maybe_ogp(mut self, value: Option<Ogp<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -750,11 +753,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DocumentBuilder<'a, document_state::SetPath<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -769,11 +772,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DocumentBuilder<'a, document_state::SetPublishedAt<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -781,12 +784,12 @@ where
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `subtitle` field (optional)
     pub fn subtitle(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `subtitle` field to an Option value (optional)
     pub fn maybe_subtitle(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -794,12 +797,12 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -807,12 +810,12 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `theme` field (optional)
     pub fn theme(mut self, value: impl Into<Option<Theme<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `theme` field to an Option value (optional)
     pub fn maybe_theme(mut self, value: Option<Theme<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -827,11 +830,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DocumentBuilder<'a, document_state::SetTitle<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -846,11 +849,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> DocumentBuilder<'a, document_state::SetUrl<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -858,12 +861,12 @@ where
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `visibility` field (optional)
     pub fn visibility(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `visibility` field to an Option value (optional)
     pub fn maybe_visibility(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -871,30 +874,27 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S> DocumentBuilder<'a, S>
 where
     S: document_state::State,
+    S::Url: document_state::IsSet,
     S::Title: document_state::IsSet,
+    S::Path: document_state::IsSet,
     S::Content: document_state::IsSet,
     S::PublishedAt: document_state::IsSet,
-    S::Path: document_state::IsSet,
-    S::Url: document_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Document<'a> {
         Document {
-            blobs: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            latex: self.__unsafe_private_named.2.or_else(|| Some(false)),
-            ogp: self.__unsafe_private_named.3,
-            path: self.__unsafe_private_named.4.unwrap(),
-            published_at: self.__unsafe_private_named.5.unwrap(),
-            subtitle: self.__unsafe_private_named.6,
-            tags: self.__unsafe_private_named.7,
-            theme: self.__unsafe_private_named.8,
-            title: self.__unsafe_private_named.9.unwrap(),
-            url: self.__unsafe_private_named.10.unwrap(),
-            visibility: self
-                .__unsafe_private_named
-                .11
-                .or_else(|| Some(CowStr::from("public"))),
+            blobs: self._fields.0,
+            content: self._fields.1.unwrap(),
+            latex: self._fields.2.or_else(|| Some(false)),
+            ogp: self._fields.3,
+            path: self._fields.4.unwrap(),
+            published_at: self._fields.5.unwrap(),
+            subtitle: self._fields.6,
+            tags: self._fields.7,
+            theme: self._fields.8,
+            title: self._fields.9.unwrap(),
+            url: self._fields.10.unwrap(),
+            visibility: self._fields.11.or_else(|| Some(CowStr::from("public"))),
             extra_data: Default::default(),
         }
     }
@@ -907,21 +907,18 @@ where
         >,
     ) -> Document<'a> {
         Document {
-            blobs: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            latex: self.__unsafe_private_named.2.or_else(|| Some(false)),
-            ogp: self.__unsafe_private_named.3,
-            path: self.__unsafe_private_named.4.unwrap(),
-            published_at: self.__unsafe_private_named.5.unwrap(),
-            subtitle: self.__unsafe_private_named.6,
-            tags: self.__unsafe_private_named.7,
-            theme: self.__unsafe_private_named.8,
-            title: self.__unsafe_private_named.9.unwrap(),
-            url: self.__unsafe_private_named.10.unwrap(),
-            visibility: self
-                .__unsafe_private_named
-                .11
-                .or_else(|| Some(CowStr::from("public"))),
+            blobs: self._fields.0,
+            content: self._fields.1.unwrap(),
+            latex: self._fields.2.or_else(|| Some(false)),
+            ogp: self._fields.3,
+            path: self._fields.4.unwrap(),
+            published_at: self._fields.5.unwrap(),
+            subtitle: self._fields.6,
+            tags: self._fields.7,
+            theme: self._fields.8,
+            title: self._fields.9.unwrap(),
+            url: self._fields.10.unwrap(),
+            visibility: self._fields.11.or_else(|| Some(CowStr::from("public"))),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_greengale/publication.rs b/crates/jacquard-api/src/app_greengale/publication.rs
index 7302ce94..86313ed6 100644
--- a/crates/jacquard-api/src/app_greengale/publication.rs
+++ b/crates/jacquard-api/src/app_greengale/publication.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -165,44 +168,44 @@ pub mod publication_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Url;
         type Name;
+        type Url;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Url = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `url` field to Set
-    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUrl<S> {}
-    impl<S: State> State for SetUrl<S> {
-        type Url = Set<members::url>;
-        type Name = S::Name;
+        type Url = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Url = S::Url;
         type Name = Set<members::name>;
+        type Url = S::Url;
+    }
+    ///State transition - sets the `url` field to Set
+    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUrl<S> {}
+    impl<S: State> State for SetUrl<S> {
+        type Name = S::Name;
+        type Url = Set<members::url>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `url` field
-        pub struct url(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `url` field
+        pub struct url(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PublicationBuilder<'a, S: publication_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<bool>,
         Option<CowStr<'a>>,
@@ -210,7 +213,7 @@ pub struct PublicationBuilder<'a, S: publication_state::State> {
         Option<UriValue<'a>>,
         Option<VoiceTheme<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Publication<'a> {
@@ -224,9 +227,9 @@ impl<'a> PublicationBuilder<'a, publication_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,12 +237,12 @@ impl<'a> PublicationBuilder<'a, publication_state::Empty> {
 impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -247,12 +250,12 @@ impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
 impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
     /// Set the `enableSiteStandard` field (optional)
     pub fn enable_site_standard(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `enableSiteStandard` field to an Option value (optional)
     pub fn maybe_enable_site_standard(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -267,11 +270,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PublicationBuilder<'a, publication_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -279,12 +282,12 @@ where
 impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
     /// Set the `theme` field (optional)
     pub fn theme(mut self, value: impl Into<Option<Theme<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `theme` field to an Option value (optional)
     pub fn maybe_theme(mut self, value: Option<Theme<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -299,11 +302,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> PublicationBuilder<'a, publication_state::SetUrl<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -311,12 +314,12 @@ where
 impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
     /// Set the `voiceTheme` field (optional)
     pub fn voice_theme(mut self, value: impl Into<Option<VoiceTheme<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `voiceTheme` field to an Option value (optional)
     pub fn maybe_voice_theme(mut self, value: Option<VoiceTheme<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -324,18 +327,18 @@ impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
 impl<'a, S> PublicationBuilder<'a, S>
 where
     S: publication_state::State,
-    S::Url: publication_state::IsSet,
     S::Name: publication_state::IsSet,
+    S::Url: publication_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Publication<'a> {
         Publication {
-            description: self.__unsafe_private_named.0,
-            enable_site_standard: self.__unsafe_private_named.1.or_else(|| Some(false)),
-            name: self.__unsafe_private_named.2.unwrap(),
-            theme: self.__unsafe_private_named.3,
-            url: self.__unsafe_private_named.4.unwrap(),
-            voice_theme: self.__unsafe_private_named.5,
+            description: self._fields.0,
+            enable_site_standard: self._fields.1.or_else(|| Some(false)),
+            name: self._fields.2.unwrap(),
+            theme: self._fields.3,
+            url: self._fields.4.unwrap(),
+            voice_theme: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -348,12 +351,12 @@ where
         >,
     ) -> Publication<'a> {
         Publication {
-            description: self.__unsafe_private_named.0,
-            enable_site_standard: self.__unsafe_private_named.1.or_else(|| Some(false)),
-            name: self.__unsafe_private_named.2.unwrap(),
-            theme: self.__unsafe_private_named.3,
-            url: self.__unsafe_private_named.4.unwrap(),
-            voice_theme: self.__unsafe_private_named.5,
+            description: self._fields.0,
+            enable_site_standard: self._fields.1.or_else(|| Some(false)),
+            name: self._fields.2.unwrap(),
+            theme: self._fields.3,
+            url: self._fields.4.unwrap(),
+            voice_theme: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_juttu/article_link.rs b/crates/jacquard-api/src/app_juttu/article_link.rs
index 2d014d22..32b9e690 100644
--- a/crates/jacquard-api/src/app_juttu/article_link.rs
+++ b/crates/jacquard-api/src/app_juttu/article_link.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -130,63 +133,63 @@ pub mod article_link_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type CommentsThread;
-        type CreatedAt;
         type ArticleId;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type CommentsThread = Unset;
-        type CreatedAt = Unset;
         type ArticleId = Unset;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `comments_thread` field to Set
     pub struct SetCommentsThread<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCommentsThread<S> {}
     impl<S: State> State for SetCommentsThread<S> {
         type CommentsThread = Set<members::comments_thread>;
-        type CreatedAt = S::CreatedAt;
-        type ArticleId = S::ArticleId;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CommentsThread = S::CommentsThread;
-        type CreatedAt = Set<members::created_at>;
         type ArticleId = S::ArticleId;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `article_id` field to Set
     pub struct SetArticleId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetArticleId<S> {}
     impl<S: State> State for SetArticleId<S> {
         type CommentsThread = S::CommentsThread;
-        type CreatedAt = S::CreatedAt;
         type ArticleId = Set<members::article_id>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CommentsThread = S::CommentsThread;
+        type ArticleId = S::ArticleId;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `comments_thread` field
         pub struct comments_thread(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `article_id` field
         pub struct article_id(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ArticleLinkBuilder<'a, S: article_link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<StrongRef<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ArticleLink<'a> {
@@ -200,9 +203,9 @@ impl<'a> ArticleLinkBuilder<'a, article_link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ArticleLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -217,11 +220,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ArticleLinkBuilder<'a, article_link_state::SetArticleId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ArticleLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -229,12 +232,12 @@ where
 impl<'a, S: article_link_state::State> ArticleLinkBuilder<'a, S> {
     /// Set the `articleUrl` field (optional)
     pub fn article_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `articleUrl` field to an Option value (optional)
     pub fn maybe_article_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -249,11 +252,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ArticleLinkBuilder<'a, article_link_state::SetCommentsThread<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ArticleLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -268,11 +271,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ArticleLinkBuilder<'a, article_link_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ArticleLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -281,16 +284,16 @@ impl<'a, S> ArticleLinkBuilder<'a, S>
 where
     S: article_link_state::State,
     S::CommentsThread: article_link_state::IsSet,
-    S::CreatedAt: article_link_state::IsSet,
     S::ArticleId: article_link_state::IsSet,
+    S::CreatedAt: article_link_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ArticleLink<'a> {
         ArticleLink {
-            article_id: self.__unsafe_private_named.0.unwrap(),
-            article_url: self.__unsafe_private_named.1,
-            comments_thread: self.__unsafe_private_named.2.unwrap(),
-            created_at: self.__unsafe_private_named.3.unwrap(),
+            article_id: self._fields.0.unwrap(),
+            article_url: self._fields.1,
+            comments_thread: self._fields.2.unwrap(),
+            created_at: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -303,10 +306,10 @@ where
         >,
     ) -> ArticleLink<'a> {
         ArticleLink {
-            article_id: self.__unsafe_private_named.0.unwrap(),
-            article_url: self.__unsafe_private_named.1,
-            comments_thread: self.__unsafe_private_named.2.unwrap(),
-            created_at: self.__unsafe_private_named.3.unwrap(),
+            article_id: self._fields.0.unwrap(),
+            article_url: self._fields.1,
+            comments_thread: self._fields.2.unwrap(),
+            created_at: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_mathr/leaderboard/entry.rs b/crates/jacquard-api/src/app_mathr/leaderboard/entry.rs
index 99dc8c56..a5102c7d 100644
--- a/crates/jacquard-api/src/app_mathr/leaderboard/entry.rs
+++ b/crates/jacquard-api/src/app_mathr/leaderboard/entry.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -183,92 +186,92 @@ pub mod entry_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Level;
-        type PlayerDid;
         type TotalSuccesses;
         type TotalChallenges;
+        type CreatedAt;
+        type PlayerDid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Level = Unset;
-        type PlayerDid = Unset;
         type TotalSuccesses = Unset;
         type TotalChallenges = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Level = S::Level;
-        type PlayerDid = S::PlayerDid;
-        type TotalSuccesses = S::TotalSuccesses;
-        type TotalChallenges = S::TotalChallenges;
+        type CreatedAt = Unset;
+        type PlayerDid = Unset;
     }
     ///State transition - sets the `level` field to Set
     pub struct SetLevel<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLevel<S> {}
     impl<S: State> State for SetLevel<S> {
-        type CreatedAt = S::CreatedAt;
         type Level = Set<members::level>;
-        type PlayerDid = S::PlayerDid;
         type TotalSuccesses = S::TotalSuccesses;
         type TotalChallenges = S::TotalChallenges;
-    }
-    ///State transition - sets the `player_did` field to Set
-    pub struct SetPlayerDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPlayerDid<S> {}
-    impl<S: State> State for SetPlayerDid<S> {
         type CreatedAt = S::CreatedAt;
-        type Level = S::Level;
-        type PlayerDid = Set<members::player_did>;
-        type TotalSuccesses = S::TotalSuccesses;
-        type TotalChallenges = S::TotalChallenges;
+        type PlayerDid = S::PlayerDid;
     }
     ///State transition - sets the `total_successes` field to Set
     pub struct SetTotalSuccesses<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTotalSuccesses<S> {}
     impl<S: State> State for SetTotalSuccesses<S> {
-        type CreatedAt = S::CreatedAt;
         type Level = S::Level;
-        type PlayerDid = S::PlayerDid;
         type TotalSuccesses = Set<members::total_successes>;
         type TotalChallenges = S::TotalChallenges;
+        type CreatedAt = S::CreatedAt;
+        type PlayerDid = S::PlayerDid;
     }
     ///State transition - sets the `total_challenges` field to Set
     pub struct SetTotalChallenges<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTotalChallenges<S> {}
     impl<S: State> State for SetTotalChallenges<S> {
+        type Level = S::Level;
+        type TotalSuccesses = S::TotalSuccesses;
+        type TotalChallenges = Set<members::total_challenges>;
         type CreatedAt = S::CreatedAt;
+        type PlayerDid = S::PlayerDid;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
         type Level = S::Level;
+        type TotalSuccesses = S::TotalSuccesses;
+        type TotalChallenges = S::TotalChallenges;
+        type CreatedAt = Set<members::created_at>;
         type PlayerDid = S::PlayerDid;
+    }
+    ///State transition - sets the `player_did` field to Set
+    pub struct SetPlayerDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPlayerDid<S> {}
+    impl<S: State> State for SetPlayerDid<S> {
+        type Level = S::Level;
         type TotalSuccesses = S::TotalSuccesses;
-        type TotalChallenges = Set<members::total_challenges>;
+        type TotalChallenges = S::TotalChallenges;
+        type CreatedAt = S::CreatedAt;
+        type PlayerDid = Set<members::player_did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `level` field
         pub struct level(());
-        ///Marker type for the `player_did` field
-        pub struct player_did(());
         ///Marker type for the `total_successes` field
         pub struct total_successes(());
         ///Marker type for the `total_challenges` field
         pub struct total_challenges(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `player_did` field
+        pub struct player_did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EntryBuilder<'a, S: entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<i64>,
         Option<i64>,
@@ -280,7 +283,7 @@ pub struct EntryBuilder<'a, S: entry_state::State> {
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Entry<'a> {
@@ -294,20 +297,9 @@ impl<'a> EntryBuilder<'a, entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -322,11 +314,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EntryBuilder<'a, entry_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -341,11 +333,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> EntryBuilder<'a, entry_state::SetLevel<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -353,12 +345,12 @@ where
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `percentage` field (optional)
     pub fn percentage(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `percentage` field to an Option value (optional)
     pub fn maybe_percentage(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -366,12 +358,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `playerAvatar` field (optional)
     pub fn player_avatar(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `playerAvatar` field to an Option value (optional)
     pub fn maybe_player_avatar(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -386,11 +378,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> EntryBuilder<'a, entry_state::SetPlayerDid<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -398,12 +390,12 @@ where
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `playerDisplayName` field (optional)
     pub fn player_display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `playerDisplayName` field to an Option value (optional)
     pub fn maybe_player_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -411,12 +403,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `playerHandle` field (optional)
     pub fn player_handle(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `playerHandle` field to an Option value (optional)
     pub fn maybe_player_handle(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -424,12 +416,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `postUri` field (optional)
     pub fn post_uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `postUri` field to an Option value (optional)
     pub fn maybe_post_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -444,11 +436,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> EntryBuilder<'a, entry_state::SetTotalChallenges<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -463,11 +455,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> EntryBuilder<'a, entry_state::SetTotalSuccesses<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -475,25 +467,25 @@ where
 impl<'a, S> EntryBuilder<'a, S>
 where
     S: entry_state::State,
-    S::CreatedAt: entry_state::IsSet,
     S::Level: entry_state::IsSet,
-    S::PlayerDid: entry_state::IsSet,
     S::TotalSuccesses: entry_state::IsSet,
     S::TotalChallenges: entry_state::IsSet,
+    S::CreatedAt: entry_state::IsSet,
+    S::PlayerDid: entry_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Entry<'a> {
         Entry {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            level: self.__unsafe_private_named.1.unwrap(),
-            percentage: self.__unsafe_private_named.2,
-            player_avatar: self.__unsafe_private_named.3,
-            player_did: self.__unsafe_private_named.4.unwrap(),
-            player_display_name: self.__unsafe_private_named.5,
-            player_handle: self.__unsafe_private_named.6,
-            post_uri: self.__unsafe_private_named.7,
-            total_challenges: self.__unsafe_private_named.8.unwrap(),
-            total_successes: self.__unsafe_private_named.9.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            level: self._fields.1.unwrap(),
+            percentage: self._fields.2,
+            player_avatar: self._fields.3,
+            player_did: self._fields.4.unwrap(),
+            player_display_name: self._fields.5,
+            player_handle: self._fields.6,
+            post_uri: self._fields.7,
+            total_challenges: self._fields.8.unwrap(),
+            total_successes: self._fields.9.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -506,16 +498,16 @@ where
         >,
     ) -> Entry<'a> {
         Entry {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            level: self.__unsafe_private_named.1.unwrap(),
-            percentage: self.__unsafe_private_named.2,
-            player_avatar: self.__unsafe_private_named.3,
-            player_did: self.__unsafe_private_named.4.unwrap(),
-            player_display_name: self.__unsafe_private_named.5,
-            player_handle: self.__unsafe_private_named.6,
-            post_uri: self.__unsafe_private_named.7,
-            total_challenges: self.__unsafe_private_named.8.unwrap(),
-            total_successes: self.__unsafe_private_named.9.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            level: self._fields.1.unwrap(),
+            percentage: self._fields.2,
+            player_avatar: self._fields.3,
+            player_did: self._fields.4.unwrap(),
+            player_display_name: self._fields.5,
+            player_handle: self._fields.6,
+            post_uri: self._fields.7,
+            total_challenges: self._fields.8.unwrap(),
+            total_successes: self._fields.9.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_mathr/score.rs b/crates/jacquard-api/src/app_mathr/score.rs
index fd3cb302..e71749fc 100644
--- a/crates/jacquard-api/src/app_mathr/score.rs
+++ b/crates/jacquard-api/src/app_mathr/score.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -164,81 +167,75 @@ pub mod score_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type TotalChallenges;
         type Level;
-        type CreatedAt;
         type TotalSuccesses;
+        type TotalChallenges;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type TotalChallenges = Unset;
         type Level = Unset;
-        type CreatedAt = Unset;
         type TotalSuccesses = Unset;
-    }
-    ///State transition - sets the `total_challenges` field to Set
-    pub struct SetTotalChallenges<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTotalChallenges<S> {}
-    impl<S: State> State for SetTotalChallenges<S> {
-        type TotalChallenges = Set<members::total_challenges>;
-        type Level = S::Level;
-        type CreatedAt = S::CreatedAt;
-        type TotalSuccesses = S::TotalSuccesses;
+        type TotalChallenges = Unset;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `level` field to Set
     pub struct SetLevel<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLevel<S> {}
     impl<S: State> State for SetLevel<S> {
-        type TotalChallenges = S::TotalChallenges;
         type Level = Set<members::level>;
-        type CreatedAt = S::CreatedAt;
         type TotalSuccesses = S::TotalSuccesses;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type TotalChallenges = S::TotalChallenges;
-        type Level = S::Level;
-        type CreatedAt = Set<members::created_at>;
-        type TotalSuccesses = S::TotalSuccesses;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `total_successes` field to Set
     pub struct SetTotalSuccesses<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTotalSuccesses<S> {}
     impl<S: State> State for SetTotalSuccesses<S> {
+        type Level = S::Level;
+        type TotalSuccesses = Set<members::total_successes>;
         type TotalChallenges = S::TotalChallenges;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `total_challenges` field to Set
+    pub struct SetTotalChallenges<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTotalChallenges<S> {}
+    impl<S: State> State for SetTotalChallenges<S> {
         type Level = S::Level;
+        type TotalSuccesses = S::TotalSuccesses;
+        type TotalChallenges = Set<members::total_challenges>;
         type CreatedAt = S::CreatedAt;
-        type TotalSuccesses = Set<members::total_successes>;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Level = S::Level;
+        type TotalSuccesses = S::TotalSuccesses;
+        type TotalChallenges = S::TotalChallenges;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `total_challenges` field
-        pub struct total_challenges(());
         ///Marker type for the `level` field
         pub struct level(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `total_successes` field
         pub struct total_successes(());
+        ///Marker type for the `total_challenges` field
+        pub struct total_challenges(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ScoreBuilder<'a, S: score_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<i64>,
-        Option<i64>,
-        Option<i64>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<i64>, Option<i64>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Score<'a> {
@@ -252,9 +249,9 @@ impl<'a> ScoreBuilder<'a, score_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -269,11 +266,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ScoreBuilder<'a, score_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -288,11 +285,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ScoreBuilder<'a, score_state::SetLevel<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -300,12 +297,12 @@ where
 impl<'a, S: score_state::State> ScoreBuilder<'a, S> {
     /// Set the `percentage` field (optional)
     pub fn percentage(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `percentage` field to an Option value (optional)
     pub fn maybe_percentage(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -320,11 +317,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ScoreBuilder<'a, score_state::SetTotalChallenges<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -339,11 +336,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ScoreBuilder<'a, score_state::SetTotalSuccesses<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -351,19 +348,19 @@ where
 impl<'a, S> ScoreBuilder<'a, S>
 where
     S: score_state::State,
-    S::TotalChallenges: score_state::IsSet,
     S::Level: score_state::IsSet,
-    S::CreatedAt: score_state::IsSet,
     S::TotalSuccesses: score_state::IsSet,
+    S::TotalChallenges: score_state::IsSet,
+    S::CreatedAt: score_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Score<'a> {
         Score {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            level: self.__unsafe_private_named.1.unwrap(),
-            percentage: self.__unsafe_private_named.2,
-            total_challenges: self.__unsafe_private_named.3.unwrap(),
-            total_successes: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            level: self._fields.1.unwrap(),
+            percentage: self._fields.2,
+            total_challenges: self._fields.3.unwrap(),
+            total_successes: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -376,11 +373,11 @@ where
         >,
     ) -> Score<'a> {
         Score {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            level: self.__unsafe_private_named.1.unwrap(),
-            percentage: self.__unsafe_private_named.2,
-            total_challenges: self.__unsafe_private_named.3.unwrap(),
-            total_successes: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            level: self._fields.1.unwrap(),
+            percentage: self._fields.2,
+            total_challenges: self._fields.3.unwrap(),
+            total_successes: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_nblr/actor/profile.rs b/crates/jacquard-api/src/app_nblr/actor/profile.rs
index 410e787e..d5c434a7 100644
--- a/crates/jacquard-api/src/app_nblr/actor/profile.rs
+++ b/crates/jacquard-api/src/app_nblr/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -255,8 +258,8 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -264,7 +267,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -278,9 +281,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -288,12 +291,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -308,11 +311,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ProfileBuilder<'a, profile_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -320,12 +323,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -333,12 +336,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -346,12 +349,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `pronouns` field (optional)
     pub fn pronouns(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `pronouns` field to an Option value (optional)
     pub fn maybe_pronouns(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -359,12 +362,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `website` field (optional)
     pub fn website(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `website` field to an Option value (optional)
     pub fn maybe_website(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -377,12 +380,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3,
-            pronouns: self.__unsafe_private_named.4,
-            website: self.__unsafe_private_named.5,
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            display_name: self._fields.3,
+            pronouns: self._fields.4,
+            website: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -395,12 +398,12 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3,
-            pronouns: self.__unsafe_private_named.4,
-            website: self.__unsafe_private_named.5,
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            display_name: self._fields.3,
+            pronouns: self._fields.4,
+            website: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_nblr/feed/collection.rs b/crates/jacquard-api/src/app_nblr/feed/collection.rs
index ccd85d1e..c753426c 100644
--- a/crates/jacquard-api/src/app_nblr/feed/collection.rs
+++ b/crates/jacquard-api/src/app_nblr/feed/collection.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -133,45 +136,45 @@ pub mod collection_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Name;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Name = S::Name;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type CreatedAt = S::CreatedAt;
         type Name = Set<members::name>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Name = S::Name;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CollectionBuilder<'a, S: collection_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Collection<'a> {
@@ -185,9 +188,9 @@ impl<'a> CollectionBuilder<'a, collection_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -202,11 +205,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionBuilder<'a, collection_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,11 +224,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CollectionBuilder<'a, collection_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -233,14 +236,14 @@ where
 impl<'a, S> CollectionBuilder<'a, S>
 where
     S: collection_state::State,
-    S::CreatedAt: collection_state::IsSet,
     S::Name: collection_state::IsSet,
+    S::CreatedAt: collection_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Collection<'a> {
         Collection {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -253,8 +256,8 @@ where
         >,
     ) -> Collection<'a> {
         Collection {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_nblr/feed/link.rs b/crates/jacquard-api/src/app_nblr/feed/link.rs
index 148df611..533bcbe7 100644
--- a/crates/jacquard-api/src/app_nblr/feed/link.rs
+++ b/crates/jacquard-api/src/app_nblr/feed/link.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -112,59 +115,59 @@ pub mod link_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type CreatedAt;
         type Collection;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type CreatedAt = Unset;
         type Collection = Unset;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type CreatedAt = S::CreatedAt;
-        type Collection = S::Collection;
+        type Uri = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Uri = S::Uri;
         type CreatedAt = Set<members::created_at>;
         type Collection = S::Collection;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `collection` field to Set
     pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCollection<S> {}
     impl<S: State> State for SetCollection<S> {
-        type Uri = S::Uri;
         type CreatedAt = S::CreatedAt;
         type Collection = Set<members::collection>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type CreatedAt = S::CreatedAt;
+        type Collection = S::Collection;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `collection` field
         pub struct collection(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LinkBuilder<'a, S: link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<Datetime>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<Datetime>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Link<'a> {
@@ -178,9 +181,9 @@ impl<'a> LinkBuilder<'a, link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -195,11 +198,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> LinkBuilder<'a, link_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -214,11 +217,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LinkBuilder<'a, link_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -233,11 +236,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LinkBuilder<'a, link_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -245,16 +248,16 @@ where
 impl<'a, S> LinkBuilder<'a, S>
 where
     S: link_state::State,
-    S::Uri: link_state::IsSet,
     S::CreatedAt: link_state::IsSet,
     S::Collection: link_state::IsSet,
+    S::Uri: link_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Link<'a> {
         Link {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            collection: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -267,9 +270,9 @@ where
         >,
     ) -> Link<'a> {
         Link {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            collection: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_nblr/feed/post.rs b/crates/jacquard-api/src/app_nblr/feed/post.rs
index b39dfa26..fd58c73e 100644
--- a/crates/jacquard-api/src/app_nblr/feed/post.rs
+++ b/crates/jacquard-api/src/app_nblr/feed/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -255,45 +258,45 @@ pub mod aspect_ratio_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Width;
         type Height;
+        type Width;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Width = Unset;
         type Height = Unset;
-    }
-    ///State transition - sets the `width` field to Set
-    pub struct SetWidth<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetWidth<S> {}
-    impl<S: State> State for SetWidth<S> {
-        type Width = Set<members::width>;
-        type Height = S::Height;
+        type Width = Unset;
     }
     ///State transition - sets the `height` field to Set
     pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHeight<S> {}
     impl<S: State> State for SetHeight<S> {
-        type Width = S::Width;
         type Height = Set<members::height>;
+        type Width = S::Width;
+    }
+    ///State transition - sets the `width` field to Set
+    pub struct SetWidth<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetWidth<S> {}
+    impl<S: State> State for SetWidth<S> {
+        type Height = S::Height;
+        type Width = Set<members::width>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `width` field
-        pub struct width(());
         ///Marker type for the `height` field
         pub struct height(());
+        ///Marker type for the `width` field
+        pub struct width(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AspectRatioBuilder<'a, S: aspect_ratio_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AspectRatio<'a> {
@@ -307,9 +310,9 @@ impl<'a> AspectRatioBuilder<'a, aspect_ratio_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -324,11 +327,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -343,11 +346,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetWidth<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -355,14 +358,14 @@ where
 impl<'a, S> AspectRatioBuilder<'a, S>
 where
     S: aspect_ratio_state::State,
-    S::Width: aspect_ratio_state::IsSet,
     S::Height: aspect_ratio_state::IsSet,
+    S::Width: aspect_ratio_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -375,8 +378,8 @@ where
         >,
     ) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -536,8 +539,8 @@ pub mod post_state {
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<post::AspectRatio<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -545,7 +548,7 @@ pub struct PostBuilder<'a, S: post_state::State> {
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -559,9 +562,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -572,12 +575,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
         mut self,
         value: impl Into<Option<post::AspectRatio<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
     pub fn maybe_aspect_ratio(mut self, value: Option<post::AspectRatio<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -592,11 +595,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -604,12 +607,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -617,12 +620,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -630,12 +633,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -643,12 +646,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `uri` field (optional)
     pub fn uri(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `uri` field to an Option value (optional)
     pub fn maybe_uri(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -661,12 +664,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            aspect_ratio: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            image: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4,
-            uri: self.__unsafe_private_named.5,
+            aspect_ratio: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            image: self._fields.3,
+            title: self._fields.4,
+            uri: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -679,12 +682,12 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            aspect_ratio: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            image: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4,
-            uri: self.__unsafe_private_named.5,
+            aspect_ratio: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            image: self._fields.3,
+            title: self._fields.4,
+            uri: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_ocho/auth.rs b/crates/jacquard-api/src/app_ocho/auth.rs
index dab8ebf4..93c9d5c2 100644
--- a/crates/jacquard-api/src/app_ocho/auth.rs
+++ b/crates/jacquard-api/src/app_ocho/auth.rs
@@ -14,7 +14,11 @@ pub mod update_email;
 pub mod update_handle;
 pub mod whoami;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -134,14 +138,14 @@ pub mod auth_callback_state {
 
 /// Builder for constructing an instance of this type
 pub struct AuthCallbackBuilder<'a, S: auth_callback_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AuthCallback<'a> {
@@ -155,9 +159,9 @@ impl<'a> AuthCallbackBuilder<'a, auth_callback_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AuthCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -172,11 +176,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AuthCallbackBuilder<'a, auth_callback_state::SetAccessJwt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AuthCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -191,11 +195,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> AuthCallbackBuilder<'a, auth_callback_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AuthCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,11 +214,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AuthCallbackBuilder<'a, auth_callback_state::SetHandle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AuthCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -229,11 +233,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AuthCallbackBuilder<'a, auth_callback_state::SetRefreshJwt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         AuthCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,10 +253,10 @@ where
     /// Build the final struct
     pub fn build(self) -> AuthCallback<'a> {
         AuthCallback {
-            access_jwt: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            handle: self.__unsafe_private_named.2.unwrap(),
-            refresh_jwt: self.__unsafe_private_named.3.unwrap(),
+            access_jwt: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            handle: self._fields.2.unwrap(),
+            refresh_jwt: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -265,10 +269,10 @@ where
         >,
     ) -> AuthCallback<'a> {
         AuthCallback {
-            access_jwt: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            handle: self.__unsafe_private_named.2.unwrap(),
-            refresh_jwt: self.__unsafe_private_named.3.unwrap(),
+            access_jwt: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            handle: self._fields.2.unwrap(),
+            refresh_jwt: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_ocho/auth/at_proto_callback.rs b/crates/jacquard-api/src/app_ocho/auth/at_proto_callback.rs
index a2ba9ff2..2f1f6598 100644
--- a/crates/jacquard-api/src/app_ocho/auth/at_proto_callback.rs
+++ b/crates/jacquard-api/src/app_ocho/auth/at_proto_callback.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -56,58 +57,58 @@ pub mod at_proto_callback_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type State;
-        type Iss;
         type Code;
+        type Iss;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type State = Unset;
-        type Iss = Unset;
         type Code = Unset;
+        type Iss = Unset;
     }
     ///State transition - sets the `state` field to Set
     pub struct SetState<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetState<S> {}
     impl<S: State> State for SetState<S> {
         type State = Set<members::state>;
-        type Iss = S::Iss;
-        type Code = S::Code;
-    }
-    ///State transition - sets the `iss` field to Set
-    pub struct SetIss<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIss<S> {}
-    impl<S: State> State for SetIss<S> {
-        type State = S::State;
-        type Iss = Set<members::iss>;
         type Code = S::Code;
+        type Iss = S::Iss;
     }
     ///State transition - sets the `code` field to Set
     pub struct SetCode<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCode<S> {}
     impl<S: State> State for SetCode<S> {
         type State = S::State;
-        type Iss = S::Iss;
         type Code = Set<members::code>;
+        type Iss = S::Iss;
+    }
+    ///State transition - sets the `iss` field to Set
+    pub struct SetIss<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIss<S> {}
+    impl<S: State> State for SetIss<S> {
+        type State = S::State;
+        type Code = S::Code;
+        type Iss = Set<members::iss>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `state` field
         pub struct state(());
-        ///Marker type for the `iss` field
-        pub struct iss(());
         ///Marker type for the `code` field
         pub struct code(());
+        ///Marker type for the `iss` field
+        pub struct iss(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AtProtoCallbackBuilder<'a, S: at_proto_callback_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AtProtoCallback<'a> {
@@ -121,9 +122,9 @@ impl<'a> AtProtoCallbackBuilder<'a, at_proto_callback_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AtProtoCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -138,11 +139,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AtProtoCallbackBuilder<'a, at_proto_callback_state::SetCode<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AtProtoCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -157,11 +158,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AtProtoCallbackBuilder<'a, at_proto_callback_state::SetIss<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AtProtoCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -176,11 +177,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AtProtoCallbackBuilder<'a, at_proto_callback_state::SetState<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AtProtoCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -189,15 +190,15 @@ impl<'a, S> AtProtoCallbackBuilder<'a, S>
 where
     S: at_proto_callback_state::State,
     S::State: at_proto_callback_state::IsSet,
-    S::Iss: at_proto_callback_state::IsSet,
     S::Code: at_proto_callback_state::IsSet,
+    S::Iss: at_proto_callback_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AtProtoCallback<'a> {
         AtProtoCallback {
-            code: self.__unsafe_private_named.0.unwrap(),
-            iss: self.__unsafe_private_named.1.unwrap(),
-            state: self.__unsafe_private_named.2.unwrap(),
+            code: self._fields.0.unwrap(),
+            iss: self._fields.1.unwrap(),
+            state: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_ocho/auth/authorize.rs b/crates/jacquard-api/src/app_ocho/auth/authorize.rs
index 8163fa0a..7c4f65b3 100644
--- a/crates/jacquard-api/src/app_ocho/auth/authorize.rs
+++ b/crates/jacquard-api/src/app_ocho/auth/authorize.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::value::Data;
@@ -105,9 +108,9 @@ pub mod authorize_state {
 
 /// Builder for constructing an instance of this type
 pub struct AuthorizeBuilder<'a, S: authorize_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Data<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Data<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Authorize<'a> {
@@ -121,9 +124,9 @@ impl<'a> AuthorizeBuilder<'a, authorize_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AuthorizeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -138,11 +141,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> AuthorizeBuilder<'a, authorize_state::SetAuthorizeOptions<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AuthorizeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -157,11 +160,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AuthorizeBuilder<'a, authorize_state::SetInput<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AuthorizeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -175,8 +178,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Authorize<'a> {
         Authorize {
-            authorize_options: self.__unsafe_private_named.0.unwrap(),
-            input: self.__unsafe_private_named.1.unwrap(),
+            authorize_options: self._fields.0.unwrap(),
+            input: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -186,8 +189,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Authorize<'a> {
         Authorize {
-            authorize_options: self.__unsafe_private_named.0.unwrap(),
-            input: self.__unsafe_private_named.1.unwrap(),
+            authorize_options: self._fields.0.unwrap(),
+            input: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_ocho/auth/github_callback.rs b/crates/jacquard-api/src/app_ocho/auth/github_callback.rs
index dd69be91..e137ef55 100644
--- a/crates/jacquard-api/src/app_ocho/auth/github_callback.rs
+++ b/crates/jacquard-api/src/app_ocho/auth/github_callback.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -53,45 +54,45 @@ pub mod github_callback_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Code;
         type State;
+        type Code;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Code = Unset;
         type State = Unset;
-    }
-    ///State transition - sets the `code` field to Set
-    pub struct SetCode<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCode<S> {}
-    impl<S: State> State for SetCode<S> {
-        type Code = Set<members::code>;
-        type State = S::State;
+        type Code = Unset;
     }
     ///State transition - sets the `state` field to Set
     pub struct SetState<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetState<S> {}
     impl<S: State> State for SetState<S> {
-        type Code = S::Code;
         type State = Set<members::state>;
+        type Code = S::Code;
+    }
+    ///State transition - sets the `code` field to Set
+    pub struct SetCode<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCode<S> {}
+    impl<S: State> State for SetCode<S> {
+        type State = S::State;
+        type Code = Set<members::code>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `code` field
-        pub struct code(());
         ///Marker type for the `state` field
         pub struct state(());
+        ///Marker type for the `code` field
+        pub struct code(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GithubCallbackBuilder<'a, S: github_callback_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GithubCallback<'a> {
@@ -105,9 +106,9 @@ impl<'a> GithubCallbackBuilder<'a, github_callback_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GithubCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -122,11 +123,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GithubCallbackBuilder<'a, github_callback_state::SetCode<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GithubCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -141,11 +142,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GithubCallbackBuilder<'a, github_callback_state::SetState<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GithubCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -153,14 +154,14 @@ where
 impl<'a, S> GithubCallbackBuilder<'a, S>
 where
     S: github_callback_state::State,
-    S::Code: github_callback_state::IsSet,
     S::State: github_callback_state::IsSet,
+    S::Code: github_callback_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GithubCallback<'a> {
         GithubCallback {
-            code: self.__unsafe_private_named.0.unwrap(),
-            state: self.__unsafe_private_named.1.unwrap(),
+            code: self._fields.0.unwrap(),
+            state: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_ocho/auth/google_callback.rs b/crates/jacquard-api/src/app_ocho/auth/google_callback.rs
index d3dc4038..421b1e76 100644
--- a/crates/jacquard-api/src/app_ocho/auth/google_callback.rs
+++ b/crates/jacquard-api/src/app_ocho/auth/google_callback.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -89,9 +90,9 @@ pub mod google_callback_state {
 
 /// Builder for constructing an instance of this type
 pub struct GoogleCallbackBuilder<'a, S: google_callback_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GoogleCallback<'a> {
@@ -105,9 +106,9 @@ impl<'a> GoogleCallbackBuilder<'a, google_callback_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GoogleCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -122,11 +123,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GoogleCallbackBuilder<'a, google_callback_state::SetCode<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GoogleCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -141,11 +142,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GoogleCallbackBuilder<'a, google_callback_state::SetState<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GoogleCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -159,8 +160,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GoogleCallback<'a> {
         GoogleCallback {
-            code: self.__unsafe_private_named.0.unwrap(),
-            state: self.__unsafe_private_named.1.unwrap(),
+            code: self._fields.0.unwrap(),
+            state: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_ocho/auth/request_email_update.rs b/crates/jacquard-api/src/app_ocho/auth/request_email_update.rs
index 69f7d207..252852c0 100644
--- a/crates/jacquard-api/src/app_ocho/auth/request_email_update.rs
+++ b/crates/jacquard-api/src/app_ocho/auth/request_email_update.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/app_ocho/auth/update_email.rs b/crates/jacquard-api/src/app_ocho/auth/update_email.rs
index 9f69eac6..f1adea85 100644
--- a/crates/jacquard-api/src/app_ocho/auth/update_email.rs
+++ b/crates/jacquard-api/src/app_ocho/auth/update_email.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/app_ocho/auth/update_handle.rs b/crates/jacquard-api/src/app_ocho/auth/update_handle.rs
index 64c1739b..58fc1971 100644
--- a/crates/jacquard-api/src/app_ocho/auth/update_handle.rs
+++ b/crates/jacquard-api/src/app_ocho/auth/update_handle.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Handle;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -82,9 +85,9 @@ pub mod update_handle_state {
 
 /// Builder for constructing an instance of this type
 pub struct UpdateHandleBuilder<'a, S: update_handle_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Handle<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Handle<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateHandle<'a> {
@@ -98,9 +101,9 @@ impl<'a> UpdateHandleBuilder<'a, update_handle_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateHandleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -115,11 +118,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> UpdateHandleBuilder<'a, update_handle_state::SetHandle<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UpdateHandleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -132,7 +135,7 @@ where
     /// Build the final struct
     pub fn build(self) -> UpdateHandle<'a> {
         UpdateHandle {
-            handle: self.__unsafe_private_named.0.unwrap(),
+            handle: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -145,7 +148,7 @@ where
         >,
     ) -> UpdateHandle<'a> {
         UpdateHandle {
-            handle: self.__unsafe_private_named.0.unwrap(),
+            handle: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_ocho/auth/whoami.rs b/crates/jacquard-api/src/app_ocho/auth/whoami.rs
index ebbb897d..0c89b214 100644
--- a/crates/jacquard-api/src/app_ocho/auth/whoami.rs
+++ b/crates/jacquard-api/src/app_ocho/auth/whoami.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_ocho/edu/get_verification_url.rs b/crates/jacquard-api/src/app_ocho/edu/get_verification_url.rs
index 2de369c0..547e72b7 100644
--- a/crates/jacquard-api/src/app_ocho/edu/get_verification_url.rs
+++ b/crates/jacquard-api/src/app_ocho/edu/get_verification_url.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_verification_url_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetVerificationUrlBuilder<'a, S: get_verification_url_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetVerificationUrl<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetVerificationUrlBuilder<'a, get_verification_url_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetVerificationUrlBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetVerificationUrlBuilder<'a, get_verification_url_state::SetDomain<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetVerificationUrlBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetVerificationUrl<'a> {
         GetVerificationUrl {
-            domain: self.__unsafe_private_named.0.unwrap(),
+            domain: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_ocho/edu/google_callback.rs b/crates/jacquard-api/src/app_ocho/edu/google_callback.rs
index 0be7a5d8..0b732fe5 100644
--- a/crates/jacquard-api/src/app_ocho/edu/google_callback.rs
+++ b/crates/jacquard-api/src/app_ocho/edu/google_callback.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -53,45 +54,45 @@ pub mod google_callback_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type State;
         type Code;
+        type State;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type State = Unset;
         type Code = Unset;
-    }
-    ///State transition - sets the `state` field to Set
-    pub struct SetState<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetState<S> {}
-    impl<S: State> State for SetState<S> {
-        type State = Set<members::state>;
-        type Code = S::Code;
+        type State = Unset;
     }
     ///State transition - sets the `code` field to Set
     pub struct SetCode<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCode<S> {}
     impl<S: State> State for SetCode<S> {
-        type State = S::State;
         type Code = Set<members::code>;
+        type State = S::State;
+    }
+    ///State transition - sets the `state` field to Set
+    pub struct SetState<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetState<S> {}
+    impl<S: State> State for SetState<S> {
+        type Code = S::Code;
+        type State = Set<members::state>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `state` field
-        pub struct state(());
         ///Marker type for the `code` field
         pub struct code(());
+        ///Marker type for the `state` field
+        pub struct state(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GoogleCallbackBuilder<'a, S: google_callback_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GoogleCallback<'a> {
@@ -105,9 +106,9 @@ impl<'a> GoogleCallbackBuilder<'a, google_callback_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GoogleCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -122,11 +123,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GoogleCallbackBuilder<'a, google_callback_state::SetCode<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GoogleCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -141,11 +142,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GoogleCallbackBuilder<'a, google_callback_state::SetState<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GoogleCallbackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -153,14 +154,14 @@ where
 impl<'a, S> GoogleCallbackBuilder<'a, S>
 where
     S: google_callback_state::State,
-    S::State: google_callback_state::IsSet,
     S::Code: google_callback_state::IsSet,
+    S::State: google_callback_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GoogleCallback<'a> {
         GoogleCallback {
-            code: self.__unsafe_private_named.0.unwrap(),
-            state: self.__unsafe_private_named.1.unwrap(),
+            code: self._fields.0.unwrap(),
+            state: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_ocho/edu/is_verified.rs b/crates/jacquard-api/src/app_ocho/edu/is_verified.rs
index f7e8dc59..15bc178c 100644
--- a/crates/jacquard-api/src/app_ocho/edu/is_verified.rs
+++ b/crates/jacquard-api/src/app_ocho/edu/is_verified.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -85,9 +88,9 @@ pub mod is_verified_state {
 
 /// Builder for constructing an instance of this type
 pub struct IsVerifiedBuilder<'a, S: is_verified_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> IsVerified<'a> {
@@ -101,9 +104,9 @@ impl<'a> IsVerifiedBuilder<'a, is_verified_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IsVerifiedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -118,11 +121,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> IsVerifiedBuilder<'a, is_verified_state::SetDomain<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         IsVerifiedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -135,7 +138,7 @@ where
     /// Build the final struct
     pub fn build(self) -> IsVerified<'a> {
         IsVerified {
-            domain: self.__unsafe_private_named.0.unwrap(),
+            domain: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_ocho/edu/verification.rs b/crates/jacquard-api/src/app_ocho/edu/verification.rs
index 11c15e49..35ae8178 100644
--- a/crates/jacquard-api/src/app_ocho/edu/verification.rs
+++ b/crates/jacquard-api/src/app_ocho/edu/verification.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -163,9 +166,9 @@ pub mod verification_state {
 
 /// Builder for constructing an instance of this type
 pub struct VerificationBuilder<'a, S: verification_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Verification<'a> {
@@ -179,9 +182,9 @@ impl<'a> VerificationBuilder<'a, verification_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VerificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> VerificationBuilder<'a, verification_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         VerificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> VerificationBuilder<'a, verification_state::SetDomain<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VerificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> VerificationBuilder<'a, verification_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         VerificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,9 +256,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Verification<'a> {
         Verification {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            domain: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            domain: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -268,9 +271,9 @@ where
         >,
     ) -> Verification<'a> {
         Verification {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            domain: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            domain: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_ocho/message/send.rs b/crates/jacquard-api/src/app_ocho/message/send.rs
index 34a7af1b..890c2487 100644
--- a/crates/jacquard-api/src/app_ocho/message/send.rs
+++ b/crates/jacquard-api/src/app_ocho/message/send.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_ocho/payment/get_stripe_intent.rs b/crates/jacquard-api/src/app_ocho/payment/get_stripe_intent.rs
index de23c42b..dfa81ac5 100644
--- a/crates/jacquard-api/src/app_ocho/payment/get_stripe_intent.rs
+++ b/crates/jacquard-api/src/app_ocho/payment/get_stripe_intent.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -83,63 +86,58 @@ pub mod get_stripe_intent_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Amount;
-        type Id;
         type Iss;
+        type Id;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Amount = Unset;
-        type Id = Unset;
         type Iss = Unset;
+        type Id = Unset;
     }
     ///State transition - sets the `amount` field to Set
     pub struct SetAmount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAmount<S> {}
     impl<S: State> State for SetAmount<S> {
         type Amount = Set<members::amount>;
-        type Id = S::Id;
-        type Iss = S::Iss;
-    }
-    ///State transition - sets the `id` field to Set
-    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetId<S> {}
-    impl<S: State> State for SetId<S> {
-        type Amount = S::Amount;
-        type Id = Set<members::id>;
         type Iss = S::Iss;
+        type Id = S::Id;
     }
     ///State transition - sets the `iss` field to Set
     pub struct SetIss<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIss<S> {}
     impl<S: State> State for SetIss<S> {
         type Amount = S::Amount;
-        type Id = S::Id;
         type Iss = Set<members::iss>;
+        type Id = S::Id;
+    }
+    ///State transition - sets the `id` field to Set
+    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetId<S> {}
+    impl<S: State> State for SetId<S> {
+        type Amount = S::Amount;
+        type Iss = S::Iss;
+        type Id = Set<members::id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `amount` field
         pub struct amount(());
-        ///Marker type for the `id` field
-        pub struct id(());
         ///Marker type for the `iss` field
         pub struct iss(());
+        ///Marker type for the `id` field
+        pub struct id(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GetStripeIntentBuilder<'a, S: get_stripe_intent_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<i64>,
-        Option<CowStr<'a>>,
-        Option<Did<'a>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<CowStr<'a>>, Option<Did<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetStripeIntent<'a> {
@@ -153,9 +151,9 @@ impl<'a> GetStripeIntentBuilder<'a, get_stripe_intent_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetStripeIntentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -170,11 +168,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> GetStripeIntentBuilder<'a, get_stripe_intent_state::SetAmount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetStripeIntentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -189,11 +187,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetStripeIntentBuilder<'a, get_stripe_intent_state::SetId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetStripeIntentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -208,11 +206,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetStripeIntentBuilder<'a, get_stripe_intent_state::SetIss<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetStripeIntentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -220,12 +218,12 @@ where
 impl<'a, S: get_stripe_intent_state::State> GetStripeIntentBuilder<'a, S> {
     /// Set the `token` field (optional)
     pub fn token(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `token` field to an Option value (optional)
     pub fn maybe_token(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -234,16 +232,16 @@ impl<'a, S> GetStripeIntentBuilder<'a, S>
 where
     S: get_stripe_intent_state::State,
     S::Amount: get_stripe_intent_state::IsSet,
-    S::Id: get_stripe_intent_state::IsSet,
     S::Iss: get_stripe_intent_state::IsSet,
+    S::Id: get_stripe_intent_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GetStripeIntent<'a> {
         GetStripeIntent {
-            amount: self.__unsafe_private_named.0.unwrap(),
-            id: self.__unsafe_private_named.1.unwrap(),
-            iss: self.__unsafe_private_named.2.unwrap(),
-            token: self.__unsafe_private_named.3,
+            amount: self._fields.0.unwrap(),
+            id: self._fields.1.unwrap(),
+            iss: self._fields.2.unwrap(),
+            token: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_ocho/plugin.rs b/crates/jacquard-api/src/app_ocho/plugin.rs
index 5452bf20..b2abeac8 100644
--- a/crates/jacquard-api/src/app_ocho/plugin.rs
+++ b/crates/jacquard-api/src/app_ocho/plugin.rs
@@ -10,7 +10,11 @@ pub mod get_manifest;
 pub mod put_hosting_url;
 pub mod service;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -1174,14 +1178,14 @@ pub mod asset_state {
 
 /// Builder for constructing an instance of this type
 pub struct AssetBuilder<'a, S: asset_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Asset<'a> {
@@ -1195,9 +1199,9 @@ impl<'a> AssetBuilder<'a, asset_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AssetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1212,11 +1216,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> AssetBuilder<'a, asset_state::SetBlob<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AssetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1231,11 +1235,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AssetBuilder<'a, asset_state::SetHash<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AssetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1250,11 +1254,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AssetBuilder<'a, asset_state::SetType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AssetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1262,12 +1266,12 @@ where
 impl<'a, S: asset_state::State> AssetBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1282,10 +1286,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Asset<'a> {
         Asset {
-            blob: self.__unsafe_private_named.0.unwrap(),
-            hash: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
-            updated_at: self.__unsafe_private_named.3,
+            blob: self._fields.0.unwrap(),
+            hash: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
+            updated_at: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -1295,10 +1299,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Asset<'a> {
         Asset {
-            blob: self.__unsafe_private_named.0.unwrap(),
-            hash: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
-            updated_at: self.__unsafe_private_named.3,
+            blob: self._fields.0.unwrap(),
+            hash: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
+            updated_at: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -1338,9 +1342,9 @@ pub mod expo_go_state {
 
 /// Builder for constructing an instance of this type
 pub struct ExpoGoBuilder<'a, S: expo_go_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<plugin::Developer<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<plugin::Developer<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ExpoGo<'a> {
@@ -1354,9 +1358,9 @@ impl<'a> ExpoGoBuilder<'a, expo_go_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExpoGoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1371,11 +1375,11 @@ where
         mut self,
         value: impl Into<plugin::Developer<'a>>,
     ) -> ExpoGoBuilder<'a, expo_go_state::SetDeveloper<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ExpoGoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1388,7 +1392,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ExpoGo<'a> {
         ExpoGo {
-            developer: self.__unsafe_private_named.0.unwrap(),
+            developer: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1398,7 +1402,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ExpoGo<'a> {
         ExpoGo {
-            developer: self.__unsafe_private_named.0.unwrap(),
+            developer: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1415,62 +1419,58 @@ pub mod launch_asset_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Url;
-        type ContentType;
         type Key;
+        type ContentType;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Url = Unset;
-        type ContentType = Unset;
         type Key = Unset;
+        type ContentType = Unset;
     }
     ///State transition - sets the `url` field to Set
     pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUrl<S> {}
     impl<S: State> State for SetUrl<S> {
         type Url = Set<members::url>;
-        type ContentType = S::ContentType;
-        type Key = S::Key;
-    }
-    ///State transition - sets the `content_type` field to Set
-    pub struct SetContentType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContentType<S> {}
-    impl<S: State> State for SetContentType<S> {
-        type Url = S::Url;
-        type ContentType = Set<members::content_type>;
         type Key = S::Key;
+        type ContentType = S::ContentType;
     }
     ///State transition - sets the `key` field to Set
     pub struct SetKey<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetKey<S> {}
     impl<S: State> State for SetKey<S> {
         type Url = S::Url;
-        type ContentType = S::ContentType;
         type Key = Set<members::key>;
+        type ContentType = S::ContentType;
+    }
+    ///State transition - sets the `content_type` field to Set
+    pub struct SetContentType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContentType<S> {}
+    impl<S: State> State for SetContentType<S> {
+        type Url = S::Url;
+        type Key = S::Key;
+        type ContentType = Set<members::content_type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `url` field
         pub struct url(());
-        ///Marker type for the `content_type` field
-        pub struct content_type(());
         ///Marker type for the `key` field
         pub struct key(());
+        ///Marker type for the `content_type` field
+        pub struct content_type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LaunchAssetBuilder<'a, S: launch_asset_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-        Option<UriValue<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LaunchAsset<'a> {
@@ -1484,9 +1484,9 @@ impl<'a> LaunchAssetBuilder<'a, launch_asset_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LaunchAssetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1501,11 +1501,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LaunchAssetBuilder<'a, launch_asset_state::SetContentType<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LaunchAssetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1520,11 +1520,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LaunchAssetBuilder<'a, launch_asset_state::SetKey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LaunchAssetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1539,11 +1539,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LaunchAssetBuilder<'a, launch_asset_state::SetUrl<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LaunchAssetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1552,15 +1552,15 @@ impl<'a, S> LaunchAssetBuilder<'a, S>
 where
     S: launch_asset_state::State,
     S::Url: launch_asset_state::IsSet,
-    S::ContentType: launch_asset_state::IsSet,
     S::Key: launch_asset_state::IsSet,
+    S::ContentType: launch_asset_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LaunchAsset<'a> {
         LaunchAsset {
-            content_type: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1.unwrap(),
-            url: self.__unsafe_private_named.2.unwrap(),
+            content_type: self._fields.0.unwrap(),
+            key: self._fields.1.unwrap(),
+            url: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1570,9 +1570,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> LaunchAsset<'a> {
         LaunchAsset {
-            content_type: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1.unwrap(),
-            url: self.__unsafe_private_named.2.unwrap(),
+            content_type: self._fields.0.unwrap(),
+            key: self._fields.1.unwrap(),
+            url: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1588,112 +1588,112 @@ pub mod manifest_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
+        type Id;
         type Metadata;
-        type Extra;
+        type CreatedAt;
         type RuntimeVersion;
-        type Id;
         type LaunchAsset;
+        type Extra;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
+        type Id = Unset;
         type Metadata = Unset;
-        type Extra = Unset;
+        type CreatedAt = Unset;
         type RuntimeVersion = Unset;
-        type Id = Unset;
         type LaunchAsset = Unset;
+        type Extra = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
+    ///State transition - sets the `id` field to Set
+    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetId<S> {}
+    impl<S: State> State for SetId<S> {
+        type Id = Set<members::id>;
         type Metadata = S::Metadata;
-        type Extra = S::Extra;
+        type CreatedAt = S::CreatedAt;
         type RuntimeVersion = S::RuntimeVersion;
-        type Id = S::Id;
         type LaunchAsset = S::LaunchAsset;
+        type Extra = S::Extra;
     }
     ///State transition - sets the `metadata` field to Set
     pub struct SetMetadata<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMetadata<S> {}
     impl<S: State> State for SetMetadata<S> {
-        type CreatedAt = S::CreatedAt;
+        type Id = S::Id;
         type Metadata = Set<members::metadata>;
-        type Extra = S::Extra;
+        type CreatedAt = S::CreatedAt;
         type RuntimeVersion = S::RuntimeVersion;
-        type Id = S::Id;
         type LaunchAsset = S::LaunchAsset;
+        type Extra = S::Extra;
     }
-    ///State transition - sets the `extra` field to Set
-    pub struct SetExtra<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetExtra<S> {}
-    impl<S: State> State for SetExtra<S> {
-        type CreatedAt = S::CreatedAt;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Id = S::Id;
         type Metadata = S::Metadata;
-        type Extra = Set<members::extra>;
+        type CreatedAt = Set<members::created_at>;
         type RuntimeVersion = S::RuntimeVersion;
-        type Id = S::Id;
         type LaunchAsset = S::LaunchAsset;
+        type Extra = S::Extra;
     }
     ///State transition - sets the `runtime_version` field to Set
     pub struct SetRuntimeVersion<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRuntimeVersion<S> {}
     impl<S: State> State for SetRuntimeVersion<S> {
-        type CreatedAt = S::CreatedAt;
+        type Id = S::Id;
         type Metadata = S::Metadata;
-        type Extra = S::Extra;
+        type CreatedAt = S::CreatedAt;
         type RuntimeVersion = Set<members::runtime_version>;
-        type Id = S::Id;
         type LaunchAsset = S::LaunchAsset;
-    }
-    ///State transition - sets the `id` field to Set
-    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetId<S> {}
-    impl<S: State> State for SetId<S> {
-        type CreatedAt = S::CreatedAt;
-        type Metadata = S::Metadata;
         type Extra = S::Extra;
-        type RuntimeVersion = S::RuntimeVersion;
-        type Id = Set<members::id>;
-        type LaunchAsset = S::LaunchAsset;
     }
     ///State transition - sets the `launch_asset` field to Set
     pub struct SetLaunchAsset<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLaunchAsset<S> {}
     impl<S: State> State for SetLaunchAsset<S> {
-        type CreatedAt = S::CreatedAt;
+        type Id = S::Id;
         type Metadata = S::Metadata;
-        type Extra = S::Extra;
+        type CreatedAt = S::CreatedAt;
         type RuntimeVersion = S::RuntimeVersion;
-        type Id = S::Id;
         type LaunchAsset = Set<members::launch_asset>;
+        type Extra = S::Extra;
+    }
+    ///State transition - sets the `extra` field to Set
+    pub struct SetExtra<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetExtra<S> {}
+    impl<S: State> State for SetExtra<S> {
+        type Id = S::Id;
+        type Metadata = S::Metadata;
+        type CreatedAt = S::CreatedAt;
+        type RuntimeVersion = S::RuntimeVersion;
+        type LaunchAsset = S::LaunchAsset;
+        type Extra = Set<members::extra>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
+        ///Marker type for the `id` field
+        pub struct id(());
         ///Marker type for the `metadata` field
         pub struct metadata(());
-        ///Marker type for the `extra` field
-        pub struct extra(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `runtime_version` field
         pub struct runtime_version(());
-        ///Marker type for the `id` field
-        pub struct id(());
         ///Marker type for the `launch_asset` field
         pub struct launch_asset(());
+        ///Marker type for the `extra` field
+        pub struct extra(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ManifestBuilder<'a, S: manifest_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<plugin::ManifestExtra<'a>>,
         Option<CowStr<'a>>,
@@ -1701,7 +1701,7 @@ pub struct ManifestBuilder<'a, S: manifest_state::State> {
         Option<Data<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Manifest<'a> {
@@ -1715,9 +1715,9 @@ impl<'a> ManifestBuilder<'a, manifest_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1732,11 +1732,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ManifestBuilder<'a, manifest_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1751,11 +1751,11 @@ where
         mut self,
         value: impl Into<plugin::ManifestExtra<'a>>,
     ) -> ManifestBuilder<'a, manifest_state::SetExtra<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1770,11 +1770,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ManifestBuilder<'a, manifest_state::SetId<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1789,11 +1789,11 @@ where
         mut self,
         value: impl Into<plugin::LaunchAsset<'a>>,
     ) -> ManifestBuilder<'a, manifest_state::SetLaunchAsset<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1808,11 +1808,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> ManifestBuilder<'a, manifest_state::SetMetadata<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1827,11 +1827,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ManifestBuilder<'a, manifest_state::SetRuntimeVersion<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1839,22 +1839,22 @@ where
 impl<'a, S> ManifestBuilder<'a, S>
 where
     S: manifest_state::State,
-    S::CreatedAt: manifest_state::IsSet,
+    S::Id: manifest_state::IsSet,
     S::Metadata: manifest_state::IsSet,
-    S::Extra: manifest_state::IsSet,
+    S::CreatedAt: manifest_state::IsSet,
     S::RuntimeVersion: manifest_state::IsSet,
-    S::Id: manifest_state::IsSet,
     S::LaunchAsset: manifest_state::IsSet,
+    S::Extra: manifest_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Manifest<'a> {
         Manifest {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            extra: self.__unsafe_private_named.1.unwrap(),
-            id: self.__unsafe_private_named.2.unwrap(),
-            launch_asset: self.__unsafe_private_named.3.unwrap(),
-            metadata: self.__unsafe_private_named.4.unwrap(),
-            runtime_version: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            extra: self._fields.1.unwrap(),
+            id: self._fields.2.unwrap(),
+            launch_asset: self._fields.3.unwrap(),
+            metadata: self._fields.4.unwrap(),
+            runtime_version: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1864,12 +1864,12 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Manifest<'a> {
         Manifest {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            extra: self.__unsafe_private_named.1.unwrap(),
-            id: self.__unsafe_private_named.2.unwrap(),
-            launch_asset: self.__unsafe_private_named.3.unwrap(),
-            metadata: self.__unsafe_private_named.4.unwrap(),
-            runtime_version: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            extra: self._fields.1.unwrap(),
+            id: self._fields.2.unwrap(),
+            launch_asset: self._fields.3.unwrap(),
+            metadata: self._fields.4.unwrap(),
+            runtime_version: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1921,9 +1921,9 @@ pub mod manifest_extra_state {
 
 /// Builder for constructing an instance of this type
 pub struct ManifestExtraBuilder<'a, S: manifest_extra_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<plugin::ExpoClient<'a>>, Option<plugin::ExpoGo<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<plugin::ExpoClient<'a>>, Option<plugin::ExpoGo<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ManifestExtra<'a> {
@@ -1937,9 +1937,9 @@ impl<'a> ManifestExtraBuilder<'a, manifest_extra_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ManifestExtraBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1954,11 +1954,11 @@ where
         mut self,
         value: impl Into<plugin::ExpoClient<'a>>,
     ) -> ManifestExtraBuilder<'a, manifest_extra_state::SetExpoClient<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ManifestExtraBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1973,11 +1973,11 @@ where
         mut self,
         value: impl Into<plugin::ExpoGo<'a>>,
     ) -> ManifestExtraBuilder<'a, manifest_extra_state::SetExpoGo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ManifestExtraBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1991,8 +1991,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ManifestExtra<'a> {
         ManifestExtra {
-            expo_client: self.__unsafe_private_named.0.unwrap(),
-            expo_go: self.__unsafe_private_named.1.unwrap(),
+            expo_client: self._fields.0.unwrap(),
+            expo_go: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2002,8 +2002,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ManifestExtra<'a> {
         ManifestExtra {
-            expo_client: self.__unsafe_private_named.0.unwrap(),
-            expo_go: self.__unsafe_private_named.1.unwrap(),
+            expo_client: self._fields.0.unwrap(),
+            expo_go: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_ocho/plugin/get_launch_asset.rs b/crates/jacquard-api/src/app_ocho/plugin/get_launch_asset.rs
index 9d8b54c0..09f67d0a 100644
--- a/crates/jacquard-api/src/app_ocho/plugin/get_launch_asset.rs
+++ b/crates/jacquard-api/src/app_ocho/plugin/get_launch_asset.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -114,9 +115,9 @@ pub mod get_launch_asset_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetLaunchAssetBuilder<'a, S: get_launch_asset_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetLaunchAsset<'a> {
@@ -130,9 +131,9 @@ impl<'a> GetLaunchAssetBuilder<'a, get_launch_asset_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetLaunchAssetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -147,11 +148,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetLaunchAssetBuilder<'a, get_launch_asset_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetLaunchAssetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -166,11 +167,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetLaunchAssetBuilder<'a, get_launch_asset_state::SetPlatform<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetLaunchAssetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -184,8 +185,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetLaunchAsset<'a> {
         GetLaunchAsset {
-            did: self.__unsafe_private_named.0.unwrap(),
-            platform: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            platform: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_ocho/plugin/get_manifest.rs b/crates/jacquard-api/src/app_ocho/plugin/get_manifest.rs
index 5655fc8b..37d68ef5 100644
--- a/crates/jacquard-api/src/app_ocho/plugin/get_manifest.rs
+++ b/crates/jacquard-api/src/app_ocho/plugin/get_manifest.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -101,9 +102,9 @@ pub mod get_manifest_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetManifestBuilder<'a, S: get_manifest_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetManifest<'a> {
@@ -117,9 +118,9 @@ impl<'a> GetManifestBuilder<'a, get_manifest_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -134,11 +135,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetManifestBuilder<'a, get_manifest_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -153,11 +154,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetManifestBuilder<'a, get_manifest_state::SetPlatform<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -171,8 +172,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetManifest<'a> {
         GetManifest {
-            did: self.__unsafe_private_named.0.unwrap(),
-            platform: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            platform: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_ocho/plugin/put_hosting_url.rs b/crates/jacquard-api/src/app_ocho/plugin/put_hosting_url.rs
index f644d1f0..1d123d36 100644
--- a/crates/jacquard-api/src/app_ocho/plugin/put_hosting_url.rs
+++ b/crates/jacquard-api/src/app_ocho/plugin/put_hosting_url.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_ocho/plugin/service.rs b/crates/jacquard-api/src/app_ocho/plugin/service.rs
index 9da68baa..666a736f 100644
--- a/crates/jacquard-api/src/app_ocho/plugin/service.rs
+++ b/crates/jacquard-api/src/app_ocho/plugin/service.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -136,9 +139,9 @@ pub mod service_state {
 
 /// Builder for constructing an instance of this type
 pub struct ServiceBuilder<'a, S: service_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Db<'a>>, Option<Vec<CowStr<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Db<'a>>, Option<Vec<CowStr<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Service<'a> {
@@ -152,9 +155,9 @@ impl<'a> ServiceBuilder<'a, service_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ServiceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -162,12 +165,12 @@ impl<'a> ServiceBuilder<'a, service_state::Empty> {
 impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
     /// Set the `db` field (optional)
     pub fn db(mut self, value: impl Into<Option<Db<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `db` field to an Option value (optional)
     pub fn maybe_db(mut self, value: Option<Db<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -182,11 +185,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> ServiceBuilder<'a, service_state::SetPermissions<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ServiceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -199,8 +202,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Service<'a> {
         Service {
-            db: self.__unsafe_private_named.0,
-            permissions: self.__unsafe_private_named.1.unwrap(),
+            db: self._fields.0,
+            permissions: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -213,8 +216,8 @@ where
         >,
     ) -> Service<'a> {
         Service {
-            db: self.__unsafe_private_named.0,
-            permissions: self.__unsafe_private_named.1.unwrap(),
+            db: self._fields.0,
+            permissions: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_ocho/push/register.rs b/crates/jacquard-api/src/app_ocho/push/register.rs
index 92737090..58283efb 100644
--- a/crates/jacquard-api/src/app_ocho/push/register.rs
+++ b/crates/jacquard-api/src/app_ocho/push/register.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_ocho/server/get_launch_token.rs b/crates/jacquard-api/src/app_ocho/server/get_launch_token.rs
index 98e94e60..264adc84 100644
--- a/crates/jacquard-api/src/app_ocho/server/get_launch_token.rs
+++ b/crates/jacquard-api/src/app_ocho/server/get_launch_token.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -86,9 +89,9 @@ pub mod get_launch_token_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetLaunchTokenBuilder<'a, S: get_launch_token_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetLaunchToken<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetLaunchTokenBuilder<'a, get_launch_token_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetLaunchTokenBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetLaunchTokenBuilder<'a, get_launch_token_state::SetAud<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetLaunchTokenBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetLaunchToken<'a> {
         GetLaunchToken {
-            aud: self.__unsafe_private_named.0.unwrap(),
+            aud: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_ocho/server/get_token.rs b/crates/jacquard-api/src/app_ocho/server/get_token.rs
index 2549cf69..6950ab8e 100644
--- a/crates/jacquard-api/src/app_ocho/server/get_token.rs
+++ b/crates/jacquard-api/src/app_ocho/server/get_token.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -86,9 +89,9 @@ pub mod get_token_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTokenBuilder<'a, S: get_token_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetToken<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetTokenBuilder<'a, get_token_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTokenBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetTokenBuilder<'a, get_token_state::SetAud<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetTokenBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetToken<'a> {
         GetToken {
-            aud: self.__unsafe_private_named.0.unwrap(),
+            aud: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_ocho/server/swap_launch_token.rs b/crates/jacquard-api/src/app_ocho/server/swap_launch_token.rs
index 25d421b6..7e82b42c 100644
--- a/crates/jacquard-api/src/app_ocho/server/swap_launch_token.rs
+++ b/crates/jacquard-api/src/app_ocho/server/swap_launch_token.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -96,9 +99,9 @@ pub mod swap_launch_token_state {
 
 /// Builder for constructing an instance of this type
 pub struct SwapLaunchTokenBuilder<'a, S: swap_launch_token_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SwapLaunchToken<'a> {
@@ -112,9 +115,9 @@ impl<'a> SwapLaunchTokenBuilder<'a, swap_launch_token_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SwapLaunchTokenBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -129,11 +132,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SwapLaunchTokenBuilder<'a, swap_launch_token_state::SetLaunchToken<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SwapLaunchTokenBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -146,7 +149,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SwapLaunchToken<'a> {
         SwapLaunchToken {
-            launch_token: self.__unsafe_private_named.0.unwrap(),
+            launch_token: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_ocho/state/get_config.rs b/crates/jacquard-api/src/app_ocho/state/get_config.rs
index 128f4ad5..fcf17482 100644
--- a/crates/jacquard-api/src/app_ocho/state/get_config.rs
+++ b/crates/jacquard-api/src/app_ocho/state/get_config.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/app_ocho/state/login.rs b/crates/jacquard-api/src/app_ocho/state/login.rs
index 381970ba..b8c5c447 100644
--- a/crates/jacquard-api/src/app_ocho/state/login.rs
+++ b/crates/jacquard-api/src/app_ocho/state/login.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_offprint/block/blockquote.rs b/crates/jacquard-api/src/app_offprint/block/blockquote.rs
index 1556d948..64966b42 100644
--- a/crates/jacquard-api/src/app_offprint/block/blockquote.rs
+++ b/crates/jacquard-api/src/app_offprint/block/blockquote.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -90,9 +93,9 @@ pub mod blockquote_state {
 
 /// Builder for constructing an instance of this type
 pub struct BlockquoteBuilder<'a, S: blockquote_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<BlockquoteContentItem<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<BlockquoteContentItem<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Blockquote<'a> {
@@ -106,9 +109,9 @@ impl<'a> BlockquoteBuilder<'a, blockquote_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlockquoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -123,11 +126,11 @@ where
         mut self,
         value: impl Into<Vec<BlockquoteContentItem<'a>>>,
     ) -> BlockquoteBuilder<'a, blockquote_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlockquoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -140,7 +143,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Blockquote<'a> {
         Blockquote {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -153,7 +156,7 @@ where
         >,
     ) -> Blockquote<'a> {
         Blockquote {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_offprint/block/bullet_list.rs b/crates/jacquard-api/src/app_offprint/block/bullet_list.rs
index 0361c836..7570f4e2 100644
--- a/crates/jacquard-api/src/app_offprint/block/bullet_list.rs
+++ b/crates/jacquard-api/src/app_offprint/block/bullet_list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -107,9 +110,9 @@ pub mod list_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListItemBuilder<'a, S: list_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<bullet_list::ListItem<'a>>>, Option<Text<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<bullet_list::ListItem<'a>>>, Option<Text<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListItem<'a> {
@@ -123,9 +126,9 @@ impl<'a> ListItemBuilder<'a, list_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ impl<'a, S: list_item_state::State> ListItemBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<bullet_list::ListItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `children` field to an Option value (optional)
@@ -144,7 +147,7 @@ impl<'a, S: list_item_state::State> ListItemBuilder<'a, S> {
         mut self,
         value: Option<Vec<bullet_list::ListItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -159,11 +162,11 @@ where
         mut self,
         value: impl Into<Text<'a>>,
     ) -> ListItemBuilder<'a, list_item_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -176,8 +179,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ListItem<'a> {
         ListItem {
-            children: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
+            children: self._fields.0,
+            content: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -190,8 +193,8 @@ where
         >,
     ) -> ListItem<'a> {
         ListItem {
-            children: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
+            children: self._fields.0,
+            content: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -300,9 +303,9 @@ pub mod bullet_list_state {
 
 /// Builder for constructing an instance of this type
 pub struct BulletListBuilder<'a, S: bullet_list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<bullet_list::ListItem<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<bullet_list::ListItem<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BulletList<'a> {
@@ -316,9 +319,9 @@ impl<'a> BulletListBuilder<'a, bullet_list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BulletListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -333,11 +336,11 @@ where
         mut self,
         value: impl Into<Vec<bullet_list::ListItem<'a>>>,
     ) -> BulletListBuilder<'a, bullet_list_state::SetChildren<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BulletListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -350,7 +353,7 @@ where
     /// Build the final struct
     pub fn build(self) -> BulletList<'a> {
         BulletList {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -363,7 +366,7 @@ where
         >,
     ) -> BulletList<'a> {
         BulletList {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_offprint/block/heading.rs b/crates/jacquard-api/src/app_offprint/block/heading.rs
index 33a6e9a4..82ec3d00 100644
--- a/crates/jacquard-api/src/app_offprint/block/heading.rs
+++ b/crates/jacquard-api/src/app_offprint/block/heading.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -84,50 +87,50 @@ pub mod heading_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Plaintext;
         type Level;
+        type Plaintext;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Plaintext = Unset;
         type Level = Unset;
-    }
-    ///State transition - sets the `plaintext` field to Set
-    pub struct SetPlaintext<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPlaintext<S> {}
-    impl<S: State> State for SetPlaintext<S> {
-        type Plaintext = Set<members::plaintext>;
-        type Level = S::Level;
+        type Plaintext = Unset;
     }
     ///State transition - sets the `level` field to Set
     pub struct SetLevel<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLevel<S> {}
     impl<S: State> State for SetLevel<S> {
-        type Plaintext = S::Plaintext;
         type Level = Set<members::level>;
+        type Plaintext = S::Plaintext;
+    }
+    ///State transition - sets the `plaintext` field to Set
+    pub struct SetPlaintext<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPlaintext<S> {}
+    impl<S: State> State for SetPlaintext<S> {
+        type Level = S::Level;
+        type Plaintext = Set<members::plaintext>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `plaintext` field
-        pub struct plaintext(());
         ///Marker type for the `level` field
         pub struct level(());
+        ///Marker type for the `plaintext` field
+        pub struct plaintext(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct HeadingBuilder<'a, S: heading_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<Data<'a>>>,
         Option<i64>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Heading<'a> {
@@ -141,9 +144,9 @@ impl<'a> HeadingBuilder<'a, heading_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HeadingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -151,12 +154,12 @@ impl<'a> HeadingBuilder<'a, heading_state::Empty> {
 impl<'a, S: heading_state::State> HeadingBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Data<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -171,11 +174,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> HeadingBuilder<'a, heading_state::SetLevel<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         HeadingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -190,11 +193,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> HeadingBuilder<'a, heading_state::SetPlaintext<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         HeadingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -202,12 +205,12 @@ where
 impl<'a, S: heading_state::State> HeadingBuilder<'a, S> {
     /// Set the `textAlign` field (optional)
     pub fn text_align(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `textAlign` field to an Option value (optional)
     pub fn maybe_text_align(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -215,16 +218,16 @@ impl<'a, S: heading_state::State> HeadingBuilder<'a, S> {
 impl<'a, S> HeadingBuilder<'a, S>
 where
     S: heading_state::State,
-    S::Plaintext: heading_state::IsSet,
     S::Level: heading_state::IsSet,
+    S::Plaintext: heading_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Heading<'a> {
         Heading {
-            facets: self.__unsafe_private_named.0,
-            level: self.__unsafe_private_named.1.unwrap(),
-            plaintext: self.__unsafe_private_named.2.unwrap(),
-            text_align: self.__unsafe_private_named.3,
+            facets: self._fields.0,
+            level: self._fields.1.unwrap(),
+            plaintext: self._fields.2.unwrap(),
+            text_align: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -234,10 +237,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Heading<'a> {
         Heading {
-            facets: self.__unsafe_private_named.0,
-            level: self.__unsafe_private_named.1.unwrap(),
-            plaintext: self.__unsafe_private_named.2.unwrap(),
-            text_align: self.__unsafe_private_named.3,
+            facets: self._fields.0,
+            level: self._fields.1.unwrap(),
+            plaintext: self._fields.2.unwrap(),
+            text_align: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_offprint/block/image.rs b/crates/jacquard-api/src/app_offprint/block/image.rs
index 34866d88..b86490f7 100644
--- a/crates/jacquard-api/src/app_offprint/block/image.rs
+++ b/crates/jacquard-api/src/app_offprint/block/image.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -174,45 +177,45 @@ pub mod aspect_ratio_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Height;
         type Width;
+        type Height;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Height = Unset;
         type Width = Unset;
-    }
-    ///State transition - sets the `height` field to Set
-    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHeight<S> {}
-    impl<S: State> State for SetHeight<S> {
-        type Height = Set<members::height>;
-        type Width = S::Width;
+        type Height = Unset;
     }
     ///State transition - sets the `width` field to Set
     pub struct SetWidth<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWidth<S> {}
     impl<S: State> State for SetWidth<S> {
-        type Height = S::Height;
         type Width = Set<members::width>;
+        type Height = S::Height;
+    }
+    ///State transition - sets the `height` field to Set
+    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHeight<S> {}
+    impl<S: State> State for SetHeight<S> {
+        type Width = S::Width;
+        type Height = Set<members::height>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `height` field
-        pub struct height(());
         ///Marker type for the `width` field
         pub struct width(());
+        ///Marker type for the `height` field
+        pub struct height(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AspectRatioBuilder<'a, S: aspect_ratio_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AspectRatio<'a> {
@@ -226,9 +229,9 @@ impl<'a> AspectRatioBuilder<'a, aspect_ratio_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -243,11 +246,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -262,11 +265,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetWidth<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -274,14 +277,14 @@ where
 impl<'a, S> AspectRatioBuilder<'a, S>
 where
     S: aspect_ratio_state::State,
-    S::Height: aspect_ratio_state::IsSet,
     S::Width: aspect_ratio_state::IsSet,
+    S::Height: aspect_ratio_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -291,8 +294,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_offprint/block/image_carousel.rs b/crates/jacquard-api/src/app_offprint/block/image_carousel.rs
index 237650aa..54b6a0d6 100644
--- a/crates/jacquard-api/src/app_offprint/block/image_carousel.rs
+++ b/crates/jacquard-api/src/app_offprint/block/image_carousel.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -120,14 +123,9 @@ pub mod image_carousel_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImageCarouselBuilder<'a, S: image_carousel_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<bool>,
-        Option<CowStr<'a>>,
-        Option<Vec<GridImage<'a>>>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<CowStr<'a>>, Option<Vec<GridImage<'a>>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ImageCarousel<'a> {
@@ -141,9 +139,9 @@ impl<'a> ImageCarouselBuilder<'a, image_carousel_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageCarouselBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -151,12 +149,12 @@ impl<'a> ImageCarouselBuilder<'a, image_carousel_state::Empty> {
 impl<'a, S: image_carousel_state::State> ImageCarouselBuilder<'a, S> {
     /// Set the `autoplay` field (optional)
     pub fn autoplay(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `autoplay` field to an Option value (optional)
     pub fn maybe_autoplay(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -164,12 +162,12 @@ impl<'a, S: image_carousel_state::State> ImageCarouselBuilder<'a, S> {
 impl<'a, S: image_carousel_state::State> ImageCarouselBuilder<'a, S> {
     /// Set the `caption` field (optional)
     pub fn caption(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `caption` field to an Option value (optional)
     pub fn maybe_caption(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -184,11 +182,11 @@ where
         mut self,
         value: impl Into<Vec<GridImage<'a>>>,
     ) -> ImageCarouselBuilder<'a, image_carousel_state::SetImages<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ImageCarouselBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,12 +194,12 @@ where
 impl<'a, S: image_carousel_state::State> ImageCarouselBuilder<'a, S> {
     /// Set the `interval` field (optional)
     pub fn interval(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `interval` field to an Option value (optional)
     pub fn maybe_interval(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -214,10 +212,10 @@ where
     /// Build the final struct
     pub fn build(self) -> ImageCarousel<'a> {
         ImageCarousel {
-            autoplay: self.__unsafe_private_named.0.or_else(|| Some(false)),
-            caption: self.__unsafe_private_named.1,
-            images: self.__unsafe_private_named.2.unwrap(),
-            interval: self.__unsafe_private_named.3.or_else(|| Some(3000i64)),
+            autoplay: self._fields.0.or_else(|| Some(false)),
+            caption: self._fields.1,
+            images: self._fields.2.unwrap(),
+            interval: self._fields.3.or_else(|| Some(3000i64)),
             extra_data: Default::default(),
         }
     }
@@ -230,10 +228,10 @@ where
         >,
     ) -> ImageCarousel<'a> {
         ImageCarousel {
-            autoplay: self.__unsafe_private_named.0.or_else(|| Some(false)),
-            caption: self.__unsafe_private_named.1,
-            images: self.__unsafe_private_named.2.unwrap(),
-            interval: self.__unsafe_private_named.3.or_else(|| Some(3000i64)),
+            autoplay: self._fields.0.or_else(|| Some(false)),
+            caption: self._fields.1,
+            images: self._fields.2.unwrap(),
+            interval: self._fields.3.or_else(|| Some(3000i64)),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_offprint/block/image_diff.rs b/crates/jacquard-api/src/app_offprint/block/image_diff.rs
index 3ba88e42..3b7249b3 100644
--- a/crates/jacquard-api/src/app_offprint/block/image_diff.rs
+++ b/crates/jacquard-api/src/app_offprint/block/image_diff.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -136,15 +139,15 @@ pub mod image_diff_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImageDiffBuilder<'a, S: image_diff_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Vec<GridImage<'a>>>,
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ImageDiff<'a> {
@@ -158,9 +161,9 @@ impl<'a> ImageDiffBuilder<'a, image_diff_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageDiffBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -168,12 +171,12 @@ impl<'a> ImageDiffBuilder<'a, image_diff_state::Empty> {
 impl<'a, S: image_diff_state::State> ImageDiffBuilder<'a, S> {
     /// Set the `alignment` field (optional)
     pub fn alignment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alignment` field to an Option value (optional)
     pub fn maybe_alignment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -181,12 +184,12 @@ impl<'a, S: image_diff_state::State> ImageDiffBuilder<'a, S> {
 impl<'a, S: image_diff_state::State> ImageDiffBuilder<'a, S> {
     /// Set the `caption` field (optional)
     pub fn caption(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `caption` field to an Option value (optional)
     pub fn maybe_caption(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -201,11 +204,11 @@ where
         mut self,
         value: impl Into<Vec<GridImage<'a>>>,
     ) -> ImageDiffBuilder<'a, image_diff_state::SetImages<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ImageDiffBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,12 +216,12 @@ where
 impl<'a, S: image_diff_state::State> ImageDiffBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -226,12 +229,12 @@ impl<'a, S: image_diff_state::State> ImageDiffBuilder<'a, S> {
 impl<'a, S: image_diff_state::State> ImageDiffBuilder<'a, S> {
     /// Set the `width` field (optional)
     pub fn width(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `width` field to an Option value (optional)
     pub fn maybe_width(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -244,11 +247,11 @@ where
     /// Build the final struct
     pub fn build(self) -> ImageDiff<'a> {
         ImageDiff {
-            alignment: self.__unsafe_private_named.0,
-            caption: self.__unsafe_private_named.1,
-            images: self.__unsafe_private_named.2.unwrap(),
-            labels: self.__unsafe_private_named.3,
-            width: self.__unsafe_private_named.4,
+            alignment: self._fields.0,
+            caption: self._fields.1,
+            images: self._fields.2.unwrap(),
+            labels: self._fields.3,
+            width: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -261,11 +264,11 @@ where
         >,
     ) -> ImageDiff<'a> {
         ImageDiff {
-            alignment: self.__unsafe_private_named.0,
-            caption: self.__unsafe_private_named.1,
-            images: self.__unsafe_private_named.2.unwrap(),
-            labels: self.__unsafe_private_named.3,
-            width: self.__unsafe_private_named.4,
+            alignment: self._fields.0,
+            caption: self._fields.1,
+            images: self._fields.2.unwrap(),
+            labels: self._fields.3,
+            width: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_offprint/block/image_grid.rs b/crates/jacquard-api/src/app_offprint/block/image_grid.rs
index 512910e8..d9f28ff4 100644
--- a/crates/jacquard-api/src/app_offprint/block/image_grid.rs
+++ b/crates/jacquard-api/src/app_offprint/block/image_grid.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -308,14 +311,14 @@ pub mod image_grid_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImageGridBuilder<'a, S: image_grid_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<Vec<image_grid::GridImage<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ImageGrid<'a> {
@@ -329,9 +332,9 @@ impl<'a> ImageGridBuilder<'a, image_grid_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageGridBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -339,12 +342,12 @@ impl<'a> ImageGridBuilder<'a, image_grid_state::Empty> {
 impl<'a, S: image_grid_state::State> ImageGridBuilder<'a, S> {
     /// Set the `aspectRatio` field (optional)
     pub fn aspect_ratio(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
     pub fn maybe_aspect_ratio(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -352,12 +355,12 @@ impl<'a, S: image_grid_state::State> ImageGridBuilder<'a, S> {
 impl<'a, S: image_grid_state::State> ImageGridBuilder<'a, S> {
     /// Set the `caption` field (optional)
     pub fn caption(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `caption` field to an Option value (optional)
     pub fn maybe_caption(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -365,12 +368,12 @@ impl<'a, S: image_grid_state::State> ImageGridBuilder<'a, S> {
 impl<'a, S: image_grid_state::State> ImageGridBuilder<'a, S> {
     /// Set the `gridRows` field (optional)
     pub fn grid_rows(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `gridRows` field to an Option value (optional)
     pub fn maybe_grid_rows(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -385,11 +388,11 @@ where
         mut self,
         value: impl Into<Vec<image_grid::GridImage<'a>>>,
     ) -> ImageGridBuilder<'a, image_grid_state::SetImages<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ImageGridBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -402,10 +405,10 @@ where
     /// Build the final struct
     pub fn build(self) -> ImageGrid<'a> {
         ImageGrid {
-            aspect_ratio: self.__unsafe_private_named.0,
-            caption: self.__unsafe_private_named.1,
-            grid_rows: self.__unsafe_private_named.2,
-            images: self.__unsafe_private_named.3.unwrap(),
+            aspect_ratio: self._fields.0,
+            caption: self._fields.1,
+            grid_rows: self._fields.2,
+            images: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -418,10 +421,10 @@ where
         >,
     ) -> ImageGrid<'a> {
         ImageGrid {
-            aspect_ratio: self.__unsafe_private_named.0,
-            caption: self.__unsafe_private_named.1,
-            grid_rows: self.__unsafe_private_named.2,
-            images: self.__unsafe_private_named.3.unwrap(),
+            aspect_ratio: self._fields.0,
+            caption: self._fields.1,
+            grid_rows: self._fields.2,
+            images: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_offprint/block/ordered_list.rs b/crates/jacquard-api/src/app_offprint/block/ordered_list.rs
index 024097a2..f3d4d386 100644
--- a/crates/jacquard-api/src/app_offprint/block/ordered_list.rs
+++ b/crates/jacquard-api/src/app_offprint/block/ordered_list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -111,9 +114,9 @@ pub mod list_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListItemBuilder<'a, S: list_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<ordered_list::ListItem<'a>>>, Option<Text<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<ordered_list::ListItem<'a>>>, Option<Text<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListItem<'a> {
@@ -127,9 +130,9 @@ impl<'a> ListItemBuilder<'a, list_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -140,7 +143,7 @@ impl<'a, S: list_item_state::State> ListItemBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<ordered_list::ListItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `children` field to an Option value (optional)
@@ -148,7 +151,7 @@ impl<'a, S: list_item_state::State> ListItemBuilder<'a, S> {
         mut self,
         value: Option<Vec<ordered_list::ListItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -163,11 +166,11 @@ where
         mut self,
         value: impl Into<Text<'a>>,
     ) -> ListItemBuilder<'a, list_item_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,8 +183,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ListItem<'a> {
         ListItem {
-            children: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
+            children: self._fields.0,
+            content: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -194,8 +197,8 @@ where
         >,
     ) -> ListItem<'a> {
         ListItem {
-            children: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
+            children: self._fields.0,
+            content: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -314,9 +317,9 @@ pub mod ordered_list_state {
 
 /// Builder for constructing an instance of this type
 pub struct OrderedListBuilder<'a, S: ordered_list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<ordered_list::ListItem<'a>>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<ordered_list::ListItem<'a>>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> OrderedList<'a> {
@@ -330,9 +333,9 @@ impl<'a> OrderedListBuilder<'a, ordered_list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OrderedListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -347,11 +350,11 @@ where
         mut self,
         value: impl Into<Vec<ordered_list::ListItem<'a>>>,
     ) -> OrderedListBuilder<'a, ordered_list_state::SetChildren<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         OrderedListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -359,12 +362,12 @@ where
 impl<'a, S: ordered_list_state::State> OrderedListBuilder<'a, S> {
     /// Set the `start` field (optional)
     pub fn start(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `start` field to an Option value (optional)
     pub fn maybe_start(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -377,8 +380,8 @@ where
     /// Build the final struct
     pub fn build(self) -> OrderedList<'a> {
         OrderedList {
-            children: self.__unsafe_private_named.0.unwrap(),
-            start: self.__unsafe_private_named.1.or_else(|| Some(1i64)),
+            children: self._fields.0.unwrap(),
+            start: self._fields.1.or_else(|| Some(1i64)),
             extra_data: Default::default(),
         }
     }
@@ -391,8 +394,8 @@ where
         >,
     ) -> OrderedList<'a> {
         OrderedList {
-            children: self.__unsafe_private_named.0.unwrap(),
-            start: self.__unsafe_private_named.1.or_else(|| Some(1i64)),
+            children: self._fields.0.unwrap(),
+            start: self._fields.1.or_else(|| Some(1i64)),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_offprint/block/task_list.rs b/crates/jacquard-api/src/app_offprint/block/task_list.rs
index 98ef5d20..e65d7eb2 100644
--- a/crates/jacquard-api/src/app_offprint/block/task_list.rs
+++ b/crates/jacquard-api/src/app_offprint/block/task_list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -109,9 +112,9 @@ pub mod task_list_state {
 
 /// Builder for constructing an instance of this type
 pub struct TaskListBuilder<'a, S: task_list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<task_list::TaskItem<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<task_list::TaskItem<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TaskList<'a> {
@@ -125,9 +128,9 @@ impl<'a> TaskListBuilder<'a, task_list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TaskListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,11 +145,11 @@ where
         mut self,
         value: impl Into<Vec<task_list::TaskItem<'a>>>,
     ) -> TaskListBuilder<'a, task_list_state::SetChildren<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TaskListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -159,7 +162,7 @@ where
     /// Build the final struct
     pub fn build(self) -> TaskList<'a> {
         TaskList {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -172,7 +175,7 @@ where
         >,
     ) -> TaskList<'a> {
         TaskList {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -268,49 +271,45 @@ pub mod task_item_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Content;
         type Checked;
+        type Content;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Content = Unset;
         type Checked = Unset;
-    }
-    ///State transition - sets the `content` field to Set
-    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContent<S> {}
-    impl<S: State> State for SetContent<S> {
-        type Content = Set<members::content>;
-        type Checked = S::Checked;
+        type Content = Unset;
     }
     ///State transition - sets the `checked` field to Set
     pub struct SetChecked<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetChecked<S> {}
     impl<S: State> State for SetChecked<S> {
-        type Content = S::Content;
         type Checked = Set<members::checked>;
+        type Content = S::Content;
+    }
+    ///State transition - sets the `content` field to Set
+    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContent<S> {}
+    impl<S: State> State for SetContent<S> {
+        type Checked = S::Checked;
+        type Content = Set<members::content>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `content` field
-        pub struct content(());
         ///Marker type for the `checked` field
         pub struct checked(());
+        ///Marker type for the `content` field
+        pub struct content(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TaskItemBuilder<'a, S: task_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<bool>,
-        Option<Vec<task_list::TaskItem<'a>>>,
-        Option<Text<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<Vec<task_list::TaskItem<'a>>>, Option<Text<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TaskItem<'a> {
@@ -324,9 +323,9 @@ impl<'a> TaskItemBuilder<'a, task_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TaskItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -341,11 +340,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> TaskItemBuilder<'a, task_item_state::SetChecked<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TaskItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -356,7 +355,7 @@ impl<'a, S: task_item_state::State> TaskItemBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<task_list::TaskItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `children` field to an Option value (optional)
@@ -364,7 +363,7 @@ impl<'a, S: task_item_state::State> TaskItemBuilder<'a, S> {
         mut self,
         value: Option<Vec<task_list::TaskItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -379,11 +378,11 @@ where
         mut self,
         value: impl Into<Text<'a>>,
     ) -> TaskItemBuilder<'a, task_item_state::SetContent<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TaskItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -391,15 +390,15 @@ where
 impl<'a, S> TaskItemBuilder<'a, S>
 where
     S: task_item_state::State,
-    S::Content: task_item_state::IsSet,
     S::Checked: task_item_state::IsSet,
+    S::Content: task_item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TaskItem<'a> {
         TaskItem {
-            checked: self.__unsafe_private_named.0.unwrap(),
-            children: self.__unsafe_private_named.1,
-            content: self.__unsafe_private_named.2.unwrap(),
+            checked: self._fields.0.unwrap(),
+            children: self._fields.1,
+            content: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -412,9 +411,9 @@ where
         >,
     ) -> TaskItem<'a> {
         TaskItem {
-            checked: self.__unsafe_private_named.0.unwrap(),
-            children: self.__unsafe_private_named.1,
-            content: self.__unsafe_private_named.2.unwrap(),
+            checked: self._fields.0.unwrap(),
+            children: self._fields.1,
+            content: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_offprint/block/web_bookmark.rs b/crates/jacquard-api/src/app_offprint/block/web_bookmark.rs
index 105bcc7b..c400ed8d 100644
--- a/crates/jacquard-api/src/app_offprint/block/web_bookmark.rs
+++ b/crates/jacquard-api/src/app_offprint/block/web_bookmark.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -181,15 +184,15 @@ pub mod web_bookmark_state {
 
 /// Builder for constructing an instance of this type
 pub struct WebBookmarkBuilder<'a, S: web_bookmark_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> WebBookmark<'a> {
@@ -203,9 +206,9 @@ impl<'a> WebBookmarkBuilder<'a, web_bookmark_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WebBookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,12 +216,12 @@ impl<'a> WebBookmarkBuilder<'a, web_bookmark_state::Empty> {
 impl<'a, S: web_bookmark_state::State> WebBookmarkBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -233,11 +236,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> WebBookmarkBuilder<'a, web_bookmark_state::SetHref<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         WebBookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -245,12 +248,12 @@ where
 impl<'a, S: web_bookmark_state::State> WebBookmarkBuilder<'a, S> {
     /// Set the `preview` field (optional)
     pub fn preview(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `preview` field to an Option value (optional)
     pub fn maybe_preview(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -258,12 +261,12 @@ impl<'a, S: web_bookmark_state::State> WebBookmarkBuilder<'a, S> {
 impl<'a, S: web_bookmark_state::State> WebBookmarkBuilder<'a, S> {
     /// Set the `siteName` field (optional)
     pub fn site_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `siteName` field to an Option value (optional)
     pub fn maybe_site_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -278,11 +281,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WebBookmarkBuilder<'a, web_bookmark_state::SetTitle<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         WebBookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -296,11 +299,11 @@ where
     /// Build the final struct
     pub fn build(self) -> WebBookmark<'a> {
         WebBookmark {
-            description: self.__unsafe_private_named.0,
-            href: self.__unsafe_private_named.1.unwrap(),
-            preview: self.__unsafe_private_named.2,
-            site_name: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4.unwrap(),
+            description: self._fields.0,
+            href: self._fields.1.unwrap(),
+            preview: self._fields.2,
+            site_name: self._fields.3,
+            title: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -313,11 +316,11 @@ where
         >,
     ) -> WebBookmark<'a> {
         WebBookmark {
-            description: self.__unsafe_private_named.0,
-            href: self.__unsafe_private_named.1.unwrap(),
-            preview: self.__unsafe_private_named.2,
-            site_name: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4.unwrap(),
+            description: self._fields.0,
+            href: self._fields.1.unwrap(),
+            preview: self._fields.2,
+            site_name: self._fields.3,
+            title: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_offprint/block/web_embed.rs b/crates/jacquard-api/src/app_offprint/block/web_embed.rs
index 39d61be6..87291ac8 100644
--- a/crates/jacquard-api/src/app_offprint/block/web_embed.rs
+++ b/crates/jacquard-api/src/app_offprint/block/web_embed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -205,8 +208,8 @@ pub mod web_embed_state {
 
 /// Builder for constructing an instance of this type
 pub struct WebEmbedBuilder<'a, S: web_embed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
@@ -218,7 +221,7 @@ pub struct WebEmbedBuilder<'a, S: web_embed_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> WebEmbed<'a> {
@@ -232,20 +235,9 @@ impl<'a> WebEmbedBuilder<'a, web_embed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WebEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,12 +245,12 @@ impl<'a> WebEmbedBuilder<'a, web_embed_state::Empty> {
 impl<'a, S: web_embed_state::State> WebEmbedBuilder<'a, S> {
     /// Set the `alignment` field (optional)
     pub fn alignment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alignment` field to an Option value (optional)
     pub fn maybe_alignment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -266,12 +258,12 @@ impl<'a, S: web_embed_state::State> WebEmbedBuilder<'a, S> {
 impl<'a, S: web_embed_state::State> WebEmbedBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -279,12 +271,12 @@ impl<'a, S: web_embed_state::State> WebEmbedBuilder<'a, S> {
 impl<'a, S: web_embed_state::State> WebEmbedBuilder<'a, S> {
     /// Set the `embedHeight` field (optional)
     pub fn embed_height(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `embedHeight` field to an Option value (optional)
     pub fn maybe_embed_height(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -292,12 +284,12 @@ impl<'a, S: web_embed_state::State> WebEmbedBuilder<'a, S> {
 impl<'a, S: web_embed_state::State> WebEmbedBuilder<'a, S> {
     /// Set the `embedUrl` field (optional)
     pub fn embed_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `embedUrl` field to an Option value (optional)
     pub fn maybe_embed_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -305,12 +297,12 @@ impl<'a, S: web_embed_state::State> WebEmbedBuilder<'a, S> {
 impl<'a, S: web_embed_state::State> WebEmbedBuilder<'a, S> {
     /// Set the `embedWidth` field (optional)
     pub fn embed_width(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `embedWidth` field to an Option value (optional)
     pub fn maybe_embed_width(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -325,11 +317,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> WebEmbedBuilder<'a, web_embed_state::SetHref<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         WebEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -337,12 +329,12 @@ where
 impl<'a, S: web_embed_state::State> WebEmbedBuilder<'a, S> {
     /// Set the `preview` field (optional)
     pub fn preview(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `preview` field to an Option value (optional)
     pub fn maybe_preview(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -350,12 +342,12 @@ impl<'a, S: web_embed_state::State> WebEmbedBuilder<'a, S> {
 impl<'a, S: web_embed_state::State> WebEmbedBuilder<'a, S> {
     /// Set the `siteName` field (optional)
     pub fn site_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `siteName` field to an Option value (optional)
     pub fn maybe_site_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -363,12 +355,12 @@ impl<'a, S: web_embed_state::State> WebEmbedBuilder<'a, S> {
 impl<'a, S: web_embed_state::State> WebEmbedBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -376,12 +368,12 @@ impl<'a, S: web_embed_state::State> WebEmbedBuilder<'a, S> {
 impl<'a, S: web_embed_state::State> WebEmbedBuilder<'a, S> {
     /// Set the `width` field (optional)
     pub fn width(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `width` field to an Option value (optional)
     pub fn maybe_width(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -394,16 +386,16 @@ where
     /// Build the final struct
     pub fn build(self) -> WebEmbed<'a> {
         WebEmbed {
-            alignment: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            embed_height: self.__unsafe_private_named.2,
-            embed_url: self.__unsafe_private_named.3,
-            embed_width: self.__unsafe_private_named.4,
-            href: self.__unsafe_private_named.5.unwrap(),
-            preview: self.__unsafe_private_named.6,
-            site_name: self.__unsafe_private_named.7,
-            title: self.__unsafe_private_named.8,
-            width: self.__unsafe_private_named.9,
+            alignment: self._fields.0,
+            description: self._fields.1,
+            embed_height: self._fields.2,
+            embed_url: self._fields.3,
+            embed_width: self._fields.4,
+            href: self._fields.5.unwrap(),
+            preview: self._fields.6,
+            site_name: self._fields.7,
+            title: self._fields.8,
+            width: self._fields.9,
             extra_data: Default::default(),
         }
     }
@@ -416,16 +408,16 @@ where
         >,
     ) -> WebEmbed<'a> {
         WebEmbed {
-            alignment: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            embed_height: self.__unsafe_private_named.2,
-            embed_url: self.__unsafe_private_named.3,
-            embed_width: self.__unsafe_private_named.4,
-            href: self.__unsafe_private_named.5.unwrap(),
-            preview: self.__unsafe_private_named.6,
-            site_name: self.__unsafe_private_named.7,
-            title: self.__unsafe_private_named.8,
-            width: self.__unsafe_private_named.9,
+            alignment: self._fields.0,
+            description: self._fields.1,
+            embed_height: self._fields.2,
+            embed_url: self._fields.3,
+            embed_width: self._fields.4,
+            href: self._fields.5.unwrap(),
+            preview: self._fields.6,
+            site_name: self._fields.7,
+            title: self._fields.8,
+            width: self._fields.9,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_offprint/content.rs b/crates/jacquard-api/src/app_offprint/content.rs
index 498aa497..f5054993 100644
--- a/crates/jacquard-api/src/app_offprint/content.rs
+++ b/crates/jacquard-api/src/app_offprint/content.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -121,9 +124,9 @@ pub mod content_state {
 
 /// Builder for constructing an instance of this type
 pub struct ContentBuilder<'a, S: content_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<ContentItemsItem<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<ContentItemsItem<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Content<'a> {
@@ -137,9 +140,9 @@ impl<'a> ContentBuilder<'a, content_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ContentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -154,11 +157,11 @@ where
         mut self,
         value: impl Into<Vec<ContentItemsItem<'a>>>,
     ) -> ContentBuilder<'a, content_state::SetItems<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ContentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -171,7 +174,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Content<'a> {
         Content {
-            items: self.__unsafe_private_named.0.unwrap(),
+            items: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -181,7 +184,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Content<'a> {
         Content {
-            items: self.__unsafe_private_named.0.unwrap(),
+            items: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_offprint/document/article.rs b/crates/jacquard-api/src/app_offprint/document/article.rs
index 53610ebb..136d1bf2 100644
--- a/crates/jacquard-api/src/app_offprint/document/article.rs
+++ b/crates/jacquard-api/src/app_offprint/document/article.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -132,9 +135,9 @@ pub mod article_state {
 
 /// Builder for constructing an instance of this type
 pub struct ArticleBuilder<'a, S: article_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Article<'a> {
@@ -148,9 +151,9 @@ impl<'a> ArticleBuilder<'a, article_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ArticleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -165,11 +168,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ArticleBuilder<'a, article_state::SetDocument<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ArticleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,7 +185,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Article<'a> {
         Article {
-            document: self.__unsafe_private_named.0.unwrap(),
+            document: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -195,7 +198,7 @@ where
         >,
     ) -> Article<'a> {
         Article {
-            document: self.__unsafe_private_named.0.unwrap(),
+            document: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_offprint/publication.rs b/crates/jacquard-api/src/app_offprint/publication.rs
index 482aff83..99f6a249 100644
--- a/crates/jacquard-api/src/app_offprint/publication.rs
+++ b/crates/jacquard-api/src/app_offprint/publication.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -131,9 +134,9 @@ pub mod publication_state {
 
 /// Builder for constructing an instance of this type
 pub struct PublicationBuilder<'a, S: publication_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Publication<'a> {
@@ -147,9 +150,9 @@ impl<'a> PublicationBuilder<'a, publication_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,11 +167,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PublicationBuilder<'a, publication_state::SetPublication<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,7 +184,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Publication<'a> {
         Publication {
-            publication: self.__unsafe_private_named.0.unwrap(),
+            publication: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -194,7 +197,7 @@ where
         >,
     ) -> Publication<'a> {
         Publication {
-            publication: self.__unsafe_private_named.0.unwrap(),
+            publication: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_openmkt/marketplace/listing.rs b/crates/jacquard-api/src/app_openmkt/marketplace/listing.rs
index 330a2ed0..f3a13798 100644
--- a/crates/jacquard-api/src/app_openmkt/marketplace/listing.rs
+++ b/crates/jacquard-api/src/app_openmkt/marketplace/listing.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -386,92 +389,92 @@ pub mod listing_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Category;
-        type Price;
-        type CreatedAt;
         type Title;
         type Location;
+        type Price;
+        type Category;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Category = Unset;
-        type Price = Unset;
-        type CreatedAt = Unset;
         type Title = Unset;
         type Location = Unset;
+        type Price = Unset;
+        type Category = Unset;
+        type CreatedAt = Unset;
     }
-    ///State transition - sets the `category` field to Set
-    pub struct SetCategory<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCategory<S> {}
-    impl<S: State> State for SetCategory<S> {
-        type Category = Set<members::category>;
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type Title = Set<members::title>;
+        type Location = S::Location;
         type Price = S::Price;
+        type Category = S::Category;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `location` field to Set
+    pub struct SetLocation<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLocation<S> {}
+    impl<S: State> State for SetLocation<S> {
         type Title = S::Title;
-        type Location = S::Location;
+        type Location = Set<members::location>;
+        type Price = S::Price;
+        type Category = S::Category;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `price` field to Set
     pub struct SetPrice<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPrice<S> {}
     impl<S: State> State for SetPrice<S> {
-        type Category = S::Category;
+        type Title = S::Title;
+        type Location = S::Location;
         type Price = Set<members::price>;
+        type Category = S::Category;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `category` field to Set
+    pub struct SetCategory<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCategory<S> {}
+    impl<S: State> State for SetCategory<S> {
         type Title = S::Title;
         type Location = S::Location;
+        type Price = S::Price;
+        type Category = Set<members::category>;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Category = S::Category;
-        type Price = S::Price;
-        type CreatedAt = Set<members::created_at>;
         type Title = S::Title;
         type Location = S::Location;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Category = S::Category;
         type Price = S::Price;
-        type CreatedAt = S::CreatedAt;
-        type Title = Set<members::title>;
-        type Location = S::Location;
-    }
-    ///State transition - sets the `location` field to Set
-    pub struct SetLocation<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLocation<S> {}
-    impl<S: State> State for SetLocation<S> {
         type Category = S::Category;
-        type Price = S::Price;
-        type CreatedAt = S::CreatedAt;
-        type Title = S::Title;
-        type Location = Set<members::location>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `category` field
-        pub struct category(());
-        ///Marker type for the `price` field
-        pub struct price(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `title` field
         pub struct title(());
         ///Marker type for the `location` field
         pub struct location(());
+        ///Marker type for the `price` field
+        pub struct price(());
+        ///Marker type for the `category` field
+        pub struct category(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ListingBuilder<'a, S: listing_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -484,7 +487,7 @@ pub struct ListingBuilder<'a, S: listing_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Listing<'a> {
@@ -498,21 +501,9 @@ impl<'a> ListingBuilder<'a, listing_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -527,11 +518,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ListingBuilder<'a, listing_state::SetCategory<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -539,12 +530,12 @@ where
 impl<'a, S: listing_state::State> ListingBuilder<'a, S> {
     /// Set the `condition` field (optional)
     pub fn condition(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `condition` field to an Option value (optional)
     pub fn maybe_condition(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -559,11 +550,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListingBuilder<'a, listing_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ListingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -571,12 +562,12 @@ where
 impl<'a, S: listing_state::State> ListingBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -584,12 +575,12 @@ impl<'a, S: listing_state::State> ListingBuilder<'a, S> {
 impl<'a, S: listing_state::State> ListingBuilder<'a, S> {
     /// Set the `externalUrl` field (optional)
     pub fn external_url(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `externalUrl` field to an Option value (optional)
     pub fn maybe_external_url(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -597,12 +588,12 @@ impl<'a, S: listing_state::State> ListingBuilder<'a, S> {
 impl<'a, S: listing_state::State> ListingBuilder<'a, S> {
     /// Set the `hideFromFriends` field (optional)
     pub fn hide_from_friends(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `hideFromFriends` field to an Option value (optional)
     pub fn maybe_hide_from_friends(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -610,12 +601,12 @@ impl<'a, S: listing_state::State> ListingBuilder<'a, S> {
 impl<'a, S: listing_state::State> ListingBuilder<'a, S> {
     /// Set the `images` field (optional)
     pub fn images(mut self, value: impl Into<Option<Vec<BlobRef<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `images` field to an Option value (optional)
     pub fn maybe_images(mut self, value: Option<Vec<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -630,11 +621,11 @@ where
         mut self,
         value: impl Into<listing::LocationObj<'a>>,
     ) -> ListingBuilder<'a, listing_state::SetLocation<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ListingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -645,12 +636,12 @@ impl<'a, S: listing_state::State> ListingBuilder<'a, S> {
         mut self,
         value: impl Into<Option<listing::MetadataObj<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `metadata` field to an Option value (optional)
     pub fn maybe_metadata(mut self, value: Option<listing::MetadataObj<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -665,11 +656,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ListingBuilder<'a, listing_state::SetPrice<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ListingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -684,11 +675,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ListingBuilder<'a, listing_state::SetTitle<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         ListingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -696,26 +687,26 @@ where
 impl<'a, S> ListingBuilder<'a, S>
 where
     S: listing_state::State,
-    S::Category: listing_state::IsSet,
-    S::Price: listing_state::IsSet,
-    S::CreatedAt: listing_state::IsSet,
     S::Title: listing_state::IsSet,
     S::Location: listing_state::IsSet,
+    S::Price: listing_state::IsSet,
+    S::Category: listing_state::IsSet,
+    S::CreatedAt: listing_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Listing<'a> {
         Listing {
-            category: self.__unsafe_private_named.0.unwrap(),
-            condition: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            external_url: self.__unsafe_private_named.4,
-            hide_from_friends: self.__unsafe_private_named.5,
-            images: self.__unsafe_private_named.6,
-            location: self.__unsafe_private_named.7.unwrap(),
-            metadata: self.__unsafe_private_named.8,
-            price: self.__unsafe_private_named.9.unwrap(),
-            title: self.__unsafe_private_named.10.unwrap(),
+            category: self._fields.0.unwrap(),
+            condition: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            external_url: self._fields.4,
+            hide_from_friends: self._fields.5,
+            images: self._fields.6,
+            location: self._fields.7.unwrap(),
+            metadata: self._fields.8,
+            price: self._fields.9.unwrap(),
+            title: self._fields.10.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -728,17 +719,17 @@ where
         >,
     ) -> Listing<'a> {
         Listing {
-            category: self.__unsafe_private_named.0.unwrap(),
-            condition: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            external_url: self.__unsafe_private_named.4,
-            hide_from_friends: self.__unsafe_private_named.5,
-            images: self.__unsafe_private_named.6,
-            location: self.__unsafe_private_named.7.unwrap(),
-            metadata: self.__unsafe_private_named.8,
-            price: self.__unsafe_private_named.9.unwrap(),
-            title: self.__unsafe_private_named.10.unwrap(),
+            category: self._fields.0.unwrap(),
+            condition: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            external_url: self._fields.4,
+            hide_from_friends: self._fields.5,
+            images: self._fields.6,
+            location: self._fields.7.unwrap(),
+            metadata: self._fields.8,
+            price: self._fields.9.unwrap(),
+            title: self._fields.10.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_protoimsg/chat/allowlist.rs b/crates/jacquard-api/src/app_protoimsg/chat/allowlist.rs
index 1f30a00b..afd5d885 100644
--- a/crates/jacquard-api/src/app_protoimsg/chat/allowlist.rs
+++ b/crates/jacquard-api/src/app_protoimsg/chat/allowlist.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -113,59 +116,59 @@ pub mod allowlist_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type CreatedAt;
         type Room;
         type Subject;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type CreatedAt = Unset;
         type Room = Unset;
         type Subject = Unset;
-        type CreatedAt = Unset;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type Room = S::Room;
+        type Subject = S::Subject;
     }
     ///State transition - sets the `room` field to Set
     pub struct SetRoom<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRoom<S> {}
     impl<S: State> State for SetRoom<S> {
+        type CreatedAt = S::CreatedAt;
         type Room = Set<members::room>;
         type Subject = S::Subject;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type Room = S::Room;
-        type Subject = Set<members::subject>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type Room = S::Room;
-        type Subject = S::Subject;
-        type CreatedAt = Set<members::created_at>;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `room` field
         pub struct room(());
         ///Marker type for the `subject` field
         pub struct subject(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AllowlistBuilder<'a, S: allowlist_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Allowlist<'a> {
@@ -179,9 +182,9 @@ impl<'a> AllowlistBuilder<'a, allowlist_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AllowlistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AllowlistBuilder<'a, allowlist_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AllowlistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> AllowlistBuilder<'a, allowlist_state::SetRoom<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AllowlistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> AllowlistBuilder<'a, allowlist_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AllowlistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,16 +249,16 @@ where
 impl<'a, S> AllowlistBuilder<'a, S>
 where
     S: allowlist_state::State,
+    S::CreatedAt: allowlist_state::IsSet,
     S::Room: allowlist_state::IsSet,
     S::Subject: allowlist_state::IsSet,
-    S::CreatedAt: allowlist_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Allowlist<'a> {
         Allowlist {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            room: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            room: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -268,9 +271,9 @@ where
         >,
     ) -> Allowlist<'a> {
         Allowlist {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            room: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            room: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_protoimsg/chat/auth_verify.rs b/crates/jacquard-api/src/app_protoimsg/chat/auth_verify.rs
index 96b721c3..2f36789d 100644
--- a/crates/jacquard-api/src/app_protoimsg/chat/auth_verify.rs
+++ b/crates/jacquard-api/src/app_protoimsg/chat/auth_verify.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,9 +149,9 @@ pub mod auth_verify_state {
 
 /// Builder for constructing an instance of this type
 pub struct AuthVerifyBuilder<'a, S: auth_verify_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AuthVerify<'a> {
@@ -162,9 +165,9 @@ impl<'a> AuthVerifyBuilder<'a, auth_verify_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AuthVerifyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AuthVerifyBuilder<'a, auth_verify_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AuthVerifyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AuthVerifyBuilder<'a, auth_verify_state::SetNonce<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AuthVerifyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,8 +219,8 @@ where
     /// Build the final struct
     pub fn build(self) -> AuthVerify<'a> {
         AuthVerify {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            nonce: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            nonce: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> AuthVerify<'a> {
         AuthVerify {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            nonce: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            nonce: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_protoimsg/chat/ban.rs b/crates/jacquard-api/src/app_protoimsg/chat/ban.rs
index dc650d92..ec5555a5 100644
--- a/crates/jacquard-api/src/app_protoimsg/chat/ban.rs
+++ b/crates/jacquard-api/src/app_protoimsg/chat/ban.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -127,49 +130,49 @@ pub mod ban_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Room;
         type Subject;
+        type Room;
         type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Room = Unset;
         type Subject = Unset;
+        type Room = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `room` field to Set
-    pub struct SetRoom<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRoom<S> {}
-    impl<S: State> State for SetRoom<S> {
-        type Room = Set<members::room>;
-        type Subject = S::Subject;
-        type CreatedAt = S::CreatedAt;
-    }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type Room = S::Room;
         type Subject = Set<members::subject>;
+        type Room = S::Room;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `room` field to Set
+    pub struct SetRoom<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRoom<S> {}
+    impl<S: State> State for SetRoom<S> {
+        type Subject = S::Subject;
+        type Room = Set<members::room>;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Room = S::Room;
         type Subject = S::Subject;
+        type Room = S::Room;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `room` field
-        pub struct room(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `room` field
+        pub struct room(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
     }
@@ -177,14 +180,9 @@ pub mod ban_state {
 
 /// Builder for constructing an instance of this type
 pub struct BanBuilder<'a, S: ban_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<CowStr<'a>>,
-        Option<AtUri<'a>>,
-        Option<Did<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<AtUri<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Ban<'a> {
@@ -198,9 +196,9 @@ impl<'a> BanBuilder<'a, ban_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +213,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BanBuilder<'a, ban_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -227,12 +225,12 @@ where
 impl<'a, S: ban_state::State> BanBuilder<'a, S> {
     /// Set the `reason` field (optional)
     pub fn reason(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `reason` field to an Option value (optional)
     pub fn maybe_reason(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -247,11 +245,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> BanBuilder<'a, ban_state::SetRoom<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -266,11 +264,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> BanBuilder<'a, ban_state::SetSubject<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -278,17 +276,17 @@ where
 impl<'a, S> BanBuilder<'a, S>
 where
     S: ban_state::State,
-    S::Room: ban_state::IsSet,
     S::Subject: ban_state::IsSet,
+    S::Room: ban_state::IsSet,
     S::CreatedAt: ban_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Ban<'a> {
         Ban {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            reason: self.__unsafe_private_named.1,
-            room: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            reason: self._fields.1,
+            room: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -301,10 +299,10 @@ where
         >,
     ) -> Ban<'a> {
         Ban {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            reason: self.__unsafe_private_named.1,
-            room: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            reason: self._fields.1,
+            room: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_protoimsg/chat/channel.rs b/crates/jacquard-api/src/app_protoimsg/chat/channel.rs
index b8dce0c6..5ca3d88a 100644
--- a/crates/jacquard-api/src/app_protoimsg/chat/channel.rs
+++ b/crates/jacquard-api/src/app_protoimsg/chat/channel.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -249,58 +252,58 @@ pub mod channel_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Room;
         type Name;
         type CreatedAt;
-        type Room;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Room = Unset;
         type Name = Unset;
         type CreatedAt = Unset;
-        type Room = Unset;
+    }
+    ///State transition - sets the `room` field to Set
+    pub struct SetRoom<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRoom<S> {}
+    impl<S: State> State for SetRoom<S> {
+        type Room = Set<members::room>;
+        type Name = S::Name;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
+        type Room = S::Room;
         type Name = Set<members::name>;
         type CreatedAt = S::CreatedAt;
-        type Room = S::Room;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Name = S::Name;
-        type CreatedAt = Set<members::created_at>;
         type Room = S::Room;
-    }
-    ///State transition - sets the `room` field to Set
-    pub struct SetRoom<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRoom<S> {}
-    impl<S: State> State for SetRoom<S> {
         type Name = S::Name;
-        type CreatedAt = S::CreatedAt;
-        type Room = Set<members::room>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `room` field
+        pub struct room(());
         ///Marker type for the `name` field
         pub struct name(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `room` field
-        pub struct room(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ChannelBuilder<'a, S: channel_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -308,7 +311,7 @@ pub struct ChannelBuilder<'a, S: channel_state::State> {
         Option<ChannelPostPolicy<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Channel<'a> {
@@ -322,9 +325,9 @@ impl<'a> ChannelBuilder<'a, channel_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ChannelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -339,11 +342,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ChannelBuilder<'a, channel_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ChannelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -351,12 +354,12 @@ where
 impl<'a, S: channel_state::State> ChannelBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -371,11 +374,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ChannelBuilder<'a, channel_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ChannelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -383,12 +386,12 @@ where
 impl<'a, S: channel_state::State> ChannelBuilder<'a, S> {
     /// Set the `position` field (optional)
     pub fn position(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `position` field to an Option value (optional)
     pub fn maybe_position(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -399,12 +402,12 @@ impl<'a, S: channel_state::State> ChannelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ChannelPostPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `postPolicy` field to an Option value (optional)
     pub fn maybe_post_policy(mut self, value: Option<ChannelPostPolicy<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -419,11 +422,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ChannelBuilder<'a, channel_state::SetRoom<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ChannelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -431,19 +434,19 @@ where
 impl<'a, S> ChannelBuilder<'a, S>
 where
     S: channel_state::State,
+    S::Room: channel_state::IsSet,
     S::Name: channel_state::IsSet,
     S::CreatedAt: channel_state::IsSet,
-    S::Room: channel_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Channel<'a> {
         Channel {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
-            position: self.__unsafe_private_named.3,
-            post_policy: self.__unsafe_private_named.4,
-            room: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            name: self._fields.2.unwrap(),
+            position: self._fields.3,
+            post_policy: self._fields.4,
+            room: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -456,12 +459,12 @@ where
         >,
     ) -> Channel<'a> {
         Channel {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
-            position: self.__unsafe_private_named.3,
-            post_policy: self.__unsafe_private_named.4,
-            room: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            name: self._fields.2.unwrap(),
+            position: self._fields.3,
+            post_policy: self._fields.4,
+            room: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_protoimsg/chat/community.rs b/crates/jacquard-api/src/app_protoimsg/chat/community.rs
index d5c59d99..4df7d49c 100644
--- a/crates/jacquard-api/src/app_protoimsg/chat/community.rs
+++ b/crates/jacquard-api/src/app_protoimsg/chat/community.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -207,49 +210,49 @@ pub mod community_group_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type Members;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type Members = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Members = S::Members;
+        type Name = Unset;
     }
     ///State transition - sets the `members` field to Set
     pub struct SetMembers<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMembers<S> {}
     impl<S: State> State for SetMembers<S> {
-        type Name = S::Name;
         type Members = Set<members::members>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Members = S::Members;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `members` field
         pub struct members(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CommunityGroupBuilder<'a, S: community_group_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<Vec<community::CommunityMember<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CommunityGroup<'a> {
@@ -263,9 +266,9 @@ impl<'a> CommunityGroupBuilder<'a, community_group_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommunityGroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -273,12 +276,12 @@ impl<'a> CommunityGroupBuilder<'a, community_group_state::Empty> {
 impl<'a, S: community_group_state::State> CommunityGroupBuilder<'a, S> {
     /// Set the `isInnerCircle` field (optional)
     pub fn is_inner_circle(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `isInnerCircle` field to an Option value (optional)
     pub fn maybe_is_inner_circle(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -293,11 +296,11 @@ where
         mut self,
         value: impl Into<Vec<community::CommunityMember<'a>>>,
     ) -> CommunityGroupBuilder<'a, community_group_state::SetMembers<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommunityGroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -312,11 +315,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommunityGroupBuilder<'a, community_group_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CommunityGroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -324,15 +327,15 @@ where
 impl<'a, S> CommunityGroupBuilder<'a, S>
 where
     S: community_group_state::State,
-    S::Name: community_group_state::IsSet,
     S::Members: community_group_state::IsSet,
+    S::Name: community_group_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CommunityGroup<'a> {
         CommunityGroup {
-            is_inner_circle: self.__unsafe_private_named.0.or_else(|| Some(false)),
-            members: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            is_inner_circle: self._fields.0.or_else(|| Some(false)),
+            members: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -345,9 +348,9 @@ where
         >,
     ) -> CommunityGroup<'a> {
         CommunityGroup {
-            is_inner_circle: self.__unsafe_private_named.0.or_else(|| Some(false)),
-            members: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            is_inner_circle: self._fields.0.or_else(|| Some(false)),
+            members: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -532,9 +535,9 @@ pub mod community_member_state {
 
 /// Builder for constructing an instance of this type
 pub struct CommunityMemberBuilder<'a, S: community_member_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CommunityMember<'a> {
@@ -548,9 +551,9 @@ impl<'a> CommunityMemberBuilder<'a, community_member_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommunityMemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -565,11 +568,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CommunityMemberBuilder<'a, community_member_state::SetAddedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommunityMemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -584,11 +587,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> CommunityMemberBuilder<'a, community_member_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommunityMemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -602,8 +605,8 @@ where
     /// Build the final struct
     pub fn build(self) -> CommunityMember<'a> {
         CommunityMember {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
+            added_at: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -616,8 +619,8 @@ where
         >,
     ) -> CommunityMember<'a> {
         CommunityMember {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
+            added_at: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -657,9 +660,9 @@ pub mod community_state {
 
 /// Builder for constructing an instance of this type
 pub struct CommunityBuilder<'a, S: community_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<community::CommunityGroup<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<community::CommunityGroup<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Community<'a> {
@@ -673,9 +676,9 @@ impl<'a> CommunityBuilder<'a, community_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommunityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -690,11 +693,11 @@ where
         mut self,
         value: impl Into<Vec<community::CommunityGroup<'a>>>,
     ) -> CommunityBuilder<'a, community_state::SetGroups<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommunityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -707,7 +710,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Community<'a> {
         Community {
-            groups: self.__unsafe_private_named.0.unwrap(),
+            groups: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -720,7 +723,7 @@ where
         >,
     ) -> Community<'a> {
         Community {
-            groups: self.__unsafe_private_named.0.unwrap(),
+            groups: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_protoimsg/chat/message.rs b/crates/jacquard-api/src/app_protoimsg/chat/message.rs
index 069271c3..15ad9910 100644
--- a/crates/jacquard-api/src/app_protoimsg/chat/message.rs
+++ b/crates/jacquard-api/src/app_protoimsg/chat/message.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -968,9 +971,9 @@ pub mod aspect_ratio_state {
 
 /// Builder for constructing an instance of this type
 pub struct AspectRatioBuilder<'a, S: aspect_ratio_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AspectRatio<'a> {
@@ -984,9 +987,9 @@ impl<'a> AspectRatioBuilder<'a, aspect_ratio_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1001,11 +1004,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1020,11 +1023,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetWidth<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1038,8 +1041,8 @@ where
     /// Build the final struct
     pub fn build(self) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1052,8 +1055,8 @@ where
         >,
     ) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1692,9 +1695,9 @@ pub mod byte_slice_state {
 
 /// Builder for constructing an instance of this type
 pub struct ByteSliceBuilder<'a, S: byte_slice_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ByteSlice<'a> {
@@ -1708,9 +1711,9 @@ impl<'a> ByteSliceBuilder<'a, byte_slice_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1725,11 +1728,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteEnd<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1744,11 +1747,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteStart<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1762,8 +1765,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1776,8 +1779,8 @@ where
         >,
     ) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1793,50 +1796,50 @@ pub mod external_embed_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type Title;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type Title = Unset;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Title = S::Title;
+        type Uri = Unset;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Uri = S::Uri;
         type Title = Set<members::title>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Title = S::Title;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ExternalEmbedBuilder<'a, S: external_embed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ExternalEmbed<'a> {
@@ -1850,9 +1853,9 @@ impl<'a> ExternalEmbedBuilder<'a, external_embed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExternalEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1860,12 +1863,12 @@ impl<'a> ExternalEmbedBuilder<'a, external_embed_state::Empty> {
 impl<'a, S: external_embed_state::State> ExternalEmbedBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1873,12 +1876,12 @@ impl<'a, S: external_embed_state::State> ExternalEmbedBuilder<'a, S> {
 impl<'a, S: external_embed_state::State> ExternalEmbedBuilder<'a, S> {
     /// Set the `thumb` field (optional)
     pub fn thumb(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `thumb` field to an Option value (optional)
     pub fn maybe_thumb(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1893,11 +1896,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ExternalEmbedBuilder<'a, external_embed_state::SetTitle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ExternalEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1912,11 +1915,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ExternalEmbedBuilder<'a, external_embed_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ExternalEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1924,16 +1927,16 @@ where
 impl<'a, S> ExternalEmbedBuilder<'a, S>
 where
     S: external_embed_state::State,
-    S::Uri: external_embed_state::IsSet,
     S::Title: external_embed_state::IsSet,
+    S::Uri: external_embed_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ExternalEmbed<'a> {
         ExternalEmbed {
-            description: self.__unsafe_private_named.0,
-            thumb: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0,
+            thumb: self._fields.1,
+            title: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1946,10 +1949,10 @@ where
         >,
     ) -> ExternalEmbed<'a> {
         ExternalEmbed {
-            description: self.__unsafe_private_named.0,
-            thumb: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0,
+            thumb: self._fields.1,
+            title: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1989,9 +1992,9 @@ pub mod image_embed_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImageEmbedBuilder<'a, S: image_embed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<message::ImageItem<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<message::ImageItem<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ImageEmbed<'a> {
@@ -2005,9 +2008,9 @@ impl<'a> ImageEmbedBuilder<'a, image_embed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2022,11 +2025,11 @@ where
         mut self,
         value: impl Into<Vec<message::ImageItem<'a>>>,
     ) -> ImageEmbedBuilder<'a, image_embed_state::SetImages<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ImageEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2039,7 +2042,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ImageEmbed<'a> {
         ImageEmbed {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2052,7 +2055,7 @@ where
         >,
     ) -> ImageEmbed<'a> {
         ImageEmbed {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2104,13 +2107,9 @@ pub mod image_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImageItemBuilder<'a, S: image_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<message::AspectRatio<'a>>,
-        Option<BlobRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<message::AspectRatio<'a>>, Option<BlobRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ImageItem<'a> {
@@ -2124,9 +2123,9 @@ impl<'a> ImageItemBuilder<'a, image_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2141,11 +2140,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ImageItemBuilder<'a, image_item_state::SetAlt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ImageItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2156,7 +2155,7 @@ impl<'a, S: image_item_state::State> ImageItemBuilder<'a, S> {
         mut self,
         value: impl Into<Option<message::AspectRatio<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
@@ -2164,7 +2163,7 @@ impl<'a, S: image_item_state::State> ImageItemBuilder<'a, S> {
         mut self,
         value: Option<message::AspectRatio<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -2179,11 +2178,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ImageItemBuilder<'a, image_item_state::SetImage<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ImageItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2197,9 +2196,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ImageItem<'a> {
         ImageItem {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            aspect_ratio: self.__unsafe_private_named.1,
-            image: self.__unsafe_private_named.2.unwrap(),
+            alt: self._fields.0.unwrap(),
+            aspect_ratio: self._fields.1,
+            image: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2212,9 +2211,9 @@ where
         >,
     ) -> ImageItem<'a> {
         ImageItem {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            aspect_ratio: self.__unsafe_private_named.1,
-            image: self.__unsafe_private_named.2.unwrap(),
+            alt: self._fields.0.unwrap(),
+            aspect_ratio: self._fields.1,
+            image: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2254,9 +2253,9 @@ pub mod link_state {
 
 /// Builder for constructing an instance of this type
 pub struct LinkBuilder<'a, S: link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Link<'a> {
@@ -2270,9 +2269,9 @@ impl<'a> LinkBuilder<'a, link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2287,11 +2286,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LinkBuilder<'a, link_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2304,7 +2303,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Link<'a> {
         Link {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2317,7 +2316,7 @@ where
         >,
     ) -> Link<'a> {
         Link {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2383,8 +2382,8 @@ pub mod message_state {
 
 /// Builder for constructing an instance of this type
 pub struct MessageBuilder<'a, S: message_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<Datetime>,
         Option<MessageEmbed<'a>>,
@@ -2392,7 +2391,7 @@ pub struct MessageBuilder<'a, S: message_state::State> {
         Option<message::ReplyRef<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Message<'a> {
@@ -2406,9 +2405,9 @@ impl<'a> MessageBuilder<'a, message_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2423,11 +2422,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> MessageBuilder<'a, message_state::SetChannel<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2442,11 +2441,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MessageBuilder<'a, message_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2454,12 +2453,12 @@ where
 impl<'a, S: message_state::State> MessageBuilder<'a, S> {
     /// Set the `embed` field (optional)
     pub fn embed(mut self, value: impl Into<Option<MessageEmbed<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `embed` field to an Option value (optional)
     pub fn maybe_embed(mut self, value: Option<MessageEmbed<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -2470,7 +2469,7 @@ impl<'a, S: message_state::State> MessageBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<message::RichTextFacet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
@@ -2478,7 +2477,7 @@ impl<'a, S: message_state::State> MessageBuilder<'a, S> {
         mut self,
         value: Option<Vec<message::RichTextFacet<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -2486,12 +2485,12 @@ impl<'a, S: message_state::State> MessageBuilder<'a, S> {
 impl<'a, S: message_state::State> MessageBuilder<'a, S> {
     /// Set the `reply` field (optional)
     pub fn reply(mut self, value: impl Into<Option<message::ReplyRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `reply` field to an Option value (optional)
     pub fn maybe_reply(mut self, value: Option<message::ReplyRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -2506,11 +2505,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MessageBuilder<'a, message_state::SetText<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         MessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2525,12 +2524,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Message<'a> {
         Message {
-            channel: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            embed: self.__unsafe_private_named.2,
-            facets: self.__unsafe_private_named.3,
-            reply: self.__unsafe_private_named.4,
-            text: self.__unsafe_private_named.5.unwrap(),
+            channel: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            embed: self._fields.2,
+            facets: self._fields.3,
+            reply: self._fields.4,
+            text: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2543,12 +2542,12 @@ where
         >,
     ) -> Message<'a> {
         Message {
-            channel: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            embed: self.__unsafe_private_named.2,
-            facets: self.__unsafe_private_named.3,
-            reply: self.__unsafe_private_named.4,
-            text: self.__unsafe_private_named.5.unwrap(),
+            channel: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            embed: self._fields.2,
+            facets: self._fields.3,
+            reply: self._fields.4,
+            text: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2588,9 +2587,9 @@ pub mod mention_state {
 
 /// Builder for constructing an instance of this type
 pub struct MentionBuilder<'a, S: mention_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Mention<'a> {
@@ -2604,9 +2603,9 @@ impl<'a> MentionBuilder<'a, mention_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2621,11 +2620,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MentionBuilder<'a, mention_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2638,7 +2637,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Mention<'a> {
         Mention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2651,7 +2650,7 @@ where
         >,
     ) -> Mention<'a> {
         Mention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2667,45 +2666,45 @@ pub mod reply_ref_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Root;
         type Parent;
+        type Root;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Root = Unset;
         type Parent = Unset;
-    }
-    ///State transition - sets the `root` field to Set
-    pub struct SetRoot<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRoot<S> {}
-    impl<S: State> State for SetRoot<S> {
-        type Root = Set<members::root>;
-        type Parent = S::Parent;
+        type Root = Unset;
     }
     ///State transition - sets the `parent` field to Set
     pub struct SetParent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetParent<S> {}
     impl<S: State> State for SetParent<S> {
-        type Root = S::Root;
         type Parent = Set<members::parent>;
+        type Root = S::Root;
+    }
+    ///State transition - sets the `root` field to Set
+    pub struct SetRoot<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRoot<S> {}
+    impl<S: State> State for SetRoot<S> {
+        type Parent = S::Parent;
+        type Root = Set<members::root>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `root` field
-        pub struct root(());
         ///Marker type for the `parent` field
         pub struct parent(());
+        ///Marker type for the `root` field
+        pub struct root(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReplyRefBuilder<'a, S: reply_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReplyRef<'a> {
@@ -2719,9 +2718,9 @@ impl<'a> ReplyRefBuilder<'a, reply_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2736,11 +2735,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ReplyRefBuilder<'a, reply_ref_state::SetParent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2755,11 +2754,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ReplyRefBuilder<'a, reply_ref_state::SetRoot<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2767,14 +2766,14 @@ where
 impl<'a, S> ReplyRefBuilder<'a, S>
 where
     S: reply_ref_state::State,
-    S::Root: reply_ref_state::IsSet,
     S::Parent: reply_ref_state::IsSet,
+    S::Root: reply_ref_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ReplyRef<'a> {
         ReplyRef {
-            parent: self.__unsafe_private_named.0.unwrap(),
-            root: self.__unsafe_private_named.1.unwrap(),
+            parent: self._fields.0.unwrap(),
+            root: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2787,8 +2786,8 @@ where
         >,
     ) -> ReplyRef<'a> {
         ReplyRef {
-            parent: self.__unsafe_private_named.0.unwrap(),
-            root: self.__unsafe_private_named.1.unwrap(),
+            parent: self._fields.0.unwrap(),
+            root: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2804,48 +2803,48 @@ pub mod rich_text_facet_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Index;
         type Features;
+        type Index;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Index = Unset;
         type Features = Unset;
-    }
-    ///State transition - sets the `index` field to Set
-    pub struct SetIndex<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndex<S> {}
-    impl<S: State> State for SetIndex<S> {
-        type Index = Set<members::index>;
-        type Features = S::Features;
+        type Index = Unset;
     }
     ///State transition - sets the `features` field to Set
     pub struct SetFeatures<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetFeatures<S> {}
     impl<S: State> State for SetFeatures<S> {
-        type Index = S::Index;
         type Features = Set<members::features>;
+        type Index = S::Index;
+    }
+    ///State transition - sets the `index` field to Set
+    pub struct SetIndex<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndex<S> {}
+    impl<S: State> State for SetIndex<S> {
+        type Features = S::Features;
+        type Index = Set<members::index>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `index` field
-        pub struct index(());
         ///Marker type for the `features` field
         pub struct features(());
+        ///Marker type for the `index` field
+        pub struct index(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RichTextFacetBuilder<'a, S: rich_text_facet_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<RichTextFacetFeaturesItem<'a>>>,
         Option<message::ByteSlice<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RichTextFacet<'a> {
@@ -2859,9 +2858,9 @@ impl<'a> RichTextFacetBuilder<'a, rich_text_facet_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RichTextFacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2876,11 +2875,11 @@ where
         mut self,
         value: impl Into<Vec<RichTextFacetFeaturesItem<'a>>>,
     ) -> RichTextFacetBuilder<'a, rich_text_facet_state::SetFeatures<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RichTextFacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2895,11 +2894,11 @@ where
         mut self,
         value: impl Into<message::ByteSlice<'a>>,
     ) -> RichTextFacetBuilder<'a, rich_text_facet_state::SetIndex<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RichTextFacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2907,14 +2906,14 @@ where
 impl<'a, S> RichTextFacetBuilder<'a, S>
 where
     S: rich_text_facet_state::State,
-    S::Index: rich_text_facet_state::IsSet,
     S::Features: rich_text_facet_state::IsSet,
+    S::Index: rich_text_facet_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RichTextFacet<'a> {
         RichTextFacet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2927,8 +2926,8 @@ where
         >,
     ) -> RichTextFacet<'a> {
         RichTextFacet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2968,14 +2967,14 @@ pub mod video_embed_state {
 
 /// Builder for constructing an instance of this type
 pub struct VideoEmbedBuilder<'a, S: video_embed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<message::AspectRatio<'a>>,
         Option<BlobRef<'a>>,
         Option<BlobRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> VideoEmbed<'a> {
@@ -2989,9 +2988,9 @@ impl<'a> VideoEmbedBuilder<'a, video_embed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VideoEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2999,12 +2998,12 @@ impl<'a> VideoEmbedBuilder<'a, video_embed_state::Empty> {
 impl<'a, S: video_embed_state::State> VideoEmbedBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -3015,7 +3014,7 @@ impl<'a, S: video_embed_state::State> VideoEmbedBuilder<'a, S> {
         mut self,
         value: impl Into<Option<message::AspectRatio<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
@@ -3023,7 +3022,7 @@ impl<'a, S: video_embed_state::State> VideoEmbedBuilder<'a, S> {
         mut self,
         value: Option<message::AspectRatio<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3031,12 +3030,12 @@ impl<'a, S: video_embed_state::State> VideoEmbedBuilder<'a, S> {
 impl<'a, S: video_embed_state::State> VideoEmbedBuilder<'a, S> {
     /// Set the `thumbnail` field (optional)
     pub fn thumbnail(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -3051,11 +3050,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> VideoEmbedBuilder<'a, video_embed_state::SetVideo<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         VideoEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3068,10 +3067,10 @@ where
     /// Build the final struct
     pub fn build(self) -> VideoEmbed<'a> {
         VideoEmbed {
-            alt: self.__unsafe_private_named.0,
-            aspect_ratio: self.__unsafe_private_named.1,
-            thumbnail: self.__unsafe_private_named.2,
-            video: self.__unsafe_private_named.3.unwrap(),
+            alt: self._fields.0,
+            aspect_ratio: self._fields.1,
+            thumbnail: self._fields.2,
+            video: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3084,10 +3083,10 @@ where
         >,
     ) -> VideoEmbed<'a> {
         VideoEmbed {
-            alt: self.__unsafe_private_named.0,
-            aspect_ratio: self.__unsafe_private_named.1,
-            thumbnail: self.__unsafe_private_named.2,
-            video: self.__unsafe_private_named.3.unwrap(),
+            alt: self._fields.0,
+            aspect_ratio: self._fields.1,
+            thumbnail: self._fields.2,
+            video: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_protoimsg/chat/poll.rs b/crates/jacquard-api/src/app_protoimsg/chat/poll.rs
index 53bfffc6..0a1ac8c1 100644
--- a/crates/jacquard-api/src/app_protoimsg/chat/poll.rs
+++ b/crates/jacquard-api/src/app_protoimsg/chat/poll.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -160,74 +163,74 @@ pub mod poll_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Channel;
-        type CreatedAt;
         type Question;
         type Options;
+        type Channel;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Channel = Unset;
-        type CreatedAt = Unset;
         type Question = Unset;
         type Options = Unset;
-    }
-    ///State transition - sets the `channel` field to Set
-    pub struct SetChannel<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetChannel<S> {}
-    impl<S: State> State for SetChannel<S> {
-        type Channel = Set<members::channel>;
-        type CreatedAt = S::CreatedAt;
-        type Question = S::Question;
-        type Options = S::Options;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type Channel = S::Channel;
-        type CreatedAt = Set<members::created_at>;
-        type Question = S::Question;
-        type Options = S::Options;
+        type Channel = Unset;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `question` field to Set
     pub struct SetQuestion<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetQuestion<S> {}
     impl<S: State> State for SetQuestion<S> {
-        type Channel = S::Channel;
-        type CreatedAt = S::CreatedAt;
         type Question = Set<members::question>;
         type Options = S::Options;
+        type Channel = S::Channel;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `options` field to Set
     pub struct SetOptions<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetOptions<S> {}
     impl<S: State> State for SetOptions<S> {
+        type Question = S::Question;
+        type Options = Set<members::options>;
         type Channel = S::Channel;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `channel` field to Set
+    pub struct SetChannel<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetChannel<S> {}
+    impl<S: State> State for SetChannel<S> {
         type Question = S::Question;
-        type Options = Set<members::options>;
+        type Options = S::Options;
+        type Channel = Set<members::channel>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Question = S::Question;
+        type Options = S::Options;
+        type Channel = S::Channel;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `channel` field
-        pub struct channel(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `question` field
         pub struct question(());
         ///Marker type for the `options` field
         pub struct options(());
+        ///Marker type for the `channel` field
+        pub struct channel(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PollBuilder<'a, S: poll_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<AtUri<'a>>,
         Option<Datetime>,
@@ -235,7 +238,7 @@ pub struct PollBuilder<'a, S: poll_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Poll<'a> {
@@ -249,9 +252,9 @@ impl<'a> PollBuilder<'a, poll_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PollBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -259,12 +262,12 @@ impl<'a> PollBuilder<'a, poll_state::Empty> {
 impl<'a, S: poll_state::State> PollBuilder<'a, S> {
     /// Set the `allowMultiple` field (optional)
     pub fn allow_multiple(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `allowMultiple` field to an Option value (optional)
     pub fn maybe_allow_multiple(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -279,11 +282,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PollBuilder<'a, poll_state::SetChannel<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PollBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -298,11 +301,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PollBuilder<'a, poll_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PollBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -310,12 +313,12 @@ where
 impl<'a, S: poll_state::State> PollBuilder<'a, S> {
     /// Set the `expiresAt` field (optional)
     pub fn expires_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `expiresAt` field to an Option value (optional)
     pub fn maybe_expires_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -330,11 +333,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> PollBuilder<'a, poll_state::SetOptions<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PollBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -349,11 +352,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PollBuilder<'a, poll_state::SetQuestion<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         PollBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -361,20 +364,20 @@ where
 impl<'a, S> PollBuilder<'a, S>
 where
     S: poll_state::State,
-    S::Channel: poll_state::IsSet,
-    S::CreatedAt: poll_state::IsSet,
     S::Question: poll_state::IsSet,
     S::Options: poll_state::IsSet,
+    S::Channel: poll_state::IsSet,
+    S::CreatedAt: poll_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Poll<'a> {
         Poll {
-            allow_multiple: self.__unsafe_private_named.0.or_else(|| Some(false)),
-            channel: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            expires_at: self.__unsafe_private_named.3,
-            options: self.__unsafe_private_named.4.unwrap(),
-            question: self.__unsafe_private_named.5.unwrap(),
+            allow_multiple: self._fields.0.or_else(|| Some(false)),
+            channel: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            expires_at: self._fields.3,
+            options: self._fields.4.unwrap(),
+            question: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -387,12 +390,12 @@ where
         >,
     ) -> Poll<'a> {
         Poll {
-            allow_multiple: self.__unsafe_private_named.0.or_else(|| Some(false)),
-            channel: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            expires_at: self.__unsafe_private_named.3,
-            options: self.__unsafe_private_named.4.unwrap(),
-            question: self.__unsafe_private_named.5.unwrap(),
+            allow_multiple: self._fields.0.or_else(|| Some(false)),
+            channel: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            expires_at: self._fields.3,
+            options: self._fields.4.unwrap(),
+            question: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_protoimsg/chat/presence.rs b/crates/jacquard-api/src/app_protoimsg/chat/presence.rs
index 444bacca..b6fbee8d 100644
--- a/crates/jacquard-api/src/app_protoimsg/chat/presence.rs
+++ b/crates/jacquard-api/src/app_protoimsg/chat/presence.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -229,49 +232,45 @@ pub mod presence_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type UpdatedAt;
         type Status;
+        type UpdatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type UpdatedAt = Unset;
         type Status = Unset;
-    }
-    ///State transition - sets the `updated_at` field to Set
-    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
-    impl<S: State> State for SetUpdatedAt<S> {
-        type UpdatedAt = Set<members::updated_at>;
-        type Status = S::Status;
+        type UpdatedAt = Unset;
     }
     ///State transition - sets the `status` field to Set
     pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStatus<S> {}
     impl<S: State> State for SetStatus<S> {
-        type UpdatedAt = S::UpdatedAt;
         type Status = Set<members::status>;
+        type UpdatedAt = S::UpdatedAt;
+    }
+    ///State transition - sets the `updated_at` field to Set
+    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
+    impl<S: State> State for SetUpdatedAt<S> {
+        type Status = S::Status;
+        type UpdatedAt = Set<members::updated_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `updated_at` field
-        pub struct updated_at(());
         ///Marker type for the `status` field
         pub struct status(());
+        ///Marker type for the `updated_at` field
+        pub struct updated_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PresenceBuilder<'a, S: presence_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<PresenceStatus<'a>>,
-        Option<Datetime>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<PresenceStatus<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Presence<'a> {
@@ -285,9 +284,9 @@ impl<'a> PresenceBuilder<'a, presence_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PresenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -295,12 +294,12 @@ impl<'a> PresenceBuilder<'a, presence_state::Empty> {
 impl<'a, S: presence_state::State> PresenceBuilder<'a, S> {
     /// Set the `awayMessage` field (optional)
     pub fn away_message(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `awayMessage` field to an Option value (optional)
     pub fn maybe_away_message(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -315,11 +314,11 @@ where
         mut self,
         value: impl Into<PresenceStatus<'a>>,
     ) -> PresenceBuilder<'a, presence_state::SetStatus<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PresenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -334,11 +333,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PresenceBuilder<'a, presence_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PresenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -346,15 +345,15 @@ where
 impl<'a, S> PresenceBuilder<'a, S>
 where
     S: presence_state::State,
-    S::UpdatedAt: presence_state::IsSet,
     S::Status: presence_state::IsSet,
+    S::UpdatedAt: presence_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Presence<'a> {
         Presence {
-            away_message: self.__unsafe_private_named.0,
-            status: self.__unsafe_private_named.1.unwrap(),
-            updated_at: self.__unsafe_private_named.2.unwrap(),
+            away_message: self._fields.0,
+            status: self._fields.1.unwrap(),
+            updated_at: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -367,9 +366,9 @@ where
         >,
     ) -> Presence<'a> {
         Presence {
-            away_message: self.__unsafe_private_named.0,
-            status: self.__unsafe_private_named.1.unwrap(),
-            updated_at: self.__unsafe_private_named.2.unwrap(),
+            away_message: self._fields.0,
+            status: self._fields.1.unwrap(),
+            updated_at: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_protoimsg/chat/role.rs b/crates/jacquard-api/src/app_protoimsg/chat/role.rs
index 07a63915..9ca4421d 100644
--- a/crates/jacquard-api/src/app_protoimsg/chat/role.rs
+++ b/crates/jacquard-api/src/app_protoimsg/chat/role.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -206,80 +209,80 @@ pub mod role_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Role;
-        type Room;
-        type Subject;
         type CreatedAt;
+        type Subject;
+        type Room;
+        type Role;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Role = Unset;
-        type Room = Unset;
-        type Subject = Unset;
         type CreatedAt = Unset;
+        type Subject = Unset;
+        type Room = Unset;
+        type Role = Unset;
     }
-    ///State transition - sets the `role` field to Set
-    pub struct SetRole<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRole<S> {}
-    impl<S: State> State for SetRole<S> {
-        type Role = Set<members::role>;
-        type Room = S::Room;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
         type Subject = S::Subject;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `room` field to Set
-    pub struct SetRoom<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRoom<S> {}
-    impl<S: State> State for SetRoom<S> {
+        type Room = S::Room;
         type Role = S::Role;
-        type Room = Set<members::room>;
-        type Subject = S::Subject;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type Role = S::Role;
-        type Room = S::Room;
-        type Subject = Set<members::subject>;
         type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
+        type Room = S::Room;
+        type Role = S::Role;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+    ///State transition - sets the `room` field to Set
+    pub struct SetRoom<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRoom<S> {}
+    impl<S: State> State for SetRoom<S> {
+        type CreatedAt = S::CreatedAt;
+        type Subject = S::Subject;
+        type Room = Set<members::room>;
         type Role = S::Role;
-        type Room = S::Room;
+    }
+    ///State transition - sets the `role` field to Set
+    pub struct SetRole<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRole<S> {}
+    impl<S: State> State for SetRole<S> {
+        type CreatedAt = S::CreatedAt;
         type Subject = S::Subject;
-        type CreatedAt = Set<members::created_at>;
+        type Room = S::Room;
+        type Role = Set<members::role>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `role` field
-        pub struct role(());
-        ///Marker type for the `room` field
-        pub struct room(());
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
+        ///Marker type for the `room` field
+        pub struct room(());
+        ///Marker type for the `role` field
+        pub struct role(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RoleBuilder<'a, S: role_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<RoleRole<'a>>,
         Option<AtUri<'a>>,
         Option<Did<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Role<'a> {
@@ -293,9 +296,9 @@ impl<'a> RoleBuilder<'a, role_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RoleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -310,11 +313,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RoleBuilder<'a, role_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RoleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -329,11 +332,11 @@ where
         mut self,
         value: impl Into<RoleRole<'a>>,
     ) -> RoleBuilder<'a, role_state::SetRole<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RoleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -348,11 +351,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RoleBuilder<'a, role_state::SetRoom<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RoleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -367,11 +370,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> RoleBuilder<'a, role_state::SetSubject<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RoleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -379,18 +382,18 @@ where
 impl<'a, S> RoleBuilder<'a, S>
 where
     S: role_state::State,
-    S::Role: role_state::IsSet,
-    S::Room: role_state::IsSet,
-    S::Subject: role_state::IsSet,
     S::CreatedAt: role_state::IsSet,
+    S::Subject: role_state::IsSet,
+    S::Room: role_state::IsSet,
+    S::Role: role_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Role<'a> {
         Role {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            role: self.__unsafe_private_named.1.unwrap(),
-            room: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            role: self._fields.1.unwrap(),
+            room: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -403,10 +406,10 @@ where
         >,
     ) -> Role<'a> {
         Role {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            role: self.__unsafe_private_named.1.unwrap(),
-            room: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            role: self._fields.1.unwrap(),
+            room: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_protoimsg/chat/room.rs b/crates/jacquard-api/src/app_protoimsg/chat/room.rs
index bfef5244..6ef668be 100644
--- a/crates/jacquard-api/src/app_protoimsg/chat/room.rs
+++ b/crates/jacquard-api/src/app_protoimsg/chat/room.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -425,8 +428,8 @@ pub mod room_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Purpose;
-        type CreatedAt;
         type Name;
+        type CreatedAt;
         type Topic;
     }
     /// Empty state - all required fields are unset
@@ -434,8 +437,8 @@ pub mod room_state {
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Purpose = Unset;
-        type CreatedAt = Unset;
         type Name = Unset;
+        type CreatedAt = Unset;
         type Topic = Unset;
     }
     ///State transition - sets the `purpose` field to Set
@@ -443,17 +446,8 @@ pub mod room_state {
     impl<S: State> sealed::Sealed for SetPurpose<S> {}
     impl<S: State> State for SetPurpose<S> {
         type Purpose = Set<members::purpose>;
-        type CreatedAt = S::CreatedAt;
-        type Name = S::Name;
-        type Topic = S::Topic;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type Purpose = S::Purpose;
-        type CreatedAt = Set<members::created_at>;
         type Name = S::Name;
+        type CreatedAt = S::CreatedAt;
         type Topic = S::Topic;
     }
     ///State transition - sets the `name` field to Set
@@ -461,8 +455,17 @@ pub mod room_state {
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
         type Purpose = S::Purpose;
-        type CreatedAt = S::CreatedAt;
         type Name = Set<members::name>;
+        type CreatedAt = S::CreatedAt;
+        type Topic = S::Topic;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Purpose = S::Purpose;
+        type Name = S::Name;
+        type CreatedAt = Set<members::created_at>;
         type Topic = S::Topic;
     }
     ///State transition - sets the `topic` field to Set
@@ -470,8 +473,8 @@ pub mod room_state {
     impl<S: State> sealed::Sealed for SetTopic<S> {}
     impl<S: State> State for SetTopic<S> {
         type Purpose = S::Purpose;
-        type CreatedAt = S::CreatedAt;
         type Name = S::Name;
+        type CreatedAt = S::CreatedAt;
         type Topic = Set<members::topic>;
     }
     /// Marker types for field names
@@ -479,10 +482,10 @@ pub mod room_state {
     pub mod members {
         ///Marker type for the `purpose` field
         pub struct purpose(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `topic` field
         pub struct topic(());
     }
@@ -490,8 +493,8 @@ pub mod room_state {
 
 /// Builder for constructing an instance of this type
 pub struct RoomBuilder<'a, S: room_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -500,7 +503,7 @@ pub struct RoomBuilder<'a, S: room_state::State> {
         Option<room::RoomSettings<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Room<'a> {
@@ -514,9 +517,9 @@ impl<'a> RoomBuilder<'a, room_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RoomBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -524,12 +527,12 @@ impl<'a> RoomBuilder<'a, room_state::Empty> {
 impl<'a, S: room_state::State> RoomBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -544,11 +547,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RoomBuilder<'a, room_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RoomBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -556,12 +559,12 @@ where
 impl<'a, S: room_state::State> RoomBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -576,11 +579,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RoomBuilder<'a, room_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RoomBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -595,11 +598,11 @@ where
         mut self,
         value: impl Into<RoomPurpose<'a>>,
     ) -> RoomBuilder<'a, room_state::SetPurpose<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RoomBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -607,12 +610,12 @@ where
 impl<'a, S: room_state::State> RoomBuilder<'a, S> {
     /// Set the `settings` field (optional)
     pub fn settings(mut self, value: impl Into<Option<room::RoomSettings<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `settings` field to an Option value (optional)
     pub fn maybe_settings(mut self, value: Option<room::RoomSettings<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -627,11 +630,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RoomBuilder<'a, room_state::SetTopic<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         RoomBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -640,20 +643,20 @@ impl<'a, S> RoomBuilder<'a, S>
 where
     S: room_state::State,
     S::Purpose: room_state::IsSet,
-    S::CreatedAt: room_state::IsSet,
     S::Name: room_state::IsSet,
+    S::CreatedAt: room_state::IsSet,
     S::Topic: room_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Room<'a> {
         Room {
-            category: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            purpose: self.__unsafe_private_named.4.unwrap(),
-            settings: self.__unsafe_private_named.5,
-            topic: self.__unsafe_private_named.6.unwrap(),
+            category: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            name: self._fields.3.unwrap(),
+            purpose: self._fields.4.unwrap(),
+            settings: self._fields.5,
+            topic: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -666,13 +669,13 @@ where
         >,
     ) -> Room<'a> {
         Room {
-            category: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            purpose: self.__unsafe_private_named.4.unwrap(),
-            settings: self.__unsafe_private_named.5,
-            topic: self.__unsafe_private_named.6.unwrap(),
+            category: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            name: self._fields.3.unwrap(),
+            purpose: self._fields.4.unwrap(),
+            settings: self._fields.5,
+            topic: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_protoimsg/chat/vote.rs b/crates/jacquard-api/src/app_protoimsg/chat/vote.rs
index 36f9d2b9..5c63beb6 100644
--- a/crates/jacquard-api/src/app_protoimsg/chat/vote.rs
+++ b/crates/jacquard-api/src/app_protoimsg/chat/vote.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -173,9 +176,9 @@ pub mod vote_state {
 
 /// Builder for constructing an instance of this type
 pub struct VoteBuilder<'a, S: vote_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>, Option<Vec<i64>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>, Option<Vec<i64>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Vote<'a> {
@@ -189,9 +192,9 @@ impl<'a> VoteBuilder<'a, vote_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -206,11 +209,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> VoteBuilder<'a, vote_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -225,11 +228,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> VoteBuilder<'a, vote_state::SetPoll<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,11 +247,11 @@ where
         mut self,
         value: impl Into<Vec<i64>>,
     ) -> VoteBuilder<'a, vote_state::SetSelectedOptions<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -263,9 +266,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Vote<'a> {
         Vote {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            poll: self.__unsafe_private_named.1.unwrap(),
-            selected_options: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            poll: self._fields.1.unwrap(),
+            selected_options: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -278,9 +281,9 @@ where
         >,
     ) -> Vote<'a> {
         Vote {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            poll: self.__unsafe_private_named.1.unwrap(),
-            selected_options: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            poll: self._fields.1.unwrap(),
+            selected_options: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_rocksky/actor/get_actor_albums.rs b/crates/jacquard-api/src/app_rocksky/actor/get_actor_albums.rs
index a718902f..1e16147f 100644
--- a/crates/jacquard-api/src/app_rocksky/actor/get_actor_albums.rs
+++ b/crates/jacquard-api/src/app_rocksky/actor/get_actor_albums.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_common::types::string::Datetime;
@@ -98,15 +101,15 @@ pub mod get_actor_albums_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorAlbumsBuilder<'a, S: get_actor_albums_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<Datetime>,
         Option<i64>,
         Option<i64>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorAlbums<'a> {
@@ -120,9 +123,9 @@ impl<'a> GetActorAlbumsBuilder<'a, get_actor_albums_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorAlbumsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,11 +140,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorAlbumsBuilder<'a, get_actor_albums_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorAlbumsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,12 +152,12 @@ where
 impl<'a, S: get_actor_albums_state::State> GetActorAlbumsBuilder<'a, S> {
     /// Set the `endDate` field (optional)
     pub fn end_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `endDate` field to an Option value (optional)
     pub fn maybe_end_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -162,12 +165,12 @@ impl<'a, S: get_actor_albums_state::State> GetActorAlbumsBuilder<'a, S> {
 impl<'a, S: get_actor_albums_state::State> GetActorAlbumsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -175,12 +178,12 @@ impl<'a, S: get_actor_albums_state::State> GetActorAlbumsBuilder<'a, S> {
 impl<'a, S: get_actor_albums_state::State> GetActorAlbumsBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -188,12 +191,12 @@ impl<'a, S: get_actor_albums_state::State> GetActorAlbumsBuilder<'a, S> {
 impl<'a, S: get_actor_albums_state::State> GetActorAlbumsBuilder<'a, S> {
     /// Set the `startDate` field (optional)
     pub fn start_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `startDate` field to an Option value (optional)
     pub fn maybe_start_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -206,11 +209,11 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorAlbums<'a> {
         GetActorAlbums {
-            did: self.__unsafe_private_named.0.unwrap(),
-            end_date: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            offset: self.__unsafe_private_named.3,
-            start_date: self.__unsafe_private_named.4,
+            did: self._fields.0.unwrap(),
+            end_date: self._fields.1,
+            limit: self._fields.2,
+            offset: self._fields.3,
+            start_date: self._fields.4,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/actor/get_actor_artists.rs b/crates/jacquard-api/src/app_rocksky/actor/get_actor_artists.rs
index 62df57d6..50fbf50b 100644
--- a/crates/jacquard-api/src/app_rocksky/actor/get_actor_artists.rs
+++ b/crates/jacquard-api/src/app_rocksky/actor/get_actor_artists.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_common::types::string::Datetime;
@@ -98,15 +101,15 @@ pub mod get_actor_artists_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorArtistsBuilder<'a, S: get_actor_artists_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<Datetime>,
         Option<i64>,
         Option<i64>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorArtists<'a> {
@@ -120,9 +123,9 @@ impl<'a> GetActorArtistsBuilder<'a, get_actor_artists_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorArtistsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,11 +140,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorArtistsBuilder<'a, get_actor_artists_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorArtistsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,12 +152,12 @@ where
 impl<'a, S: get_actor_artists_state::State> GetActorArtistsBuilder<'a, S> {
     /// Set the `endDate` field (optional)
     pub fn end_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `endDate` field to an Option value (optional)
     pub fn maybe_end_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -162,12 +165,12 @@ impl<'a, S: get_actor_artists_state::State> GetActorArtistsBuilder<'a, S> {
 impl<'a, S: get_actor_artists_state::State> GetActorArtistsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -175,12 +178,12 @@ impl<'a, S: get_actor_artists_state::State> GetActorArtistsBuilder<'a, S> {
 impl<'a, S: get_actor_artists_state::State> GetActorArtistsBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -188,12 +191,12 @@ impl<'a, S: get_actor_artists_state::State> GetActorArtistsBuilder<'a, S> {
 impl<'a, S: get_actor_artists_state::State> GetActorArtistsBuilder<'a, S> {
     /// Set the `startDate` field (optional)
     pub fn start_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `startDate` field to an Option value (optional)
     pub fn maybe_start_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -206,11 +209,11 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorArtists<'a> {
         GetActorArtists {
-            did: self.__unsafe_private_named.0.unwrap(),
-            end_date: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            offset: self.__unsafe_private_named.3,
-            start_date: self.__unsafe_private_named.4,
+            did: self._fields.0.unwrap(),
+            end_date: self._fields.1,
+            limit: self._fields.2,
+            offset: self._fields.3,
+            start_date: self._fields.4,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/actor/get_actor_compatibility.rs b/crates/jacquard-api/src/app_rocksky/actor/get_actor_compatibility.rs
index 4691a0b8..86355e8d 100644
--- a/crates/jacquard-api/src/app_rocksky/actor/get_actor_compatibility.rs
+++ b/crates/jacquard-api/src/app_rocksky/actor/get_actor_compatibility.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -87,9 +90,9 @@ pub mod get_actor_compatibility_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorCompatibilityBuilder<'a, S: get_actor_compatibility_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorCompatibility<'a> {
@@ -106,9 +109,9 @@ impl<'a> GetActorCompatibilityBuilder<'a, get_actor_compatibility_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorCompatibilityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -123,11 +126,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorCompatibilityBuilder<'a, get_actor_compatibility_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorCompatibilityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -140,7 +143,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorCompatibility<'a> {
         GetActorCompatibility {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/actor/get_actor_loved_songs.rs b/crates/jacquard-api/src/app_rocksky/actor/get_actor_loved_songs.rs
index 83a55c9d..c0d8e4dd 100644
--- a/crates/jacquard-api/src/app_rocksky/actor/get_actor_loved_songs.rs
+++ b/crates/jacquard-api/src/app_rocksky/actor/get_actor_loved_songs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -93,9 +96,9 @@ pub mod get_actor_loved_songs_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorLovedSongsBuilder<'a, S: get_actor_loved_songs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorLovedSongs<'a> {
@@ -109,9 +112,9 @@ impl<'a> GetActorLovedSongsBuilder<'a, get_actor_loved_songs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorLovedSongsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -126,11 +129,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorLovedSongsBuilder<'a, get_actor_loved_songs_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorLovedSongsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -138,12 +141,12 @@ where
 impl<'a, S: get_actor_loved_songs_state::State> GetActorLovedSongsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -151,12 +154,12 @@ impl<'a, S: get_actor_loved_songs_state::State> GetActorLovedSongsBuilder<'a, S>
 impl<'a, S: get_actor_loved_songs_state::State> GetActorLovedSongsBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -169,9 +172,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorLovedSongs<'a> {
         GetActorLovedSongs {
-            did: self.__unsafe_private_named.0.unwrap(),
-            limit: self.__unsafe_private_named.1,
-            offset: self.__unsafe_private_named.2,
+            did: self._fields.0.unwrap(),
+            limit: self._fields.1,
+            offset: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/actor/get_actor_neighbours.rs b/crates/jacquard-api/src/app_rocksky/actor/get_actor_neighbours.rs
index 0e879a63..241cf1de 100644
--- a/crates/jacquard-api/src/app_rocksky/actor/get_actor_neighbours.rs
+++ b/crates/jacquard-api/src/app_rocksky/actor/get_actor_neighbours.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -87,9 +90,9 @@ pub mod get_actor_neighbours_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorNeighboursBuilder<'a, S: get_actor_neighbours_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorNeighbours<'a> {
@@ -103,9 +106,9 @@ impl<'a> GetActorNeighboursBuilder<'a, get_actor_neighbours_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorNeighboursBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,11 +123,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorNeighboursBuilder<'a, get_actor_neighbours_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorNeighboursBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,7 +140,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorNeighbours<'a> {
         GetActorNeighbours {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/actor/get_actor_playlists.rs b/crates/jacquard-api/src/app_rocksky/actor/get_actor_playlists.rs
index ffed1788..50c8c2e5 100644
--- a/crates/jacquard-api/src/app_rocksky/actor/get_actor_playlists.rs
+++ b/crates/jacquard-api/src/app_rocksky/actor/get_actor_playlists.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -93,9 +96,9 @@ pub mod get_actor_playlists_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorPlaylistsBuilder<'a, S: get_actor_playlists_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorPlaylists<'a> {
@@ -109,9 +112,9 @@ impl<'a> GetActorPlaylistsBuilder<'a, get_actor_playlists_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorPlaylistsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -126,11 +129,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorPlaylistsBuilder<'a, get_actor_playlists_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorPlaylistsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -138,12 +141,12 @@ where
 impl<'a, S: get_actor_playlists_state::State> GetActorPlaylistsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -151,12 +154,12 @@ impl<'a, S: get_actor_playlists_state::State> GetActorPlaylistsBuilder<'a, S> {
 impl<'a, S: get_actor_playlists_state::State> GetActorPlaylistsBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -169,9 +172,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorPlaylists<'a> {
         GetActorPlaylists {
-            did: self.__unsafe_private_named.0.unwrap(),
-            limit: self.__unsafe_private_named.1,
-            offset: self.__unsafe_private_named.2,
+            did: self._fields.0.unwrap(),
+            limit: self._fields.1,
+            offset: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/actor/get_actor_scrobbles.rs b/crates/jacquard-api/src/app_rocksky/actor/get_actor_scrobbles.rs
index d97ad494..97634587 100644
--- a/crates/jacquard-api/src/app_rocksky/actor/get_actor_scrobbles.rs
+++ b/crates/jacquard-api/src/app_rocksky/actor/get_actor_scrobbles.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -93,9 +96,9 @@ pub mod get_actor_scrobbles_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorScrobblesBuilder<'a, S: get_actor_scrobbles_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorScrobbles<'a> {
@@ -109,9 +112,9 @@ impl<'a> GetActorScrobblesBuilder<'a, get_actor_scrobbles_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorScrobblesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -126,11 +129,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorScrobblesBuilder<'a, get_actor_scrobbles_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorScrobblesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -138,12 +141,12 @@ where
 impl<'a, S: get_actor_scrobbles_state::State> GetActorScrobblesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -151,12 +154,12 @@ impl<'a, S: get_actor_scrobbles_state::State> GetActorScrobblesBuilder<'a, S> {
 impl<'a, S: get_actor_scrobbles_state::State> GetActorScrobblesBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -169,9 +172,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorScrobbles<'a> {
         GetActorScrobbles {
-            did: self.__unsafe_private_named.0.unwrap(),
-            limit: self.__unsafe_private_named.1,
-            offset: self.__unsafe_private_named.2,
+            did: self._fields.0.unwrap(),
+            limit: self._fields.1,
+            offset: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/actor/get_actor_songs.rs b/crates/jacquard-api/src/app_rocksky/actor/get_actor_songs.rs
index 377e7e9e..1410ee80 100644
--- a/crates/jacquard-api/src/app_rocksky/actor/get_actor_songs.rs
+++ b/crates/jacquard-api/src/app_rocksky/actor/get_actor_songs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_common::types::string::Datetime;
@@ -98,15 +101,15 @@ pub mod get_actor_songs_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorSongsBuilder<'a, S: get_actor_songs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<Datetime>,
         Option<i64>,
         Option<i64>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorSongs<'a> {
@@ -120,9 +123,9 @@ impl<'a> GetActorSongsBuilder<'a, get_actor_songs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorSongsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,11 +140,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorSongsBuilder<'a, get_actor_songs_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorSongsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,12 +152,12 @@ where
 impl<'a, S: get_actor_songs_state::State> GetActorSongsBuilder<'a, S> {
     /// Set the `endDate` field (optional)
     pub fn end_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `endDate` field to an Option value (optional)
     pub fn maybe_end_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -162,12 +165,12 @@ impl<'a, S: get_actor_songs_state::State> GetActorSongsBuilder<'a, S> {
 impl<'a, S: get_actor_songs_state::State> GetActorSongsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -175,12 +178,12 @@ impl<'a, S: get_actor_songs_state::State> GetActorSongsBuilder<'a, S> {
 impl<'a, S: get_actor_songs_state::State> GetActorSongsBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -188,12 +191,12 @@ impl<'a, S: get_actor_songs_state::State> GetActorSongsBuilder<'a, S> {
 impl<'a, S: get_actor_songs_state::State> GetActorSongsBuilder<'a, S> {
     /// Set the `startDate` field (optional)
     pub fn start_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `startDate` field to an Option value (optional)
     pub fn maybe_start_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -206,11 +209,11 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorSongs<'a> {
         GetActorSongs {
-            did: self.__unsafe_private_named.0.unwrap(),
-            end_date: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            offset: self.__unsafe_private_named.3,
-            start_date: self.__unsafe_private_named.4,
+            did: self._fields.0.unwrap(),
+            end_date: self._fields.1,
+            limit: self._fields.2,
+            offset: self._fields.3,
+            start_date: self._fields.4,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/actor/get_profile.rs b/crates/jacquard-api/src/app_rocksky/actor/get_profile.rs
index 5278b182..285a8b0f 100644
--- a/crates/jacquard-api/src/app_rocksky/actor/get_profile.rs
+++ b/crates/jacquard-api/src/app_rocksky/actor/get_profile.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::IntoStatic;
@@ -74,9 +75,9 @@ pub mod get_profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetProfileBuilder<'a, S: get_profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetProfile<'a> {
@@ -90,9 +91,9 @@ impl<'a> GetProfileBuilder<'a, get_profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -100,12 +101,12 @@ impl<'a> GetProfileBuilder<'a, get_profile_state::Empty> {
 impl<'a, S: get_profile_state::State> GetProfileBuilder<'a, S> {
     /// Set the `did` field (optional)
     pub fn did(mut self, value: impl Into<Option<AtIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `did` field to an Option value (optional)
     pub fn maybe_did(mut self, value: Option<AtIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -116,8 +117,6 @@ where
 {
     /// Build the final struct
     pub fn build(self) -> GetProfile<'a> {
-        GetProfile {
-            did: self.__unsafe_private_named.0,
-        }
+        GetProfile { did: self._fields.0 }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/album.rs b/crates/jacquard-api/src/app_rocksky/album.rs
index 1744c057..60731e42 100644
--- a/crates/jacquard-api/src/app_rocksky/album.rs
+++ b/crates/jacquard-api/src/app_rocksky/album.rs
@@ -9,7 +9,11 @@ pub mod get_album;
 pub mod get_album_tracks;
 pub mod get_albums;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -27,7 +31,7 @@ use jacquard_lexicon::schema::LexiconSchema;
 
 #[allow(unused_imports)]
 use jacquard_lexicon::validation::{ConstraintError, ValidationPath};
-use serde::{Deserialize, Serialize};
+use serde::{Serialize, Deserialize};
 /// A declaration of an album.
 
 #[lexicon]
@@ -99,6 +103,7 @@ pub struct AlbumGetRecordOutput<'a> {
     pub value: Album<'a>,
 }
 
+
 #[lexicon]
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, IntoStatic, Default)]
 #[serde(rename_all = "camelCase")]
@@ -146,6 +151,7 @@ pub struct AlbumViewBasic<'a> {
     pub year: Option<i64>,
 }
 
+
 #[lexicon]
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, IntoStatic, Default)]
 #[serde(rename_all = "camelCase")]
@@ -200,7 +206,9 @@ pub struct AlbumViewDetailed<'a> {
 }
 
 impl<'a> Album<'a> {
-    pub fn uri(uri: impl Into<CowStr<'a>>) -> Result<RecordUri<'a, AlbumRecord>, UriError> {
+    pub fn uri(
+        uri: impl Into<CowStr<'a>>,
+    ) -> Result<RecordUri<'a, AlbumRecord>, UriError> {
         RecordUri::try_from_uri(AtUri::new_cow(uri.into())?)
     }
 }
@@ -260,20 +268,25 @@ impl<'a> LexiconSchema for Album<'a> {
             {
                 let mime = value.blob().mime_type.as_str();
                 let accepted: &[&str] = &["image/png", "image/jpeg"];
-                let matched = accepted.iter().any(|pattern| {
-                    if *pattern == "*/*" {
-                        true
-                    } else if pattern.ends_with("/*") {
-                        let prefix = &pattern[..pattern.len() - 2];
-                        mime.starts_with(prefix) && mime.as_bytes().get(prefix.len()) == Some(&b'/')
-                    } else {
-                        mime == *pattern
-                    }
-                });
+                let matched = accepted
+                    .iter()
+                    .any(|pattern| {
+                        if *pattern == "*/*" {
+                            true
+                        } else if pattern.ends_with("/*") {
+                            let prefix = &pattern[..pattern.len() - 2];
+                            mime.starts_with(prefix)
+                                && mime.as_bytes().get(prefix.len()) == Some(&b'/')
+                        } else {
+                            mime == *pattern
+                        }
+                    });
                 if !matched {
                     return Err(ConstraintError::BlobMimeTypeNotAccepted {
                         path: ValidationPath::from_field("album_art"),
-                        accepted: vec!["image/png".to_string(), "image/jpeg".to_string()],
+                        accepted: vec![
+                            "image/png".to_string(), "image/jpeg".to_string()
+                        ],
                         actual: mime.to_string(),
                     });
                 }
@@ -405,7 +418,7 @@ impl<'a> LexiconSchema for AlbumViewDetailed<'a> {
 
 pub mod album_state {
 
-    pub use crate::builder_types::{IsSet, IsUnset, Set, Unset};
+    pub use crate::builder_types::{Set, Unset, IsSet, IsUnset};
     #[allow(unused)]
     use ::core::marker::PhantomData;
     mod sealed {
@@ -413,58 +426,58 @@ pub mod album_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Artist;
         type Title;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Artist = Unset;
         type Title = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Artist = S::Artist;
-        type Title = S::Title;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `artist` field to Set
     pub struct SetArtist<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetArtist<S> {}
     impl<S: State> State for SetArtist<S> {
-        type CreatedAt = S::CreatedAt;
         type Artist = Set<members::artist>;
         type Title = S::Title;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type CreatedAt = S::CreatedAt;
         type Artist = S::Artist;
         type Title = Set<members::title>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Artist = S::Artist;
+        type Title = S::Title;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `artist` field
         pub struct artist(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AlbumBuilder<'a, S: album_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<UriValue<'a>>,
         Option<UriValue<'a>>,
@@ -480,7 +493,7 @@ pub struct AlbumBuilder<'a, S: album_state::State> {
         Option<i64>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Album<'a> {
@@ -494,11 +507,24 @@ impl<'a> AlbumBuilder<'a, album_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AlbumBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None, None, None, None, None, None, None, None, None, None, None, None, None, None,
+            _state: PhantomData,
+            _fields: (
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -506,12 +532,12 @@ impl<'a> AlbumBuilder<'a, album_state::Empty> {
 impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
     /// Set the `albumArt` field (optional)
     pub fn album_art(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `albumArt` field to an Option value (optional)
     pub fn maybe_album_art(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -519,12 +545,12 @@ impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
 impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
     /// Set the `albumArtUrl` field (optional)
     pub fn album_art_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `albumArtUrl` field to an Option value (optional)
     pub fn maybe_album_art_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -532,12 +558,12 @@ impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
 impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
     /// Set the `appleMusicLink` field (optional)
     pub fn apple_music_link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `appleMusicLink` field to an Option value (optional)
     pub fn maybe_apple_music_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -552,11 +578,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AlbumBuilder<'a, album_state::SetArtist<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         AlbumBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -571,11 +597,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AlbumBuilder<'a, album_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         AlbumBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -583,12 +609,12 @@ where
 impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
     /// Set the `duration` field (optional)
     pub fn duration(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `duration` field to an Option value (optional)
     pub fn maybe_duration(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -596,12 +622,12 @@ impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
 impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -609,12 +635,12 @@ impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
 impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
     /// Set the `releaseDate` field (optional)
     pub fn release_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `releaseDate` field to an Option value (optional)
     pub fn maybe_release_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -622,12 +648,12 @@ impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
 impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
     /// Set the `spotifyLink` field (optional)
     pub fn spotify_link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `spotifyLink` field to an Option value (optional)
     pub fn maybe_spotify_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -635,12 +661,12 @@ impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
 impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -648,12 +674,12 @@ impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
 impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
     /// Set the `tidalLink` field (optional)
     pub fn tidal_link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `tidalLink` field to an Option value (optional)
     pub fn maybe_tidal_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -668,11 +694,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AlbumBuilder<'a, album_state::SetTitle<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         AlbumBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -680,12 +706,12 @@ where
 impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
     /// Set the `year` field (optional)
     pub fn year(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `year` field to an Option value (optional)
     pub fn maybe_year(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -693,12 +719,12 @@ impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
 impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
     /// Set the `youtubeLink` field (optional)
     pub fn youtube_link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `youtubeLink` field to an Option value (optional)
     pub fn maybe_youtube_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -706,27 +732,27 @@ impl<'a, S: album_state::State> AlbumBuilder<'a, S> {
 impl<'a, S> AlbumBuilder<'a, S>
 where
     S: album_state::State,
-    S::CreatedAt: album_state::IsSet,
     S::Artist: album_state::IsSet,
     S::Title: album_state::IsSet,
+    S::CreatedAt: album_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Album<'a> {
         Album {
-            album_art: self.__unsafe_private_named.0,
-            album_art_url: self.__unsafe_private_named.1,
-            apple_music_link: self.__unsafe_private_named.2,
-            artist: self.__unsafe_private_named.3.unwrap(),
-            created_at: self.__unsafe_private_named.4.unwrap(),
-            duration: self.__unsafe_private_named.5,
-            genre: self.__unsafe_private_named.6,
-            release_date: self.__unsafe_private_named.7,
-            spotify_link: self.__unsafe_private_named.8,
-            tags: self.__unsafe_private_named.9,
-            tidal_link: self.__unsafe_private_named.10,
-            title: self.__unsafe_private_named.11.unwrap(),
-            year: self.__unsafe_private_named.12,
-            youtube_link: self.__unsafe_private_named.13,
+            album_art: self._fields.0,
+            album_art_url: self._fields.1,
+            apple_music_link: self._fields.2,
+            artist: self._fields.3.unwrap(),
+            created_at: self._fields.4.unwrap(),
+            duration: self._fields.5,
+            genre: self._fields.6,
+            release_date: self._fields.7,
+            spotify_link: self._fields.8,
+            tags: self._fields.9,
+            tidal_link: self._fields.10,
+            title: self._fields.11.unwrap(),
+            year: self._fields.12,
+            youtube_link: self._fields.13,
             extra_data: Default::default(),
         }
     }
@@ -736,30 +762,30 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Album<'a> {
         Album {
-            album_art: self.__unsafe_private_named.0,
-            album_art_url: self.__unsafe_private_named.1,
-            apple_music_link: self.__unsafe_private_named.2,
-            artist: self.__unsafe_private_named.3.unwrap(),
-            created_at: self.__unsafe_private_named.4.unwrap(),
-            duration: self.__unsafe_private_named.5,
-            genre: self.__unsafe_private_named.6,
-            release_date: self.__unsafe_private_named.7,
-            spotify_link: self.__unsafe_private_named.8,
-            tags: self.__unsafe_private_named.9,
-            tidal_link: self.__unsafe_private_named.10,
-            title: self.__unsafe_private_named.11.unwrap(),
-            year: self.__unsafe_private_named.12,
-            youtube_link: self.__unsafe_private_named.13,
+            album_art: self._fields.0,
+            album_art_url: self._fields.1,
+            apple_music_link: self._fields.2,
+            artist: self._fields.3.unwrap(),
+            created_at: self._fields.4.unwrap(),
+            duration: self._fields.5,
+            genre: self._fields.6,
+            release_date: self._fields.7,
+            spotify_link: self._fields.8,
+            tags: self._fields.9,
+            tidal_link: self._fields.10,
+            title: self._fields.11.unwrap(),
+            year: self._fields.12,
+            youtube_link: self._fields.13,
             extra_data: Some(extra_data),
         }
     }
 }
 
 fn lexicon_doc_app_rocksky_album() -> LexiconDoc<'static> {
-    use alloc::collections::BTreeMap;
     #[allow(unused_imports)]
     use jacquard_common::{CowStr, deps::smol_str::SmolStr, types::blob::MimeType};
     use jacquard_lexicon::lexicon::*;
+    use alloc::collections::BTreeMap;
     LexiconDoc {
         lexicon: Lexicon::Lexicon1,
         id: CowStr::new_static("app.rocksky.album"),
@@ -771,26 +797,25 @@ fn lexicon_doc_app_rocksky_album() -> LexiconDoc<'static> {
                     description: Some(CowStr::new_static("A declaration of an album.")),
                     key: Some(CowStr::new_static("tid")),
                     record: LexRecordRecord::Object(LexObject {
-                        required: Some(vec![
-                            SmolStr::new_static("title"),
-                            SmolStr::new_static("artist"),
-                            SmolStr::new_static("createdAt"),
-                        ]),
+                        required: Some(
+                            vec![
+                                SmolStr::new_static("title"), SmolStr::new_static("artist"),
+                                SmolStr::new_static("createdAt")
+                            ],
+                        ),
                         properties: {
                             #[allow(unused_mut)]
                             let mut map = BTreeMap::new();
                             map.insert(
                                 SmolStr::new_static("albumArt"),
-                                LexObjectProperty::Blob(LexBlob {
-                                    ..Default::default()
-                                }),
+                                LexObjectProperty::Blob(LexBlob { ..Default::default() }),
                             );
                             map.insert(
                                 SmolStr::new_static("albumArtUrl"),
                                 LexObjectProperty::String(LexString {
-                                    description: Some(CowStr::new_static(
-                                        "The URL of the album art of the album.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static("The URL of the album art of the album."),
+                                    ),
                                     format: Some(LexStringFormat::Uri),
                                     ..Default::default()
                                 }),
@@ -798,9 +823,9 @@ fn lexicon_doc_app_rocksky_album() -> LexiconDoc<'static> {
                             map.insert(
                                 SmolStr::new_static("appleMusicLink"),
                                 LexObjectProperty::String(LexString {
-                                    description: Some(CowStr::new_static(
-                                        "The Apple Music link of the album.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static("The Apple Music link of the album."),
+                                    ),
                                     format: Some(LexStringFormat::Uri),
                                     ..Default::default()
                                 }),
@@ -808,9 +833,9 @@ fn lexicon_doc_app_rocksky_album() -> LexiconDoc<'static> {
                             map.insert(
                                 SmolStr::new_static("artist"),
                                 LexObjectProperty::String(LexString {
-                                    description: Some(CowStr::new_static(
-                                        "The artist of the album.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static("The artist of the album."),
+                                    ),
                                     min_length: Some(1usize),
                                     max_length: Some(256usize),
                                     ..Default::default()
@@ -819,9 +844,11 @@ fn lexicon_doc_app_rocksky_album() -> LexiconDoc<'static> {
                             map.insert(
                                 SmolStr::new_static("createdAt"),
                                 LexObjectProperty::String(LexString {
-                                    description: Some(CowStr::new_static(
-                                        "The date and time when the album was created.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static(
+                                            "The date and time when the album was created.",
+                                        ),
+                                    ),
                                     format: Some(LexStringFormat::Datetime),
                                     ..Default::default()
                                 }),
@@ -835,9 +862,9 @@ fn lexicon_doc_app_rocksky_album() -> LexiconDoc<'static> {
                             map.insert(
                                 SmolStr::new_static("genre"),
                                 LexObjectProperty::String(LexString {
-                                    description: Some(CowStr::new_static(
-                                        "The genre of the album.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static("The genre of the album."),
+                                    ),
                                     max_length: Some(256usize),
                                     ..Default::default()
                                 }),
@@ -845,9 +872,9 @@ fn lexicon_doc_app_rocksky_album() -> LexiconDoc<'static> {
                             map.insert(
                                 SmolStr::new_static("releaseDate"),
                                 LexObjectProperty::String(LexString {
-                                    description: Some(CowStr::new_static(
-                                        "The release date of the album.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static("The release date of the album."),
+                                    ),
                                     format: Some(LexStringFormat::Datetime),
                                     ..Default::default()
                                 }),
@@ -855,9 +882,9 @@ fn lexicon_doc_app_rocksky_album() -> LexiconDoc<'static> {
                             map.insert(
                                 SmolStr::new_static("spotifyLink"),
                                 LexObjectProperty::String(LexString {
-                                    description: Some(CowStr::new_static(
-                                        "The Spotify link of the album.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static("The Spotify link of the album."),
+                                    ),
                                     format: Some(LexStringFormat::Uri),
                                     ..Default::default()
                                 }),
@@ -865,7 +892,9 @@ fn lexicon_doc_app_rocksky_album() -> LexiconDoc<'static> {
                             map.insert(
                                 SmolStr::new_static("tags"),
                                 LexObjectProperty::Array(LexArray {
-                                    description: Some(CowStr::new_static("The tags of the album.")),
+                                    description: Some(
+                                        CowStr::new_static("The tags of the album."),
+                                    ),
                                     items: LexArrayItem::String(LexString {
                                         min_length: Some(1usize),
                                         max_length: Some(256usize),
@@ -877,9 +906,9 @@ fn lexicon_doc_app_rocksky_album() -> LexiconDoc<'static> {
                             map.insert(
                                 SmolStr::new_static("tidalLink"),
                                 LexObjectProperty::String(LexString {
-                                    description: Some(CowStr::new_static(
-                                        "The tidal link of the album.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static("The tidal link of the album."),
+                                    ),
                                     format: Some(LexStringFormat::Uri),
                                     ..Default::default()
                                 }),
@@ -887,9 +916,9 @@ fn lexicon_doc_app_rocksky_album() -> LexiconDoc<'static> {
                             map.insert(
                                 SmolStr::new_static("title"),
                                 LexObjectProperty::String(LexString {
-                                    description: Some(CowStr::new_static(
-                                        "The title of the album.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static("The title of the album."),
+                                    ),
                                     min_length: Some(1usize),
                                     max_length: Some(512usize),
                                     ..Default::default()
@@ -904,9 +933,9 @@ fn lexicon_doc_app_rocksky_album() -> LexiconDoc<'static> {
                             map.insert(
                                 SmolStr::new_static("youtubeLink"),
                                 LexObjectProperty::String(LexString {
-                                    description: Some(CowStr::new_static(
-                                        "The YouTube link of the album.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static("The YouTube link of the album."),
+                                    ),
                                     format: Some(LexStringFormat::Uri),
                                     ..Default::default()
                                 }),
@@ -925,10 +954,10 @@ fn lexicon_doc_app_rocksky_album() -> LexiconDoc<'static> {
 }
 
 fn lexicon_doc_app_rocksky_album_defs() -> LexiconDoc<'static> {
-    use alloc::collections::BTreeMap;
     #[allow(unused_imports)]
     use jacquard_common::{CowStr, deps::smol_str::SmolStr, types::blob::MimeType};
     use jacquard_lexicon::lexicon::*;
+    use alloc::collections::BTreeMap;
     LexiconDoc {
         lexicon: Lexicon::Lexicon1,
         id: CowStr::new_static("app.rocksky.album.defs"),
@@ -943,9 +972,9 @@ fn lexicon_doc_app_rocksky_album_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("albumArt"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The URL of the album art image.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static("The URL of the album art image."),
+                                ),
                                 format: Some(LexStringFormat::Uri),
                                 ..Default::default()
                             }),
@@ -953,16 +982,18 @@ fn lexicon_doc_app_rocksky_album_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("artist"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static("The artist of the album.")),
+                                description: Some(
+                                    CowStr::new_static("The artist of the album."),
+                                ),
                                 ..Default::default()
                             }),
                         );
                         map.insert(
                             SmolStr::new_static("artistUri"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The URI of the album's artist.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static("The URI of the album's artist."),
+                                ),
                                 format: Some(LexStringFormat::AtUri),
                                 ..Default::default()
                             }),
@@ -970,9 +1001,9 @@ fn lexicon_doc_app_rocksky_album_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("id"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The unique identifier of the album.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static("The unique identifier of the album."),
+                                ),
                                 ..Default::default()
                             }),
                         );
@@ -986,25 +1017,27 @@ fn lexicon_doc_app_rocksky_album_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("releaseDate"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The release date of the album.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static("The release date of the album."),
+                                ),
                                 ..Default::default()
                             }),
                         );
                         map.insert(
                             SmolStr::new_static("sha256"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The SHA256 hash of the album.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static("The SHA256 hash of the album."),
+                                ),
                                 ..Default::default()
                             }),
                         );
                         map.insert(
                             SmolStr::new_static("title"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static("The title of the album.")),
+                                description: Some(
+                                    CowStr::new_static("The title of the album."),
+                                ),
                                 ..Default::default()
                             }),
                         );
@@ -1018,7 +1051,9 @@ fn lexicon_doc_app_rocksky_album_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("uri"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static("The URI of the album.")),
+                                description: Some(
+                                    CowStr::new_static("The URI of the album."),
+                                ),
                                 format: Some(LexStringFormat::AtUri),
                                 ..Default::default()
                             }),
@@ -1043,9 +1078,9 @@ fn lexicon_doc_app_rocksky_album_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("albumArt"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The URL of the album art image.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static("The URL of the album art image."),
+                                ),
                                 format: Some(LexStringFormat::Uri),
                                 ..Default::default()
                             }),
@@ -1053,16 +1088,18 @@ fn lexicon_doc_app_rocksky_album_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("artist"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static("The artist of the album.")),
+                                description: Some(
+                                    CowStr::new_static("The artist of the album."),
+                                ),
                                 ..Default::default()
                             }),
                         );
                         map.insert(
                             SmolStr::new_static("artistUri"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The URI of the album's artist.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static("The URI of the album's artist."),
+                                ),
                                 format: Some(LexStringFormat::AtUri),
                                 ..Default::default()
                             }),
@@ -1070,9 +1107,9 @@ fn lexicon_doc_app_rocksky_album_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("id"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The unique identifier of the album.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static("The unique identifier of the album."),
+                                ),
                                 ..Default::default()
                             }),
                         );
@@ -1086,18 +1123,18 @@ fn lexicon_doc_app_rocksky_album_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("releaseDate"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The release date of the album.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static("The release date of the album."),
+                                ),
                                 ..Default::default()
                             }),
                         );
                         map.insert(
                             SmolStr::new_static("sha256"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The SHA256 hash of the album.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static("The SHA256 hash of the album."),
+                                ),
                                 ..Default::default()
                             }),
                         );
@@ -1113,7 +1150,9 @@ fn lexicon_doc_app_rocksky_album_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("title"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static("The title of the album.")),
+                                description: Some(
+                                    CowStr::new_static("The title of the album."),
+                                ),
                                 ..Default::default()
                             }),
                         );
@@ -1139,7 +1178,9 @@ fn lexicon_doc_app_rocksky_album_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("uri"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static("The URI of the album.")),
+                                description: Some(
+                                    CowStr::new_static("The URI of the album."),
+                                ),
                                 format: Some(LexStringFormat::AtUri),
                                 ..Default::default()
                             }),
@@ -1159,4 +1200,4 @@ fn lexicon_doc_app_rocksky_album_defs() -> LexiconDoc<'static> {
         },
         ..Default::default()
     }
-}
+}
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/album/get_album.rs b/crates/jacquard-api/src/app_rocksky/album/get_album.rs
index b37bbf4b..cba97907 100644
--- a/crates/jacquard-api/src/app_rocksky/album/get_album.rs
+++ b/crates/jacquard-api/src/app_rocksky/album/get_album.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_album_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetAlbumBuilder<'a, S: get_album_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetAlbum<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetAlbumBuilder<'a, get_album_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetAlbumBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetAlbumBuilder<'a, get_album_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetAlbumBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetAlbum<'a> {
         GetAlbum {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/album/get_album_tracks.rs b/crates/jacquard-api/src/app_rocksky/album/get_album_tracks.rs
index 88bafac5..32ea55bb 100644
--- a/crates/jacquard-api/src/app_rocksky/album/get_album_tracks.rs
+++ b/crates/jacquard-api/src/app_rocksky/album/get_album_tracks.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -87,9 +90,9 @@ pub mod get_album_tracks_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetAlbumTracksBuilder<'a, S: get_album_tracks_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetAlbumTracks<'a> {
@@ -103,9 +106,9 @@ impl<'a> GetAlbumTracksBuilder<'a, get_album_tracks_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetAlbumTracksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,11 +123,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetAlbumTracksBuilder<'a, get_album_tracks_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetAlbumTracksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,7 +140,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetAlbumTracks<'a> {
         GetAlbumTracks {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/album/get_albums.rs b/crates/jacquard-api/src/app_rocksky/album/get_albums.rs
index 04402f29..2fadee0b 100644
--- a/crates/jacquard-api/src/app_rocksky/album/get_albums.rs
+++ b/crates/jacquard-api/src/app_rocksky/album/get_albums.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -81,9 +84,9 @@ pub mod get_albums_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetAlbumsBuilder<'a, S: get_albums_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetAlbums<'a> {
@@ -97,9 +100,9 @@ impl<'a> GetAlbumsBuilder<'a, get_albums_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetAlbumsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -107,12 +110,12 @@ impl<'a> GetAlbumsBuilder<'a, get_albums_state::Empty> {
 impl<'a, S: get_albums_state::State> GetAlbumsBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -120,12 +123,12 @@ impl<'a, S: get_albums_state::State> GetAlbumsBuilder<'a, S> {
 impl<'a, S: get_albums_state::State> GetAlbumsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -133,12 +136,12 @@ impl<'a, S: get_albums_state::State> GetAlbumsBuilder<'a, S> {
 impl<'a, S: get_albums_state::State> GetAlbumsBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -150,9 +153,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetAlbums<'a> {
         GetAlbums {
-            genre: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            offset: self.__unsafe_private_named.2,
+            genre: self._fields.0,
+            limit: self._fields.1,
+            offset: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/apikey/create_apikey.rs b/crates/jacquard-api/src/app_rocksky/apikey/create_apikey.rs
index 7092f2d6..8b14cf3e 100644
--- a/crates/jacquard-api/src/app_rocksky/apikey/create_apikey.rs
+++ b/crates/jacquard-api/src/app_rocksky/apikey/create_apikey.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::value::Data;
diff --git a/crates/jacquard-api/src/app_rocksky/apikey/get_apikeys.rs b/crates/jacquard-api/src/app_rocksky/apikey/get_apikeys.rs
index 2f5a994b..86614380 100644
--- a/crates/jacquard-api/src/app_rocksky/apikey/get_apikeys.rs
+++ b/crates/jacquard-api/src/app_rocksky/apikey/get_apikeys.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::value::Data;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -75,8 +78,8 @@ pub mod get_apikeys_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetApikeysBuilder<S: get_apikeys_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
 }
 
 impl GetApikeys {
@@ -90,8 +93,8 @@ impl GetApikeysBuilder<get_apikeys_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetApikeysBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
+            _state: PhantomData,
+            _fields: (None, None),
         }
     }
 }
@@ -99,12 +102,12 @@ impl GetApikeysBuilder<get_apikeys_state::Empty> {
 impl<S: get_apikeys_state::State> GetApikeysBuilder<S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -112,12 +115,12 @@ impl<S: get_apikeys_state::State> GetApikeysBuilder<S> {
 impl<S: get_apikeys_state::State> GetApikeysBuilder<S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -129,8 +132,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetApikeys {
         GetApikeys {
-            limit: self.__unsafe_private_named.0,
-            offset: self.__unsafe_private_named.1,
+            limit: self._fields.0,
+            offset: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/apikey/remove_apikey.rs b/crates/jacquard-api/src/app_rocksky/apikey/remove_apikey.rs
index 3d62ee9e..aa2116c2 100644
--- a/crates/jacquard-api/src/app_rocksky/apikey/remove_apikey.rs
+++ b/crates/jacquard-api/src/app_rocksky/apikey/remove_apikey.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::value::Data;
@@ -94,9 +95,9 @@ pub mod remove_apikey_params_state {
 
 /// Builder for constructing an instance of this type
 pub struct RemoveApikeyParamsBuilder<'a, S: remove_apikey_params_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RemoveApikeyParams<'a> {
@@ -110,9 +111,9 @@ impl<'a> RemoveApikeyParamsBuilder<'a, remove_apikey_params_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RemoveApikeyParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -127,11 +128,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RemoveApikeyParamsBuilder<'a, remove_apikey_params_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RemoveApikeyParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -144,7 +145,7 @@ where
     /// Build the final struct
     pub fn build(self) -> RemoveApikeyParams<'a> {
         RemoveApikeyParams {
-            id: self.__unsafe_private_named.0.unwrap(),
+            id: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/apikey/update_apikey.rs b/crates/jacquard-api/src/app_rocksky/apikey/update_apikey.rs
index af17d1d7..a905e649 100644
--- a/crates/jacquard-api/src/app_rocksky/apikey/update_apikey.rs
+++ b/crates/jacquard-api/src/app_rocksky/apikey/update_apikey.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::value::Data;
diff --git a/crates/jacquard-api/src/app_rocksky/artist.rs b/crates/jacquard-api/src/app_rocksky/artist.rs
index d3fbcd0d..6abf1383 100644
--- a/crates/jacquard-api/src/app_rocksky/artist.rs
+++ b/crates/jacquard-api/src/app_rocksky/artist.rs
@@ -10,7 +10,11 @@ pub mod get_artist_albums;
 pub mod get_artist_tracks;
 pub mod get_artists;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -560,8 +564,8 @@ pub mod artist_state {
 
 /// Builder for constructing an instance of this type
 pub struct ArtistBuilder<'a, S: artist_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -572,7 +576,7 @@ pub struct ArtistBuilder<'a, S: artist_state::State> {
         Option<UriValue<'a>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Artist<'a> {
@@ -586,19 +590,9 @@ impl<'a> ArtistBuilder<'a, artist_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ArtistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -606,12 +600,12 @@ impl<'a> ArtistBuilder<'a, artist_state::Empty> {
 impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
     /// Set the `bio` field (optional)
     pub fn bio(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `bio` field to an Option value (optional)
     pub fn maybe_bio(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -619,12 +613,12 @@ impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
 impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
     /// Set the `born` field (optional)
     pub fn born(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `born` field to an Option value (optional)
     pub fn maybe_born(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -632,12 +626,12 @@ impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
 impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
     /// Set the `bornIn` field (optional)
     pub fn born_in(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `bornIn` field to an Option value (optional)
     pub fn maybe_born_in(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -652,11 +646,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ArtistBuilder<'a, artist_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ArtistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -664,12 +658,12 @@ where
 impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
     /// Set the `died` field (optional)
     pub fn died(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `died` field to an Option value (optional)
     pub fn maybe_died(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -684,11 +678,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ArtistBuilder<'a, artist_state::SetName<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ArtistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -696,12 +690,12 @@ where
 impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
     /// Set the `picture` field (optional)
     pub fn picture(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `picture` field to an Option value (optional)
     pub fn maybe_picture(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -709,12 +703,12 @@ impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
 impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
     /// Set the `pictureUrl` field (optional)
     pub fn picture_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `pictureUrl` field to an Option value (optional)
     pub fn maybe_picture_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -722,12 +716,12 @@ impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
 impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -741,15 +735,15 @@ where
     /// Build the final struct
     pub fn build(self) -> Artist<'a> {
         Artist {
-            bio: self.__unsafe_private_named.0,
-            born: self.__unsafe_private_named.1,
-            born_in: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            died: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            picture: self.__unsafe_private_named.6,
-            picture_url: self.__unsafe_private_named.7,
-            tags: self.__unsafe_private_named.8,
+            bio: self._fields.0,
+            born: self._fields.1,
+            born_in: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            died: self._fields.4,
+            name: self._fields.5.unwrap(),
+            picture: self._fields.6,
+            picture_url: self._fields.7,
+            tags: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -762,15 +756,15 @@ where
         >,
     ) -> Artist<'a> {
         Artist {
-            bio: self.__unsafe_private_named.0,
-            born: self.__unsafe_private_named.1,
-            born_in: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            died: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            picture: self.__unsafe_private_named.6,
-            picture_url: self.__unsafe_private_named.7,
-            tags: self.__unsafe_private_named.8,
+            bio: self._fields.0,
+            born: self._fields.1,
+            born_in: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            died: self._fields.4,
+            name: self._fields.5.unwrap(),
+            picture: self._fields.6,
+            picture_url: self._fields.7,
+            tags: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_rocksky/artist/get_artist.rs b/crates/jacquard-api/src/app_rocksky/artist/get_artist.rs
index e56b9967..ff0e692d 100644
--- a/crates/jacquard-api/src/app_rocksky/artist/get_artist.rs
+++ b/crates/jacquard-api/src/app_rocksky/artist/get_artist.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_artist_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetArtistBuilder<'a, S: get_artist_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetArtist<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetArtistBuilder<'a, get_artist_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetArtistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetArtistBuilder<'a, get_artist_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetArtistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetArtist<'a> {
         GetArtist {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/artist/get_artist_albums.rs b/crates/jacquard-api/src/app_rocksky/artist/get_artist_albums.rs
index 228ce91c..521cc943 100644
--- a/crates/jacquard-api/src/app_rocksky/artist/get_artist_albums.rs
+++ b/crates/jacquard-api/src/app_rocksky/artist/get_artist_albums.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -87,9 +90,9 @@ pub mod get_artist_albums_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetArtistAlbumsBuilder<'a, S: get_artist_albums_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetArtistAlbums<'a> {
@@ -103,9 +106,9 @@ impl<'a> GetArtistAlbumsBuilder<'a, get_artist_albums_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetArtistAlbumsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,11 +123,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetArtistAlbumsBuilder<'a, get_artist_albums_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetArtistAlbumsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,7 +140,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetArtistAlbums<'a> {
         GetArtistAlbums {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/artist/get_artist_tracks.rs b/crates/jacquard-api/src/app_rocksky/artist/get_artist_tracks.rs
index d1f66afe..b980ea98 100644
--- a/crates/jacquard-api/src/app_rocksky/artist/get_artist_tracks.rs
+++ b/crates/jacquard-api/src/app_rocksky/artist/get_artist_tracks.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -81,9 +84,9 @@ pub mod get_artist_tracks_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetArtistTracksBuilder<'a, S: get_artist_tracks_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetArtistTracks<'a> {
@@ -97,9 +100,9 @@ impl<'a> GetArtistTracksBuilder<'a, get_artist_tracks_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetArtistTracksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -107,12 +110,12 @@ impl<'a> GetArtistTracksBuilder<'a, get_artist_tracks_state::Empty> {
 impl<'a, S: get_artist_tracks_state::State> GetArtistTracksBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -120,12 +123,12 @@ impl<'a, S: get_artist_tracks_state::State> GetArtistTracksBuilder<'a, S> {
 impl<'a, S: get_artist_tracks_state::State> GetArtistTracksBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -133,12 +136,12 @@ impl<'a, S: get_artist_tracks_state::State> GetArtistTracksBuilder<'a, S> {
 impl<'a, S: get_artist_tracks_state::State> GetArtistTracksBuilder<'a, S> {
     /// Set the `uri` field (optional)
     pub fn uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `uri` field to an Option value (optional)
     pub fn maybe_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -150,9 +153,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetArtistTracks<'a> {
         GetArtistTracks {
-            limit: self.__unsafe_private_named.0,
-            offset: self.__unsafe_private_named.1,
-            uri: self.__unsafe_private_named.2,
+            limit: self._fields.0,
+            offset: self._fields.1,
+            uri: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/artist/get_artists.rs b/crates/jacquard-api/src/app_rocksky/artist/get_artists.rs
index d53cac37..71ba6948 100644
--- a/crates/jacquard-api/src/app_rocksky/artist/get_artists.rs
+++ b/crates/jacquard-api/src/app_rocksky/artist/get_artists.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -84,14 +87,9 @@ pub mod get_artists_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetArtistsBuilder<'a, S: get_artists_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<i64>,
-        Option<CowStr<'a>>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetArtists<'a> {
@@ -105,9 +103,9 @@ impl<'a> GetArtistsBuilder<'a, get_artists_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetArtistsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -115,12 +113,12 @@ impl<'a> GetArtistsBuilder<'a, get_artists_state::Empty> {
 impl<'a, S: get_artists_state::State> GetArtistsBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -128,12 +126,12 @@ impl<'a, S: get_artists_state::State> GetArtistsBuilder<'a, S> {
 impl<'a, S: get_artists_state::State> GetArtistsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -141,12 +139,12 @@ impl<'a, S: get_artists_state::State> GetArtistsBuilder<'a, S> {
 impl<'a, S: get_artists_state::State> GetArtistsBuilder<'a, S> {
     /// Set the `names` field (optional)
     pub fn names(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `names` field to an Option value (optional)
     pub fn maybe_names(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -154,12 +152,12 @@ impl<'a, S: get_artists_state::State> GetArtistsBuilder<'a, S> {
 impl<'a, S: get_artists_state::State> GetArtistsBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -171,10 +169,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetArtists<'a> {
         GetArtists {
-            genre: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            names: self.__unsafe_private_named.2,
-            offset: self.__unsafe_private_named.3,
+            genre: self._fields.0,
+            limit: self._fields.1,
+            names: self._fields.2,
+            offset: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/charts/get_scrobbles_chart.rs b/crates/jacquard-api/src/app_rocksky/charts/get_scrobbles_chart.rs
index d30a417a..3a3498c0 100644
--- a/crates/jacquard-api/src/app_rocksky/charts/get_scrobbles_chart.rs
+++ b/crates/jacquard-api/src/app_rocksky/charts/get_scrobbles_chart.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -88,15 +89,15 @@ pub mod get_scrobbles_chart_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetScrobblesChartBuilder<'a, S: get_scrobbles_chart_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<AtUri<'a>>,
         Option<AtIdentifier<'a>>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetScrobblesChart<'a> {
@@ -110,9 +111,9 @@ impl<'a> GetScrobblesChartBuilder<'a, get_scrobbles_chart_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetScrobblesChartBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,12 +121,12 @@ impl<'a> GetScrobblesChartBuilder<'a, get_scrobbles_chart_state::Empty> {
 impl<'a, S: get_scrobbles_chart_state::State> GetScrobblesChartBuilder<'a, S> {
     /// Set the `albumuri` field (optional)
     pub fn albumuri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `albumuri` field to an Option value (optional)
     pub fn maybe_albumuri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -133,12 +134,12 @@ impl<'a, S: get_scrobbles_chart_state::State> GetScrobblesChartBuilder<'a, S> {
 impl<'a, S: get_scrobbles_chart_state::State> GetScrobblesChartBuilder<'a, S> {
     /// Set the `artisturi` field (optional)
     pub fn artisturi(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `artisturi` field to an Option value (optional)
     pub fn maybe_artisturi(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -146,12 +147,12 @@ impl<'a, S: get_scrobbles_chart_state::State> GetScrobblesChartBuilder<'a, S> {
 impl<'a, S: get_scrobbles_chart_state::State> GetScrobblesChartBuilder<'a, S> {
     /// Set the `did` field (optional)
     pub fn did(mut self, value: impl Into<Option<AtIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `did` field to an Option value (optional)
     pub fn maybe_did(mut self, value: Option<AtIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -159,12 +160,12 @@ impl<'a, S: get_scrobbles_chart_state::State> GetScrobblesChartBuilder<'a, S> {
 impl<'a, S: get_scrobbles_chart_state::State> GetScrobblesChartBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -172,12 +173,12 @@ impl<'a, S: get_scrobbles_chart_state::State> GetScrobblesChartBuilder<'a, S> {
 impl<'a, S: get_scrobbles_chart_state::State> GetScrobblesChartBuilder<'a, S> {
     /// Set the `songuri` field (optional)
     pub fn songuri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `songuri` field to an Option value (optional)
     pub fn maybe_songuri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -189,11 +190,11 @@ where
     /// Build the final struct
     pub fn build(self) -> GetScrobblesChart<'a> {
         GetScrobblesChart {
-            albumuri: self.__unsafe_private_named.0,
-            artisturi: self.__unsafe_private_named.1,
-            did: self.__unsafe_private_named.2,
-            genre: self.__unsafe_private_named.3,
-            songuri: self.__unsafe_private_named.4,
+            albumuri: self._fields.0,
+            artisturi: self._fields.1,
+            did: self._fields.2,
+            genre: self._fields.3,
+            songuri: self._fields.4,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/charts/get_top_artists.rs b/crates/jacquard-api/src/app_rocksky/charts/get_top_artists.rs
index c4f8c70a..75e01f53 100644
--- a/crates/jacquard-api/src/app_rocksky/charts/get_top_artists.rs
+++ b/crates/jacquard-api/src/app_rocksky/charts/get_top_artists.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Datetime;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -82,13 +85,8 @@ pub mod get_top_artists_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTopArtistsBuilder<S: get_top_artists_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<i64>,
-        Option<i64>,
-        Option<Datetime>,
-    ),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<i64>, Option<i64>, Option<Datetime>),
 }
 
 impl GetTopArtists {
@@ -102,8 +100,8 @@ impl GetTopArtistsBuilder<get_top_artists_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTopArtistsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
+            _state: PhantomData,
+            _fields: (None, None, None, None),
         }
     }
 }
@@ -111,12 +109,12 @@ impl GetTopArtistsBuilder<get_top_artists_state::Empty> {
 impl<S: get_top_artists_state::State> GetTopArtistsBuilder<S> {
     /// Set the `endDate` field (optional)
     pub fn end_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `endDate` field to an Option value (optional)
     pub fn maybe_end_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -124,12 +122,12 @@ impl<S: get_top_artists_state::State> GetTopArtistsBuilder<S> {
 impl<S: get_top_artists_state::State> GetTopArtistsBuilder<S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -137,12 +135,12 @@ impl<S: get_top_artists_state::State> GetTopArtistsBuilder<S> {
 impl<S: get_top_artists_state::State> GetTopArtistsBuilder<S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -150,12 +148,12 @@ impl<S: get_top_artists_state::State> GetTopArtistsBuilder<S> {
 impl<S: get_top_artists_state::State> GetTopArtistsBuilder<S> {
     /// Set the `startDate` field (optional)
     pub fn start_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `startDate` field to an Option value (optional)
     pub fn maybe_start_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -167,10 +165,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetTopArtists {
         GetTopArtists {
-            end_date: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            offset: self.__unsafe_private_named.2,
-            start_date: self.__unsafe_private_named.3,
+            end_date: self._fields.0,
+            limit: self._fields.1,
+            offset: self._fields.2,
+            start_date: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/charts/get_top_tracks.rs b/crates/jacquard-api/src/app_rocksky/charts/get_top_tracks.rs
index 35da0083..257b4e1c 100644
--- a/crates/jacquard-api/src/app_rocksky/charts/get_top_tracks.rs
+++ b/crates/jacquard-api/src/app_rocksky/charts/get_top_tracks.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Datetime;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -82,13 +85,8 @@ pub mod get_top_tracks_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTopTracksBuilder<S: get_top_tracks_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<i64>,
-        Option<i64>,
-        Option<Datetime>,
-    ),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<i64>, Option<i64>, Option<Datetime>),
 }
 
 impl GetTopTracks {
@@ -102,8 +100,8 @@ impl GetTopTracksBuilder<get_top_tracks_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTopTracksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
+            _state: PhantomData,
+            _fields: (None, None, None, None),
         }
     }
 }
@@ -111,12 +109,12 @@ impl GetTopTracksBuilder<get_top_tracks_state::Empty> {
 impl<S: get_top_tracks_state::State> GetTopTracksBuilder<S> {
     /// Set the `endDate` field (optional)
     pub fn end_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `endDate` field to an Option value (optional)
     pub fn maybe_end_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -124,12 +122,12 @@ impl<S: get_top_tracks_state::State> GetTopTracksBuilder<S> {
 impl<S: get_top_tracks_state::State> GetTopTracksBuilder<S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -137,12 +135,12 @@ impl<S: get_top_tracks_state::State> GetTopTracksBuilder<S> {
 impl<S: get_top_tracks_state::State> GetTopTracksBuilder<S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -150,12 +148,12 @@ impl<S: get_top_tracks_state::State> GetTopTracksBuilder<S> {
 impl<S: get_top_tracks_state::State> GetTopTracksBuilder<S> {
     /// Set the `startDate` field (optional)
     pub fn start_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `startDate` field to an Option value (optional)
     pub fn maybe_start_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -167,10 +165,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetTopTracks {
         GetTopTracks {
-            end_date: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            offset: self.__unsafe_private_named.2,
-            start_date: self.__unsafe_private_named.3,
+            end_date: self._fields.0,
+            limit: self._fields.1,
+            offset: self._fields.2,
+            start_date: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/dropbox/download_file.rs b/crates/jacquard-api/src/app_rocksky/dropbox/download_file.rs
index aa6a99d2..5b68abef 100644
--- a/crates/jacquard-api/src/app_rocksky/dropbox/download_file.rs
+++ b/crates/jacquard-api/src/app_rocksky/dropbox/download_file.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -98,9 +99,9 @@ pub mod download_file_state {
 
 /// Builder for constructing an instance of this type
 pub struct DownloadFileBuilder<'a, S: download_file_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DownloadFile<'a> {
@@ -114,9 +115,9 @@ impl<'a> DownloadFileBuilder<'a, download_file_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DownloadFileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -131,11 +132,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DownloadFileBuilder<'a, download_file_state::SetFileId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DownloadFileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,7 +149,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DownloadFile<'a> {
         DownloadFile {
-            file_id: self.__unsafe_private_named.0.unwrap(),
+            file_id: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/dropbox/get_files.rs b/crates/jacquard-api/src/app_rocksky/dropbox/get_files.rs
index 3ec7e275..174e2234 100644
--- a/crates/jacquard-api/src/app_rocksky/dropbox/get_files.rs
+++ b/crates/jacquard-api/src/app_rocksky/dropbox/get_files.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -74,9 +75,9 @@ pub mod get_files_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFilesBuilder<'a, S: get_files_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFiles<'a> {
@@ -90,9 +91,9 @@ impl<'a> GetFilesBuilder<'a, get_files_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFilesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -100,12 +101,12 @@ impl<'a> GetFilesBuilder<'a, get_files_state::Empty> {
 impl<'a, S: get_files_state::State> GetFilesBuilder<'a, S> {
     /// Set the `at` field (optional)
     pub fn at(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `at` field to an Option value (optional)
     pub fn maybe_at(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -116,8 +117,6 @@ where
 {
     /// Build the final struct
     pub fn build(self) -> GetFiles<'a> {
-        GetFiles {
-            at: self.__unsafe_private_named.0,
-        }
+        GetFiles { at: self._fields.0 }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/dropbox/get_metadata.rs b/crates/jacquard-api/src/app_rocksky/dropbox/get_metadata.rs
index f8a66988..72d2d580 100644
--- a/crates/jacquard-api/src/app_rocksky/dropbox/get_metadata.rs
+++ b/crates/jacquard-api/src/app_rocksky/dropbox/get_metadata.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_metadata_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetMetadataBuilder<'a, S: get_metadata_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetMetadata<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetMetadataBuilder<'a, get_metadata_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetMetadataBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetMetadataBuilder<'a, get_metadata_state::SetPath<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetMetadataBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetMetadata<'a> {
         GetMetadata {
-            path: self.__unsafe_private_named.0.unwrap(),
+            path: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/dropbox/get_temporary_link.rs b/crates/jacquard-api/src/app_rocksky/dropbox/get_temporary_link.rs
index c3752e21..cc11f5bf 100644
--- a/crates/jacquard-api/src/app_rocksky/dropbox/get_temporary_link.rs
+++ b/crates/jacquard-api/src/app_rocksky/dropbox/get_temporary_link.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_temporary_link_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTemporaryLinkBuilder<'a, S: get_temporary_link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetTemporaryLink<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetTemporaryLinkBuilder<'a, get_temporary_link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTemporaryLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetTemporaryLinkBuilder<'a, get_temporary_link_state::SetPath<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetTemporaryLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetTemporaryLink<'a> {
         GetTemporaryLink {
-            path: self.__unsafe_private_named.0.unwrap(),
+            path: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/feed/generator.rs b/crates/jacquard-api/src/app_rocksky/feed/generator.rs
index aeb8a540..26f7e855 100644
--- a/crates/jacquard-api/src/app_rocksky/feed/generator.rs
+++ b/crates/jacquard-api/src/app_rocksky/feed/generator.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -203,65 +206,65 @@ pub mod generator_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type DisplayName;
-        type Did;
         type CreatedAt;
+        type Did;
+        type DisplayName;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type DisplayName = Unset;
-        type Did = Unset;
         type CreatedAt = Unset;
+        type Did = Unset;
+        type DisplayName = Unset;
     }
-    ///State transition - sets the `display_name` field to Set
-    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
-    impl<S: State> State for SetDisplayName<S> {
-        type DisplayName = Set<members::display_name>;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
         type Did = S::Did;
-        type CreatedAt = S::CreatedAt;
+        type DisplayName = S::DisplayName;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type DisplayName = S::DisplayName;
-        type Did = Set<members::did>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+        type Did = Set<members::did>;
         type DisplayName = S::DisplayName;
+    }
+    ///State transition - sets the `display_name` field to Set
+    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
+    impl<S: State> State for SetDisplayName<S> {
+        type CreatedAt = S::CreatedAt;
         type Did = S::Did;
-        type CreatedAt = Set<members::created_at>;
+        type DisplayName = Set<members::display_name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `display_name` field
-        pub struct display_name(());
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `did` field
+        pub struct did(());
+        ///Marker type for the `display_name` field
+        pub struct display_name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GeneratorBuilder<'a, S: generator_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Generator<'a> {
@@ -275,9 +278,9 @@ impl<'a> GeneratorBuilder<'a, generator_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GeneratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -285,12 +288,12 @@ impl<'a> GeneratorBuilder<'a, generator_state::Empty> {
 impl<'a, S: generator_state::State> GeneratorBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -305,11 +308,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> GeneratorBuilder<'a, generator_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GeneratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -317,12 +320,12 @@ where
 impl<'a, S: generator_state::State> GeneratorBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -337,11 +340,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GeneratorBuilder<'a, generator_state::SetDid<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         GeneratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -356,11 +359,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GeneratorBuilder<'a, generator_state::SetDisplayName<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         GeneratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -368,18 +371,18 @@ where
 impl<'a, S> GeneratorBuilder<'a, S>
 where
     S: generator_state::State,
-    S::DisplayName: generator_state::IsSet,
-    S::Did: generator_state::IsSet,
     S::CreatedAt: generator_state::IsSet,
+    S::Did: generator_state::IsSet,
+    S::DisplayName: generator_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Generator<'a> {
         Generator {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            did: self.__unsafe_private_named.3.unwrap(),
-            display_name: self.__unsafe_private_named.4.unwrap(),
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            did: self._fields.3.unwrap(),
+            display_name: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -392,11 +395,11 @@ where
         >,
     ) -> Generator<'a> {
         Generator {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            did: self.__unsafe_private_named.3.unwrap(),
-            display_name: self.__unsafe_private_named.4.unwrap(),
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            did: self._fields.3.unwrap(),
+            display_name: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_rocksky/feed/get_feed.rs b/crates/jacquard-api/src/app_rocksky/feed/get_feed.rs
index 59d175e0..41182136 100644
--- a/crates/jacquard-api/src/app_rocksky/feed/get_feed.rs
+++ b/crates/jacquard-api/src/app_rocksky/feed/get_feed.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -93,9 +94,9 @@ pub mod get_feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFeedBuilder<'a, S: get_feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFeed<'a> {
@@ -109,9 +110,9 @@ impl<'a> GetFeedBuilder<'a, get_feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,12 +120,12 @@ impl<'a> GetFeedBuilder<'a, get_feed_state::Empty> {
 impl<'a, S: get_feed_state::State> GetFeedBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -139,11 +140,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetFeedBuilder<'a, get_feed_state::SetFeed<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -151,12 +152,12 @@ where
 impl<'a, S: get_feed_state::State> GetFeedBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -169,9 +170,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFeed<'a> {
         GetFeed {
-            cursor: self.__unsafe_private_named.0,
-            feed: self.__unsafe_private_named.1.unwrap(),
-            limit: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            feed: self._fields.1.unwrap(),
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/feed/get_feed_generator.rs b/crates/jacquard-api/src/app_rocksky/feed/get_feed_generator.rs
index 73c5217b..76cdb5e7 100644
--- a/crates/jacquard-api/src/app_rocksky/feed/get_feed_generator.rs
+++ b/crates/jacquard-api/src/app_rocksky/feed/get_feed_generator.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -87,9 +90,9 @@ pub mod get_feed_generator_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFeedGeneratorBuilder<'a, S: get_feed_generator_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFeedGenerator<'a> {
@@ -103,9 +106,9 @@ impl<'a> GetFeedGeneratorBuilder<'a, get_feed_generator_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFeedGeneratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,11 +123,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetFeedGeneratorBuilder<'a, get_feed_generator_state::SetFeed<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetFeedGeneratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,7 +140,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFeedGenerator<'a> {
         GetFeedGenerator {
-            feed: self.__unsafe_private_named.0.unwrap(),
+            feed: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/feed/get_feed_generators.rs b/crates/jacquard-api/src/app_rocksky/feed/get_feed_generators.rs
index 31ee7cda..f6d4dc12 100644
--- a/crates/jacquard-api/src/app_rocksky/feed/get_feed_generators.rs
+++ b/crates/jacquard-api/src/app_rocksky/feed/get_feed_generators.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::IntoStatic;
 use serde::{Serialize, Deserialize};
@@ -73,8 +74,8 @@ pub mod get_feed_generators_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFeedGeneratorsBuilder<S: get_feed_generators_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
 }
 
 impl GetFeedGenerators {
@@ -88,8 +89,8 @@ impl GetFeedGeneratorsBuilder<get_feed_generators_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFeedGeneratorsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -97,12 +98,12 @@ impl GetFeedGeneratorsBuilder<get_feed_generators_state::Empty> {
 impl<S: get_feed_generators_state::State> GetFeedGeneratorsBuilder<S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -114,7 +115,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFeedGenerators {
         GetFeedGenerators {
-            size: self.__unsafe_private_named.0,
+            size: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/feed/get_feed_skeleton.rs b/crates/jacquard-api/src/app_rocksky/feed/get_feed_skeleton.rs
index 7ecd3010..7af19252 100644
--- a/crates/jacquard-api/src/app_rocksky/feed/get_feed_skeleton.rs
+++ b/crates/jacquard-api/src/app_rocksky/feed/get_feed_skeleton.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -101,14 +104,9 @@ pub mod get_feed_skeleton_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFeedSkeletonBuilder<'a, S: get_feed_skeleton_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<AtUri<'a>>,
-        Option<i64>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFeedSkeleton<'a> {
@@ -122,9 +120,9 @@ impl<'a> GetFeedSkeletonBuilder<'a, get_feed_skeleton_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFeedSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -132,12 +130,12 @@ impl<'a> GetFeedSkeletonBuilder<'a, get_feed_skeleton_state::Empty> {
 impl<'a, S: get_feed_skeleton_state::State> GetFeedSkeletonBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -152,11 +150,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetFeedSkeletonBuilder<'a, get_feed_skeleton_state::SetFeed<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetFeedSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,12 +162,12 @@ where
 impl<'a, S: get_feed_skeleton_state::State> GetFeedSkeletonBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -177,12 +175,12 @@ impl<'a, S: get_feed_skeleton_state::State> GetFeedSkeletonBuilder<'a, S> {
 impl<'a, S: get_feed_skeleton_state::State> GetFeedSkeletonBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -195,10 +193,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFeedSkeleton<'a> {
         GetFeedSkeleton {
-            cursor: self.__unsafe_private_named.0,
-            feed: self.__unsafe_private_named.1.unwrap(),
-            limit: self.__unsafe_private_named.2,
-            offset: self.__unsafe_private_named.3,
+            cursor: self._fields.0,
+            feed: self._fields.1.unwrap(),
+            limit: self._fields.2,
+            offset: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/feed/get_now_playings.rs b/crates/jacquard-api/src/app_rocksky/feed/get_now_playings.rs
index 73cf2e71..c17f21e1 100644
--- a/crates/jacquard-api/src/app_rocksky/feed/get_now_playings.rs
+++ b/crates/jacquard-api/src/app_rocksky/feed/get_now_playings.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::IntoStatic;
 use serde::{Serialize, Deserialize};
@@ -73,8 +74,8 @@ pub mod get_now_playings_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetNowPlayingsBuilder<S: get_now_playings_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
 }
 
 impl GetNowPlayings {
@@ -88,8 +89,8 @@ impl GetNowPlayingsBuilder<get_now_playings_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetNowPlayingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -97,12 +98,12 @@ impl GetNowPlayingsBuilder<get_now_playings_state::Empty> {
 impl<S: get_now_playings_state::State> GetNowPlayingsBuilder<S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -114,7 +115,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetNowPlayings {
         GetNowPlayings {
-            size: self.__unsafe_private_named.0,
+            size: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/feed/get_stories.rs b/crates/jacquard-api/src/app_rocksky/feed/get_stories.rs
index dc231869..b2d2868f 100644
--- a/crates/jacquard-api/src/app_rocksky/feed/get_stories.rs
+++ b/crates/jacquard-api/src/app_rocksky/feed/get_stories.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::value::Data;
 use jacquard_derive::IntoStatic;
@@ -73,8 +74,8 @@ pub mod get_stories_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetStoriesBuilder<S: get_stories_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
 }
 
 impl GetStories {
@@ -88,8 +89,8 @@ impl GetStoriesBuilder<get_stories_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetStoriesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -97,12 +98,12 @@ impl GetStoriesBuilder<get_stories_state::Empty> {
 impl<S: get_stories_state::State> GetStoriesBuilder<S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -113,8 +114,6 @@ where
 {
     /// Build the final struct
     pub fn build(self) -> GetStories {
-        GetStories {
-            size: self.__unsafe_private_named.0,
-        }
+        GetStories { size: self._fields.0 }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/feed/search.rs b/crates/jacquard-api/src/app_rocksky/feed/search.rs
index 6319c677..5cedc14d 100644
--- a/crates/jacquard-api/src/app_rocksky/feed/search.rs
+++ b/crates/jacquard-api/src/app_rocksky/feed/search.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod search_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchBuilder<'a, S: search_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Search<'a> {
@@ -102,9 +103,9 @@ impl<'a> SearchBuilder<'a, search_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SearchBuilder<'a, search_state::SetQuery<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SearchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Search<'a> {
         Search {
-            query: self.__unsafe_private_named.0.unwrap(),
+            query: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/googledrive/download_file.rs b/crates/jacquard-api/src/app_rocksky/googledrive/download_file.rs
index 2b7080a9..772028a1 100644
--- a/crates/jacquard-api/src/app_rocksky/googledrive/download_file.rs
+++ b/crates/jacquard-api/src/app_rocksky/googledrive/download_file.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -98,9 +99,9 @@ pub mod download_file_state {
 
 /// Builder for constructing an instance of this type
 pub struct DownloadFileBuilder<'a, S: download_file_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DownloadFile<'a> {
@@ -114,9 +115,9 @@ impl<'a> DownloadFileBuilder<'a, download_file_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DownloadFileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -131,11 +132,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DownloadFileBuilder<'a, download_file_state::SetFileId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DownloadFileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,7 +149,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DownloadFile<'a> {
         DownloadFile {
-            file_id: self.__unsafe_private_named.0.unwrap(),
+            file_id: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/googledrive/get_file.rs b/crates/jacquard-api/src/app_rocksky/googledrive/get_file.rs
index 1ccd2d08..c159f086 100644
--- a/crates/jacquard-api/src/app_rocksky/googledrive/get_file.rs
+++ b/crates/jacquard-api/src/app_rocksky/googledrive/get_file.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_file_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFileBuilder<'a, S: get_file_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFile<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetFileBuilder<'a, get_file_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetFileBuilder<'a, get_file_state::SetFileId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetFileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFile<'a> {
         GetFile {
-            file_id: self.__unsafe_private_named.0.unwrap(),
+            file_id: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/googledrive/get_files.rs b/crates/jacquard-api/src/app_rocksky/googledrive/get_files.rs
index 3163fbe4..a4e7611f 100644
--- a/crates/jacquard-api/src/app_rocksky/googledrive/get_files.rs
+++ b/crates/jacquard-api/src/app_rocksky/googledrive/get_files.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -74,9 +75,9 @@ pub mod get_files_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFilesBuilder<'a, S: get_files_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFiles<'a> {
@@ -90,9 +91,9 @@ impl<'a> GetFilesBuilder<'a, get_files_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFilesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -100,12 +101,12 @@ impl<'a> GetFilesBuilder<'a, get_files_state::Empty> {
 impl<'a, S: get_files_state::State> GetFilesBuilder<'a, S> {
     /// Set the `at` field (optional)
     pub fn at(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `at` field to an Option value (optional)
     pub fn maybe_at(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -116,8 +117,6 @@ where
 {
     /// Build the final struct
     pub fn build(self) -> GetFiles<'a> {
-        GetFiles {
-            at: self.__unsafe_private_named.0,
-        }
+        GetFiles { at: self._fields.0 }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/graph/follow.rs b/crates/jacquard-api/src/app_rocksky/graph/follow.rs
index f4f5905d..f4300294 100644
--- a/crates/jacquard-api/src/app_rocksky/graph/follow.rs
+++ b/crates/jacquard-api/src/app_rocksky/graph/follow.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -112,45 +115,45 @@ pub mod follow_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subject;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subject = S::Subject;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FollowBuilder<'a, S: follow_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Follow<'a> {
@@ -164,9 +167,9 @@ impl<'a> FollowBuilder<'a, follow_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,11 +184,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FollowBuilder<'a, follow_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,11 +203,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> FollowBuilder<'a, follow_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,12 +215,12 @@ where
 impl<'a, S: follow_state::State> FollowBuilder<'a, S> {
     /// Set the `via` field (optional)
     pub fn via(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `via` field to an Option value (optional)
     pub fn maybe_via(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -225,15 +228,15 @@ impl<'a, S: follow_state::State> FollowBuilder<'a, S> {
 impl<'a, S> FollowBuilder<'a, S>
 where
     S: follow_state::State,
-    S::CreatedAt: follow_state::IsSet,
     S::Subject: follow_state::IsSet,
+    S::CreatedAt: follow_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            via: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            via: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -246,9 +249,9 @@ where
         >,
     ) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            via: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            via: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_rocksky/like.rs b/crates/jacquard-api/src/app_rocksky/like.rs
index bc066ecc..061cd0d9 100644
--- a/crates/jacquard-api/src/app_rocksky/like.rs
+++ b/crates/jacquard-api/src/app_rocksky/like.rs
@@ -10,7 +10,11 @@ pub mod dislike_song;
 pub mod like_shout;
 pub mod like_song;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -151,9 +155,9 @@ pub mod like_state {
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -167,9 +171,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -184,11 +188,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,11 +207,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,8 +225,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -235,8 +239,8 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_rocksky/like/dislike_shout.rs b/crates/jacquard-api/src/app_rocksky/like/dislike_shout.rs
index ff9f77d3..1293aebb 100644
--- a/crates/jacquard-api/src/app_rocksky/like/dislike_shout.rs
+++ b/crates/jacquard-api/src/app_rocksky/like/dislike_shout.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_rocksky/like/dislike_song.rs b/crates/jacquard-api/src/app_rocksky/like/dislike_song.rs
index 0e88bd1a..6d7923e5 100644
--- a/crates/jacquard-api/src/app_rocksky/like/dislike_song.rs
+++ b/crates/jacquard-api/src/app_rocksky/like/dislike_song.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_rocksky/like/like_shout.rs b/crates/jacquard-api/src/app_rocksky/like/like_shout.rs
index ad3c6823..5edd14e1 100644
--- a/crates/jacquard-api/src/app_rocksky/like/like_shout.rs
+++ b/crates/jacquard-api/src/app_rocksky/like/like_shout.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_rocksky/like/like_song.rs b/crates/jacquard-api/src/app_rocksky/like/like_song.rs
index 24a9d276..ab327ae0 100644
--- a/crates/jacquard-api/src/app_rocksky/like/like_song.rs
+++ b/crates/jacquard-api/src/app_rocksky/like/like_song.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_rocksky/player/get_currently_playing.rs b/crates/jacquard-api/src/app_rocksky/player/get_currently_playing.rs
index 72367d30..e88ed01f 100644
--- a/crates/jacquard-api/src/app_rocksky/player/get_currently_playing.rs
+++ b/crates/jacquard-api/src/app_rocksky/player/get_currently_playing.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -78,9 +79,9 @@ pub mod get_currently_playing_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetCurrentlyPlayingBuilder<'a, S: get_currently_playing_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetCurrentlyPlaying<'a> {
@@ -94,9 +95,9 @@ impl<'a> GetCurrentlyPlayingBuilder<'a, get_currently_playing_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetCurrentlyPlayingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -104,12 +105,12 @@ impl<'a> GetCurrentlyPlayingBuilder<'a, get_currently_playing_state::Empty> {
 impl<'a, S: get_currently_playing_state::State> GetCurrentlyPlayingBuilder<'a, S> {
     /// Set the `actor` field (optional)
     pub fn actor(mut self, value: impl Into<Option<AtIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `actor` field to an Option value (optional)
     pub fn maybe_actor(mut self, value: Option<AtIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -117,12 +118,12 @@ impl<'a, S: get_currently_playing_state::State> GetCurrentlyPlayingBuilder<'a, S
 impl<'a, S: get_currently_playing_state::State> GetCurrentlyPlayingBuilder<'a, S> {
     /// Set the `playerId` field (optional)
     pub fn player_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `playerId` field to an Option value (optional)
     pub fn maybe_player_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -134,8 +135,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetCurrentlyPlaying<'a> {
         GetCurrentlyPlaying {
-            actor: self.__unsafe_private_named.0,
-            player_id: self.__unsafe_private_named.1,
+            actor: self._fields.0,
+            player_id: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/player/next.rs b/crates/jacquard-api/src/app_rocksky/player/next.rs
index 4017d96e..10cfd43b 100644
--- a/crates/jacquard-api/src/app_rocksky/player/next.rs
+++ b/crates/jacquard-api/src/app_rocksky/player/next.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -71,9 +72,9 @@ pub mod next_params_state {
 
 /// Builder for constructing an instance of this type
 pub struct NextParamsBuilder<'a, S: next_params_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> NextParams<'a> {
@@ -87,9 +88,9 @@ impl<'a> NextParamsBuilder<'a, next_params_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NextParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -97,12 +98,12 @@ impl<'a> NextParamsBuilder<'a, next_params_state::Empty> {
 impl<'a, S: next_params_state::State> NextParamsBuilder<'a, S> {
     /// Set the `playerId` field (optional)
     pub fn player_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `playerId` field to an Option value (optional)
     pub fn maybe_player_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -114,7 +115,7 @@ where
     /// Build the final struct
     pub fn build(self) -> NextParams<'a> {
         NextParams {
-            player_id: self.__unsafe_private_named.0,
+            player_id: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/player/pause.rs b/crates/jacquard-api/src/app_rocksky/player/pause.rs
index e873c7d6..a85a9af0 100644
--- a/crates/jacquard-api/src/app_rocksky/player/pause.rs
+++ b/crates/jacquard-api/src/app_rocksky/player/pause.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -71,9 +72,9 @@ pub mod pause_params_state {
 
 /// Builder for constructing an instance of this type
 pub struct PauseParamsBuilder<'a, S: pause_params_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PauseParams<'a> {
@@ -87,9 +88,9 @@ impl<'a> PauseParamsBuilder<'a, pause_params_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PauseParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -97,12 +98,12 @@ impl<'a> PauseParamsBuilder<'a, pause_params_state::Empty> {
 impl<'a, S: pause_params_state::State> PauseParamsBuilder<'a, S> {
     /// Set the `playerId` field (optional)
     pub fn player_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `playerId` field to an Option value (optional)
     pub fn maybe_player_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -114,7 +115,7 @@ where
     /// Build the final struct
     pub fn build(self) -> PauseParams<'a> {
         PauseParams {
-            player_id: self.__unsafe_private_named.0,
+            player_id: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/player/play.rs b/crates/jacquard-api/src/app_rocksky/player/play.rs
index 52782c20..76c2bec0 100644
--- a/crates/jacquard-api/src/app_rocksky/player/play.rs
+++ b/crates/jacquard-api/src/app_rocksky/player/play.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -71,9 +72,9 @@ pub mod play_params_state {
 
 /// Builder for constructing an instance of this type
 pub struct PlayParamsBuilder<'a, S: play_params_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PlayParams<'a> {
@@ -87,9 +88,9 @@ impl<'a> PlayParamsBuilder<'a, play_params_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PlayParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -97,12 +98,12 @@ impl<'a> PlayParamsBuilder<'a, play_params_state::Empty> {
 impl<'a, S: play_params_state::State> PlayParamsBuilder<'a, S> {
     /// Set the `playerId` field (optional)
     pub fn player_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `playerId` field to an Option value (optional)
     pub fn maybe_player_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -114,7 +115,7 @@ where
     /// Build the final struct
     pub fn build(self) -> PlayParams<'a> {
         PlayParams {
-            player_id: self.__unsafe_private_named.0,
+            player_id: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/player/previous.rs b/crates/jacquard-api/src/app_rocksky/player/previous.rs
index 0a7eb2e0..fac267ea 100644
--- a/crates/jacquard-api/src/app_rocksky/player/previous.rs
+++ b/crates/jacquard-api/src/app_rocksky/player/previous.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -71,9 +72,9 @@ pub mod previous_params_state {
 
 /// Builder for constructing an instance of this type
 pub struct PreviousParamsBuilder<'a, S: previous_params_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PreviousParams<'a> {
@@ -87,9 +88,9 @@ impl<'a> PreviousParamsBuilder<'a, previous_params_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PreviousParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -97,12 +98,12 @@ impl<'a> PreviousParamsBuilder<'a, previous_params_state::Empty> {
 impl<'a, S: previous_params_state::State> PreviousParamsBuilder<'a, S> {
     /// Set the `playerId` field (optional)
     pub fn player_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `playerId` field to an Option value (optional)
     pub fn maybe_player_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -114,7 +115,7 @@ where
     /// Build the final struct
     pub fn build(self) -> PreviousParams<'a> {
         PreviousParams {
-            player_id: self.__unsafe_private_named.0,
+            player_id: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/player/seek.rs b/crates/jacquard-api/src/app_rocksky/player/seek.rs
index 1daa728f..46d8ad05 100644
--- a/crates/jacquard-api/src/app_rocksky/player/seek.rs
+++ b/crates/jacquard-api/src/app_rocksky/player/seek.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -85,9 +86,9 @@ pub mod seek_params_state {
 
 /// Builder for constructing an instance of this type
 pub struct SeekParamsBuilder<'a, S: seek_params_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SeekParams<'a> {
@@ -101,9 +102,9 @@ impl<'a> SeekParamsBuilder<'a, seek_params_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SeekParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -111,12 +112,12 @@ impl<'a> SeekParamsBuilder<'a, seek_params_state::Empty> {
 impl<'a, S: seek_params_state::State> SeekParamsBuilder<'a, S> {
     /// Set the `playerId` field (optional)
     pub fn player_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `playerId` field to an Option value (optional)
     pub fn maybe_player_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -131,11 +132,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SeekParamsBuilder<'a, seek_params_state::SetPosition<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SeekParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,8 +149,8 @@ where
     /// Build the final struct
     pub fn build(self) -> SeekParams<'a> {
         SeekParams {
-            player_id: self.__unsafe_private_named.0,
-            position: self.__unsafe_private_named.1.unwrap(),
+            player_id: self._fields.0,
+            position: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/playlist.rs b/crates/jacquard-api/src/app_rocksky/playlist.rs
index 7bc90d80..e1fba9cd 100644
--- a/crates/jacquard-api/src/app_rocksky/playlist.rs
+++ b/crates/jacquard-api/src/app_rocksky/playlist.rs
@@ -8,7 +8,11 @@
 pub mod get_playlist;
 pub mod get_playlists;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -25,10 +29,10 @@ use jacquard_derive::{IntoStatic, lexicon};
 use jacquard_lexicon::lexicon::LexiconDoc;
 use jacquard_lexicon::schema::LexiconSchema;
 
-use crate::app_rocksky::song::SongViewBasic;
 #[allow(unused_imports)]
 use jacquard_lexicon::validation::{ConstraintError, ValidationPath};
-use serde::{Deserialize, Serialize};
+use serde::{Serialize, Deserialize};
+use crate::app_rocksky::song::SongViewBasic;
 /// A declaration of a playlist.
 
 #[lexicon]
@@ -186,7 +190,9 @@ pub struct PlaylistViewDetailed<'a> {
 }
 
 impl<'a> Playlist<'a> {
-    pub fn uri(uri: impl Into<CowStr<'a>>) -> Result<RecordUri<'a, PlaylistRecord>, UriError> {
+    pub fn uri(
+        uri: impl Into<CowStr<'a>>,
+    ) -> Result<RecordUri<'a, PlaylistRecord>, UriError> {
         RecordUri::try_from_uri(AtUri::new_cow(uri.into())?)
     }
 }
@@ -288,20 +294,25 @@ impl<'a> LexiconSchema for Playlist<'a> {
             {
                 let mime = value.blob().mime_type.as_str();
                 let accepted: &[&str] = &["image/png", "image/jpeg"];
-                let matched = accepted.iter().any(|pattern| {
-                    if *pattern == "*/*" {
-                        true
-                    } else if pattern.ends_with("/*") {
-                        let prefix = &pattern[..pattern.len() - 2];
-                        mime.starts_with(prefix) && mime.as_bytes().get(prefix.len()) == Some(&b'/')
-                    } else {
-                        mime == *pattern
-                    }
-                });
+                let matched = accepted
+                    .iter()
+                    .any(|pattern| {
+                        if *pattern == "*/*" {
+                            true
+                        } else if pattern.ends_with("/*") {
+                            let prefix = &pattern[..pattern.len() - 2];
+                            mime.starts_with(prefix)
+                                && mime.as_bytes().get(prefix.len()) == Some(&b'/')
+                        } else {
+                            mime == *pattern
+                        }
+                    });
                 if !matched {
                     return Err(ConstraintError::BlobMimeTypeNotAccepted {
                         path: ValidationPath::from_field("picture"),
-                        accepted: vec!["image/png".to_string(), "image/jpeg".to_string()],
+                        accepted: vec![
+                            "image/png".to_string(), "image/jpeg".to_string()
+                        ],
                         actual: mime.to_string(),
                     });
                 }
@@ -352,7 +363,7 @@ impl<'a> LexiconSchema for PlaylistViewDetailed<'a> {
 
 pub mod playlist_state {
 
-    pub use crate::builder_types::{IsSet, IsUnset, Set, Unset};
+    pub use crate::builder_types::{Set, Unset, IsSet, IsUnset};
     #[allow(unused)]
     use ::core::marker::PhantomData;
     mod sealed {
@@ -396,8 +407,8 @@ pub mod playlist_state {
 
 /// Builder for constructing an instance of this type
 pub struct PlaylistBuilder<'a, S: playlist_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -408,7 +419,7 @@ pub struct PlaylistBuilder<'a, S: playlist_state::State> {
         Option<Vec<Data<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Playlist<'a> {
@@ -422,9 +433,9 @@ impl<'a> PlaylistBuilder<'a, playlist_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PlaylistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -432,12 +443,12 @@ impl<'a> PlaylistBuilder<'a, playlist_state::Empty> {
 impl<'a, S: playlist_state::State> PlaylistBuilder<'a, S> {
     /// Set the `appleMusicLink` field (optional)
     pub fn apple_music_link(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `appleMusicLink` field to an Option value (optional)
     pub fn maybe_apple_music_link(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -452,11 +463,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PlaylistBuilder<'a, playlist_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PlaylistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -464,12 +475,12 @@ where
 impl<'a, S: playlist_state::State> PlaylistBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -484,11 +495,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PlaylistBuilder<'a, playlist_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PlaylistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -496,12 +507,12 @@ where
 impl<'a, S: playlist_state::State> PlaylistBuilder<'a, S> {
     /// Set the `picture` field (optional)
     pub fn picture(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `picture` field to an Option value (optional)
     pub fn maybe_picture(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -509,12 +520,12 @@ impl<'a, S: playlist_state::State> PlaylistBuilder<'a, S> {
 impl<'a, S: playlist_state::State> PlaylistBuilder<'a, S> {
     /// Set the `spotifyLink` field (optional)
     pub fn spotify_link(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `spotifyLink` field to an Option value (optional)
     pub fn maybe_spotify_link(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -522,12 +533,12 @@ impl<'a, S: playlist_state::State> PlaylistBuilder<'a, S> {
 impl<'a, S: playlist_state::State> PlaylistBuilder<'a, S> {
     /// Set the `tidalLink` field (optional)
     pub fn tidal_link(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `tidalLink` field to an Option value (optional)
     pub fn maybe_tidal_link(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -535,12 +546,12 @@ impl<'a, S: playlist_state::State> PlaylistBuilder<'a, S> {
 impl<'a, S: playlist_state::State> PlaylistBuilder<'a, S> {
     /// Set the `tracks` field (optional)
     pub fn tracks(mut self, value: impl Into<Option<Vec<Data<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `tracks` field to an Option value (optional)
     pub fn maybe_tracks(mut self, value: Option<Vec<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -548,12 +559,12 @@ impl<'a, S: playlist_state::State> PlaylistBuilder<'a, S> {
 impl<'a, S: playlist_state::State> PlaylistBuilder<'a, S> {
     /// Set the `youtubeLink` field (optional)
     pub fn youtube_link(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `youtubeLink` field to an Option value (optional)
     pub fn maybe_youtube_link(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -567,15 +578,15 @@ where
     /// Build the final struct
     pub fn build(self) -> Playlist<'a> {
         Playlist {
-            apple_music_link: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            picture: self.__unsafe_private_named.4,
-            spotify_link: self.__unsafe_private_named.5,
-            tidal_link: self.__unsafe_private_named.6,
-            tracks: self.__unsafe_private_named.7,
-            youtube_link: self.__unsafe_private_named.8,
+            apple_music_link: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            name: self._fields.3.unwrap(),
+            picture: self._fields.4,
+            spotify_link: self._fields.5,
+            tidal_link: self._fields.6,
+            tracks: self._fields.7,
+            youtube_link: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -585,25 +596,25 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Playlist<'a> {
         Playlist {
-            apple_music_link: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            picture: self.__unsafe_private_named.4,
-            spotify_link: self.__unsafe_private_named.5,
-            tidal_link: self.__unsafe_private_named.6,
-            tracks: self.__unsafe_private_named.7,
-            youtube_link: self.__unsafe_private_named.8,
+            apple_music_link: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            name: self._fields.3.unwrap(),
+            picture: self._fields.4,
+            spotify_link: self._fields.5,
+            tidal_link: self._fields.6,
+            tracks: self._fields.7,
+            youtube_link: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
 }
 
 fn lexicon_doc_app_rocksky_playlist() -> LexiconDoc<'static> {
-    use alloc::collections::BTreeMap;
     #[allow(unused_imports)]
     use jacquard_common::{CowStr, deps::smol_str::SmolStr, types::blob::MimeType};
     use jacquard_lexicon::lexicon::*;
+    use alloc::collections::BTreeMap;
     LexiconDoc {
         lexicon: Lexicon::Lexicon1,
         id: CowStr::new_static("app.rocksky.playlist"),
@@ -612,31 +623,35 @@ fn lexicon_doc_app_rocksky_playlist() -> LexiconDoc<'static> {
             map.insert(
                 SmolStr::new_static("main"),
                 LexUserType::Record(LexRecord {
-                    description: Some(CowStr::new_static("A declaration of a playlist.")),
+                    description: Some(
+                        CowStr::new_static("A declaration of a playlist."),
+                    ),
                     key: Some(CowStr::new_static("tid")),
                     record: LexRecordRecord::Object(LexObject {
-                        required: Some(vec![
-                            SmolStr::new_static("name"),
-                            SmolStr::new_static("createdAt"),
-                        ]),
+                        required: Some(
+                            vec![
+                                SmolStr::new_static("name"),
+                                SmolStr::new_static("createdAt")
+                            ],
+                        ),
                         properties: {
                             #[allow(unused_mut)]
                             let mut map = BTreeMap::new();
                             map.insert(
                                 SmolStr::new_static("appleMusicLink"),
                                 LexObjectProperty::String(LexString {
-                                    description: Some(CowStr::new_static(
-                                        "The Apple Music link of the playlist.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static("The Apple Music link of the playlist."),
+                                    ),
                                     ..Default::default()
                                 }),
                             );
                             map.insert(
                                 SmolStr::new_static("createdAt"),
                                 LexObjectProperty::String(LexString {
-                                    description: Some(CowStr::new_static(
-                                        "The date the playlist was created.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static("The date the playlist was created."),
+                                    ),
                                     format: Some(LexStringFormat::Datetime),
                                     ..Default::default()
                                 }),
@@ -644,9 +659,9 @@ fn lexicon_doc_app_rocksky_playlist() -> LexiconDoc<'static> {
                             map.insert(
                                 SmolStr::new_static("description"),
                                 LexObjectProperty::String(LexString {
-                                    description: Some(CowStr::new_static(
-                                        "The playlist description.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static("The playlist description."),
+                                    ),
                                     min_length: Some(1usize),
                                     max_length: Some(256usize),
                                     ..Default::default()
@@ -655,9 +670,9 @@ fn lexicon_doc_app_rocksky_playlist() -> LexiconDoc<'static> {
                             map.insert(
                                 SmolStr::new_static("name"),
                                 LexObjectProperty::String(LexString {
-                                    description: Some(CowStr::new_static(
-                                        "The name of the playlist.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static("The name of the playlist."),
+                                    ),
                                     min_length: Some(1usize),
                                     max_length: Some(512usize),
                                     ..Default::default()
@@ -665,34 +680,32 @@ fn lexicon_doc_app_rocksky_playlist() -> LexiconDoc<'static> {
                             );
                             map.insert(
                                 SmolStr::new_static("picture"),
-                                LexObjectProperty::Blob(LexBlob {
-                                    ..Default::default()
-                                }),
+                                LexObjectProperty::Blob(LexBlob { ..Default::default() }),
                             );
                             map.insert(
                                 SmolStr::new_static("spotifyLink"),
                                 LexObjectProperty::String(LexString {
-                                    description: Some(CowStr::new_static(
-                                        "The Spotify link of the playlist.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static("The Spotify link of the playlist."),
+                                    ),
                                     ..Default::default()
                                 }),
                             );
                             map.insert(
                                 SmolStr::new_static("tidalLink"),
                                 LexObjectProperty::String(LexString {
-                                    description: Some(CowStr::new_static(
-                                        "The Tidal link of the playlist.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static("The Tidal link of the playlist."),
+                                    ),
                                     ..Default::default()
                                 }),
                             );
                             map.insert(
                                 SmolStr::new_static("tracks"),
                                 LexObjectProperty::Array(LexArray {
-                                    description: Some(CowStr::new_static(
-                                        "The tracks in the playlist.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static("The tracks in the playlist."),
+                                    ),
                                     items: LexArrayItem::Ref(LexRef {
                                         r#ref: CowStr::new_static("app.rocksky.song#record"),
                                         ..Default::default()
@@ -703,9 +716,9 @@ fn lexicon_doc_app_rocksky_playlist() -> LexiconDoc<'static> {
                             map.insert(
                                 SmolStr::new_static("youtubeLink"),
                                 LexObjectProperty::String(LexString {
-                                    description: Some(CowStr::new_static(
-                                        "The YouTube link of the playlist.",
-                                    )),
+                                    description: Some(
+                                        CowStr::new_static("The YouTube link of the playlist."),
+                                    ),
                                     ..Default::default()
                                 }),
                             );
@@ -723,10 +736,10 @@ fn lexicon_doc_app_rocksky_playlist() -> LexiconDoc<'static> {
 }
 
 fn lexicon_doc_app_rocksky_playlist_defs() -> LexiconDoc<'static> {
-    use alloc::collections::BTreeMap;
     #[allow(unused_imports)]
     use jacquard_common::{CowStr, deps::smol_str::SmolStr, types::blob::MimeType};
     use jacquard_lexicon::lexicon::*;
+    use alloc::collections::BTreeMap;
     LexiconDoc {
         lexicon: Lexicon::Lexicon1,
         id: CowStr::new_static("app.rocksky.playlist.defs"),
@@ -735,18 +748,22 @@ fn lexicon_doc_app_rocksky_playlist_defs() -> LexiconDoc<'static> {
             map.insert(
                 SmolStr::new_static("playlistViewBasic"),
                 LexUserType::Object(LexObject {
-                    description: Some(CowStr::new_static(
-                        "Basic view of a playlist, including its metadata",
-                    )),
+                    description: Some(
+                        CowStr::new_static(
+                            "Basic view of a playlist, including its metadata",
+                        ),
+                    ),
                     properties: {
                         #[allow(unused_mut)]
                         let mut map = BTreeMap::new();
                         map.insert(
                             SmolStr::new_static("coverImageUrl"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The URL of the cover image for the playlist.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static(
+                                        "The URL of the cover image for the playlist.",
+                                    ),
+                                ),
                                 format: Some(LexStringFormat::Uri),
                                 ..Default::default()
                             }),
@@ -754,9 +771,11 @@ fn lexicon_doc_app_rocksky_playlist_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("createdAt"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The date and time when the playlist was created.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static(
+                                        "The date and time when the playlist was created.",
+                                    ),
+                                ),
                                 format: Some(LexStringFormat::Datetime),
                                 ..Default::default()
                             }),
@@ -764,9 +783,11 @@ fn lexicon_doc_app_rocksky_playlist_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("curatorAvatarUrl"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The URL of the avatar image of the curator.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static(
+                                        "The URL of the avatar image of the curator.",
+                                    ),
+                                ),
                                 format: Some(LexStringFormat::Uri),
                                 ..Default::default()
                             }),
@@ -774,9 +795,11 @@ fn lexicon_doc_app_rocksky_playlist_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("curatorDid"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The DID of the curator of the playlist.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static(
+                                        "The DID of the curator of the playlist.",
+                                    ),
+                                ),
                                 format: Some(LexStringFormat::AtIdentifier),
                                 ..Default::default()
                             }),
@@ -784,9 +807,11 @@ fn lexicon_doc_app_rocksky_playlist_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("curatorHandle"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The handle of the curator of the playlist.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static(
+                                        "The handle of the curator of the playlist.",
+                                    ),
+                                ),
                                 format: Some(LexStringFormat::AtIdentifier),
                                 ..Default::default()
                             }),
@@ -794,34 +819,38 @@ fn lexicon_doc_app_rocksky_playlist_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("curatorName"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The name of the curator of the playlist.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static(
+                                        "The name of the curator of the playlist.",
+                                    ),
+                                ),
                                 ..Default::default()
                             }),
                         );
                         map.insert(
                             SmolStr::new_static("description"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "A description of the playlist.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static("A description of the playlist."),
+                                ),
                                 ..Default::default()
                             }),
                         );
                         map.insert(
                             SmolStr::new_static("id"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The unique identifier of the playlist.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static("The unique identifier of the playlist."),
+                                ),
                                 ..Default::default()
                             }),
                         );
                         map.insert(
                             SmolStr::new_static("title"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static("The title of the playlist.")),
+                                description: Some(
+                                    CowStr::new_static("The title of the playlist."),
+                                ),
                                 ..Default::default()
                             }),
                         );
@@ -835,7 +864,9 @@ fn lexicon_doc_app_rocksky_playlist_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("uri"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static("The URI of the playlist.")),
+                                description: Some(
+                                    CowStr::new_static("The URI of the playlist."),
+                                ),
                                 format: Some(LexStringFormat::AtUri),
                                 ..Default::default()
                             }),
@@ -848,18 +879,22 @@ fn lexicon_doc_app_rocksky_playlist_defs() -> LexiconDoc<'static> {
             map.insert(
                 SmolStr::new_static("playlistViewDetailed"),
                 LexUserType::Object(LexObject {
-                    description: Some(CowStr::new_static(
-                        "Detailed view of a playlist, including its tracks and metadata",
-                    )),
+                    description: Some(
+                        CowStr::new_static(
+                            "Detailed view of a playlist, including its tracks and metadata",
+                        ),
+                    ),
                     properties: {
                         #[allow(unused_mut)]
                         let mut map = BTreeMap::new();
                         map.insert(
                             SmolStr::new_static("coverImageUrl"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The URL of the cover image for the playlist.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static(
+                                        "The URL of the cover image for the playlist.",
+                                    ),
+                                ),
                                 format: Some(LexStringFormat::Uri),
                                 ..Default::default()
                             }),
@@ -867,9 +902,11 @@ fn lexicon_doc_app_rocksky_playlist_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("createdAt"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The date and time when the playlist was created.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static(
+                                        "The date and time when the playlist was created.",
+                                    ),
+                                ),
                                 format: Some(LexStringFormat::Datetime),
                                 ..Default::default()
                             }),
@@ -877,9 +914,11 @@ fn lexicon_doc_app_rocksky_playlist_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("curatorAvatarUrl"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The URL of the avatar image of the curator.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static(
+                                        "The URL of the avatar image of the curator.",
+                                    ),
+                                ),
                                 format: Some(LexStringFormat::Uri),
                                 ..Default::default()
                             }),
@@ -887,9 +926,11 @@ fn lexicon_doc_app_rocksky_playlist_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("curatorDid"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The DID of the curator of the playlist.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static(
+                                        "The DID of the curator of the playlist.",
+                                    ),
+                                ),
                                 format: Some(LexStringFormat::AtIdentifier),
                                 ..Default::default()
                             }),
@@ -897,9 +938,11 @@ fn lexicon_doc_app_rocksky_playlist_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("curatorHandle"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The handle of the curator of the playlist.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static(
+                                        "The handle of the curator of the playlist.",
+                                    ),
+                                ),
                                 format: Some(LexStringFormat::AtIdentifier),
                                 ..Default::default()
                             }),
@@ -907,43 +950,47 @@ fn lexicon_doc_app_rocksky_playlist_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("curatorName"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The name of the curator of the playlist.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static(
+                                        "The name of the curator of the playlist.",
+                                    ),
+                                ),
                                 ..Default::default()
                             }),
                         );
                         map.insert(
                             SmolStr::new_static("description"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "A description of the playlist.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static("A description of the playlist."),
+                                ),
                                 ..Default::default()
                             }),
                         );
                         map.insert(
                             SmolStr::new_static("id"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static(
-                                    "The unique identifier of the playlist.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static("The unique identifier of the playlist."),
+                                ),
                                 ..Default::default()
                             }),
                         );
                         map.insert(
                             SmolStr::new_static("title"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static("The title of the playlist.")),
+                                description: Some(
+                                    CowStr::new_static("The title of the playlist."),
+                                ),
                                 ..Default::default()
                             }),
                         );
                         map.insert(
                             SmolStr::new_static("tracks"),
                             LexObjectProperty::Array(LexArray {
-                                description: Some(CowStr::new_static(
-                                    "A list of tracks in the playlist.",
-                                )),
+                                description: Some(
+                                    CowStr::new_static("A list of tracks in the playlist."),
+                                ),
                                 items: LexArrayItem::Ref(LexRef {
                                     r#ref: CowStr::new_static(
                                         "app.rocksky.song.defs#songViewBasic",
@@ -956,7 +1003,9 @@ fn lexicon_doc_app_rocksky_playlist_defs() -> LexiconDoc<'static> {
                         map.insert(
                             SmolStr::new_static("uri"),
                             LexObjectProperty::String(LexString {
-                                description: Some(CowStr::new_static("The URI of the playlist.")),
+                                description: Some(
+                                    CowStr::new_static("The URI of the playlist."),
+                                ),
                                 format: Some(LexStringFormat::AtUri),
                                 ..Default::default()
                             }),
@@ -970,4 +1019,4 @@ fn lexicon_doc_app_rocksky_playlist_defs() -> LexiconDoc<'static> {
         },
         ..Default::default()
     }
-}
+}
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/playlist/get_playlist.rs b/crates/jacquard-api/src/app_rocksky/playlist/get_playlist.rs
index de0db18b..942d3d1f 100644
--- a/crates/jacquard-api/src/app_rocksky/playlist/get_playlist.rs
+++ b/crates/jacquard-api/src/app_rocksky/playlist/get_playlist.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_playlist_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetPlaylistBuilder<'a, S: get_playlist_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetPlaylist<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetPlaylistBuilder<'a, get_playlist_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetPlaylistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetPlaylistBuilder<'a, get_playlist_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetPlaylistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetPlaylist<'a> {
         GetPlaylist {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/playlist/get_playlists.rs b/crates/jacquard-api/src/app_rocksky/playlist/get_playlists.rs
index 81973834..0e496b5d 100644
--- a/crates/jacquard-api/src/app_rocksky/playlist/get_playlists.rs
+++ b/crates/jacquard-api/src/app_rocksky/playlist/get_playlists.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
@@ -75,8 +78,8 @@ pub mod get_playlists_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetPlaylistsBuilder<S: get_playlists_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
 }
 
 impl GetPlaylists {
@@ -90,8 +93,8 @@ impl GetPlaylistsBuilder<get_playlists_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetPlaylistsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
+            _state: PhantomData,
+            _fields: (None, None),
         }
     }
 }
@@ -99,12 +102,12 @@ impl GetPlaylistsBuilder<get_playlists_state::Empty> {
 impl<S: get_playlists_state::State> GetPlaylistsBuilder<S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -112,12 +115,12 @@ impl<S: get_playlists_state::State> GetPlaylistsBuilder<S> {
 impl<S: get_playlists_state::State> GetPlaylistsBuilder<S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -129,8 +132,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetPlaylists {
         GetPlaylists {
-            limit: self.__unsafe_private_named.0,
-            offset: self.__unsafe_private_named.1,
+            limit: self._fields.0,
+            offset: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/radio.rs b/crates/jacquard-api/src/app_rocksky/radio.rs
index a75b2aff..5bcdb745 100644
--- a/crates/jacquard-api/src/app_rocksky/radio.rs
+++ b/crates/jacquard-api/src/app_rocksky/radio.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -323,57 +326,57 @@ pub mod radio_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type CreatedAt;
-        type Url;
         type Name;
+        type Url;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type CreatedAt = Unset;
-        type Url = Unset;
         type Name = Unset;
+        type Url = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type CreatedAt = Set<members::created_at>;
-        type Url = S::Url;
-        type Name = S::Name;
-    }
-    ///State transition - sets the `url` field to Set
-    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUrl<S> {}
-    impl<S: State> State for SetUrl<S> {
-        type CreatedAt = S::CreatedAt;
-        type Url = Set<members::url>;
         type Name = S::Name;
+        type Url = S::Url;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
         type CreatedAt = S::CreatedAt;
-        type Url = S::Url;
         type Name = Set<members::name>;
+        type Url = S::Url;
+    }
+    ///State transition - sets the `url` field to Set
+    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUrl<S> {}
+    impl<S: State> State for SetUrl<S> {
+        type CreatedAt = S::CreatedAt;
+        type Name = S::Name;
+        type Url = Set<members::url>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `url` field
-        pub struct url(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `url` field
+        pub struct url(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RadioBuilder<'a, S: radio_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -382,7 +385,7 @@ pub struct RadioBuilder<'a, S: radio_state::State> {
         Option<UriValue<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Radio<'a> {
@@ -396,9 +399,9 @@ impl<'a> RadioBuilder<'a, radio_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RadioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -413,11 +416,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RadioBuilder<'a, radio_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RadioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -425,12 +428,12 @@ where
 impl<'a, S: radio_state::State> RadioBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -438,12 +441,12 @@ impl<'a, S: radio_state::State> RadioBuilder<'a, S> {
 impl<'a, S: radio_state::State> RadioBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -451,12 +454,12 @@ impl<'a, S: radio_state::State> RadioBuilder<'a, S> {
 impl<'a, S: radio_state::State> RadioBuilder<'a, S> {
     /// Set the `logo` field (optional)
     pub fn logo(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `logo` field to an Option value (optional)
     pub fn maybe_logo(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -471,11 +474,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RadioBuilder<'a, radio_state::SetName<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RadioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -490,11 +493,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> RadioBuilder<'a, radio_state::SetUrl<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         RadioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -502,12 +505,12 @@ where
 impl<'a, S: radio_state::State> RadioBuilder<'a, S> {
     /// Set the `website` field (optional)
     pub fn website(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `website` field to an Option value (optional)
     pub fn maybe_website(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -516,19 +519,19 @@ impl<'a, S> RadioBuilder<'a, S>
 where
     S: radio_state::State,
     S::CreatedAt: radio_state::IsSet,
-    S::Url: radio_state::IsSet,
     S::Name: radio_state::IsSet,
+    S::Url: radio_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Radio<'a> {
         Radio {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            genre: self.__unsafe_private_named.2,
-            logo: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            url: self.__unsafe_private_named.5.unwrap(),
-            website: self.__unsafe_private_named.6,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            genre: self._fields.2,
+            logo: self._fields.3,
+            name: self._fields.4.unwrap(),
+            url: self._fields.5.unwrap(),
+            website: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -541,13 +544,13 @@ where
         >,
     ) -> Radio<'a> {
         Radio {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            genre: self.__unsafe_private_named.2,
-            logo: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            url: self.__unsafe_private_named.5.unwrap(),
-            website: self.__unsafe_private_named.6,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            genre: self._fields.2,
+            logo: self._fields.3,
+            name: self._fields.4.unwrap(),
+            url: self._fields.5.unwrap(),
+            website: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_rocksky/scrobble.rs b/crates/jacquard-api/src/app_rocksky/scrobble.rs
index b0851114..f8f67495 100644
--- a/crates/jacquard-api/src/app_rocksky/scrobble.rs
+++ b/crates/jacquard-api/src/app_rocksky/scrobble.rs
@@ -9,7 +9,11 @@ pub mod create_scrobble;
 pub mod get_scrobble;
 pub mod get_scrobbles;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -567,112 +571,112 @@ pub mod scrobble_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Artist;
-        type Duration;
+        type Album;
         type Title;
+        type Duration;
         type AlbumArtist;
+        type Artist;
         type CreatedAt;
-        type Album;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Artist = Unset;
-        type Duration = Unset;
+        type Album = Unset;
         type Title = Unset;
+        type Duration = Unset;
         type AlbumArtist = Unset;
+        type Artist = Unset;
         type CreatedAt = Unset;
-        type Album = Unset;
     }
-    ///State transition - sets the `artist` field to Set
-    pub struct SetArtist<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetArtist<S> {}
-    impl<S: State> State for SetArtist<S> {
-        type Artist = Set<members::artist>;
-        type Duration = S::Duration;
+    ///State transition - sets the `album` field to Set
+    pub struct SetAlbum<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAlbum<S> {}
+    impl<S: State> State for SetAlbum<S> {
+        type Album = Set<members::album>;
         type Title = S::Title;
+        type Duration = S::Duration;
         type AlbumArtist = S::AlbumArtist;
-        type CreatedAt = S::CreatedAt;
-        type Album = S::Album;
-    }
-    ///State transition - sets the `duration` field to Set
-    pub struct SetDuration<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDuration<S> {}
-    impl<S: State> State for SetDuration<S> {
         type Artist = S::Artist;
-        type Duration = Set<members::duration>;
-        type Title = S::Title;
-        type AlbumArtist = S::AlbumArtist;
         type CreatedAt = S::CreatedAt;
-        type Album = S::Album;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Artist = S::Artist;
-        type Duration = S::Duration;
+        type Album = S::Album;
         type Title = Set<members::title>;
+        type Duration = S::Duration;
         type AlbumArtist = S::AlbumArtist;
+        type Artist = S::Artist;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `duration` field to Set
+    pub struct SetDuration<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDuration<S> {}
+    impl<S: State> State for SetDuration<S> {
         type Album = S::Album;
+        type Title = S::Title;
+        type Duration = Set<members::duration>;
+        type AlbumArtist = S::AlbumArtist;
+        type Artist = S::Artist;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `album_artist` field to Set
     pub struct SetAlbumArtist<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAlbumArtist<S> {}
     impl<S: State> State for SetAlbumArtist<S> {
-        type Artist = S::Artist;
-        type Duration = S::Duration;
+        type Album = S::Album;
         type Title = S::Title;
+        type Duration = S::Duration;
         type AlbumArtist = Set<members::album_artist>;
+        type Artist = S::Artist;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `artist` field to Set
+    pub struct SetArtist<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetArtist<S> {}
+    impl<S: State> State for SetArtist<S> {
         type Album = S::Album;
+        type Title = S::Title;
+        type Duration = S::Duration;
+        type AlbumArtist = S::AlbumArtist;
+        type Artist = Set<members::artist>;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Artist = S::Artist;
-        type Duration = S::Duration;
-        type Title = S::Title;
-        type AlbumArtist = S::AlbumArtist;
-        type CreatedAt = Set<members::created_at>;
         type Album = S::Album;
-    }
-    ///State transition - sets the `album` field to Set
-    pub struct SetAlbum<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAlbum<S> {}
-    impl<S: State> State for SetAlbum<S> {
-        type Artist = S::Artist;
-        type Duration = S::Duration;
         type Title = S::Title;
+        type Duration = S::Duration;
         type AlbumArtist = S::AlbumArtist;
-        type CreatedAt = S::CreatedAt;
-        type Album = Set<members::album>;
+        type Artist = S::Artist;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `artist` field
-        pub struct artist(());
-        ///Marker type for the `duration` field
-        pub struct duration(());
+        ///Marker type for the `album` field
+        pub struct album(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `duration` field
+        pub struct duration(());
         ///Marker type for the `album_artist` field
         pub struct album_artist(());
+        ///Marker type for the `artist` field
+        pub struct artist(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `album` field
-        pub struct album(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ScrobbleBuilder<'a, S: scrobble_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
         Option<UriValue<'a>>,
@@ -699,7 +703,7 @@ pub struct ScrobbleBuilder<'a, S: scrobble_state::State> {
         Option<i64>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Scrobble<'a> {
@@ -713,8 +717,8 @@ impl<'a> ScrobbleBuilder<'a, scrobble_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ScrobbleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -741,7 +745,7 @@ impl<'a> ScrobbleBuilder<'a, scrobble_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -756,11 +760,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ScrobbleBuilder<'a, scrobble_state::SetAlbum<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ScrobbleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -768,12 +772,12 @@ where
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `albumArt` field (optional)
     pub fn album_art(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `albumArt` field to an Option value (optional)
     pub fn maybe_album_art(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -781,12 +785,12 @@ impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `albumArtUrl` field (optional)
     pub fn album_art_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `albumArtUrl` field to an Option value (optional)
     pub fn maybe_album_art_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -801,11 +805,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ScrobbleBuilder<'a, scrobble_state::SetAlbumArtist<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ScrobbleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -813,12 +817,12 @@ where
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `appleMusicLink` field (optional)
     pub fn apple_music_link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `appleMusicLink` field to an Option value (optional)
     pub fn maybe_apple_music_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -833,11 +837,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ScrobbleBuilder<'a, scrobble_state::SetArtist<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ScrobbleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -845,12 +849,12 @@ where
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `artists` field (optional)
     pub fn artists(mut self, value: impl Into<Option<Vec<ArtistMbid<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `artists` field to an Option value (optional)
     pub fn maybe_artists(mut self, value: Option<Vec<ArtistMbid<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -858,12 +862,12 @@ impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `composer` field (optional)
     pub fn composer(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `composer` field to an Option value (optional)
     pub fn maybe_composer(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -871,12 +875,12 @@ impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `copyrightMessage` field (optional)
     pub fn copyright_message(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `copyrightMessage` field to an Option value (optional)
     pub fn maybe_copyright_message(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -891,11 +895,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ScrobbleBuilder<'a, scrobble_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ScrobbleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -903,12 +907,12 @@ where
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `discNumber` field (optional)
     pub fn disc_number(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `discNumber` field to an Option value (optional)
     pub fn maybe_disc_number(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -923,11 +927,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ScrobbleBuilder<'a, scrobble_state::SetDuration<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         ScrobbleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -935,12 +939,12 @@ where
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -948,12 +952,12 @@ impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `label` field (optional)
     pub fn label(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `label` field to an Option value (optional)
     pub fn maybe_label(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -961,12 +965,12 @@ impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `lyrics` field (optional)
     pub fn lyrics(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `lyrics` field to an Option value (optional)
     pub fn maybe_lyrics(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -974,12 +978,12 @@ impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `mbid` field (optional)
     pub fn mbid(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `mbid` field to an Option value (optional)
     pub fn maybe_mbid(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -987,12 +991,12 @@ impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `releaseDate` field (optional)
     pub fn release_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `releaseDate` field to an Option value (optional)
     pub fn maybe_release_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -1000,12 +1004,12 @@ impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `spotifyLink` field (optional)
     pub fn spotify_link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `spotifyLink` field to an Option value (optional)
     pub fn maybe_spotify_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -1013,12 +1017,12 @@ impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -1026,12 +1030,12 @@ impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `tidalLink` field (optional)
     pub fn tidal_link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `tidalLink` field to an Option value (optional)
     pub fn maybe_tidal_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -1046,11 +1050,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ScrobbleBuilder<'a, scrobble_state::SetTitle<S>> {
-        self.__unsafe_private_named.20 = Option::Some(value.into());
+        self._fields.20 = Option::Some(value.into());
         ScrobbleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1058,12 +1062,12 @@ where
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `trackNumber` field (optional)
     pub fn track_number(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `trackNumber` field to an Option value (optional)
     pub fn maybe_track_number(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -1071,12 +1075,12 @@ impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `wiki` field (optional)
     pub fn wiki(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `wiki` field to an Option value (optional)
     pub fn maybe_wiki(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -1084,12 +1088,12 @@ impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `year` field (optional)
     pub fn year(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `year` field to an Option value (optional)
     pub fn maybe_year(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -1097,12 +1101,12 @@ impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
 impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
     /// Set the `youtubeLink` field (optional)
     pub fn youtube_link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `youtubeLink` field to an Option value (optional)
     pub fn maybe_youtube_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -1110,41 +1114,41 @@ impl<'a, S: scrobble_state::State> ScrobbleBuilder<'a, S> {
 impl<'a, S> ScrobbleBuilder<'a, S>
 where
     S: scrobble_state::State,
-    S::Artist: scrobble_state::IsSet,
-    S::Duration: scrobble_state::IsSet,
+    S::Album: scrobble_state::IsSet,
     S::Title: scrobble_state::IsSet,
+    S::Duration: scrobble_state::IsSet,
     S::AlbumArtist: scrobble_state::IsSet,
+    S::Artist: scrobble_state::IsSet,
     S::CreatedAt: scrobble_state::IsSet,
-    S::Album: scrobble_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Scrobble<'a> {
         Scrobble {
-            album: self.__unsafe_private_named.0.unwrap(),
-            album_art: self.__unsafe_private_named.1,
-            album_art_url: self.__unsafe_private_named.2,
-            album_artist: self.__unsafe_private_named.3.unwrap(),
-            apple_music_link: self.__unsafe_private_named.4,
-            artist: self.__unsafe_private_named.5.unwrap(),
-            artists: self.__unsafe_private_named.6,
-            composer: self.__unsafe_private_named.7,
-            copyright_message: self.__unsafe_private_named.8,
-            created_at: self.__unsafe_private_named.9.unwrap(),
-            disc_number: self.__unsafe_private_named.10,
-            duration: self.__unsafe_private_named.11.unwrap(),
-            genre: self.__unsafe_private_named.12,
-            label: self.__unsafe_private_named.13,
-            lyrics: self.__unsafe_private_named.14,
-            mbid: self.__unsafe_private_named.15,
-            release_date: self.__unsafe_private_named.16,
-            spotify_link: self.__unsafe_private_named.17,
-            tags: self.__unsafe_private_named.18,
-            tidal_link: self.__unsafe_private_named.19,
-            title: self.__unsafe_private_named.20.unwrap(),
-            track_number: self.__unsafe_private_named.21,
-            wiki: self.__unsafe_private_named.22,
-            year: self.__unsafe_private_named.23,
-            youtube_link: self.__unsafe_private_named.24,
+            album: self._fields.0.unwrap(),
+            album_art: self._fields.1,
+            album_art_url: self._fields.2,
+            album_artist: self._fields.3.unwrap(),
+            apple_music_link: self._fields.4,
+            artist: self._fields.5.unwrap(),
+            artists: self._fields.6,
+            composer: self._fields.7,
+            copyright_message: self._fields.8,
+            created_at: self._fields.9.unwrap(),
+            disc_number: self._fields.10,
+            duration: self._fields.11.unwrap(),
+            genre: self._fields.12,
+            label: self._fields.13,
+            lyrics: self._fields.14,
+            mbid: self._fields.15,
+            release_date: self._fields.16,
+            spotify_link: self._fields.17,
+            tags: self._fields.18,
+            tidal_link: self._fields.19,
+            title: self._fields.20.unwrap(),
+            track_number: self._fields.21,
+            wiki: self._fields.22,
+            year: self._fields.23,
+            youtube_link: self._fields.24,
             extra_data: Default::default(),
         }
     }
@@ -1157,31 +1161,31 @@ where
         >,
     ) -> Scrobble<'a> {
         Scrobble {
-            album: self.__unsafe_private_named.0.unwrap(),
-            album_art: self.__unsafe_private_named.1,
-            album_art_url: self.__unsafe_private_named.2,
-            album_artist: self.__unsafe_private_named.3.unwrap(),
-            apple_music_link: self.__unsafe_private_named.4,
-            artist: self.__unsafe_private_named.5.unwrap(),
-            artists: self.__unsafe_private_named.6,
-            composer: self.__unsafe_private_named.7,
-            copyright_message: self.__unsafe_private_named.8,
-            created_at: self.__unsafe_private_named.9.unwrap(),
-            disc_number: self.__unsafe_private_named.10,
-            duration: self.__unsafe_private_named.11.unwrap(),
-            genre: self.__unsafe_private_named.12,
-            label: self.__unsafe_private_named.13,
-            lyrics: self.__unsafe_private_named.14,
-            mbid: self.__unsafe_private_named.15,
-            release_date: self.__unsafe_private_named.16,
-            spotify_link: self.__unsafe_private_named.17,
-            tags: self.__unsafe_private_named.18,
-            tidal_link: self.__unsafe_private_named.19,
-            title: self.__unsafe_private_named.20.unwrap(),
-            track_number: self.__unsafe_private_named.21,
-            wiki: self.__unsafe_private_named.22,
-            year: self.__unsafe_private_named.23,
-            youtube_link: self.__unsafe_private_named.24,
+            album: self._fields.0.unwrap(),
+            album_art: self._fields.1,
+            album_art_url: self._fields.2,
+            album_artist: self._fields.3.unwrap(),
+            apple_music_link: self._fields.4,
+            artist: self._fields.5.unwrap(),
+            artists: self._fields.6,
+            composer: self._fields.7,
+            copyright_message: self._fields.8,
+            created_at: self._fields.9.unwrap(),
+            disc_number: self._fields.10,
+            duration: self._fields.11.unwrap(),
+            genre: self._fields.12,
+            label: self._fields.13,
+            lyrics: self._fields.14,
+            mbid: self._fields.15,
+            release_date: self._fields.16,
+            spotify_link: self._fields.17,
+            tags: self._fields.18,
+            tidal_link: self._fields.19,
+            title: self._fields.20.unwrap(),
+            track_number: self._fields.21,
+            wiki: self._fields.22,
+            year: self._fields.23,
+            youtube_link: self._fields.24,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_rocksky/scrobble/create_scrobble.rs b/crates/jacquard-api/src/app_rocksky/scrobble/create_scrobble.rs
index 981e3fd2..d4e98a1a 100644
--- a/crates/jacquard-api/src/app_rocksky/scrobble/create_scrobble.rs
+++ b/crates/jacquard-api/src/app_rocksky/scrobble/create_scrobble.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::UriValue;
diff --git a/crates/jacquard-api/src/app_rocksky/scrobble/get_scrobble.rs b/crates/jacquard-api/src/app_rocksky/scrobble/get_scrobble.rs
index ddbee596..dcc9776a 100644
--- a/crates/jacquard-api/src/app_rocksky/scrobble/get_scrobble.rs
+++ b/crates/jacquard-api/src/app_rocksky/scrobble/get_scrobble.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_scrobble_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetScrobbleBuilder<'a, S: get_scrobble_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetScrobble<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetScrobbleBuilder<'a, get_scrobble_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetScrobbleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetScrobbleBuilder<'a, get_scrobble_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetScrobbleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetScrobble<'a> {
         GetScrobble {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/scrobble/get_scrobbles.rs b/crates/jacquard-api/src/app_rocksky/scrobble/get_scrobbles.rs
index 2ea832fc..d88d82c3 100644
--- a/crates/jacquard-api/src/app_rocksky/scrobble/get_scrobbles.rs
+++ b/crates/jacquard-api/src/app_rocksky/scrobble/get_scrobbles.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -83,14 +86,9 @@ pub mod get_scrobbles_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetScrobblesBuilder<'a, S: get_scrobbles_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<AtIdentifier<'a>>,
-        Option<bool>,
-        Option<i64>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<bool>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetScrobbles<'a> {
@@ -104,9 +102,9 @@ impl<'a> GetScrobblesBuilder<'a, get_scrobbles_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetScrobblesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,12 +112,12 @@ impl<'a> GetScrobblesBuilder<'a, get_scrobbles_state::Empty> {
 impl<'a, S: get_scrobbles_state::State> GetScrobblesBuilder<'a, S> {
     /// Set the `did` field (optional)
     pub fn did(mut self, value: impl Into<Option<AtIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `did` field to an Option value (optional)
     pub fn maybe_did(mut self, value: Option<AtIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -127,12 +125,12 @@ impl<'a, S: get_scrobbles_state::State> GetScrobblesBuilder<'a, S> {
 impl<'a, S: get_scrobbles_state::State> GetScrobblesBuilder<'a, S> {
     /// Set the `following` field (optional)
     pub fn following(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `following` field to an Option value (optional)
     pub fn maybe_following(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -140,12 +138,12 @@ impl<'a, S: get_scrobbles_state::State> GetScrobblesBuilder<'a, S> {
 impl<'a, S: get_scrobbles_state::State> GetScrobblesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -153,12 +151,12 @@ impl<'a, S: get_scrobbles_state::State> GetScrobblesBuilder<'a, S> {
 impl<'a, S: get_scrobbles_state::State> GetScrobblesBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -170,10 +168,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetScrobbles<'a> {
         GetScrobbles {
-            did: self.__unsafe_private_named.0,
-            following: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            offset: self.__unsafe_private_named.3,
+            did: self._fields.0,
+            following: self._fields.1,
+            limit: self._fields.2,
+            offset: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/shout.rs b/crates/jacquard-api/src/app_rocksky/shout.rs
index 17e20a54..0c23812b 100644
--- a/crates/jacquard-api/src/app_rocksky/shout.rs
+++ b/crates/jacquard-api/src/app_rocksky/shout.rs
@@ -15,7 +15,11 @@ pub mod remove_shout;
 pub mod reply_shout;
 pub mod report_shout;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -283,14 +287,14 @@ pub mod shout_state {
 
 /// Builder for constructing an instance of this type
 pub struct ShoutBuilder<'a, S: shout_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<StrongRef<'a>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Shout<'a> {
@@ -304,9 +308,9 @@ impl<'a> ShoutBuilder<'a, shout_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ShoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -321,11 +325,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ShoutBuilder<'a, shout_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ShoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -340,11 +344,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ShoutBuilder<'a, shout_state::SetMessage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ShoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -352,12 +356,12 @@ where
 impl<'a, S: shout_state::State> ShoutBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -372,11 +376,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ShoutBuilder<'a, shout_state::SetSubject<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ShoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -391,10 +395,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Shout<'a> {
         Shout {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            parent: self.__unsafe_private_named.2,
-            subject: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            parent: self._fields.2,
+            subject: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -407,10 +411,10 @@ where
         >,
     ) -> Shout<'a> {
         Shout {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            parent: self.__unsafe_private_named.2,
-            subject: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            parent: self._fields.2,
+            subject: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_rocksky/shout/create_shout.rs b/crates/jacquard-api/src/app_rocksky/shout/create_shout.rs
index a433bda9..b5e8bf10 100644
--- a/crates/jacquard-api/src/app_rocksky/shout/create_shout.rs
+++ b/crates/jacquard-api/src/app_rocksky/shout/create_shout.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_rocksky/shout/get_album_shouts.rs b/crates/jacquard-api/src/app_rocksky/shout/get_album_shouts.rs
index 5dfc0957..1984baa0 100644
--- a/crates/jacquard-api/src/app_rocksky/shout/get_album_shouts.rs
+++ b/crates/jacquard-api/src/app_rocksky/shout/get_album_shouts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_common::types::value::Data;
@@ -93,9 +96,9 @@ pub mod get_album_shouts_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetAlbumShoutsBuilder<'a, S: get_album_shouts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetAlbumShouts<'a> {
@@ -109,9 +112,9 @@ impl<'a> GetAlbumShoutsBuilder<'a, get_album_shouts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetAlbumShoutsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,12 +122,12 @@ impl<'a> GetAlbumShoutsBuilder<'a, get_album_shouts_state::Empty> {
 impl<'a, S: get_album_shouts_state::State> GetAlbumShoutsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -132,12 +135,12 @@ impl<'a, S: get_album_shouts_state::State> GetAlbumShoutsBuilder<'a, S> {
 impl<'a, S: get_album_shouts_state::State> GetAlbumShoutsBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -152,11 +155,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetAlbumShoutsBuilder<'a, get_album_shouts_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetAlbumShoutsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -169,9 +172,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetAlbumShouts<'a> {
         GetAlbumShouts {
-            limit: self.__unsafe_private_named.0,
-            offset: self.__unsafe_private_named.1,
-            uri: self.__unsafe_private_named.2.unwrap(),
+            limit: self._fields.0,
+            offset: self._fields.1,
+            uri: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/shout/get_artist_shouts.rs b/crates/jacquard-api/src/app_rocksky/shout/get_artist_shouts.rs
index 17c89052..d412d520 100644
--- a/crates/jacquard-api/src/app_rocksky/shout/get_artist_shouts.rs
+++ b/crates/jacquard-api/src/app_rocksky/shout/get_artist_shouts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_common::types::value::Data;
@@ -93,9 +96,9 @@ pub mod get_artist_shouts_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetArtistShoutsBuilder<'a, S: get_artist_shouts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetArtistShouts<'a> {
@@ -109,9 +112,9 @@ impl<'a> GetArtistShoutsBuilder<'a, get_artist_shouts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetArtistShoutsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,12 +122,12 @@ impl<'a> GetArtistShoutsBuilder<'a, get_artist_shouts_state::Empty> {
 impl<'a, S: get_artist_shouts_state::State> GetArtistShoutsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -132,12 +135,12 @@ impl<'a, S: get_artist_shouts_state::State> GetArtistShoutsBuilder<'a, S> {
 impl<'a, S: get_artist_shouts_state::State> GetArtistShoutsBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -152,11 +155,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetArtistShoutsBuilder<'a, get_artist_shouts_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetArtistShoutsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -169,9 +172,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetArtistShouts<'a> {
         GetArtistShouts {
-            limit: self.__unsafe_private_named.0,
-            offset: self.__unsafe_private_named.1,
-            uri: self.__unsafe_private_named.2.unwrap(),
+            limit: self._fields.0,
+            offset: self._fields.1,
+            uri: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/shout/get_profile_shouts.rs b/crates/jacquard-api/src/app_rocksky/shout/get_profile_shouts.rs
index 48cff57d..776af740 100644
--- a/crates/jacquard-api/src/app_rocksky/shout/get_profile_shouts.rs
+++ b/crates/jacquard-api/src/app_rocksky/shout/get_profile_shouts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_common::types::value::Data;
@@ -93,9 +96,9 @@ pub mod get_profile_shouts_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetProfileShoutsBuilder<'a, S: get_profile_shouts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetProfileShouts<'a> {
@@ -109,9 +112,9 @@ impl<'a> GetProfileShoutsBuilder<'a, get_profile_shouts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetProfileShoutsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -126,11 +129,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetProfileShoutsBuilder<'a, get_profile_shouts_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetProfileShoutsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -138,12 +141,12 @@ where
 impl<'a, S: get_profile_shouts_state::State> GetProfileShoutsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -151,12 +154,12 @@ impl<'a, S: get_profile_shouts_state::State> GetProfileShoutsBuilder<'a, S> {
 impl<'a, S: get_profile_shouts_state::State> GetProfileShoutsBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -169,9 +172,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetProfileShouts<'a> {
         GetProfileShouts {
-            did: self.__unsafe_private_named.0.unwrap(),
-            limit: self.__unsafe_private_named.1,
-            offset: self.__unsafe_private_named.2,
+            did: self._fields.0.unwrap(),
+            limit: self._fields.1,
+            offset: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/shout/get_shout_replies.rs b/crates/jacquard-api/src/app_rocksky/shout/get_shout_replies.rs
index aacbdc66..fe921c16 100644
--- a/crates/jacquard-api/src/app_rocksky/shout/get_shout_replies.rs
+++ b/crates/jacquard-api/src/app_rocksky/shout/get_shout_replies.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_common::types::value::Data;
@@ -93,9 +96,9 @@ pub mod get_shout_replies_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetShoutRepliesBuilder<'a, S: get_shout_replies_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetShoutReplies<'a> {
@@ -109,9 +112,9 @@ impl<'a> GetShoutRepliesBuilder<'a, get_shout_replies_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetShoutRepliesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,12 +122,12 @@ impl<'a> GetShoutRepliesBuilder<'a, get_shout_replies_state::Empty> {
 impl<'a, S: get_shout_replies_state::State> GetShoutRepliesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -132,12 +135,12 @@ impl<'a, S: get_shout_replies_state::State> GetShoutRepliesBuilder<'a, S> {
 impl<'a, S: get_shout_replies_state::State> GetShoutRepliesBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -152,11 +155,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetShoutRepliesBuilder<'a, get_shout_replies_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetShoutRepliesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -169,9 +172,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetShoutReplies<'a> {
         GetShoutReplies {
-            limit: self.__unsafe_private_named.0,
-            offset: self.__unsafe_private_named.1,
-            uri: self.__unsafe_private_named.2.unwrap(),
+            limit: self._fields.0,
+            offset: self._fields.1,
+            uri: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/shout/get_track_shouts.rs b/crates/jacquard-api/src/app_rocksky/shout/get_track_shouts.rs
index e8f7005f..1f611893 100644
--- a/crates/jacquard-api/src/app_rocksky/shout/get_track_shouts.rs
+++ b/crates/jacquard-api/src/app_rocksky/shout/get_track_shouts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_common::types::value::Data;
@@ -87,9 +90,9 @@ pub mod get_track_shouts_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTrackShoutsBuilder<'a, S: get_track_shouts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetTrackShouts<'a> {
@@ -103,9 +106,9 @@ impl<'a> GetTrackShoutsBuilder<'a, get_track_shouts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTrackShoutsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,11 +123,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetTrackShoutsBuilder<'a, get_track_shouts_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetTrackShoutsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,7 +140,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetTrackShouts<'a> {
         GetTrackShouts {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/shout/remove_shout.rs b/crates/jacquard-api/src/app_rocksky/shout/remove_shout.rs
index b13230f4..a8c474c3 100644
--- a/crates/jacquard-api/src/app_rocksky/shout/remove_shout.rs
+++ b/crates/jacquard-api/src/app_rocksky/shout/remove_shout.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -94,9 +95,9 @@ pub mod remove_shout_params_state {
 
 /// Builder for constructing an instance of this type
 pub struct RemoveShoutParamsBuilder<'a, S: remove_shout_params_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RemoveShoutParams<'a> {
@@ -110,9 +111,9 @@ impl<'a> RemoveShoutParamsBuilder<'a, remove_shout_params_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RemoveShoutParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -127,11 +128,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RemoveShoutParamsBuilder<'a, remove_shout_params_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RemoveShoutParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -144,7 +145,7 @@ where
     /// Build the final struct
     pub fn build(self) -> RemoveShoutParams<'a> {
         RemoveShoutParams {
-            id: self.__unsafe_private_named.0.unwrap(),
+            id: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/shout/reply_shout.rs b/crates/jacquard-api/src/app_rocksky/shout/reply_shout.rs
index 20029503..26c93d30 100644
--- a/crates/jacquard-api/src/app_rocksky/shout/reply_shout.rs
+++ b/crates/jacquard-api/src/app_rocksky/shout/reply_shout.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_rocksky/shout/report_shout.rs b/crates/jacquard-api/src/app_rocksky/shout/report_shout.rs
index ee589f13..1d8adc2f 100644
--- a/crates/jacquard-api/src/app_rocksky/shout/report_shout.rs
+++ b/crates/jacquard-api/src/app_rocksky/shout/report_shout.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/app_rocksky/song.rs b/crates/jacquard-api/src/app_rocksky/song.rs
index 4daa2194..1cf6c9c2 100644
--- a/crates/jacquard-api/src/app_rocksky/song.rs
+++ b/crates/jacquard-api/src/app_rocksky/song.rs
@@ -10,7 +10,11 @@ pub mod get_song;
 pub mod get_songs;
 pub mod match_song;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -628,112 +632,112 @@ pub mod song_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Title;
         type Album;
-        type Artist;
-        type AlbumArtist;
         type Duration;
         type CreatedAt;
+        type Artist;
+        type AlbumArtist;
+        type Title;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Title = Unset;
         type Album = Unset;
-        type Artist = Unset;
-        type AlbumArtist = Unset;
         type Duration = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Title = Set<members::title>;
-        type Album = S::Album;
-        type Artist = S::Artist;
-        type AlbumArtist = S::AlbumArtist;
-        type Duration = S::Duration;
-        type CreatedAt = S::CreatedAt;
+        type Artist = Unset;
+        type AlbumArtist = Unset;
+        type Title = Unset;
     }
     ///State transition - sets the `album` field to Set
     pub struct SetAlbum<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAlbum<S> {}
     impl<S: State> State for SetAlbum<S> {
-        type Title = S::Title;
         type Album = Set<members::album>;
+        type Duration = S::Duration;
+        type CreatedAt = S::CreatedAt;
         type Artist = S::Artist;
         type AlbumArtist = S::AlbumArtist;
-        type Duration = S::Duration;
+        type Title = S::Title;
+    }
+    ///State transition - sets the `duration` field to Set
+    pub struct SetDuration<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDuration<S> {}
+    impl<S: State> State for SetDuration<S> {
+        type Album = S::Album;
+        type Duration = Set<members::duration>;
         type CreatedAt = S::CreatedAt;
+        type Artist = S::Artist;
+        type AlbumArtist = S::AlbumArtist;
+        type Title = S::Title;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Album = S::Album;
+        type Duration = S::Duration;
+        type CreatedAt = Set<members::created_at>;
+        type Artist = S::Artist;
+        type AlbumArtist = S::AlbumArtist;
+        type Title = S::Title;
     }
     ///State transition - sets the `artist` field to Set
     pub struct SetArtist<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetArtist<S> {}
     impl<S: State> State for SetArtist<S> {
-        type Title = S::Title;
         type Album = S::Album;
-        type Artist = Set<members::artist>;
-        type AlbumArtist = S::AlbumArtist;
         type Duration = S::Duration;
         type CreatedAt = S::CreatedAt;
+        type Artist = Set<members::artist>;
+        type AlbumArtist = S::AlbumArtist;
+        type Title = S::Title;
     }
     ///State transition - sets the `album_artist` field to Set
     pub struct SetAlbumArtist<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAlbumArtist<S> {}
     impl<S: State> State for SetAlbumArtist<S> {
-        type Title = S::Title;
         type Album = S::Album;
-        type Artist = S::Artist;
-        type AlbumArtist = Set<members::album_artist>;
         type Duration = S::Duration;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `duration` field to Set
-    pub struct SetDuration<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDuration<S> {}
-    impl<S: State> State for SetDuration<S> {
-        type Title = S::Title;
-        type Album = S::Album;
         type Artist = S::Artist;
-        type AlbumArtist = S::AlbumArtist;
-        type Duration = Set<members::duration>;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+        type AlbumArtist = Set<members::album_artist>;
         type Title = S::Title;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
         type Album = S::Album;
+        type Duration = S::Duration;
+        type CreatedAt = S::CreatedAt;
         type Artist = S::Artist;
         type AlbumArtist = S::AlbumArtist;
-        type Duration = S::Duration;
-        type CreatedAt = Set<members::created_at>;
+        type Title = Set<members::title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `title` field
-        pub struct title(());
         ///Marker type for the `album` field
         pub struct album(());
-        ///Marker type for the `artist` field
-        pub struct artist(());
-        ///Marker type for the `album_artist` field
-        pub struct album_artist(());
         ///Marker type for the `duration` field
         pub struct duration(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `artist` field
+        pub struct artist(());
+        ///Marker type for the `album_artist` field
+        pub struct album_artist(());
+        ///Marker type for the `title` field
+        pub struct title(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SongBuilder<'a, S: song_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
         Option<UriValue<'a>>,
@@ -760,7 +764,7 @@ pub struct SongBuilder<'a, S: song_state::State> {
         Option<i64>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Song<'a> {
@@ -774,8 +778,8 @@ impl<'a> SongBuilder<'a, song_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -802,7 +806,7 @@ impl<'a> SongBuilder<'a, song_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -817,11 +821,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SongBuilder<'a, song_state::SetAlbum<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -829,12 +833,12 @@ where
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `albumArt` field (optional)
     pub fn album_art(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `albumArt` field to an Option value (optional)
     pub fn maybe_album_art(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -842,12 +846,12 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `albumArtUrl` field (optional)
     pub fn album_art_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `albumArtUrl` field to an Option value (optional)
     pub fn maybe_album_art_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -862,11 +866,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SongBuilder<'a, song_state::SetAlbumArtist<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -874,12 +878,12 @@ where
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `appleMusicLink` field (optional)
     pub fn apple_music_link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `appleMusicLink` field to an Option value (optional)
     pub fn maybe_apple_music_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -894,11 +898,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SongBuilder<'a, song_state::SetArtist<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         SongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -906,12 +910,12 @@ where
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `artists` field (optional)
     pub fn artists(mut self, value: impl Into<Option<Vec<ArtistMbid<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `artists` field to an Option value (optional)
     pub fn maybe_artists(mut self, value: Option<Vec<ArtistMbid<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -919,12 +923,12 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `composer` field (optional)
     pub fn composer(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `composer` field to an Option value (optional)
     pub fn maybe_composer(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -932,12 +936,12 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `copyrightMessage` field (optional)
     pub fn copyright_message(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `copyrightMessage` field to an Option value (optional)
     pub fn maybe_copyright_message(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -952,11 +956,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SongBuilder<'a, song_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         SongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -964,12 +968,12 @@ where
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `discNumber` field (optional)
     pub fn disc_number(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `discNumber` field to an Option value (optional)
     pub fn maybe_disc_number(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -984,11 +988,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SongBuilder<'a, song_state::SetDuration<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         SongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -996,12 +1000,12 @@ where
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -1009,12 +1013,12 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `label` field (optional)
     pub fn label(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `label` field to an Option value (optional)
     pub fn maybe_label(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -1022,12 +1026,12 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `lyrics` field (optional)
     pub fn lyrics(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `lyrics` field to an Option value (optional)
     pub fn maybe_lyrics(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -1035,12 +1039,12 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `mbid` field (optional)
     pub fn mbid(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `mbid` field to an Option value (optional)
     pub fn maybe_mbid(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -1048,12 +1052,12 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `releaseDate` field (optional)
     pub fn release_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `releaseDate` field to an Option value (optional)
     pub fn maybe_release_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -1061,12 +1065,12 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `spotifyLink` field (optional)
     pub fn spotify_link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `spotifyLink` field to an Option value (optional)
     pub fn maybe_spotify_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -1074,12 +1078,12 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -1087,12 +1091,12 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `tidalLink` field (optional)
     pub fn tidal_link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `tidalLink` field to an Option value (optional)
     pub fn maybe_tidal_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -1107,11 +1111,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SongBuilder<'a, song_state::SetTitle<S>> {
-        self.__unsafe_private_named.20 = Option::Some(value.into());
+        self._fields.20 = Option::Some(value.into());
         SongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1119,12 +1123,12 @@ where
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `trackNumber` field (optional)
     pub fn track_number(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `trackNumber` field to an Option value (optional)
     pub fn maybe_track_number(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -1132,12 +1136,12 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `wiki` field (optional)
     pub fn wiki(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `wiki` field to an Option value (optional)
     pub fn maybe_wiki(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -1145,12 +1149,12 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `year` field (optional)
     pub fn year(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `year` field to an Option value (optional)
     pub fn maybe_year(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -1158,12 +1162,12 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `youtubeLink` field (optional)
     pub fn youtube_link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `youtubeLink` field to an Option value (optional)
     pub fn maybe_youtube_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -1171,41 +1175,41 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S> SongBuilder<'a, S>
 where
     S: song_state::State,
-    S::Title: song_state::IsSet,
     S::Album: song_state::IsSet,
-    S::Artist: song_state::IsSet,
-    S::AlbumArtist: song_state::IsSet,
     S::Duration: song_state::IsSet,
     S::CreatedAt: song_state::IsSet,
+    S::Artist: song_state::IsSet,
+    S::AlbumArtist: song_state::IsSet,
+    S::Title: song_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Song<'a> {
         Song {
-            album: self.__unsafe_private_named.0.unwrap(),
-            album_art: self.__unsafe_private_named.1,
-            album_art_url: self.__unsafe_private_named.2,
-            album_artist: self.__unsafe_private_named.3.unwrap(),
-            apple_music_link: self.__unsafe_private_named.4,
-            artist: self.__unsafe_private_named.5.unwrap(),
-            artists: self.__unsafe_private_named.6,
-            composer: self.__unsafe_private_named.7,
-            copyright_message: self.__unsafe_private_named.8,
-            created_at: self.__unsafe_private_named.9.unwrap(),
-            disc_number: self.__unsafe_private_named.10,
-            duration: self.__unsafe_private_named.11.unwrap(),
-            genre: self.__unsafe_private_named.12,
-            label: self.__unsafe_private_named.13,
-            lyrics: self.__unsafe_private_named.14,
-            mbid: self.__unsafe_private_named.15,
-            release_date: self.__unsafe_private_named.16,
-            spotify_link: self.__unsafe_private_named.17,
-            tags: self.__unsafe_private_named.18,
-            tidal_link: self.__unsafe_private_named.19,
-            title: self.__unsafe_private_named.20.unwrap(),
-            track_number: self.__unsafe_private_named.21,
-            wiki: self.__unsafe_private_named.22,
-            year: self.__unsafe_private_named.23,
-            youtube_link: self.__unsafe_private_named.24,
+            album: self._fields.0.unwrap(),
+            album_art: self._fields.1,
+            album_art_url: self._fields.2,
+            album_artist: self._fields.3.unwrap(),
+            apple_music_link: self._fields.4,
+            artist: self._fields.5.unwrap(),
+            artists: self._fields.6,
+            composer: self._fields.7,
+            copyright_message: self._fields.8,
+            created_at: self._fields.9.unwrap(),
+            disc_number: self._fields.10,
+            duration: self._fields.11.unwrap(),
+            genre: self._fields.12,
+            label: self._fields.13,
+            lyrics: self._fields.14,
+            mbid: self._fields.15,
+            release_date: self._fields.16,
+            spotify_link: self._fields.17,
+            tags: self._fields.18,
+            tidal_link: self._fields.19,
+            title: self._fields.20.unwrap(),
+            track_number: self._fields.21,
+            wiki: self._fields.22,
+            year: self._fields.23,
+            youtube_link: self._fields.24,
             extra_data: Default::default(),
         }
     }
@@ -1218,31 +1222,31 @@ where
         >,
     ) -> Song<'a> {
         Song {
-            album: self.__unsafe_private_named.0.unwrap(),
-            album_art: self.__unsafe_private_named.1,
-            album_art_url: self.__unsafe_private_named.2,
-            album_artist: self.__unsafe_private_named.3.unwrap(),
-            apple_music_link: self.__unsafe_private_named.4,
-            artist: self.__unsafe_private_named.5.unwrap(),
-            artists: self.__unsafe_private_named.6,
-            composer: self.__unsafe_private_named.7,
-            copyright_message: self.__unsafe_private_named.8,
-            created_at: self.__unsafe_private_named.9.unwrap(),
-            disc_number: self.__unsafe_private_named.10,
-            duration: self.__unsafe_private_named.11.unwrap(),
-            genre: self.__unsafe_private_named.12,
-            label: self.__unsafe_private_named.13,
-            lyrics: self.__unsafe_private_named.14,
-            mbid: self.__unsafe_private_named.15,
-            release_date: self.__unsafe_private_named.16,
-            spotify_link: self.__unsafe_private_named.17,
-            tags: self.__unsafe_private_named.18,
-            tidal_link: self.__unsafe_private_named.19,
-            title: self.__unsafe_private_named.20.unwrap(),
-            track_number: self.__unsafe_private_named.21,
-            wiki: self.__unsafe_private_named.22,
-            year: self.__unsafe_private_named.23,
-            youtube_link: self.__unsafe_private_named.24,
+            album: self._fields.0.unwrap(),
+            album_art: self._fields.1,
+            album_art_url: self._fields.2,
+            album_artist: self._fields.3.unwrap(),
+            apple_music_link: self._fields.4,
+            artist: self._fields.5.unwrap(),
+            artists: self._fields.6,
+            composer: self._fields.7,
+            copyright_message: self._fields.8,
+            created_at: self._fields.9.unwrap(),
+            disc_number: self._fields.10,
+            duration: self._fields.11.unwrap(),
+            genre: self._fields.12,
+            label: self._fields.13,
+            lyrics: self._fields.14,
+            mbid: self._fields.15,
+            release_date: self._fields.16,
+            spotify_link: self._fields.17,
+            tags: self._fields.18,
+            tidal_link: self._fields.19,
+            title: self._fields.20.unwrap(),
+            track_number: self._fields.21,
+            wiki: self._fields.22,
+            year: self._fields.23,
+            youtube_link: self._fields.24,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/app_rocksky/song/create_song.rs b/crates/jacquard-api/src/app_rocksky/song/create_song.rs
index 881207c2..03326334 100644
--- a/crates/jacquard-api/src/app_rocksky/song/create_song.rs
+++ b/crates/jacquard-api/src/app_rocksky/song/create_song.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::UriValue;
diff --git a/crates/jacquard-api/src/app_rocksky/song/get_song.rs b/crates/jacquard-api/src/app_rocksky/song/get_song.rs
index 6f6c0fd8..0c894633 100644
--- a/crates/jacquard-api/src/app_rocksky/song/get_song.rs
+++ b/crates/jacquard-api/src/app_rocksky/song/get_song.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_song_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSongBuilder<'a, S: get_song_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSong<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetSongBuilder<'a, get_song_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetSongBuilder<'a, get_song_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetSongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSong<'a> {
         GetSong {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/song/get_songs.rs b/crates/jacquard-api/src/app_rocksky/song/get_songs.rs
index 0e63f853..5c4259e5 100644
--- a/crates/jacquard-api/src/app_rocksky/song/get_songs.rs
+++ b/crates/jacquard-api/src/app_rocksky/song/get_songs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -81,9 +84,9 @@ pub mod get_songs_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSongsBuilder<'a, S: get_songs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSongs<'a> {
@@ -97,9 +100,9 @@ impl<'a> GetSongsBuilder<'a, get_songs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSongsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -107,12 +110,12 @@ impl<'a> GetSongsBuilder<'a, get_songs_state::Empty> {
 impl<'a, S: get_songs_state::State> GetSongsBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -120,12 +123,12 @@ impl<'a, S: get_songs_state::State> GetSongsBuilder<'a, S> {
 impl<'a, S: get_songs_state::State> GetSongsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -133,12 +136,12 @@ impl<'a, S: get_songs_state::State> GetSongsBuilder<'a, S> {
 impl<'a, S: get_songs_state::State> GetSongsBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -150,9 +153,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSongs<'a> {
         GetSongs {
-            genre: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            offset: self.__unsafe_private_named.2,
+            genre: self._fields.0,
+            limit: self._fields.1,
+            offset: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/song/match_song.rs b/crates/jacquard-api/src/app_rocksky/song/match_song.rs
index 339c352c..9532049a 100644
--- a/crates/jacquard-api/src/app_rocksky/song/match_song.rs
+++ b/crates/jacquard-api/src/app_rocksky/song/match_song.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::IntoStatic;
@@ -100,9 +101,9 @@ pub mod match_song_state {
 
 /// Builder for constructing an instance of this type
 pub struct MatchSongBuilder<'a, S: match_song_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MatchSong<'a> {
@@ -116,9 +117,9 @@ impl<'a> MatchSongBuilder<'a, match_song_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MatchSongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -133,11 +134,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MatchSongBuilder<'a, match_song_state::SetArtist<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MatchSongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -152,11 +153,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MatchSongBuilder<'a, match_song_state::SetTitle<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MatchSongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -170,8 +171,8 @@ where
     /// Build the final struct
     pub fn build(self) -> MatchSong<'a> {
         MatchSong {
-            artist: self.__unsafe_private_named.0.unwrap(),
-            title: self.__unsafe_private_named.1.unwrap(),
+            artist: self._fields.0.unwrap(),
+            title: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/spotify/get_currently_playing.rs b/crates/jacquard-api/src/app_rocksky/spotify/get_currently_playing.rs
index 11879b2b..d5d5913d 100644
--- a/crates/jacquard-api/src/app_rocksky/spotify/get_currently_playing.rs
+++ b/crates/jacquard-api/src/app_rocksky/spotify/get_currently_playing.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::IntoStatic;
@@ -74,9 +75,9 @@ pub mod get_currently_playing_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetCurrentlyPlayingBuilder<'a, S: get_currently_playing_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetCurrentlyPlaying<'a> {
@@ -90,9 +91,9 @@ impl<'a> GetCurrentlyPlayingBuilder<'a, get_currently_playing_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetCurrentlyPlayingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -100,12 +101,12 @@ impl<'a> GetCurrentlyPlayingBuilder<'a, get_currently_playing_state::Empty> {
 impl<'a, S: get_currently_playing_state::State> GetCurrentlyPlayingBuilder<'a, S> {
     /// Set the `actor` field (optional)
     pub fn actor(mut self, value: impl Into<Option<AtIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `actor` field to an Option value (optional)
     pub fn maybe_actor(mut self, value: Option<AtIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -117,7 +118,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetCurrentlyPlaying<'a> {
         GetCurrentlyPlaying {
-            actor: self.__unsafe_private_named.0,
+            actor: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/spotify/next.rs b/crates/jacquard-api/src/app_rocksky/spotify/next.rs
index 7fef576f..1668526a 100644
--- a/crates/jacquard-api/src/app_rocksky/spotify/next.rs
+++ b/crates/jacquard-api/src/app_rocksky/spotify/next.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::IntoStatic;
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/app_rocksky/spotify/pause.rs b/crates/jacquard-api/src/app_rocksky/spotify/pause.rs
index 5fd2b7bd..b84df5ca 100644
--- a/crates/jacquard-api/src/app_rocksky/spotify/pause.rs
+++ b/crates/jacquard-api/src/app_rocksky/spotify/pause.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::IntoStatic;
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/app_rocksky/spotify/play.rs b/crates/jacquard-api/src/app_rocksky/spotify/play.rs
index 870a8be0..081b94b2 100644
--- a/crates/jacquard-api/src/app_rocksky/spotify/play.rs
+++ b/crates/jacquard-api/src/app_rocksky/spotify/play.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::IntoStatic;
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/app_rocksky/spotify/previous.rs b/crates/jacquard-api/src/app_rocksky/spotify/previous.rs
index c1a0683c..47a8d3fb 100644
--- a/crates/jacquard-api/src/app_rocksky/spotify/previous.rs
+++ b/crates/jacquard-api/src/app_rocksky/spotify/previous.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::IntoStatic;
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/app_rocksky/spotify/seek.rs b/crates/jacquard-api/src/app_rocksky/spotify/seek.rs
index ec086964..78761d34 100644
--- a/crates/jacquard-api/src/app_rocksky/spotify/seek.rs
+++ b/crates/jacquard-api/src/app_rocksky/spotify/seek.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::IntoStatic;
 use serde::{Serialize, Deserialize};
@@ -81,8 +82,8 @@ pub mod seek_params_state {
 
 /// Builder for constructing an instance of this type
 pub struct SeekParamsBuilder<S: seek_params_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
 }
 
 impl SeekParams {
@@ -96,8 +97,8 @@ impl SeekParamsBuilder<seek_params_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SeekParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -112,10 +113,10 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SeekParamsBuilder<seek_params_state::SetPosition<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SeekParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
+            _state: PhantomData,
+            _fields: self._fields,
         }
     }
 }
@@ -128,7 +129,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SeekParams {
         SeekParams {
-            position: self.__unsafe_private_named.0.unwrap(),
+            position: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_rocksky/stats/get_stats.rs b/crates/jacquard-api/src/app_rocksky/stats/get_stats.rs
index 94aabc13..9554366d 100644
--- a/crates/jacquard-api/src/app_rocksky/stats/get_stats.rs
+++ b/crates/jacquard-api/src/app_rocksky/stats/get_stats.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_stats_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetStatsBuilder<'a, S: get_stats_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetStats<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetStatsBuilder<'a, get_stats_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetStatsBuilder<'a, get_stats_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetStats<'a> {
         GetStats {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/art_cllctv/embed/external.rs b/crates/jacquard-api/src/art_cllctv/embed/external.rs
index e45c385f..e05a4540 100644
--- a/crates/jacquard-api/src/art_cllctv/embed/external.rs
+++ b/crates/jacquard-api/src/art_cllctv/embed/external.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -205,15 +208,15 @@ pub mod external_state {
 
 /// Builder for constructing an instance of this type
 pub struct ExternalBuilder<'a, S: external_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> External<'a> {
@@ -227,9 +230,9 @@ impl<'a> ExternalBuilder<'a, external_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,11 +247,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ExternalBuilder<'a, external_state::SetDescription<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -256,12 +259,12 @@ where
 impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
     /// Set the `thumb` field (optional)
     pub fn thumb(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `thumb` field to an Option value (optional)
     pub fn maybe_thumb(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -269,12 +272,12 @@ impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
 impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
     /// Set the `thumbHash` field (optional)
     pub fn thumb_hash(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `thumbHash` field to an Option value (optional)
     pub fn maybe_thumb_hash(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -289,11 +292,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ExternalBuilder<'a, external_state::SetTitle<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -308,11 +311,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ExternalBuilder<'a, external_state::SetUri<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -327,11 +330,11 @@ where
     /// Build the final struct
     pub fn build(self) -> External<'a> {
         External {
-            description: self.__unsafe_private_named.0.unwrap(),
-            thumb: self.__unsafe_private_named.1,
-            thumb_hash: self.__unsafe_private_named.2,
-            title: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            description: self._fields.0.unwrap(),
+            thumb: self._fields.1,
+            thumb_hash: self._fields.2,
+            title: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -344,11 +347,11 @@ where
         >,
     ) -> External<'a> {
         External {
-            description: self.__unsafe_private_named.0.unwrap(),
-            thumb: self.__unsafe_private_named.1,
-            thumb_hash: self.__unsafe_private_named.2,
-            title: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            description: self._fields.0.unwrap(),
+            thumb: self._fields.1,
+            thumb_hash: self._fields.2,
+            title: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -463,64 +466,64 @@ pub mod view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Description;
         type Uri;
         type Title;
+        type Description;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Description = Unset;
         type Uri = Unset;
         type Title = Unset;
-    }
-    ///State transition - sets the `description` field to Set
-    pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDescription<S> {}
-    impl<S: State> State for SetDescription<S> {
-        type Description = Set<members::description>;
-        type Uri = S::Uri;
-        type Title = S::Title;
+        type Description = Unset;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Description = S::Description;
         type Uri = Set<members::uri>;
         type Title = S::Title;
+        type Description = S::Description;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Description = S::Description;
         type Uri = S::Uri;
         type Title = Set<members::title>;
+        type Description = S::Description;
+    }
+    ///State transition - sets the `description` field to Set
+    pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDescription<S> {}
+    impl<S: State> State for SetDescription<S> {
+        type Uri = S::Uri;
+        type Title = S::Title;
+        type Description = Set<members::description>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `description` field
-        pub struct description(());
         ///Marker type for the `uri` field
         pub struct uri(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `description` field
+        pub struct description(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ViewBuilder<'a, S: view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> View<'a> {
@@ -534,9 +537,9 @@ impl<'a> ViewBuilder<'a, view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -551,11 +554,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ViewBuilder<'a, view_state::SetDescription<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -563,12 +566,12 @@ where
 impl<'a, S: view_state::State> ViewBuilder<'a, S> {
     /// Set the `thumb` field (optional)
     pub fn thumb(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `thumb` field to an Option value (optional)
     pub fn maybe_thumb(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -583,11 +586,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ViewBuilder<'a, view_state::SetTitle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -602,11 +605,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ViewBuilder<'a, view_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -614,17 +617,17 @@ where
 impl<'a, S> ViewBuilder<'a, S>
 where
     S: view_state::State,
-    S::Description: view_state::IsSet,
     S::Uri: view_state::IsSet,
     S::Title: view_state::IsSet,
+    S::Description: view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> View<'a> {
         View {
-            description: self.__unsafe_private_named.0.unwrap(),
-            thumb: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0.unwrap(),
+            thumb: self._fields.1,
+            title: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -637,10 +640,10 @@ where
         >,
     ) -> View<'a> {
         View {
-            description: self.__unsafe_private_named.0.unwrap(),
-            thumb: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0.unwrap(),
+            thumb: self._fields.1,
+            title: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/art_cllctv/embed/external_video.rs b/crates/jacquard-api/src/art_cllctv/embed/external_video.rs
index 480e110e..57fd6309 100644
--- a/crates/jacquard-api/src/art_cllctv/embed/external_video.rs
+++ b/crates/jacquard-api/src/art_cllctv/embed/external_video.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -183,15 +186,15 @@ pub mod external_video_state {
 
 /// Builder for constructing an instance of this type
 pub struct ExternalVideoBuilder<'a, S: external_video_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ExternalVideo<'a> {
@@ -205,9 +208,9 @@ impl<'a> ExternalVideoBuilder<'a, external_video_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExternalVideoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,12 +218,12 @@ impl<'a> ExternalVideoBuilder<'a, external_video_state::Empty> {
 impl<'a, S: external_video_state::State> ExternalVideoBuilder<'a, S> {
     /// Set the `id` field (optional)
     pub fn id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `id` field to an Option value (optional)
     pub fn maybe_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -228,12 +231,12 @@ impl<'a, S: external_video_state::State> ExternalVideoBuilder<'a, S> {
 impl<'a, S: external_video_state::State> ExternalVideoBuilder<'a, S> {
     /// Set the `service` field (optional)
     pub fn service(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `service` field to an Option value (optional)
     pub fn maybe_service(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -241,12 +244,12 @@ impl<'a, S: external_video_state::State> ExternalVideoBuilder<'a, S> {
 impl<'a, S: external_video_state::State> ExternalVideoBuilder<'a, S> {
     /// Set the `thumb` field (optional)
     pub fn thumb(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `thumb` field to an Option value (optional)
     pub fn maybe_thumb(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -254,12 +257,12 @@ impl<'a, S: external_video_state::State> ExternalVideoBuilder<'a, S> {
 impl<'a, S: external_video_state::State> ExternalVideoBuilder<'a, S> {
     /// Set the `thumbHash` field (optional)
     pub fn thumb_hash(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `thumbHash` field to an Option value (optional)
     pub fn maybe_thumb_hash(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -274,11 +277,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ExternalVideoBuilder<'a, external_video_state::SetUri<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ExternalVideoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -291,11 +294,11 @@ where
     /// Build the final struct
     pub fn build(self) -> ExternalVideo<'a> {
         ExternalVideo {
-            id: self.__unsafe_private_named.0,
-            service: self.__unsafe_private_named.1,
-            thumb: self.__unsafe_private_named.2,
-            thumb_hash: self.__unsafe_private_named.3,
-            uri: self.__unsafe_private_named.4.unwrap(),
+            id: self._fields.0,
+            service: self._fields.1,
+            thumb: self._fields.2,
+            thumb_hash: self._fields.3,
+            uri: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -308,11 +311,11 @@ where
         >,
     ) -> ExternalVideo<'a> {
         ExternalVideo {
-            id: self.__unsafe_private_named.0,
-            service: self.__unsafe_private_named.1,
-            thumb: self.__unsafe_private_named.2,
-            thumb_hash: self.__unsafe_private_named.3,
-            uri: self.__unsafe_private_named.4.unwrap(),
+            id: self._fields.0,
+            service: self._fields.1,
+            thumb: self._fields.2,
+            thumb_hash: self._fields.3,
+            uri: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -441,14 +444,14 @@ pub mod view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewBuilder<'a, S: view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> View<'a> {
@@ -462,9 +465,9 @@ impl<'a> ViewBuilder<'a, view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -472,12 +475,12 @@ impl<'a> ViewBuilder<'a, view_state::Empty> {
 impl<'a, S: view_state::State> ViewBuilder<'a, S> {
     /// Set the `id` field (optional)
     pub fn id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `id` field to an Option value (optional)
     pub fn maybe_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -485,12 +488,12 @@ impl<'a, S: view_state::State> ViewBuilder<'a, S> {
 impl<'a, S: view_state::State> ViewBuilder<'a, S> {
     /// Set the `service` field (optional)
     pub fn service(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `service` field to an Option value (optional)
     pub fn maybe_service(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -498,12 +501,12 @@ impl<'a, S: view_state::State> ViewBuilder<'a, S> {
 impl<'a, S: view_state::State> ViewBuilder<'a, S> {
     /// Set the `thumb` field (optional)
     pub fn thumb(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `thumb` field to an Option value (optional)
     pub fn maybe_thumb(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -518,11 +521,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ViewBuilder<'a, view_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -535,10 +538,10 @@ where
     /// Build the final struct
     pub fn build(self) -> View<'a> {
         View {
-            id: self.__unsafe_private_named.0,
-            service: self.__unsafe_private_named.1,
-            thumb: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            id: self._fields.0,
+            service: self._fields.1,
+            thumb: self._fields.2,
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -551,10 +554,10 @@ where
         >,
     ) -> View<'a> {
         View {
-            id: self.__unsafe_private_named.0,
-            service: self.__unsafe_private_named.1,
-            thumb: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            id: self._fields.0,
+            service: self._fields.1,
+            thumb: self._fields.2,
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/art_cllctv/embed/images.rs b/crates/jacquard-api/src/art_cllctv/embed/images.rs
index 9bf571cd..3c313637 100644
--- a/crates/jacquard-api/src/art_cllctv/embed/images.rs
+++ b/crates/jacquard-api/src/art_cllctv/embed/images.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -274,15 +277,15 @@ pub mod image_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImageBuilder<'a, S: image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<AspectRatio<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<Tombstone<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Image<'a> {
@@ -296,9 +299,9 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -313,11 +316,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ImageBuilder<'a, image_state::SetAlt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -325,12 +328,12 @@ where
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `aspectRatio` field (optional)
     pub fn aspect_ratio(mut self, value: impl Into<Option<AspectRatio<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
     pub fn maybe_aspect_ratio(mut self, value: Option<AspectRatio<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -345,11 +348,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ImageBuilder<'a, image_state::SetImage<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -357,12 +360,12 @@ where
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `imageHash` field (optional)
     pub fn image_hash(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `imageHash` field to an Option value (optional)
     pub fn maybe_image_hash(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -370,12 +373,12 @@ impl<'a, S: image_state::State> ImageBuilder<'a, S> {
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `tombstone` field (optional)
     pub fn tombstone(mut self, value: impl Into<Option<Tombstone<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tombstone` field to an Option value (optional)
     pub fn maybe_tombstone(mut self, value: Option<Tombstone<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -389,11 +392,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            aspect_ratio: self.__unsafe_private_named.1,
-            image: self.__unsafe_private_named.2.unwrap(),
-            image_hash: self.__unsafe_private_named.3,
-            tombstone: self.__unsafe_private_named.4,
+            alt: self._fields.0.unwrap(),
+            aspect_ratio: self._fields.1,
+            image: self._fields.2.unwrap(),
+            image_hash: self._fields.3,
+            tombstone: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -406,11 +409,11 @@ where
         >,
     ) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            aspect_ratio: self.__unsafe_private_named.1,
-            image: self.__unsafe_private_named.2.unwrap(),
-            image_hash: self.__unsafe_private_named.3,
-            tombstone: self.__unsafe_private_named.4,
+            alt: self._fields.0.unwrap(),
+            aspect_ratio: self._fields.1,
+            image: self._fields.2.unwrap(),
+            image_hash: self._fields.3,
+            tombstone: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
@@ -637,9 +640,9 @@ pub mod images_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImagesBuilder<'a, S: images_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<images::Image<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<images::Image<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Images<'a> {
@@ -653,9 +656,9 @@ impl<'a> ImagesBuilder<'a, images_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImagesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -670,11 +673,11 @@ where
         mut self,
         value: impl Into<Vec<images::Image<'a>>>,
     ) -> ImagesBuilder<'a, images_state::SetImages<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ImagesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -687,7 +690,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Images<'a> {
         Images {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -700,7 +703,7 @@ where
         >,
     ) -> Images<'a> {
         Images {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -740,9 +743,9 @@ pub mod view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewBuilder<'a, S: view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<images::ViewImage<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<images::ViewImage<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> View<'a> {
@@ -756,9 +759,9 @@ impl<'a> ViewBuilder<'a, view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -773,11 +776,11 @@ where
         mut self,
         value: impl Into<Vec<images::ViewImage<'a>>>,
     ) -> ViewBuilder<'a, view_state::SetImages<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -790,7 +793,7 @@ where
     /// Build the final struct
     pub fn build(self) -> View<'a> {
         View {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -803,7 +806,7 @@ where
         >,
     ) -> View<'a> {
         View {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -819,65 +822,65 @@ pub mod view_image_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Alt;
-        type Thumb;
         type Fullsize;
+        type Thumb;
+        type Alt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Alt = Unset;
-        type Thumb = Unset;
         type Fullsize = Unset;
+        type Thumb = Unset;
+        type Alt = Unset;
     }
-    ///State transition - sets the `alt` field to Set
-    pub struct SetAlt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAlt<S> {}
-    impl<S: State> State for SetAlt<S> {
-        type Alt = Set<members::alt>;
+    ///State transition - sets the `fullsize` field to Set
+    pub struct SetFullsize<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetFullsize<S> {}
+    impl<S: State> State for SetFullsize<S> {
+        type Fullsize = Set<members::fullsize>;
         type Thumb = S::Thumb;
-        type Fullsize = S::Fullsize;
+        type Alt = S::Alt;
     }
     ///State transition - sets the `thumb` field to Set
     pub struct SetThumb<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetThumb<S> {}
     impl<S: State> State for SetThumb<S> {
-        type Alt = S::Alt;
-        type Thumb = Set<members::thumb>;
         type Fullsize = S::Fullsize;
-    }
-    ///State transition - sets the `fullsize` field to Set
-    pub struct SetFullsize<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetFullsize<S> {}
-    impl<S: State> State for SetFullsize<S> {
+        type Thumb = Set<members::thumb>;
         type Alt = S::Alt;
+    }
+    ///State transition - sets the `alt` field to Set
+    pub struct SetAlt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAlt<S> {}
+    impl<S: State> State for SetAlt<S> {
+        type Fullsize = S::Fullsize;
         type Thumb = S::Thumb;
-        type Fullsize = Set<members::fullsize>;
+        type Alt = Set<members::alt>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `alt` field
-        pub struct alt(());
-        ///Marker type for the `thumb` field
-        pub struct thumb(());
         ///Marker type for the `fullsize` field
         pub struct fullsize(());
+        ///Marker type for the `thumb` field
+        pub struct thumb(());
+        ///Marker type for the `alt` field
+        pub struct alt(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ViewImageBuilder<'a, S: view_image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<AspectRatio<'a>>,
         Option<UriValue<'a>>,
         Option<UriValue<'a>>,
         Option<Tombstone<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ViewImage<'a> {
@@ -891,9 +894,9 @@ impl<'a> ViewImageBuilder<'a, view_image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -908,11 +911,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ViewImageBuilder<'a, view_image_state::SetAlt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -920,12 +923,12 @@ where
 impl<'a, S: view_image_state::State> ViewImageBuilder<'a, S> {
     /// Set the `aspectRatio` field (optional)
     pub fn aspect_ratio(mut self, value: impl Into<Option<AspectRatio<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
     pub fn maybe_aspect_ratio(mut self, value: Option<AspectRatio<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -940,11 +943,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ViewImageBuilder<'a, view_image_state::SetFullsize<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ViewImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -959,11 +962,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ViewImageBuilder<'a, view_image_state::SetThumb<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ViewImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -971,12 +974,12 @@ where
 impl<'a, S: view_image_state::State> ViewImageBuilder<'a, S> {
     /// Set the `tombstone` field (optional)
     pub fn tombstone(mut self, value: impl Into<Option<Tombstone<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tombstone` field to an Option value (optional)
     pub fn maybe_tombstone(mut self, value: Option<Tombstone<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -984,18 +987,18 @@ impl<'a, S: view_image_state::State> ViewImageBuilder<'a, S> {
 impl<'a, S> ViewImageBuilder<'a, S>
 where
     S: view_image_state::State,
-    S::Alt: view_image_state::IsSet,
-    S::Thumb: view_image_state::IsSet,
     S::Fullsize: view_image_state::IsSet,
+    S::Thumb: view_image_state::IsSet,
+    S::Alt: view_image_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ViewImage<'a> {
         ViewImage {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            aspect_ratio: self.__unsafe_private_named.1,
-            fullsize: self.__unsafe_private_named.2.unwrap(),
-            thumb: self.__unsafe_private_named.3.unwrap(),
-            tombstone: self.__unsafe_private_named.4,
+            alt: self._fields.0.unwrap(),
+            aspect_ratio: self._fields.1,
+            fullsize: self._fields.2.unwrap(),
+            thumb: self._fields.3.unwrap(),
+            tombstone: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -1008,11 +1011,11 @@ where
         >,
     ) -> ViewImage<'a> {
         ViewImage {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            aspect_ratio: self.__unsafe_private_named.1,
-            fullsize: self.__unsafe_private_named.2.unwrap(),
-            thumb: self.__unsafe_private_named.3.unwrap(),
-            tombstone: self.__unsafe_private_named.4,
+            alt: self._fields.0.unwrap(),
+            aspect_ratio: self._fields.1,
+            fullsize: self._fields.2.unwrap(),
+            thumb: self._fields.3.unwrap(),
+            tombstone: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/art_cllctv/feed/pin.rs b/crates/jacquard-api/src/art_cllctv/feed/pin.rs
index 01049692..761700f8 100644
--- a/crates/jacquard-api/src/art_cllctv/feed/pin.rs
+++ b/crates/jacquard-api/src/art_cllctv/feed/pin.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -108,45 +111,45 @@ pub mod pin_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subject;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subject = S::Subject;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PinBuilder<'a, S: pin_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Pin<'a> {
@@ -160,9 +163,9 @@ impl<'a> PinBuilder<'a, pin_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -177,11 +180,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PinBuilder<'a, pin_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> PinBuilder<'a, pin_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -208,14 +211,14 @@ where
 impl<'a, S> PinBuilder<'a, S>
 where
     S: pin_state::State,
-    S::CreatedAt: pin_state::IsSet,
     S::Subject: pin_state::IsSet,
+    S::CreatedAt: pin_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Pin<'a> {
         Pin {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -228,8 +231,8 @@ where
         >,
     ) -> Pin<'a> {
         Pin {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/art_cllctv/feed/post.rs b/crates/jacquard-api/src/art_cllctv/feed/post.rs
index d719e23a..33a318e0 100644
--- a/crates/jacquard-api/src/art_cllctv/feed/post.rs
+++ b/crates/jacquard-api/src/art_cllctv/feed/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -475,8 +478,8 @@ pub mod post_state {
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<post::Category<'a>>,
         Option<PostContent<'a>>,
         Option<Datetime>,
@@ -489,7 +492,7 @@ pub struct PostBuilder<'a, S: post_state::State> {
         Option<CowStr<'a>>,
         Option<Tombstone<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -503,21 +506,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -525,12 +516,12 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<post::Category<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<post::Category<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -538,12 +529,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `content` field (optional)
     pub fn content(mut self, value: impl Into<Option<PostContent<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `content` field to an Option value (optional)
     pub fn maybe_content(mut self, value: Option<PostContent<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -558,11 +549,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -570,12 +561,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -583,12 +574,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `embed` field (optional)
     pub fn embed(mut self, value: impl Into<Option<PostEmbed<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `embed` field to an Option value (optional)
     pub fn maybe_embed(mut self, value: Option<PostEmbed<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -596,12 +587,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -609,12 +600,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `langs` field (optional)
     pub fn langs(mut self, value: impl Into<Option<Vec<Language>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `langs` field to an Option value (optional)
     pub fn maybe_langs(mut self, value: Option<Vec<Language>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -622,12 +613,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `ogImage` field (optional)
     pub fn og_image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `ogImage` field to an Option value (optional)
     pub fn maybe_og_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -635,12 +626,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `publishedAt` field (optional)
     pub fn published_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `publishedAt` field to an Option value (optional)
     pub fn maybe_published_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -648,12 +639,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -661,12 +652,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `tombstone` field (optional)
     pub fn tombstone(mut self, value: impl Into<Option<Tombstone<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `tombstone` field to an Option value (optional)
     pub fn maybe_tombstone(mut self, value: Option<Tombstone<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -679,17 +670,17 @@ where
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            category: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            embed: self.__unsafe_private_named.4,
-            labels: self.__unsafe_private_named.5,
-            langs: self.__unsafe_private_named.6,
-            og_image: self.__unsafe_private_named.7,
-            published_at: self.__unsafe_private_named.8,
-            title: self.__unsafe_private_named.9,
-            tombstone: self.__unsafe_private_named.10,
+            category: self._fields.0,
+            content: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            embed: self._fields.4,
+            labels: self._fields.5,
+            langs: self._fields.6,
+            og_image: self._fields.7,
+            published_at: self._fields.8,
+            title: self._fields.9,
+            tombstone: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -702,17 +693,17 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            category: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            embed: self.__unsafe_private_named.4,
-            labels: self.__unsafe_private_named.5,
-            langs: self.__unsafe_private_named.6,
-            og_image: self.__unsafe_private_named.7,
-            published_at: self.__unsafe_private_named.8,
-            title: self.__unsafe_private_named.9,
-            tombstone: self.__unsafe_private_named.10,
+            category: self._fields.0,
+            content: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            embed: self._fields.4,
+            labels: self._fields.5,
+            langs: self._fields.6,
+            og_image: self._fields.7,
+            published_at: self._fields.8,
+            title: self._fields.9,
+            tombstone: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_dropb/file.rs b/crates/jacquard-api/src/at_dropb/file.rs
index 0b54f0ce..d98b9a7e 100644
--- a/crates/jacquard-api/src/at_dropb/file.rs
+++ b/crates/jacquard-api/src/at_dropb/file.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -217,15 +220,15 @@ pub mod file_state {
 
 /// Builder for constructing an instance of this type
 pub struct FileBuilder<'a, S: file_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> File<'a> {
@@ -239,9 +242,9 @@ impl<'a> FileBuilder<'a, file_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -256,11 +259,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> FileBuilder<'a, file_state::SetBlob<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -268,12 +271,12 @@ where
 impl<'a, S: file_state::State> FileBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -281,12 +284,12 @@ impl<'a, S: file_state::State> FileBuilder<'a, S> {
 impl<'a, S: file_state::State> FileBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -294,12 +297,12 @@ impl<'a, S: file_state::State> FileBuilder<'a, S> {
 impl<'a, S: file_state::State> FileBuilder<'a, S> {
     /// Set the `thumbnail` field (optional)
     pub fn thumbnail(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -307,12 +310,12 @@ impl<'a, S: file_state::State> FileBuilder<'a, S> {
 impl<'a, S: file_state::State> FileBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -325,11 +328,11 @@ where
     /// Build the final struct
     pub fn build(self) -> File<'a> {
         File {
-            blob: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2,
-            thumbnail: self.__unsafe_private_named.3,
-            updated_at: self.__unsafe_private_named.4,
+            blob: self._fields.0.unwrap(),
+            created_at: self._fields.1,
+            name: self._fields.2,
+            thumbnail: self._fields.3,
+            updated_at: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -342,11 +345,11 @@ where
         >,
     ) -> File<'a> {
         File {
-            blob: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2,
-            thumbnail: self.__unsafe_private_named.3,
-            updated_at: self.__unsafe_private_named.4,
+            blob: self._fields.0.unwrap(),
+            created_at: self._fields.1,
+            name: self._fields.2,
+            thumbnail: self._fields.3,
+            updated_at: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_inlay.rs b/crates/jacquard-api/src/at_inlay.rs
index 5d4d7ae4..7d0cb9d6 100644
--- a/crates/jacquard-api/src/at_inlay.rs
+++ b/crates/jacquard-api/src/at_inlay.rs
@@ -16,7 +16,11 @@ pub mod placeholder;
 pub mod slot;
 pub mod throw;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -608,9 +612,9 @@ pub mod element_state {
 
 /// Builder for constructing an instance of this type
 pub struct ElementBuilder<'a, S: element_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Data<'a>>, Option<Nsid<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Data<'a>>, Option<Nsid<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Element<'a> {
@@ -624,9 +628,9 @@ impl<'a> ElementBuilder<'a, element_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ElementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -634,12 +638,12 @@ impl<'a> ElementBuilder<'a, element_state::Empty> {
 impl<'a, S: element_state::State> ElementBuilder<'a, S> {
     /// Set the `key` field (optional)
     pub fn key(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `key` field to an Option value (optional)
     pub fn maybe_key(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -647,12 +651,12 @@ impl<'a, S: element_state::State> ElementBuilder<'a, S> {
 impl<'a, S: element_state::State> ElementBuilder<'a, S> {
     /// Set the `props` field (optional)
     pub fn props(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `props` field to an Option value (optional)
     pub fn maybe_props(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -667,11 +671,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> ElementBuilder<'a, element_state::SetType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ElementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -684,9 +688,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Element<'a> {
         Element {
-            key: self.__unsafe_private_named.0,
-            props: self.__unsafe_private_named.1,
-            r#type: self.__unsafe_private_named.2.unwrap(),
+            key: self._fields.0,
+            props: self._fields.1,
+            r#type: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -696,9 +700,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Element<'a> {
         Element {
-            key: self.__unsafe_private_named.0,
-            props: self.__unsafe_private_named.1,
-            r#type: self.__unsafe_private_named.2.unwrap(),
+            key: self._fields.0,
+            props: self._fields.1,
+            r#type: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -714,48 +718,45 @@ pub mod response_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Node;
         type Cache;
+        type Node;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Node = Unset;
         type Cache = Unset;
-    }
-    ///State transition - sets the `node` field to Set
-    pub struct SetNode<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetNode<S> {}
-    impl<S: State> State for SetNode<S> {
-        type Node = Set<members::node>;
-        type Cache = S::Cache;
+        type Node = Unset;
     }
     ///State transition - sets the `cache` field to Set
     pub struct SetCache<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCache<S> {}
     impl<S: State> State for SetCache<S> {
-        type Node = S::Node;
         type Cache = Set<members::cache>;
+        type Node = S::Node;
+    }
+    ///State transition - sets the `node` field to Set
+    pub struct SetNode<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetNode<S> {}
+    impl<S: State> State for SetNode<S> {
+        type Cache = S::Cache;
+        type Node = Set<members::node>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `node` field
-        pub struct node(());
         ///Marker type for the `cache` field
         pub struct cache(());
+        ///Marker type for the `node` field
+        pub struct node(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ResponseBuilder<'a, S: response_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<at_inlay::CachePolicy<'a>>,
-        Option<at_inlay::Element<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<at_inlay::CachePolicy<'a>>, Option<at_inlay::Element<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Response<'a> {
@@ -769,9 +770,9 @@ impl<'a> ResponseBuilder<'a, response_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -786,11 +787,11 @@ where
         mut self,
         value: impl Into<at_inlay::CachePolicy<'a>>,
     ) -> ResponseBuilder<'a, response_state::SetCache<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -805,11 +806,11 @@ where
         mut self,
         value: impl Into<at_inlay::Element<'a>>,
     ) -> ResponseBuilder<'a, response_state::SetNode<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -817,14 +818,14 @@ where
 impl<'a, S> ResponseBuilder<'a, S>
 where
     S: response_state::State,
-    S::Node: response_state::IsSet,
     S::Cache: response_state::IsSet,
+    S::Node: response_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Response<'a> {
         Response {
-            cache: self.__unsafe_private_named.0.unwrap(),
-            node: self.__unsafe_private_named.1.unwrap(),
+            cache: self._fields.0.unwrap(),
+            node: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -834,8 +835,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Response<'a> {
         Response {
-            cache: self.__unsafe_private_named.0.unwrap(),
-            node: self.__unsafe_private_named.1.unwrap(),
+            cache: self._fields.0.unwrap(),
+            node: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -875,9 +876,9 @@ pub mod tag_link_state {
 
 /// Builder for constructing an instance of this type
 pub struct TagLinkBuilder<'a, S: tag_link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Nsid<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Nsid<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TagLink<'a> {
@@ -891,9 +892,9 @@ impl<'a> TagLinkBuilder<'a, tag_link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TagLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -901,12 +902,12 @@ impl<'a> TagLinkBuilder<'a, tag_link_state::Empty> {
 impl<'a, S: tag_link_state::State> TagLinkBuilder<'a, S> {
     /// Set the `from` field (optional)
     pub fn from(mut self, value: impl Into<Option<Nsid<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `from` field to an Option value (optional)
     pub fn maybe_from(mut self, value: Option<Nsid<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -921,11 +922,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> TagLinkBuilder<'a, tag_link_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TagLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -938,8 +939,8 @@ where
     /// Build the final struct
     pub fn build(self) -> TagLink<'a> {
         TagLink {
-            from: self.__unsafe_private_named.0,
-            subject: self.__unsafe_private_named.1.unwrap(),
+            from: self._fields.0,
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -949,8 +950,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> TagLink<'a> {
         TagLink {
-            from: self.__unsafe_private_named.0,
-            subject: self.__unsafe_private_named.1.unwrap(),
+            from: self._fields.0,
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -990,9 +991,9 @@ pub mod tag_record_state {
 
 /// Builder for constructing an instance of this type
 pub struct TagRecordBuilder<'a, S: tag_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TagRecord<'a> {
@@ -1006,9 +1007,9 @@ impl<'a> TagRecordBuilder<'a, tag_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TagRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1023,11 +1024,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> TagRecordBuilder<'a, tag_record_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TagRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1040,7 +1041,7 @@ where
     /// Build the final struct
     pub fn build(self) -> TagRecord<'a> {
         TagRecord {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1050,7 +1051,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> TagRecord<'a> {
         TagRecord {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_inlay/binding.rs b/crates/jacquard-api/src/at_inlay/binding.rs
index d1bb74b3..2f31a995 100644
--- a/crates/jacquard-api/src/at_inlay/binding.rs
+++ b/crates/jacquard-api/src/at_inlay/binding.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -93,9 +96,9 @@ pub mod binding_state {
 
 /// Builder for constructing an instance of this type
 pub struct BindingBuilder<'a, S: binding_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<CowStr<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<CowStr<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Binding<'a> {
@@ -109,9 +112,9 @@ impl<'a> BindingBuilder<'a, binding_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BindingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -126,11 +129,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> BindingBuilder<'a, binding_state::SetPath<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BindingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -143,7 +146,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Binding<'a> {
         Binding {
-            path: self.__unsafe_private_named.0.unwrap(),
+            path: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -156,7 +159,7 @@ where
         >,
     ) -> Binding<'a> {
         Binding {
-            path: self.__unsafe_private_named.0.unwrap(),
+            path: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_inlay/component.rs b/crates/jacquard-api/src/at_inlay/component.rs
index 4314afd2..dd313b3e 100644
--- a/crates/jacquard-api/src/at_inlay/component.rs
+++ b/crates/jacquard-api/src/at_inlay/component.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -645,9 +648,9 @@ pub mod body_external_state {
 
 /// Builder for constructing an instance of this type
 pub struct BodyExternalBuilder<'a, S: body_external_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BodyExternal<'a> {
@@ -661,9 +664,9 @@ impl<'a> BodyExternalBuilder<'a, body_external_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BodyExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -678,11 +681,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> BodyExternalBuilder<'a, body_external_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BodyExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -695,7 +698,7 @@ where
     /// Build the final struct
     pub fn build(self) -> BodyExternal<'a> {
         BodyExternal {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -705,7 +708,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> BodyExternal<'a> {
         BodyExternal {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1045,9 +1048,9 @@ pub mod body_template_state {
 
 /// Builder for constructing an instance of this type
 pub struct BodyTemplateBuilder<'a, S: body_template_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Data<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Data<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BodyTemplate<'a> {
@@ -1061,9 +1064,9 @@ impl<'a> BodyTemplateBuilder<'a, body_template_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BodyTemplateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1078,11 +1081,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> BodyTemplateBuilder<'a, body_template_state::SetNode<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BodyTemplateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1095,7 +1098,7 @@ where
     /// Build the final struct
     pub fn build(self) -> BodyTemplate<'a> {
         BodyTemplate {
-            node: self.__unsafe_private_named.0.unwrap(),
+            node: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1105,7 +1108,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> BodyTemplate<'a> {
         BodyTemplate {
-            node: self.__unsafe_private_named.0.unwrap(),
+            node: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1145,8 +1148,8 @@ pub mod component_state {
 
 /// Builder for constructing an instance of this type
 pub struct ComponentBuilder<'a, S: component_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ComponentBody<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -1156,7 +1159,7 @@ pub struct ComponentBuilder<'a, S: component_state::State> {
         Option<ViaValtown<'a>>,
         Option<component::View<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Component<'a> {
@@ -1170,9 +1173,9 @@ impl<'a> ComponentBuilder<'a, component_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ComponentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1180,12 +1183,12 @@ impl<'a> ComponentBuilder<'a, component_state::Empty> {
 impl<'a, S: component_state::State> ComponentBuilder<'a, S> {
     /// Set the `body` field (optional)
     pub fn body(mut self, value: impl Into<Option<ComponentBody<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `body` field to an Option value (optional)
     pub fn maybe_body(mut self, value: Option<ComponentBody<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1193,12 +1196,12 @@ impl<'a, S: component_state::State> ComponentBuilder<'a, S> {
 impl<'a, S: component_state::State> ComponentBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1206,12 +1209,12 @@ impl<'a, S: component_state::State> ComponentBuilder<'a, S> {
 impl<'a, S: component_state::State> ComponentBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1219,12 +1222,12 @@ impl<'a, S: component_state::State> ComponentBuilder<'a, S> {
 impl<'a, S: component_state::State> ComponentBuilder<'a, S> {
     /// Set the `imports` field (optional)
     pub fn imports(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `imports` field to an Option value (optional)
     pub fn maybe_imports(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1239,11 +1242,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> ComponentBuilder<'a, component_state::SetType<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ComponentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1251,12 +1254,12 @@ where
 impl<'a, S: component_state::State> ComponentBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1264,12 +1267,12 @@ impl<'a, S: component_state::State> ComponentBuilder<'a, S> {
 impl<'a, S: component_state::State> ComponentBuilder<'a, S> {
     /// Set the `via` field (optional)
     pub fn via(mut self, value: impl Into<Option<ViaValtown<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `via` field to an Option value (optional)
     pub fn maybe_via(mut self, value: Option<ViaValtown<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1277,12 +1280,12 @@ impl<'a, S: component_state::State> ComponentBuilder<'a, S> {
 impl<'a, S: component_state::State> ComponentBuilder<'a, S> {
     /// Set the `view` field (optional)
     pub fn view(mut self, value: impl Into<Option<component::View<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `view` field to an Option value (optional)
     pub fn maybe_view(mut self, value: Option<component::View<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -1295,14 +1298,14 @@ where
     /// Build the final struct
     pub fn build(self) -> Component<'a> {
         Component {
-            body: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            imports: self.__unsafe_private_named.3,
-            r#type: self.__unsafe_private_named.4.unwrap(),
-            updated_at: self.__unsafe_private_named.5,
-            via: self.__unsafe_private_named.6,
-            view: self.__unsafe_private_named.7,
+            body: self._fields.0,
+            created_at: self._fields.1,
+            description: self._fields.2,
+            imports: self._fields.3,
+            r#type: self._fields.4.unwrap(),
+            updated_at: self._fields.5,
+            via: self._fields.6,
+            view: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -1312,14 +1315,14 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Component<'a> {
         Component {
-            body: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            imports: self.__unsafe_private_named.3,
-            r#type: self.__unsafe_private_named.4.unwrap(),
-            updated_at: self.__unsafe_private_named.5,
-            via: self.__unsafe_private_named.6,
-            view: self.__unsafe_private_named.7,
+            body: self._fields.0,
+            created_at: self._fields.1,
+            description: self._fields.2,
+            imports: self._fields.3,
+            r#type: self._fields.4.unwrap(),
+            updated_at: self._fields.5,
+            via: self._fields.6,
+            view: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
@@ -1371,9 +1374,9 @@ pub mod view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewBuilder<'a, S: view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<ViewAcceptsItem<'a>>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<ViewAcceptsItem<'a>>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> View<'a> {
@@ -1387,9 +1390,9 @@ impl<'a> ViewBuilder<'a, view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1404,11 +1407,11 @@ where
         mut self,
         value: impl Into<Vec<ViewAcceptsItem<'a>>>,
     ) -> ViewBuilder<'a, view_state::SetAccepts<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1423,11 +1426,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ViewBuilder<'a, view_state::SetProp<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1441,8 +1444,8 @@ where
     /// Build the final struct
     pub fn build(self) -> View<'a> {
         View {
-            accepts: self.__unsafe_private_named.0.unwrap(),
-            prop: self.__unsafe_private_named.1.unwrap(),
+            accepts: self._fields.0.unwrap(),
+            prop: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1452,8 +1455,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> View<'a> {
         View {
-            accepts: self.__unsafe_private_named.0.unwrap(),
-            prop: self.__unsafe_private_named.1.unwrap(),
+            accepts: self._fields.0.unwrap(),
+            prop: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_inlay/fragment.rs b/crates/jacquard-api/src/at_inlay/fragment.rs
index 0b4c87b5..65071cca 100644
--- a/crates/jacquard-api/src/at_inlay/fragment.rs
+++ b/crates/jacquard-api/src/at_inlay/fragment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::value::Data;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -92,9 +95,9 @@ pub mod fragment_state {
 
 /// Builder for constructing an instance of this type
 pub struct FragmentBuilder<'a, S: fragment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Data<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Data<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Fragment<'a> {
@@ -108,9 +111,9 @@ impl<'a> FragmentBuilder<'a, fragment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FragmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -125,11 +128,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> FragmentBuilder<'a, fragment_state::SetChildren<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FragmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,7 +145,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Fragment<'a> {
         Fragment {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -152,7 +155,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Fragment<'a> {
         Fragment {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_inlay/loading.rs b/crates/jacquard-api/src/at_inlay/loading.rs
index 38b57999..43744ac0 100644
--- a/crates/jacquard-api/src/at_inlay/loading.rs
+++ b/crates/jacquard-api/src/at_inlay/loading.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::value::Data;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -107,9 +110,9 @@ pub mod loading_state {
 
 /// Builder for constructing an instance of this type
 pub struct LoadingBuilder<'a, S: loading_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Data<'a>>, Option<Element<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Data<'a>>, Option<Element<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Loading<'a> {
@@ -123,9 +126,9 @@ impl<'a> LoadingBuilder<'a, loading_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LoadingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -140,11 +143,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> LoadingBuilder<'a, loading_state::SetChildren<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LoadingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -159,11 +162,11 @@ where
         mut self,
         value: impl Into<Element<'a>>,
     ) -> LoadingBuilder<'a, loading_state::SetFallback<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LoadingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -177,8 +180,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Loading<'a> {
         Loading {
-            children: self.__unsafe_private_named.0.unwrap(),
-            fallback: self.__unsafe_private_named.1.unwrap(),
+            children: self._fields.0.unwrap(),
+            fallback: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -188,8 +191,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Loading<'a> {
         Loading {
-            children: self.__unsafe_private_named.0.unwrap(),
-            fallback: self.__unsafe_private_named.1.unwrap(),
+            children: self._fields.0.unwrap(),
+            fallback: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_inlay/maybe.rs b/crates/jacquard-api/src/at_inlay/maybe.rs
index b83f753b..3aeedf69 100644
--- a/crates/jacquard-api/src/at_inlay/maybe.rs
+++ b/crates/jacquard-api/src/at_inlay/maybe.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::value::Data;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -96,9 +99,9 @@ pub mod maybe_state {
 
 /// Builder for constructing an instance of this type
 pub struct MaybeBuilder<'a, S: maybe_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Data<'a>>, Option<Element<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Data<'a>>, Option<Element<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Maybe<'a> {
@@ -112,9 +115,9 @@ impl<'a> MaybeBuilder<'a, maybe_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MaybeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -129,11 +132,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> MaybeBuilder<'a, maybe_state::SetChildren<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MaybeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -141,12 +144,12 @@ where
 impl<'a, S: maybe_state::State> MaybeBuilder<'a, S> {
     /// Set the `fallback` field (optional)
     pub fn fallback(mut self, value: impl Into<Option<Element<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `fallback` field to an Option value (optional)
     pub fn maybe_fallback(mut self, value: Option<Element<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -159,8 +162,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Maybe<'a> {
         Maybe {
-            children: self.__unsafe_private_named.0.unwrap(),
-            fallback: self.__unsafe_private_named.1,
+            children: self._fields.0.unwrap(),
+            fallback: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -170,8 +173,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Maybe<'a> {
         Maybe {
-            children: self.__unsafe_private_named.0.unwrap(),
-            fallback: self.__unsafe_private_named.1,
+            children: self._fields.0.unwrap(),
+            fallback: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_inlay/missing.rs b/crates/jacquard-api/src/at_inlay/missing.rs
index 6cf1ac6f..25c631a4 100644
--- a/crates/jacquard-api/src/at_inlay/missing.rs
+++ b/crates/jacquard-api/src/at_inlay/missing.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -93,9 +96,9 @@ pub mod missing_state {
 
 /// Builder for constructing an instance of this type
 pub struct MissingBuilder<'a, S: missing_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<CowStr<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<CowStr<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Missing<'a> {
@@ -109,9 +112,9 @@ impl<'a> MissingBuilder<'a, missing_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MissingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -126,11 +129,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> MissingBuilder<'a, missing_state::SetPath<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MissingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -143,7 +146,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Missing<'a> {
         Missing {
-            path: self.__unsafe_private_named.0.unwrap(),
+            path: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -156,7 +159,7 @@ where
         >,
     ) -> Missing<'a> {
         Missing {
-            path: self.__unsafe_private_named.0.unwrap(),
+            path: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_inlay/pack.rs b/crates/jacquard-api/src/at_inlay/pack.rs
index 6ba036b6..155382cc 100644
--- a/crates/jacquard-api/src/at_inlay/pack.rs
+++ b/crates/jacquard-api/src/at_inlay/pack.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -189,9 +192,9 @@ pub mod export_state {
 
 /// Builder for constructing an instance of this type
 pub struct ExportBuilder<'a, S: export_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<Nsid<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<Nsid<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Export<'a> {
@@ -205,9 +208,9 @@ impl<'a> ExportBuilder<'a, export_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExportBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -222,11 +225,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ExportBuilder<'a, export_state::SetComponent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ExportBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -241,11 +244,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> ExportBuilder<'a, export_state::SetType<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ExportBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -259,8 +262,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Export<'a> {
         Export {
-            component: self.__unsafe_private_named.0.unwrap(),
-            r#type: self.__unsafe_private_named.1.unwrap(),
+            component: self._fields.0.unwrap(),
+            r#type: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -273,8 +276,8 @@ where
         >,
     ) -> Export<'a> {
         Export {
-            component: self.__unsafe_private_named.0.unwrap(),
-            r#type: self.__unsafe_private_named.1.unwrap(),
+            component: self._fields.0.unwrap(),
+            r#type: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -397,49 +400,45 @@ pub mod pack_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type Exports;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type Exports = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Exports = S::Exports;
+        type Name = Unset;
     }
     ///State transition - sets the `exports` field to Set
     pub struct SetExports<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetExports<S> {}
     impl<S: State> State for SetExports<S> {
-        type Name = S::Name;
         type Exports = Set<members::exports>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Exports = S::Exports;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `exports` field
         pub struct exports(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PackBuilder<'a, S: pack_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<Vec<pack::Export<'a>>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Vec<pack::Export<'a>>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Pack<'a> {
@@ -453,9 +452,9 @@ impl<'a> PackBuilder<'a, pack_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -463,12 +462,12 @@ impl<'a> PackBuilder<'a, pack_state::Empty> {
 impl<'a, S: pack_state::State> PackBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -483,11 +482,11 @@ where
         mut self,
         value: impl Into<Vec<pack::Export<'a>>>,
     ) -> PackBuilder<'a, pack_state::SetExports<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -502,11 +501,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PackBuilder<'a, pack_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -514,15 +513,15 @@ where
 impl<'a, S> PackBuilder<'a, S>
 where
     S: pack_state::State,
-    S::Name: pack_state::IsSet,
     S::Exports: pack_state::IsSet,
+    S::Name: pack_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Pack<'a> {
         Pack {
-            created_at: self.__unsafe_private_named.0,
-            exports: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0,
+            exports: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -535,9 +534,9 @@ where
         >,
     ) -> Pack<'a> {
         Pack {
-            created_at: self.__unsafe_private_named.0,
-            exports: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0,
+            exports: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_inlay/placeholder.rs b/crates/jacquard-api/src/at_inlay/placeholder.rs
index b9060b98..ac843382 100644
--- a/crates/jacquard-api/src/at_inlay/placeholder.rs
+++ b/crates/jacquard-api/src/at_inlay/placeholder.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
@@ -106,9 +109,9 @@ pub mod placeholder_state {
 
 /// Builder for constructing an instance of this type
 pub struct PlaceholderBuilder<'a, S: placeholder_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<Element<'a>>>, Option<Element<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<Element<'a>>>, Option<Element<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Placeholder<'a> {
@@ -122,9 +125,9 @@ impl<'a> PlaceholderBuilder<'a, placeholder_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PlaceholderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -139,11 +142,11 @@ where
         mut self,
         value: impl Into<Vec<Element<'a>>>,
     ) -> PlaceholderBuilder<'a, placeholder_state::SetChildren<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PlaceholderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -158,11 +161,11 @@ where
         mut self,
         value: impl Into<Element<'a>>,
     ) -> PlaceholderBuilder<'a, placeholder_state::SetFallback<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PlaceholderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -176,8 +179,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Placeholder<'a> {
         Placeholder {
-            children: self.__unsafe_private_named.0.unwrap(),
-            fallback: self.__unsafe_private_named.1.unwrap(),
+            children: self._fields.0.unwrap(),
+            fallback: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -190,8 +193,8 @@ where
         >,
     ) -> Placeholder<'a> {
         Placeholder {
-            children: self.__unsafe_private_named.0.unwrap(),
-            fallback: self.__unsafe_private_named.1.unwrap(),
+            children: self._fields.0.unwrap(),
+            fallback: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_inlay/slot.rs b/crates/jacquard-api/src/at_inlay/slot.rs
index 2de9d038..76ebec95 100644
--- a/crates/jacquard-api/src/at_inlay/slot.rs
+++ b/crates/jacquard-api/src/at_inlay/slot.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/at_inlay/throw.rs b/crates/jacquard-api/src/at_inlay/throw.rs
index b977ac0b..b03c2a93 100644
--- a/crates/jacquard-api/src/at_inlay/throw.rs
+++ b/crates/jacquard-api/src/at_inlay/throw.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/at_margin/annotation.rs b/crates/jacquard-api/src/at_margin/annotation.rs
index 955d572c..6a6272c2 100644
--- a/crates/jacquard-api/src/at_margin/annotation.rs
+++ b/crates/jacquard-api/src/at_margin/annotation.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -1390,44 +1393,44 @@ pub mod annotation_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Target;
         type CreatedAt;
+        type Target;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Target = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `target` field to Set
-    pub struct SetTarget<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTarget<S> {}
-    impl<S: State> State for SetTarget<S> {
-        type Target = Set<members::target>;
-        type CreatedAt = S::CreatedAt;
+        type Target = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Target = S::Target;
         type CreatedAt = Set<members::created_at>;
+        type Target = S::Target;
+    }
+    ///State transition - sets the `target` field to Set
+    pub struct SetTarget<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTarget<S> {}
+    impl<S: State> State for SetTarget<S> {
+        type CreatedAt = S::CreatedAt;
+        type Target = Set<members::target>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `target` field
-        pub struct target(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `target` field
+        pub struct target(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AnnotationBuilder<'a, S: annotation_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<annotation::Body<'a>>,
         Option<Datetime>,
         Option<annotation::Generator<'a>>,
@@ -1437,7 +1440,7 @@ pub struct AnnotationBuilder<'a, S: annotation_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<annotation::Target<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Annotation<'a> {
@@ -1451,9 +1454,9 @@ impl<'a> AnnotationBuilder<'a, annotation_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AnnotationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1461,12 +1464,12 @@ impl<'a> AnnotationBuilder<'a, annotation_state::Empty> {
 impl<'a, S: annotation_state::State> AnnotationBuilder<'a, S> {
     /// Set the `body` field (optional)
     pub fn body(mut self, value: impl Into<Option<annotation::Body<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `body` field to an Option value (optional)
     pub fn maybe_body(mut self, value: Option<annotation::Body<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1481,11 +1484,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AnnotationBuilder<'a, annotation_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AnnotationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1496,12 +1499,12 @@ impl<'a, S: annotation_state::State> AnnotationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<annotation::Generator<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `generator` field to an Option value (optional)
     pub fn maybe_generator(mut self, value: Option<annotation::Generator<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1509,12 +1512,12 @@ impl<'a, S: annotation_state::State> AnnotationBuilder<'a, S> {
 impl<'a, S: annotation_state::State> AnnotationBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1525,12 +1528,12 @@ impl<'a, S: annotation_state::State> AnnotationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<AnnotationMotivation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `motivation` field to an Option value (optional)
     pub fn maybe_motivation(mut self, value: Option<AnnotationMotivation<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1538,12 +1541,12 @@ impl<'a, S: annotation_state::State> AnnotationBuilder<'a, S> {
 impl<'a, S: annotation_state::State> AnnotationBuilder<'a, S> {
     /// Set the `rights` field (optional)
     pub fn rights(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `rights` field to an Option value (optional)
     pub fn maybe_rights(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1551,12 +1554,12 @@ impl<'a, S: annotation_state::State> AnnotationBuilder<'a, S> {
 impl<'a, S: annotation_state::State> AnnotationBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1571,11 +1574,11 @@ where
         mut self,
         value: impl Into<annotation::Target<'a>>,
     ) -> AnnotationBuilder<'a, annotation_state::SetTarget<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         AnnotationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1583,20 +1586,20 @@ where
 impl<'a, S> AnnotationBuilder<'a, S>
 where
     S: annotation_state::State,
-    S::Target: annotation_state::IsSet,
     S::CreatedAt: annotation_state::IsSet,
+    S::Target: annotation_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Annotation<'a> {
         Annotation {
-            body: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            generator: self.__unsafe_private_named.2,
-            labels: self.__unsafe_private_named.3,
-            motivation: self.__unsafe_private_named.4,
-            rights: self.__unsafe_private_named.5,
-            tags: self.__unsafe_private_named.6,
-            target: self.__unsafe_private_named.7.unwrap(),
+            body: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            generator: self._fields.2,
+            labels: self._fields.3,
+            motivation: self._fields.4,
+            rights: self._fields.5,
+            tags: self._fields.6,
+            target: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1609,14 +1612,14 @@ where
         >,
     ) -> Annotation<'a> {
         Annotation {
-            body: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            generator: self.__unsafe_private_named.2,
-            labels: self.__unsafe_private_named.3,
-            motivation: self.__unsafe_private_named.4,
-            rights: self.__unsafe_private_named.5,
-            tags: self.__unsafe_private_named.6,
-            target: self.__unsafe_private_named.7.unwrap(),
+            body: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            generator: self._fields.2,
+            labels: self._fields.3,
+            motivation: self._fields.4,
+            rights: self._fields.5,
+            tags: self._fields.6,
+            target: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1632,49 +1635,49 @@ pub mod range_selector_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type StartSelector;
         type EndSelector;
+        type StartSelector;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type StartSelector = Unset;
         type EndSelector = Unset;
-    }
-    ///State transition - sets the `start_selector` field to Set
-    pub struct SetStartSelector<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStartSelector<S> {}
-    impl<S: State> State for SetStartSelector<S> {
-        type StartSelector = Set<members::start_selector>;
-        type EndSelector = S::EndSelector;
+        type StartSelector = Unset;
     }
     ///State transition - sets the `end_selector` field to Set
     pub struct SetEndSelector<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEndSelector<S> {}
     impl<S: State> State for SetEndSelector<S> {
-        type StartSelector = S::StartSelector;
         type EndSelector = Set<members::end_selector>;
+        type StartSelector = S::StartSelector;
+    }
+    ///State transition - sets the `start_selector` field to Set
+    pub struct SetStartSelector<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStartSelector<S> {}
+    impl<S: State> State for SetStartSelector<S> {
+        type EndSelector = S::EndSelector;
+        type StartSelector = Set<members::start_selector>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `start_selector` field
-        pub struct start_selector(());
         ///Marker type for the `end_selector` field
         pub struct end_selector(());
+        ///Marker type for the `start_selector` field
+        pub struct start_selector(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RangeSelectorBuilder<'a, S: range_selector_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<RangeSelectorEndSelector<'a>>,
         Option<RangeSelectorStartSelector<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RangeSelector<'a> {
@@ -1688,9 +1691,9 @@ impl<'a> RangeSelectorBuilder<'a, range_selector_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RangeSelectorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1705,11 +1708,11 @@ where
         mut self,
         value: impl Into<RangeSelectorEndSelector<'a>>,
     ) -> RangeSelectorBuilder<'a, range_selector_state::SetEndSelector<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RangeSelectorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1724,11 +1727,11 @@ where
         mut self,
         value: impl Into<RangeSelectorStartSelector<'a>>,
     ) -> RangeSelectorBuilder<'a, range_selector_state::SetStartSelector<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RangeSelectorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1736,12 +1739,12 @@ where
 impl<'a, S: range_selector_state::State> RangeSelectorBuilder<'a, S> {
     /// Set the `type` field (optional)
     pub fn r#type(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `type` field to an Option value (optional)
     pub fn maybe_type(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1749,15 +1752,15 @@ impl<'a, S: range_selector_state::State> RangeSelectorBuilder<'a, S> {
 impl<'a, S> RangeSelectorBuilder<'a, S>
 where
     S: range_selector_state::State,
-    S::StartSelector: range_selector_state::IsSet,
     S::EndSelector: range_selector_state::IsSet,
+    S::StartSelector: range_selector_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RangeSelector<'a> {
         RangeSelector {
-            end_selector: self.__unsafe_private_named.0.unwrap(),
-            start_selector: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2,
+            end_selector: self._fields.0.unwrap(),
+            start_selector: self._fields.1.unwrap(),
+            r#type: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -1770,9 +1773,9 @@ where
         >,
     ) -> RangeSelector<'a> {
         RangeSelector {
-            end_selector: self.__unsafe_private_named.0.unwrap(),
-            start_selector: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2,
+            end_selector: self._fields.0.unwrap(),
+            start_selector: self._fields.1.unwrap(),
+            r#type: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -1812,15 +1815,15 @@ pub mod target_state {
 
 /// Builder for constructing an instance of this type
 pub struct TargetBuilder<'a, S: target_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<TargetSelector<'a>>,
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
         Option<annotation::TimeState<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Target<'a> {
@@ -1834,9 +1837,9 @@ impl<'a> TargetBuilder<'a, target_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1844,12 +1847,12 @@ impl<'a> TargetBuilder<'a, target_state::Empty> {
 impl<'a, S: target_state::State> TargetBuilder<'a, S> {
     /// Set the `selector` field (optional)
     pub fn selector(mut self, value: impl Into<Option<TargetSelector<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `selector` field to an Option value (optional)
     pub fn maybe_selector(mut self, value: Option<TargetSelector<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1864,11 +1867,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> TargetBuilder<'a, target_state::SetSource<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1876,12 +1879,12 @@ where
 impl<'a, S: target_state::State> TargetBuilder<'a, S> {
     /// Set the `sourceHash` field (optional)
     pub fn source_hash(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `sourceHash` field to an Option value (optional)
     pub fn maybe_source_hash(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1889,12 +1892,12 @@ impl<'a, S: target_state::State> TargetBuilder<'a, S> {
 impl<'a, S: target_state::State> TargetBuilder<'a, S> {
     /// Set the `state` field (optional)
     pub fn state(mut self, value: impl Into<Option<annotation::TimeState<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `state` field to an Option value (optional)
     pub fn maybe_state(mut self, value: Option<annotation::TimeState<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1902,12 +1905,12 @@ impl<'a, S: target_state::State> TargetBuilder<'a, S> {
 impl<'a, S: target_state::State> TargetBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1920,11 +1923,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Target<'a> {
         Target {
-            selector: self.__unsafe_private_named.0,
-            source: self.__unsafe_private_named.1.unwrap(),
-            source_hash: self.__unsafe_private_named.2,
-            state: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4,
+            selector: self._fields.0,
+            source: self._fields.1.unwrap(),
+            source_hash: self._fields.2,
+            state: self._fields.3,
+            title: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -1937,11 +1940,11 @@ where
         >,
     ) -> Target<'a> {
         Target {
-            selector: self.__unsafe_private_named.0,
-            source: self.__unsafe_private_named.1.unwrap(),
-            source_hash: self.__unsafe_private_named.2,
-            state: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4,
+            selector: self._fields.0,
+            source: self._fields.1.unwrap(),
+            source_hash: self._fields.2,
+            state: self._fields.3,
+            title: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
@@ -1993,9 +1996,9 @@ pub mod text_position_selector_state {
 
 /// Builder for constructing an instance of this type
 pub struct TextPositionSelectorBuilder<'a, S: text_position_selector_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TextPositionSelector<'a> {
@@ -2012,9 +2015,9 @@ impl<'a> TextPositionSelectorBuilder<'a, text_position_selector_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TextPositionSelectorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2029,11 +2032,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> TextPositionSelectorBuilder<'a, text_position_selector_state::SetEnd<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TextPositionSelectorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2048,11 +2051,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> TextPositionSelectorBuilder<'a, text_position_selector_state::SetStart<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TextPositionSelectorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2060,12 +2063,12 @@ where
 impl<'a, S: text_position_selector_state::State> TextPositionSelectorBuilder<'a, S> {
     /// Set the `type` field (optional)
     pub fn r#type(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `type` field to an Option value (optional)
     pub fn maybe_type(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -2079,9 +2082,9 @@ where
     /// Build the final struct
     pub fn build(self) -> TextPositionSelector<'a> {
         TextPositionSelector {
-            end: self.__unsafe_private_named.0.unwrap(),
-            start: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2,
+            end: self._fields.0.unwrap(),
+            start: self._fields.1.unwrap(),
+            r#type: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -2094,9 +2097,9 @@ where
         >,
     ) -> TextPositionSelector<'a> {
         TextPositionSelector {
-            end: self.__unsafe_private_named.0.unwrap(),
-            start: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2,
+            end: self._fields.0.unwrap(),
+            start: self._fields.1.unwrap(),
+            r#type: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_margin/apikey.rs b/crates/jacquard-api/src/at_margin/apikey.rs
index ee8bb86c..7557618a 100644
--- a/crates/jacquard-api/src/at_margin/apikey.rs
+++ b/crates/jacquard-api/src/at_margin/apikey.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -123,59 +126,59 @@ pub mod apikey_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type CreatedAt;
         type Name;
         type KeyHash;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type CreatedAt = Unset;
         type Name = Unset;
         type KeyHash = Unset;
-        type CreatedAt = Unset;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type Name = S::Name;
+        type KeyHash = S::KeyHash;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
+        type CreatedAt = S::CreatedAt;
         type Name = Set<members::name>;
         type KeyHash = S::KeyHash;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `key_hash` field to Set
     pub struct SetKeyHash<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetKeyHash<S> {}
     impl<S: State> State for SetKeyHash<S> {
-        type Name = S::Name;
-        type KeyHash = Set<members::key_hash>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type Name = S::Name;
-        type KeyHash = S::KeyHash;
-        type CreatedAt = Set<members::created_at>;
+        type KeyHash = Set<members::key_hash>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `name` field
         pub struct name(());
         ///Marker type for the `key_hash` field
         pub struct key_hash(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ApikeyBuilder<'a, S: apikey_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Apikey<'a> {
@@ -189,9 +192,9 @@ impl<'a> ApikeyBuilder<'a, apikey_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ApikeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -206,11 +209,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ApikeyBuilder<'a, apikey_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ApikeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -225,11 +228,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ApikeyBuilder<'a, apikey_state::SetKeyHash<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ApikeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,11 +247,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ApikeyBuilder<'a, apikey_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ApikeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -256,16 +259,16 @@ where
 impl<'a, S> ApikeyBuilder<'a, S>
 where
     S: apikey_state::State,
+    S::CreatedAt: apikey_state::IsSet,
     S::Name: apikey_state::IsSet,
     S::KeyHash: apikey_state::IsSet,
-    S::CreatedAt: apikey_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Apikey<'a> {
         Apikey {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            key_hash: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            key_hash: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -278,9 +281,9 @@ where
         >,
     ) -> Apikey<'a> {
         Apikey {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            key_hash: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            key_hash: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_margin/collection.rs b/crates/jacquard-api/src/at_margin/collection.rs
index 4b66b92d..859317e7 100644
--- a/crates/jacquard-api/src/at_margin/collection.rs
+++ b/crates/jacquard-api/src/at_margin/collection.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -221,14 +224,14 @@ pub mod collection_state {
 
 /// Builder for constructing an instance of this type
 pub struct CollectionBuilder<'a, S: collection_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Collection<'a> {
@@ -242,9 +245,9 @@ impl<'a> CollectionBuilder<'a, collection_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -259,11 +262,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionBuilder<'a, collection_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -271,12 +274,12 @@ where
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -284,12 +287,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `icon` field (optional)
     pub fn icon(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `icon` field to an Option value (optional)
     pub fn maybe_icon(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -304,11 +307,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CollectionBuilder<'a, collection_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -322,10 +325,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Collection<'a> {
         Collection {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            icon: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            icon: self._fields.2,
+            name: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -338,10 +341,10 @@ where
         >,
     ) -> Collection<'a> {
         Collection {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            icon: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            icon: self._fields.2,
+            name: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_margin/collection_item.rs b/crates/jacquard-api/src/at_margin/collection_item.rs
index e5d2773b..cdceb392 100644
--- a/crates/jacquard-api/src/at_margin/collection_item.rs
+++ b/crates/jacquard-api/src/at_margin/collection_item.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -124,64 +127,59 @@ pub mod collection_item_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Collection;
         type Annotation;
         type CreatedAt;
+        type Collection;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Collection = Unset;
         type Annotation = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `collection` field to Set
-    pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCollection<S> {}
-    impl<S: State> State for SetCollection<S> {
-        type Collection = Set<members::collection>;
-        type Annotation = S::Annotation;
-        type CreatedAt = S::CreatedAt;
+        type Collection = Unset;
     }
     ///State transition - sets the `annotation` field to Set
     pub struct SetAnnotation<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAnnotation<S> {}
     impl<S: State> State for SetAnnotation<S> {
-        type Collection = S::Collection;
         type Annotation = Set<members::annotation>;
         type CreatedAt = S::CreatedAt;
+        type Collection = S::Collection;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Collection = S::Collection;
         type Annotation = S::Annotation;
         type CreatedAt = Set<members::created_at>;
+        type Collection = S::Collection;
+    }
+    ///State transition - sets the `collection` field to Set
+    pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCollection<S> {}
+    impl<S: State> State for SetCollection<S> {
+        type Annotation = S::Annotation;
+        type CreatedAt = S::CreatedAt;
+        type Collection = Set<members::collection>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `collection` field
-        pub struct collection(());
         ///Marker type for the `annotation` field
         pub struct annotation(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `collection` field
+        pub struct collection(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CollectionItemBuilder<'a, S: collection_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<AtUri<'a>>,
-        Option<AtUri<'a>>,
-        Option<Datetime>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<AtUri<'a>>, Option<Datetime>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CollectionItem<'a> {
@@ -195,9 +193,9 @@ impl<'a> CollectionItemBuilder<'a, collection_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,11 +210,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CollectionItemBuilder<'a, collection_item_state::SetAnnotation<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -231,11 +229,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CollectionItemBuilder<'a, collection_item_state::SetCollection<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -250,11 +248,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionItemBuilder<'a, collection_item_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -262,12 +260,12 @@ where
 impl<'a, S: collection_item_state::State> CollectionItemBuilder<'a, S> {
     /// Set the `position` field (optional)
     pub fn position(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `position` field to an Option value (optional)
     pub fn maybe_position(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -275,17 +273,17 @@ impl<'a, S: collection_item_state::State> CollectionItemBuilder<'a, S> {
 impl<'a, S> CollectionItemBuilder<'a, S>
 where
     S: collection_item_state::State,
-    S::Collection: collection_item_state::IsSet,
     S::Annotation: collection_item_state::IsSet,
     S::CreatedAt: collection_item_state::IsSet,
+    S::Collection: collection_item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CollectionItem<'a> {
         CollectionItem {
-            annotation: self.__unsafe_private_named.0.unwrap(),
-            collection: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            position: self.__unsafe_private_named.3,
+            annotation: self._fields.0.unwrap(),
+            collection: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            position: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -298,10 +296,10 @@ where
         >,
     ) -> CollectionItem<'a> {
         CollectionItem {
-            annotation: self.__unsafe_private_named.0.unwrap(),
-            collection: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            position: self.__unsafe_private_named.3,
+            annotation: self._fields.0.unwrap(),
+            collection: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            position: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_margin/like.rs b/crates/jacquard-api/src/at_margin/like.rs
index d2c3717b..7d0bb935 100644
--- a/crates/jacquard-api/src/at_margin/like.rs
+++ b/crates/jacquard-api/src/at_margin/like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -136,45 +139,45 @@ pub mod like_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subject;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subject = S::Subject;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<like::SubjectRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<like::SubjectRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -188,9 +191,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -205,11 +208,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -224,11 +227,11 @@ where
         mut self,
         value: impl Into<like::SubjectRef<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -236,14 +239,14 @@ where
 impl<'a, S> LikeBuilder<'a, S>
 where
     S: like_state::State,
-    S::CreatedAt: like_state::IsSet,
     S::Subject: like_state::IsSet,
+    S::CreatedAt: like_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -256,8 +259,8 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -355,45 +358,45 @@ pub mod subject_ref_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Cid;
         type Uri;
+        type Cid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Cid = Unset;
         type Uri = Unset;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type Cid = Set<members::cid>;
-        type Uri = S::Uri;
+        type Cid = Unset;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Cid = S::Cid;
         type Uri = Set<members::uri>;
+        type Cid = S::Cid;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Uri = S::Uri;
+        type Cid = Set<members::cid>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SubjectRefBuilder<'a, S: subject_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SubjectRef<'a> {
@@ -407,9 +410,9 @@ impl<'a> SubjectRefBuilder<'a, subject_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubjectRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -424,11 +427,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> SubjectRefBuilder<'a, subject_ref_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SubjectRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -443,11 +446,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SubjectRefBuilder<'a, subject_ref_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SubjectRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -455,14 +458,14 @@ where
 impl<'a, S> SubjectRefBuilder<'a, S>
 where
     S: subject_ref_state::State,
-    S::Cid: subject_ref_state::IsSet,
     S::Uri: subject_ref_state::IsSet,
+    S::Cid: subject_ref_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SubjectRef<'a> {
         SubjectRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -475,8 +478,8 @@ where
         >,
     ) -> SubjectRef<'a> {
         SubjectRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_margin/preferences.rs b/crates/jacquard-api/src/at_margin/preferences.rs
index 99ffacf7..c879e780 100644
--- a/crates/jacquard-api/src/at_margin/preferences.rs
+++ b/crates/jacquard-api/src/at_margin/preferences.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -497,15 +500,15 @@ pub mod preferences_state {
 
 /// Builder for constructing an instance of this type
 pub struct PreferencesBuilder<'a, S: preferences_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<bool>,
         Option<Vec<CowStr<'a>>>,
         Option<Vec<preferences::LabelPreference<'a>>>,
         Option<Vec<preferences::LabelerSubscription<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Preferences<'a> {
@@ -519,9 +522,9 @@ impl<'a> PreferencesBuilder<'a, preferences_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -536,11 +539,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PreferencesBuilder<'a, preferences_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -551,12 +554,12 @@ impl<'a, S: preferences_state::State> PreferencesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<bool>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `disableExternalLinkWarning` field to an Option value (optional)
     pub fn maybe_disable_external_link_warning(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -567,7 +570,7 @@ impl<'a, S: preferences_state::State> PreferencesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<CowStr<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `externalLinkSkippedHostnames` field to an Option value (optional)
@@ -575,7 +578,7 @@ impl<'a, S: preferences_state::State> PreferencesBuilder<'a, S> {
         mut self,
         value: Option<Vec<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -586,7 +589,7 @@ impl<'a, S: preferences_state::State> PreferencesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<preferences::LabelPreference<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `labelPreferences` field to an Option value (optional)
@@ -594,7 +597,7 @@ impl<'a, S: preferences_state::State> PreferencesBuilder<'a, S> {
         mut self,
         value: Option<Vec<preferences::LabelPreference<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -605,7 +608,7 @@ impl<'a, S: preferences_state::State> PreferencesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<preferences::LabelerSubscription<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `subscribedLabelers` field to an Option value (optional)
@@ -613,7 +616,7 @@ impl<'a, S: preferences_state::State> PreferencesBuilder<'a, S> {
         mut self,
         value: Option<Vec<preferences::LabelerSubscription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -626,11 +629,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Preferences<'a> {
         Preferences {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            disable_external_link_warning: self.__unsafe_private_named.1,
-            external_link_skipped_hostnames: self.__unsafe_private_named.2,
-            label_preferences: self.__unsafe_private_named.3,
-            subscribed_labelers: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            disable_external_link_warning: self._fields.1,
+            external_link_skipped_hostnames: self._fields.2,
+            label_preferences: self._fields.3,
+            subscribed_labelers: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -643,11 +646,11 @@ where
         >,
     ) -> Preferences<'a> {
         Preferences {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            disable_external_link_warning: self.__unsafe_private_named.1,
-            external_link_skipped_hostnames: self.__unsafe_private_named.2,
-            label_preferences: self.__unsafe_private_named.3,
-            subscribed_labelers: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            disable_external_link_warning: self._fields.1,
+            external_link_skipped_hostnames: self._fields.2,
+            label_preferences: self._fields.3,
+            subscribed_labelers: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_margin/profile.rs b/crates/jacquard-api/src/at_margin/profile.rs
index def1bbf9..d9c69d8b 100644
--- a/crates/jacquard-api/src/at_margin/profile.rs
+++ b/crates/jacquard-api/src/at_margin/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -231,8 +234,8 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -240,7 +243,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -254,9 +257,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -264,12 +267,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -277,12 +280,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `bio` field (optional)
     pub fn bio(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `bio` field to an Option value (optional)
     pub fn maybe_bio(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -297,11 +300,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ProfileBuilder<'a, profile_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -309,12 +312,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -322,12 +325,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `links` field (optional)
     pub fn links(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `links` field to an Option value (optional)
     pub fn maybe_links(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -335,12 +338,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `website` field (optional)
     pub fn website(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `website` field to an Option value (optional)
     pub fn maybe_website(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -353,12 +356,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            bio: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            display_name: self.__unsafe_private_named.3,
-            links: self.__unsafe_private_named.4,
-            website: self.__unsafe_private_named.5,
+            avatar: self._fields.0,
+            bio: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            display_name: self._fields.3,
+            links: self._fields.4,
+            website: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -371,12 +374,12 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            bio: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            display_name: self.__unsafe_private_named.3,
-            links: self.__unsafe_private_named.4,
-            website: self.__unsafe_private_named.5,
+            avatar: self._fields.0,
+            bio: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            display_name: self._fields.3,
+            links: self._fields.4,
+            website: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_margin/reply.rs b/crates/jacquard-api/src/at_margin/reply.rs
index 5c6ee684..e6795a86 100644
--- a/crates/jacquard-api/src/at_margin/reply.rs
+++ b/crates/jacquard-api/src/at_margin/reply.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -176,81 +179,81 @@ pub mod reply_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Root;
         type Parent;
         type Text;
         type CreatedAt;
+        type Root;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Root = Unset;
         type Parent = Unset;
         type Text = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `root` field to Set
-    pub struct SetRoot<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRoot<S> {}
-    impl<S: State> State for SetRoot<S> {
-        type Root = Set<members::root>;
-        type Parent = S::Parent;
-        type Text = S::Text;
-        type CreatedAt = S::CreatedAt;
+        type Root = Unset;
     }
     ///State transition - sets the `parent` field to Set
     pub struct SetParent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetParent<S> {}
     impl<S: State> State for SetParent<S> {
-        type Root = S::Root;
         type Parent = Set<members::parent>;
         type Text = S::Text;
         type CreatedAt = S::CreatedAt;
+        type Root = S::Root;
     }
     ///State transition - sets the `text` field to Set
     pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetText<S> {}
     impl<S: State> State for SetText<S> {
-        type Root = S::Root;
         type Parent = S::Parent;
         type Text = Set<members::text>;
         type CreatedAt = S::CreatedAt;
+        type Root = S::Root;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Root = S::Root;
         type Parent = S::Parent;
         type Text = S::Text;
         type CreatedAt = Set<members::created_at>;
+        type Root = S::Root;
+    }
+    ///State transition - sets the `root` field to Set
+    pub struct SetRoot<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRoot<S> {}
+    impl<S: State> State for SetRoot<S> {
+        type Parent = S::Parent;
+        type Text = S::Text;
+        type CreatedAt = S::CreatedAt;
+        type Root = Set<members::root>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `root` field
-        pub struct root(());
         ///Marker type for the `parent` field
         pub struct parent(());
         ///Marker type for the `text` field
         pub struct text(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `root` field
+        pub struct root(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReplyBuilder<'a, S: reply_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<reply::ReplyRef<'a>>,
         Option<reply::ReplyRef<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Reply<'a> {
@@ -264,9 +267,9 @@ impl<'a> ReplyBuilder<'a, reply_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReplyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -281,11 +284,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReplyBuilder<'a, reply_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReplyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -293,12 +296,12 @@ where
 impl<'a, S: reply_state::State> ReplyBuilder<'a, S> {
     /// Set the `format` field (optional)
     pub fn format(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `format` field to an Option value (optional)
     pub fn maybe_format(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -313,11 +316,11 @@ where
         mut self,
         value: impl Into<reply::ReplyRef<'a>>,
     ) -> ReplyBuilder<'a, reply_state::SetParent<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReplyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -332,11 +335,11 @@ where
         mut self,
         value: impl Into<reply::ReplyRef<'a>>,
     ) -> ReplyBuilder<'a, reply_state::SetRoot<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ReplyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -351,11 +354,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReplyBuilder<'a, reply_state::SetText<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ReplyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -363,22 +366,19 @@ where
 impl<'a, S> ReplyBuilder<'a, S>
 where
     S: reply_state::State,
-    S::Root: reply_state::IsSet,
     S::Parent: reply_state::IsSet,
     S::Text: reply_state::IsSet,
     S::CreatedAt: reply_state::IsSet,
+    S::Root: reply_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Reply<'a> {
         Reply {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            format: self
-                .__unsafe_private_named
-                .1
-                .or_else(|| Some(CowStr::from("text/plain"))),
-            parent: self.__unsafe_private_named.2.unwrap(),
-            root: self.__unsafe_private_named.3.unwrap(),
-            text: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            format: self._fields.1.or_else(|| Some(CowStr::from("text/plain"))),
+            parent: self._fields.2.unwrap(),
+            root: self._fields.3.unwrap(),
+            text: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -391,14 +391,11 @@ where
         >,
     ) -> Reply<'a> {
         Reply {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            format: self
-                .__unsafe_private_named
-                .1
-                .or_else(|| Some(CowStr::from("text/plain"))),
-            parent: self.__unsafe_private_named.2.unwrap(),
-            root: self.__unsafe_private_named.3.unwrap(),
-            text: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            format: self._fields.1.or_else(|| Some(CowStr::from("text/plain"))),
+            parent: self._fields.2.unwrap(),
+            root: self._fields.3.unwrap(),
+            text: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -527,45 +524,45 @@ pub mod reply_ref_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type Cid;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type Cid = Unset;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Cid = S::Cid;
+        type Uri = Unset;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type Uri = S::Uri;
         type Cid = Set<members::cid>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Cid = S::Cid;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `cid` field
         pub struct cid(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReplyRefBuilder<'a, S: reply_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReplyRef<'a> {
@@ -579,9 +576,9 @@ impl<'a> ReplyRefBuilder<'a, reply_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -596,11 +593,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> ReplyRefBuilder<'a, reply_ref_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -615,11 +612,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ReplyRefBuilder<'a, reply_ref_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -627,14 +624,14 @@ where
 impl<'a, S> ReplyRefBuilder<'a, S>
 where
     S: reply_ref_state::State,
-    S::Uri: reply_ref_state::IsSet,
     S::Cid: reply_ref_state::IsSet,
+    S::Uri: reply_ref_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ReplyRef<'a> {
         ReplyRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -647,8 +644,8 @@ where
         >,
     ) -> ReplyRef<'a> {
         ReplyRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_noted/link.rs b/crates/jacquard-api/src/at_noted/link.rs
index 8ddb8893..5d5427f2 100644
--- a/crates/jacquard-api/src/at_noted/link.rs
+++ b/crates/jacquard-api/src/at_noted/link.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -152,15 +155,15 @@ pub mod link_state {
 
 /// Builder for constructing an instance of this type
 pub struct LinkBuilder<'a, S: link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Link<'a> {
@@ -174,9 +177,9 @@ impl<'a> LinkBuilder<'a, link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -191,11 +194,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LinkBuilder<'a, link_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,12 +206,12 @@ where
 impl<'a, S: link_state::State> LinkBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -216,12 +219,12 @@ impl<'a, S: link_state::State> LinkBuilder<'a, S> {
 impl<'a, S: link_state::State> LinkBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -229,12 +232,12 @@ impl<'a, S: link_state::State> LinkBuilder<'a, S> {
 impl<'a, S: link_state::State> LinkBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -249,11 +252,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LinkBuilder<'a, link_state::SetUrl<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -267,11 +270,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Link<'a> {
         Link {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            tags: self.__unsafe_private_named.2,
-            title: self.__unsafe_private_named.3,
-            url: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            tags: self._fields.2,
+            title: self._fields.3,
+            url: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -284,11 +287,11 @@ where
         >,
     ) -> Link<'a> {
         Link {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            tags: self.__unsafe_private_named.2,
-            title: self.__unsafe_private_named.3,
-            url: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            tags: self._fields.2,
+            title: self._fields.3,
+            url: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_noted/post.rs b/crates/jacquard-api/src/at_noted/post.rs
index 985d666d..dbc09ccd 100644
--- a/crates/jacquard-api/src/at_noted/post.rs
+++ b/crates/jacquard-api/src/at_noted/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -155,8 +158,8 @@ pub mod post_state {
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -164,7 +167,7 @@ pub struct PostBuilder<'a, S: post_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -178,9 +181,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -188,12 +191,12 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `body` field (optional)
     pub fn body(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `body` field to an Option value (optional)
     pub fn maybe_body(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -201,12 +204,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -214,12 +217,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `extended` field (optional)
     pub fn extended(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `extended` field to an Option value (optional)
     pub fn maybe_extended(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetSlug<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,12 +249,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -266,11 +269,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetTitle<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -284,12 +287,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            body: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            extended: self.__unsafe_private_named.2,
-            slug: self.__unsafe_private_named.3.unwrap(),
-            tags: self.__unsafe_private_named.4,
-            title: self.__unsafe_private_named.5.unwrap(),
+            body: self._fields.0,
+            created_at: self._fields.1,
+            extended: self._fields.2,
+            slug: self._fields.3.unwrap(),
+            tags: self._fields.4,
+            title: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -302,12 +305,12 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            body: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            extended: self.__unsafe_private_named.2,
-            slug: self.__unsafe_private_named.3.unwrap(),
-            tags: self.__unsafe_private_named.4,
-            title: self.__unsafe_private_named.5.unwrap(),
+            body: self._fields.0,
+            created_at: self._fields.1,
+            extended: self._fields.2,
+            slug: self._fields.3.unwrap(),
+            tags: self._fields.4,
+            title: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_pasteb/paste.rs b/crates/jacquard-api/src/at_pasteb/paste.rs
index 91c281aa..829a6f90 100644
--- a/crates/jacquard-api/src/at_pasteb/paste.rs
+++ b/crates/jacquard-api/src/at_pasteb/paste.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -268,8 +271,8 @@ pub mod paste_state {
 
 /// Builder for constructing an instance of this type
 pub struct PasteBuilder<'a, S: paste_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -278,7 +281,7 @@ pub struct PasteBuilder<'a, S: paste_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Paste<'a> {
@@ -292,9 +295,9 @@ impl<'a> PasteBuilder<'a, paste_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PasteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -309,11 +312,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> PasteBuilder<'a, paste_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PasteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -328,11 +331,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PasteBuilder<'a, paste_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PasteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -340,12 +343,12 @@ where
 impl<'a, S: paste_state::State> PasteBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -353,12 +356,12 @@ impl<'a, S: paste_state::State> PasteBuilder<'a, S> {
 impl<'a, S: paste_state::State> PasteBuilder<'a, S> {
     /// Set the `lang` field (optional)
     pub fn lang(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `lang` field to an Option value (optional)
     pub fn maybe_lang(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -366,12 +369,12 @@ impl<'a, S: paste_state::State> PasteBuilder<'a, S> {
 impl<'a, S: paste_state::State> PasteBuilder<'a, S> {
     /// Set the `thumbnail` field (optional)
     pub fn thumbnail(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -379,12 +382,12 @@ impl<'a, S: paste_state::State> PasteBuilder<'a, S> {
 impl<'a, S: paste_state::State> PasteBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -392,12 +395,12 @@ impl<'a, S: paste_state::State> PasteBuilder<'a, S> {
 impl<'a, S: paste_state::State> PasteBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -411,13 +414,13 @@ where
     /// Build the final struct
     pub fn build(self) -> Paste<'a> {
         Paste {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            lang: self.__unsafe_private_named.3,
-            thumbnail: self.__unsafe_private_named.4,
-            title: self.__unsafe_private_named.5,
-            updated_at: self.__unsafe_private_named.6,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            lang: self._fields.3,
+            thumbnail: self._fields.4,
+            title: self._fields.5,
+            updated_at: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -430,13 +433,13 @@ where
         >,
     ) -> Paste<'a> {
         Paste {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            lang: self.__unsafe_private_named.3,
-            thumbnail: self.__unsafe_private_named.4,
-            title: self.__unsafe_private_named.5,
-            updated_at: self.__unsafe_private_named.6,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            lang: self._fields.3,
+            thumbnail: self._fields.4,
+            title: self._fields.5,
+            updated_at: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_podping/records/podping.rs b/crates/jacquard-api/src/at_podping/records/podping.rs
index adc45cfc..49eebfa6 100644
--- a/crates/jacquard-api/src/at_podping/records/podping.rs
+++ b/crates/jacquard-api/src/at_podping/records/podping.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -128,91 +131,91 @@ pub mod podping_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Timestamp;
-        type Version;
         type Iris;
         type Medium;
         type Reason;
+        type Version;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Timestamp = Unset;
-        type Version = Unset;
         type Iris = Unset;
         type Medium = Unset;
         type Reason = Unset;
+        type Version = Unset;
     }
     ///State transition - sets the `timestamp` field to Set
     pub struct SetTimestamp<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTimestamp<S> {}
     impl<S: State> State for SetTimestamp<S> {
         type Timestamp = Set<members::timestamp>;
-        type Version = S::Version;
-        type Iris = S::Iris;
-        type Medium = S::Medium;
-        type Reason = S::Reason;
-    }
-    ///State transition - sets the `version` field to Set
-    pub struct SetVersion<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetVersion<S> {}
-    impl<S: State> State for SetVersion<S> {
-        type Timestamp = S::Timestamp;
-        type Version = Set<members::version>;
         type Iris = S::Iris;
         type Medium = S::Medium;
         type Reason = S::Reason;
+        type Version = S::Version;
     }
     ///State transition - sets the `iris` field to Set
     pub struct SetIris<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIris<S> {}
     impl<S: State> State for SetIris<S> {
         type Timestamp = S::Timestamp;
-        type Version = S::Version;
         type Iris = Set<members::iris>;
         type Medium = S::Medium;
         type Reason = S::Reason;
+        type Version = S::Version;
     }
     ///State transition - sets the `medium` field to Set
     pub struct SetMedium<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMedium<S> {}
     impl<S: State> State for SetMedium<S> {
         type Timestamp = S::Timestamp;
-        type Version = S::Version;
         type Iris = S::Iris;
         type Medium = Set<members::medium>;
         type Reason = S::Reason;
+        type Version = S::Version;
     }
     ///State transition - sets the `reason` field to Set
     pub struct SetReason<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetReason<S> {}
     impl<S: State> State for SetReason<S> {
         type Timestamp = S::Timestamp;
-        type Version = S::Version;
         type Iris = S::Iris;
         type Medium = S::Medium;
         type Reason = Set<members::reason>;
+        type Version = S::Version;
+    }
+    ///State transition - sets the `version` field to Set
+    pub struct SetVersion<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetVersion<S> {}
+    impl<S: State> State for SetVersion<S> {
+        type Timestamp = S::Timestamp;
+        type Iris = S::Iris;
+        type Medium = S::Medium;
+        type Reason = S::Reason;
+        type Version = Set<members::version>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `timestamp` field
         pub struct timestamp(());
-        ///Marker type for the `version` field
-        pub struct version(());
         ///Marker type for the `iris` field
         pub struct iris(());
         ///Marker type for the `medium` field
         pub struct medium(());
         ///Marker type for the `reason` field
         pub struct reason(());
+        ///Marker type for the `version` field
+        pub struct version(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PodpingBuilder<'a, S: podping_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<UriValue<'a>>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -221,7 +224,7 @@ pub struct PodpingBuilder<'a, S: podping_state::State> {
         Option<Datetime>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Podping<'a> {
@@ -235,9 +238,9 @@ impl<'a> PodpingBuilder<'a, podping_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PodpingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -252,11 +255,11 @@ where
         mut self,
         value: impl Into<Vec<UriValue<'a>>>,
     ) -> PodpingBuilder<'a, podping_state::SetIris<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PodpingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -271,11 +274,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PodpingBuilder<'a, podping_state::SetMedium<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PodpingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -290,11 +293,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PodpingBuilder<'a, podping_state::SetReason<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PodpingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -302,12 +305,12 @@ where
 impl<'a, S: podping_state::State> PodpingBuilder<'a, S> {
     /// Set the `sessionId` field (optional)
     pub fn session_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `sessionId` field to an Option value (optional)
     pub fn maybe_session_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -315,12 +318,12 @@ impl<'a, S: podping_state::State> PodpingBuilder<'a, S> {
 impl<'a, S: podping_state::State> PodpingBuilder<'a, S> {
     /// Set the `source` field (optional)
     pub fn source(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `source` field to an Option value (optional)
     pub fn maybe_source(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -335,11 +338,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PodpingBuilder<'a, podping_state::SetTimestamp<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         PodpingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -354,11 +357,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PodpingBuilder<'a, podping_state::SetVersion<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         PodpingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -367,21 +370,21 @@ impl<'a, S> PodpingBuilder<'a, S>
 where
     S: podping_state::State,
     S::Timestamp: podping_state::IsSet,
-    S::Version: podping_state::IsSet,
     S::Iris: podping_state::IsSet,
     S::Medium: podping_state::IsSet,
     S::Reason: podping_state::IsSet,
+    S::Version: podping_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Podping<'a> {
         Podping {
-            iris: self.__unsafe_private_named.0.unwrap(),
-            medium: self.__unsafe_private_named.1.unwrap(),
-            reason: self.__unsafe_private_named.2.unwrap(),
-            session_id: self.__unsafe_private_named.3,
-            source: self.__unsafe_private_named.4,
-            timestamp: self.__unsafe_private_named.5.unwrap(),
-            version: self.__unsafe_private_named.6.unwrap(),
+            iris: self._fields.0.unwrap(),
+            medium: self._fields.1.unwrap(),
+            reason: self._fields.2.unwrap(),
+            session_id: self._fields.3,
+            source: self._fields.4,
+            timestamp: self._fields.5.unwrap(),
+            version: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -394,13 +397,13 @@ where
         >,
     ) -> Podping<'a> {
         Podping {
-            iris: self.__unsafe_private_named.0.unwrap(),
-            medium: self.__unsafe_private_named.1.unwrap(),
-            reason: self.__unsafe_private_named.2.unwrap(),
-            session_id: self.__unsafe_private_named.3,
-            source: self.__unsafe_private_named.4,
-            timestamp: self.__unsafe_private_named.5.unwrap(),
-            version: self.__unsafe_private_named.6.unwrap(),
+            iris: self._fields.0.unwrap(),
+            medium: self._fields.1.unwrap(),
+            reason: self._fields.2.unwrap(),
+            session_id: self._fields.3,
+            source: self._fields.4,
+            timestamp: self._fields.5.unwrap(),
+            version: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_podping/records/startup.rs b/crates/jacquard-api/src/at_podping/records/startup.rs
index b6c29c2c..3439d579 100644
--- a/crates/jacquard-api/src/at_podping/records/startup.rs
+++ b/crates/jacquard-api/src/at_podping/records/startup.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -144,58 +147,58 @@ pub mod startup_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ServerAccount;
-        type Timestamp;
         type Message;
+        type Timestamp;
+        type ServerAccount;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ServerAccount = Unset;
-        type Timestamp = Unset;
         type Message = Unset;
+        type Timestamp = Unset;
+        type ServerAccount = Unset;
     }
-    ///State transition - sets the `server_account` field to Set
-    pub struct SetServerAccount<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetServerAccount<S> {}
-    impl<S: State> State for SetServerAccount<S> {
-        type ServerAccount = Set<members::server_account>;
+    ///State transition - sets the `message` field to Set
+    pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMessage<S> {}
+    impl<S: State> State for SetMessage<S> {
+        type Message = Set<members::message>;
         type Timestamp = S::Timestamp;
-        type Message = S::Message;
+        type ServerAccount = S::ServerAccount;
     }
     ///State transition - sets the `timestamp` field to Set
     pub struct SetTimestamp<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTimestamp<S> {}
     impl<S: State> State for SetTimestamp<S> {
-        type ServerAccount = S::ServerAccount;
-        type Timestamp = Set<members::timestamp>;
         type Message = S::Message;
-    }
-    ///State transition - sets the `message` field to Set
-    pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMessage<S> {}
-    impl<S: State> State for SetMessage<S> {
+        type Timestamp = Set<members::timestamp>;
         type ServerAccount = S::ServerAccount;
+    }
+    ///State transition - sets the `server_account` field to Set
+    pub struct SetServerAccount<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetServerAccount<S> {}
+    impl<S: State> State for SetServerAccount<S> {
+        type Message = S::Message;
         type Timestamp = S::Timestamp;
-        type Message = Set<members::message>;
+        type ServerAccount = Set<members::server_account>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `server_account` field
-        pub struct server_account(());
-        ///Marker type for the `timestamp` field
-        pub struct timestamp(());
         ///Marker type for the `message` field
         pub struct message(());
+        ///Marker type for the `timestamp` field
+        pub struct timestamp(());
+        ///Marker type for the `server_account` field
+        pub struct server_account(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct StartupBuilder<'a, S: startup_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
@@ -208,7 +211,7 @@ pub struct StartupBuilder<'a, S: startup_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Startup<'a> {
@@ -222,21 +225,9 @@ impl<'a> StartupBuilder<'a, startup_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StartupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,12 +235,12 @@ impl<'a> StartupBuilder<'a, startup_state::Empty> {
 impl<'a, S: startup_state::State> StartupBuilder<'a, S> {
     /// Set the `capacity` field (optional)
     pub fn capacity(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `capacity` field to an Option value (optional)
     pub fn maybe_capacity(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -257,12 +248,12 @@ impl<'a, S: startup_state::State> StartupBuilder<'a, S> {
 impl<'a, S: startup_state::State> StartupBuilder<'a, S> {
     /// Set the `hive` field (optional)
     pub fn hive(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `hive` field to an Option value (optional)
     pub fn maybe_hive(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -277,11 +268,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> StartupBuilder<'a, startup_state::SetMessage<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         StartupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -289,12 +280,12 @@ where
 impl<'a, S: startup_state::State> StartupBuilder<'a, S> {
     /// Set the `pingingApp` field (optional)
     pub fn pinging_app(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `pingingApp` field to an Option value (optional)
     pub fn maybe_pinging_app(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -309,11 +300,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> StartupBuilder<'a, startup_state::SetServerAccount<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         StartupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -321,12 +312,12 @@ where
 impl<'a, S: startup_state::State> StartupBuilder<'a, S> {
     /// Set the `sessionId` field (optional)
     pub fn session_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `sessionId` field to an Option value (optional)
     pub fn maybe_session_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -334,12 +325,12 @@ impl<'a, S: startup_state::State> StartupBuilder<'a, S> {
 impl<'a, S: startup_state::State> StartupBuilder<'a, S> {
     /// Set the `source` field (optional)
     pub fn source(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `source` field to an Option value (optional)
     pub fn maybe_source(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -354,11 +345,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StartupBuilder<'a, startup_state::SetTimestamp<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         StartupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -366,12 +357,12 @@ where
 impl<'a, S: startup_state::State> StartupBuilder<'a, S> {
     /// Set the `useTestNode` field (optional)
     pub fn use_test_node(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `useTestNode` field to an Option value (optional)
     pub fn maybe_use_test_node(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -379,12 +370,12 @@ impl<'a, S: startup_state::State> StartupBuilder<'a, S> {
 impl<'a, S: startup_state::State> StartupBuilder<'a, S> {
     /// Set the `uuid` field (optional)
     pub fn uuid(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `uuid` field to an Option value (optional)
     pub fn maybe_uuid(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -392,12 +383,12 @@ impl<'a, S: startup_state::State> StartupBuilder<'a, S> {
 impl<'a, S: startup_state::State> StartupBuilder<'a, S> {
     /// Set the `v` field (optional)
     pub fn v(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `v` field to an Option value (optional)
     pub fn maybe_v(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -405,24 +396,24 @@ impl<'a, S: startup_state::State> StartupBuilder<'a, S> {
 impl<'a, S> StartupBuilder<'a, S>
 where
     S: startup_state::State,
-    S::ServerAccount: startup_state::IsSet,
-    S::Timestamp: startup_state::IsSet,
     S::Message: startup_state::IsSet,
+    S::Timestamp: startup_state::IsSet,
+    S::ServerAccount: startup_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Startup<'a> {
         Startup {
-            capacity: self.__unsafe_private_named.0,
-            hive: self.__unsafe_private_named.1,
-            message: self.__unsafe_private_named.2.unwrap(),
-            pinging_app: self.__unsafe_private_named.3,
-            server_account: self.__unsafe_private_named.4.unwrap(),
-            session_id: self.__unsafe_private_named.5,
-            source: self.__unsafe_private_named.6,
-            timestamp: self.__unsafe_private_named.7.unwrap(),
-            use_test_node: self.__unsafe_private_named.8,
-            uuid: self.__unsafe_private_named.9,
-            v: self.__unsafe_private_named.10,
+            capacity: self._fields.0,
+            hive: self._fields.1,
+            message: self._fields.2.unwrap(),
+            pinging_app: self._fields.3,
+            server_account: self._fields.4.unwrap(),
+            session_id: self._fields.5,
+            source: self._fields.6,
+            timestamp: self._fields.7.unwrap(),
+            use_test_node: self._fields.8,
+            uuid: self._fields.9,
+            v: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -435,17 +426,17 @@ where
         >,
     ) -> Startup<'a> {
         Startup {
-            capacity: self.__unsafe_private_named.0,
-            hive: self.__unsafe_private_named.1,
-            message: self.__unsafe_private_named.2.unwrap(),
-            pinging_app: self.__unsafe_private_named.3,
-            server_account: self.__unsafe_private_named.4.unwrap(),
-            session_id: self.__unsafe_private_named.5,
-            source: self.__unsafe_private_named.6,
-            timestamp: self.__unsafe_private_named.7.unwrap(),
-            use_test_node: self.__unsafe_private_named.8,
-            uuid: self.__unsafe_private_named.9,
-            v: self.__unsafe_private_named.10,
+            capacity: self._fields.0,
+            hive: self._fields.1,
+            message: self._fields.2.unwrap(),
+            pinging_app: self._fields.3,
+            server_account: self._fields.4.unwrap(),
+            session_id: self._fields.5,
+            source: self._fields.6,
+            timestamp: self._fields.7.unwrap(),
+            use_test_node: self._fields.8,
+            uuid: self._fields.9,
+            v: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/at_unthread/document/delete_draft.rs b/crates/jacquard-api/src/at_unthread/document/delete_draft.rs
index b13c02db..0ea6fbca 100644
--- a/crates/jacquard-api/src/at_unthread/document/delete_draft.rs
+++ b/crates/jacquard-api/src/at_unthread/document/delete_draft.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/at_unthread/document/get_draft.rs b/crates/jacquard-api/src/at_unthread/document/get_draft.rs
index 0e533f7f..8fb38d9b 100644
--- a/crates/jacquard-api/src/at_unthread/document/get_draft.rs
+++ b/crates/jacquard-api/src/at_unthread/document/get_draft.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, open_union};
@@ -122,9 +123,9 @@ pub mod get_draft_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetDraftBuilder<'a, S: get_draft_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetDraft<'a> {
@@ -138,9 +139,9 @@ impl<'a> GetDraftBuilder<'a, get_draft_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetDraftBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -155,11 +156,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetDraftBuilder<'a, get_draft_state::SetTid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetDraftBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -172,7 +173,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetDraft<'a> {
         GetDraft {
-            tid: self.__unsafe_private_named.0.unwrap(),
+            tid: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/at_unthread/document/list_drafts.rs b/crates/jacquard-api/src/at_unthread/document/list_drafts.rs
index 92132050..a8429672 100644
--- a/crates/jacquard-api/src/at_unthread/document/list_drafts.rs
+++ b/crates/jacquard-api/src/at_unthread/document/list_drafts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod list_drafts_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListDraftsBuilder<'a, S: list_drafts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListDrafts<'a> {
@@ -102,9 +105,9 @@ impl<'a> ListDraftsBuilder<'a, list_drafts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListDraftsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -112,12 +115,12 @@ impl<'a> ListDraftsBuilder<'a, list_drafts_state::Empty> {
 impl<'a, S: list_drafts_state::State> ListDraftsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -125,12 +128,12 @@ impl<'a, S: list_drafts_state::State> ListDraftsBuilder<'a, S> {
 impl<'a, S: list_drafts_state::State> ListDraftsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -142,8 +145,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ListDrafts<'a> {
         ListDrafts {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/at_unthread/document/put_draft.rs b/crates/jacquard-api/src/at_unthread/document/put_draft.rs
index 304d6cfa..78421b5a 100644
--- a/crates/jacquard-api/src/at_unthread/document/put_draft.rs
+++ b/crates/jacquard-api/src/at_unthread/document/put_draft.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,80 +149,80 @@ pub mod draft_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Tid;
+        type CreatedAt;
         type UpdatedAt;
         type Content;
-        type CreatedAt;
-        type Tid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Tid = Unset;
+        type CreatedAt = Unset;
         type UpdatedAt = Unset;
         type Content = Unset;
-        type CreatedAt = Unset;
-        type Tid = Unset;
+    }
+    ///State transition - sets the `tid` field to Set
+    pub struct SetTid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTid<S> {}
+    impl<S: State> State for SetTid<S> {
+        type Tid = Set<members::tid>;
+        type CreatedAt = S::CreatedAt;
+        type UpdatedAt = S::UpdatedAt;
+        type Content = S::Content;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Tid = S::Tid;
+        type CreatedAt = Set<members::created_at>;
+        type UpdatedAt = S::UpdatedAt;
+        type Content = S::Content;
     }
     ///State transition - sets the `updated_at` field to Set
     pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
     impl<S: State> State for SetUpdatedAt<S> {
+        type Tid = S::Tid;
+        type CreatedAt = S::CreatedAt;
         type UpdatedAt = Set<members::updated_at>;
         type Content = S::Content;
-        type CreatedAt = S::CreatedAt;
-        type Tid = S::Tid;
     }
     ///State transition - sets the `content` field to Set
     pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContent<S> {}
     impl<S: State> State for SetContent<S> {
-        type UpdatedAt = S::UpdatedAt;
-        type Content = Set<members::content>;
-        type CreatedAt = S::CreatedAt;
         type Tid = S::Tid;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type UpdatedAt = S::UpdatedAt;
-        type Content = S::Content;
-        type CreatedAt = Set<members::created_at>;
-        type Tid = S::Tid;
-    }
-    ///State transition - sets the `tid` field to Set
-    pub struct SetTid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTid<S> {}
-    impl<S: State> State for SetTid<S> {
-        type UpdatedAt = S::UpdatedAt;
-        type Content = S::Content;
         type CreatedAt = S::CreatedAt;
-        type Tid = Set<members::tid>;
+        type UpdatedAt = S::UpdatedAt;
+        type Content = Set<members::content>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `tid` field
+        pub struct tid(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `updated_at` field
         pub struct updated_at(());
         ///Marker type for the `content` field
         pub struct content(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `tid` field
-        pub struct tid(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DraftViewBuilder<'a, S: draft_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DraftView<'a> {
@@ -233,9 +236,9 @@ impl<'a> DraftViewBuilder<'a, draft_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DraftViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -250,11 +253,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DraftViewBuilder<'a, draft_view_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DraftViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -269,11 +272,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DraftViewBuilder<'a, draft_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DraftViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -288,11 +291,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DraftViewBuilder<'a, draft_view_state::SetTid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         DraftViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -307,11 +310,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DraftViewBuilder<'a, draft_view_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         DraftViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -319,18 +322,18 @@ where
 impl<'a, S> DraftViewBuilder<'a, S>
 where
     S: draft_view_state::State,
+    S::Tid: draft_view_state::IsSet,
+    S::CreatedAt: draft_view_state::IsSet,
     S::UpdatedAt: draft_view_state::IsSet,
     S::Content: draft_view_state::IsSet,
-    S::CreatedAt: draft_view_state::IsSet,
-    S::Tid: draft_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DraftView<'a> {
         DraftView {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            tid: self.__unsafe_private_named.2.unwrap(),
-            updated_at: self.__unsafe_private_named.3.unwrap(),
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            tid: self._fields.2.unwrap(),
+            updated_at: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -340,10 +343,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> DraftView<'a> {
         DraftView {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            tid: self.__unsafe_private_named.2.unwrap(),
-            updated_at: self.__unsafe_private_named.3.unwrap(),
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            tid: self._fields.2.unwrap(),
+            updated_at: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/beauty_cybernetic/trustcow/review.rs b/crates/jacquard-api/src/beauty_cybernetic/trustcow/review.rs
index 54ff4c3d..d9cabce2 100644
--- a/crates/jacquard-api/src/beauty_cybernetic/trustcow/review.rs
+++ b/crates/jacquard-api/src/beauty_cybernetic/trustcow/review.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -304,8 +307,8 @@ pub mod review_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReviewBuilder<'a, S: review_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<i64>,
@@ -313,7 +316,7 @@ pub struct ReviewBuilder<'a, S: review_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Review<'a> {
@@ -327,9 +330,9 @@ impl<'a> ReviewBuilder<'a, review_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -344,11 +347,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReviewBuilder<'a, review_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -356,12 +359,12 @@ where
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -376,11 +379,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ReviewBuilder<'a, review_state::SetRating<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -391,12 +394,12 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ReviewReviewerRole<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `reviewerRole` field to an Option value (optional)
     pub fn maybe_reviewer_role(mut self, value: Option<ReviewReviewerRole<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -404,12 +407,12 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -424,11 +427,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReviewBuilder<'a, review_state::SetTransaction<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -443,12 +446,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Review<'a> {
         Review {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            rating: self.__unsafe_private_named.2.unwrap(),
-            reviewer_role: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4,
-            transaction: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            rating: self._fields.2.unwrap(),
+            reviewer_role: self._fields.3,
+            title: self._fields.4,
+            transaction: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -461,12 +464,12 @@ where
         >,
     ) -> Review<'a> {
         Review {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            rating: self.__unsafe_private_named.2.unwrap(),
-            reviewer_role: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4,
-            transaction: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            rating: self._fields.2.unwrap(),
+            reviewer_role: self._fields.3,
+            title: self._fields.4,
+            transaction: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/beauty_cybernetic/trustcow/transaction.rs b/crates/jacquard-api/src/beauty_cybernetic/trustcow/transaction.rs
index bb6ae076..982cc560 100644
--- a/crates/jacquard-api/src/beauty_cybernetic/trustcow/transaction.rs
+++ b/crates/jacquard-api/src/beauty_cybernetic/trustcow/transaction.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -160,73 +163,73 @@ pub mod transaction_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type ServiceProvider;
-        type ServiceConsumer;
         type CreatedAt;
         type TransactionId;
+        type ServiceConsumer;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type ServiceProvider = Unset;
-        type ServiceConsumer = Unset;
         type CreatedAt = Unset;
         type TransactionId = Unset;
+        type ServiceConsumer = Unset;
     }
     ///State transition - sets the `service_provider` field to Set
     pub struct SetServiceProvider<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetServiceProvider<S> {}
     impl<S: State> State for SetServiceProvider<S> {
         type ServiceProvider = Set<members::service_provider>;
-        type ServiceConsumer = S::ServiceConsumer;
-        type CreatedAt = S::CreatedAt;
-        type TransactionId = S::TransactionId;
-    }
-    ///State transition - sets the `service_consumer` field to Set
-    pub struct SetServiceConsumer<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetServiceConsumer<S> {}
-    impl<S: State> State for SetServiceConsumer<S> {
-        type ServiceProvider = S::ServiceProvider;
-        type ServiceConsumer = Set<members::service_consumer>;
         type CreatedAt = S::CreatedAt;
         type TransactionId = S::TransactionId;
+        type ServiceConsumer = S::ServiceConsumer;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type ServiceProvider = S::ServiceProvider;
-        type ServiceConsumer = S::ServiceConsumer;
         type CreatedAt = Set<members::created_at>;
         type TransactionId = S::TransactionId;
+        type ServiceConsumer = S::ServiceConsumer;
     }
     ///State transition - sets the `transaction_id` field to Set
     pub struct SetTransactionId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTransactionId<S> {}
     impl<S: State> State for SetTransactionId<S> {
         type ServiceProvider = S::ServiceProvider;
-        type ServiceConsumer = S::ServiceConsumer;
         type CreatedAt = S::CreatedAt;
         type TransactionId = Set<members::transaction_id>;
+        type ServiceConsumer = S::ServiceConsumer;
+    }
+    ///State transition - sets the `service_consumer` field to Set
+    pub struct SetServiceConsumer<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetServiceConsumer<S> {}
+    impl<S: State> State for SetServiceConsumer<S> {
+        type ServiceProvider = S::ServiceProvider;
+        type CreatedAt = S::CreatedAt;
+        type TransactionId = S::TransactionId;
+        type ServiceConsumer = Set<members::service_consumer>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `service_provider` field
         pub struct service_provider(());
-        ///Marker type for the `service_consumer` field
-        pub struct service_consumer(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `transaction_id` field
         pub struct transaction_id(());
+        ///Marker type for the `service_consumer` field
+        pub struct service_consumer(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TransactionBuilder<'a, S: transaction_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -235,7 +238,7 @@ pub struct TransactionBuilder<'a, S: transaction_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Transaction<'a> {
@@ -249,9 +252,9 @@ impl<'a> TransactionBuilder<'a, transaction_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TransactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -259,12 +262,12 @@ impl<'a> TransactionBuilder<'a, transaction_state::Empty> {
 impl<'a, S: transaction_state::State> TransactionBuilder<'a, S> {
     /// Set the `amount` field (optional)
     pub fn amount(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `amount` field to an Option value (optional)
     pub fn maybe_amount(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -279,11 +282,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TransactionBuilder<'a, transaction_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TransactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -291,12 +294,12 @@ where
 impl<'a, S: transaction_state::State> TransactionBuilder<'a, S> {
     /// Set the `currency` field (optional)
     pub fn currency(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `currency` field to an Option value (optional)
     pub fn maybe_currency(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -304,12 +307,12 @@ impl<'a, S: transaction_state::State> TransactionBuilder<'a, S> {
 impl<'a, S: transaction_state::State> TransactionBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -324,11 +327,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TransactionBuilder<'a, transaction_state::SetServiceConsumer<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         TransactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -343,11 +346,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TransactionBuilder<'a, transaction_state::SetServiceProvider<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         TransactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -362,11 +365,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TransactionBuilder<'a, transaction_state::SetTransactionId<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         TransactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -375,20 +378,20 @@ impl<'a, S> TransactionBuilder<'a, S>
 where
     S: transaction_state::State,
     S::ServiceProvider: transaction_state::IsSet,
-    S::ServiceConsumer: transaction_state::IsSet,
     S::CreatedAt: transaction_state::IsSet,
     S::TransactionId: transaction_state::IsSet,
+    S::ServiceConsumer: transaction_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Transaction<'a> {
         Transaction {
-            amount: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            currency: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            service_consumer: self.__unsafe_private_named.4.unwrap(),
-            service_provider: self.__unsafe_private_named.5.unwrap(),
-            transaction_id: self.__unsafe_private_named.6.unwrap(),
+            amount: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            currency: self._fields.2,
+            description: self._fields.3,
+            service_consumer: self._fields.4.unwrap(),
+            service_provider: self._fields.5.unwrap(),
+            transaction_id: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -401,13 +404,13 @@ where
         >,
     ) -> Transaction<'a> {
         Transaction {
-            amount: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            currency: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            service_consumer: self.__unsafe_private_named.4.unwrap(),
-            service_provider: self.__unsafe_private_named.5.unwrap(),
-            transaction_id: self.__unsafe_private_named.6.unwrap(),
+            amount: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            currency: self._fields.2,
+            description: self._fields.3,
+            service_consumer: self._fields.4.unwrap(),
+            service_provider: self._fields.5.unwrap(),
+            transaction_id: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/beauty_cybernetic/trustcow/warrant.rs b/crates/jacquard-api/src/beauty_cybernetic/trustcow/warrant.rs
index a4ccf378..79ed6479 100644
--- a/crates/jacquard-api/src/beauty_cybernetic/trustcow/warrant.rs
+++ b/crates/jacquard-api/src/beauty_cybernetic/trustcow/warrant.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -340,44 +343,44 @@ pub mod warrant_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subject;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subject = S::Subject;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct WarrantBuilder<'a, S: warrant_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -385,7 +388,7 @@ pub struct WarrantBuilder<'a, S: warrant_state::State> {
         Option<WarrantTrustLevel<'a>>,
         Option<WarrantWarrantType<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Warrant<'a> {
@@ -399,9 +402,9 @@ impl<'a> WarrantBuilder<'a, warrant_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WarrantBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -416,11 +419,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> WarrantBuilder<'a, warrant_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         WarrantBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -428,12 +431,12 @@ where
 impl<'a, S: warrant_state::State> WarrantBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -441,12 +444,12 @@ impl<'a, S: warrant_state::State> WarrantBuilder<'a, S> {
 impl<'a, S: warrant_state::State> WarrantBuilder<'a, S> {
     /// Set the `expiresAt` field (optional)
     pub fn expires_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `expiresAt` field to an Option value (optional)
     pub fn maybe_expires_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -461,11 +464,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WarrantBuilder<'a, warrant_state::SetSubject<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         WarrantBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -476,12 +479,12 @@ impl<'a, S: warrant_state::State> WarrantBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WarrantTrustLevel<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `trustLevel` field to an Option value (optional)
     pub fn maybe_trust_level(mut self, value: Option<WarrantTrustLevel<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -492,12 +495,12 @@ impl<'a, S: warrant_state::State> WarrantBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WarrantWarrantType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `warrantType` field to an Option value (optional)
     pub fn maybe_warrant_type(mut self, value: Option<WarrantWarrantType<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -505,18 +508,18 @@ impl<'a, S: warrant_state::State> WarrantBuilder<'a, S> {
 impl<'a, S> WarrantBuilder<'a, S>
 where
     S: warrant_state::State,
-    S::CreatedAt: warrant_state::IsSet,
     S::Subject: warrant_state::IsSet,
+    S::CreatedAt: warrant_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Warrant<'a> {
         Warrant {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            expires_at: self.__unsafe_private_named.2,
-            subject: self.__unsafe_private_named.3.unwrap(),
-            trust_level: self.__unsafe_private_named.4,
-            warrant_type: self.__unsafe_private_named.5,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            expires_at: self._fields.2,
+            subject: self._fields.3.unwrap(),
+            trust_level: self._fields.4,
+            warrant_type: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -529,12 +532,12 @@ where
         >,
     ) -> Warrant<'a> {
         Warrant {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            expires_at: self.__unsafe_private_named.2,
-            subject: self.__unsafe_private_named.3.unwrap(),
-            trust_level: self.__unsafe_private_named.4,
-            warrant_type: self.__unsafe_private_named.5,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            expires_at: self._fields.2,
+            subject: self._fields.3.unwrap(),
+            trust_level: self._fields.4,
+            warrant_type: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/block/blockquote.rs b/crates/jacquard-api/src/blog_pckt/block/blockquote.rs
index 0cb27580..440a19eb 100644
--- a/crates/jacquard-api/src/blog_pckt/block/blockquote.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/blockquote.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -77,9 +80,9 @@ pub mod blockquote_state {
 
 /// Builder for constructing an instance of this type
 pub struct BlockquoteBuilder<'a, S: blockquote_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<Text<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<Text<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Blockquote<'a> {
@@ -93,9 +96,9 @@ impl<'a> BlockquoteBuilder<'a, blockquote_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlockquoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -110,11 +113,11 @@ where
         mut self,
         value: impl Into<Vec<Text<'a>>>,
     ) -> BlockquoteBuilder<'a, blockquote_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlockquoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -127,7 +130,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Blockquote<'a> {
         Blockquote {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -140,7 +143,7 @@ where
         >,
     ) -> Blockquote<'a> {
         Blockquote {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/block/bluesky_embed.rs b/crates/jacquard-api/src/blog_pckt/block/bluesky_embed.rs
index e98d2cff..bb87c666 100644
--- a/crates/jacquard-api/src/blog_pckt/block/bluesky_embed.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/bluesky_embed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -77,9 +80,9 @@ pub mod bluesky_embed_state {
 
 /// Builder for constructing an instance of this type
 pub struct BlueskyEmbedBuilder<'a, S: bluesky_embed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BlueskyEmbed<'a> {
@@ -93,9 +96,9 @@ impl<'a> BlueskyEmbedBuilder<'a, bluesky_embed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlueskyEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -110,11 +113,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> BlueskyEmbedBuilder<'a, bluesky_embed_state::SetPostRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlueskyEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -127,7 +130,7 @@ where
     /// Build the final struct
     pub fn build(self) -> BlueskyEmbed<'a> {
         BlueskyEmbed {
-            post_ref: self.__unsafe_private_named.0.unwrap(),
+            post_ref: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -140,7 +143,7 @@ where
         >,
     ) -> BlueskyEmbed<'a> {
         BlueskyEmbed {
-            post_ref: self.__unsafe_private_named.0.unwrap(),
+            post_ref: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/block/bullet_list.rs b/crates/jacquard-api/src/blog_pckt/block/bullet_list.rs
index fd16d8e7..699a3e79 100644
--- a/crates/jacquard-api/src/blog_pckt/block/bullet_list.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/bullet_list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -77,9 +80,9 @@ pub mod bullet_list_state {
 
 /// Builder for constructing an instance of this type
 pub struct BulletListBuilder<'a, S: bullet_list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<ListItem<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<ListItem<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BulletList<'a> {
@@ -93,9 +96,9 @@ impl<'a> BulletListBuilder<'a, bullet_list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BulletListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -110,11 +113,11 @@ where
         mut self,
         value: impl Into<Vec<ListItem<'a>>>,
     ) -> BulletListBuilder<'a, bullet_list_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BulletListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -127,7 +130,7 @@ where
     /// Build the final struct
     pub fn build(self) -> BulletList<'a> {
         BulletList {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -140,7 +143,7 @@ where
         >,
     ) -> BulletList<'a> {
         BulletList {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/block/gallery.rs b/crates/jacquard-api/src/blog_pckt/block/gallery.rs
index 34a330e8..0224bd82 100644
--- a/crates/jacquard-api/src/blog_pckt/block/gallery.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/gallery.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -77,9 +80,9 @@ pub mod gallery_state {
 
 /// Builder for constructing an instance of this type
 pub struct GalleryBuilder<'a, S: gallery_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Gallery<'a> {
@@ -93,9 +96,9 @@ impl<'a> GalleryBuilder<'a, gallery_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GalleryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -110,11 +113,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GalleryBuilder<'a, gallery_state::SetRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GalleryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -127,7 +130,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Gallery<'a> {
         Gallery {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -140,7 +143,7 @@ where
         >,
     ) -> Gallery<'a> {
         Gallery {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/block/iframe.rs b/crates/jacquard-api/src/blog_pckt/block/iframe.rs
index c969b751..d72de94c 100644
--- a/crates/jacquard-api/src/blog_pckt/block/iframe.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/iframe.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -98,9 +101,9 @@ pub mod iframe_state {
 
 /// Builder for constructing an instance of this type
 pub struct IframeBuilder<'a, S: iframe_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Iframe<'a> {
@@ -114,9 +117,9 @@ impl<'a> IframeBuilder<'a, iframe_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IframeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -124,12 +127,12 @@ impl<'a> IframeBuilder<'a, iframe_state::Empty> {
 impl<'a, S: iframe_state::State> IframeBuilder<'a, S> {
     /// Set the `height` field (optional)
     pub fn height(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `height` field to an Option value (optional)
     pub fn maybe_height(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -144,11 +147,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> IframeBuilder<'a, iframe_state::SetUrl<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         IframeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -161,8 +164,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Iframe<'a> {
         Iframe {
-            height: self.__unsafe_private_named.0,
-            url: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0,
+            url: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -175,8 +178,8 @@ where
         >,
     ) -> Iframe<'a> {
         Iframe {
-            height: self.__unsafe_private_named.0,
-            url: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0,
+            url: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/block/image.rs b/crates/jacquard-api/src/blog_pckt/block/image.rs
index 1cc637c4..f4cad4d8 100644
--- a/crates/jacquard-api/src/blog_pckt/block/image.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/image.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -241,45 +244,45 @@ pub mod aspect_ratio_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Height;
         type Width;
+        type Height;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Height = Unset;
         type Width = Unset;
-    }
-    ///State transition - sets the `height` field to Set
-    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHeight<S> {}
-    impl<S: State> State for SetHeight<S> {
-        type Height = Set<members::height>;
-        type Width = S::Width;
+        type Height = Unset;
     }
     ///State transition - sets the `width` field to Set
     pub struct SetWidth<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWidth<S> {}
     impl<S: State> State for SetWidth<S> {
-        type Height = S::Height;
         type Width = Set<members::width>;
+        type Height = S::Height;
+    }
+    ///State transition - sets the `height` field to Set
+    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHeight<S> {}
+    impl<S: State> State for SetHeight<S> {
+        type Width = S::Width;
+        type Height = Set<members::height>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `height` field
-        pub struct height(());
         ///Marker type for the `width` field
         pub struct width(());
+        ///Marker type for the `height` field
+        pub struct height(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AspectRatioBuilder<'a, S: aspect_ratio_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AspectRatio<'a> {
@@ -293,9 +296,9 @@ impl<'a> AspectRatioBuilder<'a, aspect_ratio_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -310,11 +313,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -329,11 +332,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetWidth<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -341,14 +344,14 @@ where
 impl<'a, S> AspectRatioBuilder<'a, S>
 where
     S: aspect_ratio_state::State,
-    S::Height: aspect_ratio_state::IsSet,
     S::Width: aspect_ratio_state::IsSet,
+    S::Height: aspect_ratio_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -361,8 +364,8 @@ where
         >,
     ) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -543,9 +546,9 @@ pub mod image_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImageBuilder<'a, S: image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<image::ImageAttrs<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<image::ImageAttrs<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Image<'a> {
@@ -559,9 +562,9 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -576,11 +579,11 @@ where
         mut self,
         value: impl Into<image::ImageAttrs<'a>>,
     ) -> ImageBuilder<'a, image_state::SetAttrs<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -593,7 +596,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Image<'a> {
         Image {
-            attrs: self.__unsafe_private_named.0.unwrap(),
+            attrs: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -606,7 +609,7 @@ where
         >,
     ) -> Image<'a> {
         Image {
-            attrs: self.__unsafe_private_named.0.unwrap(),
+            attrs: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/block/list_item.rs b/crates/jacquard-api/src/blog_pckt/block/list_item.rs
index 9d56eb85..1c4d3c98 100644
--- a/crates/jacquard-api/src/blog_pckt/block/list_item.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/list_item.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -93,9 +96,9 @@ pub mod list_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListItemBuilder<'a, S: list_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<ListItemContentItem<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<ListItemContentItem<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListItem<'a> {
@@ -109,9 +112,9 @@ impl<'a> ListItemBuilder<'a, list_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -126,11 +129,11 @@ where
         mut self,
         value: impl Into<Vec<ListItemContentItem<'a>>>,
     ) -> ListItemBuilder<'a, list_item_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -143,7 +146,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ListItem<'a> {
         ListItem {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -156,7 +159,7 @@ where
         >,
     ) -> ListItem<'a> {
         ListItem {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/block/mention.rs b/crates/jacquard-api/src/blog_pckt/block/mention.rs
index 123aa0e9..0e36cbf1 100644
--- a/crates/jacquard-api/src/blog_pckt/block/mention.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/mention.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -67,45 +70,45 @@ pub mod mention_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Handle;
         type Did;
+        type Handle;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Handle = Unset;
         type Did = Unset;
-    }
-    ///State transition - sets the `handle` field to Set
-    pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHandle<S> {}
-    impl<S: State> State for SetHandle<S> {
-        type Handle = Set<members::handle>;
-        type Did = S::Did;
+        type Handle = Unset;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type Handle = S::Handle;
         type Did = Set<members::did>;
+        type Handle = S::Handle;
+    }
+    ///State transition - sets the `handle` field to Set
+    pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHandle<S> {}
+    impl<S: State> State for SetHandle<S> {
+        type Did = S::Did;
+        type Handle = Set<members::handle>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `handle` field
-        pub struct handle(());
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `handle` field
+        pub struct handle(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MentionBuilder<'a, S: mention_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Handle<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Handle<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Mention<'a> {
@@ -119,9 +122,9 @@ impl<'a> MentionBuilder<'a, mention_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,11 +139,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MentionBuilder<'a, mention_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -155,11 +158,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> MentionBuilder<'a, mention_state::SetHandle<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -167,14 +170,14 @@ where
 impl<'a, S> MentionBuilder<'a, S>
 where
     S: mention_state::State,
-    S::Handle: mention_state::IsSet,
     S::Did: mention_state::IsSet,
+    S::Handle: mention_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Mention<'a> {
         Mention {
-            did: self.__unsafe_private_named.0.unwrap(),
-            handle: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            handle: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -187,8 +190,8 @@ where
         >,
     ) -> Mention<'a> {
         Mention {
-            did: self.__unsafe_private_named.0.unwrap(),
-            handle: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            handle: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/block/ordered_list.rs b/crates/jacquard-api/src/blog_pckt/block/ordered_list.rs
index 113677ff..994ee624 100644
--- a/crates/jacquard-api/src/blog_pckt/block/ordered_list.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/ordered_list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -89,9 +92,9 @@ pub mod ordered_list_state {
 
 /// Builder for constructing an instance of this type
 pub struct OrderedListBuilder<'a, S: ordered_list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<ListItem<'a>>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<ListItem<'a>>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> OrderedList<'a> {
@@ -105,9 +108,9 @@ impl<'a> OrderedListBuilder<'a, ordered_list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OrderedListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -122,11 +125,11 @@ where
         mut self,
         value: impl Into<Vec<ListItem<'a>>>,
     ) -> OrderedListBuilder<'a, ordered_list_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         OrderedListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -134,12 +137,12 @@ where
 impl<'a, S: ordered_list_state::State> OrderedListBuilder<'a, S> {
     /// Set the `start` field (optional)
     pub fn start(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `start` field to an Option value (optional)
     pub fn maybe_start(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -152,8 +155,8 @@ where
     /// Build the final struct
     pub fn build(self) -> OrderedList<'a> {
         OrderedList {
-            content: self.__unsafe_private_named.0.unwrap(),
-            start: self.__unsafe_private_named.1,
+            content: self._fields.0.unwrap(),
+            start: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -166,8 +169,8 @@ where
         >,
     ) -> OrderedList<'a> {
         OrderedList {
-            content: self.__unsafe_private_named.0.unwrap(),
-            start: self.__unsafe_private_named.1,
+            content: self._fields.0.unwrap(),
+            start: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/block/table.rs b/crates/jacquard-api/src/blog_pckt/block/table.rs
index 17de60cd..c6dfb0f7 100644
--- a/crates/jacquard-api/src/blog_pckt/block/table.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/table.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -77,9 +80,9 @@ pub mod table_state {
 
 /// Builder for constructing an instance of this type
 pub struct TableBuilder<'a, S: table_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<TableRow<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<TableRow<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Table<'a> {
@@ -93,9 +96,9 @@ impl<'a> TableBuilder<'a, table_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TableBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -110,11 +113,11 @@ where
         mut self,
         value: impl Into<Vec<TableRow<'a>>>,
     ) -> TableBuilder<'a, table_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TableBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -127,7 +130,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Table<'a> {
         Table {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -140,7 +143,7 @@ where
         >,
     ) -> Table<'a> {
         Table {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/block/table_cell.rs b/crates/jacquard-api/src/blog_pckt/block/table_cell.rs
index c0094df9..f8e8965d 100644
--- a/crates/jacquard-api/src/blog_pckt/block/table_cell.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/table_cell.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -101,9 +104,9 @@ pub mod table_cell_state {
 
 /// Builder for constructing an instance of this type
 pub struct TableCellBuilder<'a, S: table_cell_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Vec<Text<'a>>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Vec<Text<'a>>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TableCell<'a> {
@@ -117,9 +120,9 @@ impl<'a> TableCellBuilder<'a, table_cell_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TableCellBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -127,12 +130,12 @@ impl<'a> TableCellBuilder<'a, table_cell_state::Empty> {
 impl<'a, S: table_cell_state::State> TableCellBuilder<'a, S> {
     /// Set the `colspan` field (optional)
     pub fn colspan(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `colspan` field to an Option value (optional)
     pub fn maybe_colspan(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -147,11 +150,11 @@ where
         mut self,
         value: impl Into<Vec<Text<'a>>>,
     ) -> TableCellBuilder<'a, table_cell_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TableCellBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -159,12 +162,12 @@ where
 impl<'a, S: table_cell_state::State> TableCellBuilder<'a, S> {
     /// Set the `rowspan` field (optional)
     pub fn rowspan(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `rowspan` field to an Option value (optional)
     pub fn maybe_rowspan(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -177,9 +180,9 @@ where
     /// Build the final struct
     pub fn build(self) -> TableCell<'a> {
         TableCell {
-            colspan: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            rowspan: self.__unsafe_private_named.2,
+            colspan: self._fields.0,
+            content: self._fields.1.unwrap(),
+            rowspan: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -192,9 +195,9 @@ where
         >,
     ) -> TableCell<'a> {
         TableCell {
-            colspan: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            rowspan: self.__unsafe_private_named.2,
+            colspan: self._fields.0,
+            content: self._fields.1.unwrap(),
+            rowspan: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/block/table_header.rs b/crates/jacquard-api/src/blog_pckt/block/table_header.rs
index 9db62c12..f9513afd 100644
--- a/crates/jacquard-api/src/blog_pckt/block/table_header.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/table_header.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -101,9 +104,9 @@ pub mod table_header_state {
 
 /// Builder for constructing an instance of this type
 pub struct TableHeaderBuilder<'a, S: table_header_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Vec<Text<'a>>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Vec<Text<'a>>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TableHeader<'a> {
@@ -117,9 +120,9 @@ impl<'a> TableHeaderBuilder<'a, table_header_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TableHeaderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -127,12 +130,12 @@ impl<'a> TableHeaderBuilder<'a, table_header_state::Empty> {
 impl<'a, S: table_header_state::State> TableHeaderBuilder<'a, S> {
     /// Set the `colspan` field (optional)
     pub fn colspan(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `colspan` field to an Option value (optional)
     pub fn maybe_colspan(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -147,11 +150,11 @@ where
         mut self,
         value: impl Into<Vec<Text<'a>>>,
     ) -> TableHeaderBuilder<'a, table_header_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TableHeaderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -159,12 +162,12 @@ where
 impl<'a, S: table_header_state::State> TableHeaderBuilder<'a, S> {
     /// Set the `rowspan` field (optional)
     pub fn rowspan(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `rowspan` field to an Option value (optional)
     pub fn maybe_rowspan(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -177,9 +180,9 @@ where
     /// Build the final struct
     pub fn build(self) -> TableHeader<'a> {
         TableHeader {
-            colspan: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            rowspan: self.__unsafe_private_named.2,
+            colspan: self._fields.0,
+            content: self._fields.1.unwrap(),
+            rowspan: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -192,9 +195,9 @@ where
         >,
     ) -> TableHeader<'a> {
         TableHeader {
-            colspan: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            rowspan: self.__unsafe_private_named.2,
+            colspan: self._fields.0,
+            content: self._fields.1.unwrap(),
+            rowspan: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/block/table_row.rs b/crates/jacquard-api/src/blog_pckt/block/table_row.rs
index 2ca9526e..1f6f1406 100644
--- a/crates/jacquard-api/src/blog_pckt/block/table_row.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/table_row.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -90,9 +93,9 @@ pub mod table_row_state {
 
 /// Builder for constructing an instance of this type
 pub struct TableRowBuilder<'a, S: table_row_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<TableRowContentItem<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<TableRowContentItem<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TableRow<'a> {
@@ -106,9 +109,9 @@ impl<'a> TableRowBuilder<'a, table_row_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TableRowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -123,11 +126,11 @@ where
         mut self,
         value: impl Into<Vec<TableRowContentItem<'a>>>,
     ) -> TableRowBuilder<'a, table_row_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TableRowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -140,7 +143,7 @@ where
     /// Build the final struct
     pub fn build(self) -> TableRow<'a> {
         TableRow {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -153,7 +156,7 @@ where
         >,
     ) -> TableRow<'a> {
         TableRow {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/block/task_item.rs b/crates/jacquard-api/src/blog_pckt/block/task_item.rs
index af286dae..4dda63b8 100644
--- a/crates/jacquard-api/src/blog_pckt/block/task_item.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/task_item.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -91,9 +94,9 @@ pub mod task_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct TaskItemBuilder<'a, S: task_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<Vec<Text<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<Vec<Text<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TaskItem<'a> {
@@ -107,9 +110,9 @@ impl<'a> TaskItemBuilder<'a, task_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TaskItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -124,11 +127,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> TaskItemBuilder<'a, task_item_state::SetChecked<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TaskItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -143,11 +146,11 @@ where
         mut self,
         value: impl Into<Vec<Text<'a>>>,
     ) -> TaskItemBuilder<'a, task_item_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TaskItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -161,8 +164,8 @@ where
     /// Build the final struct
     pub fn build(self) -> TaskItem<'a> {
         TaskItem {
-            checked: self.__unsafe_private_named.0.unwrap(),
-            content: self.__unsafe_private_named.1.unwrap(),
+            checked: self._fields.0.unwrap(),
+            content: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -175,8 +178,8 @@ where
         >,
     ) -> TaskItem<'a> {
         TaskItem {
-            checked: self.__unsafe_private_named.0.unwrap(),
-            content: self.__unsafe_private_named.1.unwrap(),
+            checked: self._fields.0.unwrap(),
+            content: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/block/task_list.rs b/crates/jacquard-api/src/blog_pckt/block/task_list.rs
index bd84b100..c9fdda58 100644
--- a/crates/jacquard-api/src/blog_pckt/block/task_list.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/task_list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -77,9 +80,9 @@ pub mod task_list_state {
 
 /// Builder for constructing an instance of this type
 pub struct TaskListBuilder<'a, S: task_list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<TaskItem<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<TaskItem<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TaskList<'a> {
@@ -93,9 +96,9 @@ impl<'a> TaskListBuilder<'a, task_list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TaskListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -110,11 +113,11 @@ where
         mut self,
         value: impl Into<Vec<TaskItem<'a>>>,
     ) -> TaskListBuilder<'a, task_list_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TaskListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -127,7 +130,7 @@ where
     /// Build the final struct
     pub fn build(self) -> TaskList<'a> {
         TaskList {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -140,7 +143,7 @@ where
         >,
     ) -> TaskList<'a> {
         TaskList {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/block/website.rs b/crates/jacquard-api/src/blog_pckt/block/website.rs
index 7bf6fc87..84f0eaef 100644
--- a/crates/jacquard-api/src/blog_pckt/block/website.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/website.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -90,14 +93,14 @@ pub mod website_state {
 
 /// Builder for constructing an instance of this type
 pub struct WebsiteBuilder<'a, S: website_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Website<'a> {
@@ -111,9 +114,9 @@ impl<'a> WebsiteBuilder<'a, website_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WebsiteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -121,12 +124,12 @@ impl<'a> WebsiteBuilder<'a, website_state::Empty> {
 impl<'a, S: website_state::State> WebsiteBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -134,12 +137,12 @@ impl<'a, S: website_state::State> WebsiteBuilder<'a, S> {
 impl<'a, S: website_state::State> WebsiteBuilder<'a, S> {
     /// Set the `previewImage` field (optional)
     pub fn preview_image(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `previewImage` field to an Option value (optional)
     pub fn maybe_preview_image(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -154,11 +157,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> WebsiteBuilder<'a, website_state::SetSrc<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         WebsiteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -166,12 +169,12 @@ where
 impl<'a, S: website_state::State> WebsiteBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -184,10 +187,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Website<'a> {
         Website {
-            description: self.__unsafe_private_named.0,
-            preview_image: self.__unsafe_private_named.1,
-            src: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3,
+            description: self._fields.0,
+            preview_image: self._fields.1,
+            src: self._fields.2.unwrap(),
+            title: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -200,10 +203,10 @@ where
         >,
     ) -> Website<'a> {
         Website {
-            description: self.__unsafe_private_named.0,
-            preview_image: self.__unsafe_private_named.1,
-            src: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3,
+            description: self._fields.0,
+            preview_image: self._fields.1,
+            src: self._fields.2.unwrap(),
+            title: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/blog.rs b/crates/jacquard-api/src/blog_pckt/blog.rs
index c1ca8fee..d91eb3a1 100644
--- a/crates/jacquard-api/src/blog_pckt/blog.rs
+++ b/crates/jacquard-api/src/blog_pckt/blog.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -243,8 +246,8 @@ pub mod blog_state {
 
 /// Builder for constructing an instance of this type
 pub struct BlogBuilder<'a, S: blog_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
@@ -253,7 +256,7 @@ pub struct BlogBuilder<'a, S: blog_state::State> {
         Option<Datetime>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Blog<'a> {
@@ -267,9 +270,9 @@ impl<'a> BlogBuilder<'a, blog_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -277,12 +280,12 @@ impl<'a> BlogBuilder<'a, blog_state::Empty> {
 impl<'a, S: blog_state::State> BlogBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -290,12 +293,12 @@ impl<'a, S: blog_state::State> BlogBuilder<'a, S> {
 impl<'a, S: blog_state::State> BlogBuilder<'a, S> {
     /// Set the `icon` field (optional)
     pub fn icon(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `icon` field to an Option value (optional)
     pub fn maybe_icon(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -310,11 +313,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BlogBuilder<'a, blog_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BlogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -322,12 +325,12 @@ where
 impl<'a, S: blog_state::State> BlogBuilder<'a, S> {
     /// Set the `rss` field (optional)
     pub fn rss(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `rss` field to an Option value (optional)
     pub fn maybe_rss(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -335,12 +338,12 @@ impl<'a, S: blog_state::State> BlogBuilder<'a, S> {
 impl<'a, S: blog_state::State> BlogBuilder<'a, S> {
     /// Set the `theme` field (optional)
     pub fn theme(mut self, value: impl Into<Option<blog::Theme<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `theme` field to an Option value (optional)
     pub fn maybe_theme(mut self, value: Option<blog::Theme<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -348,12 +351,12 @@ impl<'a, S: blog_state::State> BlogBuilder<'a, S> {
 impl<'a, S: blog_state::State> BlogBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -361,12 +364,12 @@ impl<'a, S: blog_state::State> BlogBuilder<'a, S> {
 impl<'a, S: blog_state::State> BlogBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -379,13 +382,13 @@ where
     /// Build the final struct
     pub fn build(self) -> Blog<'a> {
         Blog {
-            description: self.__unsafe_private_named.0,
-            icon: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
-            rss: self.__unsafe_private_named.3,
-            theme: self.__unsafe_private_named.4,
-            updated_at: self.__unsafe_private_named.5,
-            url: self.__unsafe_private_named.6,
+            description: self._fields.0,
+            icon: self._fields.1,
+            name: self._fields.2.unwrap(),
+            rss: self._fields.3,
+            theme: self._fields.4,
+            updated_at: self._fields.5,
+            url: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -398,13 +401,13 @@ where
         >,
     ) -> Blog<'a> {
         Blog {
-            description: self.__unsafe_private_named.0,
-            icon: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
-            rss: self.__unsafe_private_named.3,
-            theme: self.__unsafe_private_named.4,
-            updated_at: self.__unsafe_private_named.5,
-            url: self.__unsafe_private_named.6,
+            description: self._fields.0,
+            icon: self._fields.1,
+            name: self._fields.2.unwrap(),
+            rss: self._fields.3,
+            theme: self._fields.4,
+            updated_at: self._fields.5,
+            url: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/document.rs b/crates/jacquard-api/src/blog_pckt/document.rs
index 64fc0d9e..321f9ebb 100644
--- a/crates/jacquard-api/src/blog_pckt/document.rs
+++ b/crates/jacquard-api/src/blog_pckt/document.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -145,9 +148,9 @@ pub mod document_state {
 
 /// Builder for constructing an instance of this type
 pub struct DocumentBuilder<'a, S: document_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Document<'a> {
@@ -161,9 +164,9 @@ impl<'a> DocumentBuilder<'a, document_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> DocumentBuilder<'a, document_state::SetDocument<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> DocumentBuilder<'a, document_state::SetSite<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,8 +218,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Document<'a> {
         Document {
-            document: self.__unsafe_private_named.0.unwrap(),
-            site: self.__unsafe_private_named.1.unwrap(),
+            document: self._fields.0.unwrap(),
+            site: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -229,8 +232,8 @@ where
         >,
     ) -> Document<'a> {
         Document {
-            document: self.__unsafe_private_named.0.unwrap(),
-            site: self.__unsafe_private_named.1.unwrap(),
+            document: self._fields.0.unwrap(),
+            site: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/gallery.rs b/crates/jacquard-api/src/blog_pckt/gallery.rs
index d6c43d47..c331908b 100644
--- a/crates/jacquard-api/src/blog_pckt/gallery.rs
+++ b/crates/jacquard-api/src/blog_pckt/gallery.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -208,14 +211,14 @@ pub mod gallery_state {
 
 /// Builder for constructing an instance of this type
 pub struct GalleryBuilder<'a, S: gallery_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Vec<ImageAttrs<'a>>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Gallery<'a> {
@@ -229,9 +232,9 @@ impl<'a> GalleryBuilder<'a, gallery_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GalleryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,12 +242,12 @@ impl<'a> GalleryBuilder<'a, gallery_state::Empty> {
 impl<'a, S: gallery_state::State> GalleryBuilder<'a, S> {
     /// Set the `caption` field (optional)
     pub fn caption(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `caption` field to an Option value (optional)
     pub fn maybe_caption(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -259,11 +262,11 @@ where
         mut self,
         value: impl Into<Vec<ImageAttrs<'a>>>,
     ) -> GalleryBuilder<'a, gallery_state::SetImages<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GalleryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -271,12 +274,12 @@ where
 impl<'a, S: gallery_state::State> GalleryBuilder<'a, S> {
     /// Set the `layout` field (optional)
     pub fn layout(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `layout` field to an Option value (optional)
     pub fn maybe_layout(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -284,12 +287,12 @@ impl<'a, S: gallery_state::State> GalleryBuilder<'a, S> {
 impl<'a, S: gallery_state::State> GalleryBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -302,10 +305,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Gallery<'a> {
         Gallery {
-            caption: self.__unsafe_private_named.0,
-            images: self.__unsafe_private_named.1.unwrap(),
-            layout: self.__unsafe_private_named.2,
-            title: self.__unsafe_private_named.3,
+            caption: self._fields.0,
+            images: self._fields.1.unwrap(),
+            layout: self._fields.2,
+            title: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -318,10 +321,10 @@ where
         >,
     ) -> Gallery<'a> {
         Gallery {
-            caption: self.__unsafe_private_named.0,
-            images: self.__unsafe_private_named.1.unwrap(),
-            layout: self.__unsafe_private_named.2,
-            title: self.__unsafe_private_named.3,
+            caption: self._fields.0,
+            images: self._fields.1.unwrap(),
+            layout: self._fields.2,
+            title: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/mark/link.rs b/crates/jacquard-api/src/blog_pckt/mark/link.rs
index e2a5b8e3..296bde41 100644
--- a/crates/jacquard-api/src/blog_pckt/mark/link.rs
+++ b/crates/jacquard-api/src/blog_pckt/mark/link.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -158,14 +161,14 @@ pub mod link_attrs_state {
 
 /// Builder for constructing an instance of this type
 pub struct LinkAttrsBuilder<'a, S: link_attrs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LinkAttrs<'a> {
@@ -179,9 +182,9 @@ impl<'a> LinkAttrsBuilder<'a, link_attrs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinkAttrsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LinkAttrsBuilder<'a, link_attrs_state::SetHref<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LinkAttrsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -208,12 +211,12 @@ where
 impl<'a, S: link_attrs_state::State> LinkAttrsBuilder<'a, S> {
     /// Set the `rel` field (optional)
     pub fn rel(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `rel` field to an Option value (optional)
     pub fn maybe_rel(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -221,12 +224,12 @@ impl<'a, S: link_attrs_state::State> LinkAttrsBuilder<'a, S> {
 impl<'a, S: link_attrs_state::State> LinkAttrsBuilder<'a, S> {
     /// Set the `target` field (optional)
     pub fn target(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `target` field to an Option value (optional)
     pub fn maybe_target(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -234,12 +237,12 @@ impl<'a, S: link_attrs_state::State> LinkAttrsBuilder<'a, S> {
 impl<'a, S: link_attrs_state::State> LinkAttrsBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -252,10 +255,10 @@ where
     /// Build the final struct
     pub fn build(self) -> LinkAttrs<'a> {
         LinkAttrs {
-            href: self.__unsafe_private_named.0.unwrap(),
-            rel: self.__unsafe_private_named.1,
-            target: self.__unsafe_private_named.2,
-            title: self.__unsafe_private_named.3,
+            href: self._fields.0.unwrap(),
+            rel: self._fields.1,
+            target: self._fields.2,
+            title: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -268,10 +271,10 @@ where
         >,
     ) -> LinkAttrs<'a> {
         LinkAttrs {
-            href: self.__unsafe_private_named.0.unwrap(),
-            rel: self.__unsafe_private_named.1,
-            target: self.__unsafe_private_named.2,
-            title: self.__unsafe_private_named.3,
+            href: self._fields.0.unwrap(),
+            rel: self._fields.1,
+            target: self._fields.2,
+            title: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -406,9 +409,9 @@ pub mod link_state {
 
 /// Builder for constructing an instance of this type
 pub struct LinkBuilder<'a, S: link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<link::LinkAttrs<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<link::LinkAttrs<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Link<'a> {
@@ -422,9 +425,9 @@ impl<'a> LinkBuilder<'a, link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -439,11 +442,11 @@ where
         mut self,
         value: impl Into<link::LinkAttrs<'a>>,
     ) -> LinkBuilder<'a, link_state::SetAttrs<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -456,7 +459,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Link<'a> {
         Link {
-            attrs: self.__unsafe_private_named.0.unwrap(),
+            attrs: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -469,7 +472,7 @@ where
         >,
     ) -> Link<'a> {
         Link {
-            attrs: self.__unsafe_private_named.0.unwrap(),
+            attrs: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/post.rs b/crates/jacquard-api/src/blog_pckt/post.rs
index 752bad7e..13afd6a9 100644
--- a/crates/jacquard-api/src/blog_pckt/post.rs
+++ b/crates/jacquard-api/src/blog_pckt/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -157,74 +160,74 @@ pub mod post_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Blocks;
         type Title;
-        type Blog;
         type Url;
+        type Blocks;
+        type Blog;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Blocks = Unset;
         type Title = Unset;
-        type Blog = Unset;
         type Url = Unset;
-    }
-    ///State transition - sets the `blocks` field to Set
-    pub struct SetBlocks<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBlocks<S> {}
-    impl<S: State> State for SetBlocks<S> {
-        type Blocks = Set<members::blocks>;
-        type Title = S::Title;
-        type Blog = S::Blog;
-        type Url = S::Url;
+        type Blocks = Unset;
+        type Blog = Unset;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Blocks = S::Blocks;
         type Title = Set<members::title>;
-        type Blog = S::Blog;
         type Url = S::Url;
-    }
-    ///State transition - sets the `blog` field to Set
-    pub struct SetBlog<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBlog<S> {}
-    impl<S: State> State for SetBlog<S> {
         type Blocks = S::Blocks;
-        type Title = S::Title;
-        type Blog = Set<members::blog>;
-        type Url = S::Url;
+        type Blog = S::Blog;
     }
     ///State transition - sets the `url` field to Set
     pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUrl<S> {}
     impl<S: State> State for SetUrl<S> {
+        type Title = S::Title;
+        type Url = Set<members::url>;
         type Blocks = S::Blocks;
+        type Blog = S::Blog;
+    }
+    ///State transition - sets the `blocks` field to Set
+    pub struct SetBlocks<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBlocks<S> {}
+    impl<S: State> State for SetBlocks<S> {
         type Title = S::Title;
+        type Url = S::Url;
+        type Blocks = Set<members::blocks>;
         type Blog = S::Blog;
-        type Url = Set<members::url>;
+    }
+    ///State transition - sets the `blog` field to Set
+    pub struct SetBlog<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBlog<S> {}
+    impl<S: State> State for SetBlog<S> {
+        type Title = S::Title;
+        type Url = S::Url;
+        type Blocks = S::Blocks;
+        type Blog = Set<members::blog>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `blocks` field
-        pub struct blocks(());
         ///Marker type for the `title` field
         pub struct title(());
-        ///Marker type for the `blog` field
-        pub struct blog(());
         ///Marker type for the `url` field
         pub struct url(());
+        ///Marker type for the `blocks` field
+        pub struct blocks(());
+        ///Marker type for the `blog` field
+        pub struct blog(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Data<'a>>,
         Option<StrongRef<'a>>,
         Option<CowStr<'a>>,
@@ -236,7 +239,7 @@ pub struct PostBuilder<'a, S: post_state::State> {
         Option<Datetime>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -250,20 +253,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -278,11 +270,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> PostBuilder<'a, post_state::SetBlocks<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -297,11 +289,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> PostBuilder<'a, post_state::SetBlog<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -309,12 +301,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `bodyPlain` field (optional)
     pub fn body_plain(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `bodyPlain` field to an Option value (optional)
     pub fn maybe_body_plain(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -322,12 +314,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `cover` field (optional)
     pub fn cover(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `cover` field to an Option value (optional)
     pub fn maybe_cover(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -335,12 +327,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `images` field (optional)
     pub fn images(mut self, value: impl Into<Option<Vec<BlobRef<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `images` field to an Option value (optional)
     pub fn maybe_images(mut self, value: Option<Vec<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -348,12 +340,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `publishedAt` field (optional)
     pub fn published_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `publishedAt` field to an Option value (optional)
     pub fn maybe_published_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -361,12 +353,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -381,11 +373,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetTitle<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -393,12 +385,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -413,11 +405,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> PostBuilder<'a, post_state::SetUrl<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -425,24 +417,24 @@ where
 impl<'a, S> PostBuilder<'a, S>
 where
     S: post_state::State,
-    S::Blocks: post_state::IsSet,
     S::Title: post_state::IsSet,
-    S::Blog: post_state::IsSet,
     S::Url: post_state::IsSet,
+    S::Blocks: post_state::IsSet,
+    S::Blog: post_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            blocks: self.__unsafe_private_named.0.unwrap(),
-            blog: self.__unsafe_private_named.1.unwrap(),
-            body_plain: self.__unsafe_private_named.2,
-            cover: self.__unsafe_private_named.3,
-            images: self.__unsafe_private_named.4,
-            published_at: self.__unsafe_private_named.5,
-            tags: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7.unwrap(),
-            updated_at: self.__unsafe_private_named.8,
-            url: self.__unsafe_private_named.9.unwrap(),
+            blocks: self._fields.0.unwrap(),
+            blog: self._fields.1.unwrap(),
+            body_plain: self._fields.2,
+            cover: self._fields.3,
+            images: self._fields.4,
+            published_at: self._fields.5,
+            tags: self._fields.6,
+            title: self._fields.7.unwrap(),
+            updated_at: self._fields.8,
+            url: self._fields.9.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -452,16 +444,16 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Post<'a> {
         Post {
-            blocks: self.__unsafe_private_named.0.unwrap(),
-            blog: self.__unsafe_private_named.1.unwrap(),
-            body_plain: self.__unsafe_private_named.2,
-            cover: self.__unsafe_private_named.3,
-            images: self.__unsafe_private_named.4,
-            published_at: self.__unsafe_private_named.5,
-            tags: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7.unwrap(),
-            updated_at: self.__unsafe_private_named.8,
-            url: self.__unsafe_private_named.9.unwrap(),
+            blocks: self._fields.0.unwrap(),
+            blog: self._fields.1.unwrap(),
+            body_plain: self._fields.2,
+            cover: self._fields.3,
+            images: self._fields.4,
+            published_at: self._fields.5,
+            tags: self._fields.6,
+            title: self._fields.7.unwrap(),
+            updated_at: self._fields.8,
+            url: self._fields.9.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/publication.rs b/crates/jacquard-api/src/blog_pckt/publication.rs
index e6a8c3d2..92abd1ca 100644
--- a/crates/jacquard-api/src/blog_pckt/publication.rs
+++ b/crates/jacquard-api/src/blog_pckt/publication.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -131,9 +134,9 @@ pub mod publication_state {
 
 /// Builder for constructing an instance of this type
 pub struct PublicationBuilder<'a, S: publication_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Publication<'a> {
@@ -147,9 +150,9 @@ impl<'a> PublicationBuilder<'a, publication_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,11 +167,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> PublicationBuilder<'a, publication_state::SetPublication<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,7 +184,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Publication<'a> {
         Publication {
-            publication: self.__unsafe_private_named.0.unwrap(),
+            publication: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -194,7 +197,7 @@ where
         >,
     ) -> Publication<'a> {
         Publication {
-            publication: self.__unsafe_private_named.0.unwrap(),
+            publication: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/richtext/facet.rs b/crates/jacquard-api/src/blog_pckt/richtext/facet.rs
index d680a896..b27a1fa9 100644
--- a/crates/jacquard-api/src/blog_pckt/richtext/facet.rs
+++ b/crates/jacquard-api/src/blog_pckt/richtext/facet.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -380,9 +383,9 @@ pub mod at_mention_state {
 
 /// Builder for constructing an instance of this type
 pub struct AtMentionBuilder<'a, S: at_mention_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AtMention<'a> {
@@ -396,9 +399,9 @@ impl<'a> AtMentionBuilder<'a, at_mention_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AtMentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -413,11 +416,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> AtMentionBuilder<'a, at_mention_state::SetAtUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AtMentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -430,7 +433,7 @@ where
     /// Build the final struct
     pub fn build(self) -> AtMention<'a> {
         AtMention {
-            at_uri: self.__unsafe_private_named.0.unwrap(),
+            at_uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -443,7 +446,7 @@ where
         >,
     ) -> AtMention<'a> {
         AtMention {
-            at_uri: self.__unsafe_private_named.0.unwrap(),
+            at_uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -721,45 +724,45 @@ pub mod byte_slice_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ByteEnd;
         type ByteStart;
+        type ByteEnd;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ByteEnd = Unset;
         type ByteStart = Unset;
-    }
-    ///State transition - sets the `byte_end` field to Set
-    pub struct SetByteEnd<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetByteEnd<S> {}
-    impl<S: State> State for SetByteEnd<S> {
-        type ByteEnd = Set<members::byte_end>;
-        type ByteStart = S::ByteStart;
+        type ByteEnd = Unset;
     }
     ///State transition - sets the `byte_start` field to Set
     pub struct SetByteStart<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetByteStart<S> {}
     impl<S: State> State for SetByteStart<S> {
-        type ByteEnd = S::ByteEnd;
         type ByteStart = Set<members::byte_start>;
+        type ByteEnd = S::ByteEnd;
+    }
+    ///State transition - sets the `byte_end` field to Set
+    pub struct SetByteEnd<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetByteEnd<S> {}
+    impl<S: State> State for SetByteEnd<S> {
+        type ByteStart = S::ByteStart;
+        type ByteEnd = Set<members::byte_end>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `byte_end` field
-        pub struct byte_end(());
         ///Marker type for the `byte_start` field
         pub struct byte_start(());
+        ///Marker type for the `byte_end` field
+        pub struct byte_end(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ByteSliceBuilder<'a, S: byte_slice_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ByteSlice<'a> {
@@ -773,9 +776,9 @@ impl<'a> ByteSliceBuilder<'a, byte_slice_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -790,11 +793,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteEnd<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -809,11 +812,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteStart<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -821,14 +824,14 @@ where
 impl<'a, S> ByteSliceBuilder<'a, S>
 where
     S: byte_slice_state::State,
-    S::ByteEnd: byte_slice_state::IsSet,
     S::ByteStart: byte_slice_state::IsSet,
+    S::ByteEnd: byte_slice_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -841,8 +844,8 @@ where
         >,
     ) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -882,9 +885,9 @@ pub mod did_mention_state {
 
 /// Builder for constructing an instance of this type
 pub struct DidMentionBuilder<'a, S: did_mention_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DidMention<'a> {
@@ -898,9 +901,9 @@ impl<'a> DidMentionBuilder<'a, did_mention_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DidMentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -915,11 +918,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> DidMentionBuilder<'a, did_mention_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DidMentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -932,7 +935,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DidMention<'a> {
         DidMention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -945,7 +948,7 @@ where
         >,
     ) -> DidMention<'a> {
         DidMention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -997,12 +1000,9 @@ pub mod facet_state {
 
 /// Builder for constructing an instance of this type
 pub struct FacetBuilder<'a, S: facet_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<FacetFeaturesItem<'a>>>,
-        Option<facet::ByteSlice<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<FacetFeaturesItem<'a>>>, Option<facet::ByteSlice<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Facet<'a> {
@@ -1016,9 +1016,9 @@ impl<'a> FacetBuilder<'a, facet_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1033,11 +1033,11 @@ where
         mut self,
         value: impl Into<Vec<FacetFeaturesItem<'a>>>,
     ) -> FacetBuilder<'a, facet_state::SetFeatures<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1052,11 +1052,11 @@ where
         mut self,
         value: impl Into<facet::ByteSlice<'a>>,
     ) -> FacetBuilder<'a, facet_state::SetIndex<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1070,8 +1070,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1084,8 +1084,8 @@ where
         >,
     ) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blog_pckt/theme.rs b/crates/jacquard-api/src/blog_pckt/theme.rs
index 782e98cd..90620cb8 100644
--- a/crates/jacquard-api/src/blog_pckt/theme.rs
+++ b/crates/jacquard-api/src/blog_pckt/theme.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -222,14 +225,14 @@ pub mod theme_state {
 
 /// Builder for constructing an instance of this type
 pub struct ThemeBuilder<'a, S: theme_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<theme::Palette<'a>>,
         Option<CowStr<'a>>,
         Option<theme::Palette<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Theme<'a> {
@@ -243,9 +246,9 @@ impl<'a> ThemeBuilder<'a, theme_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ThemeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -260,11 +263,11 @@ where
         mut self,
         value: impl Into<theme::Palette<'a>>,
     ) -> ThemeBuilder<'a, theme_state::SetDark<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ThemeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -272,12 +275,12 @@ where
 impl<'a, S: theme_state::State> ThemeBuilder<'a, S> {
     /// Set the `font` field (optional)
     pub fn font(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `font` field to an Option value (optional)
     pub fn maybe_font(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -292,11 +295,11 @@ where
         mut self,
         value: impl Into<theme::Palette<'a>>,
     ) -> ThemeBuilder<'a, theme_state::SetLight<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ThemeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -304,12 +307,12 @@ where
 impl<'a, S: theme_state::State> ThemeBuilder<'a, S> {
     /// Set the `transparency` field (optional)
     pub fn transparency(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `transparency` field to an Option value (optional)
     pub fn maybe_transparency(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -323,10 +326,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Theme<'a> {
         Theme {
-            dark: self.__unsafe_private_named.0.unwrap(),
-            font: self.__unsafe_private_named.1,
-            light: self.__unsafe_private_named.2.unwrap(),
-            transparency: self.__unsafe_private_named.3,
+            dark: self._fields.0.unwrap(),
+            font: self._fields.1,
+            light: self._fields.2.unwrap(),
+            transparency: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -339,10 +342,10 @@ where
         >,
     ) -> Theme<'a> {
         Theme {
-            dark: self.__unsafe_private_named.0.unwrap(),
-            font: self.__unsafe_private_named.1,
-            light: self.__unsafe_private_named.2.unwrap(),
-            transparency: self.__unsafe_private_named.3,
+            dark: self._fields.0.unwrap(),
+            font: self._fields.1,
+            light: self._fields.2.unwrap(),
+            transparency: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue__2048.rs b/crates/jacquard-api/src/blue__2048.rs
index f299c97f..d9a99bb8 100644
--- a/crates/jacquard-api/src/blue__2048.rs
+++ b/crates/jacquard-api/src/blue__2048.rs
@@ -10,7 +10,11 @@ pub mod key;
 pub mod player;
 pub mod verification;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -69,80 +73,75 @@ pub mod sync_status_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Hash;
-        type CreatedAt;
         type SyncedWithAtRepo;
         type UpdatedAt;
+        type Hash;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Hash = Unset;
-        type CreatedAt = Unset;
         type SyncedWithAtRepo = Unset;
         type UpdatedAt = Unset;
-    }
-    ///State transition - sets the `hash` field to Set
-    pub struct SetHash<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHash<S> {}
-    impl<S: State> State for SetHash<S> {
-        type Hash = Set<members::hash>;
-        type CreatedAt = S::CreatedAt;
-        type SyncedWithAtRepo = S::SyncedWithAtRepo;
-        type UpdatedAt = S::UpdatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type Hash = S::Hash;
-        type CreatedAt = Set<members::created_at>;
-        type SyncedWithAtRepo = S::SyncedWithAtRepo;
-        type UpdatedAt = S::UpdatedAt;
+        type Hash = Unset;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `synced_with_at_repo` field to Set
     pub struct SetSyncedWithAtRepo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSyncedWithAtRepo<S> {}
     impl<S: State> State for SetSyncedWithAtRepo<S> {
-        type Hash = S::Hash;
-        type CreatedAt = S::CreatedAt;
         type SyncedWithAtRepo = Set<members::synced_with_at_repo>;
         type UpdatedAt = S::UpdatedAt;
+        type Hash = S::Hash;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `updated_at` field to Set
     pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
     impl<S: State> State for SetUpdatedAt<S> {
+        type SyncedWithAtRepo = S::SyncedWithAtRepo;
+        type UpdatedAt = Set<members::updated_at>;
         type Hash = S::Hash;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `hash` field to Set
+    pub struct SetHash<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHash<S> {}
+    impl<S: State> State for SetHash<S> {
         type SyncedWithAtRepo = S::SyncedWithAtRepo;
-        type UpdatedAt = Set<members::updated_at>;
+        type UpdatedAt = S::UpdatedAt;
+        type Hash = Set<members::hash>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type SyncedWithAtRepo = S::SyncedWithAtRepo;
+        type UpdatedAt = S::UpdatedAt;
+        type Hash = S::Hash;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `hash` field
-        pub struct hash(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `synced_with_at_repo` field
         pub struct synced_with_at_repo(());
         ///Marker type for the `updated_at` field
         pub struct updated_at(());
+        ///Marker type for the `hash` field
+        pub struct hash(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SyncStatusBuilder<'a, S: sync_status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<CowStr<'a>>,
-        Option<bool>,
-        Option<Datetime>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<bool>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SyncStatus<'a> {
@@ -156,9 +155,9 @@ impl<'a> SyncStatusBuilder<'a, sync_status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SyncStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -173,11 +172,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SyncStatusBuilder<'a, sync_status_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SyncStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -192,11 +191,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SyncStatusBuilder<'a, sync_status_state::SetHash<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SyncStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -211,11 +210,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> SyncStatusBuilder<'a, sync_status_state::SetSyncedWithAtRepo<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SyncStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -230,11 +229,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SyncStatusBuilder<'a, sync_status_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SyncStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -242,18 +241,18 @@ where
 impl<'a, S> SyncStatusBuilder<'a, S>
 where
     S: sync_status_state::State,
-    S::Hash: sync_status_state::IsSet,
-    S::CreatedAt: sync_status_state::IsSet,
     S::SyncedWithAtRepo: sync_status_state::IsSet,
     S::UpdatedAt: sync_status_state::IsSet,
+    S::Hash: sync_status_state::IsSet,
+    S::CreatedAt: sync_status_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SyncStatus<'a> {
         SyncStatus {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            hash: self.__unsafe_private_named.1.unwrap(),
-            synced_with_at_repo: self.__unsafe_private_named.2.unwrap(),
-            updated_at: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            hash: self._fields.1.unwrap(),
+            synced_with_at_repo: self._fields.2.unwrap(),
+            updated_at: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -266,10 +265,10 @@ where
         >,
     ) -> SyncStatus<'a> {
         SyncStatus {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            hash: self.__unsafe_private_named.1.unwrap(),
-            synced_with_at_repo: self.__unsafe_private_named.2.unwrap(),
-            updated_at: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            hash: self._fields.1.unwrap(),
+            synced_with_at_repo: self._fields.2.unwrap(),
+            updated_at: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue__2048/game.rs b/crates/jacquard-api/src/blue__2048/game.rs
index e871fc68..f2f66996 100644
--- a/crates/jacquard-api/src/blue__2048/game.rs
+++ b/crates/jacquard-api/src/blue__2048/game.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -134,112 +137,112 @@ pub mod game_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CurrentScore;
-        type Completed;
         type Won;
+        type Completed;
+        type CurrentScore;
+        type CreatedAt;
         type SeededRecording;
         type SyncStatus;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CurrentScore = Unset;
-        type Completed = Unset;
         type Won = Unset;
+        type Completed = Unset;
+        type CurrentScore = Unset;
+        type CreatedAt = Unset;
         type SeededRecording = Unset;
         type SyncStatus = Unset;
-        type CreatedAt = Unset;
     }
-    ///State transition - sets the `current_score` field to Set
-    pub struct SetCurrentScore<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCurrentScore<S> {}
-    impl<S: State> State for SetCurrentScore<S> {
-        type CurrentScore = Set<members::current_score>;
+    ///State transition - sets the `won` field to Set
+    pub struct SetWon<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetWon<S> {}
+    impl<S: State> State for SetWon<S> {
+        type Won = Set<members::won>;
         type Completed = S::Completed;
-        type Won = S::Won;
+        type CurrentScore = S::CurrentScore;
+        type CreatedAt = S::CreatedAt;
         type SeededRecording = S::SeededRecording;
         type SyncStatus = S::SyncStatus;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `completed` field to Set
     pub struct SetCompleted<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCompleted<S> {}
     impl<S: State> State for SetCompleted<S> {
-        type CurrentScore = S::CurrentScore;
-        type Completed = Set<members::completed>;
         type Won = S::Won;
+        type Completed = Set<members::completed>;
+        type CurrentScore = S::CurrentScore;
+        type CreatedAt = S::CreatedAt;
         type SeededRecording = S::SeededRecording;
         type SyncStatus = S::SyncStatus;
+    }
+    ///State transition - sets the `current_score` field to Set
+    pub struct SetCurrentScore<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCurrentScore<S> {}
+    impl<S: State> State for SetCurrentScore<S> {
+        type Won = S::Won;
+        type Completed = S::Completed;
+        type CurrentScore = Set<members::current_score>;
         type CreatedAt = S::CreatedAt;
+        type SeededRecording = S::SeededRecording;
+        type SyncStatus = S::SyncStatus;
     }
-    ///State transition - sets the `won` field to Set
-    pub struct SetWon<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetWon<S> {}
-    impl<S: State> State for SetWon<S> {
-        type CurrentScore = S::CurrentScore;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Won = S::Won;
         type Completed = S::Completed;
-        type Won = Set<members::won>;
+        type CurrentScore = S::CurrentScore;
+        type CreatedAt = Set<members::created_at>;
         type SeededRecording = S::SeededRecording;
         type SyncStatus = S::SyncStatus;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `seeded_recording` field to Set
     pub struct SetSeededRecording<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSeededRecording<S> {}
     impl<S: State> State for SetSeededRecording<S> {
-        type CurrentScore = S::CurrentScore;
-        type Completed = S::Completed;
         type Won = S::Won;
+        type Completed = S::Completed;
+        type CurrentScore = S::CurrentScore;
+        type CreatedAt = S::CreatedAt;
         type SeededRecording = Set<members::seeded_recording>;
         type SyncStatus = S::SyncStatus;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `sync_status` field to Set
     pub struct SetSyncStatus<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSyncStatus<S> {}
     impl<S: State> State for SetSyncStatus<S> {
-        type CurrentScore = S::CurrentScore;
-        type Completed = S::Completed;
         type Won = S::Won;
-        type SeededRecording = S::SeededRecording;
-        type SyncStatus = Set<members::sync_status>;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CurrentScore = S::CurrentScore;
         type Completed = S::Completed;
-        type Won = S::Won;
+        type CurrentScore = S::CurrentScore;
+        type CreatedAt = S::CreatedAt;
         type SeededRecording = S::SeededRecording;
-        type SyncStatus = S::SyncStatus;
-        type CreatedAt = Set<members::created_at>;
+        type SyncStatus = Set<members::sync_status>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `current_score` field
-        pub struct current_score(());
-        ///Marker type for the `completed` field
-        pub struct completed(());
         ///Marker type for the `won` field
         pub struct won(());
+        ///Marker type for the `completed` field
+        pub struct completed(());
+        ///Marker type for the `current_score` field
+        pub struct current_score(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `seeded_recording` field
         pub struct seeded_recording(());
         ///Marker type for the `sync_status` field
         pub struct sync_status(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GameBuilder<'a, S: game_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<Datetime>,
         Option<i64>,
@@ -247,7 +250,7 @@ pub struct GameBuilder<'a, S: game_state::State> {
         Option<SyncStatus<'a>>,
         Option<bool>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Game<'a> {
@@ -261,9 +264,9 @@ impl<'a> GameBuilder<'a, game_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -278,11 +281,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> GameBuilder<'a, game_state::SetCompleted<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -297,11 +300,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> GameBuilder<'a, game_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -316,11 +319,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> GameBuilder<'a, game_state::SetCurrentScore<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -335,11 +338,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GameBuilder<'a, game_state::SetSeededRecording<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -354,11 +357,11 @@ where
         mut self,
         value: impl Into<SyncStatus<'a>>,
     ) -> GameBuilder<'a, game_state::SetSyncStatus<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -373,11 +376,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> GameBuilder<'a, game_state::SetWon<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -385,22 +388,22 @@ where
 impl<'a, S> GameBuilder<'a, S>
 where
     S: game_state::State,
-    S::CurrentScore: game_state::IsSet,
-    S::Completed: game_state::IsSet,
     S::Won: game_state::IsSet,
+    S::Completed: game_state::IsSet,
+    S::CurrentScore: game_state::IsSet,
+    S::CreatedAt: game_state::IsSet,
     S::SeededRecording: game_state::IsSet,
     S::SyncStatus: game_state::IsSet,
-    S::CreatedAt: game_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Game<'a> {
         Game {
-            completed: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            current_score: self.__unsafe_private_named.2.unwrap(),
-            seeded_recording: self.__unsafe_private_named.3.unwrap(),
-            sync_status: self.__unsafe_private_named.4.unwrap(),
-            won: self.__unsafe_private_named.5.unwrap(),
+            completed: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            current_score: self._fields.2.unwrap(),
+            seeded_recording: self._fields.3.unwrap(),
+            sync_status: self._fields.4.unwrap(),
+            won: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -413,12 +416,12 @@ where
         >,
     ) -> Game<'a> {
         Game {
-            completed: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            current_score: self.__unsafe_private_named.2.unwrap(),
-            seeded_recording: self.__unsafe_private_named.3.unwrap(),
-            sync_status: self.__unsafe_private_named.4.unwrap(),
-            won: self.__unsafe_private_named.5.unwrap(),
+            completed: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            current_score: self._fields.2.unwrap(),
+            seeded_recording: self._fields.3.unwrap(),
+            sync_status: self._fields.4.unwrap(),
+            won: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue__2048/key.rs b/crates/jacquard-api/src/blue__2048/key.rs
index f6d9f5aa..1997b0cf 100644
--- a/crates/jacquard-api/src/blue__2048/key.rs
+++ b/crates/jacquard-api/src/blue__2048/key.rs
@@ -8,7 +8,11 @@
 pub mod game;
 pub mod player;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -125,9 +129,9 @@ pub mod key_state {
 
 /// Builder for constructing an instance of this type
 pub struct KeyBuilder<'a, S: key_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Key<'a> {
@@ -141,9 +145,9 @@ impl<'a> KeyBuilder<'a, key_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         KeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -158,11 +162,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> KeyBuilder<'a, key_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         KeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -177,11 +181,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> KeyBuilder<'a, key_state::SetKey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         KeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -195,8 +199,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Key<'a> {
         Key {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            key: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -209,8 +213,8 @@ where
         >,
     ) -> Key<'a> {
         Key {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            key: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -383,9 +387,9 @@ pub mod signature_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct SignatureRefBuilder<'a, S: signature_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SignatureRef<'a> {
@@ -399,9 +403,9 @@ impl<'a> SignatureRefBuilder<'a, signature_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SignatureRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -416,11 +420,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureRefBuilder<'a, signature_ref_state::SetAtUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SignatureRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -435,11 +439,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SignatureRefBuilder<'a, signature_ref_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SignatureRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -454,11 +458,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureRefBuilder<'a, signature_ref_state::SetSignature<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SignatureRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -473,9 +477,9 @@ where
     /// Build the final struct
     pub fn build(self) -> SignatureRef<'a> {
         SignatureRef {
-            at_uri: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            signature: self.__unsafe_private_named.2.unwrap(),
+            at_uri: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            signature: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -488,9 +492,9 @@ where
         >,
     ) -> SignatureRef<'a> {
         SignatureRef {
-            at_uri: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            signature: self.__unsafe_private_named.2.unwrap(),
+            at_uri: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            signature: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue__2048/key/game.rs b/crates/jacquard-api/src/blue__2048/key/game.rs
index a4e3aa51..c560a730 100644
--- a/crates/jacquard-api/src/blue__2048/key/game.rs
+++ b/crates/jacquard-api/src/blue__2048/key/game.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,9 +149,9 @@ pub mod game_state {
 
 /// Builder for constructing an instance of this type
 pub struct GameBuilder<'a, S: game_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Key<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Key<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Game<'a> {
@@ -162,9 +165,9 @@ impl<'a> GameBuilder<'a, game_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> GameBuilder<'a, game_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<Key<'a>>,
     ) -> GameBuilder<'a, game_state::SetKey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,8 +219,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Game<'a> {
         Game {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            key: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Game<'a> {
         Game {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            key: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue__2048/key/player/stats.rs b/crates/jacquard-api/src/blue__2048/key/player/stats.rs
index b6f0161b..23701ca0 100644
--- a/crates/jacquard-api/src/blue__2048/key/player/stats.rs
+++ b/crates/jacquard-api/src/blue__2048/key/player/stats.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,9 +149,9 @@ pub mod stats_state {
 
 /// Builder for constructing an instance of this type
 pub struct StatsBuilder<'a, S: stats_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Key<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Key<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Stats<'a> {
@@ -162,9 +165,9 @@ impl<'a> StatsBuilder<'a, stats_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StatsBuilder<'a, stats_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<Key<'a>>,
     ) -> StatsBuilder<'a, stats_state::SetKey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,8 +219,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Stats<'a> {
         Stats {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            key: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Stats<'a> {
         Stats {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            key: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue__2048/player/profile.rs b/crates/jacquard-api/src/blue__2048/player/profile.rs
index 8ac90a31..3a444308 100644
--- a/crates/jacquard-api/src/blue__2048/player/profile.rs
+++ b/crates/jacquard-api/src/blue__2048/player/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -167,9 +170,9 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<bool>, Option<SyncStatus<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<bool>, Option<SyncStatus<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -183,9 +186,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,11 +203,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ProfileBuilder<'a, profile_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -219,11 +222,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ProfileBuilder<'a, profile_state::SetSoloPlay<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -238,11 +241,11 @@ where
         mut self,
         value: impl Into<SyncStatus<'a>>,
     ) -> ProfileBuilder<'a, profile_state::SetSyncStatus<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -257,9 +260,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            solo_play: self.__unsafe_private_named.1.unwrap(),
-            sync_status: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            solo_play: self._fields.1.unwrap(),
+            sync_status: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -272,9 +275,9 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            solo_play: self.__unsafe_private_named.1.unwrap(),
-            sync_status: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            solo_play: self._fields.1.unwrap(),
+            sync_status: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue__2048/player/stats.rs b/crates/jacquard-api/src/blue__2048/player/stats.rs
index e7f33e82..a3f55d97 100644
--- a/crates/jacquard-api/src/blue__2048/player/stats.rs
+++ b/crates/jacquard-api/src/blue__2048/player/stats.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -159,71 +162,43 @@ pub mod stats_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type GamesPlayed;
         type HighestNumberBlock;
-        type AverageScore;
         type LeastMovesToFindTwentyFortyEight;
-        type HighestScore;
-        type TimesTwentyFortyEightBeenFound;
-        type TotalScore;
         type CreatedAt;
+        type GamesPlayed;
         type SyncStatus;
+        type TimesTwentyFortyEightBeenFound;
+        type AverageScore;
+        type HighestScore;
+        type TotalScore;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type GamesPlayed = Unset;
         type HighestNumberBlock = Unset;
-        type AverageScore = Unset;
         type LeastMovesToFindTwentyFortyEight = Unset;
-        type HighestScore = Unset;
-        type TimesTwentyFortyEightBeenFound = Unset;
-        type TotalScore = Unset;
         type CreatedAt = Unset;
+        type GamesPlayed = Unset;
         type SyncStatus = Unset;
-    }
-    ///State transition - sets the `games_played` field to Set
-    pub struct SetGamesPlayed<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetGamesPlayed<S> {}
-    impl<S: State> State for SetGamesPlayed<S> {
-        type GamesPlayed = Set<members::games_played>;
-        type HighestNumberBlock = S::HighestNumberBlock;
-        type AverageScore = S::AverageScore;
-        type LeastMovesToFindTwentyFortyEight = S::LeastMovesToFindTwentyFortyEight;
-        type HighestScore = S::HighestScore;
-        type TimesTwentyFortyEightBeenFound = S::TimesTwentyFortyEightBeenFound;
-        type TotalScore = S::TotalScore;
-        type CreatedAt = S::CreatedAt;
-        type SyncStatus = S::SyncStatus;
+        type TimesTwentyFortyEightBeenFound = Unset;
+        type AverageScore = Unset;
+        type HighestScore = Unset;
+        type TotalScore = Unset;
     }
     ///State transition - sets the `highest_number_block` field to Set
     pub struct SetHighestNumberBlock<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHighestNumberBlock<S> {}
     impl<S: State> State for SetHighestNumberBlock<S> {
-        type GamesPlayed = S::GamesPlayed;
         type HighestNumberBlock = Set<members::highest_number_block>;
-        type AverageScore = S::AverageScore;
         type LeastMovesToFindTwentyFortyEight = S::LeastMovesToFindTwentyFortyEight;
-        type HighestScore = S::HighestScore;
-        type TimesTwentyFortyEightBeenFound = S::TimesTwentyFortyEightBeenFound;
-        type TotalScore = S::TotalScore;
         type CreatedAt = S::CreatedAt;
-        type SyncStatus = S::SyncStatus;
-    }
-    ///State transition - sets the `average_score` field to Set
-    pub struct SetAverageScore<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAverageScore<S> {}
-    impl<S: State> State for SetAverageScore<S> {
         type GamesPlayed = S::GamesPlayed;
-        type HighestNumberBlock = S::HighestNumberBlock;
-        type AverageScore = Set<members::average_score>;
-        type LeastMovesToFindTwentyFortyEight = S::LeastMovesToFindTwentyFortyEight;
-        type HighestScore = S::HighestScore;
+        type SyncStatus = S::SyncStatus;
         type TimesTwentyFortyEightBeenFound = S::TimesTwentyFortyEightBeenFound;
+        type AverageScore = S::AverageScore;
+        type HighestScore = S::HighestScore;
         type TotalScore = S::TotalScore;
-        type CreatedAt = S::CreatedAt;
-        type SyncStatus = S::SyncStatus;
     }
     ///State transition - sets the `least_moves_to_find_twenty_forty_eight` field to Set
     pub struct SetLeastMovesToFindTwentyFortyEight<S: State = Empty>(
@@ -231,31 +206,59 @@ pub mod stats_state {
     );
     impl<S: State> sealed::Sealed for SetLeastMovesToFindTwentyFortyEight<S> {}
     impl<S: State> State for SetLeastMovesToFindTwentyFortyEight<S> {
-        type GamesPlayed = S::GamesPlayed;
         type HighestNumberBlock = S::HighestNumberBlock;
-        type AverageScore = S::AverageScore;
         type LeastMovesToFindTwentyFortyEight = Set<
             members::least_moves_to_find_twenty_forty_eight,
         >;
+        type CreatedAt = S::CreatedAt;
+        type GamesPlayed = S::GamesPlayed;
+        type SyncStatus = S::SyncStatus;
+        type TimesTwentyFortyEightBeenFound = S::TimesTwentyFortyEightBeenFound;
+        type AverageScore = S::AverageScore;
         type HighestScore = S::HighestScore;
+        type TotalScore = S::TotalScore;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type HighestNumberBlock = S::HighestNumberBlock;
+        type LeastMovesToFindTwentyFortyEight = S::LeastMovesToFindTwentyFortyEight;
+        type CreatedAt = Set<members::created_at>;
+        type GamesPlayed = S::GamesPlayed;
+        type SyncStatus = S::SyncStatus;
         type TimesTwentyFortyEightBeenFound = S::TimesTwentyFortyEightBeenFound;
+        type AverageScore = S::AverageScore;
+        type HighestScore = S::HighestScore;
         type TotalScore = S::TotalScore;
+    }
+    ///State transition - sets the `games_played` field to Set
+    pub struct SetGamesPlayed<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetGamesPlayed<S> {}
+    impl<S: State> State for SetGamesPlayed<S> {
+        type HighestNumberBlock = S::HighestNumberBlock;
+        type LeastMovesToFindTwentyFortyEight = S::LeastMovesToFindTwentyFortyEight;
         type CreatedAt = S::CreatedAt;
+        type GamesPlayed = Set<members::games_played>;
         type SyncStatus = S::SyncStatus;
+        type TimesTwentyFortyEightBeenFound = S::TimesTwentyFortyEightBeenFound;
+        type AverageScore = S::AverageScore;
+        type HighestScore = S::HighestScore;
+        type TotalScore = S::TotalScore;
     }
-    ///State transition - sets the `highest_score` field to Set
-    pub struct SetHighestScore<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHighestScore<S> {}
-    impl<S: State> State for SetHighestScore<S> {
-        type GamesPlayed = S::GamesPlayed;
+    ///State transition - sets the `sync_status` field to Set
+    pub struct SetSyncStatus<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSyncStatus<S> {}
+    impl<S: State> State for SetSyncStatus<S> {
         type HighestNumberBlock = S::HighestNumberBlock;
-        type AverageScore = S::AverageScore;
         type LeastMovesToFindTwentyFortyEight = S::LeastMovesToFindTwentyFortyEight;
-        type HighestScore = Set<members::highest_score>;
+        type CreatedAt = S::CreatedAt;
+        type GamesPlayed = S::GamesPlayed;
+        type SyncStatus = Set<members::sync_status>;
         type TimesTwentyFortyEightBeenFound = S::TimesTwentyFortyEightBeenFound;
+        type AverageScore = S::AverageScore;
+        type HighestScore = S::HighestScore;
         type TotalScore = S::TotalScore;
-        type CreatedAt = S::CreatedAt;
-        type SyncStatus = S::SyncStatus;
     }
     ///State transition - sets the `times_twenty_forty_eight_been_found` field to Set
     pub struct SetTimesTwentyFortyEightBeenFound<S: State = Empty>(
@@ -263,88 +266,88 @@ pub mod stats_state {
     );
     impl<S: State> sealed::Sealed for SetTimesTwentyFortyEightBeenFound<S> {}
     impl<S: State> State for SetTimesTwentyFortyEightBeenFound<S> {
-        type GamesPlayed = S::GamesPlayed;
         type HighestNumberBlock = S::HighestNumberBlock;
-        type AverageScore = S::AverageScore;
         type LeastMovesToFindTwentyFortyEight = S::LeastMovesToFindTwentyFortyEight;
-        type HighestScore = S::HighestScore;
+        type CreatedAt = S::CreatedAt;
+        type GamesPlayed = S::GamesPlayed;
+        type SyncStatus = S::SyncStatus;
         type TimesTwentyFortyEightBeenFound = Set<
             members::times_twenty_forty_eight_been_found,
         >;
+        type AverageScore = S::AverageScore;
+        type HighestScore = S::HighestScore;
         type TotalScore = S::TotalScore;
-        type CreatedAt = S::CreatedAt;
-        type SyncStatus = S::SyncStatus;
     }
-    ///State transition - sets the `total_score` field to Set
-    pub struct SetTotalScore<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTotalScore<S> {}
-    impl<S: State> State for SetTotalScore<S> {
-        type GamesPlayed = S::GamesPlayed;
+    ///State transition - sets the `average_score` field to Set
+    pub struct SetAverageScore<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAverageScore<S> {}
+    impl<S: State> State for SetAverageScore<S> {
         type HighestNumberBlock = S::HighestNumberBlock;
-        type AverageScore = S::AverageScore;
         type LeastMovesToFindTwentyFortyEight = S::LeastMovesToFindTwentyFortyEight;
-        type HighestScore = S::HighestScore;
-        type TimesTwentyFortyEightBeenFound = S::TimesTwentyFortyEightBeenFound;
-        type TotalScore = Set<members::total_score>;
         type CreatedAt = S::CreatedAt;
+        type GamesPlayed = S::GamesPlayed;
         type SyncStatus = S::SyncStatus;
+        type TimesTwentyFortyEightBeenFound = S::TimesTwentyFortyEightBeenFound;
+        type AverageScore = Set<members::average_score>;
+        type HighestScore = S::HighestScore;
+        type TotalScore = S::TotalScore;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type GamesPlayed = S::GamesPlayed;
+    ///State transition - sets the `highest_score` field to Set
+    pub struct SetHighestScore<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHighestScore<S> {}
+    impl<S: State> State for SetHighestScore<S> {
         type HighestNumberBlock = S::HighestNumberBlock;
-        type AverageScore = S::AverageScore;
         type LeastMovesToFindTwentyFortyEight = S::LeastMovesToFindTwentyFortyEight;
-        type HighestScore = S::HighestScore;
+        type CreatedAt = S::CreatedAt;
+        type GamesPlayed = S::GamesPlayed;
+        type SyncStatus = S::SyncStatus;
         type TimesTwentyFortyEightBeenFound = S::TimesTwentyFortyEightBeenFound;
+        type AverageScore = S::AverageScore;
+        type HighestScore = Set<members::highest_score>;
         type TotalScore = S::TotalScore;
-        type CreatedAt = Set<members::created_at>;
-        type SyncStatus = S::SyncStatus;
     }
-    ///State transition - sets the `sync_status` field to Set
-    pub struct SetSyncStatus<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSyncStatus<S> {}
-    impl<S: State> State for SetSyncStatus<S> {
-        type GamesPlayed = S::GamesPlayed;
+    ///State transition - sets the `total_score` field to Set
+    pub struct SetTotalScore<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTotalScore<S> {}
+    impl<S: State> State for SetTotalScore<S> {
         type HighestNumberBlock = S::HighestNumberBlock;
-        type AverageScore = S::AverageScore;
         type LeastMovesToFindTwentyFortyEight = S::LeastMovesToFindTwentyFortyEight;
-        type HighestScore = S::HighestScore;
-        type TimesTwentyFortyEightBeenFound = S::TimesTwentyFortyEightBeenFound;
-        type TotalScore = S::TotalScore;
         type CreatedAt = S::CreatedAt;
-        type SyncStatus = Set<members::sync_status>;
+        type GamesPlayed = S::GamesPlayed;
+        type SyncStatus = S::SyncStatus;
+        type TimesTwentyFortyEightBeenFound = S::TimesTwentyFortyEightBeenFound;
+        type AverageScore = S::AverageScore;
+        type HighestScore = S::HighestScore;
+        type TotalScore = Set<members::total_score>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `games_played` field
-        pub struct games_played(());
         ///Marker type for the `highest_number_block` field
         pub struct highest_number_block(());
-        ///Marker type for the `average_score` field
-        pub struct average_score(());
         ///Marker type for the `least_moves_to_find_twenty_forty_eight` field
         pub struct least_moves_to_find_twenty_forty_eight(());
-        ///Marker type for the `highest_score` field
-        pub struct highest_score(());
-        ///Marker type for the `times_twenty_forty_eight_been_found` field
-        pub struct times_twenty_forty_eight_been_found(());
-        ///Marker type for the `total_score` field
-        pub struct total_score(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `games_played` field
+        pub struct games_played(());
         ///Marker type for the `sync_status` field
         pub struct sync_status(());
+        ///Marker type for the `times_twenty_forty_eight_been_found` field
+        pub struct times_twenty_forty_eight_been_found(());
+        ///Marker type for the `average_score` field
+        pub struct average_score(());
+        ///Marker type for the `highest_score` field
+        pub struct highest_score(());
+        ///Marker type for the `total_score` field
+        pub struct total_score(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct StatsBuilder<'a, S: stats_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<Datetime>,
         Option<i64>,
@@ -355,7 +358,7 @@ pub struct StatsBuilder<'a, S: stats_state::State> {
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Stats<'a> {
@@ -369,19 +372,9 @@ impl<'a> StatsBuilder<'a, stats_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -396,11 +389,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> StatsBuilder<'a, stats_state::SetAverageScore<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -415,11 +408,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StatsBuilder<'a, stats_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -434,11 +427,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> StatsBuilder<'a, stats_state::SetGamesPlayed<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -453,11 +446,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> StatsBuilder<'a, stats_state::SetHighestNumberBlock<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -472,11 +465,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> StatsBuilder<'a, stats_state::SetHighestScore<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -491,11 +484,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> StatsBuilder<'a, stats_state::SetLeastMovesToFindTwentyFortyEight<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -510,11 +503,11 @@ where
         mut self,
         value: impl Into<SyncStatus<'a>>,
     ) -> StatsBuilder<'a, stats_state::SetSyncStatus<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -529,11 +522,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> StatsBuilder<'a, stats_state::SetTimesTwentyFortyEightBeenFound<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -548,11 +541,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> StatsBuilder<'a, stats_state::SetTotalScore<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -560,31 +553,28 @@ where
 impl<'a, S> StatsBuilder<'a, S>
 where
     S: stats_state::State,
-    S::GamesPlayed: stats_state::IsSet,
     S::HighestNumberBlock: stats_state::IsSet,
-    S::AverageScore: stats_state::IsSet,
     S::LeastMovesToFindTwentyFortyEight: stats_state::IsSet,
-    S::HighestScore: stats_state::IsSet,
-    S::TimesTwentyFortyEightBeenFound: stats_state::IsSet,
-    S::TotalScore: stats_state::IsSet,
     S::CreatedAt: stats_state::IsSet,
+    S::GamesPlayed: stats_state::IsSet,
     S::SyncStatus: stats_state::IsSet,
+    S::TimesTwentyFortyEightBeenFound: stats_state::IsSet,
+    S::AverageScore: stats_state::IsSet,
+    S::HighestScore: stats_state::IsSet,
+    S::TotalScore: stats_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Stats<'a> {
         Stats {
-            average_score: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            games_played: self.__unsafe_private_named.2.unwrap(),
-            highest_number_block: self.__unsafe_private_named.3.unwrap(),
-            highest_score: self.__unsafe_private_named.4.unwrap(),
-            least_moves_to_find_twenty_forty_eight: self
-                .__unsafe_private_named
-                .5
-                .unwrap(),
-            sync_status: self.__unsafe_private_named.6.unwrap(),
-            times_twenty_forty_eight_been_found: self.__unsafe_private_named.7.unwrap(),
-            total_score: self.__unsafe_private_named.8.unwrap(),
+            average_score: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            games_played: self._fields.2.unwrap(),
+            highest_number_block: self._fields.3.unwrap(),
+            highest_score: self._fields.4.unwrap(),
+            least_moves_to_find_twenty_forty_eight: self._fields.5.unwrap(),
+            sync_status: self._fields.6.unwrap(),
+            times_twenty_forty_eight_been_found: self._fields.7.unwrap(),
+            total_score: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -597,18 +587,15 @@ where
         >,
     ) -> Stats<'a> {
         Stats {
-            average_score: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            games_played: self.__unsafe_private_named.2.unwrap(),
-            highest_number_block: self.__unsafe_private_named.3.unwrap(),
-            highest_score: self.__unsafe_private_named.4.unwrap(),
-            least_moves_to_find_twenty_forty_eight: self
-                .__unsafe_private_named
-                .5
-                .unwrap(),
-            sync_status: self.__unsafe_private_named.6.unwrap(),
-            times_twenty_forty_eight_been_found: self.__unsafe_private_named.7.unwrap(),
-            total_score: self.__unsafe_private_named.8.unwrap(),
+            average_score: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            games_played: self._fields.2.unwrap(),
+            highest_number_block: self._fields.3.unwrap(),
+            highest_score: self._fields.4.unwrap(),
+            least_moves_to_find_twenty_forty_eight: self._fields.5.unwrap(),
+            sync_status: self._fields.6.unwrap(),
+            times_twenty_forty_eight_been_found: self._fields.7.unwrap(),
+            total_score: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue__2048/verification.rs b/crates/jacquard-api/src/blue__2048/verification.rs
index fb0db5c7..9869208e 100644
--- a/crates/jacquard-api/src/blue__2048/verification.rs
+++ b/crates/jacquard-api/src/blue__2048/verification.rs
@@ -8,7 +8,11 @@
 pub mod game;
 pub mod stats;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -68,99 +72,99 @@ pub mod verification_ref_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type RecordRef;
         type Subject;
-        type CreatedAt;
-        type Signature;
         type KeyRef;
+        type RecordRef;
+        type Signature;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type RecordRef = Unset;
         type Subject = Unset;
-        type CreatedAt = Unset;
-        type Signature = Unset;
         type KeyRef = Unset;
-    }
-    ///State transition - sets the `record_ref` field to Set
-    pub struct SetRecordRef<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRecordRef<S> {}
-    impl<S: State> State for SetRecordRef<S> {
-        type RecordRef = Set<members::record_ref>;
-        type Subject = S::Subject;
-        type CreatedAt = S::CreatedAt;
-        type Signature = S::Signature;
-        type KeyRef = S::KeyRef;
+        type RecordRef = Unset;
+        type Signature = Unset;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type RecordRef = S::RecordRef;
         type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
-        type Signature = S::Signature;
         type KeyRef = S::KeyRef;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type RecordRef = S::RecordRef;
+        type Signature = S::Signature;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `key_ref` field to Set
+    pub struct SetKeyRef<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetKeyRef<S> {}
+    impl<S: State> State for SetKeyRef<S> {
         type Subject = S::Subject;
-        type CreatedAt = Set<members::created_at>;
+        type KeyRef = Set<members::key_ref>;
+        type RecordRef = S::RecordRef;
         type Signature = S::Signature;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `record_ref` field to Set
+    pub struct SetRecordRef<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRecordRef<S> {}
+    impl<S: State> State for SetRecordRef<S> {
+        type Subject = S::Subject;
         type KeyRef = S::KeyRef;
+        type RecordRef = Set<members::record_ref>;
+        type Signature = S::Signature;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `signature` field to Set
     pub struct SetSignature<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSignature<S> {}
     impl<S: State> State for SetSignature<S> {
-        type RecordRef = S::RecordRef;
         type Subject = S::Subject;
-        type CreatedAt = S::CreatedAt;
-        type Signature = Set<members::signature>;
         type KeyRef = S::KeyRef;
-    }
-    ///State transition - sets the `key_ref` field to Set
-    pub struct SetKeyRef<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetKeyRef<S> {}
-    impl<S: State> State for SetKeyRef<S> {
         type RecordRef = S::RecordRef;
-        type Subject = S::Subject;
+        type Signature = Set<members::signature>;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type KeyRef = S::KeyRef;
+        type RecordRef = S::RecordRef;
         type Signature = S::Signature;
-        type KeyRef = Set<members::key_ref>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `record_ref` field
-        pub struct record_ref(());
         ///Marker type for the `subject` field
         pub struct subject(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `signature` field
-        pub struct signature(());
         ///Marker type for the `key_ref` field
         pub struct key_ref(());
+        ///Marker type for the `record_ref` field
+        pub struct record_ref(());
+        ///Marker type for the `signature` field
+        pub struct signature(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct VerificationRefBuilder<'a, S: verification_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<AtUri<'a>>,
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
         Option<Did<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> VerificationRef<'a> {
@@ -174,9 +178,9 @@ impl<'a> VerificationRefBuilder<'a, verification_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VerificationRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -191,11 +195,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> VerificationRefBuilder<'a, verification_ref_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         VerificationRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,11 +214,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> VerificationRefBuilder<'a, verification_ref_state::SetKeyRef<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VerificationRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -229,11 +233,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> VerificationRefBuilder<'a, verification_ref_state::SetRecordRef<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         VerificationRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -248,11 +252,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> VerificationRefBuilder<'a, verification_ref_state::SetSignature<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         VerificationRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -267,11 +271,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> VerificationRefBuilder<'a, verification_ref_state::SetSubject<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         VerificationRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -279,20 +283,20 @@ where
 impl<'a, S> VerificationRefBuilder<'a, S>
 where
     S: verification_ref_state::State,
-    S::RecordRef: verification_ref_state::IsSet,
     S::Subject: verification_ref_state::IsSet,
-    S::CreatedAt: verification_ref_state::IsSet,
-    S::Signature: verification_ref_state::IsSet,
     S::KeyRef: verification_ref_state::IsSet,
+    S::RecordRef: verification_ref_state::IsSet,
+    S::Signature: verification_ref_state::IsSet,
+    S::CreatedAt: verification_ref_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> VerificationRef<'a> {
         VerificationRef {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            key_ref: self.__unsafe_private_named.1.unwrap(),
-            record_ref: self.__unsafe_private_named.2.unwrap(),
-            signature: self.__unsafe_private_named.3.unwrap(),
-            subject: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            key_ref: self._fields.1.unwrap(),
+            record_ref: self._fields.2.unwrap(),
+            signature: self._fields.3.unwrap(),
+            subject: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -305,11 +309,11 @@ where
         >,
     ) -> VerificationRef<'a> {
         VerificationRef {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            key_ref: self.__unsafe_private_named.1.unwrap(),
-            record_ref: self.__unsafe_private_named.2.unwrap(),
-            signature: self.__unsafe_private_named.3.unwrap(),
-            subject: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            key_ref: self._fields.1.unwrap(),
+            record_ref: self._fields.2.unwrap(),
+            signature: self._fields.3.unwrap(),
+            subject: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue__2048/verification/game.rs b/crates/jacquard-api/src/blue__2048/verification/game.rs
index d397b647..2333662c 100644
--- a/crates/jacquard-api/src/blue__2048/verification/game.rs
+++ b/crates/jacquard-api/src/blue__2048/verification/game.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -123,9 +126,9 @@ pub mod game_state {
 
 /// Builder for constructing an instance of this type
 pub struct GameBuilder<'a, S: game_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<VerificationRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<VerificationRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Game<'a> {
@@ -139,9 +142,9 @@ impl<'a> GameBuilder<'a, game_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,12 +152,12 @@ impl<'a> GameBuilder<'a, game_state::Empty> {
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -165,12 +168,12 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
         mut self,
         value: impl Into<Option<VerificationRef<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `verifiedRef` field to an Option value (optional)
     pub fn maybe_verified_ref(mut self, value: Option<VerificationRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -182,8 +185,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Game<'a> {
         Game {
-            created_at: self.__unsafe_private_named.0,
-            verified_ref: self.__unsafe_private_named.1,
+            created_at: self._fields.0,
+            verified_ref: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -196,8 +199,8 @@ where
         >,
     ) -> Game<'a> {
         Game {
-            created_at: self.__unsafe_private_named.0,
-            verified_ref: self.__unsafe_private_named.1,
+            created_at: self._fields.0,
+            verified_ref: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue__2048/verification/stats.rs b/crates/jacquard-api/src/blue__2048/verification/stats.rs
index 0a4da7a2..87fde145 100644
--- a/crates/jacquard-api/src/blue__2048/verification/stats.rs
+++ b/crates/jacquard-api/src/blue__2048/verification/stats.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -123,9 +126,9 @@ pub mod stats_state {
 
 /// Builder for constructing an instance of this type
 pub struct StatsBuilder<'a, S: stats_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<VerificationRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<VerificationRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Stats<'a> {
@@ -139,9 +142,9 @@ impl<'a> StatsBuilder<'a, stats_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,12 +152,12 @@ impl<'a> StatsBuilder<'a, stats_state::Empty> {
 impl<'a, S: stats_state::State> StatsBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -165,12 +168,12 @@ impl<'a, S: stats_state::State> StatsBuilder<'a, S> {
         mut self,
         value: impl Into<Option<VerificationRef<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `verifiedRef` field to an Option value (optional)
     pub fn maybe_verified_ref(mut self, value: Option<VerificationRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -182,8 +185,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Stats<'a> {
         Stats {
-            created_at: self.__unsafe_private_named.0,
-            verified_ref: self.__unsafe_private_named.1,
+            created_at: self._fields.0,
+            verified_ref: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -196,8 +199,8 @@ where
         >,
     ) -> Stats<'a> {
         Stats {
-            created_at: self.__unsafe_private_named.0,
-            verified_ref: self.__unsafe_private_named.1,
+            created_at: self._fields.0,
+            verified_ref: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_atplane/fav_client.rs b/crates/jacquard-api/src/blue_atplane/fav_client.rs
index 99cdcc99..f53ef3ad 100644
--- a/crates/jacquard-api/src/blue_atplane/fav_client.rs
+++ b/crates/jacquard-api/src/blue_atplane/fav_client.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -143,9 +146,9 @@ pub mod fav_client_state {
 
 /// Builder for constructing an instance of this type
 pub struct FavClientBuilder<'a, S: fav_client_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> FavClient<'a> {
@@ -159,9 +162,9 @@ impl<'a> FavClientBuilder<'a, fav_client_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FavClientBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -176,11 +179,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> FavClientBuilder<'a, fav_client_state::SetFavClient<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FavClientBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -193,7 +196,7 @@ where
     /// Build the final struct
     pub fn build(self) -> FavClient<'a> {
         FavClient {
-            fav_client: self.__unsafe_private_named.0.unwrap(),
+            fav_client: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -206,7 +209,7 @@ where
         >,
     ) -> FavClient<'a> {
         FavClient {
-            fav_client: self.__unsafe_private_named.0.unwrap(),
+            fav_client: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_atplay/score.rs b/crates/jacquard-api/src/blue_atplay/score.rs
index 49b93d70..c32154d3 100644
--- a/crates/jacquard-api/src/blue_atplay/score.rs
+++ b/crates/jacquard-api/src/blue_atplay/score.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -73,45 +76,45 @@ pub mod attestation_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Key;
         type Signature;
+        type Key;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Key = Unset;
         type Signature = Unset;
-    }
-    ///State transition - sets the `key` field to Set
-    pub struct SetKey<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetKey<S> {}
-    impl<S: State> State for SetKey<S> {
-        type Key = Set<members::key>;
-        type Signature = S::Signature;
+        type Key = Unset;
     }
     ///State transition - sets the `signature` field to Set
     pub struct SetSignature<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSignature<S> {}
     impl<S: State> State for SetSignature<S> {
-        type Key = S::Key;
         type Signature = Set<members::signature>;
+        type Key = S::Key;
+    }
+    ///State transition - sets the `key` field to Set
+    pub struct SetKey<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetKey<S> {}
+    impl<S: State> State for SetKey<S> {
+        type Signature = S::Signature;
+        type Key = Set<members::key>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `key` field
-        pub struct key(());
         ///Marker type for the `signature` field
         pub struct signature(());
+        ///Marker type for the `key` field
+        pub struct key(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AttestationBuilder<'a, S: attestation_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<Bytes>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<Bytes>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Attestation<'a> {
@@ -125,9 +128,9 @@ impl<'a> AttestationBuilder<'a, attestation_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AttestationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -135,12 +138,12 @@ impl<'a> AttestationBuilder<'a, attestation_state::Empty> {
 impl<'a, S: attestation_state::State> AttestationBuilder<'a, S> {
     /// Set the `attestedAt` field (optional)
     pub fn attested_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `attestedAt` field to an Option value (optional)
     pub fn maybe_attested_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -155,11 +158,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AttestationBuilder<'a, attestation_state::SetKey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AttestationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -174,11 +177,11 @@ where
         mut self,
         value: impl Into<Bytes>,
     ) -> AttestationBuilder<'a, attestation_state::SetSignature<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AttestationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -186,15 +189,15 @@ where
 impl<'a, S> AttestationBuilder<'a, S>
 where
     S: attestation_state::State,
-    S::Key: attestation_state::IsSet,
     S::Signature: attestation_state::IsSet,
+    S::Key: attestation_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Attestation<'a> {
         Attestation {
-            attested_at: self.__unsafe_private_named.0,
-            key: self.__unsafe_private_named.1.unwrap(),
-            signature: self.__unsafe_private_named.2.unwrap(),
+            attested_at: self._fields.0,
+            key: self._fields.1.unwrap(),
+            signature: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -207,9 +210,9 @@ where
         >,
     ) -> Attestation<'a> {
         Attestation {
-            attested_at: self.__unsafe_private_named.0,
-            key: self.__unsafe_private_named.1.unwrap(),
-            signature: self.__unsafe_private_named.2.unwrap(),
+            attested_at: self._fields.0,
+            key: self._fields.1.unwrap(),
+            signature: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_atroom/room/layout.rs b/crates/jacquard-api/src/blue_atroom/room/layout.rs
index 125a99b3..8061b436 100644
--- a/crates/jacquard-api/src/blue_atroom/room/layout.rs
+++ b/crates/jacquard-api/src/blue_atroom/room/layout.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -461,9 +464,9 @@ pub mod color_state {
 
 /// Builder for constructing an instance of this type
 pub struct ColorBuilder<'a, S: color_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Color<'a> {
@@ -477,9 +480,9 @@ impl<'a> ColorBuilder<'a, color_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ColorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -494,11 +497,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ColorBuilder<'a, color_state::SetBlue<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ColorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -513,11 +516,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ColorBuilder<'a, color_state::SetGreen<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ColorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -532,11 +535,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ColorBuilder<'a, color_state::SetRed<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ColorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -551,9 +554,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Color<'a> {
         Color {
-            blue: self.__unsafe_private_named.0.unwrap(),
-            green: self.__unsafe_private_named.1.unwrap(),
-            red: self.__unsafe_private_named.2.unwrap(),
+            blue: self._fields.0.unwrap(),
+            green: self._fields.1.unwrap(),
+            red: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -566,9 +569,9 @@ where
         >,
     ) -> Color<'a> {
         Color {
-            blue: self.__unsafe_private_named.0.unwrap(),
-            green: self.__unsafe_private_named.1.unwrap(),
-            red: self.__unsafe_private_named.2.unwrap(),
+            blue: self._fields.0.unwrap(),
+            green: self._fields.1.unwrap(),
+            red: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -889,9 +892,9 @@ pub mod floor_state {
 
 /// Builder for constructing an instance of this type
 pub struct FloorBuilder<'a, S: floor_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<layout::Surface<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<layout::Surface<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Floor<'a> {
@@ -905,9 +908,9 @@ impl<'a> FloorBuilder<'a, floor_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FloorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -922,11 +925,11 @@ where
         mut self,
         value: impl Into<layout::Surface<'a>>,
     ) -> FloorBuilder<'a, floor_state::SetSurface<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FloorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -939,7 +942,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Floor<'a> {
         Floor {
-            surface: self.__unsafe_private_named.0.unwrap(),
+            surface: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -952,7 +955,7 @@ where
         >,
     ) -> Floor<'a> {
         Floor {
-            surface: self.__unsafe_private_named.0.unwrap(),
+            surface: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -968,59 +971,59 @@ pub mod furnishing_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Object;
         type Rotation;
         type Position;
+        type Object;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Object = Unset;
         type Rotation = Unset;
         type Position = Unset;
-    }
-    ///State transition - sets the `object` field to Set
-    pub struct SetObject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetObject<S> {}
-    impl<S: State> State for SetObject<S> {
-        type Object = Set<members::object>;
-        type Rotation = S::Rotation;
-        type Position = S::Position;
+        type Object = Unset;
     }
     ///State transition - sets the `rotation` field to Set
     pub struct SetRotation<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRotation<S> {}
     impl<S: State> State for SetRotation<S> {
-        type Object = S::Object;
         type Rotation = Set<members::rotation>;
         type Position = S::Position;
+        type Object = S::Object;
     }
     ///State transition - sets the `position` field to Set
     pub struct SetPosition<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPosition<S> {}
     impl<S: State> State for SetPosition<S> {
-        type Object = S::Object;
         type Rotation = S::Rotation;
         type Position = Set<members::position>;
+        type Object = S::Object;
+    }
+    ///State transition - sets the `object` field to Set
+    pub struct SetObject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetObject<S> {}
+    impl<S: State> State for SetObject<S> {
+        type Rotation = S::Rotation;
+        type Position = S::Position;
+        type Object = Set<members::object>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `object` field
-        pub struct object(());
         ///Marker type for the `rotation` field
         pub struct rotation(());
         ///Marker type for the `position` field
         pub struct position(());
+        ///Marker type for the `object` field
+        pub struct object(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FurnishingBuilder<'a, S: furnishing_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>, Option<Vec<i64>>, Option<Vec<i64>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>, Option<Vec<i64>>, Option<Vec<i64>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Furnishing<'a> {
@@ -1034,9 +1037,9 @@ impl<'a> FurnishingBuilder<'a, furnishing_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FurnishingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1051,11 +1054,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> FurnishingBuilder<'a, furnishing_state::SetObject<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FurnishingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1070,11 +1073,11 @@ where
         mut self,
         value: impl Into<Vec<i64>>,
     ) -> FurnishingBuilder<'a, furnishing_state::SetPosition<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FurnishingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1089,11 +1092,11 @@ where
         mut self,
         value: impl Into<Vec<i64>>,
     ) -> FurnishingBuilder<'a, furnishing_state::SetRotation<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         FurnishingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1101,16 +1104,16 @@ where
 impl<'a, S> FurnishingBuilder<'a, S>
 where
     S: furnishing_state::State,
-    S::Object: furnishing_state::IsSet,
     S::Rotation: furnishing_state::IsSet,
     S::Position: furnishing_state::IsSet,
+    S::Object: furnishing_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Furnishing<'a> {
         Furnishing {
-            object: self.__unsafe_private_named.0.unwrap(),
-            position: self.__unsafe_private_named.1.unwrap(),
-            rotation: self.__unsafe_private_named.2.unwrap(),
+            object: self._fields.0.unwrap(),
+            position: self._fields.1.unwrap(),
+            rotation: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1123,9 +1126,9 @@ where
         >,
     ) -> Furnishing<'a> {
         Furnishing {
-            object: self.__unsafe_private_named.0.unwrap(),
-            position: self.__unsafe_private_named.1.unwrap(),
-            rotation: self.__unsafe_private_named.2.unwrap(),
+            object: self._fields.0.unwrap(),
+            position: self._fields.1.unwrap(),
+            rotation: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1141,99 +1144,99 @@ pub mod layout_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Wall;
         type Floor;
-        type Size;
         type Furnishings;
         type CreatedAt;
+        type Wall;
+        type Size;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Wall = Unset;
         type Floor = Unset;
-        type Size = Unset;
         type Furnishings = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `wall` field to Set
-    pub struct SetWall<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetWall<S> {}
-    impl<S: State> State for SetWall<S> {
-        type Wall = Set<members::wall>;
-        type Floor = S::Floor;
-        type Size = S::Size;
-        type Furnishings = S::Furnishings;
-        type CreatedAt = S::CreatedAt;
+        type Wall = Unset;
+        type Size = Unset;
     }
     ///State transition - sets the `floor` field to Set
     pub struct SetFloor<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetFloor<S> {}
     impl<S: State> State for SetFloor<S> {
-        type Wall = S::Wall;
         type Floor = Set<members::floor>;
-        type Size = S::Size;
         type Furnishings = S::Furnishings;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `size` field to Set
-    pub struct SetSize<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSize<S> {}
-    impl<S: State> State for SetSize<S> {
         type Wall = S::Wall;
-        type Floor = S::Floor;
-        type Size = Set<members::size>;
-        type Furnishings = S::Furnishings;
-        type CreatedAt = S::CreatedAt;
+        type Size = S::Size;
     }
     ///State transition - sets the `furnishings` field to Set
     pub struct SetFurnishings<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetFurnishings<S> {}
     impl<S: State> State for SetFurnishings<S> {
-        type Wall = S::Wall;
         type Floor = S::Floor;
-        type Size = S::Size;
         type Furnishings = Set<members::furnishings>;
         type CreatedAt = S::CreatedAt;
+        type Wall = S::Wall;
+        type Size = S::Size;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Floor = S::Floor;
+        type Furnishings = S::Furnishings;
+        type CreatedAt = Set<members::created_at>;
         type Wall = S::Wall;
+        type Size = S::Size;
+    }
+    ///State transition - sets the `wall` field to Set
+    pub struct SetWall<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetWall<S> {}
+    impl<S: State> State for SetWall<S> {
         type Floor = S::Floor;
+        type Furnishings = S::Furnishings;
+        type CreatedAt = S::CreatedAt;
+        type Wall = Set<members::wall>;
         type Size = S::Size;
+    }
+    ///State transition - sets the `size` field to Set
+    pub struct SetSize<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSize<S> {}
+    impl<S: State> State for SetSize<S> {
+        type Floor = S::Floor;
         type Furnishings = S::Furnishings;
-        type CreatedAt = Set<members::created_at>;
+        type CreatedAt = S::CreatedAt;
+        type Wall = S::Wall;
+        type Size = Set<members::size>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `wall` field
-        pub struct wall(());
         ///Marker type for the `floor` field
         pub struct floor(());
-        ///Marker type for the `size` field
-        pub struct size(());
         ///Marker type for the `furnishings` field
         pub struct furnishings(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `wall` field
+        pub struct wall(());
+        ///Marker type for the `size` field
+        pub struct size(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LayoutBuilder<'a, S: layout_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<layout::Floor<'a>>,
         Option<Vec<layout::Furnishing<'a>>>,
         Option<i64>,
         Option<layout::Wall<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Layout<'a> {
@@ -1247,9 +1250,9 @@ impl<'a> LayoutBuilder<'a, layout_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LayoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1264,11 +1267,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LayoutBuilder<'a, layout_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LayoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1283,11 +1286,11 @@ where
         mut self,
         value: impl Into<layout::Floor<'a>>,
     ) -> LayoutBuilder<'a, layout_state::SetFloor<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LayoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1302,11 +1305,11 @@ where
         mut self,
         value: impl Into<Vec<layout::Furnishing<'a>>>,
     ) -> LayoutBuilder<'a, layout_state::SetFurnishings<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LayoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1321,11 +1324,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> LayoutBuilder<'a, layout_state::SetSize<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LayoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1340,11 +1343,11 @@ where
         mut self,
         value: impl Into<layout::Wall<'a>>,
     ) -> LayoutBuilder<'a, layout_state::SetWall<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         LayoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1352,20 +1355,20 @@ where
 impl<'a, S> LayoutBuilder<'a, S>
 where
     S: layout_state::State,
-    S::Wall: layout_state::IsSet,
     S::Floor: layout_state::IsSet,
-    S::Size: layout_state::IsSet,
     S::Furnishings: layout_state::IsSet,
     S::CreatedAt: layout_state::IsSet,
+    S::Wall: layout_state::IsSet,
+    S::Size: layout_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Layout<'a> {
         Layout {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            floor: self.__unsafe_private_named.1.unwrap(),
-            furnishings: self.__unsafe_private_named.2.unwrap(),
-            size: self.__unsafe_private_named.3.unwrap(),
-            wall: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            floor: self._fields.1.unwrap(),
+            furnishings: self._fields.2.unwrap(),
+            size: self._fields.3.unwrap(),
+            wall: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1378,11 +1381,11 @@ where
         >,
     ) -> Layout<'a> {
         Layout {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            floor: self.__unsafe_private_named.1.unwrap(),
-            furnishings: self.__unsafe_private_named.2.unwrap(),
-            size: self.__unsafe_private_named.3.unwrap(),
-            wall: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            floor: self._fields.1.unwrap(),
+            furnishings: self._fields.2.unwrap(),
+            size: self._fields.3.unwrap(),
+            wall: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1422,13 +1425,9 @@ pub mod surface_state {
 
 /// Builder for constructing an instance of this type
 pub struct SurfaceBuilder<'a, S: surface_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<layout::Color<'a>>,
-        Option<CowStr<'a>>,
-        Option<Vec<i64>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<layout::Color<'a>>, Option<CowStr<'a>>, Option<Vec<i64>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Surface<'a> {
@@ -1442,9 +1441,9 @@ impl<'a> SurfaceBuilder<'a, surface_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SurfaceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1459,11 +1458,11 @@ where
         mut self,
         value: impl Into<layout::Color<'a>>,
     ) -> SurfaceBuilder<'a, surface_state::SetColor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SurfaceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1471,12 +1470,12 @@ where
 impl<'a, S: surface_state::State> SurfaceBuilder<'a, S> {
     /// Set the `texture` field (optional)
     pub fn texture(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `texture` field to an Option value (optional)
     pub fn maybe_texture(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1484,12 +1483,12 @@ impl<'a, S: surface_state::State> SurfaceBuilder<'a, S> {
 impl<'a, S: surface_state::State> SurfaceBuilder<'a, S> {
     /// Set the `textureTiling` field (optional)
     pub fn texture_tiling(mut self, value: impl Into<Option<Vec<i64>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `textureTiling` field to an Option value (optional)
     pub fn maybe_texture_tiling(mut self, value: Option<Vec<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1502,9 +1501,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Surface<'a> {
         Surface {
-            color: self.__unsafe_private_named.0.unwrap(),
-            texture: self.__unsafe_private_named.1,
-            texture_tiling: self.__unsafe_private_named.2,
+            color: self._fields.0.unwrap(),
+            texture: self._fields.1,
+            texture_tiling: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -1517,9 +1516,9 @@ where
         >,
     ) -> Surface<'a> {
         Surface {
-            color: self.__unsafe_private_named.0.unwrap(),
-            texture: self.__unsafe_private_named.1,
-            texture_tiling: self.__unsafe_private_named.2,
+            color: self._fields.0.unwrap(),
+            texture: self._fields.1,
+            texture_tiling: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -1535,59 +1534,59 @@ pub mod wall_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Height;
-        type Surface;
         type Thickness;
+        type Surface;
+        type Height;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Height = Unset;
-        type Surface = Unset;
         type Thickness = Unset;
+        type Surface = Unset;
+        type Height = Unset;
     }
-    ///State transition - sets the `height` field to Set
-    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHeight<S> {}
-    impl<S: State> State for SetHeight<S> {
-        type Height = Set<members::height>;
+    ///State transition - sets the `thickness` field to Set
+    pub struct SetThickness<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetThickness<S> {}
+    impl<S: State> State for SetThickness<S> {
+        type Thickness = Set<members::thickness>;
         type Surface = S::Surface;
-        type Thickness = S::Thickness;
+        type Height = S::Height;
     }
     ///State transition - sets the `surface` field to Set
     pub struct SetSurface<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSurface<S> {}
     impl<S: State> State for SetSurface<S> {
-        type Height = S::Height;
-        type Surface = Set<members::surface>;
         type Thickness = S::Thickness;
-    }
-    ///State transition - sets the `thickness` field to Set
-    pub struct SetThickness<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetThickness<S> {}
-    impl<S: State> State for SetThickness<S> {
+        type Surface = Set<members::surface>;
         type Height = S::Height;
+    }
+    ///State transition - sets the `height` field to Set
+    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHeight<S> {}
+    impl<S: State> State for SetHeight<S> {
+        type Thickness = S::Thickness;
         type Surface = S::Surface;
-        type Thickness = Set<members::thickness>;
+        type Height = Set<members::height>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `height` field
-        pub struct height(());
-        ///Marker type for the `surface` field
-        pub struct surface(());
         ///Marker type for the `thickness` field
         pub struct thickness(());
+        ///Marker type for the `surface` field
+        pub struct surface(());
+        ///Marker type for the `height` field
+        pub struct height(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct WallBuilder<'a, S: wall_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<layout::Surface<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<layout::Surface<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Wall<'a> {
@@ -1601,9 +1600,9 @@ impl<'a> WallBuilder<'a, wall_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WallBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1618,11 +1617,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> WallBuilder<'a, wall_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         WallBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1637,11 +1636,11 @@ where
         mut self,
         value: impl Into<layout::Surface<'a>>,
     ) -> WallBuilder<'a, wall_state::SetSurface<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         WallBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1656,11 +1655,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> WallBuilder<'a, wall_state::SetThickness<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         WallBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1668,16 +1667,16 @@ where
 impl<'a, S> WallBuilder<'a, S>
 where
     S: wall_state::State,
-    S::Height: wall_state::IsSet,
-    S::Surface: wall_state::IsSet,
     S::Thickness: wall_state::IsSet,
+    S::Surface: wall_state::IsSet,
+    S::Height: wall_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Wall<'a> {
         Wall {
-            height: self.__unsafe_private_named.0.unwrap(),
-            surface: self.__unsafe_private_named.1.unwrap(),
-            thickness: self.__unsafe_private_named.2.unwrap(),
+            height: self._fields.0.unwrap(),
+            surface: self._fields.1.unwrap(),
+            thickness: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1690,9 +1689,9 @@ where
         >,
     ) -> Wall<'a> {
         Wall {
-            height: self.__unsafe_private_named.0.unwrap(),
-            surface: self.__unsafe_private_named.1.unwrap(),
-            thickness: self.__unsafe_private_named.2.unwrap(),
+            height: self._fields.0.unwrap(),
+            surface: self._fields.1.unwrap(),
+            thickness: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_atroom/room/object.rs b/crates/jacquard-api/src/blue_atroom/room/object.rs
index 00be8c54..a9a17336 100644
--- a/crates/jacquard-api/src/blue_atroom/room/object.rs
+++ b/crates/jacquard-api/src/blue_atroom/room/object.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -342,8 +345,8 @@ pub mod object_state {
     pub trait State: sealed::Sealed {
         type Scale;
         type Name;
-        type Model;
         type CreatedAt;
+        type Model;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
@@ -351,8 +354,8 @@ pub mod object_state {
     impl State for Empty {
         type Scale = Unset;
         type Name = Unset;
-        type Model = Unset;
         type CreatedAt = Unset;
+        type Model = Unset;
     }
     ///State transition - sets the `scale` field to Set
     pub struct SetScale<S: State = Empty>(PhantomData<fn() -> S>);
@@ -360,8 +363,8 @@ pub mod object_state {
     impl<S: State> State for SetScale<S> {
         type Scale = Set<members::scale>;
         type Name = S::Name;
-        type Model = S::Model;
         type CreatedAt = S::CreatedAt;
+        type Model = S::Model;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
@@ -369,17 +372,8 @@ pub mod object_state {
     impl<S: State> State for SetName<S> {
         type Scale = S::Scale;
         type Name = Set<members::name>;
-        type Model = S::Model;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `model` field to Set
-    pub struct SetModel<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetModel<S> {}
-    impl<S: State> State for SetModel<S> {
-        type Scale = S::Scale;
-        type Name = S::Name;
-        type Model = Set<members::model>;
         type CreatedAt = S::CreatedAt;
+        type Model = S::Model;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
@@ -387,8 +381,17 @@ pub mod object_state {
     impl<S: State> State for SetCreatedAt<S> {
         type Scale = S::Scale;
         type Name = S::Name;
-        type Model = S::Model;
         type CreatedAt = Set<members::created_at>;
+        type Model = S::Model;
+    }
+    ///State transition - sets the `model` field to Set
+    pub struct SetModel<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetModel<S> {}
+    impl<S: State> State for SetModel<S> {
+        type Scale = S::Scale;
+        type Name = S::Name;
+        type CreatedAt = S::CreatedAt;
+        type Model = Set<members::model>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
@@ -397,24 +400,24 @@ pub mod object_state {
         pub struct scale(());
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `model` field
-        pub struct model(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `model` field
+        pub struct model(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ObjectBuilder<'a, S: object_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<Vec<object::LocalizedName<'a>>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Object<'a> {
@@ -428,9 +431,9 @@ impl<'a> ObjectBuilder<'a, object_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ObjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -445,11 +448,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ObjectBuilder<'a, object_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ObjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -464,11 +467,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ObjectBuilder<'a, object_state::SetModel<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ObjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -483,11 +486,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ObjectBuilder<'a, object_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ObjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -498,7 +501,7 @@ impl<'a, S: object_state::State> ObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<object::LocalizedName<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `nameLangs` field to an Option value (optional)
@@ -506,7 +509,7 @@ impl<'a, S: object_state::State> ObjectBuilder<'a, S> {
         mut self,
         value: Option<Vec<object::LocalizedName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -521,11 +524,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ObjectBuilder<'a, object_state::SetScale<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ObjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -535,17 +538,17 @@ where
     S: object_state::State,
     S::Scale: object_state::IsSet,
     S::Name: object_state::IsSet,
-    S::Model: object_state::IsSet,
     S::CreatedAt: object_state::IsSet,
+    S::Model: object_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Object<'a> {
         Object {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            model: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            name_langs: self.__unsafe_private_named.3,
-            scale: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            model: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            name_langs: self._fields.3,
+            scale: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -558,11 +561,11 @@ where
         >,
     ) -> Object<'a> {
         Object {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            model: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            name_langs: self.__unsafe_private_named.3,
-            scale: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            model: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            name_langs: self._fields.3,
+            scale: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_backyard/actor/profile.rs b/crates/jacquard-api/src/blue_backyard/actor/profile.rs
index 3f796bf7..9ff2543e 100644
--- a/crates/jacquard-api/src/blue_backyard/actor/profile.rs
+++ b/crates/jacquard-api/src/blue_backyard/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -286,8 +289,8 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<BlobRef<'a>>,
         Option<Datetime>,
@@ -295,7 +298,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -309,9 +312,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -319,12 +322,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -332,12 +335,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -345,12 +348,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -358,12 +361,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -371,12 +374,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -384,12 +387,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `pronouns` field (optional)
     pub fn pronouns(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `pronouns` field to an Option value (optional)
     pub fn maybe_pronouns(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -401,12 +404,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4,
-            pronouns: self.__unsafe_private_named.5,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            created_at: self._fields.2,
+            description: self._fields.3,
+            display_name: self._fields.4,
+            pronouns: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -419,12 +422,12 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4,
-            pronouns: self.__unsafe_private_named.5,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            created_at: self._fields.2,
+            description: self._fields.3,
+            display_name: self._fields.4,
+            pronouns: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_backyard/feed/comment.rs b/crates/jacquard-api/src/blue_backyard/feed/comment.rs
index 286cd8eb..2d5cc049 100644
--- a/crates/jacquard-api/src/blue_backyard/feed/comment.rs
+++ b/crates/jacquard-api/src/blue_backyard/feed/comment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -149,74 +152,74 @@ pub mod comment_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
+        type Text;
         type Root;
+        type Subject;
         type CreatedAt;
-        type Text;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
+        type Text = Unset;
         type Root = Unset;
+        type Subject = Unset;
         type CreatedAt = Unset;
-        type Text = Unset;
     }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
+    ///State transition - sets the `text` field to Set
+    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetText<S> {}
+    impl<S: State> State for SetText<S> {
+        type Text = Set<members::text>;
         type Root = S::Root;
+        type Subject = S::Subject;
         type CreatedAt = S::CreatedAt;
-        type Text = S::Text;
     }
     ///State transition - sets the `root` field to Set
     pub struct SetRoot<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRoot<S> {}
     impl<S: State> State for SetRoot<S> {
-        type Subject = S::Subject;
+        type Text = S::Text;
         type Root = Set<members::root>;
+        type Subject = S::Subject;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
         type Text = S::Text;
+        type Root = S::Root;
+        type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
-        type Root = S::Root;
-        type CreatedAt = Set<members::created_at>;
         type Text = S::Text;
-    }
-    ///State transition - sets the `text` field to Set
-    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetText<S> {}
-    impl<S: State> State for SetText<S> {
-        type Subject = S::Subject;
         type Root = S::Root;
-        type CreatedAt = S::CreatedAt;
-        type Text = Set<members::text>;
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
+        ///Marker type for the `text` field
+        pub struct text(());
         ///Marker type for the `root` field
         pub struct root(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `text` field
-        pub struct text(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CommentBuilder<'a, S: comment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Vec<Facet<'a>>>,
         Option<StrongRef<'a>>,
@@ -224,7 +227,7 @@ pub struct CommentBuilder<'a, S: comment_state::State> {
         Option<StrongRef<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Comment<'a> {
@@ -238,9 +241,9 @@ impl<'a> CommentBuilder<'a, comment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -255,11 +258,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CommentBuilder<'a, comment_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -267,12 +270,12 @@ where
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -280,12 +283,12 @@ impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -300,11 +303,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetRoot<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -319,11 +322,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetSubject<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -338,11 +341,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetText<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -350,20 +353,20 @@ where
 impl<'a, S> CommentBuilder<'a, S>
 where
     S: comment_state::State,
-    S::Subject: comment_state::IsSet,
+    S::Text: comment_state::IsSet,
     S::Root: comment_state::IsSet,
+    S::Subject: comment_state::IsSet,
     S::CreatedAt: comment_state::IsSet,
-    S::Text: comment_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Comment<'a> {
         Comment {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            facets: self.__unsafe_private_named.1,
-            parent: self.__unsafe_private_named.2,
-            root: self.__unsafe_private_named.3.unwrap(),
-            subject: self.__unsafe_private_named.4.unwrap(),
-            text: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            facets: self._fields.1,
+            parent: self._fields.2,
+            root: self._fields.3.unwrap(),
+            subject: self._fields.4.unwrap(),
+            text: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -376,12 +379,12 @@ where
         >,
     ) -> Comment<'a> {
         Comment {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            facets: self.__unsafe_private_named.1,
-            parent: self.__unsafe_private_named.2,
-            root: self.__unsafe_private_named.3.unwrap(),
-            subject: self.__unsafe_private_named.4.unwrap(),
-            text: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            facets: self._fields.1,
+            parent: self._fields.2,
+            root: self._fields.3.unwrap(),
+            subject: self._fields.4.unwrap(),
+            text: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_backyard/feed/like.rs b/crates/jacquard-api/src/blue_backyard/feed/like.rs
index 68a95bdc..80d4d47d 100644
--- a/crates/jacquard-api/src/blue_backyard/feed/like.rs
+++ b/crates/jacquard-api/src/blue_backyard/feed/like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -110,45 +113,45 @@ pub mod like_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subject;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subject = S::Subject;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -162,9 +165,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,14 +213,14 @@ where
 impl<'a, S> LikeBuilder<'a, S>
 where
     S: like_state::State,
-    S::CreatedAt: like_state::IsSet,
     S::Subject: like_state::IsSet,
+    S::CreatedAt: like_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_backyard/feed/post.rs b/crates/jacquard-api/src/blue_backyard/feed/post.rs
index b41a6c08..7191961d 100644
--- a/crates/jacquard-api/src/blue_backyard/feed/post.rs
+++ b/crates/jacquard-api/src/blue_backyard/feed/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -457,9 +460,9 @@ pub mod aspect_ratio_state {
 
 /// Builder for constructing an instance of this type
 pub struct AspectRatioBuilder<'a, S: aspect_ratio_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AspectRatio<'a> {
@@ -473,9 +476,9 @@ impl<'a> AspectRatioBuilder<'a, aspect_ratio_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -490,11 +493,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -509,11 +512,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetWidth<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -527,8 +530,8 @@ where
     /// Build the final struct
     pub fn build(self) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -541,8 +544,8 @@ where
         >,
     ) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -833,9 +836,9 @@ pub mod embed_block_state {
 
 /// Builder for constructing an instance of this type
 pub struct EmbedBlockBuilder<'a, S: embed_block_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> EmbedBlock<'a> {
@@ -849,9 +852,9 @@ impl<'a> EmbedBlockBuilder<'a, embed_block_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EmbedBlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -866,11 +869,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> EmbedBlockBuilder<'a, embed_block_state::SetUrl<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EmbedBlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -883,7 +886,7 @@ where
     /// Build the final struct
     pub fn build(self) -> EmbedBlock<'a> {
         EmbedBlock {
-            url: self.__unsafe_private_named.0.unwrap(),
+            url: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -896,7 +899,7 @@ where
         >,
     ) -> EmbedBlock<'a> {
         EmbedBlock {
-            url: self.__unsafe_private_named.0.unwrap(),
+            url: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -912,50 +915,50 @@ pub mod image_block_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Blob;
         type MimeType;
+        type Blob;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Blob = Unset;
         type MimeType = Unset;
-    }
-    ///State transition - sets the `blob` field to Set
-    pub struct SetBlob<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBlob<S> {}
-    impl<S: State> State for SetBlob<S> {
-        type Blob = Set<members::blob>;
-        type MimeType = S::MimeType;
+        type Blob = Unset;
     }
     ///State transition - sets the `mime_type` field to Set
     pub struct SetMimeType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMimeType<S> {}
     impl<S: State> State for SetMimeType<S> {
-        type Blob = S::Blob;
         type MimeType = Set<members::mime_type>;
+        type Blob = S::Blob;
+    }
+    ///State transition - sets the `blob` field to Set
+    pub struct SetBlob<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBlob<S> {}
+    impl<S: State> State for SetBlob<S> {
+        type MimeType = S::MimeType;
+        type Blob = Set<members::blob>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `blob` field
-        pub struct blob(());
         ///Marker type for the `mime_type` field
         pub struct mime_type(());
+        ///Marker type for the `blob` field
+        pub struct blob(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ImageBlockBuilder<'a, S: image_block_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<post::AspectRatio<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ImageBlock<'a> {
@@ -969,9 +972,9 @@ impl<'a> ImageBlockBuilder<'a, image_block_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageBlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -979,12 +982,12 @@ impl<'a> ImageBlockBuilder<'a, image_block_state::Empty> {
 impl<'a, S: image_block_state::State> ImageBlockBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -995,12 +998,12 @@ impl<'a, S: image_block_state::State> ImageBlockBuilder<'a, S> {
         mut self,
         value: impl Into<Option<post::AspectRatio<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
     pub fn maybe_aspect_ratio(mut self, value: Option<post::AspectRatio<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1015,11 +1018,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ImageBlockBuilder<'a, image_block_state::SetBlob<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ImageBlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1034,11 +1037,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ImageBlockBuilder<'a, image_block_state::SetMimeType<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ImageBlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1046,16 +1049,16 @@ where
 impl<'a, S> ImageBlockBuilder<'a, S>
 where
     S: image_block_state::State,
-    S::Blob: image_block_state::IsSet,
     S::MimeType: image_block_state::IsSet,
+    S::Blob: image_block_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ImageBlock<'a> {
         ImageBlock {
-            alt: self.__unsafe_private_named.0,
-            aspect_ratio: self.__unsafe_private_named.1,
-            blob: self.__unsafe_private_named.2.unwrap(),
-            mime_type: self.__unsafe_private_named.3.unwrap(),
+            alt: self._fields.0,
+            aspect_ratio: self._fields.1,
+            blob: self._fields.2.unwrap(),
+            mime_type: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1068,10 +1071,10 @@ where
         >,
     ) -> ImageBlock<'a> {
         ImageBlock {
-            alt: self.__unsafe_private_named.0,
-            aspect_ratio: self.__unsafe_private_named.1,
-            blob: self.__unsafe_private_named.2.unwrap(),
-            mime_type: self.__unsafe_private_named.3.unwrap(),
+            alt: self._fields.0,
+            aspect_ratio: self._fields.1,
+            blob: self._fields.2.unwrap(),
+            mime_type: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1123,14 +1126,14 @@ pub mod post_state {
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<PostContentItem<'a>>>,
         Option<Datetime>,
         Option<Vec<Language>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -1144,9 +1147,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1161,11 +1164,11 @@ where
         mut self,
         value: impl Into<Vec<PostContentItem<'a>>>,
     ) -> PostBuilder<'a, post_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1180,11 +1183,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1192,12 +1195,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `langs` field (optional)
     pub fn langs(mut self, value: impl Into<Option<Vec<Language>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `langs` field to an Option value (optional)
     pub fn maybe_langs(mut self, value: Option<Vec<Language>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1205,12 +1208,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1224,10 +1227,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            langs: self.__unsafe_private_named.2,
-            tags: self.__unsafe_private_named.3,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            langs: self._fields.2,
+            tags: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -1240,10 +1243,10 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            langs: self.__unsafe_private_named.2,
-            tags: self.__unsafe_private_named.3,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            langs: self._fields.2,
+            tags: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_backyard/feed/reblog.rs b/crates/jacquard-api/src/blue_backyard/feed/reblog.rs
index 6065a85c..4eb07fa4 100644
--- a/crates/jacquard-api/src/blue_backyard/feed/reblog.rs
+++ b/crates/jacquard-api/src/blue_backyard/feed/reblog.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -155,50 +158,50 @@ pub mod reblog_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subject;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subject = S::Subject;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReblogBuilder<'a, S: reblog_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<ReblogContentItem<'a>>>,
         Option<Datetime>,
         Option<StrongRef<'a>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Reblog<'a> {
@@ -212,9 +215,9 @@ impl<'a> ReblogBuilder<'a, reblog_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReblogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -225,12 +228,12 @@ impl<'a, S: reblog_state::State> ReblogBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<ReblogContentItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `content` field to an Option value (optional)
     pub fn maybe_content(mut self, value: Option<Vec<ReblogContentItem<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -245,11 +248,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReblogBuilder<'a, reblog_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReblogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -264,11 +267,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ReblogBuilder<'a, reblog_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReblogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -276,12 +279,12 @@ where
 impl<'a, S: reblog_state::State> ReblogBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -289,16 +292,16 @@ impl<'a, S: reblog_state::State> ReblogBuilder<'a, S> {
 impl<'a, S> ReblogBuilder<'a, S>
 where
     S: reblog_state::State,
-    S::CreatedAt: reblog_state::IsSet,
     S::Subject: reblog_state::IsSet,
+    S::CreatedAt: reblog_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Reblog<'a> {
         Reblog {
-            content: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
-            tags: self.__unsafe_private_named.3,
+            content: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
+            tags: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -311,10 +314,10 @@ where
         >,
     ) -> Reblog<'a> {
         Reblog {
-            content: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
-            tags: self.__unsafe_private_named.3,
+            content: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
+            tags: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_backyard/graph/block.rs b/crates/jacquard-api/src/blue_backyard/graph/block.rs
index cc8d2972..d2fc6c6d 100644
--- a/crates/jacquard-api/src/blue_backyard/graph/block.rs
+++ b/crates/jacquard-api/src/blue_backyard/graph/block.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -109,45 +112,45 @@ pub mod block_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subject;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subject = S::Subject;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BlockBuilder<'a, S: block_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Block<'a> {
@@ -161,9 +164,9 @@ impl<'a> BlockBuilder<'a, block_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BlockBuilder<'a, block_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> BlockBuilder<'a, block_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,14 +212,14 @@ where
 impl<'a, S> BlockBuilder<'a, S>
 where
     S: block_state::State,
-    S::CreatedAt: block_state::IsSet,
     S::Subject: block_state::IsSet,
+    S::CreatedAt: block_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Block<'a> {
         Block {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -229,8 +232,8 @@ where
         >,
     ) -> Block<'a> {
         Block {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_backyard/graph/follow.rs b/crates/jacquard-api/src/blue_backyard/graph/follow.rs
index e37845f4..b5238514 100644
--- a/crates/jacquard-api/src/blue_backyard/graph/follow.rs
+++ b/crates/jacquard-api/src/blue_backyard/graph/follow.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -109,45 +112,45 @@ pub mod follow_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subject;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subject = S::Subject;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FollowBuilder<'a, S: follow_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Follow<'a> {
@@ -161,9 +164,9 @@ impl<'a> FollowBuilder<'a, follow_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FollowBuilder<'a, follow_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> FollowBuilder<'a, follow_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,14 +212,14 @@ where
 impl<'a, S> FollowBuilder<'a, S>
 where
     S: follow_state::State,
-    S::CreatedAt: follow_state::IsSet,
     S::Subject: follow_state::IsSet,
+    S::CreatedAt: follow_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -229,8 +232,8 @@ where
         >,
     ) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_backyard/richtext/facet.rs b/crates/jacquard-api/src/blue_backyard/richtext/facet.rs
index fbf5f382..643228f2 100644
--- a/crates/jacquard-api/src/blue_backyard/richtext/facet.rs
+++ b/crates/jacquard-api/src/blue_backyard/richtext/facet.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -542,45 +545,45 @@ pub mod byte_slice_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ByteStart;
         type ByteEnd;
+        type ByteStart;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ByteStart = Unset;
         type ByteEnd = Unset;
-    }
-    ///State transition - sets the `byte_start` field to Set
-    pub struct SetByteStart<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetByteStart<S> {}
-    impl<S: State> State for SetByteStart<S> {
-        type ByteStart = Set<members::byte_start>;
-        type ByteEnd = S::ByteEnd;
+        type ByteStart = Unset;
     }
     ///State transition - sets the `byte_end` field to Set
     pub struct SetByteEnd<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetByteEnd<S> {}
     impl<S: State> State for SetByteEnd<S> {
-        type ByteStart = S::ByteStart;
         type ByteEnd = Set<members::byte_end>;
+        type ByteStart = S::ByteStart;
+    }
+    ///State transition - sets the `byte_start` field to Set
+    pub struct SetByteStart<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetByteStart<S> {}
+    impl<S: State> State for SetByteStart<S> {
+        type ByteEnd = S::ByteEnd;
+        type ByteStart = Set<members::byte_start>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `byte_start` field
-        pub struct byte_start(());
         ///Marker type for the `byte_end` field
         pub struct byte_end(());
+        ///Marker type for the `byte_start` field
+        pub struct byte_start(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ByteSliceBuilder<'a, S: byte_slice_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ByteSlice<'a> {
@@ -594,9 +597,9 @@ impl<'a> ByteSliceBuilder<'a, byte_slice_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -611,11 +614,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteEnd<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -630,11 +633,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteStart<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -642,14 +645,14 @@ where
 impl<'a, S> ByteSliceBuilder<'a, S>
 where
     S: byte_slice_state::State,
-    S::ByteStart: byte_slice_state::IsSet,
     S::ByteEnd: byte_slice_state::IsSet,
+    S::ByteStart: byte_slice_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -662,8 +665,8 @@ where
         >,
     ) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -703,9 +706,9 @@ pub mod link_state {
 
 /// Builder for constructing an instance of this type
 pub struct LinkBuilder<'a, S: link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Link<'a> {
@@ -719,9 +722,9 @@ impl<'a> LinkBuilder<'a, link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -736,11 +739,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LinkBuilder<'a, link_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -753,7 +756,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Link<'a> {
         Link {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -766,7 +769,7 @@ where
         >,
     ) -> Link<'a> {
         Link {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -818,12 +821,9 @@ pub mod facet_state {
 
 /// Builder for constructing an instance of this type
 pub struct FacetBuilder<'a, S: facet_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<FacetFeaturesItem<'a>>>,
-        Option<facet::ByteSlice<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<FacetFeaturesItem<'a>>>, Option<facet::ByteSlice<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Facet<'a> {
@@ -837,9 +837,9 @@ impl<'a> FacetBuilder<'a, facet_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -854,11 +854,11 @@ where
         mut self,
         value: impl Into<Vec<FacetFeaturesItem<'a>>>,
     ) -> FacetBuilder<'a, facet_state::SetFeatures<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -873,11 +873,11 @@ where
         mut self,
         value: impl Into<facet::ByteSlice<'a>>,
     ) -> FacetBuilder<'a, facet_state::SetIndex<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -891,8 +891,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -905,8 +905,8 @@ where
         >,
     ) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -946,9 +946,9 @@ pub mod mention_state {
 
 /// Builder for constructing an instance of this type
 pub struct MentionBuilder<'a, S: mention_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Mention<'a> {
@@ -962,9 +962,9 @@ impl<'a> MentionBuilder<'a, mention_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -979,11 +979,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MentionBuilder<'a, mention_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -996,7 +996,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Mention<'a> {
         Mention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1009,7 +1009,7 @@ where
         >,
     ) -> Mention<'a> {
         Mention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_linkat/board.rs b/crates/jacquard-api/src/blue_linkat/board.rs
index cdceb80e..19df9fec 100644
--- a/crates/jacquard-api/src/blue_linkat/board.rs
+++ b/crates/jacquard-api/src/blue_linkat/board.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -247,9 +250,9 @@ pub mod board_state {
 
 /// Builder for constructing an instance of this type
 pub struct BoardBuilder<'a, S: board_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<board::Card<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<board::Card<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Board<'a> {
@@ -263,9 +266,9 @@ impl<'a> BoardBuilder<'a, board_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BoardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -280,11 +283,11 @@ where
         mut self,
         value: impl Into<Vec<board::Card<'a>>>,
     ) -> BoardBuilder<'a, board_state::SetCards<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BoardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -297,7 +300,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Board<'a> {
         Board {
-            cards: self.__unsafe_private_named.0.unwrap(),
+            cards: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -310,7 +313,7 @@ where
         >,
     ) -> Board<'a> {
         Board {
-            cards: self.__unsafe_private_named.0.unwrap(),
+            cards: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_recipes/actor.rs b/crates/jacquard-api/src/blue_recipes/actor.rs
index ba531136..104c2820 100644
--- a/crates/jacquard-api/src/blue_recipes/actor.rs
+++ b/crates/jacquard-api/src/blue_recipes/actor.rs
@@ -7,7 +7,11 @@
 
 pub mod profile;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -133,44 +137,44 @@ pub mod profile_view_basic_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Handle;
         type Did;
+        type Handle;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Handle = Unset;
         type Did = Unset;
-    }
-    ///State transition - sets the `handle` field to Set
-    pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHandle<S> {}
-    impl<S: State> State for SetHandle<S> {
-        type Handle = Set<members::handle>;
-        type Did = S::Did;
+        type Handle = Unset;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type Handle = S::Handle;
         type Did = Set<members::did>;
+        type Handle = S::Handle;
+    }
+    ///State transition - sets the `handle` field to Set
+    pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHandle<S> {}
+    impl<S: State> State for SetHandle<S> {
+        type Did = S::Did;
+        type Handle = Set<members::handle>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `handle` field
-        pub struct handle(());
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `handle` field
+        pub struct handle(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ProfileViewBasicBuilder<'a, S: profile_view_basic_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<Did<'a>>,
@@ -178,7 +182,7 @@ pub struct ProfileViewBasicBuilder<'a, S: profile_view_basic_state::State> {
         Option<Handle<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileViewBasic<'a> {
@@ -192,9 +196,9 @@ impl<'a> ProfileViewBasicBuilder<'a, profile_view_basic_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -202,12 +206,12 @@ impl<'a> ProfileViewBasicBuilder<'a, profile_view_basic_state::Empty> {
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -215,12 +219,12 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -235,11 +239,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ProfileViewBasicBuilder<'a, profile_view_basic_state::SetDid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ProfileViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -247,12 +251,12 @@ where
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -267,11 +271,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> ProfileViewBasicBuilder<'a, profile_view_basic_state::SetHandle<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ProfileViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -279,12 +283,12 @@ where
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `pronouns` field (optional)
     pub fn pronouns(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `pronouns` field to an Option value (optional)
     pub fn maybe_pronouns(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -292,18 +296,18 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
 impl<'a, S> ProfileViewBasicBuilder<'a, S>
 where
     S: profile_view_basic_state::State,
-    S::Handle: profile_view_basic_state::IsSet,
     S::Did: profile_view_basic_state::IsSet,
+    S::Handle: profile_view_basic_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ProfileViewBasic<'a> {
         ProfileViewBasic {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            did: self.__unsafe_private_named.2.unwrap(),
-            display_name: self.__unsafe_private_named.3,
-            handle: self.__unsafe_private_named.4.unwrap(),
-            pronouns: self.__unsafe_private_named.5,
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            did: self._fields.2.unwrap(),
+            display_name: self._fields.3,
+            handle: self._fields.4.unwrap(),
+            pronouns: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -316,12 +320,12 @@ where
         >,
     ) -> ProfileViewBasic<'a> {
         ProfileViewBasic {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            did: self.__unsafe_private_named.2.unwrap(),
-            display_name: self.__unsafe_private_named.3,
-            handle: self.__unsafe_private_named.4.unwrap(),
-            pronouns: self.__unsafe_private_named.5,
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            did: self._fields.2.unwrap(),
+            display_name: self._fields.3,
+            handle: self._fields.4.unwrap(),
+            pronouns: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_recipes/actor/profile.rs b/crates/jacquard-api/src/blue_recipes/actor/profile.rs
index 9b87b63a..2190fc90 100644
--- a/crates/jacquard-api/src/blue_recipes/actor/profile.rs
+++ b/crates/jacquard-api/src/blue_recipes/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -301,8 +304,8 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
@@ -311,7 +314,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -325,9 +328,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -335,12 +338,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -348,12 +351,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -361,12 +364,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -374,12 +377,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -394,11 +397,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProfileBuilder<'a, profile_state::SetDisplayName<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -406,12 +409,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `pronouns` field (optional)
     pub fn pronouns(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `pronouns` field to an Option value (optional)
     pub fn maybe_pronouns(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -419,12 +422,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `website` field (optional)
     pub fn website(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `website` field to an Option value (optional)
     pub fn maybe_website(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -437,13 +440,13 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4.unwrap(),
-            pronouns: self.__unsafe_private_named.5,
-            website: self.__unsafe_private_named.6,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            created_at: self._fields.2,
+            description: self._fields.3,
+            display_name: self._fields.4.unwrap(),
+            pronouns: self._fields.5,
+            website: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -456,13 +459,13 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4.unwrap(),
-            pronouns: self.__unsafe_private_named.5,
-            website: self.__unsafe_private_named.6,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            created_at: self._fields.2,
+            description: self._fields.3,
+            display_name: self._fields.4.unwrap(),
+            pronouns: self._fields.5,
+            website: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_recipes/feed.rs b/crates/jacquard-api/src/blue_recipes/feed.rs
index 2cca58db..2537d8f4 100644
--- a/crates/jacquard-api/src/blue_recipes/feed.rs
+++ b/crates/jacquard-api/src/blue_recipes/feed.rs
@@ -9,7 +9,11 @@ pub mod get_recipe;
 pub mod get_recipes;
 pub mod recipe;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -127,9 +131,9 @@ pub mod not_found_recipe_state {
 
 /// Builder for constructing an instance of this type
 pub struct NotFoundRecipeBuilder<'a, S: not_found_recipe_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> NotFoundRecipe<'a> {
@@ -143,9 +147,9 @@ impl<'a> NotFoundRecipeBuilder<'a, not_found_recipe_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NotFoundRecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -160,11 +164,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> NotFoundRecipeBuilder<'a, not_found_recipe_state::SetNotFound<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NotFoundRecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +183,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> NotFoundRecipeBuilder<'a, not_found_recipe_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         NotFoundRecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,8 +201,8 @@ where
     /// Build the final struct
     pub fn build(self) -> NotFoundRecipe<'a> {
         NotFoundRecipe {
-            not_found: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            not_found: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -211,8 +215,8 @@ where
         >,
     ) -> NotFoundRecipe<'a> {
         NotFoundRecipe {
-            not_found: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            not_found: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -331,99 +335,99 @@ pub mod recipe_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Author;
-        type Cid;
         type Uri;
-        type IndexedAt;
+        type Cid;
+        type Author;
         type Record;
+        type IndexedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Author = Unset;
-        type Cid = Unset;
         type Uri = Unset;
-        type IndexedAt = Unset;
+        type Cid = Unset;
+        type Author = Unset;
         type Record = Unset;
+        type IndexedAt = Unset;
     }
-    ///State transition - sets the `author` field to Set
-    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAuthor<S> {}
-    impl<S: State> State for SetAuthor<S> {
-        type Author = Set<members::author>;
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Uri = Set<members::uri>;
         type Cid = S::Cid;
-        type Uri = S::Uri;
-        type IndexedAt = S::IndexedAt;
+        type Author = S::Author;
         type Record = S::Record;
+        type IndexedAt = S::IndexedAt;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type Author = S::Author;
-        type Cid = Set<members::cid>;
         type Uri = S::Uri;
-        type IndexedAt = S::IndexedAt;
-        type Record = S::Record;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
+        type Cid = Set<members::cid>;
         type Author = S::Author;
-        type Cid = S::Cid;
-        type Uri = Set<members::uri>;
-        type IndexedAt = S::IndexedAt;
         type Record = S::Record;
+        type IndexedAt = S::IndexedAt;
     }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
-        type Author = S::Author;
-        type Cid = S::Cid;
+    ///State transition - sets the `author` field to Set
+    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAuthor<S> {}
+    impl<S: State> State for SetAuthor<S> {
         type Uri = S::Uri;
-        type IndexedAt = Set<members::indexed_at>;
+        type Cid = S::Cid;
+        type Author = Set<members::author>;
         type Record = S::Record;
+        type IndexedAt = S::IndexedAt;
     }
     ///State transition - sets the `record` field to Set
     pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecord<S> {}
     impl<S: State> State for SetRecord<S> {
-        type Author = S::Author;
-        type Cid = S::Cid;
         type Uri = S::Uri;
-        type IndexedAt = S::IndexedAt;
+        type Cid = S::Cid;
+        type Author = S::Author;
         type Record = Set<members::record>;
+        type IndexedAt = S::IndexedAt;
+    }
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
+        type Uri = S::Uri;
+        type Cid = S::Cid;
+        type Author = S::Author;
+        type Record = S::Record;
+        type IndexedAt = Set<members::indexed_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `author` field
-        pub struct author(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `indexed_at` field
-        pub struct indexed_at(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
+        ///Marker type for the `author` field
+        pub struct author(());
         ///Marker type for the `record` field
         pub struct record(());
+        ///Marker type for the `indexed_at` field
+        pub struct indexed_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RecipeViewBuilder<'a, S: recipe_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<Cid<'a>>,
         Option<Datetime>,
         Option<Recipe<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RecipeView<'a> {
@@ -437,9 +441,9 @@ impl<'a> RecipeViewBuilder<'a, recipe_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecipeViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -454,11 +458,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> RecipeViewBuilder<'a, recipe_view_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecipeViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -473,11 +477,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> RecipeViewBuilder<'a, recipe_view_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RecipeViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -492,11 +496,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RecipeViewBuilder<'a, recipe_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RecipeViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -511,11 +515,11 @@ where
         mut self,
         value: impl Into<Recipe<'a>>,
     ) -> RecipeViewBuilder<'a, recipe_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RecipeViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -530,11 +534,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RecipeViewBuilder<'a, recipe_view_state::SetUri<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RecipeViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -542,20 +546,20 @@ where
 impl<'a, S> RecipeViewBuilder<'a, S>
 where
     S: recipe_view_state::State,
-    S::Author: recipe_view_state::IsSet,
-    S::Cid: recipe_view_state::IsSet,
     S::Uri: recipe_view_state::IsSet,
-    S::IndexedAt: recipe_view_state::IsSet,
+    S::Cid: recipe_view_state::IsSet,
+    S::Author: recipe_view_state::IsSet,
     S::Record: recipe_view_state::IsSet,
+    S::IndexedAt: recipe_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RecipeView<'a> {
         RecipeView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            record: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            record: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -568,11 +572,11 @@ where
         >,
     ) -> RecipeView<'a> {
         RecipeView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            record: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            record: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_recipes/feed/get_recipe.rs b/crates/jacquard-api/src/blue_recipes/feed/get_recipe.rs
index 15ad8193..6f30f96d 100644
--- a/crates/jacquard-api/src/blue_recipes/feed/get_recipe.rs
+++ b/crates/jacquard-api/src/blue_recipes/feed/get_recipe.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -132,9 +135,9 @@ pub mod get_recipe_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetRecipeBuilder<'a, S: get_recipe_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<AtUri<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<AtUri<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetRecipe<'a> {
@@ -148,9 +151,9 @@ impl<'a> GetRecipeBuilder<'a, get_recipe_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetRecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -165,11 +168,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> GetRecipeBuilder<'a, get_recipe_state::SetUris<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetRecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,7 +185,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetRecipe<'a> {
         GetRecipe {
-            uris: self.__unsafe_private_named.0.unwrap(),
+            uris: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/blue_recipes/feed/get_recipes.rs b/crates/jacquard-api/src/blue_recipes/feed/get_recipes.rs
index 9df2b3b4..87c2f358 100644
--- a/crates/jacquard-api/src/blue_recipes/feed/get_recipes.rs
+++ b/crates/jacquard-api/src/blue_recipes/feed/get_recipes.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -88,9 +91,9 @@ pub mod get_recipes_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetRecipesBuilder<'a, S: get_recipes_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetRecipes<'a> {
@@ -104,9 +107,9 @@ impl<'a> GetRecipesBuilder<'a, get_recipes_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetRecipesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,12 +117,12 @@ impl<'a> GetRecipesBuilder<'a, get_recipes_state::Empty> {
 impl<'a, S: get_recipes_state::State> GetRecipesBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<AtIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<AtIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -127,12 +130,12 @@ impl<'a, S: get_recipes_state::State> GetRecipesBuilder<'a, S> {
 impl<'a, S: get_recipes_state::State> GetRecipesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -140,12 +143,12 @@ impl<'a, S: get_recipes_state::State> GetRecipesBuilder<'a, S> {
 impl<'a, S: get_recipes_state::State> GetRecipesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -157,9 +160,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetRecipes<'a> {
         GetRecipes {
-            author: self.__unsafe_private_named.0,
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            author: self._fields.0,
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/blue_recipes/feed/recipe.rs b/crates/jacquard-api/src/blue_recipes/feed/recipe.rs
index e663e49c..f13d0217 100644
--- a/crates/jacquard-api/src/blue_recipes/feed/recipe.rs
+++ b/crates/jacquard-api/src/blue_recipes/feed/recipe.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -474,58 +477,58 @@ pub mod recipe_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Title;
         type Steps;
         type Ingredients;
-        type Title;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Title = Unset;
         type Steps = Unset;
         type Ingredients = Unset;
-        type Title = Unset;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type Title = Set<members::title>;
+        type Steps = S::Steps;
+        type Ingredients = S::Ingredients;
     }
     ///State transition - sets the `steps` field to Set
     pub struct SetSteps<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSteps<S> {}
     impl<S: State> State for SetSteps<S> {
+        type Title = S::Title;
         type Steps = Set<members::steps>;
         type Ingredients = S::Ingredients;
-        type Title = S::Title;
     }
     ///State transition - sets the `ingredients` field to Set
     pub struct SetIngredients<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIngredients<S> {}
     impl<S: State> State for SetIngredients<S> {
-        type Steps = S::Steps;
-        type Ingredients = Set<members::ingredients>;
         type Title = S::Title;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
         type Steps = S::Steps;
-        type Ingredients = S::Ingredients;
-        type Title = Set<members::title>;
+        type Ingredients = Set<members::ingredients>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `title` field
+        pub struct title(());
         ///Marker type for the `steps` field
         pub struct steps(());
         ///Marker type for the `ingredients` field
         pub struct ingredients(());
-        ///Marker type for the `title` field
-        pub struct title(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RecipeBuilder<'a, S: recipe_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
@@ -535,7 +538,7 @@ pub struct RecipeBuilder<'a, S: recipe_state::State> {
         Option<i64>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Recipe<'a> {
@@ -549,9 +552,9 @@ impl<'a> RecipeBuilder<'a, recipe_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -559,12 +562,12 @@ impl<'a> RecipeBuilder<'a, recipe_state::Empty> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -572,12 +575,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -585,12 +588,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -605,11 +608,11 @@ where
         mut self,
         value: impl Into<Vec<recipe::Ingredient<'a>>>,
     ) -> RecipeBuilder<'a, recipe_state::SetIngredients<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -617,12 +620,12 @@ where
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `serves` field (optional)
     pub fn serves(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `serves` field to an Option value (optional)
     pub fn maybe_serves(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -637,11 +640,11 @@ where
         mut self,
         value: impl Into<Vec<recipe::Step<'a>>>,
     ) -> RecipeBuilder<'a, recipe_state::SetSteps<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         RecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -649,12 +652,12 @@ where
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `time` field (optional)
     pub fn time(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `time` field to an Option value (optional)
     pub fn maybe_time(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -669,11 +672,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RecipeBuilder<'a, recipe_state::SetTitle<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         RecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -681,21 +684,21 @@ where
 impl<'a, S> RecipeBuilder<'a, S>
 where
     S: recipe_state::State,
+    S::Title: recipe_state::IsSet,
     S::Steps: recipe_state::IsSet,
     S::Ingredients: recipe_state::IsSet,
-    S::Title: recipe_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Recipe<'a> {
         Recipe {
-            created_at: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            image: self.__unsafe_private_named.2,
-            ingredients: self.__unsafe_private_named.3.unwrap(),
-            serves: self.__unsafe_private_named.4,
-            steps: self.__unsafe_private_named.5.unwrap(),
-            time: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7.unwrap(),
+            created_at: self._fields.0,
+            description: self._fields.1,
+            image: self._fields.2,
+            ingredients: self._fields.3.unwrap(),
+            serves: self._fields.4,
+            steps: self._fields.5.unwrap(),
+            time: self._fields.6,
+            title: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -708,14 +711,14 @@ where
         >,
     ) -> Recipe<'a> {
         Recipe {
-            created_at: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            image: self.__unsafe_private_named.2,
-            ingredients: self.__unsafe_private_named.3.unwrap(),
-            serves: self.__unsafe_private_named.4,
-            steps: self.__unsafe_private_named.5.unwrap(),
-            time: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7.unwrap(),
+            created_at: self._fields.0,
+            description: self._fields.1,
+            image: self._fields.2,
+            ingredients: self._fields.3.unwrap(),
+            serves: self._fields.4,
+            steps: self._fields.5.unwrap(),
+            time: self._fields.6,
+            title: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_rito/feed/bookmark.rs b/crates/jacquard-api/src/blue_rito/feed/bookmark.rs
index b2563416..10a44e4b 100644
--- a/crates/jacquard-api/src/blue_rito/feed/bookmark.rs
+++ b/crates/jacquard-api/src/blue_rito/feed/bookmark.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -442,8 +445,8 @@ pub mod bookmark_state {
 
 /// Builder for constructing an instance of this type
 pub struct BookmarkBuilder<'a, S: bookmark_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<bookmark::Locale<'a>>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -452,7 +455,7 @@ pub struct BookmarkBuilder<'a, S: bookmark_state::State> {
         Option<UriValue<'a>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Bookmark<'a> {
@@ -466,9 +469,9 @@ impl<'a> BookmarkBuilder<'a, bookmark_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -483,11 +486,11 @@ where
         mut self,
         value: impl Into<Vec<bookmark::Locale<'a>>>,
     ) -> BookmarkBuilder<'a, bookmark_state::SetComments<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -502,11 +505,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BookmarkBuilder<'a, bookmark_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -514,12 +517,12 @@ where
 impl<'a, S: bookmark_state::State> BookmarkBuilder<'a, S> {
     /// Set the `ogpDescription` field (optional)
     pub fn ogp_description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `ogpDescription` field to an Option value (optional)
     pub fn maybe_ogp_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -527,12 +530,12 @@ impl<'a, S: bookmark_state::State> BookmarkBuilder<'a, S> {
 impl<'a, S: bookmark_state::State> BookmarkBuilder<'a, S> {
     /// Set the `ogpImage` field (optional)
     pub fn ogp_image(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `ogpImage` field to an Option value (optional)
     pub fn maybe_ogp_image(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -540,12 +543,12 @@ impl<'a, S: bookmark_state::State> BookmarkBuilder<'a, S> {
 impl<'a, S: bookmark_state::State> BookmarkBuilder<'a, S> {
     /// Set the `ogpTitle` field (optional)
     pub fn ogp_title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `ogpTitle` field to an Option value (optional)
     pub fn maybe_ogp_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -560,11 +563,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> BookmarkBuilder<'a, bookmark_state::SetSubject<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         BookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -572,12 +575,12 @@ where
 impl<'a, S: bookmark_state::State> BookmarkBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -592,13 +595,13 @@ where
     /// Build the final struct
     pub fn build(self) -> Bookmark<'a> {
         Bookmark {
-            comments: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            ogp_description: self.__unsafe_private_named.2,
-            ogp_image: self.__unsafe_private_named.3,
-            ogp_title: self.__unsafe_private_named.4,
-            subject: self.__unsafe_private_named.5.unwrap(),
-            tags: self.__unsafe_private_named.6,
+            comments: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            ogp_description: self._fields.2,
+            ogp_image: self._fields.3,
+            ogp_title: self._fields.4,
+            subject: self._fields.5.unwrap(),
+            tags: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -611,13 +614,13 @@ where
         >,
     ) -> Bookmark<'a> {
         Bookmark {
-            comments: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            ogp_description: self.__unsafe_private_named.2,
-            ogp_image: self.__unsafe_private_named.3,
-            ogp_title: self.__unsafe_private_named.4,
-            subject: self.__unsafe_private_named.5.unwrap(),
-            tags: self.__unsafe_private_named.6,
+            comments: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            ogp_description: self._fields.2,
+            ogp_image: self._fields.3,
+            ogp_title: self._fields.4,
+            subject: self._fields.5.unwrap(),
+            tags: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_rito/feed/like.rs b/crates/jacquard-api/src/blue_rito/feed/like.rs
index c1800312..5258a84b 100644
--- a/crates/jacquard-api/src/blue_rito/feed/like.rs
+++ b/crates/jacquard-api/src/blue_rito/feed/like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -108,45 +111,45 @@ pub mod like_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type CreatedAt;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
+        type Subject = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -160,9 +163,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -177,11 +180,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -208,14 +211,14 @@ where
 impl<'a, S> LikeBuilder<'a, S>
 where
     S: like_state::State,
-    S::Subject: like_state::IsSet,
     S::CreatedAt: like_state::IsSet,
+    S::Subject: like_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -228,8 +231,8 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_rito/label/auto/like.rs b/crates/jacquard-api/src/blue_rito/label/auto/like.rs
index 78b2e8a2..b39bb861 100644
--- a/crates/jacquard-api/src/blue_rito/label/auto/like.rs
+++ b/crates/jacquard-api/src/blue_rito/label/auto/like.rs
@@ -7,7 +7,11 @@
 
 pub mod settings;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -147,9 +151,9 @@ pub mod like_state {
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -163,9 +167,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,11 +184,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -199,11 +203,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -217,8 +221,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -231,8 +235,8 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_rito/label/auto/like/settings.rs b/crates/jacquard-api/src/blue_rito/label/auto/like/settings.rs
index 93e99d0b..d0ac8664 100644
--- a/crates/jacquard-api/src/blue_rito/label/auto/like/settings.rs
+++ b/crates/jacquard-api/src/blue_rito/label/auto/like/settings.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -178,13 +181,13 @@ pub mod settings_state {
 
 /// Builder for constructing an instance of this type
 pub struct SettingsBuilder<'a, S: settings_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<settings::PostRef<'a>>,
         Option<Datetime>,
         Option<settings::PostRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Settings<'a> {
@@ -198,9 +201,9 @@ impl<'a> SettingsBuilder<'a, settings_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<settings::PostRef<'a>>,
     ) -> SettingsBuilder<'a, settings_state::SetApply<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SettingsBuilder<'a, settings_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,12 +249,12 @@ where
 impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
     /// Set the `delete` field (optional)
     pub fn delete(mut self, value: impl Into<Option<settings::PostRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `delete` field to an Option value (optional)
     pub fn maybe_delete(mut self, value: Option<settings::PostRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -265,9 +268,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Settings<'a> {
         Settings {
-            apply: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            delete: self.__unsafe_private_named.2,
+            apply: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            delete: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -280,9 +283,9 @@ where
         >,
     ) -> Settings<'a> {
         Settings {
-            apply: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            delete: self.__unsafe_private_named.2,
+            apply: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            delete: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -434,9 +437,9 @@ pub mod post_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct PostRefBuilder<'a, S: post_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PostRef<'a> {
@@ -450,9 +453,9 @@ impl<'a> PostRefBuilder<'a, post_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -467,11 +470,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostRefBuilder<'a, post_ref_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PostRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -486,11 +489,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> PostRefBuilder<'a, post_ref_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -504,8 +507,8 @@ where
     /// Build the final struct
     pub fn build(self) -> PostRef<'a> {
         PostRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -518,8 +521,8 @@ where
         >,
     ) -> PostRef<'a> {
         PostRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_rito/label/auto/post.rs b/crates/jacquard-api/src/blue_rito/label/auto/post.rs
index e3f2db6f..04d8ceb1 100644
--- a/crates/jacquard-api/src/blue_rito/label/auto/post.rs
+++ b/crates/jacquard-api/src/blue_rito/label/auto/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -122,9 +125,9 @@ pub mod post_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Label;
-        type AppliedTo;
-        type Condition;
         type DurationInHours;
+        type Condition;
+        type AppliedTo;
         type CreatedAt;
     }
     /// Empty state - all required fields are unset
@@ -132,9 +135,9 @@ pub mod post_state {
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Label = Unset;
-        type AppliedTo = Unset;
-        type Condition = Unset;
         type DurationInHours = Unset;
+        type Condition = Unset;
+        type AppliedTo = Unset;
         type CreatedAt = Unset;
     }
     ///State transition - sets the `label` field to Set
@@ -142,19 +145,19 @@ pub mod post_state {
     impl<S: State> sealed::Sealed for SetLabel<S> {}
     impl<S: State> State for SetLabel<S> {
         type Label = Set<members::label>;
-        type AppliedTo = S::AppliedTo;
-        type Condition = S::Condition;
         type DurationInHours = S::DurationInHours;
+        type Condition = S::Condition;
+        type AppliedTo = S::AppliedTo;
         type CreatedAt = S::CreatedAt;
     }
-    ///State transition - sets the `applied_to` field to Set
-    pub struct SetAppliedTo<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAppliedTo<S> {}
-    impl<S: State> State for SetAppliedTo<S> {
+    ///State transition - sets the `duration_in_hours` field to Set
+    pub struct SetDurationInHours<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDurationInHours<S> {}
+    impl<S: State> State for SetDurationInHours<S> {
         type Label = S::Label;
-        type AppliedTo = Set<members::applied_to>;
+        type DurationInHours = Set<members::duration_in_hours>;
         type Condition = S::Condition;
-        type DurationInHours = S::DurationInHours;
+        type AppliedTo = S::AppliedTo;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `condition` field to Set
@@ -162,19 +165,19 @@ pub mod post_state {
     impl<S: State> sealed::Sealed for SetCondition<S> {}
     impl<S: State> State for SetCondition<S> {
         type Label = S::Label;
-        type AppliedTo = S::AppliedTo;
-        type Condition = Set<members::condition>;
         type DurationInHours = S::DurationInHours;
+        type Condition = Set<members::condition>;
+        type AppliedTo = S::AppliedTo;
         type CreatedAt = S::CreatedAt;
     }
-    ///State transition - sets the `duration_in_hours` field to Set
-    pub struct SetDurationInHours<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDurationInHours<S> {}
-    impl<S: State> State for SetDurationInHours<S> {
+    ///State transition - sets the `applied_to` field to Set
+    pub struct SetAppliedTo<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAppliedTo<S> {}
+    impl<S: State> State for SetAppliedTo<S> {
         type Label = S::Label;
-        type AppliedTo = S::AppliedTo;
+        type DurationInHours = S::DurationInHours;
         type Condition = S::Condition;
-        type DurationInHours = Set<members::duration_in_hours>;
+        type AppliedTo = Set<members::applied_to>;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
@@ -182,9 +185,9 @@ pub mod post_state {
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type Label = S::Label;
-        type AppliedTo = S::AppliedTo;
-        type Condition = S::Condition;
         type DurationInHours = S::DurationInHours;
+        type Condition = S::Condition;
+        type AppliedTo = S::AppliedTo;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
@@ -192,12 +195,12 @@ pub mod post_state {
     pub mod members {
         ///Marker type for the `label` field
         pub struct label(());
-        ///Marker type for the `applied_to` field
-        pub struct applied_to(());
-        ///Marker type for the `condition` field
-        pub struct condition(());
         ///Marker type for the `duration_in_hours` field
         pub struct duration_in_hours(());
+        ///Marker type for the `condition` field
+        pub struct condition(());
+        ///Marker type for the `applied_to` field
+        pub struct applied_to(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
     }
@@ -205,8 +208,8 @@ pub mod post_state {
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -214,7 +217,7 @@ pub struct PostBuilder<'a, S: post_state::State> {
         Option<i64>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -228,9 +231,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -238,12 +241,12 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `action` field (optional)
     pub fn action(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `action` field to an Option value (optional)
     pub fn maybe_action(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -258,11 +261,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetAppliedTo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -277,11 +280,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetCondition<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -296,11 +299,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -315,11 +318,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PostBuilder<'a, post_state::SetDurationInHours<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -334,11 +337,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetLabel<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -347,20 +350,20 @@ impl<'a, S> PostBuilder<'a, S>
 where
     S: post_state::State,
     S::Label: post_state::IsSet,
-    S::AppliedTo: post_state::IsSet,
-    S::Condition: post_state::IsSet,
     S::DurationInHours: post_state::IsSet,
+    S::Condition: post_state::IsSet,
+    S::AppliedTo: post_state::IsSet,
     S::CreatedAt: post_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            action: self.__unsafe_private_named.0,
-            applied_to: self.__unsafe_private_named.1.unwrap(),
-            condition: self.__unsafe_private_named.2.unwrap(),
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            duration_in_hours: self.__unsafe_private_named.4.unwrap(),
-            label: self.__unsafe_private_named.5.unwrap(),
+            action: self._fields.0,
+            applied_to: self._fields.1.unwrap(),
+            condition: self._fields.2.unwrap(),
+            created_at: self._fields.3.unwrap(),
+            duration_in_hours: self._fields.4.unwrap(),
+            label: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -373,12 +376,12 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            action: self.__unsafe_private_named.0,
-            applied_to: self.__unsafe_private_named.1.unwrap(),
-            condition: self.__unsafe_private_named.2.unwrap(),
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            duration_in_hours: self.__unsafe_private_named.4.unwrap(),
-            label: self.__unsafe_private_named.5.unwrap(),
+            action: self._fields.0,
+            applied_to: self._fields.1.unwrap(),
+            condition: self._fields.2.unwrap(),
+            created_at: self._fields.3.unwrap(),
+            duration_in_hours: self._fields.4.unwrap(),
+            label: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_rito/service/get_schema.rs b/crates/jacquard-api/src/blue_rito/service/get_schema.rs
index bb215e15..1d5e6311 100644
--- a/crates/jacquard-api/src/blue_rito/service/get_schema.rs
+++ b/crates/jacquard-api/src/blue_rito/service/get_schema.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -137,63 +140,63 @@ pub mod langs_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Moderation;
-        type Lang;
         type Title;
+        type Lang;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Moderation = Unset;
-        type Lang = Unset;
         type Title = Unset;
+        type Lang = Unset;
     }
     ///State transition - sets the `moderation` field to Set
     pub struct SetModeration<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetModeration<S> {}
     impl<S: State> State for SetModeration<S> {
         type Moderation = Set<members::moderation>;
-        type Lang = S::Lang;
-        type Title = S::Title;
-    }
-    ///State transition - sets the `lang` field to Set
-    pub struct SetLang<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLang<S> {}
-    impl<S: State> State for SetLang<S> {
-        type Moderation = S::Moderation;
-        type Lang = Set<members::lang>;
         type Title = S::Title;
+        type Lang = S::Lang;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
         type Moderation = S::Moderation;
-        type Lang = S::Lang;
         type Title = Set<members::title>;
+        type Lang = S::Lang;
+    }
+    ///State transition - sets the `lang` field to Set
+    pub struct SetLang<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLang<S> {}
+    impl<S: State> State for SetLang<S> {
+        type Moderation = S::Moderation;
+        type Title = S::Title;
+        type Lang = Set<members::lang>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `moderation` field
         pub struct moderation(());
-        ///Marker type for the `lang` field
-        pub struct lang(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `lang` field
+        pub struct lang(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LangsBuilder<'a, S: langs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Langs<'a> {
@@ -207,9 +210,9 @@ impl<'a> LangsBuilder<'a, langs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LangsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -217,12 +220,12 @@ impl<'a> LangsBuilder<'a, langs_state::Empty> {
 impl<'a, S: langs_state::State> LangsBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -237,11 +240,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LangsBuilder<'a, langs_state::SetLang<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LangsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -256,11 +259,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> LangsBuilder<'a, langs_state::SetModeration<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LangsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -275,11 +278,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LangsBuilder<'a, langs_state::SetTitle<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LangsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -288,16 +291,16 @@ impl<'a, S> LangsBuilder<'a, S>
 where
     S: langs_state::State,
     S::Moderation: langs_state::IsSet,
-    S::Lang: langs_state::IsSet,
     S::Title: langs_state::IsSet,
+    S::Lang: langs_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Langs<'a> {
         Langs {
-            comment: self.__unsafe_private_named.0,
-            lang: self.__unsafe_private_named.1.unwrap(),
-            moderation: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3.unwrap(),
+            comment: self._fields.0,
+            lang: self._fields.1.unwrap(),
+            moderation: self._fields.2.unwrap(),
+            title: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -310,10 +313,10 @@ where
         >,
     ) -> Langs<'a> {
         Langs {
-            comment: self.__unsafe_private_named.0,
-            lang: self.__unsafe_private_named.1.unwrap(),
-            moderation: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3.unwrap(),
+            comment: self._fields.0,
+            lang: self._fields.1.unwrap(),
+            moderation: self._fields.2.unwrap(),
+            title: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_rito/service/schema.rs b/crates/jacquard-api/src/blue_rito/service/schema.rs
index 47d53f49..c24eade8 100644
--- a/crates/jacquard-api/src/blue_rito/service/schema.rs
+++ b/crates/jacquard-api/src/blue_rito/service/schema.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -132,9 +135,9 @@ pub mod schema_state {
 
 /// Builder for constructing an instance of this type
 pub struct SchemaBuilder<'a, S: schema_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Schema<'a> {
@@ -148,9 +151,9 @@ impl<'a> SchemaBuilder<'a, schema_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SchemaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -165,11 +168,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> SchemaBuilder<'a, schema_state::SetSchema<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SchemaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,7 +185,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Schema<'a> {
         Schema {
-            schema: self.__unsafe_private_named.0.unwrap(),
+            schema: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -195,7 +198,7 @@ where
         >,
     ) -> Schema<'a> {
         Schema {
-            schema: self.__unsafe_private_named.0.unwrap(),
+            schema: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_skytalk/talk/comment.rs b/crates/jacquard-api/src/blue_skytalk/talk/comment.rs
index 841e5891..46f6a2ad 100644
--- a/crates/jacquard-api/src/blue_skytalk/talk/comment.rs
+++ b/crates/jacquard-api/src/blue_skytalk/talk/comment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -152,64 +155,64 @@ pub mod comment_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ThreadUri;
         type Text;
         type CreatedAt;
+        type ThreadUri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ThreadUri = Unset;
         type Text = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `thread_uri` field to Set
-    pub struct SetThreadUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetThreadUri<S> {}
-    impl<S: State> State for SetThreadUri<S> {
-        type ThreadUri = Set<members::thread_uri>;
-        type Text = S::Text;
-        type CreatedAt = S::CreatedAt;
+        type ThreadUri = Unset;
     }
     ///State transition - sets the `text` field to Set
     pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetText<S> {}
     impl<S: State> State for SetText<S> {
-        type ThreadUri = S::ThreadUri;
         type Text = Set<members::text>;
         type CreatedAt = S::CreatedAt;
+        type ThreadUri = S::ThreadUri;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type ThreadUri = S::ThreadUri;
         type Text = S::Text;
         type CreatedAt = Set<members::created_at>;
+        type ThreadUri = S::ThreadUri;
+    }
+    ///State transition - sets the `thread_uri` field to Set
+    pub struct SetThreadUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetThreadUri<S> {}
+    impl<S: State> State for SetThreadUri<S> {
+        type Text = S::Text;
+        type CreatedAt = S::CreatedAt;
+        type ThreadUri = Set<members::thread_uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `thread_uri` field
-        pub struct thread_uri(());
         ///Marker type for the `text` field
         pub struct text(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `thread_uri` field
+        pub struct thread_uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CommentBuilder<'a, S: comment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<BlobRef<'a>>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Comment<'a> {
@@ -223,9 +226,9 @@ impl<'a> CommentBuilder<'a, comment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -233,12 +236,12 @@ impl<'a> CommentBuilder<'a, comment_state::Empty> {
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `blobs` field (optional)
     pub fn blobs(mut self, value: impl Into<Option<Vec<BlobRef<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `blobs` field to an Option value (optional)
     pub fn maybe_blobs(mut self, value: Option<Vec<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -253,11 +256,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CommentBuilder<'a, comment_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -272,11 +275,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetText<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -291,11 +294,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetThreadUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -303,17 +306,17 @@ where
 impl<'a, S> CommentBuilder<'a, S>
 where
     S: comment_state::State,
-    S::ThreadUri: comment_state::IsSet,
     S::Text: comment_state::IsSet,
     S::CreatedAt: comment_state::IsSet,
+    S::ThreadUri: comment_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Comment<'a> {
         Comment {
-            blobs: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            text: self.__unsafe_private_named.2.unwrap(),
-            thread_uri: self.__unsafe_private_named.3.unwrap(),
+            blobs: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            text: self._fields.2.unwrap(),
+            thread_uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -326,10 +329,10 @@ where
         >,
     ) -> Comment<'a> {
         Comment {
-            blobs: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            text: self.__unsafe_private_named.2.unwrap(),
-            thread_uri: self.__unsafe_private_named.3.unwrap(),
+            blobs: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            text: self._fields.2.unwrap(),
+            thread_uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_skytalk/talk/thread.rs b/crates/jacquard-api/src/blue_skytalk/talk/thread.rs
index db6d59d4..96f6006e 100644
--- a/crates/jacquard-api/src/blue_skytalk/talk/thread.rs
+++ b/crates/jacquard-api/src/blue_skytalk/talk/thread.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -178,49 +181,49 @@ pub mod thread_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Title;
         type ChannelId;
+        type Title;
         type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Title = Unset;
         type ChannelId = Unset;
+        type Title = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Title = Set<members::title>;
-        type ChannelId = S::ChannelId;
-        type CreatedAt = S::CreatedAt;
-    }
     ///State transition - sets the `channel_id` field to Set
     pub struct SetChannelId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetChannelId<S> {}
     impl<S: State> State for SetChannelId<S> {
-        type Title = S::Title;
         type ChannelId = Set<members::channel_id>;
+        type Title = S::Title;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type ChannelId = S::ChannelId;
+        type Title = Set<members::title>;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Title = S::Title;
         type ChannelId = S::ChannelId;
+        type Title = S::Title;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `title` field
-        pub struct title(());
         ///Marker type for the `channel_id` field
         pub struct channel_id(());
+        ///Marker type for the `title` field
+        pub struct title(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
     }
@@ -228,15 +231,15 @@ pub mod thread_state {
 
 /// Builder for constructing an instance of this type
 pub struct ThreadBuilder<'a, S: thread_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<BlobRef<'a>>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Thread<'a> {
@@ -250,9 +253,9 @@ impl<'a> ThreadBuilder<'a, thread_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ThreadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -260,12 +263,12 @@ impl<'a> ThreadBuilder<'a, thread_state::Empty> {
 impl<'a, S: thread_state::State> ThreadBuilder<'a, S> {
     /// Set the `blobs` field (optional)
     pub fn blobs(mut self, value: impl Into<Option<Vec<BlobRef<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `blobs` field to an Option value (optional)
     pub fn maybe_blobs(mut self, value: Option<Vec<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -280,11 +283,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ThreadBuilder<'a, thread_state::SetChannelId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ThreadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -299,11 +302,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ThreadBuilder<'a, thread_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ThreadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -311,12 +314,12 @@ where
 impl<'a, S: thread_state::State> ThreadBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -331,11 +334,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ThreadBuilder<'a, thread_state::SetTitle<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ThreadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -343,18 +346,18 @@ where
 impl<'a, S> ThreadBuilder<'a, S>
 where
     S: thread_state::State,
-    S::Title: thread_state::IsSet,
     S::ChannelId: thread_state::IsSet,
+    S::Title: thread_state::IsSet,
     S::CreatedAt: thread_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Thread<'a> {
         Thread {
-            blobs: self.__unsafe_private_named.0,
-            channel_id: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            text: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4.unwrap(),
+            blobs: self._fields.0,
+            channel_id: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            text: self._fields.3,
+            title: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -367,11 +370,11 @@ where
         >,
     ) -> Thread<'a> {
         Thread {
-            blobs: self.__unsafe_private_named.0,
-            channel_id: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            text: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4.unwrap(),
+            blobs: self._fields.0,
+            channel_id: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            text: self._fields.3,
+            title: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/blue_zio/atfile/lock.rs b/crates/jacquard-api/src/blue_zio/atfile/lock.rs
index c1a47d34..ac72ccb9 100644
--- a/crates/jacquard-api/src/blue_zio/atfile/lock.rs
+++ b/crates/jacquard-api/src/blue_zio/atfile/lock.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -118,9 +121,9 @@ pub mod lock_state {
 
 /// Builder for constructing an instance of this type
 pub struct LockBuilder<'a, S: lock_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Lock<'a> {
@@ -134,9 +137,9 @@ impl<'a> LockBuilder<'a, lock_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -144,12 +147,12 @@ impl<'a> LockBuilder<'a, lock_state::Empty> {
 impl<'a, S: lock_state::State> LockBuilder<'a, S> {
     /// Set the `lock` field (optional)
     pub fn lock(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `lock` field to an Option value (optional)
     pub fn maybe_lock(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -161,7 +164,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Lock<'a> {
         Lock {
-            lock: self.__unsafe_private_named.0,
+            lock: self._fields.0,
             extra_data: Default::default(),
         }
     }
@@ -174,7 +177,7 @@ where
         >,
     ) -> Lock<'a> {
         Lock {
-            lock: self.__unsafe_private_named.0,
+            lock: self._fields.0,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/bond_biblio/book.rs b/crates/jacquard-api/src/bond_biblio/book.rs
index db8ad10f..a0cf2aab 100644
--- a/crates/jacquard-api/src/bond_biblio/book.rs
+++ b/crates/jacquard-api/src/bond_biblio/book.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -152,64 +155,64 @@ pub mod book_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Authors;
-        type Title;
         type CreatedAt;
+        type Title;
+        type Authors;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Authors = Unset;
-        type Title = Unset;
         type CreatedAt = Unset;
+        type Title = Unset;
+        type Authors = Unset;
     }
-    ///State transition - sets the `authors` field to Set
-    pub struct SetAuthors<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAuthors<S> {}
-    impl<S: State> State for SetAuthors<S> {
-        type Authors = Set<members::authors>;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
         type Title = S::Title;
-        type CreatedAt = S::CreatedAt;
+        type Authors = S::Authors;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Authors = S::Authors;
-        type Title = Set<members::title>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+        type Title = Set<members::title>;
         type Authors = S::Authors;
+    }
+    ///State transition - sets the `authors` field to Set
+    pub struct SetAuthors<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAuthors<S> {}
+    impl<S: State> State for SetAuthors<S> {
+        type CreatedAt = S::CreatedAt;
         type Title = S::Title;
-        type CreatedAt = Set<members::created_at>;
+        type Authors = Set<members::authors>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `authors` field
-        pub struct authors(());
-        ///Marker type for the `title` field
-        pub struct title(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `title` field
+        pub struct title(());
+        ///Marker type for the `authors` field
+        pub struct authors(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BookBuilder<'a, S: book_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<Vec<AtUri<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Book<'a> {
@@ -223,9 +226,9 @@ impl<'a> BookBuilder<'a, book_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -240,11 +243,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BookBuilder<'a, book_state::SetAuthors<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -259,11 +262,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BookBuilder<'a, book_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -271,12 +274,12 @@ where
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `lists` field (optional)
     pub fn lists(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `lists` field to an Option value (optional)
     pub fn maybe_lists(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -291,11 +294,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BookBuilder<'a, book_state::SetTitle<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -303,17 +306,17 @@ where
 impl<'a, S> BookBuilder<'a, S>
 where
     S: book_state::State,
-    S::Authors: book_state::IsSet,
-    S::Title: book_state::IsSet,
     S::CreatedAt: book_state::IsSet,
+    S::Title: book_state::IsSet,
+    S::Authors: book_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Book<'a> {
         Book {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            lists: self.__unsafe_private_named.2,
-            title: self.__unsafe_private_named.3.unwrap(),
+            authors: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            lists: self._fields.2,
+            title: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -326,10 +329,10 @@ where
         >,
     ) -> Book<'a> {
         Book {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            lists: self.__unsafe_private_named.2,
-            title: self.__unsafe_private_named.3.unwrap(),
+            authors: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            lists: self._fields.2,
+            title: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/bond_biblio/list.rs b/crates/jacquard-api/src/bond_biblio/list.rs
index 5f8e6cc4..ebe35729 100644
--- a/crates/jacquard-api/src/bond_biblio/list.rs
+++ b/crates/jacquard-api/src/bond_biblio/list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -169,92 +172,92 @@ pub mod list_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Duedate;
+        type CreatedAt;
+        type Title;
         type Librarians;
+        type Duedate;
         type Books;
-        type Title;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Duedate = Unset;
+        type CreatedAt = Unset;
+        type Title = Unset;
         type Librarians = Unset;
+        type Duedate = Unset;
         type Books = Unset;
-        type Title = Unset;
-        type CreatedAt = Unset;
     }
-    ///State transition - sets the `duedate` field to Set
-    pub struct SetDuedate<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDuedate<S> {}
-    impl<S: State> State for SetDuedate<S> {
-        type Duedate = Set<members::duedate>;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type Title = S::Title;
         type Librarians = S::Librarians;
+        type Duedate = S::Duedate;
         type Books = S::Books;
-        type Title = S::Title;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
         type CreatedAt = S::CreatedAt;
+        type Title = Set<members::title>;
+        type Librarians = S::Librarians;
+        type Duedate = S::Duedate;
+        type Books = S::Books;
     }
     ///State transition - sets the `librarians` field to Set
     pub struct SetLibrarians<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLibrarians<S> {}
     impl<S: State> State for SetLibrarians<S> {
-        type Duedate = S::Duedate;
+        type CreatedAt = S::CreatedAt;
+        type Title = S::Title;
         type Librarians = Set<members::librarians>;
+        type Duedate = S::Duedate;
         type Books = S::Books;
-        type Title = S::Title;
+    }
+    ///State transition - sets the `duedate` field to Set
+    pub struct SetDuedate<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDuedate<S> {}
+    impl<S: State> State for SetDuedate<S> {
         type CreatedAt = S::CreatedAt;
+        type Title = S::Title;
+        type Librarians = S::Librarians;
+        type Duedate = Set<members::duedate>;
+        type Books = S::Books;
     }
     ///State transition - sets the `books` field to Set
     pub struct SetBooks<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBooks<S> {}
     impl<S: State> State for SetBooks<S> {
-        type Duedate = S::Duedate;
-        type Librarians = S::Librarians;
-        type Books = Set<members::books>;
-        type Title = S::Title;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Duedate = S::Duedate;
+        type Title = S::Title;
         type Librarians = S::Librarians;
-        type Books = S::Books;
-        type Title = Set<members::title>;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type Duedate = S::Duedate;
-        type Librarians = S::Librarians;
-        type Books = S::Books;
-        type Title = S::Title;
-        type CreatedAt = Set<members::created_at>;
+        type Books = Set<members::books>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `duedate` field
-        pub struct duedate(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `title` field
+        pub struct title(());
         ///Marker type for the `librarians` field
         pub struct librarians(());
+        ///Marker type for the `duedate` field
+        pub struct duedate(());
         ///Marker type for the `books` field
         pub struct books(());
-        ///Marker type for the `title` field
-        pub struct title(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ListBuilder<'a, S: list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<BookRequirement<'a>>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -262,7 +265,7 @@ pub struct ListBuilder<'a, S: list_state::State> {
         Option<Vec<Did<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> List<'a> {
@@ -276,9 +279,9 @@ impl<'a> ListBuilder<'a, list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -293,11 +296,11 @@ where
         mut self,
         value: impl Into<Vec<BookRequirement<'a>>>,
     ) -> ListBuilder<'a, list_state::SetBooks<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -312,11 +315,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListBuilder<'a, list_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -324,12 +327,12 @@ where
 impl<'a, S: list_state::State> ListBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -344,11 +347,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListBuilder<'a, list_state::SetDuedate<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -363,11 +366,11 @@ where
         mut self,
         value: impl Into<Vec<Did<'a>>>,
     ) -> ListBuilder<'a, list_state::SetLibrarians<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -382,11 +385,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ListBuilder<'a, list_state::SetTitle<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -394,21 +397,21 @@ where
 impl<'a, S> ListBuilder<'a, S>
 where
     S: list_state::State,
-    S::Duedate: list_state::IsSet,
+    S::CreatedAt: list_state::IsSet,
+    S::Title: list_state::IsSet,
     S::Librarians: list_state::IsSet,
+    S::Duedate: list_state::IsSet,
     S::Books: list_state::IsSet,
-    S::Title: list_state::IsSet,
-    S::CreatedAt: list_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> List<'a> {
         List {
-            books: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            duedate: self.__unsafe_private_named.3.unwrap(),
-            librarians: self.__unsafe_private_named.4.unwrap(),
-            title: self.__unsafe_private_named.5.unwrap(),
+            books: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            duedate: self._fields.3.unwrap(),
+            librarians: self._fields.4.unwrap(),
+            title: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -421,12 +424,12 @@ where
         >,
     ) -> List<'a> {
         List {
-            books: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            duedate: self.__unsafe_private_named.3.unwrap(),
-            librarians: self.__unsafe_private_named.4.unwrap(),
-            title: self.__unsafe_private_named.5.unwrap(),
+            books: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            duedate: self._fields.3.unwrap(),
+            librarians: self._fields.4.unwrap(),
+            title: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/bond_biblio/stamp.rs b/crates/jacquard-api/src/bond_biblio/stamp.rs
index dec0ddbb..8d895344 100644
--- a/crates/jacquard-api/src/bond_biblio/stamp.rs
+++ b/crates/jacquard-api/src/bond_biblio/stamp.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -113,59 +116,59 @@ pub mod stamp_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type List;
         type Book;
         type CreatedAt;
+        type List;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type List = Unset;
         type Book = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `list` field to Set
-    pub struct SetList<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetList<S> {}
-    impl<S: State> State for SetList<S> {
-        type List = Set<members::list>;
-        type Book = S::Book;
-        type CreatedAt = S::CreatedAt;
+        type List = Unset;
     }
     ///State transition - sets the `book` field to Set
     pub struct SetBook<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBook<S> {}
     impl<S: State> State for SetBook<S> {
-        type List = S::List;
         type Book = Set<members::book>;
         type CreatedAt = S::CreatedAt;
+        type List = S::List;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type List = S::List;
         type Book = S::Book;
         type CreatedAt = Set<members::created_at>;
+        type List = S::List;
+    }
+    ///State transition - sets the `list` field to Set
+    pub struct SetList<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetList<S> {}
+    impl<S: State> State for SetList<S> {
+        type Book = S::Book;
+        type CreatedAt = S::CreatedAt;
+        type List = Set<members::list>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `list` field
-        pub struct list(());
         ///Marker type for the `book` field
         pub struct book(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `list` field
+        pub struct list(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct StampBuilder<'a, S: stamp_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<Datetime>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<Datetime>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Stamp<'a> {
@@ -179,9 +182,9 @@ impl<'a> StampBuilder<'a, stamp_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StampBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> StampBuilder<'a, stamp_state::SetBook<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StampBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StampBuilder<'a, stamp_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StampBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> StampBuilder<'a, stamp_state::SetList<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         StampBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,16 +249,16 @@ where
 impl<'a, S> StampBuilder<'a, S>
 where
     S: stamp_state::State,
-    S::List: stamp_state::IsSet,
     S::Book: stamp_state::IsSet,
     S::CreatedAt: stamp_state::IsSet,
+    S::List: stamp_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Stamp<'a> {
         Stamp {
-            book: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            list: self.__unsafe_private_named.2.unwrap(),
+            book: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            list: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -268,9 +271,9 @@ where
         >,
     ) -> Stamp<'a> {
         Stamp {
-            book: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            list: self.__unsafe_private_named.2.unwrap(),
+            book: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            list: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/buzz_bookhive.rs b/crates/jacquard-api/src/buzz_bookhive.rs
index 85870e56..b7ff68a7 100644
--- a/crates/jacquard-api/src/buzz_bookhive.rs
+++ b/crates/jacquard-api/src/buzz_bookhive.rs
@@ -14,7 +14,11 @@ pub mod hive_book;
 pub mod list_genres;
 pub mod search_books;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -792,112 +796,112 @@ pub mod activity_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type UserHandle;
-        type UserDid;
         type CreatedAt;
+        type HiveId;
         type Title;
+        type UserDid;
+        type UserHandle;
         type Type;
-        type HiveId;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type UserHandle = Unset;
-        type UserDid = Unset;
         type CreatedAt = Unset;
+        type HiveId = Unset;
         type Title = Unset;
+        type UserDid = Unset;
+        type UserHandle = Unset;
         type Type = Unset;
-        type HiveId = Unset;
     }
-    ///State transition - sets the `user_handle` field to Set
-    pub struct SetUserHandle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUserHandle<S> {}
-    impl<S: State> State for SetUserHandle<S> {
-        type UserHandle = Set<members::user_handle>;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type HiveId = S::HiveId;
+        type Title = S::Title;
         type UserDid = S::UserDid;
+        type UserHandle = S::UserHandle;
+        type Type = S::Type;
+    }
+    ///State transition - sets the `hive_id` field to Set
+    pub struct SetHiveId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHiveId<S> {}
+    impl<S: State> State for SetHiveId<S> {
         type CreatedAt = S::CreatedAt;
+        type HiveId = Set<members::hive_id>;
         type Title = S::Title;
+        type UserDid = S::UserDid;
+        type UserHandle = S::UserHandle;
         type Type = S::Type;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type CreatedAt = S::CreatedAt;
         type HiveId = S::HiveId;
+        type Title = Set<members::title>;
+        type UserDid = S::UserDid;
+        type UserHandle = S::UserHandle;
+        type Type = S::Type;
     }
     ///State transition - sets the `user_did` field to Set
     pub struct SetUserDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUserDid<S> {}
     impl<S: State> State for SetUserDid<S> {
-        type UserHandle = S::UserHandle;
-        type UserDid = Set<members::user_did>;
         type CreatedAt = S::CreatedAt;
-        type Title = S::Title;
-        type Type = S::Type;
         type HiveId = S::HiveId;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type UserHandle = S::UserHandle;
-        type UserDid = S::UserDid;
-        type CreatedAt = Set<members::created_at>;
         type Title = S::Title;
+        type UserDid = Set<members::user_did>;
+        type UserHandle = S::UserHandle;
         type Type = S::Type;
-        type HiveId = S::HiveId;
     }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type UserHandle = S::UserHandle;
-        type UserDid = S::UserDid;
+    ///State transition - sets the `user_handle` field to Set
+    pub struct SetUserHandle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUserHandle<S> {}
+    impl<S: State> State for SetUserHandle<S> {
         type CreatedAt = S::CreatedAt;
-        type Title = Set<members::title>;
-        type Type = S::Type;
         type HiveId = S::HiveId;
+        type Title = S::Title;
+        type UserDid = S::UserDid;
+        type UserHandle = Set<members::user_handle>;
+        type Type = S::Type;
     }
     ///State transition - sets the `type` field to Set
     pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetType<S> {}
     impl<S: State> State for SetType<S> {
-        type UserHandle = S::UserHandle;
-        type UserDid = S::UserDid;
         type CreatedAt = S::CreatedAt;
-        type Title = S::Title;
-        type Type = Set<members::r#type>;
         type HiveId = S::HiveId;
-    }
-    ///State transition - sets the `hive_id` field to Set
-    pub struct SetHiveId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHiveId<S> {}
-    impl<S: State> State for SetHiveId<S> {
-        type UserHandle = S::UserHandle;
-        type UserDid = S::UserDid;
-        type CreatedAt = S::CreatedAt;
         type Title = S::Title;
-        type Type = S::Type;
-        type HiveId = Set<members::hive_id>;
+        type UserDid = S::UserDid;
+        type UserHandle = S::UserHandle;
+        type Type = Set<members::r#type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `user_handle` field
-        pub struct user_handle(());
-        ///Marker type for the `user_did` field
-        pub struct user_did(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `hive_id` field
+        pub struct hive_id(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `user_did` field
+        pub struct user_did(());
+        ///Marker type for the `user_handle` field
+        pub struct user_handle(());
         ///Marker type for the `type` field
         pub struct r#type(());
-        ///Marker type for the `hive_id` field
-        pub struct hive_id(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ActivityBuilder<'a, S: activity_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -905,7 +909,7 @@ pub struct ActivityBuilder<'a, S: activity_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Activity<'a> {
@@ -919,9 +923,9 @@ impl<'a> ActivityBuilder<'a, activity_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -936,11 +940,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ActivityBuilder<'a, activity_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -955,11 +959,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ActivityBuilder<'a, activity_state::SetHiveId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -974,11 +978,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ActivityBuilder<'a, activity_state::SetTitle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -993,11 +997,11 @@ where
         mut self,
         value: impl Into<ActivityType<'a>>,
     ) -> ActivityBuilder<'a, activity_state::SetType<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1012,11 +1016,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ActivityBuilder<'a, activity_state::SetUserDid<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1031,11 +1035,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ActivityBuilder<'a, activity_state::SetUserHandle<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1043,22 +1047,22 @@ where
 impl<'a, S> ActivityBuilder<'a, S>
 where
     S: activity_state::State,
-    S::UserHandle: activity_state::IsSet,
-    S::UserDid: activity_state::IsSet,
     S::CreatedAt: activity_state::IsSet,
+    S::HiveId: activity_state::IsSet,
     S::Title: activity_state::IsSet,
+    S::UserDid: activity_state::IsSet,
+    S::UserHandle: activity_state::IsSet,
     S::Type: activity_state::IsSet,
-    S::HiveId: activity_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Activity<'a> {
         Activity {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            hive_id: self.__unsafe_private_named.1.unwrap(),
-            title: self.__unsafe_private_named.2.unwrap(),
-            r#type: self.__unsafe_private_named.3.unwrap(),
-            user_did: self.__unsafe_private_named.4.unwrap(),
-            user_handle: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            hive_id: self._fields.1.unwrap(),
+            title: self._fields.2.unwrap(),
+            r#type: self._fields.3.unwrap(),
+            user_did: self._fields.4.unwrap(),
+            user_handle: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1071,12 +1075,12 @@ where
         >,
     ) -> Activity<'a> {
         Activity {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            hive_id: self.__unsafe_private_named.1.unwrap(),
-            title: self.__unsafe_private_named.2.unwrap(),
-            r#type: self.__unsafe_private_named.3.unwrap(),
-            user_did: self.__unsafe_private_named.4.unwrap(),
-            user_handle: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            hive_id: self._fields.1.unwrap(),
+            title: self._fields.2.unwrap(),
+            r#type: self._fields.3.unwrap(),
+            user_did: self._fields.4.unwrap(),
+            user_handle: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1693,8 +1697,8 @@ pub mod book_progress_state {
 
 /// Builder for constructing an instance of this type
 pub struct BookProgressBuilder<'a, S: book_progress_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<i64>,
         Option<i64>,
@@ -1702,7 +1706,7 @@ pub struct BookProgressBuilder<'a, S: book_progress_state::State> {
         Option<i64>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BookProgress<'a> {
@@ -1716,9 +1720,9 @@ impl<'a> BookProgressBuilder<'a, book_progress_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BookProgressBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1726,12 +1730,12 @@ impl<'a> BookProgressBuilder<'a, book_progress_state::Empty> {
 impl<'a, S: book_progress_state::State> BookProgressBuilder<'a, S> {
     /// Set the `currentChapter` field (optional)
     pub fn current_chapter(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `currentChapter` field to an Option value (optional)
     pub fn maybe_current_chapter(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1739,12 +1743,12 @@ impl<'a, S: book_progress_state::State> BookProgressBuilder<'a, S> {
 impl<'a, S: book_progress_state::State> BookProgressBuilder<'a, S> {
     /// Set the `currentPage` field (optional)
     pub fn current_page(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `currentPage` field to an Option value (optional)
     pub fn maybe_current_page(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1752,12 +1756,12 @@ impl<'a, S: book_progress_state::State> BookProgressBuilder<'a, S> {
 impl<'a, S: book_progress_state::State> BookProgressBuilder<'a, S> {
     /// Set the `percent` field (optional)
     pub fn percent(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `percent` field to an Option value (optional)
     pub fn maybe_percent(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1765,12 +1769,12 @@ impl<'a, S: book_progress_state::State> BookProgressBuilder<'a, S> {
 impl<'a, S: book_progress_state::State> BookProgressBuilder<'a, S> {
     /// Set the `totalChapters` field (optional)
     pub fn total_chapters(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `totalChapters` field to an Option value (optional)
     pub fn maybe_total_chapters(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1778,12 +1782,12 @@ impl<'a, S: book_progress_state::State> BookProgressBuilder<'a, S> {
 impl<'a, S: book_progress_state::State> BookProgressBuilder<'a, S> {
     /// Set the `totalPages` field (optional)
     pub fn total_pages(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `totalPages` field to an Option value (optional)
     pub fn maybe_total_pages(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1798,11 +1802,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BookProgressBuilder<'a, book_progress_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         BookProgressBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1815,12 +1819,12 @@ where
     /// Build the final struct
     pub fn build(self) -> BookProgress<'a> {
         BookProgress {
-            current_chapter: self.__unsafe_private_named.0,
-            current_page: self.__unsafe_private_named.1,
-            percent: self.__unsafe_private_named.2,
-            total_chapters: self.__unsafe_private_named.3,
-            total_pages: self.__unsafe_private_named.4,
-            updated_at: self.__unsafe_private_named.5.unwrap(),
+            current_chapter: self._fields.0,
+            current_page: self._fields.1,
+            percent: self._fields.2,
+            total_chapters: self._fields.3,
+            total_pages: self._fields.4,
+            updated_at: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1833,12 +1837,12 @@ where
         >,
     ) -> BookProgress<'a> {
         BookProgress {
-            current_chapter: self.__unsafe_private_named.0,
-            current_page: self.__unsafe_private_named.1,
-            percent: self.__unsafe_private_named.2,
-            total_chapters: self.__unsafe_private_named.3,
-            total_pages: self.__unsafe_private_named.4,
-            updated_at: self.__unsafe_private_named.5.unwrap(),
+            current_chapter: self._fields.0,
+            current_page: self._fields.1,
+            percent: self._fields.2,
+            total_chapters: self._fields.3,
+            total_pages: self._fields.4,
+            updated_at: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1854,112 +1858,112 @@ pub mod comment_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Did;
-        type CreatedAt;
+        type Comment;
+        type Book;
         type Handle;
+        type CreatedAt;
         type Parent;
-        type Book;
-        type Comment;
+        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Did = Unset;
-        type CreatedAt = Unset;
+        type Comment = Unset;
+        type Book = Unset;
         type Handle = Unset;
+        type CreatedAt = Unset;
         type Parent = Unset;
-        type Book = Unset;
-        type Comment = Unset;
+        type Did = Unset;
     }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Did = Set<members::did>;
-        type CreatedAt = S::CreatedAt;
+    ///State transition - sets the `comment` field to Set
+    pub struct SetComment<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetComment<S> {}
+    impl<S: State> State for SetComment<S> {
+        type Comment = Set<members::comment>;
+        type Book = S::Book;
         type Handle = S::Handle;
+        type CreatedAt = S::CreatedAt;
         type Parent = S::Parent;
-        type Book = S::Book;
-        type Comment = S::Comment;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type Did = S::Did;
-        type CreatedAt = Set<members::created_at>;
+    }
+    ///State transition - sets the `book` field to Set
+    pub struct SetBook<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBook<S> {}
+    impl<S: State> State for SetBook<S> {
+        type Comment = S::Comment;
+        type Book = Set<members::book>;
         type Handle = S::Handle;
+        type CreatedAt = S::CreatedAt;
         type Parent = S::Parent;
-        type Book = S::Book;
-        type Comment = S::Comment;
+        type Did = S::Did;
     }
     ///State transition - sets the `handle` field to Set
     pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHandle<S> {}
     impl<S: State> State for SetHandle<S> {
-        type Did = S::Did;
-        type CreatedAt = S::CreatedAt;
+        type Comment = S::Comment;
+        type Book = S::Book;
         type Handle = Set<members::handle>;
+        type CreatedAt = S::CreatedAt;
         type Parent = S::Parent;
-        type Book = S::Book;
+        type Did = S::Did;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
         type Comment = S::Comment;
+        type Book = S::Book;
+        type Handle = S::Handle;
+        type CreatedAt = Set<members::created_at>;
+        type Parent = S::Parent;
+        type Did = S::Did;
     }
     ///State transition - sets the `parent` field to Set
     pub struct SetParent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetParent<S> {}
     impl<S: State> State for SetParent<S> {
-        type Did = S::Did;
-        type CreatedAt = S::CreatedAt;
+        type Comment = S::Comment;
+        type Book = S::Book;
         type Handle = S::Handle;
+        type CreatedAt = S::CreatedAt;
         type Parent = Set<members::parent>;
-        type Book = S::Book;
-        type Comment = S::Comment;
-    }
-    ///State transition - sets the `book` field to Set
-    pub struct SetBook<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBook<S> {}
-    impl<S: State> State for SetBook<S> {
         type Did = S::Did;
-        type CreatedAt = S::CreatedAt;
-        type Handle = S::Handle;
-        type Parent = S::Parent;
-        type Book = Set<members::book>;
-        type Comment = S::Comment;
     }
-    ///State transition - sets the `comment` field to Set
-    pub struct SetComment<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetComment<S> {}
-    impl<S: State> State for SetComment<S> {
-        type Did = S::Did;
-        type CreatedAt = S::CreatedAt;
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Comment = S::Comment;
+        type Book = S::Book;
         type Handle = S::Handle;
+        type CreatedAt = S::CreatedAt;
         type Parent = S::Parent;
-        type Book = S::Book;
-        type Comment = Set<members::comment>;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `did` field
-        pub struct did(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
+        ///Marker type for the `comment` field
+        pub struct comment(());
+        ///Marker type for the `book` field
+        pub struct book(());
         ///Marker type for the `handle` field
         pub struct handle(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `parent` field
         pub struct parent(());
-        ///Marker type for the `book` field
-        pub struct book(());
-        ///Marker type for the `comment` field
-        pub struct comment(());
+        ///Marker type for the `did` field
+        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CommentBuilder<'a, S: comment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<StrongRef<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -1967,7 +1971,7 @@ pub struct CommentBuilder<'a, S: comment_state::State> {
         Option<CowStr<'a>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Comment<'a> {
@@ -1981,9 +1985,9 @@ impl<'a> CommentBuilder<'a, comment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1998,11 +2002,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetBook<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2017,11 +2021,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetComment<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2036,11 +2040,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CommentBuilder<'a, comment_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2055,11 +2059,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetDid<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2074,11 +2078,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetHandle<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2093,11 +2097,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetParent<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2105,22 +2109,22 @@ where
 impl<'a, S> CommentBuilder<'a, S>
 where
     S: comment_state::State,
-    S::Did: comment_state::IsSet,
-    S::CreatedAt: comment_state::IsSet,
+    S::Comment: comment_state::IsSet,
+    S::Book: comment_state::IsSet,
     S::Handle: comment_state::IsSet,
+    S::CreatedAt: comment_state::IsSet,
     S::Parent: comment_state::IsSet,
-    S::Book: comment_state::IsSet,
-    S::Comment: comment_state::IsSet,
+    S::Did: comment_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Comment<'a> {
         Comment {
-            book: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            did: self.__unsafe_private_named.3.unwrap(),
-            handle: self.__unsafe_private_named.4.unwrap(),
-            parent: self.__unsafe_private_named.5.unwrap(),
+            book: self._fields.0.unwrap(),
+            comment: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            did: self._fields.3.unwrap(),
+            handle: self._fields.4.unwrap(),
+            parent: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2133,12 +2137,12 @@ where
         >,
     ) -> Comment<'a> {
         Comment {
-            book: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            did: self.__unsafe_private_named.3.unwrap(),
-            handle: self.__unsafe_private_named.4.unwrap(),
-            parent: self.__unsafe_private_named.5.unwrap(),
+            book: self._fields.0.unwrap(),
+            comment: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            did: self._fields.3.unwrap(),
+            handle: self._fields.4.unwrap(),
+            parent: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2154,74 +2158,74 @@ pub mod profile_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type BooksRead;
-        type Reviews;
         type Handle;
+        type BooksRead;
         type DisplayName;
+        type Reviews;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type BooksRead = Unset;
-        type Reviews = Unset;
         type Handle = Unset;
+        type BooksRead = Unset;
         type DisplayName = Unset;
-    }
-    ///State transition - sets the `books_read` field to Set
-    pub struct SetBooksRead<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBooksRead<S> {}
-    impl<S: State> State for SetBooksRead<S> {
-        type BooksRead = Set<members::books_read>;
-        type Reviews = S::Reviews;
-        type Handle = S::Handle;
-        type DisplayName = S::DisplayName;
-    }
-    ///State transition - sets the `reviews` field to Set
-    pub struct SetReviews<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetReviews<S> {}
-    impl<S: State> State for SetReviews<S> {
-        type BooksRead = S::BooksRead;
-        type Reviews = Set<members::reviews>;
-        type Handle = S::Handle;
-        type DisplayName = S::DisplayName;
+        type Reviews = Unset;
     }
     ///State transition - sets the `handle` field to Set
     pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHandle<S> {}
     impl<S: State> State for SetHandle<S> {
+        type Handle = Set<members::handle>;
         type BooksRead = S::BooksRead;
+        type DisplayName = S::DisplayName;
         type Reviews = S::Reviews;
-        type Handle = Set<members::handle>;
+    }
+    ///State transition - sets the `books_read` field to Set
+    pub struct SetBooksRead<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBooksRead<S> {}
+    impl<S: State> State for SetBooksRead<S> {
+        type Handle = S::Handle;
+        type BooksRead = Set<members::books_read>;
         type DisplayName = S::DisplayName;
+        type Reviews = S::Reviews;
     }
     ///State transition - sets the `display_name` field to Set
     pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDisplayName<S> {}
     impl<S: State> State for SetDisplayName<S> {
+        type Handle = S::Handle;
         type BooksRead = S::BooksRead;
+        type DisplayName = Set<members::display_name>;
         type Reviews = S::Reviews;
+    }
+    ///State transition - sets the `reviews` field to Set
+    pub struct SetReviews<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetReviews<S> {}
+    impl<S: State> State for SetReviews<S> {
         type Handle = S::Handle;
-        type DisplayName = Set<members::display_name>;
+        type BooksRead = S::BooksRead;
+        type DisplayName = S::DisplayName;
+        type Reviews = Set<members::reviews>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `books_read` field
-        pub struct books_read(());
-        ///Marker type for the `reviews` field
-        pub struct reviews(());
         ///Marker type for the `handle` field
         pub struct handle(());
+        ///Marker type for the `books_read` field
+        pub struct books_read(());
         ///Marker type for the `display_name` field
         pub struct display_name(());
+        ///Marker type for the `reviews` field
+        pub struct reviews(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<i64>,
         Option<CowStr<'a>>,
@@ -2230,7 +2234,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<bool>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -2244,9 +2248,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2254,12 +2258,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -2274,11 +2278,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ProfileBuilder<'a, profile_state::SetBooksRead<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2286,12 +2290,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -2306,11 +2310,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProfileBuilder<'a, profile_state::SetDisplayName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2325,11 +2329,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProfileBuilder<'a, profile_state::SetHandle<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2337,12 +2341,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `isFollowing` field (optional)
     pub fn is_following(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `isFollowing` field to an Option value (optional)
     pub fn maybe_is_following(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -2357,11 +2361,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ProfileBuilder<'a, profile_state::SetReviews<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2369,21 +2373,21 @@ where
 impl<'a, S> ProfileBuilder<'a, S>
 where
     S: profile_state::State,
-    S::BooksRead: profile_state::IsSet,
-    S::Reviews: profile_state::IsSet,
     S::Handle: profile_state::IsSet,
+    S::BooksRead: profile_state::IsSet,
     S::DisplayName: profile_state::IsSet,
+    S::Reviews: profile_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            books_read: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3.unwrap(),
-            handle: self.__unsafe_private_named.4.unwrap(),
-            is_following: self.__unsafe_private_named.5,
-            reviews: self.__unsafe_private_named.6.unwrap(),
+            avatar: self._fields.0,
+            books_read: self._fields.1.unwrap(),
+            description: self._fields.2,
+            display_name: self._fields.3.unwrap(),
+            handle: self._fields.4.unwrap(),
+            is_following: self._fields.5,
+            reviews: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2396,13 +2400,13 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            books_read: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3.unwrap(),
-            handle: self.__unsafe_private_named.4.unwrap(),
-            is_following: self.__unsafe_private_named.5,
-            reviews: self.__unsafe_private_named.6.unwrap(),
+            avatar: self._fields.0,
+            books_read: self._fields.1.unwrap(),
+            description: self._fields.2,
+            display_name: self._fields.3.unwrap(),
+            handle: self._fields.4.unwrap(),
+            is_following: self._fields.5,
+            reviews: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2418,81 +2422,81 @@ pub mod review_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Handle;
         type Review;
-        type Did;
         type CreatedAt;
+        type Handle;
+        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Handle = Unset;
         type Review = Unset;
-        type Did = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `handle` field to Set
-    pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHandle<S> {}
-    impl<S: State> State for SetHandle<S> {
-        type Handle = Set<members::handle>;
-        type Review = S::Review;
-        type Did = S::Did;
-        type CreatedAt = S::CreatedAt;
+        type Handle = Unset;
+        type Did = Unset;
     }
     ///State transition - sets the `review` field to Set
     pub struct SetReview<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetReview<S> {}
     impl<S: State> State for SetReview<S> {
-        type Handle = S::Handle;
         type Review = Set<members::review>;
-        type Did = S::Did;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
         type Handle = S::Handle;
-        type Review = S::Review;
-        type Did = Set<members::did>;
-        type CreatedAt = S::CreatedAt;
+        type Did = S::Did;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Review = S::Review;
+        type CreatedAt = Set<members::created_at>;
         type Handle = S::Handle;
+        type Did = S::Did;
+    }
+    ///State transition - sets the `handle` field to Set
+    pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHandle<S> {}
+    impl<S: State> State for SetHandle<S> {
         type Review = S::Review;
+        type CreatedAt = S::CreatedAt;
+        type Handle = Set<members::handle>;
         type Did = S::Did;
-        type CreatedAt = Set<members::created_at>;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Review = S::Review;
+        type CreatedAt = S::CreatedAt;
+        type Handle = S::Handle;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `handle` field
-        pub struct handle(());
         ///Marker type for the `review` field
         pub struct review(());
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `handle` field
+        pub struct handle(());
+        ///Marker type for the `did` field
+        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReviewBuilder<'a, S: review_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Review<'a> {
@@ -2506,9 +2510,9 @@ impl<'a> ReviewBuilder<'a, review_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2523,11 +2527,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReviewBuilder<'a, review_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2542,11 +2546,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReviewBuilder<'a, review_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2561,11 +2565,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReviewBuilder<'a, review_state::SetHandle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2580,11 +2584,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReviewBuilder<'a, review_state::SetReview<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2592,12 +2596,12 @@ where
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `stars` field (optional)
     pub fn stars(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `stars` field to an Option value (optional)
     pub fn maybe_stars(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -2605,19 +2609,19 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S> ReviewBuilder<'a, S>
 where
     S: review_state::State,
-    S::Handle: review_state::IsSet,
     S::Review: review_state::IsSet,
-    S::Did: review_state::IsSet,
     S::CreatedAt: review_state::IsSet,
+    S::Handle: review_state::IsSet,
+    S::Did: review_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Review<'a> {
         Review {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            handle: self.__unsafe_private_named.2.unwrap(),
-            review: self.__unsafe_private_named.3.unwrap(),
-            stars: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            handle: self._fields.2.unwrap(),
+            review: self._fields.3.unwrap(),
+            stars: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -2630,11 +2634,11 @@ where
         >,
     ) -> Review<'a> {
         Review {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            handle: self.__unsafe_private_named.2.unwrap(),
-            review: self.__unsafe_private_named.3.unwrap(),
-            stars: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            handle: self._fields.2.unwrap(),
+            review: self._fields.3.unwrap(),
+            stars: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
@@ -2650,112 +2654,112 @@ pub mod user_book_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type HiveId;
-        type UserDid;
-        type CreatedAt;
         type Title;
+        type UserDid;
         type Authors;
+        type HiveId;
         type Thumbnail;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type HiveId = Unset;
-        type UserDid = Unset;
-        type CreatedAt = Unset;
         type Title = Unset;
+        type UserDid = Unset;
         type Authors = Unset;
+        type HiveId = Unset;
         type Thumbnail = Unset;
+        type CreatedAt = Unset;
     }
-    ///State transition - sets the `hive_id` field to Set
-    pub struct SetHiveId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHiveId<S> {}
-    impl<S: State> State for SetHiveId<S> {
-        type HiveId = Set<members::hive_id>;
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type Title = Set<members::title>;
         type UserDid = S::UserDid;
-        type CreatedAt = S::CreatedAt;
-        type Title = S::Title;
         type Authors = S::Authors;
+        type HiveId = S::HiveId;
         type Thumbnail = S::Thumbnail;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `user_did` field to Set
     pub struct SetUserDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUserDid<S> {}
     impl<S: State> State for SetUserDid<S> {
-        type HiveId = S::HiveId;
-        type UserDid = Set<members::user_did>;
-        type CreatedAt = S::CreatedAt;
         type Title = S::Title;
+        type UserDid = Set<members::user_did>;
         type Authors = S::Authors;
-        type Thumbnail = S::Thumbnail;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type HiveId = S::HiveId;
-        type UserDid = S::UserDid;
-        type CreatedAt = Set<members::created_at>;
-        type Title = S::Title;
-        type Authors = S::Authors;
         type Thumbnail = S::Thumbnail;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type HiveId = S::HiveId;
-        type UserDid = S::UserDid;
         type CreatedAt = S::CreatedAt;
-        type Title = Set<members::title>;
-        type Authors = S::Authors;
-        type Thumbnail = S::Thumbnail;
     }
     ///State transition - sets the `authors` field to Set
     pub struct SetAuthors<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthors<S> {}
     impl<S: State> State for SetAuthors<S> {
-        type HiveId = S::HiveId;
+        type Title = S::Title;
         type UserDid = S::UserDid;
+        type Authors = Set<members::authors>;
+        type HiveId = S::HiveId;
+        type Thumbnail = S::Thumbnail;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `hive_id` field to Set
+    pub struct SetHiveId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHiveId<S> {}
+    impl<S: State> State for SetHiveId<S> {
         type Title = S::Title;
-        type Authors = Set<members::authors>;
+        type UserDid = S::UserDid;
+        type Authors = S::Authors;
+        type HiveId = Set<members::hive_id>;
         type Thumbnail = S::Thumbnail;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `thumbnail` field to Set
     pub struct SetThumbnail<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetThumbnail<S> {}
     impl<S: State> State for SetThumbnail<S> {
-        type HiveId = S::HiveId;
+        type Title = S::Title;
         type UserDid = S::UserDid;
+        type Authors = S::Authors;
+        type HiveId = S::HiveId;
+        type Thumbnail = Set<members::thumbnail>;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
         type Title = S::Title;
+        type UserDid = S::UserDid;
         type Authors = S::Authors;
-        type Thumbnail = Set<members::thumbnail>;
+        type HiveId = S::HiveId;
+        type Thumbnail = S::Thumbnail;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `hive_id` field
-        pub struct hive_id(());
-        ///Marker type for the `user_did` field
-        pub struct user_did(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `user_did` field
+        pub struct user_did(());
         ///Marker type for the `authors` field
         pub struct authors(());
+        ///Marker type for the `hive_id` field
+        pub struct hive_id(());
         ///Marker type for the `thumbnail` field
         pub struct thumbnail(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct UserBookBuilder<'a, S: user_book_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<buzz_bookhive::BookProgress<'a>>,
         Option<CowStr<'a>>,
@@ -2773,7 +2777,7 @@ pub struct UserBookBuilder<'a, S: user_book_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UserBook<'a> {
@@ -2787,8 +2791,8 @@ impl<'a> UserBookBuilder<'a, user_book_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UserBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -2806,7 +2810,7 @@ impl<'a> UserBookBuilder<'a, user_book_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2821,11 +2825,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> UserBookBuilder<'a, user_book_state::SetAuthors<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UserBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2836,7 +2840,7 @@ impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<buzz_bookhive::BookProgress<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `bookProgress` field to an Option value (optional)
@@ -2844,7 +2848,7 @@ impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
         mut self,
         value: Option<buzz_bookhive::BookProgress<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -2852,12 +2856,12 @@ impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
 impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
     /// Set the `cover` field (optional)
     pub fn cover(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `cover` field to an Option value (optional)
     pub fn maybe_cover(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -2872,11 +2876,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> UserBookBuilder<'a, user_book_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         UserBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2884,12 +2888,12 @@ where
 impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -2897,12 +2901,12 @@ impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
 impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
     /// Set the `finishedAt` field (optional)
     pub fn finished_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `finishedAt` field to an Option value (optional)
     pub fn maybe_finished_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -2917,11 +2921,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> UserBookBuilder<'a, user_book_state::SetHiveId<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         UserBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2929,12 +2933,12 @@ where
 impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
     /// Set the `rating` field (optional)
     pub fn rating(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `rating` field to an Option value (optional)
     pub fn maybe_rating(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -2942,12 +2946,12 @@ impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
 impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -2955,12 +2959,12 @@ impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
 impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
     /// Set the `stars` field (optional)
     pub fn stars(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `stars` field to an Option value (optional)
     pub fn maybe_stars(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -2968,12 +2972,12 @@ impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
 impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
     /// Set the `startedAt` field (optional)
     pub fn started_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `startedAt` field to an Option value (optional)
     pub fn maybe_started_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -2981,12 +2985,12 @@ impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
 impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<UserBookStatus<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<UserBookStatus<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -3001,11 +3005,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> UserBookBuilder<'a, user_book_state::SetThumbnail<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         UserBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3020,11 +3024,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> UserBookBuilder<'a, user_book_state::SetTitle<S>> {
-        self.__unsafe_private_named.13 = Option::Some(value.into());
+        self._fields.13 = Option::Some(value.into());
         UserBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3039,11 +3043,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> UserBookBuilder<'a, user_book_state::SetUserDid<S>> {
-        self.__unsafe_private_named.14 = Option::Some(value.into());
+        self._fields.14 = Option::Some(value.into());
         UserBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3051,12 +3055,12 @@ where
 impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
     /// Set the `userHandle` field (optional)
     pub fn user_handle(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `userHandle` field to an Option value (optional)
     pub fn maybe_user_handle(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -3064,32 +3068,32 @@ impl<'a, S: user_book_state::State> UserBookBuilder<'a, S> {
 impl<'a, S> UserBookBuilder<'a, S>
 where
     S: user_book_state::State,
-    S::HiveId: user_book_state::IsSet,
-    S::UserDid: user_book_state::IsSet,
-    S::CreatedAt: user_book_state::IsSet,
     S::Title: user_book_state::IsSet,
+    S::UserDid: user_book_state::IsSet,
     S::Authors: user_book_state::IsSet,
+    S::HiveId: user_book_state::IsSet,
     S::Thumbnail: user_book_state::IsSet,
+    S::CreatedAt: user_book_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> UserBook<'a> {
         UserBook {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            book_progress: self.__unsafe_private_named.1,
-            cover: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            description: self.__unsafe_private_named.4,
-            finished_at: self.__unsafe_private_named.5,
-            hive_id: self.__unsafe_private_named.6.unwrap(),
-            rating: self.__unsafe_private_named.7,
-            review: self.__unsafe_private_named.8,
-            stars: self.__unsafe_private_named.9,
-            started_at: self.__unsafe_private_named.10,
-            status: self.__unsafe_private_named.11,
-            thumbnail: self.__unsafe_private_named.12.unwrap(),
-            title: self.__unsafe_private_named.13.unwrap(),
-            user_did: self.__unsafe_private_named.14.unwrap(),
-            user_handle: self.__unsafe_private_named.15,
+            authors: self._fields.0.unwrap(),
+            book_progress: self._fields.1,
+            cover: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            description: self._fields.4,
+            finished_at: self._fields.5,
+            hive_id: self._fields.6.unwrap(),
+            rating: self._fields.7,
+            review: self._fields.8,
+            stars: self._fields.9,
+            started_at: self._fields.10,
+            status: self._fields.11,
+            thumbnail: self._fields.12.unwrap(),
+            title: self._fields.13.unwrap(),
+            user_did: self._fields.14.unwrap(),
+            user_handle: self._fields.15,
             extra_data: Default::default(),
         }
     }
@@ -3102,22 +3106,22 @@ where
         >,
     ) -> UserBook<'a> {
         UserBook {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            book_progress: self.__unsafe_private_named.1,
-            cover: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            description: self.__unsafe_private_named.4,
-            finished_at: self.__unsafe_private_named.5,
-            hive_id: self.__unsafe_private_named.6.unwrap(),
-            rating: self.__unsafe_private_named.7,
-            review: self.__unsafe_private_named.8,
-            stars: self.__unsafe_private_named.9,
-            started_at: self.__unsafe_private_named.10,
-            status: self.__unsafe_private_named.11,
-            thumbnail: self.__unsafe_private_named.12.unwrap(),
-            title: self.__unsafe_private_named.13.unwrap(),
-            user_did: self.__unsafe_private_named.14.unwrap(),
-            user_handle: self.__unsafe_private_named.15,
+            authors: self._fields.0.unwrap(),
+            book_progress: self._fields.1,
+            cover: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            description: self._fields.4,
+            finished_at: self._fields.5,
+            hive_id: self._fields.6.unwrap(),
+            rating: self._fields.7,
+            review: self._fields.8,
+            stars: self._fields.9,
+            started_at: self._fields.10,
+            status: self._fields.11,
+            thumbnail: self._fields.12.unwrap(),
+            title: self._fields.13.unwrap(),
+            user_did: self._fields.14.unwrap(),
+            user_handle: self._fields.15,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/buzz_bookhive/book.rs b/crates/jacquard-api/src/buzz_bookhive/book.rs
index c89044f6..51f04f89 100644
--- a/crates/jacquard-api/src/buzz_bookhive/book.rs
+++ b/crates/jacquard-api/src/buzz_bookhive/book.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -359,74 +362,74 @@ pub mod book_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Title;
         type Authors;
         type HiveId;
         type CreatedAt;
-        type Title;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Title = Unset;
         type Authors = Unset;
         type HiveId = Unset;
         type CreatedAt = Unset;
-        type Title = Unset;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type Title = Set<members::title>;
+        type Authors = S::Authors;
+        type HiveId = S::HiveId;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `authors` field to Set
     pub struct SetAuthors<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthors<S> {}
     impl<S: State> State for SetAuthors<S> {
+        type Title = S::Title;
         type Authors = Set<members::authors>;
         type HiveId = S::HiveId;
         type CreatedAt = S::CreatedAt;
-        type Title = S::Title;
     }
     ///State transition - sets the `hive_id` field to Set
     pub struct SetHiveId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHiveId<S> {}
     impl<S: State> State for SetHiveId<S> {
+        type Title = S::Title;
         type Authors = S::Authors;
         type HiveId = Set<members::hive_id>;
         type CreatedAt = S::CreatedAt;
-        type Title = S::Title;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Authors = S::Authors;
-        type HiveId = S::HiveId;
-        type CreatedAt = Set<members::created_at>;
         type Title = S::Title;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
         type Authors = S::Authors;
         type HiveId = S::HiveId;
-        type CreatedAt = S::CreatedAt;
-        type Title = Set<members::title>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `title` field
+        pub struct title(());
         ///Marker type for the `authors` field
         pub struct authors(());
         ///Marker type for the `hive_id` field
         pub struct hive_id(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `title` field
-        pub struct title(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BookBuilder<'a, S: book_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<BookProgress<'a>>,
         Option<BlobRef<'a>>,
@@ -439,7 +442,7 @@ pub struct BookBuilder<'a, S: book_state::State> {
         Option<BookStatus<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Book<'a> {
@@ -453,21 +456,9 @@ impl<'a> BookBuilder<'a, book_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -482,11 +473,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BookBuilder<'a, book_state::SetAuthors<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -494,12 +485,12 @@ where
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `bookProgress` field (optional)
     pub fn book_progress(mut self, value: impl Into<Option<BookProgress<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `bookProgress` field to an Option value (optional)
     pub fn maybe_book_progress(mut self, value: Option<BookProgress<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -507,12 +498,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `cover` field (optional)
     pub fn cover(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `cover` field to an Option value (optional)
     pub fn maybe_cover(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -527,11 +518,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BookBuilder<'a, book_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -539,12 +530,12 @@ where
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `finishedAt` field (optional)
     pub fn finished_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `finishedAt` field to an Option value (optional)
     pub fn maybe_finished_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -559,11 +550,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BookBuilder<'a, book_state::SetHiveId<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         BookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -571,12 +562,12 @@ where
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -584,12 +575,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `stars` field (optional)
     pub fn stars(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `stars` field to an Option value (optional)
     pub fn maybe_stars(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -597,12 +588,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `startedAt` field (optional)
     pub fn started_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `startedAt` field to an Option value (optional)
     pub fn maybe_started_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -610,12 +601,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<BookStatus<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<BookStatus<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -630,11 +621,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BookBuilder<'a, book_state::SetTitle<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         BookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -642,25 +633,25 @@ where
 impl<'a, S> BookBuilder<'a, S>
 where
     S: book_state::State,
+    S::Title: book_state::IsSet,
     S::Authors: book_state::IsSet,
     S::HiveId: book_state::IsSet,
     S::CreatedAt: book_state::IsSet,
-    S::Title: book_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Book<'a> {
         Book {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            book_progress: self.__unsafe_private_named.1,
-            cover: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            finished_at: self.__unsafe_private_named.4,
-            hive_id: self.__unsafe_private_named.5.unwrap(),
-            review: self.__unsafe_private_named.6,
-            stars: self.__unsafe_private_named.7,
-            started_at: self.__unsafe_private_named.8,
-            status: self.__unsafe_private_named.9,
-            title: self.__unsafe_private_named.10.unwrap(),
+            authors: self._fields.0.unwrap(),
+            book_progress: self._fields.1,
+            cover: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            finished_at: self._fields.4,
+            hive_id: self._fields.5.unwrap(),
+            review: self._fields.6,
+            stars: self._fields.7,
+            started_at: self._fields.8,
+            status: self._fields.9,
+            title: self._fields.10.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -673,17 +664,17 @@ where
         >,
     ) -> Book<'a> {
         Book {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            book_progress: self.__unsafe_private_named.1,
-            cover: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            finished_at: self.__unsafe_private_named.4,
-            hive_id: self.__unsafe_private_named.5.unwrap(),
-            review: self.__unsafe_private_named.6,
-            stars: self.__unsafe_private_named.7,
-            started_at: self.__unsafe_private_named.8,
-            status: self.__unsafe_private_named.9,
-            title: self.__unsafe_private_named.10.unwrap(),
+            authors: self._fields.0.unwrap(),
+            book_progress: self._fields.1,
+            cover: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            finished_at: self._fields.4,
+            hive_id: self._fields.5.unwrap(),
+            review: self._fields.6,
+            stars: self._fields.7,
+            started_at: self._fields.8,
+            status: self._fields.9,
+            title: self._fields.10.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/buzz_bookhive/buzz.rs b/crates/jacquard-api/src/buzz_bookhive/buzz.rs
index a0e72fc5..6d230f0e 100644
--- a/crates/jacquard-api/src/buzz_bookhive/buzz.rs
+++ b/crates/jacquard-api/src/buzz_bookhive/buzz.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -139,80 +142,80 @@ pub mod buzz_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type Book;
         type Comment;
         type Parent;
+        type CreatedAt;
+        type Book;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type Book = Unset;
         type Comment = Unset;
         type Parent = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Book = S::Book;
-        type Comment = S::Comment;
-        type Parent = S::Parent;
-    }
-    ///State transition - sets the `book` field to Set
-    pub struct SetBook<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBook<S> {}
-    impl<S: State> State for SetBook<S> {
-        type CreatedAt = S::CreatedAt;
-        type Book = Set<members::book>;
-        type Comment = S::Comment;
-        type Parent = S::Parent;
+        type CreatedAt = Unset;
+        type Book = Unset;
     }
     ///State transition - sets the `comment` field to Set
     pub struct SetComment<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetComment<S> {}
     impl<S: State> State for SetComment<S> {
-        type CreatedAt = S::CreatedAt;
-        type Book = S::Book;
         type Comment = Set<members::comment>;
         type Parent = S::Parent;
+        type CreatedAt = S::CreatedAt;
+        type Book = S::Book;
     }
     ///State transition - sets the `parent` field to Set
     pub struct SetParent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetParent<S> {}
     impl<S: State> State for SetParent<S> {
+        type Comment = S::Comment;
+        type Parent = Set<members::parent>;
         type CreatedAt = S::CreatedAt;
         type Book = S::Book;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
         type Comment = S::Comment;
-        type Parent = Set<members::parent>;
+        type Parent = S::Parent;
+        type CreatedAt = Set<members::created_at>;
+        type Book = S::Book;
+    }
+    ///State transition - sets the `book` field to Set
+    pub struct SetBook<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBook<S> {}
+    impl<S: State> State for SetBook<S> {
+        type Comment = S::Comment;
+        type Parent = S::Parent;
+        type CreatedAt = S::CreatedAt;
+        type Book = Set<members::book>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `book` field
-        pub struct book(());
         ///Marker type for the `comment` field
         pub struct comment(());
         ///Marker type for the `parent` field
         pub struct parent(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `book` field
+        pub struct book(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BuzzBuilder<'a, S: buzz_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<StrongRef<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Buzz<'a> {
@@ -226,9 +229,9 @@ impl<'a> BuzzBuilder<'a, buzz_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BuzzBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -243,11 +246,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> BuzzBuilder<'a, buzz_state::SetBook<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BuzzBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -262,11 +265,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BuzzBuilder<'a, buzz_state::SetComment<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BuzzBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -281,11 +284,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BuzzBuilder<'a, buzz_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BuzzBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -300,11 +303,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> BuzzBuilder<'a, buzz_state::SetParent<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BuzzBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -312,18 +315,18 @@ where
 impl<'a, S> BuzzBuilder<'a, S>
 where
     S: buzz_state::State,
-    S::CreatedAt: buzz_state::IsSet,
-    S::Book: buzz_state::IsSet,
     S::Comment: buzz_state::IsSet,
     S::Parent: buzz_state::IsSet,
+    S::CreatedAt: buzz_state::IsSet,
+    S::Book: buzz_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Buzz<'a> {
         Buzz {
-            book: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            parent: self.__unsafe_private_named.3.unwrap(),
+            book: self._fields.0.unwrap(),
+            comment: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            parent: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -336,10 +339,10 @@ where
         >,
     ) -> Buzz<'a> {
         Buzz {
-            book: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            parent: self.__unsafe_private_named.3.unwrap(),
+            book: self._fields.0.unwrap(),
+            comment: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            parent: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/buzz_bookhive/get_book.rs b/crates/jacquard-api/src/buzz_bookhive/get_book.rs
index d85dd33c..413bcac2 100644
--- a/crates/jacquard-api/src/buzz_bookhive/get_book.rs
+++ b/crates/jacquard-api/src/buzz_bookhive/get_book.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::blob::BlobRef;
@@ -230,14 +233,14 @@ pub mod get_book_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetBookBuilder<'a, S: get_book_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetBook<'a> {
@@ -251,9 +254,9 @@ impl<'a> GetBookBuilder<'a, get_book_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -261,12 +264,12 @@ impl<'a> GetBookBuilder<'a, get_book_state::Empty> {
 impl<'a, S: get_book_state::State> GetBookBuilder<'a, S> {
     /// Set the `goodreadsId` field (optional)
     pub fn goodreads_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `goodreadsId` field to an Option value (optional)
     pub fn maybe_goodreads_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -274,12 +277,12 @@ impl<'a, S: get_book_state::State> GetBookBuilder<'a, S> {
 impl<'a, S: get_book_state::State> GetBookBuilder<'a, S> {
     /// Set the `id` field (optional)
     pub fn id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `id` field to an Option value (optional)
     pub fn maybe_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -287,12 +290,12 @@ impl<'a, S: get_book_state::State> GetBookBuilder<'a, S> {
 impl<'a, S: get_book_state::State> GetBookBuilder<'a, S> {
     /// Set the `isbn` field (optional)
     pub fn isbn(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `isbn` field to an Option value (optional)
     pub fn maybe_isbn(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -300,12 +303,12 @@ impl<'a, S: get_book_state::State> GetBookBuilder<'a, S> {
 impl<'a, S: get_book_state::State> GetBookBuilder<'a, S> {
     /// Set the `isbn13` field (optional)
     pub fn isbn13(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `isbn13` field to an Option value (optional)
     pub fn maybe_isbn13(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -317,10 +320,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetBook<'a> {
         GetBook {
-            goodreads_id: self.__unsafe_private_named.0,
-            id: self.__unsafe_private_named.1,
-            isbn: self.__unsafe_private_named.2,
-            isbn13: self.__unsafe_private_named.3,
+            goodreads_id: self._fields.0,
+            id: self._fields.1,
+            isbn: self._fields.2,
+            isbn13: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/buzz_bookhive/get_book_identifiers.rs b/crates/jacquard-api/src/buzz_bookhive/get_book_identifiers.rs
index 91109df7..1b024c76 100644
--- a/crates/jacquard-api/src/buzz_bookhive/get_book_identifiers.rs
+++ b/crates/jacquard-api/src/buzz_bookhive/get_book_identifiers.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -83,14 +86,14 @@ pub mod get_book_identifiers_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetBookIdentifiersBuilder<'a, S: get_book_identifiers_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetBookIdentifiers<'a> {
@@ -104,9 +107,9 @@ impl<'a> GetBookIdentifiersBuilder<'a, get_book_identifiers_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetBookIdentifiersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,12 +117,12 @@ impl<'a> GetBookIdentifiersBuilder<'a, get_book_identifiers_state::Empty> {
 impl<'a, S: get_book_identifiers_state::State> GetBookIdentifiersBuilder<'a, S> {
     /// Set the `goodreadsId` field (optional)
     pub fn goodreads_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `goodreadsId` field to an Option value (optional)
     pub fn maybe_goodreads_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -127,12 +130,12 @@ impl<'a, S: get_book_identifiers_state::State> GetBookIdentifiersBuilder<'a, S>
 impl<'a, S: get_book_identifiers_state::State> GetBookIdentifiersBuilder<'a, S> {
     /// Set the `hiveId` field (optional)
     pub fn hive_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `hiveId` field to an Option value (optional)
     pub fn maybe_hive_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -140,12 +143,12 @@ impl<'a, S: get_book_identifiers_state::State> GetBookIdentifiersBuilder<'a, S>
 impl<'a, S: get_book_identifiers_state::State> GetBookIdentifiersBuilder<'a, S> {
     /// Set the `isbn` field (optional)
     pub fn isbn(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `isbn` field to an Option value (optional)
     pub fn maybe_isbn(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -153,12 +156,12 @@ impl<'a, S: get_book_identifiers_state::State> GetBookIdentifiersBuilder<'a, S>
 impl<'a, S: get_book_identifiers_state::State> GetBookIdentifiersBuilder<'a, S> {
     /// Set the `isbn13` field (optional)
     pub fn isbn13(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `isbn13` field to an Option value (optional)
     pub fn maybe_isbn13(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -170,10 +173,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetBookIdentifiers<'a> {
         GetBookIdentifiers {
-            goodreads_id: self.__unsafe_private_named.0,
-            hive_id: self.__unsafe_private_named.1,
-            isbn: self.__unsafe_private_named.2,
-            isbn13: self.__unsafe_private_named.3,
+            goodreads_id: self._fields.0,
+            hive_id: self._fields.1,
+            isbn: self._fields.2,
+            isbn13: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/buzz_bookhive/get_profile.rs b/crates/jacquard-api/src/buzz_bookhive/get_profile.rs
index f3a78e2b..c74b5930 100644
--- a/crates/jacquard-api/src/buzz_bookhive/get_profile.rs
+++ b/crates/jacquard-api/src/buzz_bookhive/get_profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -89,9 +92,9 @@ pub mod get_profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetProfileBuilder<'a, S: get_profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetProfile<'a> {
@@ -105,9 +108,9 @@ impl<'a> GetProfileBuilder<'a, get_profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -115,12 +118,12 @@ impl<'a> GetProfileBuilder<'a, get_profile_state::Empty> {
 impl<'a, S: get_profile_state::State> GetProfileBuilder<'a, S> {
     /// Set the `did` field (optional)
     pub fn did(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `did` field to an Option value (optional)
     pub fn maybe_did(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -128,12 +131,12 @@ impl<'a, S: get_profile_state::State> GetProfileBuilder<'a, S> {
 impl<'a, S: get_profile_state::State> GetProfileBuilder<'a, S> {
     /// Set the `handle` field (optional)
     pub fn handle(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `handle` field to an Option value (optional)
     pub fn maybe_handle(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -145,8 +148,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetProfile<'a> {
         GetProfile {
-            did: self.__unsafe_private_named.0,
-            handle: self.__unsafe_private_named.1,
+            did: self._fields.0,
+            handle: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/buzz_bookhive/hive_book.rs b/crates/jacquard-api/src/buzz_bookhive/hive_book.rs
index ea8ff868..b60cd2dd 100644
--- a/crates/jacquard-api/src/buzz_bookhive/hive_book.rs
+++ b/crates/jacquard-api/src/buzz_bookhive/hive_book.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -222,112 +225,112 @@ pub mod hive_book_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Title;
+        type CreatedAt;
         type UpdatedAt;
+        type Id;
         type Thumbnail;
         type Authors;
-        type Id;
-        type Title;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Title = Unset;
+        type CreatedAt = Unset;
         type UpdatedAt = Unset;
+        type Id = Unset;
         type Thumbnail = Unset;
         type Authors = Unset;
-        type Id = Unset;
-        type Title = Unset;
-        type CreatedAt = Unset;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type Title = Set<members::title>;
+        type CreatedAt = S::CreatedAt;
+        type UpdatedAt = S::UpdatedAt;
+        type Id = S::Id;
+        type Thumbnail = S::Thumbnail;
+        type Authors = S::Authors;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Title = S::Title;
+        type CreatedAt = Set<members::created_at>;
+        type UpdatedAt = S::UpdatedAt;
+        type Id = S::Id;
+        type Thumbnail = S::Thumbnail;
+        type Authors = S::Authors;
     }
     ///State transition - sets the `updated_at` field to Set
     pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
     impl<S: State> State for SetUpdatedAt<S> {
+        type Title = S::Title;
+        type CreatedAt = S::CreatedAt;
         type UpdatedAt = Set<members::updated_at>;
+        type Id = S::Id;
         type Thumbnail = S::Thumbnail;
         type Authors = S::Authors;
-        type Id = S::Id;
+    }
+    ///State transition - sets the `id` field to Set
+    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetId<S> {}
+    impl<S: State> State for SetId<S> {
         type Title = S::Title;
         type CreatedAt = S::CreatedAt;
+        type UpdatedAt = S::UpdatedAt;
+        type Id = Set<members::id>;
+        type Thumbnail = S::Thumbnail;
+        type Authors = S::Authors;
     }
     ///State transition - sets the `thumbnail` field to Set
     pub struct SetThumbnail<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetThumbnail<S> {}
     impl<S: State> State for SetThumbnail<S> {
+        type Title = S::Title;
+        type CreatedAt = S::CreatedAt;
         type UpdatedAt = S::UpdatedAt;
+        type Id = S::Id;
         type Thumbnail = Set<members::thumbnail>;
         type Authors = S::Authors;
-        type Id = S::Id;
-        type Title = S::Title;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `authors` field to Set
     pub struct SetAuthors<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthors<S> {}
     impl<S: State> State for SetAuthors<S> {
-        type UpdatedAt = S::UpdatedAt;
-        type Thumbnail = S::Thumbnail;
-        type Authors = Set<members::authors>;
-        type Id = S::Id;
         type Title = S::Title;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `id` field to Set
-    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetId<S> {}
-    impl<S: State> State for SetId<S> {
         type UpdatedAt = S::UpdatedAt;
-        type Thumbnail = S::Thumbnail;
-        type Authors = S::Authors;
-        type Id = Set<members::id>;
-        type Title = S::Title;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type UpdatedAt = S::UpdatedAt;
-        type Thumbnail = S::Thumbnail;
-        type Authors = S::Authors;
         type Id = S::Id;
-        type Title = Set<members::title>;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type UpdatedAt = S::UpdatedAt;
         type Thumbnail = S::Thumbnail;
-        type Authors = S::Authors;
-        type Id = S::Id;
-        type Title = S::Title;
-        type CreatedAt = Set<members::created_at>;
+        type Authors = Set<members::authors>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `title` field
+        pub struct title(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `updated_at` field
         pub struct updated_at(());
+        ///Marker type for the `id` field
+        pub struct id(());
         ///Marker type for the `thumbnail` field
         pub struct thumbnail(());
         ///Marker type for the `authors` field
         pub struct authors(());
-        ///Marker type for the `id` field
-        pub struct id(());
-        ///Marker type for the `title` field
-        pub struct title(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct HiveBookBuilder<'a, S: hive_book_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -343,7 +346,7 @@ pub struct HiveBookBuilder<'a, S: hive_book_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> HiveBook<'a> {
@@ -357,8 +360,8 @@ impl<'a> HiveBookBuilder<'a, hive_book_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HiveBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -374,7 +377,7 @@ impl<'a> HiveBookBuilder<'a, hive_book_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -389,11 +392,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> HiveBookBuilder<'a, hive_book_state::SetAuthors<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         HiveBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -401,12 +404,12 @@ where
 impl<'a, S: hive_book_state::State> HiveBookBuilder<'a, S> {
     /// Set the `cover` field (optional)
     pub fn cover(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cover` field to an Option value (optional)
     pub fn maybe_cover(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -421,11 +424,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> HiveBookBuilder<'a, hive_book_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         HiveBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -433,12 +436,12 @@ where
 impl<'a, S: hive_book_state::State> HiveBookBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -453,11 +456,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> HiveBookBuilder<'a, hive_book_state::SetId<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         HiveBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -465,12 +468,12 @@ where
 impl<'a, S: hive_book_state::State> HiveBookBuilder<'a, S> {
     /// Set the `identifiers` field (optional)
     pub fn identifiers(mut self, value: impl Into<Option<BookIdentifiers<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `identifiers` field to an Option value (optional)
     pub fn maybe_identifiers(mut self, value: Option<BookIdentifiers<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -478,12 +481,12 @@ impl<'a, S: hive_book_state::State> HiveBookBuilder<'a, S> {
 impl<'a, S: hive_book_state::State> HiveBookBuilder<'a, S> {
     /// Set the `rating` field (optional)
     pub fn rating(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `rating` field to an Option value (optional)
     pub fn maybe_rating(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -491,12 +494,12 @@ impl<'a, S: hive_book_state::State> HiveBookBuilder<'a, S> {
 impl<'a, S: hive_book_state::State> HiveBookBuilder<'a, S> {
     /// Set the `ratingsCount` field (optional)
     pub fn ratings_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `ratingsCount` field to an Option value (optional)
     pub fn maybe_ratings_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -504,12 +507,12 @@ impl<'a, S: hive_book_state::State> HiveBookBuilder<'a, S> {
 impl<'a, S: hive_book_state::State> HiveBookBuilder<'a, S> {
     /// Set the `source` field (optional)
     pub fn source(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `source` field to an Option value (optional)
     pub fn maybe_source(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -517,12 +520,12 @@ impl<'a, S: hive_book_state::State> HiveBookBuilder<'a, S> {
 impl<'a, S: hive_book_state::State> HiveBookBuilder<'a, S> {
     /// Set the `sourceId` field (optional)
     pub fn source_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `sourceId` field to an Option value (optional)
     pub fn maybe_source_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -530,12 +533,12 @@ impl<'a, S: hive_book_state::State> HiveBookBuilder<'a, S> {
 impl<'a, S: hive_book_state::State> HiveBookBuilder<'a, S> {
     /// Set the `sourceUrl` field (optional)
     pub fn source_url(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `sourceUrl` field to an Option value (optional)
     pub fn maybe_source_url(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -550,11 +553,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> HiveBookBuilder<'a, hive_book_state::SetThumbnail<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         HiveBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -569,11 +572,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> HiveBookBuilder<'a, hive_book_state::SetTitle<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         HiveBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -588,11 +591,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> HiveBookBuilder<'a, hive_book_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.13 = Option::Some(value.into());
+        self._fields.13 = Option::Some(value.into());
         HiveBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -600,30 +603,30 @@ where
 impl<'a, S> HiveBookBuilder<'a, S>
 where
     S: hive_book_state::State,
+    S::Title: hive_book_state::IsSet,
+    S::CreatedAt: hive_book_state::IsSet,
     S::UpdatedAt: hive_book_state::IsSet,
+    S::Id: hive_book_state::IsSet,
     S::Thumbnail: hive_book_state::IsSet,
     S::Authors: hive_book_state::IsSet,
-    S::Id: hive_book_state::IsSet,
-    S::Title: hive_book_state::IsSet,
-    S::CreatedAt: hive_book_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> HiveBook<'a> {
         HiveBook {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            cover: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            id: self.__unsafe_private_named.4.unwrap(),
-            identifiers: self.__unsafe_private_named.5,
-            rating: self.__unsafe_private_named.6,
-            ratings_count: self.__unsafe_private_named.7,
-            source: self.__unsafe_private_named.8,
-            source_id: self.__unsafe_private_named.9,
-            source_url: self.__unsafe_private_named.10,
-            thumbnail: self.__unsafe_private_named.11.unwrap(),
-            title: self.__unsafe_private_named.12.unwrap(),
-            updated_at: self.__unsafe_private_named.13.unwrap(),
+            authors: self._fields.0.unwrap(),
+            cover: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            id: self._fields.4.unwrap(),
+            identifiers: self._fields.5,
+            rating: self._fields.6,
+            ratings_count: self._fields.7,
+            source: self._fields.8,
+            source_id: self._fields.9,
+            source_url: self._fields.10,
+            thumbnail: self._fields.11.unwrap(),
+            title: self._fields.12.unwrap(),
+            updated_at: self._fields.13.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -636,20 +639,20 @@ where
         >,
     ) -> HiveBook<'a> {
         HiveBook {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            cover: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            id: self.__unsafe_private_named.4.unwrap(),
-            identifiers: self.__unsafe_private_named.5,
-            rating: self.__unsafe_private_named.6,
-            ratings_count: self.__unsafe_private_named.7,
-            source: self.__unsafe_private_named.8,
-            source_id: self.__unsafe_private_named.9,
-            source_url: self.__unsafe_private_named.10,
-            thumbnail: self.__unsafe_private_named.11.unwrap(),
-            title: self.__unsafe_private_named.12.unwrap(),
-            updated_at: self.__unsafe_private_named.13.unwrap(),
+            authors: self._fields.0.unwrap(),
+            cover: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            id: self._fields.4.unwrap(),
+            identifiers: self._fields.5,
+            rating: self._fields.6,
+            ratings_count: self._fields.7,
+            source: self._fields.8,
+            source_id: self._fields.9,
+            source_url: self._fields.10,
+            thumbnail: self._fields.11.unwrap(),
+            title: self._fields.12.unwrap(),
+            updated_at: self._fields.13.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/buzz_bookhive/list_genres.rs b/crates/jacquard-api/src/buzz_bookhive/list_genres.rs
index 9e055848..a21f62a7 100644
--- a/crates/jacquard-api/src/buzz_bookhive/list_genres.rs
+++ b/crates/jacquard-api/src/buzz_bookhive/list_genres.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -144,9 +147,9 @@ pub mod genre_with_count_state {
 
 /// Builder for constructing an instance of this type
 pub struct GenreWithCountBuilder<'a, S: genre_with_count_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GenreWithCount<'a> {
@@ -160,9 +163,9 @@ impl<'a> GenreWithCountBuilder<'a, genre_with_count_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GenreWithCountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -177,11 +180,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> GenreWithCountBuilder<'a, genre_with_count_state::SetCount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GenreWithCountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GenreWithCountBuilder<'a, genre_with_count_state::SetGenre<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GenreWithCountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -214,8 +217,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GenreWithCount<'a> {
         GenreWithCount {
-            count: self.__unsafe_private_named.0.unwrap(),
-            genre: self.__unsafe_private_named.1.unwrap(),
+            count: self._fields.0.unwrap(),
+            genre: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -228,8 +231,8 @@ where
         >,
     ) -> GenreWithCount<'a> {
         GenreWithCount {
-            count: self.__unsafe_private_named.0.unwrap(),
-            genre: self.__unsafe_private_named.1.unwrap(),
+            count: self._fields.0.unwrap(),
+            genre: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -341,8 +344,8 @@ pub mod list_genres_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListGenresBuilder<S: list_genres_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<i64>),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<i64>),
 }
 
 impl ListGenres {
@@ -356,8 +359,8 @@ impl ListGenresBuilder<list_genres_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListGenresBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
+            _state: PhantomData,
+            _fields: (None, None, None),
         }
     }
 }
@@ -365,12 +368,12 @@ impl ListGenresBuilder<list_genres_state::Empty> {
 impl<S: list_genres_state::State> ListGenresBuilder<S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -378,12 +381,12 @@ impl<S: list_genres_state::State> ListGenresBuilder<S> {
 impl<S: list_genres_state::State> ListGenresBuilder<S> {
     /// Set the `minBooks` field (optional)
     pub fn min_books(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `minBooks` field to an Option value (optional)
     pub fn maybe_min_books(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -391,12 +394,12 @@ impl<S: list_genres_state::State> ListGenresBuilder<S> {
 impl<S: list_genres_state::State> ListGenresBuilder<S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -408,9 +411,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ListGenres {
         ListGenres {
-            limit: self.__unsafe_private_named.0,
-            min_books: self.__unsafe_private_named.1,
-            offset: self.__unsafe_private_named.2,
+            limit: self._fields.0,
+            min_books: self._fields.1,
+            offset: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/buzz_bookhive/search_books.rs b/crates/jacquard-api/src/buzz_bookhive/search_books.rs
index 773b6799..ef58b659 100644
--- a/crates/jacquard-api/src/buzz_bookhive/search_books.rs
+++ b/crates/jacquard-api/src/buzz_bookhive/search_books.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -93,15 +96,15 @@ pub mod search_books_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchBooksBuilder<'a, S: search_books_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<i64>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchBooks<'a> {
@@ -115,9 +118,9 @@ impl<'a> SearchBooksBuilder<'a, search_books_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchBooksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -125,12 +128,12 @@ impl<'a> SearchBooksBuilder<'a, search_books_state::Empty> {
 impl<'a, S: search_books_state::State> SearchBooksBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -138,12 +141,12 @@ impl<'a, S: search_books_state::State> SearchBooksBuilder<'a, S> {
 impl<'a, S: search_books_state::State> SearchBooksBuilder<'a, S> {
     /// Set the `id` field (optional)
     pub fn id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `id` field to an Option value (optional)
     pub fn maybe_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -151,12 +154,12 @@ impl<'a, S: search_books_state::State> SearchBooksBuilder<'a, S> {
 impl<'a, S: search_books_state::State> SearchBooksBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -164,12 +167,12 @@ impl<'a, S: search_books_state::State> SearchBooksBuilder<'a, S> {
 impl<'a, S: search_books_state::State> SearchBooksBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -177,12 +180,12 @@ impl<'a, S: search_books_state::State> SearchBooksBuilder<'a, S> {
 impl<'a, S: search_books_state::State> SearchBooksBuilder<'a, S> {
     /// Set the `q` field (optional)
     pub fn q(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `q` field to an Option value (optional)
     pub fn maybe_q(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -194,11 +197,11 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchBooks<'a> {
         SearchBooks {
-            genre: self.__unsafe_private_named.0,
-            id: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            offset: self.__unsafe_private_named.3,
-            q: self.__unsafe_private_named.4,
+            genre: self._fields.0,
+            id: self._fields.1,
+            limit: self._fields.2,
+            offset: self._fields.3,
+            q: self._fields.4,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/ca_jmaingot/board_game_play.rs b/crates/jacquard-api/src/ca_jmaingot/board_game_play.rs
index 10d0c278..7807a750 100644
--- a/crates/jacquard-api/src/ca_jmaingot/board_game_play.rs
+++ b/crates/jacquard-api/src/ca_jmaingot/board_game_play.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -113,58 +116,58 @@ pub mod board_game_play_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Name;
-        type BggId;
         type PlayedAt;
+        type BggId;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Name = Unset;
-        type BggId = Unset;
         type PlayedAt = Unset;
+        type BggId = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
         type Name = Set<members::name>;
-        type BggId = S::BggId;
-        type PlayedAt = S::PlayedAt;
-    }
-    ///State transition - sets the `bgg_id` field to Set
-    pub struct SetBggId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBggId<S> {}
-    impl<S: State> State for SetBggId<S> {
-        type Name = S::Name;
-        type BggId = Set<members::bgg_id>;
         type PlayedAt = S::PlayedAt;
+        type BggId = S::BggId;
     }
     ///State transition - sets the `played_at` field to Set
     pub struct SetPlayedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPlayedAt<S> {}
     impl<S: State> State for SetPlayedAt<S> {
         type Name = S::Name;
-        type BggId = S::BggId;
         type PlayedAt = Set<members::played_at>;
+        type BggId = S::BggId;
+    }
+    ///State transition - sets the `bgg_id` field to Set
+    pub struct SetBggId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBggId<S> {}
+    impl<S: State> State for SetBggId<S> {
+        type Name = S::Name;
+        type PlayedAt = S::PlayedAt;
+        type BggId = Set<members::bgg_id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `bgg_id` field
-        pub struct bgg_id(());
         ///Marker type for the `played_at` field
         pub struct played_at(());
+        ///Marker type for the `bgg_id` field
+        pub struct bgg_id(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BoardGamePlayBuilder<'a, S: board_game_play_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BoardGamePlay<'a> {
@@ -178,9 +181,9 @@ impl<'a> BoardGamePlayBuilder<'a, board_game_play_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BoardGamePlayBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -195,11 +198,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BoardGamePlayBuilder<'a, board_game_play_state::SetBggId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BoardGamePlayBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -214,11 +217,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BoardGamePlayBuilder<'a, board_game_play_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BoardGamePlayBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -233,11 +236,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BoardGamePlayBuilder<'a, board_game_play_state::SetPlayedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BoardGamePlayBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,15 +249,15 @@ impl<'a, S> BoardGamePlayBuilder<'a, S>
 where
     S: board_game_play_state::State,
     S::Name: board_game_play_state::IsSet,
-    S::BggId: board_game_play_state::IsSet,
     S::PlayedAt: board_game_play_state::IsSet,
+    S::BggId: board_game_play_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> BoardGamePlay<'a> {
         BoardGamePlay {
-            bgg_id: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            played_at: self.__unsafe_private_named.2.unwrap(),
+            bgg_id: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            played_at: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -267,9 +270,9 @@ where
         >,
     ) -> BoardGamePlay<'a> {
         BoardGamePlay {
-            bgg_id: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            played_at: self.__unsafe_private_named.2.unwrap(),
+            bgg_id: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            played_at: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/cat_vt3e/gallery/group.rs b/crates/jacquard-api/src/cat_vt3e/gallery/group.rs
index 512aeed0..b87b1d85 100644
--- a/crates/jacquard-api/src/cat_vt3e/gallery/group.rs
+++ b/crates/jacquard-api/src/cat_vt3e/gallery/group.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -156,9 +159,9 @@ pub mod group_state {
 
 /// Builder for constructing an instance of this type
 pub struct GroupBuilder<'a, S: group_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Group<'a> {
@@ -172,9 +175,9 @@ impl<'a> GroupBuilder<'a, group_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -189,11 +192,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> GroupBuilder<'a, group_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -201,12 +204,12 @@ where
 impl<'a, S: group_state::State> GroupBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -214,12 +217,12 @@ impl<'a, S: group_state::State> GroupBuilder<'a, S> {
 impl<'a, S: group_state::State> GroupBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -232,9 +235,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Group<'a> {
         Group {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            title: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -247,9 +250,9 @@ where
         >,
     ) -> Group<'a> {
         Group {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            title: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/cat_vt3e/gallery/group_item.rs b/crates/jacquard-api/src/cat_vt3e/gallery/group_item.rs
index 4453ea2e..892374fa 100644
--- a/crates/jacquard-api/src/cat_vt3e/gallery/group_item.rs
+++ b/crates/jacquard-api/src/cat_vt3e/gallery/group_item.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -115,64 +118,64 @@ pub mod group_item_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type AddedAt;
-        type Group;
         type Image;
+        type Group;
+        type AddedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type AddedAt = Unset;
-        type Group = Unset;
         type Image = Unset;
+        type Group = Unset;
+        type AddedAt = Unset;
     }
-    ///State transition - sets the `added_at` field to Set
-    pub struct SetAddedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAddedAt<S> {}
-    impl<S: State> State for SetAddedAt<S> {
-        type AddedAt = Set<members::added_at>;
+    ///State transition - sets the `image` field to Set
+    pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetImage<S> {}
+    impl<S: State> State for SetImage<S> {
+        type Image = Set<members::image>;
         type Group = S::Group;
-        type Image = S::Image;
+        type AddedAt = S::AddedAt;
     }
     ///State transition - sets the `group` field to Set
     pub struct SetGroup<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetGroup<S> {}
     impl<S: State> State for SetGroup<S> {
-        type AddedAt = S::AddedAt;
-        type Group = Set<members::group>;
         type Image = S::Image;
-    }
-    ///State transition - sets the `image` field to Set
-    pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetImage<S> {}
-    impl<S: State> State for SetImage<S> {
+        type Group = Set<members::group>;
         type AddedAt = S::AddedAt;
+    }
+    ///State transition - sets the `added_at` field to Set
+    pub struct SetAddedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAddedAt<S> {}
+    impl<S: State> State for SetAddedAt<S> {
+        type Image = S::Image;
         type Group = S::Group;
-        type Image = Set<members::image>;
+        type AddedAt = Set<members::added_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `added_at` field
-        pub struct added_at(());
-        ///Marker type for the `group` field
-        pub struct group(());
         ///Marker type for the `image` field
         pub struct image(());
+        ///Marker type for the `group` field
+        pub struct group(());
+        ///Marker type for the `added_at` field
+        pub struct added_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GroupItemBuilder<'a, S: group_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<AtUri<'a>>,
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GroupItem<'a> {
@@ -186,9 +189,9 @@ impl<'a> GroupItemBuilder<'a, group_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GroupItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,11 +206,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> GroupItemBuilder<'a, group_item_state::SetAddedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GroupItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -222,11 +225,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GroupItemBuilder<'a, group_item_state::SetGroup<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GroupItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -241,11 +244,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GroupItemBuilder<'a, group_item_state::SetImage<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GroupItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,12 +256,12 @@ where
 impl<'a, S: group_item_state::State> GroupItemBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -266,17 +269,17 @@ impl<'a, S: group_item_state::State> GroupItemBuilder<'a, S> {
 impl<'a, S> GroupItemBuilder<'a, S>
 where
     S: group_item_state::State,
-    S::AddedAt: group_item_state::IsSet,
-    S::Group: group_item_state::IsSet,
     S::Image: group_item_state::IsSet,
+    S::Group: group_item_state::IsSet,
+    S::AddedAt: group_item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GroupItem<'a> {
         GroupItem {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            group: self.__unsafe_private_named.1.unwrap(),
-            image: self.__unsafe_private_named.2.unwrap(),
-            note: self.__unsafe_private_named.3,
+            added_at: self._fields.0.unwrap(),
+            group: self._fields.1.unwrap(),
+            image: self._fields.2.unwrap(),
+            note: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -289,10 +292,10 @@ where
         >,
     ) -> GroupItem<'a> {
         GroupItem {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            group: self.__unsafe_private_named.1.unwrap(),
-            image: self.__unsafe_private_named.2.unwrap(),
-            note: self.__unsafe_private_named.3,
+            added_at: self._fields.0.unwrap(),
+            group: self._fields.1.unwrap(),
+            image: self._fields.2.unwrap(),
+            note: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/cat_vt3e/gallery/image.rs b/crates/jacquard-api/src/cat_vt3e/gallery/image.rs
index 1eeac145..934a1aa6 100644
--- a/crates/jacquard-api/src/cat_vt3e/gallery/image.rs
+++ b/crates/jacquard-api/src/cat_vt3e/gallery/image.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -206,44 +209,44 @@ pub mod image_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Image;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Image = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Image = S::Image;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `image` field to Set
     pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetImage<S> {}
     impl<S: State> State for SetImage<S> {
-        type CreatedAt = S::CreatedAt;
         type Image = Set<members::image>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Image = S::Image;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `image` field
         pub struct image(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ImageBuilder<'a, S: image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<i64>,
         Option<CowStr<'a>>,
@@ -257,7 +260,7 @@ pub struct ImageBuilder<'a, S: image_state::State> {
         Option<CowStr<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Image<'a> {
@@ -271,8 +274,8 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -286,7 +289,7 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -294,12 +297,12 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -307,12 +310,12 @@ impl<'a, S: image_state::State> ImageBuilder<'a, S> {
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `aspectRatio` field (optional)
     pub fn aspect_ratio(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
     pub fn maybe_aspect_ratio(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -320,12 +323,12 @@ impl<'a, S: image_state::State> ImageBuilder<'a, S> {
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `blurhash` field (optional)
     pub fn blurhash(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `blurhash` field to an Option value (optional)
     pub fn maybe_blurhash(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -333,12 +336,12 @@ impl<'a, S: image_state::State> ImageBuilder<'a, S> {
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `caption` field (optional)
     pub fn caption(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `caption` field to an Option value (optional)
     pub fn maybe_caption(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -346,12 +349,12 @@ impl<'a, S: image_state::State> ImageBuilder<'a, S> {
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `checksum` field (optional)
     pub fn checksum(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `checksum` field to an Option value (optional)
     pub fn maybe_checksum(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -366,11 +369,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ImageBuilder<'a, image_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -378,12 +381,12 @@ where
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `dominantColour` field (optional)
     pub fn dominant_colour(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `dominantColour` field to an Option value (optional)
     pub fn maybe_dominant_colour(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -391,12 +394,12 @@ impl<'a, S: image_state::State> ImageBuilder<'a, S> {
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `height` field (optional)
     pub fn height(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `height` field to an Option value (optional)
     pub fn maybe_height(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -411,11 +414,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ImageBuilder<'a, image_state::SetImage<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -423,12 +426,12 @@ where
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `sizeInBytes` field (optional)
     pub fn size_in_bytes(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `sizeInBytes` field to an Option value (optional)
     pub fn maybe_size_in_bytes(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -436,12 +439,12 @@ impl<'a, S: image_state::State> ImageBuilder<'a, S> {
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -449,12 +452,12 @@ impl<'a, S: image_state::State> ImageBuilder<'a, S> {
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `width` field (optional)
     pub fn width(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `width` field to an Option value (optional)
     pub fn maybe_width(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -462,24 +465,24 @@ impl<'a, S: image_state::State> ImageBuilder<'a, S> {
 impl<'a, S> ImageBuilder<'a, S>
 where
     S: image_state::State,
-    S::CreatedAt: image_state::IsSet,
     S::Image: image_state::IsSet,
+    S::CreatedAt: image_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0,
-            aspect_ratio: self.__unsafe_private_named.1,
-            blurhash: self.__unsafe_private_named.2,
-            caption: self.__unsafe_private_named.3,
-            checksum: self.__unsafe_private_named.4,
-            created_at: self.__unsafe_private_named.5.unwrap(),
-            dominant_colour: self.__unsafe_private_named.6,
-            height: self.__unsafe_private_named.7,
-            image: self.__unsafe_private_named.8.unwrap(),
-            size_in_bytes: self.__unsafe_private_named.9,
-            title: self.__unsafe_private_named.10,
-            width: self.__unsafe_private_named.11,
+            alt: self._fields.0,
+            aspect_ratio: self._fields.1,
+            blurhash: self._fields.2,
+            caption: self._fields.3,
+            checksum: self._fields.4,
+            created_at: self._fields.5.unwrap(),
+            dominant_colour: self._fields.6,
+            height: self._fields.7,
+            image: self._fields.8.unwrap(),
+            size_in_bytes: self._fields.9,
+            title: self._fields.10,
+            width: self._fields.11,
             extra_data: Default::default(),
         }
     }
@@ -492,18 +495,18 @@ where
         >,
     ) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0,
-            aspect_ratio: self.__unsafe_private_named.1,
-            blurhash: self.__unsafe_private_named.2,
-            caption: self.__unsafe_private_named.3,
-            checksum: self.__unsafe_private_named.4,
-            created_at: self.__unsafe_private_named.5.unwrap(),
-            dominant_colour: self.__unsafe_private_named.6,
-            height: self.__unsafe_private_named.7,
-            image: self.__unsafe_private_named.8.unwrap(),
-            size_in_bytes: self.__unsafe_private_named.9,
-            title: self.__unsafe_private_named.10,
-            width: self.__unsafe_private_named.11,
+            alt: self._fields.0,
+            aspect_ratio: self._fields.1,
+            blurhash: self._fields.2,
+            caption: self._fields.3,
+            checksum: self._fields.4,
+            created_at: self._fields.5.unwrap(),
+            dominant_colour: self._fields.6,
+            height: self._fields.7,
+            image: self._fields.8.unwrap(),
+            size_in_bytes: self._fields.9,
+            title: self._fields.10,
+            width: self._fields.11,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/ch_indiemusi/alpha/actor/artist.rs b/crates/jacquard-api/src/ch_indiemusi/alpha/actor/artist.rs
index 3b1c412a..ff16ae65 100644
--- a/crates/jacquard-api/src/ch_indiemusi/alpha/actor/artist.rs
+++ b/crates/jacquard-api/src/ch_indiemusi/alpha/actor/artist.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -129,9 +132,9 @@ pub mod artist_state {
 
 /// Builder for constructing an instance of this type
 pub struct ArtistBuilder<'a, S: artist_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Artist<'a> {
@@ -145,9 +148,9 @@ impl<'a> ArtistBuilder<'a, artist_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ArtistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -155,12 +158,12 @@ impl<'a> ArtistBuilder<'a, artist_state::Empty> {
 impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -172,7 +175,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Artist<'a> {
         Artist {
-            name: self.__unsafe_private_named.0,
+            name: self._fields.0,
             extra_data: Default::default(),
         }
     }
@@ -185,7 +188,7 @@ where
         >,
     ) -> Artist<'a> {
         Artist {
-            name: self.__unsafe_private_named.0,
+            name: self._fields.0,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/ch_indiemusi/alpha/actor/master_owner.rs b/crates/jacquard-api/src/ch_indiemusi/alpha/actor/master_owner.rs
index a24ed21f..7bdbd5f2 100644
--- a/crates/jacquard-api/src/ch_indiemusi/alpha/actor/master_owner.rs
+++ b/crates/jacquard-api/src/ch_indiemusi/alpha/actor/master_owner.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -142,9 +145,9 @@ pub mod master_owner_state {
 
 /// Builder for constructing an instance of this type
 pub struct MasterOwnerBuilder<'a, S: master_owner_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MasterOwner<'a> {
@@ -158,9 +161,9 @@ impl<'a> MasterOwnerBuilder<'a, master_owner_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MasterOwnerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -175,11 +178,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MasterOwnerBuilder<'a, master_owner_state::SetName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MasterOwnerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -192,7 +195,7 @@ where
     /// Build the final struct
     pub fn build(self) -> MasterOwner<'a> {
         MasterOwner {
-            name: self.__unsafe_private_named.0.unwrap(),
+            name: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -205,7 +208,7 @@ where
         >,
     ) -> MasterOwner<'a> {
         MasterOwner {
-            name: self.__unsafe_private_named.0.unwrap(),
+            name: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/ch_indiemusi/alpha/actor/publishing_owner.rs b/crates/jacquard-api/src/ch_indiemusi/alpha/actor/publishing_owner.rs
index e828e163..1d171c99 100644
--- a/crates/jacquard-api/src/ch_indiemusi/alpha/actor/publishing_owner.rs
+++ b/crates/jacquard-api/src/ch_indiemusi/alpha/actor/publishing_owner.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -182,15 +185,15 @@ pub mod publishing_owner_state {
 
 /// Builder for constructing an instance of this type
 pub struct PublishingOwnerBuilder<'a, S: publishing_owner_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PublishingOwner<'a> {
@@ -204,9 +207,9 @@ impl<'a> PublishingOwnerBuilder<'a, publishing_owner_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PublishingOwnerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -214,12 +217,12 @@ impl<'a> PublishingOwnerBuilder<'a, publishing_owner_state::Empty> {
 impl<'a, S: publishing_owner_state::State> PublishingOwnerBuilder<'a, S> {
     /// Set the `collectingSociety` field (optional)
     pub fn collecting_society(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `collectingSociety` field to an Option value (optional)
     pub fn maybe_collecting_society(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -227,12 +230,12 @@ impl<'a, S: publishing_owner_state::State> PublishingOwnerBuilder<'a, S> {
 impl<'a, S: publishing_owner_state::State> PublishingOwnerBuilder<'a, S> {
     /// Set the `companyName` field (optional)
     pub fn company_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `companyName` field to an Option value (optional)
     pub fn maybe_company_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -240,12 +243,12 @@ impl<'a, S: publishing_owner_state::State> PublishingOwnerBuilder<'a, S> {
 impl<'a, S: publishing_owner_state::State> PublishingOwnerBuilder<'a, S> {
     /// Set the `firstName` field (optional)
     pub fn first_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `firstName` field to an Option value (optional)
     pub fn maybe_first_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -253,12 +256,12 @@ impl<'a, S: publishing_owner_state::State> PublishingOwnerBuilder<'a, S> {
 impl<'a, S: publishing_owner_state::State> PublishingOwnerBuilder<'a, S> {
     /// Set the `ipi` field (optional)
     pub fn ipi(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `ipi` field to an Option value (optional)
     pub fn maybe_ipi(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -266,12 +269,12 @@ impl<'a, S: publishing_owner_state::State> PublishingOwnerBuilder<'a, S> {
 impl<'a, S: publishing_owner_state::State> PublishingOwnerBuilder<'a, S> {
     /// Set the `lastName` field (optional)
     pub fn last_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `lastName` field to an Option value (optional)
     pub fn maybe_last_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -283,11 +286,11 @@ where
     /// Build the final struct
     pub fn build(self) -> PublishingOwner<'a> {
         PublishingOwner {
-            collecting_society: self.__unsafe_private_named.0,
-            company_name: self.__unsafe_private_named.1,
-            first_name: self.__unsafe_private_named.2,
-            ipi: self.__unsafe_private_named.3,
-            last_name: self.__unsafe_private_named.4,
+            collecting_society: self._fields.0,
+            company_name: self._fields.1,
+            first_name: self._fields.2,
+            ipi: self._fields.3,
+            last_name: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -300,11 +303,11 @@ where
         >,
     ) -> PublishingOwner<'a> {
         PublishingOwner {
-            collecting_society: self.__unsafe_private_named.0,
-            company_name: self.__unsafe_private_named.1,
-            first_name: self.__unsafe_private_named.2,
-            ipi: self.__unsafe_private_named.3,
-            last_name: self.__unsafe_private_named.4,
+            collecting_society: self._fields.0,
+            company_name: self._fields.1,
+            first_name: self._fields.2,
+            ipi: self._fields.3,
+            last_name: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/ch_indiemusi/alpha/grant.rs b/crates/jacquard-api/src/ch_indiemusi/alpha/grant.rs
index 4d542417..571616c5 100644
--- a/crates/jacquard-api/src/ch_indiemusi/alpha/grant.rs
+++ b/crates/jacquard-api/src/ch_indiemusi/alpha/grant.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -172,57 +175,57 @@ pub mod grant_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type ServiceDid;
-        type WrappedMasterKey;
         type CreatedAt;
+        type WrappedMasterKey;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type ServiceDid = Unset;
-        type WrappedMasterKey = Unset;
         type CreatedAt = Unset;
+        type WrappedMasterKey = Unset;
     }
     ///State transition - sets the `service_did` field to Set
     pub struct SetServiceDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetServiceDid<S> {}
     impl<S: State> State for SetServiceDid<S> {
         type ServiceDid = Set<members::service_did>;
-        type WrappedMasterKey = S::WrappedMasterKey;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `wrapped_master_key` field to Set
-    pub struct SetWrappedMasterKey<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetWrappedMasterKey<S> {}
-    impl<S: State> State for SetWrappedMasterKey<S> {
-        type ServiceDid = S::ServiceDid;
-        type WrappedMasterKey = Set<members::wrapped_master_key>;
         type CreatedAt = S::CreatedAt;
+        type WrappedMasterKey = S::WrappedMasterKey;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type ServiceDid = S::ServiceDid;
-        type WrappedMasterKey = S::WrappedMasterKey;
         type CreatedAt = Set<members::created_at>;
+        type WrappedMasterKey = S::WrappedMasterKey;
+    }
+    ///State transition - sets the `wrapped_master_key` field to Set
+    pub struct SetWrappedMasterKey<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetWrappedMasterKey<S> {}
+    impl<S: State> State for SetWrappedMasterKey<S> {
+        type ServiceDid = S::ServiceDid;
+        type CreatedAt = S::CreatedAt;
+        type WrappedMasterKey = Set<members::wrapped_master_key>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `service_did` field
         pub struct service_did(());
-        ///Marker type for the `wrapped_master_key` field
-        pub struct wrapped_master_key(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `wrapped_master_key` field
+        pub struct wrapped_master_key(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GrantBuilder<'a, S: grant_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<Did<'a>>,
@@ -230,7 +233,7 @@ pub struct GrantBuilder<'a, S: grant_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Grant<'a> {
@@ -244,9 +247,9 @@ impl<'a> GrantBuilder<'a, grant_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GrantBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -261,11 +264,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> GrantBuilder<'a, grant_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GrantBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -273,12 +276,12 @@ where
 impl<'a, S: grant_state::State> GrantBuilder<'a, S> {
     /// Set the `expiresAt` field (optional)
     pub fn expires_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `expiresAt` field to an Option value (optional)
     pub fn maybe_expires_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -293,11 +296,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GrantBuilder<'a, grant_state::SetServiceDid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GrantBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -312,11 +315,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GrantBuilder<'a, grant_state::SetWrappedMasterKey<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         GrantBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -327,12 +330,12 @@ impl<'a, S: grant_state::State> GrantBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `wrappedMasterKeyIv` field to an Option value (optional)
     pub fn maybe_wrapped_master_key_iv(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -340,12 +343,12 @@ impl<'a, S: grant_state::State> GrantBuilder<'a, S> {
 impl<'a, S: grant_state::State> GrantBuilder<'a, S> {
     /// Set the `wrappingAlgorithm` field (optional)
     pub fn wrapping_algorithm(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `wrappingAlgorithm` field to an Option value (optional)
     pub fn maybe_wrapping_algorithm(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -354,19 +357,19 @@ impl<'a, S> GrantBuilder<'a, S>
 where
     S: grant_state::State,
     S::ServiceDid: grant_state::IsSet,
-    S::WrappedMasterKey: grant_state::IsSet,
     S::CreatedAt: grant_state::IsSet,
+    S::WrappedMasterKey: grant_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Grant<'a> {
         Grant {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            expires_at: self.__unsafe_private_named.1,
-            service_did: self.__unsafe_private_named.2.unwrap(),
-            wrapped_master_key: self.__unsafe_private_named.3.unwrap(),
-            wrapped_master_key_iv: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            expires_at: self._fields.1,
+            service_did: self._fields.2.unwrap(),
+            wrapped_master_key: self._fields.3.unwrap(),
+            wrapped_master_key_iv: self._fields.4,
             wrapping_algorithm: self
-                .__unsafe_private_named
+                ._fields
                 .5
                 .or_else(|| Some(CowStr::from("RSA-OAEP"))),
             extra_data: Default::default(),
@@ -381,13 +384,13 @@ where
         >,
     ) -> Grant<'a> {
         Grant {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            expires_at: self.__unsafe_private_named.1,
-            service_did: self.__unsafe_private_named.2.unwrap(),
-            wrapped_master_key: self.__unsafe_private_named.3.unwrap(),
-            wrapped_master_key_iv: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            expires_at: self._fields.1,
+            service_did: self._fields.2.unwrap(),
+            wrapped_master_key: self._fields.3.unwrap(),
+            wrapped_master_key_iv: self._fields.4,
             wrapping_algorithm: self
-                .__unsafe_private_named
+                ._fields
                 .5
                 .or_else(|| Some(CowStr::from("RSA-OAEP"))),
             extra_data: Some(extra_data),
diff --git a/crates/jacquard-api/src/ch_indiemusi/alpha/recording.rs b/crates/jacquard-api/src/ch_indiemusi/alpha/recording.rs
index 5e6d8f67..9af1bcab 100644
--- a/crates/jacquard-api/src/ch_indiemusi/alpha/recording.rs
+++ b/crates/jacquard-api/src/ch_indiemusi/alpha/recording.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -418,44 +421,44 @@ pub mod recording_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Artists;
         type Title;
+        type Artists;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Artists = Unset;
         type Title = Unset;
-    }
-    ///State transition - sets the `artists` field to Set
-    pub struct SetArtists<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetArtists<S> {}
-    impl<S: State> State for SetArtists<S> {
-        type Artists = Set<members::artists>;
-        type Title = S::Title;
+        type Artists = Unset;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Artists = S::Artists;
         type Title = Set<members::title>;
+        type Artists = S::Artists;
+    }
+    ///State transition - sets the `artists` field to Set
+    pub struct SetArtists<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetArtists<S> {}
+    impl<S: State> State for SetArtists<S> {
+        type Title = S::Title;
+        type Artists = Set<members::artists>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `artists` field
-        pub struct artists(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `artists` field
+        pub struct artists(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RecordingBuilder<'a, S: recording_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<recording::Artist<'a>>>,
         Option<BlobRef<'a>>,
         Option<i64>,
@@ -464,7 +467,7 @@ pub struct RecordingBuilder<'a, S: recording_state::State> {
         Option<Song<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Recording<'a> {
@@ -478,9 +481,9 @@ impl<'a> RecordingBuilder<'a, recording_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -495,11 +498,11 @@ where
         mut self,
         value: impl Into<Vec<recording::Artist<'a>>>,
     ) -> RecordingBuilder<'a, recording_state::SetArtists<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -507,12 +510,12 @@ where
 impl<'a, S: recording_state::State> RecordingBuilder<'a, S> {
     /// Set the `audioFile` field (optional)
     pub fn audio_file(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `audioFile` field to an Option value (optional)
     pub fn maybe_audio_file(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -520,12 +523,12 @@ impl<'a, S: recording_state::State> RecordingBuilder<'a, S> {
 impl<'a, S: recording_state::State> RecordingBuilder<'a, S> {
     /// Set the `duration` field (optional)
     pub fn duration(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `duration` field to an Option value (optional)
     pub fn maybe_duration(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -533,12 +536,12 @@ impl<'a, S: recording_state::State> RecordingBuilder<'a, S> {
 impl<'a, S: recording_state::State> RecordingBuilder<'a, S> {
     /// Set the `isrc` field (optional)
     pub fn isrc(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `isrc` field to an Option value (optional)
     pub fn maybe_isrc(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -549,7 +552,7 @@ impl<'a, S: recording_state::State> RecordingBuilder<'a, S> {
         mut self,
         value: impl Into<Option<recording::MasterOwnerInfo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `masterOwner` field to an Option value (optional)
@@ -557,7 +560,7 @@ impl<'a, S: recording_state::State> RecordingBuilder<'a, S> {
         mut self,
         value: Option<recording::MasterOwnerInfo<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -565,12 +568,12 @@ impl<'a, S: recording_state::State> RecordingBuilder<'a, S> {
 impl<'a, S: recording_state::State> RecordingBuilder<'a, S> {
     /// Set the `song` field (optional)
     pub fn song(mut self, value: impl Into<Option<Song<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `song` field to an Option value (optional)
     pub fn maybe_song(mut self, value: Option<Song<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -585,11 +588,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RecordingBuilder<'a, recording_state::SetTitle<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         RecordingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -597,19 +600,19 @@ where
 impl<'a, S> RecordingBuilder<'a, S>
 where
     S: recording_state::State,
-    S::Artists: recording_state::IsSet,
     S::Title: recording_state::IsSet,
+    S::Artists: recording_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Recording<'a> {
         Recording {
-            artists: self.__unsafe_private_named.0.unwrap(),
-            audio_file: self.__unsafe_private_named.1,
-            duration: self.__unsafe_private_named.2,
-            isrc: self.__unsafe_private_named.3,
-            master_owner: self.__unsafe_private_named.4,
-            song: self.__unsafe_private_named.5,
-            title: self.__unsafe_private_named.6.unwrap(),
+            artists: self._fields.0.unwrap(),
+            audio_file: self._fields.1,
+            duration: self._fields.2,
+            isrc: self._fields.3,
+            master_owner: self._fields.4,
+            song: self._fields.5,
+            title: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -622,13 +625,13 @@ where
         >,
     ) -> Recording<'a> {
         Recording {
-            artists: self.__unsafe_private_named.0.unwrap(),
-            audio_file: self.__unsafe_private_named.1,
-            duration: self.__unsafe_private_named.2,
-            isrc: self.__unsafe_private_named.3,
-            master_owner: self.__unsafe_private_named.4,
-            song: self.__unsafe_private_named.5,
-            title: self.__unsafe_private_named.6.unwrap(),
+            artists: self._fields.0.unwrap(),
+            audio_file: self._fields.1,
+            duration: self._fields.2,
+            isrc: self._fields.3,
+            master_owner: self._fields.4,
+            song: self._fields.5,
+            title: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/ch_indiemusi/alpha/release.rs b/crates/jacquard-api/src/ch_indiemusi/alpha/release.rs
index e3e2f16d..8cd832f0 100644
--- a/crates/jacquard-api/src/ch_indiemusi/alpha/release.rs
+++ b/crates/jacquard-api/src/ch_indiemusi/alpha/release.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -350,49 +353,49 @@ pub mod release_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Artists;
         type Title;
+        type Artists;
         type Recordings;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Artists = Unset;
         type Title = Unset;
+        type Artists = Unset;
         type Recordings = Unset;
     }
-    ///State transition - sets the `artists` field to Set
-    pub struct SetArtists<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetArtists<S> {}
-    impl<S: State> State for SetArtists<S> {
-        type Artists = Set<members::artists>;
-        type Title = S::Title;
-        type Recordings = S::Recordings;
-    }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Artists = S::Artists;
         type Title = Set<members::title>;
+        type Artists = S::Artists;
+        type Recordings = S::Recordings;
+    }
+    ///State transition - sets the `artists` field to Set
+    pub struct SetArtists<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetArtists<S> {}
+    impl<S: State> State for SetArtists<S> {
+        type Title = S::Title;
+        type Artists = Set<members::artists>;
         type Recordings = S::Recordings;
     }
     ///State transition - sets the `recordings` field to Set
     pub struct SetRecordings<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecordings<S> {}
     impl<S: State> State for SetRecordings<S> {
-        type Artists = S::Artists;
         type Title = S::Title;
+        type Artists = S::Artists;
         type Recordings = Set<members::recordings>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `artists` field
-        pub struct artists(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `artists` field
+        pub struct artists(());
         ///Marker type for the `recordings` field
         pub struct recordings(());
     }
@@ -400,8 +403,8 @@ pub mod release_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReleaseBuilder<'a, S: release_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<release::Artist<'a>>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
@@ -409,7 +412,7 @@ pub struct ReleaseBuilder<'a, S: release_state::State> {
         Option<Datetime>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Release<'a> {
@@ -423,9 +426,9 @@ impl<'a> ReleaseBuilder<'a, release_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReleaseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -440,11 +443,11 @@ where
         mut self,
         value: impl Into<Vec<release::Artist<'a>>>,
     ) -> ReleaseBuilder<'a, release_state::SetArtists<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReleaseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -452,12 +455,12 @@ where
 impl<'a, S: release_state::State> ReleaseBuilder<'a, S> {
     /// Set the `artworkImage` field (optional)
     pub fn artwork_image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `artworkImage` field to an Option value (optional)
     pub fn maybe_artwork_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -465,12 +468,12 @@ impl<'a, S: release_state::State> ReleaseBuilder<'a, S> {
 impl<'a, S: release_state::State> ReleaseBuilder<'a, S> {
     /// Set the `gtin` field (optional)
     pub fn gtin(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `gtin` field to an Option value (optional)
     pub fn maybe_gtin(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -485,11 +488,11 @@ where
         mut self,
         value: impl Into<Vec<Recording<'a>>>,
     ) -> ReleaseBuilder<'a, release_state::SetRecordings<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ReleaseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -497,12 +500,12 @@ where
 impl<'a, S: release_state::State> ReleaseBuilder<'a, S> {
     /// Set the `releaseDate` field (optional)
     pub fn release_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `releaseDate` field to an Option value (optional)
     pub fn maybe_release_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -517,11 +520,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReleaseBuilder<'a, release_state::SetTitle<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ReleaseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -529,19 +532,19 @@ where
 impl<'a, S> ReleaseBuilder<'a, S>
 where
     S: release_state::State,
-    S::Artists: release_state::IsSet,
     S::Title: release_state::IsSet,
+    S::Artists: release_state::IsSet,
     S::Recordings: release_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Release<'a> {
         Release {
-            artists: self.__unsafe_private_named.0.unwrap(),
-            artwork_image: self.__unsafe_private_named.1,
-            gtin: self.__unsafe_private_named.2,
-            recordings: self.__unsafe_private_named.3.unwrap(),
-            release_date: self.__unsafe_private_named.4,
-            title: self.__unsafe_private_named.5.unwrap(),
+            artists: self._fields.0.unwrap(),
+            artwork_image: self._fields.1,
+            gtin: self._fields.2,
+            recordings: self._fields.3.unwrap(),
+            release_date: self._fields.4,
+            title: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -554,12 +557,12 @@ where
         >,
     ) -> Release<'a> {
         Release {
-            artists: self.__unsafe_private_named.0.unwrap(),
-            artwork_image: self.__unsafe_private_named.1,
-            gtin: self.__unsafe_private_named.2,
-            recordings: self.__unsafe_private_named.3.unwrap(),
-            release_date: self.__unsafe_private_named.4,
-            title: self.__unsafe_private_named.5.unwrap(),
+            artists: self._fields.0.unwrap(),
+            artwork_image: self._fields.1,
+            gtin: self._fields.2,
+            recordings: self._fields.3.unwrap(),
+            release_date: self._fields.4,
+            title: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/ch_indiemusi/alpha/song.rs b/crates/jacquard-api/src/ch_indiemusi/alpha/song.rs
index d2a9ef39..695f2e44 100644
--- a/crates/jacquard-api/src/ch_indiemusi/alpha/song.rs
+++ b/crates/jacquard-api/src/ch_indiemusi/alpha/song.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -426,13 +429,13 @@ pub mod song_state {
 
 /// Builder for constructing an instance of this type
 pub struct SongBuilder<'a, S: song_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<song::InterestedParty<'a>>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Song<'a> {
@@ -446,9 +449,9 @@ impl<'a> SongBuilder<'a, song_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -463,11 +466,11 @@ where
         mut self,
         value: impl Into<Vec<song::InterestedParty<'a>>>,
     ) -> SongBuilder<'a, song_state::SetInterestedParties<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -475,12 +478,12 @@ where
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `iswc` field (optional)
     pub fn iswc(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `iswc` field to an Option value (optional)
     pub fn maybe_iswc(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -495,11 +498,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SongBuilder<'a, song_state::SetTitle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -513,9 +516,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Song<'a> {
         Song {
-            interested_parties: self.__unsafe_private_named.0.unwrap(),
-            iswc: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2.unwrap(),
+            interested_parties: self._fields.0.unwrap(),
+            iswc: self._fields.1,
+            title: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -528,9 +531,9 @@ where
         >,
     ) -> Song<'a> {
         Song {
-            interested_parties: self.__unsafe_private_named.0.unwrap(),
-            iswc: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2.unwrap(),
+            interested_parties: self._fields.0.unwrap(),
+            iswc: self._fields.1,
+            title: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/ch_indiemusi/alpha/track.rs b/crates/jacquard-api/src/ch_indiemusi/alpha/track.rs
index 60e40272..810dd162 100644
--- a/crates/jacquard-api/src/ch_indiemusi/alpha/track.rs
+++ b/crates/jacquard-api/src/ch_indiemusi/alpha/track.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -189,8 +192,8 @@ pub mod track_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type EncryptedContentIv;
-        type Title;
         type CreatedAt;
+        type Title;
         type AudioBlob;
     }
     /// Empty state - all required fields are unset
@@ -198,8 +201,8 @@ pub mod track_state {
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type EncryptedContentIv = Unset;
-        type Title = Unset;
         type CreatedAt = Unset;
+        type Title = Unset;
         type AudioBlob = Unset;
     }
     ///State transition - sets the `encrypted_content_iv` field to Set
@@ -207,17 +210,8 @@ pub mod track_state {
     impl<S: State> sealed::Sealed for SetEncryptedContentIv<S> {}
     impl<S: State> State for SetEncryptedContentIv<S> {
         type EncryptedContentIv = Set<members::encrypted_content_iv>;
-        type Title = S::Title;
-        type CreatedAt = S::CreatedAt;
-        type AudioBlob = S::AudioBlob;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type EncryptedContentIv = S::EncryptedContentIv;
-        type Title = Set<members::title>;
         type CreatedAt = S::CreatedAt;
+        type Title = S::Title;
         type AudioBlob = S::AudioBlob;
     }
     ///State transition - sets the `created_at` field to Set
@@ -225,8 +219,17 @@ pub mod track_state {
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type EncryptedContentIv = S::EncryptedContentIv;
-        type Title = S::Title;
         type CreatedAt = Set<members::created_at>;
+        type Title = S::Title;
+        type AudioBlob = S::AudioBlob;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type EncryptedContentIv = S::EncryptedContentIv;
+        type CreatedAt = S::CreatedAt;
+        type Title = Set<members::title>;
         type AudioBlob = S::AudioBlob;
     }
     ///State transition - sets the `audio_blob` field to Set
@@ -234,8 +237,8 @@ pub mod track_state {
     impl<S: State> sealed::Sealed for SetAudioBlob<S> {}
     impl<S: State> State for SetAudioBlob<S> {
         type EncryptedContentIv = S::EncryptedContentIv;
-        type Title = S::Title;
         type CreatedAt = S::CreatedAt;
+        type Title = S::Title;
         type AudioBlob = Set<members::audio_blob>;
     }
     /// Marker types for field names
@@ -243,10 +246,10 @@ pub mod track_state {
     pub mod members {
         ///Marker type for the `encrypted_content_iv` field
         pub struct encrypted_content_iv(());
-        ///Marker type for the `title` field
-        pub struct title(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `title` field
+        pub struct title(());
         ///Marker type for the `audio_blob` field
         pub struct audio_blob(());
     }
@@ -254,15 +257,15 @@ pub mod track_state {
 
 /// Builder for constructing an instance of this type
 pub struct TrackBuilder<'a, S: track_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Track<'a> {
@@ -276,9 +279,9 @@ impl<'a> TrackBuilder<'a, track_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TrackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -293,11 +296,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> TrackBuilder<'a, track_state::SetAudioBlob<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TrackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -312,11 +315,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TrackBuilder<'a, track_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TrackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -331,11 +334,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TrackBuilder<'a, track_state::SetEncryptedContentIv<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TrackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -343,12 +346,12 @@ where
 impl<'a, S: track_state::State> TrackBuilder<'a, S> {
     /// Set the `encryptionAlgorithm` field (optional)
     pub fn encryption_algorithm(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `encryptionAlgorithm` field to an Option value (optional)
     pub fn maybe_encryption_algorithm(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -363,11 +366,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TrackBuilder<'a, track_state::SetTitle<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         TrackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -376,21 +379,21 @@ impl<'a, S> TrackBuilder<'a, S>
 where
     S: track_state::State,
     S::EncryptedContentIv: track_state::IsSet,
-    S::Title: track_state::IsSet,
     S::CreatedAt: track_state::IsSet,
+    S::Title: track_state::IsSet,
     S::AudioBlob: track_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Track<'a> {
         Track {
-            audio_blob: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            encrypted_content_iv: self.__unsafe_private_named.2.unwrap(),
+            audio_blob: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            encrypted_content_iv: self._fields.2.unwrap(),
             encryption_algorithm: self
-                .__unsafe_private_named
+                ._fields
                 .3
                 .or_else(|| Some(CowStr::from("AES-GCM-256"))),
-            title: self.__unsafe_private_named.4.unwrap(),
+            title: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -403,14 +406,14 @@ where
         >,
     ) -> Track<'a> {
         Track {
-            audio_blob: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            encrypted_content_iv: self.__unsafe_private_named.2.unwrap(),
+            audio_blob: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            encrypted_content_iv: self._fields.2.unwrap(),
             encryption_algorithm: self
-                .__unsafe_private_named
+                ._fields
                 .3
                 .or_else(|| Some(CowStr::from("AES-GCM-256"))),
-            title: self.__unsafe_private_named.4.unwrap(),
+            title: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/ch_indiemusi/social/join.rs b/crates/jacquard-api/src/ch_indiemusi/social/join.rs
index df54bafa..17f4fdf1 100644
--- a/crates/jacquard-api/src/ch_indiemusi/social/join.rs
+++ b/crates/jacquard-api/src/ch_indiemusi/social/join.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -132,9 +135,9 @@ pub mod join_state {
 
 /// Builder for constructing an instance of this type
 pub struct JoinBuilder<'a, S: join_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Join<'a> {
@@ -148,9 +151,9 @@ impl<'a> JoinBuilder<'a, join_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         JoinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -165,11 +168,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> JoinBuilder<'a, join_state::SetSong<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         JoinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,7 +185,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Join<'a> {
         Join {
-            song: self.__unsafe_private_named.0.unwrap(),
+            song: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -195,7 +198,7 @@ where
         >,
     ) -> Join<'a> {
         Join {
-            song: self.__unsafe_private_named.0.unwrap(),
+            song: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/ch_indiemusi/social/song.rs b/crates/jacquard-api/src/ch_indiemusi/social/song.rs
index 049d54f2..a3f1fba2 100644
--- a/crates/jacquard-api/src/ch_indiemusi/social/song.rs
+++ b/crates/jacquard-api/src/ch_indiemusi/social/song.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -155,45 +158,45 @@ pub mod song_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type JoinersNeeded;
         type Name;
+        type JoinersNeeded;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type JoinersNeeded = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `joiners_needed` field to Set
-    pub struct SetJoinersNeeded<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetJoinersNeeded<S> {}
-    impl<S: State> State for SetJoinersNeeded<S> {
-        type JoinersNeeded = Set<members::joiners_needed>;
-        type Name = S::Name;
+        type JoinersNeeded = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type JoinersNeeded = S::JoinersNeeded;
         type Name = Set<members::name>;
+        type JoinersNeeded = S::JoinersNeeded;
+    }
+    ///State transition - sets the `joiners_needed` field to Set
+    pub struct SetJoinersNeeded<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetJoinersNeeded<S> {}
+    impl<S: State> State for SetJoinersNeeded<S> {
+        type Name = S::Name;
+        type JoinersNeeded = Set<members::joiners_needed>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `joiners_needed` field
-        pub struct joiners_needed(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `joiners_needed` field
+        pub struct joiners_needed(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SongBuilder<'a, S: song_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Song<'a> {
@@ -207,9 +210,9 @@ impl<'a> SongBuilder<'a, song_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -224,11 +227,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SongBuilder<'a, song_state::SetJoinersNeeded<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -243,11 +246,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SongBuilder<'a, song_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -255,14 +258,14 @@ where
 impl<'a, S> SongBuilder<'a, S>
 where
     S: song_state::State,
-    S::JoinersNeeded: song_state::IsSet,
     S::Name: song_state::IsSet,
+    S::JoinersNeeded: song_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Song<'a> {
         Song {
-            joiners_needed: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
+            joiners_needed: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -275,8 +278,8 @@ where
         >,
     ) -> Song<'a> {
         Song {
-            joiners_needed: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
+            joiners_needed: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/chat_bsky/actor.rs b/crates/jacquard-api/src/chat_bsky/actor.rs
index 206459c9..481f74d7 100644
--- a/crates/jacquard-api/src/chat_bsky/actor.rs
+++ b/crates/jacquard-api/src/chat_bsky/actor.rs
@@ -9,7 +9,11 @@ pub mod declaration;
 pub mod delete_account;
 pub mod export_account_data;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -142,8 +146,8 @@ pub mod profile_view_basic_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileViewBasicBuilder<'a, S: profile_view_basic_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileAssociated<'a>>,
         Option<UriValue<'a>>,
         Option<bool>,
@@ -154,7 +158,7 @@ pub struct ProfileViewBasicBuilder<'a, S: profile_view_basic_state::State> {
         Option<VerificationState<'a>>,
         Option<ViewerState<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileViewBasic<'a> {
@@ -168,19 +172,9 @@ impl<'a> ProfileViewBasicBuilder<'a, profile_view_basic_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -191,12 +185,12 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProfileAssociated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `associated` field to an Option value (optional)
     pub fn maybe_associated(mut self, value: Option<ProfileAssociated<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -204,12 +198,12 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -217,12 +211,12 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `chatDisabled` field (optional)
     pub fn chat_disabled(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `chatDisabled` field to an Option value (optional)
     pub fn maybe_chat_disabled(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -237,11 +231,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ProfileViewBasicBuilder<'a, profile_view_basic_state::SetDid<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ProfileViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,12 +243,12 @@ where
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -269,11 +263,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> ProfileViewBasicBuilder<'a, profile_view_basic_state::SetHandle<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ProfileViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -281,12 +275,12 @@ where
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -297,12 +291,12 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
         mut self,
         value: impl Into<Option<VerificationState<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `verification` field to an Option value (optional)
     pub fn maybe_verification(mut self, value: Option<VerificationState<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -310,12 +304,12 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<ViewerState<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<ViewerState<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -329,15 +323,15 @@ where
     /// Build the final struct
     pub fn build(self) -> ProfileViewBasic<'a> {
         ProfileViewBasic {
-            associated: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            chat_disabled: self.__unsafe_private_named.2,
-            did: self.__unsafe_private_named.3.unwrap(),
-            display_name: self.__unsafe_private_named.4,
-            handle: self.__unsafe_private_named.5.unwrap(),
-            labels: self.__unsafe_private_named.6,
-            verification: self.__unsafe_private_named.7,
-            viewer: self.__unsafe_private_named.8,
+            associated: self._fields.0,
+            avatar: self._fields.1,
+            chat_disabled: self._fields.2,
+            did: self._fields.3.unwrap(),
+            display_name: self._fields.4,
+            handle: self._fields.5.unwrap(),
+            labels: self._fields.6,
+            verification: self._fields.7,
+            viewer: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -350,15 +344,15 @@ where
         >,
     ) -> ProfileViewBasic<'a> {
         ProfileViewBasic {
-            associated: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            chat_disabled: self.__unsafe_private_named.2,
-            did: self.__unsafe_private_named.3.unwrap(),
-            display_name: self.__unsafe_private_named.4,
-            handle: self.__unsafe_private_named.5.unwrap(),
-            labels: self.__unsafe_private_named.6,
-            verification: self.__unsafe_private_named.7,
-            viewer: self.__unsafe_private_named.8,
+            associated: self._fields.0,
+            avatar: self._fields.1,
+            chat_disabled: self._fields.2,
+            did: self._fields.3.unwrap(),
+            display_name: self._fields.4,
+            handle: self._fields.5.unwrap(),
+            labels: self._fields.6,
+            verification: self._fields.7,
+            viewer: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/chat_bsky/actor/declaration.rs b/crates/jacquard-api/src/chat_bsky/actor/declaration.rs
index 8a7980f1..5940d563 100644
--- a/crates/jacquard-api/src/chat_bsky/actor/declaration.rs
+++ b/crates/jacquard-api/src/chat_bsky/actor/declaration.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -227,9 +230,9 @@ pub mod declaration_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeclarationBuilder<'a, S: declaration_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<DeclarationAllowIncoming<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<DeclarationAllowIncoming<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Declaration<'a> {
@@ -243,9 +246,9 @@ impl<'a> DeclarationBuilder<'a, declaration_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeclarationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -260,11 +263,11 @@ where
         mut self,
         value: impl Into<DeclarationAllowIncoming<'a>>,
     ) -> DeclarationBuilder<'a, declaration_state::SetAllowIncoming<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeclarationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -277,7 +280,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Declaration<'a> {
         Declaration {
-            allow_incoming: self.__unsafe_private_named.0.unwrap(),
+            allow_incoming: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -290,7 +293,7 @@ where
         >,
     ) -> Declaration<'a> {
         Declaration {
-            allow_incoming: self.__unsafe_private_named.0.unwrap(),
+            allow_incoming: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/chat_bsky/actor/delete_account.rs b/crates/jacquard-api/src/chat_bsky/actor/delete_account.rs
index 35755bfe..5b4d7f31 100644
--- a/crates/jacquard-api/src/chat_bsky/actor/delete_account.rs
+++ b/crates/jacquard-api/src/chat_bsky/actor/delete_account.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/chat_bsky/actor/export_account_data.rs b/crates/jacquard-api/src/chat_bsky/actor/export_account_data.rs
index b84d7b20..0220db72 100644
--- a/crates/jacquard-api/src/chat_bsky/actor/export_account_data.rs
+++ b/crates/jacquard-api/src/chat_bsky/actor/export_account_data.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::deps::bytes::Bytes;
 use jacquard_derive::IntoStatic;
diff --git a/crates/jacquard-api/src/chat_bsky/convo.rs b/crates/jacquard-api/src/chat_bsky/convo.rs
index b899faca..82d9592e 100644
--- a/crates/jacquard-api/src/chat_bsky/convo.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo.rs
@@ -23,7 +23,11 @@ pub mod unmute_convo;
 pub mod update_all_read;
 pub mod update_read;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -805,92 +809,92 @@ pub mod convo_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Rev;
         type Muted;
         type UnreadCount;
-        type Rev;
-        type Id;
         type Members;
+        type Id;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Rev = Unset;
         type Muted = Unset;
         type UnreadCount = Unset;
-        type Rev = Unset;
-        type Id = Unset;
         type Members = Unset;
+        type Id = Unset;
+    }
+    ///State transition - sets the `rev` field to Set
+    pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRev<S> {}
+    impl<S: State> State for SetRev<S> {
+        type Rev = Set<members::rev>;
+        type Muted = S::Muted;
+        type UnreadCount = S::UnreadCount;
+        type Members = S::Members;
+        type Id = S::Id;
     }
     ///State transition - sets the `muted` field to Set
     pub struct SetMuted<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMuted<S> {}
     impl<S: State> State for SetMuted<S> {
+        type Rev = S::Rev;
         type Muted = Set<members::muted>;
         type UnreadCount = S::UnreadCount;
-        type Rev = S::Rev;
-        type Id = S::Id;
         type Members = S::Members;
+        type Id = S::Id;
     }
     ///State transition - sets the `unread_count` field to Set
     pub struct SetUnreadCount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUnreadCount<S> {}
     impl<S: State> State for SetUnreadCount<S> {
+        type Rev = S::Rev;
         type Muted = S::Muted;
         type UnreadCount = Set<members::unread_count>;
-        type Rev = S::Rev;
-        type Id = S::Id;
         type Members = S::Members;
+        type Id = S::Id;
     }
-    ///State transition - sets the `rev` field to Set
-    pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRev<S> {}
-    impl<S: State> State for SetRev<S> {
+    ///State transition - sets the `members` field to Set
+    pub struct SetMembers<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMembers<S> {}
+    impl<S: State> State for SetMembers<S> {
+        type Rev = S::Rev;
         type Muted = S::Muted;
         type UnreadCount = S::UnreadCount;
-        type Rev = Set<members::rev>;
+        type Members = Set<members::members>;
         type Id = S::Id;
-        type Members = S::Members;
     }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetId<S> {}
     impl<S: State> State for SetId<S> {
-        type Muted = S::Muted;
-        type UnreadCount = S::UnreadCount;
         type Rev = S::Rev;
-        type Id = Set<members::id>;
-        type Members = S::Members;
-    }
-    ///State transition - sets the `members` field to Set
-    pub struct SetMembers<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMembers<S> {}
-    impl<S: State> State for SetMembers<S> {
         type Muted = S::Muted;
         type UnreadCount = S::UnreadCount;
-        type Rev = S::Rev;
-        type Id = S::Id;
-        type Members = Set<members::members>;
+        type Members = S::Members;
+        type Id = Set<members::id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `rev` field
+        pub struct rev(());
         ///Marker type for the `muted` field
         pub struct muted(());
         ///Marker type for the `unread_count` field
         pub struct unread_count(());
-        ///Marker type for the `rev` field
-        pub struct rev(());
-        ///Marker type for the `id` field
-        pub struct id(());
         ///Marker type for the `members` field
         pub struct members(());
+        ///Marker type for the `id` field
+        pub struct id(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ConvoViewBuilder<'a, S: convo_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<ConvoViewLastMessage<'a>>,
         Option<convo::MessageAndReactionView<'a>>,
@@ -900,7 +904,7 @@ pub struct ConvoViewBuilder<'a, S: convo_view_state::State> {
         Option<ConvoViewStatus<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ConvoView<'a> {
@@ -914,9 +918,9 @@ impl<'a> ConvoViewBuilder<'a, convo_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ConvoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -931,11 +935,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ConvoViewBuilder<'a, convo_view_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ConvoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -946,7 +950,7 @@ impl<'a, S: convo_view_state::State> ConvoViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ConvoViewLastMessage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `lastMessage` field to an Option value (optional)
@@ -954,7 +958,7 @@ impl<'a, S: convo_view_state::State> ConvoViewBuilder<'a, S> {
         mut self,
         value: Option<ConvoViewLastMessage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -965,7 +969,7 @@ impl<'a, S: convo_view_state::State> ConvoViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<convo::MessageAndReactionView<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `lastReaction` field to an Option value (optional)
@@ -973,7 +977,7 @@ impl<'a, S: convo_view_state::State> ConvoViewBuilder<'a, S> {
         mut self,
         value: Option<convo::MessageAndReactionView<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -988,11 +992,11 @@ where
         mut self,
         value: impl Into<Vec<ProfileViewBasic<'a>>>,
     ) -> ConvoViewBuilder<'a, convo_view_state::SetMembers<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ConvoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1007,11 +1011,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ConvoViewBuilder<'a, convo_view_state::SetMuted<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ConvoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1026,11 +1030,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ConvoViewBuilder<'a, convo_view_state::SetRev<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ConvoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1038,12 +1042,12 @@ where
 impl<'a, S: convo_view_state::State> ConvoViewBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<ConvoViewStatus<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<ConvoViewStatus<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1058,11 +1062,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ConvoViewBuilder<'a, convo_view_state::SetUnreadCount<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ConvoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1070,23 +1074,23 @@ where
 impl<'a, S> ConvoViewBuilder<'a, S>
 where
     S: convo_view_state::State,
+    S::Rev: convo_view_state::IsSet,
     S::Muted: convo_view_state::IsSet,
     S::UnreadCount: convo_view_state::IsSet,
-    S::Rev: convo_view_state::IsSet,
-    S::Id: convo_view_state::IsSet,
     S::Members: convo_view_state::IsSet,
+    S::Id: convo_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ConvoView<'a> {
         ConvoView {
-            id: self.__unsafe_private_named.0.unwrap(),
-            last_message: self.__unsafe_private_named.1,
-            last_reaction: self.__unsafe_private_named.2,
-            members: self.__unsafe_private_named.3.unwrap(),
-            muted: self.__unsafe_private_named.4.unwrap(),
-            rev: self.__unsafe_private_named.5.unwrap(),
-            status: self.__unsafe_private_named.6,
-            unread_count: self.__unsafe_private_named.7.unwrap(),
+            id: self._fields.0.unwrap(),
+            last_message: self._fields.1,
+            last_reaction: self._fields.2,
+            members: self._fields.3.unwrap(),
+            muted: self._fields.4.unwrap(),
+            rev: self._fields.5.unwrap(),
+            status: self._fields.6,
+            unread_count: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1099,14 +1103,14 @@ where
         >,
     ) -> ConvoView<'a> {
         ConvoView {
-            id: self.__unsafe_private_named.0.unwrap(),
-            last_message: self.__unsafe_private_named.1,
-            last_reaction: self.__unsafe_private_named.2,
-            members: self.__unsafe_private_named.3.unwrap(),
-            muted: self.__unsafe_private_named.4.unwrap(),
-            rev: self.__unsafe_private_named.5.unwrap(),
-            status: self.__unsafe_private_named.6,
-            unread_count: self.__unsafe_private_named.7.unwrap(),
+            id: self._fields.0.unwrap(),
+            last_message: self._fields.1,
+            last_reaction: self._fields.2,
+            members: self._fields.3.unwrap(),
+            muted: self._fields.4.unwrap(),
+            rev: self._fields.5.unwrap(),
+            status: self._fields.6,
+            unread_count: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1814,80 +1818,80 @@ pub mod deleted_message_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Id;
-        type Rev;
         type SentAt;
+        type Id;
         type Sender;
+        type Rev;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Id = Unset;
-        type Rev = Unset;
         type SentAt = Unset;
+        type Id = Unset;
         type Sender = Unset;
-    }
-    ///State transition - sets the `id` field to Set
-    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetId<S> {}
-    impl<S: State> State for SetId<S> {
-        type Id = Set<members::id>;
-        type Rev = S::Rev;
-        type SentAt = S::SentAt;
-        type Sender = S::Sender;
-    }
-    ///State transition - sets the `rev` field to Set
-    pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRev<S> {}
-    impl<S: State> State for SetRev<S> {
-        type Id = S::Id;
-        type Rev = Set<members::rev>;
-        type SentAt = S::SentAt;
-        type Sender = S::Sender;
+        type Rev = Unset;
     }
     ///State transition - sets the `sent_at` field to Set
     pub struct SetSentAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSentAt<S> {}
     impl<S: State> State for SetSentAt<S> {
+        type SentAt = Set<members::sent_at>;
         type Id = S::Id;
+        type Sender = S::Sender;
         type Rev = S::Rev;
-        type SentAt = Set<members::sent_at>;
+    }
+    ///State transition - sets the `id` field to Set
+    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetId<S> {}
+    impl<S: State> State for SetId<S> {
+        type SentAt = S::SentAt;
+        type Id = Set<members::id>;
         type Sender = S::Sender;
+        type Rev = S::Rev;
     }
     ///State transition - sets the `sender` field to Set
     pub struct SetSender<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSender<S> {}
     impl<S: State> State for SetSender<S> {
+        type SentAt = S::SentAt;
         type Id = S::Id;
+        type Sender = Set<members::sender>;
         type Rev = S::Rev;
+    }
+    ///State transition - sets the `rev` field to Set
+    pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRev<S> {}
+    impl<S: State> State for SetRev<S> {
         type SentAt = S::SentAt;
-        type Sender = Set<members::sender>;
+        type Id = S::Id;
+        type Sender = S::Sender;
+        type Rev = Set<members::rev>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `id` field
-        pub struct id(());
-        ///Marker type for the `rev` field
-        pub struct rev(());
         ///Marker type for the `sent_at` field
         pub struct sent_at(());
+        ///Marker type for the `id` field
+        pub struct id(());
         ///Marker type for the `sender` field
         pub struct sender(());
+        ///Marker type for the `rev` field
+        pub struct rev(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DeletedMessageViewBuilder<'a, S: deleted_message_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<convo::MessageViewSender<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeletedMessageView<'a> {
@@ -1901,9 +1905,9 @@ impl<'a> DeletedMessageViewBuilder<'a, deleted_message_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeletedMessageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1918,11 +1922,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DeletedMessageViewBuilder<'a, deleted_message_view_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeletedMessageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1937,11 +1941,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DeletedMessageViewBuilder<'a, deleted_message_view_state::SetRev<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DeletedMessageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1956,11 +1960,11 @@ where
         mut self,
         value: impl Into<convo::MessageViewSender<'a>>,
     ) -> DeletedMessageViewBuilder<'a, deleted_message_view_state::SetSender<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         DeletedMessageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1975,11 +1979,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DeletedMessageViewBuilder<'a, deleted_message_view_state::SetSentAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         DeletedMessageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1987,18 +1991,18 @@ where
 impl<'a, S> DeletedMessageViewBuilder<'a, S>
 where
     S: deleted_message_view_state::State,
-    S::Id: deleted_message_view_state::IsSet,
-    S::Rev: deleted_message_view_state::IsSet,
     S::SentAt: deleted_message_view_state::IsSet,
+    S::Id: deleted_message_view_state::IsSet,
     S::Sender: deleted_message_view_state::IsSet,
+    S::Rev: deleted_message_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DeletedMessageView<'a> {
         DeletedMessageView {
-            id: self.__unsafe_private_named.0.unwrap(),
-            rev: self.__unsafe_private_named.1.unwrap(),
-            sender: self.__unsafe_private_named.2.unwrap(),
-            sent_at: self.__unsafe_private_named.3.unwrap(),
+            id: self._fields.0.unwrap(),
+            rev: self._fields.1.unwrap(),
+            sender: self._fields.2.unwrap(),
+            sent_at: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2011,10 +2015,10 @@ where
         >,
     ) -> DeletedMessageView<'a> {
         DeletedMessageView {
-            id: self.__unsafe_private_named.0.unwrap(),
-            rev: self.__unsafe_private_named.1.unwrap(),
-            sender: self.__unsafe_private_named.2.unwrap(),
-            sent_at: self.__unsafe_private_named.3.unwrap(),
+            id: self._fields.0.unwrap(),
+            rev: self._fields.1.unwrap(),
+            sender: self._fields.2.unwrap(),
+            sent_at: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2030,65 +2034,65 @@ pub mod log_add_reaction_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type ConvoId;
         type Rev;
         type Message;
-        type ConvoId;
         type Reaction;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type ConvoId = Unset;
         type Rev = Unset;
         type Message = Unset;
-        type ConvoId = Unset;
         type Reaction = Unset;
     }
+    ///State transition - sets the `convo_id` field to Set
+    pub struct SetConvoId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetConvoId<S> {}
+    impl<S: State> State for SetConvoId<S> {
+        type ConvoId = Set<members::convo_id>;
+        type Rev = S::Rev;
+        type Message = S::Message;
+        type Reaction = S::Reaction;
+    }
     ///State transition - sets the `rev` field to Set
     pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRev<S> {}
     impl<S: State> State for SetRev<S> {
+        type ConvoId = S::ConvoId;
         type Rev = Set<members::rev>;
         type Message = S::Message;
-        type ConvoId = S::ConvoId;
         type Reaction = S::Reaction;
     }
     ///State transition - sets the `message` field to Set
     pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMessage<S> {}
     impl<S: State> State for SetMessage<S> {
-        type Rev = S::Rev;
-        type Message = Set<members::message>;
         type ConvoId = S::ConvoId;
-        type Reaction = S::Reaction;
-    }
-    ///State transition - sets the `convo_id` field to Set
-    pub struct SetConvoId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetConvoId<S> {}
-    impl<S: State> State for SetConvoId<S> {
         type Rev = S::Rev;
-        type Message = S::Message;
-        type ConvoId = Set<members::convo_id>;
+        type Message = Set<members::message>;
         type Reaction = S::Reaction;
     }
     ///State transition - sets the `reaction` field to Set
     pub struct SetReaction<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetReaction<S> {}
     impl<S: State> State for SetReaction<S> {
+        type ConvoId = S::ConvoId;
         type Rev = S::Rev;
         type Message = S::Message;
-        type ConvoId = S::ConvoId;
         type Reaction = Set<members::reaction>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `convo_id` field
+        pub struct convo_id(());
         ///Marker type for the `rev` field
         pub struct rev(());
         ///Marker type for the `message` field
         pub struct message(());
-        ///Marker type for the `convo_id` field
-        pub struct convo_id(());
         ///Marker type for the `reaction` field
         pub struct reaction(());
     }
@@ -2096,14 +2100,14 @@ pub mod log_add_reaction_state {
 
 /// Builder for constructing an instance of this type
 pub struct LogAddReactionBuilder<'a, S: log_add_reaction_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<LogAddReactionMessage<'a>>,
         Option<convo::ReactionView<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LogAddReaction<'a> {
@@ -2117,9 +2121,9 @@ impl<'a> LogAddReactionBuilder<'a, log_add_reaction_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LogAddReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2134,11 +2138,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogAddReactionBuilder<'a, log_add_reaction_state::SetConvoId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LogAddReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2153,11 +2157,11 @@ where
         mut self,
         value: impl Into<LogAddReactionMessage<'a>>,
     ) -> LogAddReactionBuilder<'a, log_add_reaction_state::SetMessage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LogAddReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2172,11 +2176,11 @@ where
         mut self,
         value: impl Into<convo::ReactionView<'a>>,
     ) -> LogAddReactionBuilder<'a, log_add_reaction_state::SetReaction<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LogAddReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2191,11 +2195,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogAddReactionBuilder<'a, log_add_reaction_state::SetRev<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LogAddReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2203,18 +2207,18 @@ where
 impl<'a, S> LogAddReactionBuilder<'a, S>
 where
     S: log_add_reaction_state::State,
+    S::ConvoId: log_add_reaction_state::IsSet,
     S::Rev: log_add_reaction_state::IsSet,
     S::Message: log_add_reaction_state::IsSet,
-    S::ConvoId: log_add_reaction_state::IsSet,
     S::Reaction: log_add_reaction_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LogAddReaction<'a> {
         LogAddReaction {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            reaction: self.__unsafe_private_named.2.unwrap(),
-            rev: self.__unsafe_private_named.3.unwrap(),
+            convo_id: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            reaction: self._fields.2.unwrap(),
+            rev: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2227,10 +2231,10 @@ where
         >,
     ) -> LogAddReaction<'a> {
         LogAddReaction {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            reaction: self.__unsafe_private_named.2.unwrap(),
-            rev: self.__unsafe_private_named.3.unwrap(),
+            convo_id: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            reaction: self._fields.2.unwrap(),
+            rev: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2246,63 +2250,63 @@ pub mod log_create_message_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Rev;
         type Message;
         type ConvoId;
-        type Rev;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Rev = Unset;
         type Message = Unset;
         type ConvoId = Unset;
-        type Rev = Unset;
+    }
+    ///State transition - sets the `rev` field to Set
+    pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRev<S> {}
+    impl<S: State> State for SetRev<S> {
+        type Rev = Set<members::rev>;
+        type Message = S::Message;
+        type ConvoId = S::ConvoId;
     }
     ///State transition - sets the `message` field to Set
     pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMessage<S> {}
     impl<S: State> State for SetMessage<S> {
+        type Rev = S::Rev;
         type Message = Set<members::message>;
         type ConvoId = S::ConvoId;
-        type Rev = S::Rev;
     }
     ///State transition - sets the `convo_id` field to Set
     pub struct SetConvoId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetConvoId<S> {}
     impl<S: State> State for SetConvoId<S> {
-        type Message = S::Message;
-        type ConvoId = Set<members::convo_id>;
         type Rev = S::Rev;
-    }
-    ///State transition - sets the `rev` field to Set
-    pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRev<S> {}
-    impl<S: State> State for SetRev<S> {
         type Message = S::Message;
-        type ConvoId = S::ConvoId;
-        type Rev = Set<members::rev>;
+        type ConvoId = Set<members::convo_id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `rev` field
+        pub struct rev(());
         ///Marker type for the `message` field
         pub struct message(());
         ///Marker type for the `convo_id` field
         pub struct convo_id(());
-        ///Marker type for the `rev` field
-        pub struct rev(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LogCreateMessageBuilder<'a, S: log_create_message_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<LogCreateMessageMessage<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LogCreateMessage<'a> {
@@ -2316,9 +2320,9 @@ impl<'a> LogCreateMessageBuilder<'a, log_create_message_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LogCreateMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2333,11 +2337,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogCreateMessageBuilder<'a, log_create_message_state::SetConvoId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LogCreateMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2352,11 +2356,11 @@ where
         mut self,
         value: impl Into<LogCreateMessageMessage<'a>>,
     ) -> LogCreateMessageBuilder<'a, log_create_message_state::SetMessage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LogCreateMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2371,11 +2375,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogCreateMessageBuilder<'a, log_create_message_state::SetRev<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LogCreateMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2383,16 +2387,16 @@ where
 impl<'a, S> LogCreateMessageBuilder<'a, S>
 where
     S: log_create_message_state::State,
+    S::Rev: log_create_message_state::IsSet,
     S::Message: log_create_message_state::IsSet,
     S::ConvoId: log_create_message_state::IsSet,
-    S::Rev: log_create_message_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LogCreateMessage<'a> {
         LogCreateMessage {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            rev: self.__unsafe_private_named.2.unwrap(),
+            convo_id: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            rev: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2405,9 +2409,9 @@ where
         >,
     ) -> LogCreateMessage<'a> {
         LogCreateMessage {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            rev: self.__unsafe_private_named.2.unwrap(),
+            convo_id: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            rev: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2423,63 +2427,63 @@ pub mod log_delete_message_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type ConvoId;
         type Message;
         type Rev;
-        type ConvoId;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type ConvoId = Unset;
         type Message = Unset;
         type Rev = Unset;
-        type ConvoId = Unset;
+    }
+    ///State transition - sets the `convo_id` field to Set
+    pub struct SetConvoId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetConvoId<S> {}
+    impl<S: State> State for SetConvoId<S> {
+        type ConvoId = Set<members::convo_id>;
+        type Message = S::Message;
+        type Rev = S::Rev;
     }
     ///State transition - sets the `message` field to Set
     pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMessage<S> {}
     impl<S: State> State for SetMessage<S> {
+        type ConvoId = S::ConvoId;
         type Message = Set<members::message>;
         type Rev = S::Rev;
-        type ConvoId = S::ConvoId;
     }
     ///State transition - sets the `rev` field to Set
     pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRev<S> {}
     impl<S: State> State for SetRev<S> {
-        type Message = S::Message;
-        type Rev = Set<members::rev>;
         type ConvoId = S::ConvoId;
-    }
-    ///State transition - sets the `convo_id` field to Set
-    pub struct SetConvoId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetConvoId<S> {}
-    impl<S: State> State for SetConvoId<S> {
         type Message = S::Message;
-        type Rev = S::Rev;
-        type ConvoId = Set<members::convo_id>;
+        type Rev = Set<members::rev>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `convo_id` field
+        pub struct convo_id(());
         ///Marker type for the `message` field
         pub struct message(());
         ///Marker type for the `rev` field
         pub struct rev(());
-        ///Marker type for the `convo_id` field
-        pub struct convo_id(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LogDeleteMessageBuilder<'a, S: log_delete_message_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<LogDeleteMessageMessage<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LogDeleteMessage<'a> {
@@ -2493,9 +2497,9 @@ impl<'a> LogDeleteMessageBuilder<'a, log_delete_message_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LogDeleteMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2510,11 +2514,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogDeleteMessageBuilder<'a, log_delete_message_state::SetConvoId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LogDeleteMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2529,11 +2533,11 @@ where
         mut self,
         value: impl Into<LogDeleteMessageMessage<'a>>,
     ) -> LogDeleteMessageBuilder<'a, log_delete_message_state::SetMessage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LogDeleteMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2548,11 +2552,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogDeleteMessageBuilder<'a, log_delete_message_state::SetRev<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LogDeleteMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2560,16 +2564,16 @@ where
 impl<'a, S> LogDeleteMessageBuilder<'a, S>
 where
     S: log_delete_message_state::State,
+    S::ConvoId: log_delete_message_state::IsSet,
     S::Message: log_delete_message_state::IsSet,
     S::Rev: log_delete_message_state::IsSet,
-    S::ConvoId: log_delete_message_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LogDeleteMessage<'a> {
         LogDeleteMessage {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            rev: self.__unsafe_private_named.2.unwrap(),
+            convo_id: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            rev: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2582,9 +2586,9 @@ where
         >,
     ) -> LogDeleteMessage<'a> {
         LogDeleteMessage {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            rev: self.__unsafe_private_named.2.unwrap(),
+            convo_id: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            rev: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2600,63 +2604,59 @@ pub mod log_read_message_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ConvoId;
-        type Rev;
         type Message;
+        type Rev;
+        type ConvoId;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ConvoId = Unset;
-        type Rev = Unset;
         type Message = Unset;
+        type Rev = Unset;
+        type ConvoId = Unset;
     }
-    ///State transition - sets the `convo_id` field to Set
-    pub struct SetConvoId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetConvoId<S> {}
-    impl<S: State> State for SetConvoId<S> {
-        type ConvoId = Set<members::convo_id>;
+    ///State transition - sets the `message` field to Set
+    pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMessage<S> {}
+    impl<S: State> State for SetMessage<S> {
+        type Message = Set<members::message>;
         type Rev = S::Rev;
-        type Message = S::Message;
+        type ConvoId = S::ConvoId;
     }
     ///State transition - sets the `rev` field to Set
     pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRev<S> {}
     impl<S: State> State for SetRev<S> {
-        type ConvoId = S::ConvoId;
-        type Rev = Set<members::rev>;
         type Message = S::Message;
-    }
-    ///State transition - sets the `message` field to Set
-    pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMessage<S> {}
-    impl<S: State> State for SetMessage<S> {
+        type Rev = Set<members::rev>;
         type ConvoId = S::ConvoId;
+    }
+    ///State transition - sets the `convo_id` field to Set
+    pub struct SetConvoId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetConvoId<S> {}
+    impl<S: State> State for SetConvoId<S> {
+        type Message = S::Message;
         type Rev = S::Rev;
-        type Message = Set<members::message>;
+        type ConvoId = Set<members::convo_id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `convo_id` field
-        pub struct convo_id(());
-        ///Marker type for the `rev` field
-        pub struct rev(());
         ///Marker type for the `message` field
         pub struct message(());
+        ///Marker type for the `rev` field
+        pub struct rev(());
+        ///Marker type for the `convo_id` field
+        pub struct convo_id(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LogReadMessageBuilder<'a, S: log_read_message_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<LogReadMessageMessage<'a>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<LogReadMessageMessage<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LogReadMessage<'a> {
@@ -2670,9 +2670,9 @@ impl<'a> LogReadMessageBuilder<'a, log_read_message_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LogReadMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2687,11 +2687,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogReadMessageBuilder<'a, log_read_message_state::SetConvoId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LogReadMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2706,11 +2706,11 @@ where
         mut self,
         value: impl Into<LogReadMessageMessage<'a>>,
     ) -> LogReadMessageBuilder<'a, log_read_message_state::SetMessage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LogReadMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2725,11 +2725,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogReadMessageBuilder<'a, log_read_message_state::SetRev<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LogReadMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2737,16 +2737,16 @@ where
 impl<'a, S> LogReadMessageBuilder<'a, S>
 where
     S: log_read_message_state::State,
-    S::ConvoId: log_read_message_state::IsSet,
-    S::Rev: log_read_message_state::IsSet,
     S::Message: log_read_message_state::IsSet,
+    S::Rev: log_read_message_state::IsSet,
+    S::ConvoId: log_read_message_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LogReadMessage<'a> {
         LogReadMessage {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            rev: self.__unsafe_private_named.2.unwrap(),
+            convo_id: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            rev: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2759,9 +2759,9 @@ where
         >,
     ) -> LogReadMessage<'a> {
         LogReadMessage {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            rev: self.__unsafe_private_named.2.unwrap(),
+            convo_id: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            rev: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2777,80 +2777,80 @@ pub mod log_remove_reaction_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Rev;
         type Reaction;
-        type ConvoId;
         type Message;
+        type ConvoId;
+        type Rev;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Rev = Unset;
         type Reaction = Unset;
-        type ConvoId = Unset;
         type Message = Unset;
-    }
-    ///State transition - sets the `rev` field to Set
-    pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRev<S> {}
-    impl<S: State> State for SetRev<S> {
-        type Rev = Set<members::rev>;
-        type Reaction = S::Reaction;
-        type ConvoId = S::ConvoId;
-        type Message = S::Message;
+        type ConvoId = Unset;
+        type Rev = Unset;
     }
     ///State transition - sets the `reaction` field to Set
     pub struct SetReaction<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetReaction<S> {}
     impl<S: State> State for SetReaction<S> {
-        type Rev = S::Rev;
         type Reaction = Set<members::reaction>;
-        type ConvoId = S::ConvoId;
         type Message = S::Message;
+        type ConvoId = S::ConvoId;
+        type Rev = S::Rev;
+    }
+    ///State transition - sets the `message` field to Set
+    pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMessage<S> {}
+    impl<S: State> State for SetMessage<S> {
+        type Reaction = S::Reaction;
+        type Message = Set<members::message>;
+        type ConvoId = S::ConvoId;
+        type Rev = S::Rev;
     }
     ///State transition - sets the `convo_id` field to Set
     pub struct SetConvoId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetConvoId<S> {}
     impl<S: State> State for SetConvoId<S> {
-        type Rev = S::Rev;
         type Reaction = S::Reaction;
-        type ConvoId = Set<members::convo_id>;
         type Message = S::Message;
-    }
-    ///State transition - sets the `message` field to Set
-    pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMessage<S> {}
-    impl<S: State> State for SetMessage<S> {
+        type ConvoId = Set<members::convo_id>;
         type Rev = S::Rev;
+    }
+    ///State transition - sets the `rev` field to Set
+    pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRev<S> {}
+    impl<S: State> State for SetRev<S> {
         type Reaction = S::Reaction;
+        type Message = S::Message;
         type ConvoId = S::ConvoId;
-        type Message = Set<members::message>;
+        type Rev = Set<members::rev>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `rev` field
-        pub struct rev(());
         ///Marker type for the `reaction` field
         pub struct reaction(());
-        ///Marker type for the `convo_id` field
-        pub struct convo_id(());
         ///Marker type for the `message` field
         pub struct message(());
+        ///Marker type for the `convo_id` field
+        pub struct convo_id(());
+        ///Marker type for the `rev` field
+        pub struct rev(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LogRemoveReactionBuilder<'a, S: log_remove_reaction_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<LogRemoveReactionMessage<'a>>,
         Option<convo::ReactionView<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LogRemoveReaction<'a> {
@@ -2864,9 +2864,9 @@ impl<'a> LogRemoveReactionBuilder<'a, log_remove_reaction_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LogRemoveReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2881,11 +2881,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogRemoveReactionBuilder<'a, log_remove_reaction_state::SetConvoId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LogRemoveReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2900,11 +2900,11 @@ where
         mut self,
         value: impl Into<LogRemoveReactionMessage<'a>>,
     ) -> LogRemoveReactionBuilder<'a, log_remove_reaction_state::SetMessage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LogRemoveReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2919,11 +2919,11 @@ where
         mut self,
         value: impl Into<convo::ReactionView<'a>>,
     ) -> LogRemoveReactionBuilder<'a, log_remove_reaction_state::SetReaction<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LogRemoveReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2938,11 +2938,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogRemoveReactionBuilder<'a, log_remove_reaction_state::SetRev<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LogRemoveReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2950,18 +2950,18 @@ where
 impl<'a, S> LogRemoveReactionBuilder<'a, S>
 where
     S: log_remove_reaction_state::State,
-    S::Rev: log_remove_reaction_state::IsSet,
     S::Reaction: log_remove_reaction_state::IsSet,
-    S::ConvoId: log_remove_reaction_state::IsSet,
     S::Message: log_remove_reaction_state::IsSet,
+    S::ConvoId: log_remove_reaction_state::IsSet,
+    S::Rev: log_remove_reaction_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LogRemoveReaction<'a> {
         LogRemoveReaction {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            reaction: self.__unsafe_private_named.2.unwrap(),
-            rev: self.__unsafe_private_named.3.unwrap(),
+            convo_id: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            reaction: self._fields.2.unwrap(),
+            rev: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2974,10 +2974,10 @@ where
         >,
     ) -> LogRemoveReaction<'a> {
         LogRemoveReaction {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            reaction: self.__unsafe_private_named.2.unwrap(),
-            rev: self.__unsafe_private_named.3.unwrap(),
+            convo_id: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            reaction: self._fields.2.unwrap(),
+            rev: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -3029,12 +3029,9 @@ pub mod message_and_reaction_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct MessageAndReactionViewBuilder<'a, S: message_and_reaction_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<convo::MessageView<'a>>,
-        Option<convo::ReactionView<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<convo::MessageView<'a>>, Option<convo::ReactionView<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MessageAndReactionView<'a> {
@@ -3051,9 +3048,9 @@ impl<'a> MessageAndReactionViewBuilder<'a, message_and_reaction_view_state::Empt
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MessageAndReactionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3071,11 +3068,11 @@ where
         'a,
         message_and_reaction_view_state::SetMessage<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MessageAndReactionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3093,11 +3090,11 @@ where
         'a,
         message_and_reaction_view_state::SetReaction<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MessageAndReactionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3111,8 +3108,8 @@ where
     /// Build the final struct
     pub fn build(self) -> MessageAndReactionView<'a> {
         MessageAndReactionView {
-            message: self.__unsafe_private_named.0.unwrap(),
-            reaction: self.__unsafe_private_named.1.unwrap(),
+            message: self._fields.0.unwrap(),
+            reaction: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3125,8 +3122,8 @@ where
         >,
     ) -> MessageAndReactionView<'a> {
         MessageAndReactionView {
-            message: self.__unsafe_private_named.0.unwrap(),
-            reaction: self.__unsafe_private_named.1.unwrap(),
+            message: self._fields.0.unwrap(),
+            reaction: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -3142,59 +3139,59 @@ pub mod message_ref_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Did;
         type MessageId;
         type ConvoId;
-        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Did = Unset;
         type MessageId = Unset;
         type ConvoId = Unset;
-        type Did = Unset;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Did = Set<members::did>;
+        type MessageId = S::MessageId;
+        type ConvoId = S::ConvoId;
     }
     ///State transition - sets the `message_id` field to Set
     pub struct SetMessageId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMessageId<S> {}
     impl<S: State> State for SetMessageId<S> {
+        type Did = S::Did;
         type MessageId = Set<members::message_id>;
         type ConvoId = S::ConvoId;
-        type Did = S::Did;
     }
     ///State transition - sets the `convo_id` field to Set
     pub struct SetConvoId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetConvoId<S> {}
     impl<S: State> State for SetConvoId<S> {
-        type MessageId = S::MessageId;
-        type ConvoId = Set<members::convo_id>;
         type Did = S::Did;
-    }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
         type MessageId = S::MessageId;
-        type ConvoId = S::ConvoId;
-        type Did = Set<members::did>;
+        type ConvoId = Set<members::convo_id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `did` field
+        pub struct did(());
         ///Marker type for the `message_id` field
         pub struct message_id(());
         ///Marker type for the `convo_id` field
         pub struct convo_id(());
-        ///Marker type for the `did` field
-        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MessageRefBuilder<'a, S: message_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Did<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Did<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MessageRef<'a> {
@@ -3208,9 +3205,9 @@ impl<'a> MessageRefBuilder<'a, message_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MessageRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3225,11 +3222,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MessageRefBuilder<'a, message_ref_state::SetConvoId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MessageRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3244,11 +3241,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MessageRefBuilder<'a, message_ref_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MessageRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3263,11 +3260,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MessageRefBuilder<'a, message_ref_state::SetMessageId<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         MessageRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3275,16 +3272,16 @@ where
 impl<'a, S> MessageRefBuilder<'a, S>
 where
     S: message_ref_state::State,
+    S::Did: message_ref_state::IsSet,
     S::MessageId: message_ref_state::IsSet,
     S::ConvoId: message_ref_state::IsSet,
-    S::Did: message_ref_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> MessageRef<'a> {
         MessageRef {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            message_id: self.__unsafe_private_named.2.unwrap(),
+            convo_id: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            message_id: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3297,9 +3294,9 @@ where
         >,
     ) -> MessageRef<'a> {
         MessageRef {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            message_id: self.__unsafe_private_named.2.unwrap(),
+            convo_id: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            message_id: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -3315,92 +3312,92 @@ pub mod message_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Sender;
-        type SentAt;
         type Id;
+        type SentAt;
         type Rev;
         type Text;
+        type Sender;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Sender = Unset;
-        type SentAt = Unset;
         type Id = Unset;
+        type SentAt = Unset;
         type Rev = Unset;
         type Text = Unset;
+        type Sender = Unset;
     }
-    ///State transition - sets the `sender` field to Set
-    pub struct SetSender<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSender<S> {}
-    impl<S: State> State for SetSender<S> {
-        type Sender = Set<members::sender>;
+    ///State transition - sets the `id` field to Set
+    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetId<S> {}
+    impl<S: State> State for SetId<S> {
+        type Id = Set<members::id>;
         type SentAt = S::SentAt;
-        type Id = S::Id;
         type Rev = S::Rev;
         type Text = S::Text;
+        type Sender = S::Sender;
     }
     ///State transition - sets the `sent_at` field to Set
     pub struct SetSentAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSentAt<S> {}
     impl<S: State> State for SetSentAt<S> {
-        type Sender = S::Sender;
-        type SentAt = Set<members::sent_at>;
         type Id = S::Id;
+        type SentAt = Set<members::sent_at>;
         type Rev = S::Rev;
         type Text = S::Text;
-    }
-    ///State transition - sets the `id` field to Set
-    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetId<S> {}
-    impl<S: State> State for SetId<S> {
         type Sender = S::Sender;
-        type SentAt = S::SentAt;
-        type Id = Set<members::id>;
-        type Rev = S::Rev;
-        type Text = S::Text;
     }
     ///State transition - sets the `rev` field to Set
     pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRev<S> {}
     impl<S: State> State for SetRev<S> {
-        type Sender = S::Sender;
-        type SentAt = S::SentAt;
         type Id = S::Id;
+        type SentAt = S::SentAt;
         type Rev = Set<members::rev>;
         type Text = S::Text;
+        type Sender = S::Sender;
     }
     ///State transition - sets the `text` field to Set
     pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetText<S> {}
     impl<S: State> State for SetText<S> {
-        type Sender = S::Sender;
-        type SentAt = S::SentAt;
         type Id = S::Id;
+        type SentAt = S::SentAt;
         type Rev = S::Rev;
         type Text = Set<members::text>;
+        type Sender = S::Sender;
+    }
+    ///State transition - sets the `sender` field to Set
+    pub struct SetSender<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSender<S> {}
+    impl<S: State> State for SetSender<S> {
+        type Id = S::Id;
+        type SentAt = S::SentAt;
+        type Rev = S::Rev;
+        type Text = S::Text;
+        type Sender = Set<members::sender>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `sender` field
-        pub struct sender(());
-        ///Marker type for the `sent_at` field
-        pub struct sent_at(());
         ///Marker type for the `id` field
         pub struct id(());
+        ///Marker type for the `sent_at` field
+        pub struct sent_at(());
         ///Marker type for the `rev` field
         pub struct rev(());
         ///Marker type for the `text` field
         pub struct text(());
+        ///Marker type for the `sender` field
+        pub struct sender(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MessageViewBuilder<'a, S: message_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<View<'a>>,
         Option<Vec<Facet<'a>>>,
         Option<CowStr<'a>>,
@@ -3410,7 +3407,7 @@ pub struct MessageViewBuilder<'a, S: message_view_state::State> {
         Option<Datetime>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MessageView<'a> {
@@ -3424,9 +3421,9 @@ impl<'a> MessageViewBuilder<'a, message_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MessageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3434,12 +3431,12 @@ impl<'a> MessageViewBuilder<'a, message_view_state::Empty> {
 impl<'a, S: message_view_state::State> MessageViewBuilder<'a, S> {
     /// Set the `embed` field (optional)
     pub fn embed(mut self, value: impl Into<Option<View<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `embed` field to an Option value (optional)
     pub fn maybe_embed(mut self, value: Option<View<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -3447,12 +3444,12 @@ impl<'a, S: message_view_state::State> MessageViewBuilder<'a, S> {
 impl<'a, S: message_view_state::State> MessageViewBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3467,11 +3464,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MessageViewBuilder<'a, message_view_state::SetId<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         MessageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3482,7 +3479,7 @@ impl<'a, S: message_view_state::State> MessageViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<convo::ReactionView<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `reactions` field to an Option value (optional)
@@ -3490,7 +3487,7 @@ impl<'a, S: message_view_state::State> MessageViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<convo::ReactionView<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -3505,11 +3502,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MessageViewBuilder<'a, message_view_state::SetRev<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         MessageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3524,11 +3521,11 @@ where
         mut self,
         value: impl Into<convo::MessageViewSender<'a>>,
     ) -> MessageViewBuilder<'a, message_view_state::SetSender<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         MessageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3543,11 +3540,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MessageViewBuilder<'a, message_view_state::SetSentAt<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         MessageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3562,11 +3559,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MessageViewBuilder<'a, message_view_state::SetText<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         MessageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3574,23 +3571,23 @@ where
 impl<'a, S> MessageViewBuilder<'a, S>
 where
     S: message_view_state::State,
-    S::Sender: message_view_state::IsSet,
-    S::SentAt: message_view_state::IsSet,
     S::Id: message_view_state::IsSet,
+    S::SentAt: message_view_state::IsSet,
     S::Rev: message_view_state::IsSet,
     S::Text: message_view_state::IsSet,
+    S::Sender: message_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> MessageView<'a> {
         MessageView {
-            embed: self.__unsafe_private_named.0,
-            facets: self.__unsafe_private_named.1,
-            id: self.__unsafe_private_named.2.unwrap(),
-            reactions: self.__unsafe_private_named.3,
-            rev: self.__unsafe_private_named.4.unwrap(),
-            sender: self.__unsafe_private_named.5.unwrap(),
-            sent_at: self.__unsafe_private_named.6.unwrap(),
-            text: self.__unsafe_private_named.7.unwrap(),
+            embed: self._fields.0,
+            facets: self._fields.1,
+            id: self._fields.2.unwrap(),
+            reactions: self._fields.3,
+            rev: self._fields.4.unwrap(),
+            sender: self._fields.5.unwrap(),
+            sent_at: self._fields.6.unwrap(),
+            text: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3603,14 +3600,14 @@ where
         >,
     ) -> MessageView<'a> {
         MessageView {
-            embed: self.__unsafe_private_named.0,
-            facets: self.__unsafe_private_named.1,
-            id: self.__unsafe_private_named.2.unwrap(),
-            reactions: self.__unsafe_private_named.3,
-            rev: self.__unsafe_private_named.4.unwrap(),
-            sender: self.__unsafe_private_named.5.unwrap(),
-            sent_at: self.__unsafe_private_named.6.unwrap(),
-            text: self.__unsafe_private_named.7.unwrap(),
+            embed: self._fields.0,
+            facets: self._fields.1,
+            id: self._fields.2.unwrap(),
+            reactions: self._fields.3,
+            rev: self._fields.4.unwrap(),
+            sender: self._fields.5.unwrap(),
+            sent_at: self._fields.6.unwrap(),
+            text: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -3650,9 +3647,9 @@ pub mod message_view_sender_state {
 
 /// Builder for constructing an instance of this type
 pub struct MessageViewSenderBuilder<'a, S: message_view_sender_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MessageViewSender<'a> {
@@ -3666,9 +3663,9 @@ impl<'a> MessageViewSenderBuilder<'a, message_view_sender_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MessageViewSenderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3683,11 +3680,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MessageViewSenderBuilder<'a, message_view_sender_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MessageViewSenderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3700,7 +3697,7 @@ where
     /// Build the final struct
     pub fn build(self) -> MessageViewSender<'a> {
         MessageViewSender {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3713,7 +3710,7 @@ where
         >,
     ) -> MessageViewSender<'a> {
         MessageViewSender {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -3730,62 +3727,62 @@ pub mod reaction_view_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Value;
-        type CreatedAt;
         type Sender;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Value = Unset;
-        type CreatedAt = Unset;
         type Sender = Unset;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `value` field to Set
     pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetValue<S> {}
     impl<S: State> State for SetValue<S> {
         type Value = Set<members::value>;
-        type CreatedAt = S::CreatedAt;
-        type Sender = S::Sender;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type Value = S::Value;
-        type CreatedAt = Set<members::created_at>;
         type Sender = S::Sender;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `sender` field to Set
     pub struct SetSender<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSender<S> {}
     impl<S: State> State for SetSender<S> {
         type Value = S::Value;
-        type CreatedAt = S::CreatedAt;
         type Sender = Set<members::sender>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Value = S::Value;
+        type Sender = S::Sender;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `value` field
         pub struct value(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `sender` field
         pub struct sender(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReactionViewBuilder<'a, S: reaction_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<convo::ReactionViewSender<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReactionView<'a> {
@@ -3799,9 +3796,9 @@ impl<'a> ReactionViewBuilder<'a, reaction_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReactionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3816,11 +3813,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReactionViewBuilder<'a, reaction_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReactionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3835,11 +3832,11 @@ where
         mut self,
         value: impl Into<convo::ReactionViewSender<'a>>,
     ) -> ReactionViewBuilder<'a, reaction_view_state::SetSender<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReactionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3854,11 +3851,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReactionViewBuilder<'a, reaction_view_state::SetValue<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReactionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3867,15 +3864,15 @@ impl<'a, S> ReactionViewBuilder<'a, S>
 where
     S: reaction_view_state::State,
     S::Value: reaction_view_state::IsSet,
-    S::CreatedAt: reaction_view_state::IsSet,
     S::Sender: reaction_view_state::IsSet,
+    S::CreatedAt: reaction_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ReactionView<'a> {
         ReactionView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            sender: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            sender: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3888,9 +3885,9 @@ where
         >,
     ) -> ReactionView<'a> {
         ReactionView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            sender: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            sender: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -3930,9 +3927,9 @@ pub mod reaction_view_sender_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReactionViewSenderBuilder<'a, S: reaction_view_sender_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReactionViewSender<'a> {
@@ -3946,9 +3943,9 @@ impl<'a> ReactionViewSenderBuilder<'a, reaction_view_sender_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReactionViewSenderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3963,11 +3960,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ReactionViewSenderBuilder<'a, reaction_view_sender_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReactionViewSenderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3980,7 +3977,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ReactionViewSender<'a> {
         ReactionViewSender {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3993,7 +3990,7 @@ where
         >,
     ) -> ReactionViewSender<'a> {
         ReactionViewSender {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/chat_bsky/convo/accept_convo.rs b/crates/jacquard-api/src/chat_bsky/convo/accept_convo.rs
index 820142d0..bcb84698 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/accept_convo.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/accept_convo.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/chat_bsky/convo/add_reaction.rs b/crates/jacquard-api/src/chat_bsky/convo/add_reaction.rs
index e469332d..6cb6cf67 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/add_reaction.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/add_reaction.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/chat_bsky/convo/delete_message_for_self.rs b/crates/jacquard-api/src/chat_bsky/convo/delete_message_for_self.rs
index 99f894bd..7d71b539 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/delete_message_for_self.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/delete_message_for_self.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/chat_bsky/convo/get_convo.rs b/crates/jacquard-api/src/chat_bsky/convo/get_convo.rs
index 103058d5..b6c621bb 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/get_convo.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/get_convo.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_convo_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetConvoBuilder<'a, S: get_convo_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetConvo<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetConvoBuilder<'a, get_convo_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetConvoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetConvoBuilder<'a, get_convo_state::SetConvoId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetConvoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetConvo<'a> {
         GetConvo {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
+            convo_id: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/get_convo_availability.rs b/crates/jacquard-api/src/chat_bsky/convo/get_convo_availability.rs
index 7730ab5a..78b64b4f 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/get_convo_availability.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/get_convo_availability.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -88,9 +91,9 @@ pub mod get_convo_availability_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetConvoAvailabilityBuilder<'a, S: get_convo_availability_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<Did<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<Did<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetConvoAvailability<'a> {
@@ -107,9 +110,9 @@ impl<'a> GetConvoAvailabilityBuilder<'a, get_convo_availability_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetConvoAvailabilityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -124,11 +127,11 @@ where
         mut self,
         value: impl Into<Vec<Did<'a>>>,
     ) -> GetConvoAvailabilityBuilder<'a, get_convo_availability_state::SetMembers<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetConvoAvailabilityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -141,7 +144,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetConvoAvailability<'a> {
         GetConvoAvailability {
-            members: self.__unsafe_private_named.0.unwrap(),
+            members: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/get_convo_for_members.rs b/crates/jacquard-api/src/chat_bsky/convo/get_convo_for_members.rs
index a0b008b5..83a53906 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/get_convo_for_members.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/get_convo_for_members.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_convo_for_members_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetConvoForMembersBuilder<'a, S: get_convo_for_members_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<Did<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<Did<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetConvoForMembers<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetConvoForMembersBuilder<'a, get_convo_for_members_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetConvoForMembersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<Vec<Did<'a>>>,
     ) -> GetConvoForMembersBuilder<'a, get_convo_for_members_state::SetMembers<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetConvoForMembersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetConvoForMembers<'a> {
         GetConvoForMembers {
-            members: self.__unsafe_private_named.0.unwrap(),
+            members: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/get_log.rs b/crates/jacquard-api/src/chat_bsky/convo/get_log.rs
index 6b032eba..7307d434 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/get_log.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/get_log.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -114,9 +117,9 @@ pub mod get_log_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetLogBuilder<'a, S: get_log_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetLog<'a> {
@@ -130,9 +133,9 @@ impl<'a> GetLogBuilder<'a, get_log_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetLogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -140,12 +143,12 @@ impl<'a> GetLogBuilder<'a, get_log_state::Empty> {
 impl<'a, S: get_log_state::State> GetLogBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -156,8 +159,6 @@ where
 {
     /// Build the final struct
     pub fn build(self) -> GetLog<'a> {
-        GetLog {
-            cursor: self.__unsafe_private_named.0,
-        }
+        GetLog { cursor: self._fields.0 }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/get_messages.rs b/crates/jacquard-api/src/chat_bsky/convo/get_messages.rs
index fc3e94f2..82f7224b 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/get_messages.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/get_messages.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -113,9 +116,9 @@ pub mod get_messages_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetMessagesBuilder<'a, S: get_messages_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetMessages<'a> {
@@ -129,9 +132,9 @@ impl<'a> GetMessagesBuilder<'a, get_messages_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetMessagesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -146,11 +149,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetMessagesBuilder<'a, get_messages_state::SetConvoId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetMessagesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -158,12 +161,12 @@ where
 impl<'a, S: get_messages_state::State> GetMessagesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -171,12 +174,12 @@ impl<'a, S: get_messages_state::State> GetMessagesBuilder<'a, S> {
 impl<'a, S: get_messages_state::State> GetMessagesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -189,9 +192,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetMessages<'a> {
         GetMessages {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            convo_id: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/leave_convo.rs b/crates/jacquard-api/src/chat_bsky/convo/leave_convo.rs
index c7bf49ab..c9a4e655 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/leave_convo.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/leave_convo.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/chat_bsky/convo/list_convos.rs b/crates/jacquard-api/src/chat_bsky/convo/list_convos.rs
index 26951a07..18536fe5 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/list_convos.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/list_convos.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -91,14 +94,9 @@ pub mod list_convos_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListConvosBuilder<'a, S: list_convos_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<i64>,
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListConvos<'a> {
@@ -112,9 +110,9 @@ impl<'a> ListConvosBuilder<'a, list_convos_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListConvosBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -122,12 +120,12 @@ impl<'a> ListConvosBuilder<'a, list_convos_state::Empty> {
 impl<'a, S: list_convos_state::State> ListConvosBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -135,12 +133,12 @@ impl<'a, S: list_convos_state::State> ListConvosBuilder<'a, S> {
 impl<'a, S: list_convos_state::State> ListConvosBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -148,12 +146,12 @@ impl<'a, S: list_convos_state::State> ListConvosBuilder<'a, S> {
 impl<'a, S: list_convos_state::State> ListConvosBuilder<'a, S> {
     /// Set the `readState` field (optional)
     pub fn read_state(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `readState` field to an Option value (optional)
     pub fn maybe_read_state(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -161,12 +159,12 @@ impl<'a, S: list_convos_state::State> ListConvosBuilder<'a, S> {
 impl<'a, S: list_convos_state::State> ListConvosBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -178,10 +176,10 @@ where
     /// Build the final struct
     pub fn build(self) -> ListConvos<'a> {
         ListConvos {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            read_state: self.__unsafe_private_named.2,
-            status: self.__unsafe_private_named.3,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            read_state: self._fields.2,
+            status: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/mute_convo.rs b/crates/jacquard-api/src/chat_bsky/convo/mute_convo.rs
index ce6902c1..a622d0e0 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/mute_convo.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/mute_convo.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/chat_bsky/convo/remove_reaction.rs b/crates/jacquard-api/src/chat_bsky/convo/remove_reaction.rs
index 8c19505d..f81c5ba1 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/remove_reaction.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/remove_reaction.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/chat_bsky/convo/send_message.rs b/crates/jacquard-api/src/chat_bsky/convo/send_message.rs
index 78310aaf..f1132c24 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/send_message.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/send_message.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -71,45 +74,45 @@ pub mod send_message_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ConvoId;
         type Message;
+        type ConvoId;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ConvoId = Unset;
         type Message = Unset;
-    }
-    ///State transition - sets the `convo_id` field to Set
-    pub struct SetConvoId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetConvoId<S> {}
-    impl<S: State> State for SetConvoId<S> {
-        type ConvoId = Set<members::convo_id>;
-        type Message = S::Message;
+        type ConvoId = Unset;
     }
     ///State transition - sets the `message` field to Set
     pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMessage<S> {}
     impl<S: State> State for SetMessage<S> {
-        type ConvoId = S::ConvoId;
         type Message = Set<members::message>;
+        type ConvoId = S::ConvoId;
+    }
+    ///State transition - sets the `convo_id` field to Set
+    pub struct SetConvoId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetConvoId<S> {}
+    impl<S: State> State for SetConvoId<S> {
+        type Message = S::Message;
+        type ConvoId = Set<members::convo_id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `convo_id` field
-        pub struct convo_id(());
         ///Marker type for the `message` field
         pub struct message(());
+        ///Marker type for the `convo_id` field
+        pub struct convo_id(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SendMessageBuilder<'a, S: send_message_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<MessageInput<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<MessageInput<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SendMessage<'a> {
@@ -123,9 +126,9 @@ impl<'a> SendMessageBuilder<'a, send_message_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SendMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -140,11 +143,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SendMessageBuilder<'a, send_message_state::SetConvoId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SendMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -159,11 +162,11 @@ where
         mut self,
         value: impl Into<MessageInput<'a>>,
     ) -> SendMessageBuilder<'a, send_message_state::SetMessage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SendMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -171,14 +174,14 @@ where
 impl<'a, S> SendMessageBuilder<'a, S>
 where
     S: send_message_state::State,
-    S::ConvoId: send_message_state::IsSet,
     S::Message: send_message_state::IsSet,
+    S::ConvoId: send_message_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SendMessage<'a> {
         SendMessage {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
+            convo_id: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -191,8 +194,8 @@ where
         >,
     ) -> SendMessage<'a> {
         SendMessage {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
+            convo_id: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/chat_bsky/convo/send_message_batch.rs b/crates/jacquard-api/src/chat_bsky/convo/send_message_batch.rs
index 676e8fa0..1f4a46e3 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/send_message_batch.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/send_message_batch.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -139,9 +142,9 @@ pub mod batch_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct BatchItemBuilder<'a, S: batch_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<MessageInput<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<MessageInput<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BatchItem<'a> {
@@ -155,9 +158,9 @@ impl<'a> BatchItemBuilder<'a, batch_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BatchItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -172,11 +175,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BatchItemBuilder<'a, batch_item_state::SetConvoId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BatchItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -191,11 +194,11 @@ where
         mut self,
         value: impl Into<MessageInput<'a>>,
     ) -> BatchItemBuilder<'a, batch_item_state::SetMessage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BatchItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,8 +212,8 @@ where
     /// Build the final struct
     pub fn build(self) -> BatchItem<'a> {
         BatchItem {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
+            convo_id: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -223,8 +226,8 @@ where
         >,
     ) -> BatchItem<'a> {
         BatchItem {
-            convo_id: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
+            convo_id: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -342,9 +345,9 @@ pub mod send_message_batch_state {
 
 /// Builder for constructing an instance of this type
 pub struct SendMessageBatchBuilder<'a, S: send_message_batch_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<send_message_batch::BatchItem<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<send_message_batch::BatchItem<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SendMessageBatch<'a> {
@@ -358,9 +361,9 @@ impl<'a> SendMessageBatchBuilder<'a, send_message_batch_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SendMessageBatchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -375,11 +378,11 @@ where
         mut self,
         value: impl Into<Vec<send_message_batch::BatchItem<'a>>>,
     ) -> SendMessageBatchBuilder<'a, send_message_batch_state::SetItems<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SendMessageBatchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -392,7 +395,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SendMessageBatch<'a> {
         SendMessageBatch {
-            items: self.__unsafe_private_named.0.unwrap(),
+            items: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -405,7 +408,7 @@ where
         >,
     ) -> SendMessageBatch<'a> {
         SendMessageBatch {
-            items: self.__unsafe_private_named.0.unwrap(),
+            items: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/chat_bsky/convo/unmute_convo.rs b/crates/jacquard-api/src/chat_bsky/convo/unmute_convo.rs
index d6d1641d..26a73e4c 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/unmute_convo.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/unmute_convo.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/chat_bsky/convo/update_all_read.rs b/crates/jacquard-api/src/chat_bsky/convo/update_all_read.rs
index 86504b42..d381d4e7 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/update_all_read.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/update_all_read.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/chat_bsky/convo/update_read.rs b/crates/jacquard-api/src/chat_bsky/convo/update_read.rs
index 0acc160c..d8d958d6 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/update_read.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/update_read.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/chat_bsky/moderation/get_actor_metadata.rs b/crates/jacquard-api/src/chat_bsky/moderation/get_actor_metadata.rs
index 935387a7..0fa1e012 100644
--- a/crates/jacquard-api/src/chat_bsky/moderation/get_actor_metadata.rs
+++ b/crates/jacquard-api/src/chat_bsky/moderation/get_actor_metadata.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -124,9 +127,9 @@ pub mod get_actor_metadata_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorMetadataBuilder<'a, S: get_actor_metadata_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorMetadata<'a> {
@@ -140,9 +143,9 @@ impl<'a> GetActorMetadataBuilder<'a, get_actor_metadata_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorMetadataBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -157,11 +160,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetActorMetadataBuilder<'a, get_actor_metadata_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorMetadataBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -174,7 +177,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorMetadata<'a> {
         GetActorMetadata {
-            actor: self.__unsafe_private_named.0.unwrap(),
+            actor: self._fields.0.unwrap(),
         }
     }
 }
@@ -255,9 +258,9 @@ pub mod metadata_state {
 
 /// Builder for constructing an instance of this type
 pub struct MetadataBuilder<'a, S: metadata_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Metadata<'a> {
@@ -271,9 +274,9 @@ impl<'a> MetadataBuilder<'a, metadata_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MetadataBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -288,11 +291,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> MetadataBuilder<'a, metadata_state::SetConvos<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MetadataBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -307,11 +310,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> MetadataBuilder<'a, metadata_state::SetConvosStarted<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MetadataBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -326,11 +329,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> MetadataBuilder<'a, metadata_state::SetMessagesReceived<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         MetadataBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -345,11 +348,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> MetadataBuilder<'a, metadata_state::SetMessagesSent<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         MetadataBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -365,10 +368,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Metadata<'a> {
         Metadata {
-            convos: self.__unsafe_private_named.0.unwrap(),
-            convos_started: self.__unsafe_private_named.1.unwrap(),
-            messages_received: self.__unsafe_private_named.2.unwrap(),
-            messages_sent: self.__unsafe_private_named.3.unwrap(),
+            convos: self._fields.0.unwrap(),
+            convos_started: self._fields.1.unwrap(),
+            messages_received: self._fields.2.unwrap(),
+            messages_sent: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -381,10 +384,10 @@ where
         >,
     ) -> Metadata<'a> {
         Metadata {
-            convos: self.__unsafe_private_named.0.unwrap(),
-            convos_started: self.__unsafe_private_named.1.unwrap(),
-            messages_received: self.__unsafe_private_named.2.unwrap(),
-            messages_sent: self.__unsafe_private_named.3.unwrap(),
+            convos: self._fields.0.unwrap(),
+            convos_started: self._fields.1.unwrap(),
+            messages_received: self._fields.2.unwrap(),
+            messages_sent: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/chat_bsky/moderation/get_message_context.rs b/crates/jacquard-api/src/chat_bsky/moderation/get_message_context.rs
index d3935d2f..d67e7463 100644
--- a/crates/jacquard-api/src/chat_bsky/moderation/get_message_context.rs
+++ b/crates/jacquard-api/src/chat_bsky/moderation/get_message_context.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -118,14 +121,9 @@ pub mod get_message_context_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetMessageContextBuilder<'a, S: get_message_context_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<i64>,
-        Option<i64>,
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetMessageContext<'a> {
@@ -139,9 +137,9 @@ impl<'a> GetMessageContextBuilder<'a, get_message_context_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetMessageContextBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,12 +147,12 @@ impl<'a> GetMessageContextBuilder<'a, get_message_context_state::Empty> {
 impl<'a, S: get_message_context_state::State> GetMessageContextBuilder<'a, S> {
     /// Set the `after` field (optional)
     pub fn after(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `after` field to an Option value (optional)
     pub fn maybe_after(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -162,12 +160,12 @@ impl<'a, S: get_message_context_state::State> GetMessageContextBuilder<'a, S> {
 impl<'a, S: get_message_context_state::State> GetMessageContextBuilder<'a, S> {
     /// Set the `before` field (optional)
     pub fn before(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `before` field to an Option value (optional)
     pub fn maybe_before(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -175,12 +173,12 @@ impl<'a, S: get_message_context_state::State> GetMessageContextBuilder<'a, S> {
 impl<'a, S: get_message_context_state::State> GetMessageContextBuilder<'a, S> {
     /// Set the `convoId` field (optional)
     pub fn convo_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `convoId` field to an Option value (optional)
     pub fn maybe_convo_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -195,11 +193,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetMessageContextBuilder<'a, get_message_context_state::SetMessageId<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         GetMessageContextBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,10 +210,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetMessageContext<'a> {
         GetMessageContext {
-            after: self.__unsafe_private_named.0,
-            before: self.__unsafe_private_named.1,
-            convo_id: self.__unsafe_private_named.2,
-            message_id: self.__unsafe_private_named.3.unwrap(),
+            after: self._fields.0,
+            before: self._fields.1,
+            convo_id: self._fields.2,
+            message_id: self._fields.3.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/moderation/update_actor_access.rs b/crates/jacquard-api/src/chat_bsky/moderation/update_actor_access.rs
index 601114a7..431ee0db 100644
--- a/crates/jacquard-api/src/chat_bsky/moderation/update_actor_access.rs
+++ b/crates/jacquard-api/src/chat_bsky/moderation/update_actor_access.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -62,45 +65,45 @@ pub mod update_actor_access_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Actor;
         type AllowAccess;
+        type Actor;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Actor = Unset;
         type AllowAccess = Unset;
-    }
-    ///State transition - sets the `actor` field to Set
-    pub struct SetActor<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetActor<S> {}
-    impl<S: State> State for SetActor<S> {
-        type Actor = Set<members::actor>;
-        type AllowAccess = S::AllowAccess;
+        type Actor = Unset;
     }
     ///State transition - sets the `allow_access` field to Set
     pub struct SetAllowAccess<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAllowAccess<S> {}
     impl<S: State> State for SetAllowAccess<S> {
-        type Actor = S::Actor;
         type AllowAccess = Set<members::allow_access>;
+        type Actor = S::Actor;
+    }
+    ///State transition - sets the `actor` field to Set
+    pub struct SetActor<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetActor<S> {}
+    impl<S: State> State for SetActor<S> {
+        type AllowAccess = S::AllowAccess;
+        type Actor = Set<members::actor>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `actor` field
-        pub struct actor(());
         ///Marker type for the `allow_access` field
         pub struct allow_access(());
+        ///Marker type for the `actor` field
+        pub struct actor(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct UpdateActorAccessBuilder<'a, S: update_actor_access_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<bool>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<bool>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateActorAccess<'a> {
@@ -114,9 +117,9 @@ impl<'a> UpdateActorAccessBuilder<'a, update_actor_access_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateActorAccessBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -131,11 +134,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> UpdateActorAccessBuilder<'a, update_actor_access_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UpdateActorAccessBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -150,11 +153,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> UpdateActorAccessBuilder<'a, update_actor_access_state::SetAllowAccess<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UpdateActorAccessBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -162,12 +165,12 @@ where
 impl<'a, S: update_actor_access_state::State> UpdateActorAccessBuilder<'a, S> {
     /// Set the `ref` field (optional)
     pub fn r#ref(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `ref` field to an Option value (optional)
     pub fn maybe_ref(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -175,15 +178,15 @@ impl<'a, S: update_actor_access_state::State> UpdateActorAccessBuilder<'a, S> {
 impl<'a, S> UpdateActorAccessBuilder<'a, S>
 where
     S: update_actor_access_state::State,
-    S::Actor: update_actor_access_state::IsSet,
     S::AllowAccess: update_actor_access_state::IsSet,
+    S::Actor: update_actor_access_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> UpdateActorAccess<'a> {
         UpdateActorAccess {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            allow_access: self.__unsafe_private_named.1.unwrap(),
-            r#ref: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            allow_access: self._fields.1.unwrap(),
+            r#ref: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -196,9 +199,9 @@ where
         >,
     ) -> UpdateActorAccess<'a> {
         UpdateActorAccess {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            allow_access: self.__unsafe_private_named.1.unwrap(),
-            r#ref: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            allow_access: self._fields.1.unwrap(),
+            r#ref: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/chat_firehose/get_user_channels.rs b/crates/jacquard-api/src/chat_firehose/get_user_channels.rs
index 0e33bfd6..d7a93457 100644
--- a/crates/jacquard-api/src/chat_firehose/get_user_channels.rs
+++ b/crates/jacquard-api/src/chat_firehose/get_user_channels.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
diff --git a/crates/jacquard-api/src/city_yoyle/status.rs b/crates/jacquard-api/src/city_yoyle/status.rs
index 7607d8a6..f7d0577e 100644
--- a/crates/jacquard-api/src/city_yoyle/status.rs
+++ b/crates/jacquard-api/src/city_yoyle/status.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -157,9 +160,9 @@ pub mod status_state {
 
 /// Builder for constructing an instance of this type
 pub struct StatusBuilder<'a, S: status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Status<'a> {
@@ -173,9 +176,9 @@ impl<'a> StatusBuilder<'a, status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,12 +186,12 @@ impl<'a> StatusBuilder<'a, status_state::Empty> {
 impl<'a, S: status_state::State> StatusBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -203,11 +206,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> StatusBuilder<'a, status_state::SetText<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -220,8 +223,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Status<'a> {
         Status {
-            created_at: self.__unsafe_private_named.0,
-            text: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0,
+            text: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -234,8 +237,8 @@ where
         >,
     ) -> Status<'a> {
         Status {
-            created_at: self.__unsafe_private_named.0,
-            text: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0,
+            text: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/club_stellz/evm/address_control.rs b/crates/jacquard-api/src/club_stellz/evm/address_control.rs
index 2b4ea1ac..245e5252 100644
--- a/crates/jacquard-api/src/club_stellz/evm/address_control.rs
+++ b/crates/jacquard-api/src/club_stellz/evm/address_control.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -163,64 +166,64 @@ pub mod address_control_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Siwe;
         type Address;
         type Signature;
+        type Siwe;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Siwe = Unset;
         type Address = Unset;
         type Signature = Unset;
-    }
-    ///State transition - sets the `siwe` field to Set
-    pub struct SetSiwe<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSiwe<S> {}
-    impl<S: State> State for SetSiwe<S> {
-        type Siwe = Set<members::siwe>;
-        type Address = S::Address;
-        type Signature = S::Signature;
+        type Siwe = Unset;
     }
     ///State transition - sets the `address` field to Set
     pub struct SetAddress<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAddress<S> {}
     impl<S: State> State for SetAddress<S> {
-        type Siwe = S::Siwe;
         type Address = Set<members::address>;
         type Signature = S::Signature;
+        type Siwe = S::Siwe;
     }
     ///State transition - sets the `signature` field to Set
     pub struct SetSignature<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSignature<S> {}
     impl<S: State> State for SetSignature<S> {
-        type Siwe = S::Siwe;
         type Address = S::Address;
         type Signature = Set<members::signature>;
+        type Siwe = S::Siwe;
+    }
+    ///State transition - sets the `siwe` field to Set
+    pub struct SetSiwe<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSiwe<S> {}
+    impl<S: State> State for SetSiwe<S> {
+        type Address = S::Address;
+        type Signature = S::Signature;
+        type Siwe = Set<members::siwe>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `siwe` field
-        pub struct siwe(());
         ///Marker type for the `address` field
         pub struct address(());
         ///Marker type for the `signature` field
         pub struct signature(());
+        ///Marker type for the `siwe` field
+        pub struct siwe(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AddressControlBuilder<'a, S: address_control_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Bytes>,
         Option<Vec<i64>>,
         Option<Bytes>,
         Option<address_control::SiweMessage<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AddressControl<'a> {
@@ -234,9 +237,9 @@ impl<'a> AddressControlBuilder<'a, address_control_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AddressControlBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -251,11 +254,11 @@ where
         mut self,
         value: impl Into<Bytes>,
     ) -> AddressControlBuilder<'a, address_control_state::SetAddress<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AddressControlBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -263,12 +266,12 @@ where
 impl<'a, S: address_control_state::State> AddressControlBuilder<'a, S> {
     /// Set the `alsoOn` field (optional)
     pub fn also_on(mut self, value: impl Into<Option<Vec<i64>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `alsoOn` field to an Option value (optional)
     pub fn maybe_also_on(mut self, value: Option<Vec<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -283,11 +286,11 @@ where
         mut self,
         value: impl Into<Bytes>,
     ) -> AddressControlBuilder<'a, address_control_state::SetSignature<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AddressControlBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -302,11 +305,11 @@ where
         mut self,
         value: impl Into<address_control::SiweMessage<'a>>,
     ) -> AddressControlBuilder<'a, address_control_state::SetSiwe<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         AddressControlBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -314,17 +317,17 @@ where
 impl<'a, S> AddressControlBuilder<'a, S>
 where
     S: address_control_state::State,
-    S::Siwe: address_control_state::IsSet,
     S::Address: address_control_state::IsSet,
     S::Signature: address_control_state::IsSet,
+    S::Siwe: address_control_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AddressControl<'a> {
         AddressControl {
-            address: self.__unsafe_private_named.0.unwrap(),
-            also_on: self.__unsafe_private_named.1,
-            signature: self.__unsafe_private_named.2.unwrap(),
-            siwe: self.__unsafe_private_named.3.unwrap(),
+            address: self._fields.0.unwrap(),
+            also_on: self._fields.1,
+            signature: self._fields.2.unwrap(),
+            siwe: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -337,10 +340,10 @@ where
         >,
     ) -> AddressControl<'a> {
         AddressControl {
-            address: self.__unsafe_private_named.0.unwrap(),
-            also_on: self.__unsafe_private_named.1,
-            signature: self.__unsafe_private_named.2.unwrap(),
-            siwe: self.__unsafe_private_named.3.unwrap(),
+            address: self._fields.0.unwrap(),
+            also_on: self._fields.1,
+            signature: self._fields.2.unwrap(),
+            siwe: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -525,158 +528,158 @@ pub mod siwe_message_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Address;
         type ChainId;
+        type Version;
+        type Address;
         type Uri;
-        type Nonce;
         type Statement;
-        type IssuedAt;
-        type Version;
+        type Nonce;
         type Domain;
+        type IssuedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Address = Unset;
         type ChainId = Unset;
+        type Version = Unset;
+        type Address = Unset;
         type Uri = Unset;
-        type Nonce = Unset;
         type Statement = Unset;
-        type IssuedAt = Unset;
-        type Version = Unset;
+        type Nonce = Unset;
         type Domain = Unset;
-    }
-    ///State transition - sets the `address` field to Set
-    pub struct SetAddress<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAddress<S> {}
-    impl<S: State> State for SetAddress<S> {
-        type Address = Set<members::address>;
-        type ChainId = S::ChainId;
-        type Uri = S::Uri;
-        type Nonce = S::Nonce;
-        type Statement = S::Statement;
-        type IssuedAt = S::IssuedAt;
-        type Version = S::Version;
-        type Domain = S::Domain;
+        type IssuedAt = Unset;
     }
     ///State transition - sets the `chain_id` field to Set
     pub struct SetChainId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetChainId<S> {}
     impl<S: State> State for SetChainId<S> {
-        type Address = S::Address;
         type ChainId = Set<members::chain_id>;
+        type Version = S::Version;
+        type Address = S::Address;
         type Uri = S::Uri;
+        type Statement = S::Statement;
         type Nonce = S::Nonce;
+        type Domain = S::Domain;
+        type IssuedAt = S::IssuedAt;
+    }
+    ///State transition - sets the `version` field to Set
+    pub struct SetVersion<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetVersion<S> {}
+    impl<S: State> State for SetVersion<S> {
+        type ChainId = S::ChainId;
+        type Version = Set<members::version>;
+        type Address = S::Address;
+        type Uri = S::Uri;
         type Statement = S::Statement;
+        type Nonce = S::Nonce;
+        type Domain = S::Domain;
         type IssuedAt = S::IssuedAt;
+    }
+    ///State transition - sets the `address` field to Set
+    pub struct SetAddress<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAddress<S> {}
+    impl<S: State> State for SetAddress<S> {
+        type ChainId = S::ChainId;
         type Version = S::Version;
+        type Address = Set<members::address>;
+        type Uri = S::Uri;
+        type Statement = S::Statement;
+        type Nonce = S::Nonce;
         type Domain = S::Domain;
+        type IssuedAt = S::IssuedAt;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Address = S::Address;
         type ChainId = S::ChainId;
-        type Uri = Set<members::uri>;
-        type Nonce = S::Nonce;
-        type Statement = S::Statement;
-        type IssuedAt = S::IssuedAt;
         type Version = S::Version;
-        type Domain = S::Domain;
-    }
-    ///State transition - sets the `nonce` field to Set
-    pub struct SetNonce<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetNonce<S> {}
-    impl<S: State> State for SetNonce<S> {
         type Address = S::Address;
-        type ChainId = S::ChainId;
-        type Uri = S::Uri;
-        type Nonce = Set<members::nonce>;
+        type Uri = Set<members::uri>;
         type Statement = S::Statement;
-        type IssuedAt = S::IssuedAt;
-        type Version = S::Version;
+        type Nonce = S::Nonce;
         type Domain = S::Domain;
+        type IssuedAt = S::IssuedAt;
     }
     ///State transition - sets the `statement` field to Set
     pub struct SetStatement<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStatement<S> {}
     impl<S: State> State for SetStatement<S> {
-        type Address = S::Address;
         type ChainId = S::ChainId;
-        type Uri = S::Uri;
-        type Nonce = S::Nonce;
-        type Statement = Set<members::statement>;
-        type IssuedAt = S::IssuedAt;
         type Version = S::Version;
-        type Domain = S::Domain;
-    }
-    ///State transition - sets the `issued_at` field to Set
-    pub struct SetIssuedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIssuedAt<S> {}
-    impl<S: State> State for SetIssuedAt<S> {
         type Address = S::Address;
-        type ChainId = S::ChainId;
         type Uri = S::Uri;
+        type Statement = Set<members::statement>;
         type Nonce = S::Nonce;
-        type Statement = S::Statement;
-        type IssuedAt = Set<members::issued_at>;
-        type Version = S::Version;
         type Domain = S::Domain;
+        type IssuedAt = S::IssuedAt;
     }
-    ///State transition - sets the `version` field to Set
-    pub struct SetVersion<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetVersion<S> {}
-    impl<S: State> State for SetVersion<S> {
-        type Address = S::Address;
+    ///State transition - sets the `nonce` field to Set
+    pub struct SetNonce<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetNonce<S> {}
+    impl<S: State> State for SetNonce<S> {
         type ChainId = S::ChainId;
+        type Version = S::Version;
+        type Address = S::Address;
         type Uri = S::Uri;
-        type Nonce = S::Nonce;
         type Statement = S::Statement;
-        type IssuedAt = S::IssuedAt;
-        type Version = Set<members::version>;
+        type Nonce = Set<members::nonce>;
         type Domain = S::Domain;
+        type IssuedAt = S::IssuedAt;
     }
     ///State transition - sets the `domain` field to Set
     pub struct SetDomain<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDomain<S> {}
     impl<S: State> State for SetDomain<S> {
-        type Address = S::Address;
         type ChainId = S::ChainId;
+        type Version = S::Version;
+        type Address = S::Address;
         type Uri = S::Uri;
-        type Nonce = S::Nonce;
         type Statement = S::Statement;
+        type Nonce = S::Nonce;
+        type Domain = Set<members::domain>;
         type IssuedAt = S::IssuedAt;
+    }
+    ///State transition - sets the `issued_at` field to Set
+    pub struct SetIssuedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIssuedAt<S> {}
+    impl<S: State> State for SetIssuedAt<S> {
+        type ChainId = S::ChainId;
         type Version = S::Version;
-        type Domain = Set<members::domain>;
+        type Address = S::Address;
+        type Uri = S::Uri;
+        type Statement = S::Statement;
+        type Nonce = S::Nonce;
+        type Domain = S::Domain;
+        type IssuedAt = Set<members::issued_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `address` field
-        pub struct address(());
         ///Marker type for the `chain_id` field
         pub struct chain_id(());
+        ///Marker type for the `version` field
+        pub struct version(());
+        ///Marker type for the `address` field
+        pub struct address(());
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `nonce` field
-        pub struct nonce(());
         ///Marker type for the `statement` field
         pub struct statement(());
-        ///Marker type for the `issued_at` field
-        pub struct issued_at(());
-        ///Marker type for the `version` field
-        pub struct version(());
+        ///Marker type for the `nonce` field
+        pub struct nonce(());
         ///Marker type for the `domain` field
         pub struct domain(());
+        ///Marker type for the `issued_at` field
+        pub struct issued_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SiweMessageBuilder<'a, S: siwe_message_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<i64>,
         Option<CowStr<'a>>,
@@ -686,7 +689,7 @@ pub struct SiweMessageBuilder<'a, S: siwe_message_state::State> {
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SiweMessage<'a> {
@@ -700,9 +703,9 @@ impl<'a> SiweMessageBuilder<'a, siwe_message_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SiweMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -717,11 +720,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SiweMessageBuilder<'a, siwe_message_state::SetAddress<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SiweMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -736,11 +739,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SiweMessageBuilder<'a, siwe_message_state::SetChainId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SiweMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -755,11 +758,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SiweMessageBuilder<'a, siwe_message_state::SetDomain<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SiweMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -774,11 +777,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SiweMessageBuilder<'a, siwe_message_state::SetIssuedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SiweMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -793,11 +796,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SiweMessageBuilder<'a, siwe_message_state::SetNonce<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         SiweMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -812,11 +815,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SiweMessageBuilder<'a, siwe_message_state::SetStatement<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         SiweMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -831,11 +834,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> SiweMessageBuilder<'a, siwe_message_state::SetUri<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         SiweMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -850,11 +853,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SiweMessageBuilder<'a, siwe_message_state::SetVersion<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         SiweMessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -862,26 +865,26 @@ where
 impl<'a, S> SiweMessageBuilder<'a, S>
 where
     S: siwe_message_state::State,
-    S::Address: siwe_message_state::IsSet,
     S::ChainId: siwe_message_state::IsSet,
+    S::Version: siwe_message_state::IsSet,
+    S::Address: siwe_message_state::IsSet,
     S::Uri: siwe_message_state::IsSet,
-    S::Nonce: siwe_message_state::IsSet,
     S::Statement: siwe_message_state::IsSet,
-    S::IssuedAt: siwe_message_state::IsSet,
-    S::Version: siwe_message_state::IsSet,
+    S::Nonce: siwe_message_state::IsSet,
     S::Domain: siwe_message_state::IsSet,
+    S::IssuedAt: siwe_message_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SiweMessage<'a> {
         SiweMessage {
-            address: self.__unsafe_private_named.0.unwrap(),
-            chain_id: self.__unsafe_private_named.1.unwrap(),
-            domain: self.__unsafe_private_named.2.unwrap(),
-            issued_at: self.__unsafe_private_named.3.unwrap(),
-            nonce: self.__unsafe_private_named.4.unwrap(),
-            statement: self.__unsafe_private_named.5.unwrap(),
-            uri: self.__unsafe_private_named.6.unwrap(),
-            version: self.__unsafe_private_named.7.unwrap(),
+            address: self._fields.0.unwrap(),
+            chain_id: self._fields.1.unwrap(),
+            domain: self._fields.2.unwrap(),
+            issued_at: self._fields.3.unwrap(),
+            nonce: self._fields.4.unwrap(),
+            statement: self._fields.5.unwrap(),
+            uri: self._fields.6.unwrap(),
+            version: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -894,14 +897,14 @@ where
         >,
     ) -> SiweMessage<'a> {
         SiweMessage {
-            address: self.__unsafe_private_named.0.unwrap(),
-            chain_id: self.__unsafe_private_named.1.unwrap(),
-            domain: self.__unsafe_private_named.2.unwrap(),
-            issued_at: self.__unsafe_private_named.3.unwrap(),
-            nonce: self.__unsafe_private_named.4.unwrap(),
-            statement: self.__unsafe_private_named.5.unwrap(),
-            uri: self.__unsafe_private_named.6.unwrap(),
-            version: self.__unsafe_private_named.7.unwrap(),
+            address: self._fields.0.unwrap(),
+            chain_id: self._fields.1.unwrap(),
+            domain: self._fields.2.unwrap(),
+            issued_at: self._fields.3.unwrap(),
+            nonce: self._fields.4.unwrap(),
+            statement: self._fields.5.unwrap(),
+            uri: self._fields.6.unwrap(),
+            version: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com__5jiji/test/list_videos.rs b/crates/jacquard-api/src/com__5jiji/test/list_videos.rs
index 2f177663..dabcb760 100644
--- a/crates/jacquard-api/src/com__5jiji/test/list_videos.rs
+++ b/crates/jacquard-api/src/com__5jiji/test/list_videos.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::deps::bytes::Bytes;
 use jacquard_derive::IntoStatic;
diff --git a/crates/jacquard-api/src/com__5jiji/test/publish_video.rs b/crates/jacquard-api/src/com__5jiji/test/publish_video.rs
index 8a687b3d..dbaf09cd 100644
--- a/crates/jacquard-api/src/com__5jiji/test/publish_video.rs
+++ b/crates/jacquard-api/src/com__5jiji/test/publish_video.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
diff --git a/crates/jacquard-api/src/com__5jiji/test/videos.rs b/crates/jacquard-api/src/com__5jiji/test/videos.rs
index 5579d3e3..ca02bde5 100644
--- a/crates/jacquard-api/src/com__5jiji/test/videos.rs
+++ b/crates/jacquard-api/src/com__5jiji/test/videos.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -125,59 +128,59 @@ pub mod videos_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Id;
         type Title;
         type Creator;
-        type Id;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Id = Unset;
         type Title = Unset;
         type Creator = Unset;
-        type Id = Unset;
+    }
+    ///State transition - sets the `id` field to Set
+    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetId<S> {}
+    impl<S: State> State for SetId<S> {
+        type Id = Set<members::id>;
+        type Title = S::Title;
+        type Creator = S::Creator;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
+        type Id = S::Id;
         type Title = Set<members::title>;
         type Creator = S::Creator;
-        type Id = S::Id;
     }
     ///State transition - sets the `creator` field to Set
     pub struct SetCreator<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreator<S> {}
     impl<S: State> State for SetCreator<S> {
-        type Title = S::Title;
-        type Creator = Set<members::creator>;
         type Id = S::Id;
-    }
-    ///State transition - sets the `id` field to Set
-    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetId<S> {}
-    impl<S: State> State for SetId<S> {
         type Title = S::Title;
-        type Creator = S::Creator;
-        type Id = Set<members::id>;
+        type Creator = Set<members::creator>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `id` field
+        pub struct id(());
         ///Marker type for the `title` field
         pub struct title(());
         ///Marker type for the `creator` field
         pub struct creator(());
-        ///Marker type for the `id` field
-        pub struct id(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct VideosBuilder<'a, S: videos_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Data<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Data<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Videos<'a> {
@@ -191,9 +194,9 @@ impl<'a> VideosBuilder<'a, videos_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VideosBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -208,11 +211,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> VideosBuilder<'a, videos_state::SetCreator<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         VideosBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -227,11 +230,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> VideosBuilder<'a, videos_state::SetId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VideosBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,11 +249,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> VideosBuilder<'a, videos_state::SetTitle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         VideosBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -258,16 +261,16 @@ where
 impl<'a, S> VideosBuilder<'a, S>
 where
     S: videos_state::State,
+    S::Id: videos_state::IsSet,
     S::Title: videos_state::IsSet,
     S::Creator: videos_state::IsSet,
-    S::Id: videos_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Videos<'a> {
         Videos {
-            creator: self.__unsafe_private_named.0.unwrap(),
-            id: self.__unsafe_private_named.1.unwrap(),
-            title: self.__unsafe_private_named.2.unwrap(),
+            creator: self._fields.0.unwrap(),
+            id: self._fields.1.unwrap(),
+            title: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -277,9 +280,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Videos<'a> {
         Videos {
-            creator: self.__unsafe_private_named.0.unwrap(),
-            id: self.__unsafe_private_named.1.unwrap(),
-            title: self.__unsafe_private_named.2.unwrap(),
+            creator: self._fields.0.unwrap(),
+            id: self._fields.1.unwrap(),
+            title: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/admin.rs b/crates/jacquard-api/src/com_atproto/admin.rs
index c628dfad..e0db27ae 100644
--- a/crates/jacquard-api/src/com_atproto/admin.rs
+++ b/crates/jacquard-api/src/com_atproto/admin.rs
@@ -21,7 +21,11 @@ pub mod update_account_password;
 pub mod update_account_signing_key;
 pub mod update_subject_status;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -205,57 +209,57 @@ pub mod account_view_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Handle;
-        type Did;
         type IndexedAt;
+        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Handle = Unset;
-        type Did = Unset;
         type IndexedAt = Unset;
+        type Did = Unset;
     }
     ///State transition - sets the `handle` field to Set
     pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHandle<S> {}
     impl<S: State> State for SetHandle<S> {
         type Handle = Set<members::handle>;
-        type Did = S::Did;
-        type IndexedAt = S::IndexedAt;
-    }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Handle = S::Handle;
-        type Did = Set<members::did>;
         type IndexedAt = S::IndexedAt;
+        type Did = S::Did;
     }
     ///State transition - sets the `indexed_at` field to Set
     pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
     impl<S: State> State for SetIndexedAt<S> {
         type Handle = S::Handle;
-        type Did = S::Did;
         type IndexedAt = Set<members::indexed_at>;
+        type Did = S::Did;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Handle = S::Handle;
+        type IndexedAt = S::IndexedAt;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `handle` field
         pub struct handle(());
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `indexed_at` field
         pub struct indexed_at(());
+        ///Marker type for the `did` field
+        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AccountViewBuilder<'a, S: account_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
@@ -269,7 +273,7 @@ pub struct AccountViewBuilder<'a, S: account_view_state::State> {
         Option<Vec<Data<'a>>>,
         Option<Vec<admin::ThreatSignature<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AccountView<'a> {
@@ -283,8 +287,8 @@ impl<'a> AccountViewBuilder<'a, account_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AccountViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -298,7 +302,7 @@ impl<'a> AccountViewBuilder<'a, account_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -306,12 +310,12 @@ impl<'a> AccountViewBuilder<'a, account_view_state::Empty> {
 impl<'a, S: account_view_state::State> AccountViewBuilder<'a, S> {
     /// Set the `deactivatedAt` field (optional)
     pub fn deactivated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `deactivatedAt` field to an Option value (optional)
     pub fn maybe_deactivated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -326,11 +330,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> AccountViewBuilder<'a, account_view_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AccountViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -338,12 +342,12 @@ where
 impl<'a, S: account_view_state::State> AccountViewBuilder<'a, S> {
     /// Set the `email` field (optional)
     pub fn email(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `email` field to an Option value (optional)
     pub fn maybe_email(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -351,12 +355,12 @@ impl<'a, S: account_view_state::State> AccountViewBuilder<'a, S> {
 impl<'a, S: account_view_state::State> AccountViewBuilder<'a, S> {
     /// Set the `emailConfirmedAt` field (optional)
     pub fn email_confirmed_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `emailConfirmedAt` field to an Option value (optional)
     pub fn maybe_email_confirmed_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -371,11 +375,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> AccountViewBuilder<'a, account_view_state::SetHandle<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         AccountViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -390,11 +394,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AccountViewBuilder<'a, account_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         AccountViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -402,12 +406,12 @@ where
 impl<'a, S: account_view_state::State> AccountViewBuilder<'a, S> {
     /// Set the `inviteNote` field (optional)
     pub fn invite_note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `inviteNote` field to an Option value (optional)
     pub fn maybe_invite_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -415,12 +419,12 @@ impl<'a, S: account_view_state::State> AccountViewBuilder<'a, S> {
 impl<'a, S: account_view_state::State> AccountViewBuilder<'a, S> {
     /// Set the `invitedBy` field (optional)
     pub fn invited_by(mut self, value: impl Into<Option<InviteCode<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `invitedBy` field to an Option value (optional)
     pub fn maybe_invited_by(mut self, value: Option<InviteCode<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -428,12 +432,12 @@ impl<'a, S: account_view_state::State> AccountViewBuilder<'a, S> {
 impl<'a, S: account_view_state::State> AccountViewBuilder<'a, S> {
     /// Set the `invites` field (optional)
     pub fn invites(mut self, value: impl Into<Option<Vec<InviteCode<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `invites` field to an Option value (optional)
     pub fn maybe_invites(mut self, value: Option<Vec<InviteCode<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -441,12 +445,12 @@ impl<'a, S: account_view_state::State> AccountViewBuilder<'a, S> {
 impl<'a, S: account_view_state::State> AccountViewBuilder<'a, S> {
     /// Set the `invitesDisabled` field (optional)
     pub fn invites_disabled(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `invitesDisabled` field to an Option value (optional)
     pub fn maybe_invites_disabled(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -454,12 +458,12 @@ impl<'a, S: account_view_state::State> AccountViewBuilder<'a, S> {
 impl<'a, S: account_view_state::State> AccountViewBuilder<'a, S> {
     /// Set the `relatedRecords` field (optional)
     pub fn related_records(mut self, value: impl Into<Option<Vec<Data<'a>>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `relatedRecords` field to an Option value (optional)
     pub fn maybe_related_records(mut self, value: Option<Vec<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -470,7 +474,7 @@ impl<'a, S: account_view_state::State> AccountViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<admin::ThreatSignature<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `threatSignatures` field to an Option value (optional)
@@ -478,7 +482,7 @@ impl<'a, S: account_view_state::State> AccountViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<admin::ThreatSignature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -487,24 +491,24 @@ impl<'a, S> AccountViewBuilder<'a, S>
 where
     S: account_view_state::State,
     S::Handle: account_view_state::IsSet,
-    S::Did: account_view_state::IsSet,
     S::IndexedAt: account_view_state::IsSet,
+    S::Did: account_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AccountView<'a> {
         AccountView {
-            deactivated_at: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            email: self.__unsafe_private_named.2,
-            email_confirmed_at: self.__unsafe_private_named.3,
-            handle: self.__unsafe_private_named.4.unwrap(),
-            indexed_at: self.__unsafe_private_named.5.unwrap(),
-            invite_note: self.__unsafe_private_named.6,
-            invited_by: self.__unsafe_private_named.7,
-            invites: self.__unsafe_private_named.8,
-            invites_disabled: self.__unsafe_private_named.9,
-            related_records: self.__unsafe_private_named.10,
-            threat_signatures: self.__unsafe_private_named.11,
+            deactivated_at: self._fields.0,
+            did: self._fields.1.unwrap(),
+            email: self._fields.2,
+            email_confirmed_at: self._fields.3,
+            handle: self._fields.4.unwrap(),
+            indexed_at: self._fields.5.unwrap(),
+            invite_note: self._fields.6,
+            invited_by: self._fields.7,
+            invites: self._fields.8,
+            invites_disabled: self._fields.9,
+            related_records: self._fields.10,
+            threat_signatures: self._fields.11,
             extra_data: Default::default(),
         }
     }
@@ -514,18 +518,18 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> AccountView<'a> {
         AccountView {
-            deactivated_at: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            email: self.__unsafe_private_named.2,
-            email_confirmed_at: self.__unsafe_private_named.3,
-            handle: self.__unsafe_private_named.4.unwrap(),
-            indexed_at: self.__unsafe_private_named.5.unwrap(),
-            invite_note: self.__unsafe_private_named.6,
-            invited_by: self.__unsafe_private_named.7,
-            invites: self.__unsafe_private_named.8,
-            invites_disabled: self.__unsafe_private_named.9,
-            related_records: self.__unsafe_private_named.10,
-            threat_signatures: self.__unsafe_private_named.11,
+            deactivated_at: self._fields.0,
+            did: self._fields.1.unwrap(),
+            email: self._fields.2,
+            email_confirmed_at: self._fields.3,
+            handle: self._fields.4.unwrap(),
+            indexed_at: self._fields.5.unwrap(),
+            invite_note: self._fields.6,
+            invited_by: self._fields.7,
+            invites: self._fields.8,
+            invites_disabled: self._fields.9,
+            related_records: self._fields.10,
+            threat_signatures: self._fields.11,
             extra_data: Some(extra_data),
         }
     }
@@ -763,45 +767,45 @@ pub mod repo_blob_ref_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Did;
         type Cid;
+        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Did = Unset;
         type Cid = Unset;
-    }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Did = Set<members::did>;
-        type Cid = S::Cid;
+        type Did = Unset;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type Did = S::Did;
         type Cid = Set<members::cid>;
+        type Did = S::Did;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Cid = S::Cid;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `cid` field
         pub struct cid(());
+        ///Marker type for the `did` field
+        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RepoBlobRefBuilder<'a, S: repo_blob_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<Did<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<Did<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RepoBlobRef<'a> {
@@ -815,9 +819,9 @@ impl<'a> RepoBlobRefBuilder<'a, repo_blob_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RepoBlobRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -832,11 +836,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> RepoBlobRefBuilder<'a, repo_blob_ref_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RepoBlobRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -851,11 +855,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> RepoBlobRefBuilder<'a, repo_blob_ref_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RepoBlobRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -863,12 +867,12 @@ where
 impl<'a, S: repo_blob_ref_state::State> RepoBlobRefBuilder<'a, S> {
     /// Set the `recordUri` field (optional)
     pub fn record_uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `recordUri` field to an Option value (optional)
     pub fn maybe_record_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -876,15 +880,15 @@ impl<'a, S: repo_blob_ref_state::State> RepoBlobRefBuilder<'a, S> {
 impl<'a, S> RepoBlobRefBuilder<'a, S>
 where
     S: repo_blob_ref_state::State,
-    S::Did: repo_blob_ref_state::IsSet,
     S::Cid: repo_blob_ref_state::IsSet,
+    S::Did: repo_blob_ref_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RepoBlobRef<'a> {
         RepoBlobRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            record_uri: self.__unsafe_private_named.2,
+            cid: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            record_uri: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -894,9 +898,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> RepoBlobRef<'a> {
         RepoBlobRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            record_uri: self.__unsafe_private_named.2,
+            cid: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            record_uri: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -936,9 +940,9 @@ pub mod repo_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct RepoRefBuilder<'a, S: repo_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RepoRef<'a> {
@@ -952,9 +956,9 @@ impl<'a> RepoRefBuilder<'a, repo_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RepoRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -969,11 +973,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> RepoRefBuilder<'a, repo_ref_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RepoRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -986,7 +990,7 @@ where
     /// Build the final struct
     pub fn build(self) -> RepoRef<'a> {
         RepoRef {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -996,7 +1000,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> RepoRef<'a> {
         RepoRef {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1036,9 +1040,9 @@ pub mod status_attr_state {
 
 /// Builder for constructing an instance of this type
 pub struct StatusAttrBuilder<'a, S: status_attr_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> StatusAttr<'a> {
@@ -1052,9 +1056,9 @@ impl<'a> StatusAttrBuilder<'a, status_attr_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StatusAttrBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1069,11 +1073,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> StatusAttrBuilder<'a, status_attr_state::SetApplied<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StatusAttrBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1081,12 +1085,12 @@ where
 impl<'a, S: status_attr_state::State> StatusAttrBuilder<'a, S> {
     /// Set the `ref` field (optional)
     pub fn r#ref(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `ref` field to an Option value (optional)
     pub fn maybe_ref(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1099,8 +1103,8 @@ where
     /// Build the final struct
     pub fn build(self) -> StatusAttr<'a> {
         StatusAttr {
-            applied: self.__unsafe_private_named.0.unwrap(),
-            r#ref: self.__unsafe_private_named.1,
+            applied: self._fields.0.unwrap(),
+            r#ref: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -1110,8 +1114,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> StatusAttr<'a> {
         StatusAttr {
-            applied: self.__unsafe_private_named.0.unwrap(),
-            r#ref: self.__unsafe_private_named.1,
+            applied: self._fields.0.unwrap(),
+            r#ref: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/admin/delete_account.rs b/crates/jacquard-api/src/com_atproto/admin/delete_account.rs
index f6fee0b4..70392155 100644
--- a/crates/jacquard-api/src/com_atproto/admin/delete_account.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/delete_account.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -81,9 +84,9 @@ pub mod delete_account_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeleteAccountBuilder<'a, S: delete_account_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeleteAccount<'a> {
@@ -97,9 +100,9 @@ impl<'a> DeleteAccountBuilder<'a, delete_account_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteAccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,11 +117,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> DeleteAccountBuilder<'a, delete_account_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeleteAccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -131,7 +134,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DeleteAccount<'a> {
         DeleteAccount {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -144,7 +147,7 @@ where
         >,
     ) -> DeleteAccount<'a> {
         DeleteAccount {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/admin/disable_account_invites.rs b/crates/jacquard-api/src/com_atproto/admin/disable_account_invites.rs
index 9d38410e..3a2babf2 100644
--- a/crates/jacquard-api/src/com_atproto/admin/disable_account_invites.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/disable_account_invites.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -86,9 +89,9 @@ pub mod disable_account_invites_state {
 
 /// Builder for constructing an instance of this type
 pub struct DisableAccountInvitesBuilder<'a, S: disable_account_invites_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DisableAccountInvites<'a> {
@@ -105,9 +108,9 @@ impl<'a> DisableAccountInvitesBuilder<'a, disable_account_invites_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DisableAccountInvitesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -122,11 +125,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> DisableAccountInvitesBuilder<'a, disable_account_invites_state::SetAccount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DisableAccountInvitesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -134,12 +137,12 @@ where
 impl<'a, S: disable_account_invites_state::State> DisableAccountInvitesBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -152,8 +155,8 @@ where
     /// Build the final struct
     pub fn build(self) -> DisableAccountInvites<'a> {
         DisableAccountInvites {
-            account: self.__unsafe_private_named.0.unwrap(),
-            note: self.__unsafe_private_named.1,
+            account: self._fields.0.unwrap(),
+            note: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -166,8 +169,8 @@ where
         >,
     ) -> DisableAccountInvites<'a> {
         DisableAccountInvites {
-            account: self.__unsafe_private_named.0.unwrap(),
-            note: self.__unsafe_private_named.1,
+            account: self._fields.0.unwrap(),
+            note: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/admin/disable_invite_codes.rs b/crates/jacquard-api/src/com_atproto/admin/disable_invite_codes.rs
index ed883908..20ea9e3d 100644
--- a/crates/jacquard-api/src/com_atproto/admin/disable_invite_codes.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/disable_invite_codes.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/com_atproto/admin/enable_account_invites.rs b/crates/jacquard-api/src/com_atproto/admin/enable_account_invites.rs
index ad495d25..55cdc2a3 100644
--- a/crates/jacquard-api/src/com_atproto/admin/enable_account_invites.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/enable_account_invites.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -86,9 +89,9 @@ pub mod enable_account_invites_state {
 
 /// Builder for constructing an instance of this type
 pub struct EnableAccountInvitesBuilder<'a, S: enable_account_invites_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> EnableAccountInvites<'a> {
@@ -105,9 +108,9 @@ impl<'a> EnableAccountInvitesBuilder<'a, enable_account_invites_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EnableAccountInvitesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -122,11 +125,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> EnableAccountInvitesBuilder<'a, enable_account_invites_state::SetAccount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EnableAccountInvitesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -134,12 +137,12 @@ where
 impl<'a, S: enable_account_invites_state::State> EnableAccountInvitesBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -152,8 +155,8 @@ where
     /// Build the final struct
     pub fn build(self) -> EnableAccountInvites<'a> {
         EnableAccountInvites {
-            account: self.__unsafe_private_named.0.unwrap(),
-            note: self.__unsafe_private_named.1,
+            account: self._fields.0.unwrap(),
+            note: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -166,8 +169,8 @@ where
         >,
     ) -> EnableAccountInvites<'a> {
         EnableAccountInvites {
-            account: self.__unsafe_private_named.0.unwrap(),
-            note: self.__unsafe_private_named.1,
+            account: self._fields.0.unwrap(),
+            note: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/admin/get_account_info.rs b/crates/jacquard-api/src/com_atproto/admin/get_account_info.rs
index 48395cae..67f2ff06 100644
--- a/crates/jacquard-api/src/com_atproto/admin/get_account_info.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/get_account_info.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_account_info_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetAccountInfoBuilder<'a, S: get_account_info_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetAccountInfo<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetAccountInfoBuilder<'a, get_account_info_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetAccountInfoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetAccountInfoBuilder<'a, get_account_info_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetAccountInfoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetAccountInfo<'a> {
         GetAccountInfo {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/get_account_infos.rs b/crates/jacquard-api/src/com_atproto/admin/get_account_infos.rs
index 17ba7d9c..c67d7f86 100644
--- a/crates/jacquard-api/src/com_atproto/admin/get_account_infos.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/get_account_infos.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_account_infos_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetAccountInfosBuilder<'a, S: get_account_infos_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<Did<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<Did<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetAccountInfos<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetAccountInfosBuilder<'a, get_account_infos_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetAccountInfosBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<Vec<Did<'a>>>,
     ) -> GetAccountInfosBuilder<'a, get_account_infos_state::SetDids<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetAccountInfosBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetAccountInfos<'a> {
         GetAccountInfos {
-            dids: self.__unsafe_private_named.0.unwrap(),
+            dids: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/get_invite_codes.rs b/crates/jacquard-api/src/com_atproto/admin/get_invite_codes.rs
index 9b576906..2b9f477c 100644
--- a/crates/jacquard-api/src/com_atproto/admin/get_invite_codes.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/get_invite_codes.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -94,9 +97,9 @@ pub mod get_invite_codes_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetInviteCodesBuilder<'a, S: get_invite_codes_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetInviteCodes<'a> {
@@ -110,9 +113,9 @@ impl<'a> GetInviteCodesBuilder<'a, get_invite_codes_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetInviteCodesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,12 +123,12 @@ impl<'a> GetInviteCodesBuilder<'a, get_invite_codes_state::Empty> {
 impl<'a, S: get_invite_codes_state::State> GetInviteCodesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -133,12 +136,12 @@ impl<'a, S: get_invite_codes_state::State> GetInviteCodesBuilder<'a, S> {
 impl<'a, S: get_invite_codes_state::State> GetInviteCodesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -146,12 +149,12 @@ impl<'a, S: get_invite_codes_state::State> GetInviteCodesBuilder<'a, S> {
 impl<'a, S: get_invite_codes_state::State> GetInviteCodesBuilder<'a, S> {
     /// Set the `sort` field (optional)
     pub fn sort(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `sort` field to an Option value (optional)
     pub fn maybe_sort(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -163,9 +166,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetInviteCodes<'a> {
         GetInviteCodes {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            sort: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            sort: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/get_subject_status.rs b/crates/jacquard-api/src/com_atproto/admin/get_subject_status.rs
index 16a1ecf1..26788c3f 100644
--- a/crates/jacquard-api/src/com_atproto/admin/get_subject_status.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/get_subject_status.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::{Did, AtUri, Cid};
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -103,9 +106,9 @@ pub mod get_subject_status_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSubjectStatusBuilder<'a, S: get_subject_status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<Did<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<Did<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSubjectStatus<'a> {
@@ -119,9 +122,9 @@ impl<'a> GetSubjectStatusBuilder<'a, get_subject_status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSubjectStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -129,12 +132,12 @@ impl<'a> GetSubjectStatusBuilder<'a, get_subject_status_state::Empty> {
 impl<'a, S: get_subject_status_state::State> GetSubjectStatusBuilder<'a, S> {
     /// Set the `blob` field (optional)
     pub fn blob(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `blob` field to an Option value (optional)
     pub fn maybe_blob(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -142,12 +145,12 @@ impl<'a, S: get_subject_status_state::State> GetSubjectStatusBuilder<'a, S> {
 impl<'a, S: get_subject_status_state::State> GetSubjectStatusBuilder<'a, S> {
     /// Set the `did` field (optional)
     pub fn did(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `did` field to an Option value (optional)
     pub fn maybe_did(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -155,12 +158,12 @@ impl<'a, S: get_subject_status_state::State> GetSubjectStatusBuilder<'a, S> {
 impl<'a, S: get_subject_status_state::State> GetSubjectStatusBuilder<'a, S> {
     /// Set the `uri` field (optional)
     pub fn uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `uri` field to an Option value (optional)
     pub fn maybe_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -172,9 +175,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSubjectStatus<'a> {
         GetSubjectStatus {
-            blob: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1,
-            uri: self.__unsafe_private_named.2,
+            blob: self._fields.0,
+            did: self._fields.1,
+            uri: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/search_accounts.rs b/crates/jacquard-api/src/com_atproto/admin/search_accounts.rs
index 7ce49509..966aafa7 100644
--- a/crates/jacquard-api/src/com_atproto/admin/search_accounts.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/search_accounts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -88,9 +91,9 @@ pub mod search_accounts_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchAccountsBuilder<'a, S: search_accounts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchAccounts<'a> {
@@ -104,9 +107,9 @@ impl<'a> SearchAccountsBuilder<'a, search_accounts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchAccountsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,12 +117,12 @@ impl<'a> SearchAccountsBuilder<'a, search_accounts_state::Empty> {
 impl<'a, S: search_accounts_state::State> SearchAccountsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -127,12 +130,12 @@ impl<'a, S: search_accounts_state::State> SearchAccountsBuilder<'a, S> {
 impl<'a, S: search_accounts_state::State> SearchAccountsBuilder<'a, S> {
     /// Set the `email` field (optional)
     pub fn email(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `email` field to an Option value (optional)
     pub fn maybe_email(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -140,12 +143,12 @@ impl<'a, S: search_accounts_state::State> SearchAccountsBuilder<'a, S> {
 impl<'a, S: search_accounts_state::State> SearchAccountsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -157,9 +160,9 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchAccounts<'a> {
         SearchAccounts {
-            cursor: self.__unsafe_private_named.0,
-            email: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            email: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/send_email.rs b/crates/jacquard-api/src/com_atproto/admin/send_email.rs
index 99ccc4a9..8d796fa3 100644
--- a/crates/jacquard-api/src/com_atproto/admin/send_email.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/send_email.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -77,49 +80,49 @@ pub mod send_email_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Content;
         type RecipientDid;
+        type Content;
         type SenderDid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Content = Unset;
         type RecipientDid = Unset;
+        type Content = Unset;
         type SenderDid = Unset;
     }
-    ///State transition - sets the `content` field to Set
-    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContent<S> {}
-    impl<S: State> State for SetContent<S> {
-        type Content = Set<members::content>;
-        type RecipientDid = S::RecipientDid;
-        type SenderDid = S::SenderDid;
-    }
     ///State transition - sets the `recipient_did` field to Set
     pub struct SetRecipientDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecipientDid<S> {}
     impl<S: State> State for SetRecipientDid<S> {
-        type Content = S::Content;
         type RecipientDid = Set<members::recipient_did>;
+        type Content = S::Content;
+        type SenderDid = S::SenderDid;
+    }
+    ///State transition - sets the `content` field to Set
+    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContent<S> {}
+    impl<S: State> State for SetContent<S> {
+        type RecipientDid = S::RecipientDid;
+        type Content = Set<members::content>;
         type SenderDid = S::SenderDid;
     }
     ///State transition - sets the `sender_did` field to Set
     pub struct SetSenderDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSenderDid<S> {}
     impl<S: State> State for SetSenderDid<S> {
-        type Content = S::Content;
         type RecipientDid = S::RecipientDid;
+        type Content = S::Content;
         type SenderDid = Set<members::sender_did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `content` field
-        pub struct content(());
         ///Marker type for the `recipient_did` field
         pub struct recipient_did(());
+        ///Marker type for the `content` field
+        pub struct content(());
         ///Marker type for the `sender_did` field
         pub struct sender_did(());
     }
@@ -127,15 +130,15 @@ pub mod send_email_state {
 
 /// Builder for constructing an instance of this type
 pub struct SendEmailBuilder<'a, S: send_email_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Did<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SendEmail<'a> {
@@ -149,9 +152,9 @@ impl<'a> SendEmailBuilder<'a, send_email_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SendEmailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -159,12 +162,12 @@ impl<'a> SendEmailBuilder<'a, send_email_state::Empty> {
 impl<'a, S: send_email_state::State> SendEmailBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SendEmailBuilder<'a, send_email_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SendEmailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> SendEmailBuilder<'a, send_email_state::SetRecipientDid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SendEmailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -217,11 +220,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> SendEmailBuilder<'a, send_email_state::SetSenderDid<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SendEmailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -229,12 +232,12 @@ where
 impl<'a, S: send_email_state::State> SendEmailBuilder<'a, S> {
     /// Set the `subject` field (optional)
     pub fn subject(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `subject` field to an Option value (optional)
     pub fn maybe_subject(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -242,18 +245,18 @@ impl<'a, S: send_email_state::State> SendEmailBuilder<'a, S> {
 impl<'a, S> SendEmailBuilder<'a, S>
 where
     S: send_email_state::State,
-    S::Content: send_email_state::IsSet,
     S::RecipientDid: send_email_state::IsSet,
+    S::Content: send_email_state::IsSet,
     S::SenderDid: send_email_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SendEmail<'a> {
         SendEmail {
-            comment: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            recipient_did: self.__unsafe_private_named.2.unwrap(),
-            sender_did: self.__unsafe_private_named.3.unwrap(),
-            subject: self.__unsafe_private_named.4,
+            comment: self._fields.0,
+            content: self._fields.1.unwrap(),
+            recipient_did: self._fields.2.unwrap(),
+            sender_did: self._fields.3.unwrap(),
+            subject: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -266,11 +269,11 @@ where
         >,
     ) -> SendEmail<'a> {
         SendEmail {
-            comment: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            recipient_did: self.__unsafe_private_named.2.unwrap(),
-            sender_did: self.__unsafe_private_named.3.unwrap(),
-            subject: self.__unsafe_private_named.4,
+            comment: self._fields.0,
+            content: self._fields.1.unwrap(),
+            recipient_did: self._fields.2.unwrap(),
+            sender_did: self._fields.3.unwrap(),
+            subject: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/admin/update_account_email.rs b/crates/jacquard-api/src/com_atproto/admin/update_account_email.rs
index 23358ecf..2c290d21 100644
--- a/crates/jacquard-api/src/com_atproto/admin/update_account_email.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/update_account_email.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -97,9 +100,9 @@ pub mod update_account_email_state {
 
 /// Builder for constructing an instance of this type
 pub struct UpdateAccountEmailBuilder<'a, S: update_account_email_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateAccountEmail<'a> {
@@ -113,9 +116,9 @@ impl<'a> UpdateAccountEmailBuilder<'a, update_account_email_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateAccountEmailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -130,11 +133,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> UpdateAccountEmailBuilder<'a, update_account_email_state::SetAccount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UpdateAccountEmailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,11 +152,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> UpdateAccountEmailBuilder<'a, update_account_email_state::SetEmail<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UpdateAccountEmailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -167,8 +170,8 @@ where
     /// Build the final struct
     pub fn build(self) -> UpdateAccountEmail<'a> {
         UpdateAccountEmail {
-            account: self.__unsafe_private_named.0.unwrap(),
-            email: self.__unsafe_private_named.1.unwrap(),
+            account: self._fields.0.unwrap(),
+            email: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -181,8 +184,8 @@ where
         >,
     ) -> UpdateAccountEmail<'a> {
         UpdateAccountEmail {
-            account: self.__unsafe_private_named.0.unwrap(),
-            email: self.__unsafe_private_named.1.unwrap(),
+            account: self._fields.0.unwrap(),
+            email: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/admin/update_account_handle.rs b/crates/jacquard-api/src/com_atproto/admin/update_account_handle.rs
index 64573e94..f87a7007 100644
--- a/crates/jacquard-api/src/com_atproto/admin/update_account_handle.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/update_account_handle.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::{Did, Handle};
 use jacquard_derive::{IntoStatic, lexicon};
@@ -59,45 +62,45 @@ pub mod update_account_handle_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Did;
         type Handle;
+        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Did = Unset;
         type Handle = Unset;
-    }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Did = Set<members::did>;
-        type Handle = S::Handle;
+        type Did = Unset;
     }
     ///State transition - sets the `handle` field to Set
     pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHandle<S> {}
     impl<S: State> State for SetHandle<S> {
-        type Did = S::Did;
         type Handle = Set<members::handle>;
+        type Did = S::Did;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Handle = S::Handle;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `handle` field
         pub struct handle(());
+        ///Marker type for the `did` field
+        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct UpdateAccountHandleBuilder<'a, S: update_account_handle_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Handle<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Handle<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateAccountHandle<'a> {
@@ -111,9 +114,9 @@ impl<'a> UpdateAccountHandleBuilder<'a, update_account_handle_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateAccountHandleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -128,11 +131,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> UpdateAccountHandleBuilder<'a, update_account_handle_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UpdateAccountHandleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -147,11 +150,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> UpdateAccountHandleBuilder<'a, update_account_handle_state::SetHandle<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UpdateAccountHandleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -159,14 +162,14 @@ where
 impl<'a, S> UpdateAccountHandleBuilder<'a, S>
 where
     S: update_account_handle_state::State,
-    S::Did: update_account_handle_state::IsSet,
     S::Handle: update_account_handle_state::IsSet,
+    S::Did: update_account_handle_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> UpdateAccountHandle<'a> {
         UpdateAccountHandle {
-            did: self.__unsafe_private_named.0.unwrap(),
-            handle: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            handle: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -179,8 +182,8 @@ where
         >,
     ) -> UpdateAccountHandle<'a> {
         UpdateAccountHandle {
-            did: self.__unsafe_private_named.0.unwrap(),
-            handle: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            handle: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/admin/update_account_password.rs b/crates/jacquard-api/src/com_atproto/admin/update_account_password.rs
index 9db37f31..053ff5c3 100644
--- a/crates/jacquard-api/src/com_atproto/admin/update_account_password.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/update_account_password.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -96,9 +99,9 @@ pub mod update_account_password_state {
 
 /// Builder for constructing an instance of this type
 pub struct UpdateAccountPasswordBuilder<'a, S: update_account_password_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateAccountPassword<'a> {
@@ -115,9 +118,9 @@ impl<'a> UpdateAccountPasswordBuilder<'a, update_account_password_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateAccountPasswordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -132,11 +135,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> UpdateAccountPasswordBuilder<'a, update_account_password_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UpdateAccountPasswordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -154,11 +157,11 @@ where
         'a,
         update_account_password_state::SetPassword<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UpdateAccountPasswordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -172,8 +175,8 @@ where
     /// Build the final struct
     pub fn build(self) -> UpdateAccountPassword<'a> {
         UpdateAccountPassword {
-            did: self.__unsafe_private_named.0.unwrap(),
-            password: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            password: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -186,8 +189,8 @@ where
         >,
     ) -> UpdateAccountPassword<'a> {
         UpdateAccountPassword {
-            did: self.__unsafe_private_named.0.unwrap(),
-            password: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            password: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/admin/update_account_signing_key.rs b/crates/jacquard-api/src/com_atproto/admin/update_account_signing_key.rs
index 1c844910..8a95d319 100644
--- a/crates/jacquard-api/src/com_atproto/admin/update_account_signing_key.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/update_account_signing_key.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -99,9 +102,9 @@ pub struct UpdateAccountSigningKeyBuilder<
     'a,
     S: update_account_signing_key_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateAccountSigningKey<'a> {
@@ -118,9 +121,9 @@ impl<'a> UpdateAccountSigningKeyBuilder<'a, update_account_signing_key_state::Em
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateAccountSigningKeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -138,11 +141,11 @@ where
         'a,
         update_account_signing_key_state::SetDid<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UpdateAccountSigningKeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -160,11 +163,11 @@ where
         'a,
         update_account_signing_key_state::SetSigningKey<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UpdateAccountSigningKeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,8 +181,8 @@ where
     /// Build the final struct
     pub fn build(self) -> UpdateAccountSigningKey<'a> {
         UpdateAccountSigningKey {
-            did: self.__unsafe_private_named.0.unwrap(),
-            signing_key: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            signing_key: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -192,8 +195,8 @@ where
         >,
     ) -> UpdateAccountSigningKey<'a> {
         UpdateAccountSigningKey {
-            did: self.__unsafe_private_named.0.unwrap(),
-            signing_key: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            signing_key: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/admin/update_subject_status.rs b/crates/jacquard-api/src/com_atproto/admin/update_subject_status.rs
index d7e12bd2..54a5c990 100644
--- a/crates/jacquard-api/src/com_atproto/admin/update_subject_status.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/update_subject_status.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
 use serde::{Serialize, Deserialize};
@@ -130,13 +133,13 @@ pub mod update_subject_status_state {
 
 /// Builder for constructing an instance of this type
 pub struct UpdateSubjectStatusBuilder<'a, S: update_subject_status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<StatusAttr<'a>>,
         Option<UpdateSubjectStatusSubject<'a>>,
         Option<StatusAttr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateSubjectStatus<'a> {
@@ -150,9 +153,9 @@ impl<'a> UpdateSubjectStatusBuilder<'a, update_subject_status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateSubjectStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -160,12 +163,12 @@ impl<'a> UpdateSubjectStatusBuilder<'a, update_subject_status_state::Empty> {
 impl<'a, S: update_subject_status_state::State> UpdateSubjectStatusBuilder<'a, S> {
     /// Set the `deactivated` field (optional)
     pub fn deactivated(mut self, value: impl Into<Option<StatusAttr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `deactivated` field to an Option value (optional)
     pub fn maybe_deactivated(mut self, value: Option<StatusAttr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -180,11 +183,11 @@ where
         mut self,
         value: impl Into<UpdateSubjectStatusSubject<'a>>,
     ) -> UpdateSubjectStatusBuilder<'a, update_subject_status_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UpdateSubjectStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -192,12 +195,12 @@ where
 impl<'a, S: update_subject_status_state::State> UpdateSubjectStatusBuilder<'a, S> {
     /// Set the `takedown` field (optional)
     pub fn takedown(mut self, value: impl Into<Option<StatusAttr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `takedown` field to an Option value (optional)
     pub fn maybe_takedown(mut self, value: Option<StatusAttr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -210,9 +213,9 @@ where
     /// Build the final struct
     pub fn build(self) -> UpdateSubjectStatus<'a> {
         UpdateSubjectStatus {
-            deactivated: self.__unsafe_private_named.0,
-            subject: self.__unsafe_private_named.1.unwrap(),
-            takedown: self.__unsafe_private_named.2,
+            deactivated: self._fields.0,
+            subject: self._fields.1.unwrap(),
+            takedown: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -225,9 +228,9 @@ where
         >,
     ) -> UpdateSubjectStatus<'a> {
         UpdateSubjectStatus {
-            deactivated: self.__unsafe_private_named.0,
-            subject: self.__unsafe_private_named.1.unwrap(),
-            takedown: self.__unsafe_private_named.2,
+            deactivated: self._fields.0,
+            subject: self._fields.1.unwrap(),
+            takedown: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/identity.rs b/crates/jacquard-api/src/com_atproto/identity.rs
index b7705702..e2acd26f 100644
--- a/crates/jacquard-api/src/com_atproto/identity.rs
+++ b/crates/jacquard-api/src/com_atproto/identity.rs
@@ -15,7 +15,11 @@ pub mod sign_plc_operation;
 pub mod submit_plc_operation;
 pub mod update_handle;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -70,58 +74,58 @@ pub mod identity_info_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Handle;
-        type Did;
         type DidDoc;
+        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Handle = Unset;
-        type Did = Unset;
         type DidDoc = Unset;
+        type Did = Unset;
     }
     ///State transition - sets the `handle` field to Set
     pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHandle<S> {}
     impl<S: State> State for SetHandle<S> {
         type Handle = Set<members::handle>;
-        type Did = S::Did;
-        type DidDoc = S::DidDoc;
-    }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Handle = S::Handle;
-        type Did = Set<members::did>;
         type DidDoc = S::DidDoc;
+        type Did = S::Did;
     }
     ///State transition - sets the `did_doc` field to Set
     pub struct SetDidDoc<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDidDoc<S> {}
     impl<S: State> State for SetDidDoc<S> {
         type Handle = S::Handle;
-        type Did = S::Did;
         type DidDoc = Set<members::did_doc>;
+        type Did = S::Did;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Handle = S::Handle;
+        type DidDoc = S::DidDoc;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `handle` field
         pub struct handle(());
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `did_doc` field
         pub struct did_doc(());
+        ///Marker type for the `did` field
+        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct IdentityInfoBuilder<'a, S: identity_info_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Data<'a>>, Option<Handle<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Data<'a>>, Option<Handle<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> IdentityInfo<'a> {
@@ -135,9 +139,9 @@ impl<'a> IdentityInfoBuilder<'a, identity_info_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IdentityInfoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -152,11 +156,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> IdentityInfoBuilder<'a, identity_info_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         IdentityInfoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -171,11 +175,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> IdentityInfoBuilder<'a, identity_info_state::SetDidDoc<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         IdentityInfoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -190,11 +194,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> IdentityInfoBuilder<'a, identity_info_state::SetHandle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         IdentityInfoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,15 +207,15 @@ impl<'a, S> IdentityInfoBuilder<'a, S>
 where
     S: identity_info_state::State,
     S::Handle: identity_info_state::IsSet,
-    S::Did: identity_info_state::IsSet,
     S::DidDoc: identity_info_state::IsSet,
+    S::Did: identity_info_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> IdentityInfo<'a> {
         IdentityInfo {
-            did: self.__unsafe_private_named.0.unwrap(),
-            did_doc: self.__unsafe_private_named.1.unwrap(),
-            handle: self.__unsafe_private_named.2.unwrap(),
+            did: self._fields.0.unwrap(),
+            did_doc: self._fields.1.unwrap(),
+            handle: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -221,9 +225,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> IdentityInfo<'a> {
         IdentityInfo {
-            did: self.__unsafe_private_named.0.unwrap(),
-            did_doc: self.__unsafe_private_named.1.unwrap(),
-            handle: self.__unsafe_private_named.2.unwrap(),
+            did: self._fields.0.unwrap(),
+            did_doc: self._fields.1.unwrap(),
+            handle: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/identity/get_recommended_did_credentials.rs b/crates/jacquard-api/src/com_atproto/identity/get_recommended_did_credentials.rs
index ab5e4474..03a5ab35 100644
--- a/crates/jacquard-api/src/com_atproto/identity/get_recommended_did_credentials.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/get_recommended_did_credentials.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::value::Data;
diff --git a/crates/jacquard-api/src/com_atproto/identity/refresh_identity.rs b/crates/jacquard-api/src/com_atproto/identity/refresh_identity.rs
index 83a547f4..5ee29698 100644
--- a/crates/jacquard-api/src/com_atproto/identity/refresh_identity.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/refresh_identity.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -150,9 +153,9 @@ pub mod refresh_identity_state {
 
 /// Builder for constructing an instance of this type
 pub struct RefreshIdentityBuilder<'a, S: refresh_identity_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RefreshIdentity<'a> {
@@ -166,9 +169,9 @@ impl<'a> RefreshIdentityBuilder<'a, refresh_identity_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RefreshIdentityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,11 +186,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> RefreshIdentityBuilder<'a, refresh_identity_state::SetIdentifier<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RefreshIdentityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,7 +203,7 @@ where
     /// Build the final struct
     pub fn build(self) -> RefreshIdentity<'a> {
         RefreshIdentity {
-            identifier: self.__unsafe_private_named.0.unwrap(),
+            identifier: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -213,7 +216,7 @@ where
         >,
     ) -> RefreshIdentity<'a> {
         RefreshIdentity {
-            identifier: self.__unsafe_private_named.0.unwrap(),
+            identifier: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/identity/request_plc_operation_signature.rs b/crates/jacquard-api/src/com_atproto/identity/request_plc_operation_signature.rs
index 153c9295..51279c80 100644
--- a/crates/jacquard-api/src/com_atproto/identity/request_plc_operation_signature.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/request_plc_operation_signature.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::IntoStatic;
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/com_atproto/identity/resolve_did.rs b/crates/jacquard-api/src/com_atproto/identity/resolve_did.rs
index 666fc696..0e561100 100644
--- a/crates/jacquard-api/src/com_atproto/identity/resolve_did.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/resolve_did.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -135,9 +138,9 @@ pub mod resolve_did_state {
 
 /// Builder for constructing an instance of this type
 pub struct ResolveDidBuilder<'a, S: resolve_did_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ResolveDid<'a> {
@@ -151,9 +154,9 @@ impl<'a> ResolveDidBuilder<'a, resolve_did_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ResolveDidBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -168,11 +171,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ResolveDidBuilder<'a, resolve_did_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ResolveDidBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -185,7 +188,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ResolveDid<'a> {
         ResolveDid {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/identity/resolve_handle.rs b/crates/jacquard-api/src/com_atproto/identity/resolve_handle.rs
index 912bffe5..fe739ea7 100644
--- a/crates/jacquard-api/src/com_atproto/identity/resolve_handle.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/resolve_handle.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Handle};
@@ -123,9 +126,9 @@ pub mod resolve_handle_state {
 
 /// Builder for constructing an instance of this type
 pub struct ResolveHandleBuilder<'a, S: resolve_handle_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Handle<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Handle<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ResolveHandle<'a> {
@@ -139,9 +142,9 @@ impl<'a> ResolveHandleBuilder<'a, resolve_handle_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ResolveHandleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -156,11 +159,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> ResolveHandleBuilder<'a, resolve_handle_state::SetHandle<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ResolveHandleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -173,7 +176,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ResolveHandle<'a> {
         ResolveHandle {
-            handle: self.__unsafe_private_named.0.unwrap(),
+            handle: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/identity/resolve_identity.rs b/crates/jacquard-api/src/com_atproto/identity/resolve_identity.rs
index f4df7d11..783c7c15 100644
--- a/crates/jacquard-api/src/com_atproto/identity/resolve_identity.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/resolve_identity.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -144,9 +145,9 @@ pub mod resolve_identity_state {
 
 /// Builder for constructing an instance of this type
 pub struct ResolveIdentityBuilder<'a, S: resolve_identity_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ResolveIdentity<'a> {
@@ -160,9 +161,9 @@ impl<'a> ResolveIdentityBuilder<'a, resolve_identity_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ResolveIdentityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -177,11 +178,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> ResolveIdentityBuilder<'a, resolve_identity_state::SetIdentifier<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ResolveIdentityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -194,7 +195,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ResolveIdentity<'a> {
         ResolveIdentity {
-            identifier: self.__unsafe_private_named.0.unwrap(),
+            identifier: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/identity/sign_plc_operation.rs b/crates/jacquard-api/src/com_atproto/identity/sign_plc_operation.rs
index bfa62315..c2a88e32 100644
--- a/crates/jacquard-api/src/com_atproto/identity/sign_plc_operation.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/sign_plc_operation.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::value::Data;
diff --git a/crates/jacquard-api/src/com_atproto/identity/submit_plc_operation.rs b/crates/jacquard-api/src/com_atproto/identity/submit_plc_operation.rs
index 26179ea6..d3f3c2bd 100644
--- a/crates/jacquard-api/src/com_atproto/identity/submit_plc_operation.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/submit_plc_operation.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::value::Data;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -81,9 +84,9 @@ pub mod submit_plc_operation_state {
 
 /// Builder for constructing an instance of this type
 pub struct SubmitPlcOperationBuilder<'a, S: submit_plc_operation_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Data<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Data<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SubmitPlcOperation<'a> {
@@ -97,9 +100,9 @@ impl<'a> SubmitPlcOperationBuilder<'a, submit_plc_operation_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubmitPlcOperationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,11 +117,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> SubmitPlcOperationBuilder<'a, submit_plc_operation_state::SetOperation<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SubmitPlcOperationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -131,7 +134,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SubmitPlcOperation<'a> {
         SubmitPlcOperation {
-            operation: self.__unsafe_private_named.0.unwrap(),
+            operation: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -141,7 +144,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> SubmitPlcOperation<'a> {
         SubmitPlcOperation {
-            operation: self.__unsafe_private_named.0.unwrap(),
+            operation: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/identity/update_handle.rs b/crates/jacquard-api/src/com_atproto/identity/update_handle.rs
index b748fe2e..d4099477 100644
--- a/crates/jacquard-api/src/com_atproto/identity/update_handle.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/update_handle.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Handle;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -82,9 +85,9 @@ pub mod update_handle_state {
 
 /// Builder for constructing an instance of this type
 pub struct UpdateHandleBuilder<'a, S: update_handle_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Handle<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Handle<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateHandle<'a> {
@@ -98,9 +101,9 @@ impl<'a> UpdateHandleBuilder<'a, update_handle_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateHandleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -115,11 +118,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> UpdateHandleBuilder<'a, update_handle_state::SetHandle<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UpdateHandleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -132,7 +135,7 @@ where
     /// Build the final struct
     pub fn build(self) -> UpdateHandle<'a> {
         UpdateHandle {
-            handle: self.__unsafe_private_named.0.unwrap(),
+            handle: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -145,7 +148,7 @@ where
         >,
     ) -> UpdateHandle<'a> {
         UpdateHandle {
-            handle: self.__unsafe_private_named.0.unwrap(),
+            handle: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/label.rs b/crates/jacquard-api/src/com_atproto/label.rs
index 62afe128..61ef0da8 100644
--- a/crates/jacquard-api/src/com_atproto/label.rs
+++ b/crates/jacquard-api/src/com_atproto/label.rs
@@ -11,7 +11,11 @@ pub mod query_labels;
 #[cfg(feature = "streaming")]
 pub mod subscribe_labels;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -727,73 +731,73 @@ pub mod label_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Src;
-        type Cts;
         type Val;
         type Uri;
+        type Cts;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Src = Unset;
-        type Cts = Unset;
         type Val = Unset;
         type Uri = Unset;
+        type Cts = Unset;
     }
     ///State transition - sets the `src` field to Set
     pub struct SetSrc<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSrc<S> {}
     impl<S: State> State for SetSrc<S> {
         type Src = Set<members::src>;
-        type Cts = S::Cts;
-        type Val = S::Val;
-        type Uri = S::Uri;
-    }
-    ///State transition - sets the `cts` field to Set
-    pub struct SetCts<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCts<S> {}
-    impl<S: State> State for SetCts<S> {
-        type Src = S::Src;
-        type Cts = Set<members::cts>;
         type Val = S::Val;
         type Uri = S::Uri;
+        type Cts = S::Cts;
     }
     ///State transition - sets the `val` field to Set
     pub struct SetVal<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetVal<S> {}
     impl<S: State> State for SetVal<S> {
         type Src = S::Src;
-        type Cts = S::Cts;
         type Val = Set<members::val>;
         type Uri = S::Uri;
+        type Cts = S::Cts;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
         type Src = S::Src;
-        type Cts = S::Cts;
         type Val = S::Val;
         type Uri = Set<members::uri>;
+        type Cts = S::Cts;
+    }
+    ///State transition - sets the `cts` field to Set
+    pub struct SetCts<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCts<S> {}
+    impl<S: State> State for SetCts<S> {
+        type Src = S::Src;
+        type Val = S::Val;
+        type Uri = S::Uri;
+        type Cts = Set<members::cts>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `src` field
         pub struct src(());
-        ///Marker type for the `cts` field
-        pub struct cts(());
         ///Marker type for the `val` field
         pub struct val(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `cts` field
+        pub struct cts(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LabelBuilder<'a, S: label_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<Datetime>,
         Option<Datetime>,
@@ -804,7 +808,7 @@ pub struct LabelBuilder<'a, S: label_state::State> {
         Option<CowStr<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Label<'a> {
@@ -818,19 +822,9 @@ impl<'a> LabelBuilder<'a, label_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LabelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -838,12 +832,12 @@ impl<'a> LabelBuilder<'a, label_state::Empty> {
 impl<'a, S: label_state::State> LabelBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -858,11 +852,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LabelBuilder<'a, label_state::SetCts<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LabelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -870,12 +864,12 @@ where
 impl<'a, S: label_state::State> LabelBuilder<'a, S> {
     /// Set the `exp` field (optional)
     pub fn exp(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `exp` field to an Option value (optional)
     pub fn maybe_exp(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -883,12 +877,12 @@ impl<'a, S: label_state::State> LabelBuilder<'a, S> {
 impl<'a, S: label_state::State> LabelBuilder<'a, S> {
     /// Set the `neg` field (optional)
     pub fn neg(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `neg` field to an Option value (optional)
     pub fn maybe_neg(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -896,12 +890,12 @@ impl<'a, S: label_state::State> LabelBuilder<'a, S> {
 impl<'a, S: label_state::State> LabelBuilder<'a, S> {
     /// Set the `sig` field (optional)
     pub fn sig(mut self, value: impl Into<Option<Bytes>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `sig` field to an Option value (optional)
     pub fn maybe_sig(mut self, value: Option<Bytes>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -916,11 +910,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> LabelBuilder<'a, label_state::SetSrc<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         LabelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -935,11 +929,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LabelBuilder<'a, label_state::SetUri<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         LabelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -954,11 +948,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LabelBuilder<'a, label_state::SetVal<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         LabelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -966,12 +960,12 @@ where
 impl<'a, S: label_state::State> LabelBuilder<'a, S> {
     /// Set the `ver` field (optional)
     pub fn ver(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `ver` field to an Option value (optional)
     pub fn maybe_ver(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -980,22 +974,22 @@ impl<'a, S> LabelBuilder<'a, S>
 where
     S: label_state::State,
     S::Src: label_state::IsSet,
-    S::Cts: label_state::IsSet,
     S::Val: label_state::IsSet,
     S::Uri: label_state::IsSet,
+    S::Cts: label_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Label<'a> {
         Label {
-            cid: self.__unsafe_private_named.0,
-            cts: self.__unsafe_private_named.1.unwrap(),
-            exp: self.__unsafe_private_named.2,
-            neg: self.__unsafe_private_named.3,
-            sig: self.__unsafe_private_named.4,
-            src: self.__unsafe_private_named.5.unwrap(),
-            uri: self.__unsafe_private_named.6.unwrap(),
-            val: self.__unsafe_private_named.7.unwrap(),
-            ver: self.__unsafe_private_named.8,
+            cid: self._fields.0,
+            cts: self._fields.1.unwrap(),
+            exp: self._fields.2,
+            neg: self._fields.3,
+            sig: self._fields.4,
+            src: self._fields.5.unwrap(),
+            uri: self._fields.6.unwrap(),
+            val: self._fields.7.unwrap(),
+            ver: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -1008,15 +1002,15 @@ where
         >,
     ) -> Label<'a> {
         Label {
-            cid: self.__unsafe_private_named.0,
-            cts: self.__unsafe_private_named.1.unwrap(),
-            exp: self.__unsafe_private_named.2,
-            neg: self.__unsafe_private_named.3,
-            sig: self.__unsafe_private_named.4,
-            src: self.__unsafe_private_named.5.unwrap(),
-            uri: self.__unsafe_private_named.6.unwrap(),
-            val: self.__unsafe_private_named.7.unwrap(),
-            ver: self.__unsafe_private_named.8,
+            cid: self._fields.0,
+            cts: self._fields.1.unwrap(),
+            exp: self._fields.2,
+            neg: self._fields.3,
+            sig: self._fields.4,
+            src: self._fields.5.unwrap(),
+            uri: self._fields.6.unwrap(),
+            val: self._fields.7.unwrap(),
+            ver: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
@@ -1360,65 +1354,65 @@ pub mod label_value_definition_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Locales;
         type Severity;
         type Blurs;
+        type Locales;
         type Identifier;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Locales = Unset;
         type Severity = Unset;
         type Blurs = Unset;
+        type Locales = Unset;
         type Identifier = Unset;
     }
-    ///State transition - sets the `locales` field to Set
-    pub struct SetLocales<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLocales<S> {}
-    impl<S: State> State for SetLocales<S> {
-        type Locales = Set<members::locales>;
-        type Severity = S::Severity;
-        type Blurs = S::Blurs;
-        type Identifier = S::Identifier;
-    }
     ///State transition - sets the `severity` field to Set
     pub struct SetSeverity<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSeverity<S> {}
     impl<S: State> State for SetSeverity<S> {
-        type Locales = S::Locales;
         type Severity = Set<members::severity>;
         type Blurs = S::Blurs;
+        type Locales = S::Locales;
         type Identifier = S::Identifier;
     }
     ///State transition - sets the `blurs` field to Set
     pub struct SetBlurs<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBlurs<S> {}
     impl<S: State> State for SetBlurs<S> {
-        type Locales = S::Locales;
         type Severity = S::Severity;
         type Blurs = Set<members::blurs>;
+        type Locales = S::Locales;
+        type Identifier = S::Identifier;
+    }
+    ///State transition - sets the `locales` field to Set
+    pub struct SetLocales<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLocales<S> {}
+    impl<S: State> State for SetLocales<S> {
+        type Severity = S::Severity;
+        type Blurs = S::Blurs;
+        type Locales = Set<members::locales>;
         type Identifier = S::Identifier;
     }
     ///State transition - sets the `identifier` field to Set
     pub struct SetIdentifier<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIdentifier<S> {}
     impl<S: State> State for SetIdentifier<S> {
-        type Locales = S::Locales;
         type Severity = S::Severity;
         type Blurs = S::Blurs;
+        type Locales = S::Locales;
         type Identifier = Set<members::identifier>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `locales` field
-        pub struct locales(());
         ///Marker type for the `severity` field
         pub struct severity(());
         ///Marker type for the `blurs` field
         pub struct blurs(());
+        ///Marker type for the `locales` field
+        pub struct locales(());
         ///Marker type for the `identifier` field
         pub struct identifier(());
     }
@@ -1426,8 +1420,8 @@ pub mod label_value_definition_state {
 
 /// Builder for constructing an instance of this type
 pub struct LabelValueDefinitionBuilder<'a, S: label_value_definition_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<LabelValueDefinitionBlurs<'a>>,
         Option<LabelValueDefinitionDefaultSetting<'a>>,
@@ -1435,7 +1429,7 @@ pub struct LabelValueDefinitionBuilder<'a, S: label_value_definition_state::Stat
         Option<Vec<label::LabelValueDefinitionStrings<'a>>>,
         Option<LabelValueDefinitionSeverity<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LabelValueDefinition<'a> {
@@ -1452,9 +1446,9 @@ impl<'a> LabelValueDefinitionBuilder<'a, label_value_definition_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LabelValueDefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1462,12 +1456,12 @@ impl<'a> LabelValueDefinitionBuilder<'a, label_value_definition_state::Empty> {
 impl<'a, S: label_value_definition_state::State> LabelValueDefinitionBuilder<'a, S> {
     /// Set the `adultOnly` field (optional)
     pub fn adult_only(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `adultOnly` field to an Option value (optional)
     pub fn maybe_adult_only(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1482,11 +1476,11 @@ where
         mut self,
         value: impl Into<LabelValueDefinitionBlurs<'a>>,
     ) -> LabelValueDefinitionBuilder<'a, label_value_definition_state::SetBlurs<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LabelValueDefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1497,7 +1491,7 @@ impl<'a, S: label_value_definition_state::State> LabelValueDefinitionBuilder<'a,
         mut self,
         value: impl Into<Option<LabelValueDefinitionDefaultSetting<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `defaultSetting` field to an Option value (optional)
@@ -1505,7 +1499,7 @@ impl<'a, S: label_value_definition_state::State> LabelValueDefinitionBuilder<'a,
         mut self,
         value: Option<LabelValueDefinitionDefaultSetting<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1523,11 +1517,11 @@ where
         'a,
         label_value_definition_state::SetIdentifier<S>,
     > {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LabelValueDefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1542,11 +1536,11 @@ where
         mut self,
         value: impl Into<Vec<label::LabelValueDefinitionStrings<'a>>>,
     ) -> LabelValueDefinitionBuilder<'a, label_value_definition_state::SetLocales<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         LabelValueDefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1561,11 +1555,11 @@ where
         mut self,
         value: impl Into<LabelValueDefinitionSeverity<'a>>,
     ) -> LabelValueDefinitionBuilder<'a, label_value_definition_state::SetSeverity<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         LabelValueDefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1573,20 +1567,20 @@ where
 impl<'a, S> LabelValueDefinitionBuilder<'a, S>
 where
     S: label_value_definition_state::State,
-    S::Locales: label_value_definition_state::IsSet,
     S::Severity: label_value_definition_state::IsSet,
     S::Blurs: label_value_definition_state::IsSet,
+    S::Locales: label_value_definition_state::IsSet,
     S::Identifier: label_value_definition_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LabelValueDefinition<'a> {
         LabelValueDefinition {
-            adult_only: self.__unsafe_private_named.0,
-            blurs: self.__unsafe_private_named.1.unwrap(),
-            default_setting: self.__unsafe_private_named.2,
-            identifier: self.__unsafe_private_named.3.unwrap(),
-            locales: self.__unsafe_private_named.4.unwrap(),
-            severity: self.__unsafe_private_named.5.unwrap(),
+            adult_only: self._fields.0,
+            blurs: self._fields.1.unwrap(),
+            default_setting: self._fields.2,
+            identifier: self._fields.3.unwrap(),
+            locales: self._fields.4.unwrap(),
+            severity: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1599,12 +1593,12 @@ where
         >,
     ) -> LabelValueDefinition<'a> {
         LabelValueDefinition {
-            adult_only: self.__unsafe_private_named.0,
-            blurs: self.__unsafe_private_named.1.unwrap(),
-            default_setting: self.__unsafe_private_named.2,
-            identifier: self.__unsafe_private_named.3.unwrap(),
-            locales: self.__unsafe_private_named.4.unwrap(),
-            severity: self.__unsafe_private_named.5.unwrap(),
+            adult_only: self._fields.0,
+            blurs: self._fields.1.unwrap(),
+            default_setting: self._fields.2,
+            identifier: self._fields.3.unwrap(),
+            locales: self._fields.4.unwrap(),
+            severity: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1621,50 +1615,50 @@ pub mod label_value_definition_strings_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Lang;
-        type Name;
         type Description;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Lang = Unset;
-        type Name = Unset;
         type Description = Unset;
+        type Name = Unset;
     }
     ///State transition - sets the `lang` field to Set
     pub struct SetLang<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLang<S> {}
     impl<S: State> State for SetLang<S> {
         type Lang = Set<members::lang>;
-        type Name = S::Name;
-        type Description = S::Description;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Lang = S::Lang;
-        type Name = Set<members::name>;
         type Description = S::Description;
+        type Name = S::Name;
     }
     ///State transition - sets the `description` field to Set
     pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDescription<S> {}
     impl<S: State> State for SetDescription<S> {
         type Lang = S::Lang;
-        type Name = S::Name;
         type Description = Set<members::description>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Lang = S::Lang;
+        type Description = S::Description;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `lang` field
         pub struct lang(());
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `description` field
         pub struct description(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
@@ -1673,9 +1667,9 @@ pub struct LabelValueDefinitionStringsBuilder<
     'a,
     S: label_value_definition_strings_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Language>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Language>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LabelValueDefinitionStrings<'a> {
@@ -1694,9 +1688,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LabelValueDefinitionStringsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1714,11 +1708,11 @@ where
         'a,
         label_value_definition_strings_state::SetDescription<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LabelValueDefinitionStringsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1736,11 +1730,11 @@ where
         'a,
         label_value_definition_strings_state::SetLang<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LabelValueDefinitionStringsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1758,11 +1752,11 @@ where
         'a,
         label_value_definition_strings_state::SetName<S>,
     > {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LabelValueDefinitionStringsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1771,15 +1765,15 @@ impl<'a, S> LabelValueDefinitionStringsBuilder<'a, S>
 where
     S: label_value_definition_strings_state::State,
     S::Lang: label_value_definition_strings_state::IsSet,
-    S::Name: label_value_definition_strings_state::IsSet,
     S::Description: label_value_definition_strings_state::IsSet,
+    S::Name: label_value_definition_strings_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LabelValueDefinitionStrings<'a> {
         LabelValueDefinitionStrings {
-            description: self.__unsafe_private_named.0.unwrap(),
-            lang: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            description: self._fields.0.unwrap(),
+            lang: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1792,9 +1786,9 @@ where
         >,
     ) -> LabelValueDefinitionStrings<'a> {
         LabelValueDefinitionStrings {
-            description: self.__unsafe_private_named.0.unwrap(),
-            lang: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            description: self._fields.0.unwrap(),
+            lang: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1834,9 +1828,9 @@ pub mod self_labels_state {
 
 /// Builder for constructing an instance of this type
 pub struct SelfLabelsBuilder<'a, S: self_labels_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<label::SelfLabel<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<label::SelfLabel<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SelfLabels<'a> {
@@ -1850,9 +1844,9 @@ impl<'a> SelfLabelsBuilder<'a, self_labels_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SelfLabelsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1867,11 +1861,11 @@ where
         mut self,
         value: impl Into<Vec<label::SelfLabel<'a>>>,
     ) -> SelfLabelsBuilder<'a, self_labels_state::SetValues<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SelfLabelsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1884,7 +1878,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SelfLabels<'a> {
         SelfLabels {
-            values: self.__unsafe_private_named.0.unwrap(),
+            values: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1897,7 +1891,7 @@ where
         >,
     ) -> SelfLabels<'a> {
         SelfLabels {
-            values: self.__unsafe_private_named.0.unwrap(),
+            values: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/label/query_labels.rs b/crates/jacquard-api/src/com_atproto/label/query_labels.rs
index 6ea7cfc3..9fe76bea 100644
--- a/crates/jacquard-api/src/com_atproto/label/query_labels.rs
+++ b/crates/jacquard-api/src/com_atproto/label/query_labels.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -104,14 +107,14 @@ pub mod query_labels_state {
 
 /// Builder for constructing an instance of this type
 pub struct QueryLabelsBuilder<'a, S: query_labels_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<i64>,
         Option<Vec<Did<'a>>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> QueryLabels<'a> {
@@ -125,9 +128,9 @@ impl<'a> QueryLabelsBuilder<'a, query_labels_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         QueryLabelsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -135,12 +138,12 @@ impl<'a> QueryLabelsBuilder<'a, query_labels_state::Empty> {
 impl<'a, S: query_labels_state::State> QueryLabelsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -148,12 +151,12 @@ impl<'a, S: query_labels_state::State> QueryLabelsBuilder<'a, S> {
 impl<'a, S: query_labels_state::State> QueryLabelsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -161,12 +164,12 @@ impl<'a, S: query_labels_state::State> QueryLabelsBuilder<'a, S> {
 impl<'a, S: query_labels_state::State> QueryLabelsBuilder<'a, S> {
     /// Set the `sources` field (optional)
     pub fn sources(mut self, value: impl Into<Option<Vec<Did<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `sources` field to an Option value (optional)
     pub fn maybe_sources(mut self, value: Option<Vec<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -181,11 +184,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> QueryLabelsBuilder<'a, query_labels_state::SetUriPatterns<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         QueryLabelsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,10 +201,10 @@ where
     /// Build the final struct
     pub fn build(self) -> QueryLabels<'a> {
         QueryLabels {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            sources: self.__unsafe_private_named.2,
-            uri_patterns: self.__unsafe_private_named.3.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            sources: self._fields.2,
+            uri_patterns: self._fields.3.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/label/subscribe_labels.rs b/crates/jacquard-api/src/com_atproto/label/subscribe_labels.rs
index 28b37dbb..f4eda74b 100644
--- a/crates/jacquard-api/src/com_atproto/label/subscribe_labels.rs
+++ b/crates/jacquard-api/src/com_atproto/label/subscribe_labels.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -405,9 +408,9 @@ pub mod labels_state {
 
 /// Builder for constructing an instance of this type
 pub struct LabelsBuilder<'a, S: labels_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<Label<'a>>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<Label<'a>>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Labels<'a> {
@@ -421,9 +424,9 @@ impl<'a> LabelsBuilder<'a, labels_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LabelsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -438,11 +441,11 @@ where
         mut self,
         value: impl Into<Vec<Label<'a>>>,
     ) -> LabelsBuilder<'a, labels_state::SetLabels<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LabelsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -457,11 +460,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> LabelsBuilder<'a, labels_state::SetSeq<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LabelsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -475,8 +478,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Labels<'a> {
         Labels {
-            labels: self.__unsafe_private_named.0.unwrap(),
-            seq: self.__unsafe_private_named.1.unwrap(),
+            labels: self._fields.0.unwrap(),
+            seq: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -489,8 +492,8 @@ where
         >,
     ) -> Labels<'a> {
         Labels {
-            labels: self.__unsafe_private_named.0.unwrap(),
-            seq: self.__unsafe_private_named.1.unwrap(),
+            labels: self._fields.0.unwrap(),
+            seq: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -517,8 +520,8 @@ pub mod subscribe_labels_state {
 
 /// Builder for constructing an instance of this type
 pub struct SubscribeLabelsBuilder<S: subscribe_labels_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
 }
 
 impl SubscribeLabels {
@@ -532,8 +535,8 @@ impl SubscribeLabelsBuilder<subscribe_labels_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubscribeLabelsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -541,12 +544,12 @@ impl SubscribeLabelsBuilder<subscribe_labels_state::Empty> {
 impl<S: subscribe_labels_state::State> SubscribeLabelsBuilder<S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -558,7 +561,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SubscribeLabels {
         SubscribeLabels {
-            cursor: self.__unsafe_private_named.0,
+            cursor: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/lexicon/resolve_lexicon.rs b/crates/jacquard-api/src/com_atproto/lexicon/resolve_lexicon.rs
index 692b98cd..b1819bab 100644
--- a/crates/jacquard-api/src/com_atproto/lexicon/resolve_lexicon.rs
+++ b/crates/jacquard-api/src/com_atproto/lexicon/resolve_lexicon.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{AtUri, Nsid, Cid};
@@ -131,9 +134,9 @@ pub mod resolve_lexicon_state {
 
 /// Builder for constructing an instance of this type
 pub struct ResolveLexiconBuilder<'a, S: resolve_lexicon_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Nsid<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Nsid<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ResolveLexicon<'a> {
@@ -147,9 +150,9 @@ impl<'a> ResolveLexiconBuilder<'a, resolve_lexicon_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ResolveLexiconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,11 +167,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> ResolveLexiconBuilder<'a, resolve_lexicon_state::SetNsid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ResolveLexiconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,7 +184,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ResolveLexicon<'a> {
         ResolveLexicon {
-            nsid: self.__unsafe_private_named.0.unwrap(),
+            nsid: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/lexicon/schema.rs b/crates/jacquard-api/src/com_atproto/lexicon/schema.rs
index 65739d86..d220dc9f 100644
--- a/crates/jacquard-api/src/com_atproto/lexicon/schema.rs
+++ b/crates/jacquard-api/src/com_atproto/lexicon/schema.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -131,9 +134,9 @@ pub mod schema_state {
 
 /// Builder for constructing an instance of this type
 pub struct SchemaBuilder<'a, S: schema_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Schema<'a> {
@@ -147,9 +150,9 @@ impl<'a> SchemaBuilder<'a, schema_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SchemaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,11 +167,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SchemaBuilder<'a, schema_state::SetLexicon<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SchemaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,7 +184,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Schema<'a> {
         Schema {
-            lexicon: self.__unsafe_private_named.0.unwrap(),
+            lexicon: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -194,7 +197,7 @@ where
         >,
     ) -> Schema<'a> {
         Schema {
-            lexicon: self.__unsafe_private_named.0.unwrap(),
+            lexicon: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/moderation/create_report.rs b/crates/jacquard-api/src/com_atproto/moderation/create_report.rs
index 46635356..e037d6c5 100644
--- a/crates/jacquard-api/src/com_atproto/moderation/create_report.rs
+++ b/crates/jacquard-api/src/com_atproto/moderation/create_report.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -189,14 +192,14 @@ pub mod create_report_state {
 
 /// Builder for constructing an instance of this type
 pub struct CreateReportBuilder<'a, S: create_report_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<create_report::ModTool<'a>>,
         Option<CowStr<'a>>,
         Option<ReasonType<'a>>,
         Option<CreateReportSubject<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CreateReport<'a> {
@@ -210,9 +213,9 @@ impl<'a> CreateReportBuilder<'a, create_report_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreateReportBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -223,12 +226,12 @@ impl<'a, S: create_report_state::State> CreateReportBuilder<'a, S> {
         mut self,
         value: impl Into<Option<create_report::ModTool<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `modTool` field to an Option value (optional)
     pub fn maybe_mod_tool(mut self, value: Option<create_report::ModTool<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -236,12 +239,12 @@ impl<'a, S: create_report_state::State> CreateReportBuilder<'a, S> {
 impl<'a, S: create_report_state::State> CreateReportBuilder<'a, S> {
     /// Set the `reason` field (optional)
     pub fn reason(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `reason` field to an Option value (optional)
     pub fn maybe_reason(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -256,11 +259,11 @@ where
         mut self,
         value: impl Into<ReasonType<'a>>,
     ) -> CreateReportBuilder<'a, create_report_state::SetReasonType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CreateReportBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -275,11 +278,11 @@ where
         mut self,
         value: impl Into<CreateReportSubject<'a>>,
     ) -> CreateReportBuilder<'a, create_report_state::SetSubject<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CreateReportBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -293,10 +296,10 @@ where
     /// Build the final struct
     pub fn build(self) -> CreateReport<'a> {
         CreateReport {
-            mod_tool: self.__unsafe_private_named.0,
-            reason: self.__unsafe_private_named.1,
-            reason_type: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
+            mod_tool: self._fields.0,
+            reason: self._fields.1,
+            reason_type: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -306,10 +309,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> CreateReport<'a> {
         CreateReport {
-            mod_tool: self.__unsafe_private_named.0,
-            reason: self.__unsafe_private_named.1,
-            reason_type: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
+            mod_tool: self._fields.0,
+            reason: self._fields.1,
+            reason_type: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/repo.rs b/crates/jacquard-api/src/com_atproto/repo.rs
index c81ccd59..830a29b1 100644
--- a/crates/jacquard-api/src/com_atproto/repo.rs
+++ b/crates/jacquard-api/src/com_atproto/repo.rs
@@ -17,7 +17,11 @@ pub mod put_record;
 pub mod strong_ref;
 pub mod upload_blob;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -65,45 +69,45 @@ pub mod commit_meta_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Cid;
         type Rev;
+        type Cid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Cid = Unset;
         type Rev = Unset;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type Cid = Set<members::cid>;
-        type Rev = S::Rev;
+        type Cid = Unset;
     }
     ///State transition - sets the `rev` field to Set
     pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRev<S> {}
     impl<S: State> State for SetRev<S> {
-        type Cid = S::Cid;
         type Rev = Set<members::rev>;
+        type Cid = S::Cid;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Rev = S::Rev;
+        type Cid = Set<members::cid>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `rev` field
         pub struct rev(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CommitMetaBuilder<'a, S: commit_meta_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<Tid>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<Tid>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CommitMeta<'a> {
@@ -117,9 +121,9 @@ impl<'a> CommitMetaBuilder<'a, commit_meta_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommitMetaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -134,11 +138,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> CommitMetaBuilder<'a, commit_meta_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommitMetaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -153,11 +157,11 @@ where
         mut self,
         value: impl Into<Tid>,
     ) -> CommitMetaBuilder<'a, commit_meta_state::SetRev<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommitMetaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -165,14 +169,14 @@ where
 impl<'a, S> CommitMetaBuilder<'a, S>
 where
     S: commit_meta_state::State,
-    S::Cid: commit_meta_state::IsSet,
     S::Rev: commit_meta_state::IsSet,
+    S::Cid: commit_meta_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CommitMeta<'a> {
         CommitMeta {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            rev: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            rev: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -185,8 +189,8 @@ where
         >,
     ) -> CommitMeta<'a> {
         CommitMeta {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            rev: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            rev: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs b/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs
index 105dbe41..9b0f8eed 100644
--- a/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -517,49 +520,45 @@ pub mod create_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Collection;
         type Value;
+        type Collection;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Collection = Unset;
         type Value = Unset;
-    }
-    ///State transition - sets the `collection` field to Set
-    pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCollection<S> {}
-    impl<S: State> State for SetCollection<S> {
-        type Collection = Set<members::collection>;
-        type Value = S::Value;
+        type Collection = Unset;
     }
     ///State transition - sets the `value` field to Set
     pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetValue<S> {}
     impl<S: State> State for SetValue<S> {
-        type Collection = S::Collection;
         type Value = Set<members::value>;
+        type Collection = S::Collection;
+    }
+    ///State transition - sets the `collection` field to Set
+    pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCollection<S> {}
+    impl<S: State> State for SetCollection<S> {
+        type Value = S::Value;
+        type Collection = Set<members::collection>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `collection` field
-        pub struct collection(());
         ///Marker type for the `value` field
         pub struct value(());
+        ///Marker type for the `collection` field
+        pub struct collection(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CreateBuilder<'a, S: create_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Nsid<'a>>,
-        Option<RecordKey<Rkey<'a>>>,
-        Option<Data<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Nsid<'a>>, Option<RecordKey<Rkey<'a>>>, Option<Data<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Create<'a> {
@@ -573,9 +572,9 @@ impl<'a> CreateBuilder<'a, create_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -590,11 +589,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> CreateBuilder<'a, create_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CreateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -602,12 +601,12 @@ where
 impl<'a, S: create_state::State> CreateBuilder<'a, S> {
     /// Set the `rkey` field (optional)
     pub fn rkey(mut self, value: impl Into<Option<RecordKey<Rkey<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `rkey` field to an Option value (optional)
     pub fn maybe_rkey(mut self, value: Option<RecordKey<Rkey<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -622,11 +621,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> CreateBuilder<'a, create_state::SetValue<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CreateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -634,15 +633,15 @@ where
 impl<'a, S> CreateBuilder<'a, S>
 where
     S: create_state::State,
-    S::Collection: create_state::IsSet,
     S::Value: create_state::IsSet,
+    S::Collection: create_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Create<'a> {
         Create {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            rkey: self.__unsafe_private_named.1,
-            value: self.__unsafe_private_named.2.unwrap(),
+            collection: self._fields.0.unwrap(),
+            rkey: self._fields.1,
+            value: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -652,9 +651,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Create<'a> {
         Create {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            rkey: self.__unsafe_private_named.1,
-            value: self.__unsafe_private_named.2.unwrap(),
+            collection: self._fields.0.unwrap(),
+            rkey: self._fields.1,
+            value: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -987,13 +986,13 @@ pub mod create_result_state {
 
 /// Builder for constructing an instance of this type
 pub struct CreateResultBuilder<'a, S: create_result_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<AtUri<'a>>,
         Option<CreateResultValidationStatus<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CreateResult<'a> {
@@ -1007,9 +1006,9 @@ impl<'a> CreateResultBuilder<'a, create_result_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreateResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1024,11 +1023,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> CreateResultBuilder<'a, create_result_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CreateResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1043,11 +1042,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CreateResultBuilder<'a, create_result_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CreateResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1058,7 +1057,7 @@ impl<'a, S: create_result_state::State> CreateResultBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CreateResultValidationStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `validationStatus` field to an Option value (optional)
@@ -1066,7 +1065,7 @@ impl<'a, S: create_result_state::State> CreateResultBuilder<'a, S> {
         mut self,
         value: Option<CreateResultValidationStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1080,9 +1079,9 @@ where
     /// Build the final struct
     pub fn build(self) -> CreateResult<'a> {
         CreateResult {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            validation_status: self.__unsafe_private_named.2,
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            validation_status: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -1092,9 +1091,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> CreateResult<'a> {
         CreateResult {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            validation_status: self.__unsafe_private_named.2,
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            validation_status: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -1146,9 +1145,9 @@ pub mod delete_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeleteBuilder<'a, S: delete_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Nsid<'a>>, Option<RecordKey<Rkey<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Nsid<'a>>, Option<RecordKey<Rkey<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Delete<'a> {
@@ -1162,9 +1161,9 @@ impl<'a> DeleteBuilder<'a, delete_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1179,11 +1178,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> DeleteBuilder<'a, delete_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeleteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1198,11 +1197,11 @@ where
         mut self,
         value: impl Into<RecordKey<Rkey<'a>>>,
     ) -> DeleteBuilder<'a, delete_state::SetRkey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DeleteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1216,8 +1215,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Delete<'a> {
         Delete {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            rkey: self.__unsafe_private_named.1.unwrap(),
+            collection: self._fields.0.unwrap(),
+            rkey: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1227,8 +1226,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Delete<'a> {
         Delete {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            rkey: self.__unsafe_private_named.1.unwrap(),
+            collection: self._fields.0.unwrap(),
+            rkey: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1244,50 +1243,50 @@ pub mod apply_writes_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Repo;
         type Writes;
+        type Repo;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Repo = Unset;
         type Writes = Unset;
-    }
-    ///State transition - sets the `repo` field to Set
-    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepo<S> {}
-    impl<S: State> State for SetRepo<S> {
-        type Repo = Set<members::repo>;
-        type Writes = S::Writes;
+        type Repo = Unset;
     }
     ///State transition - sets the `writes` field to Set
     pub struct SetWrites<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWrites<S> {}
     impl<S: State> State for SetWrites<S> {
-        type Repo = S::Repo;
         type Writes = Set<members::writes>;
+        type Repo = S::Repo;
+    }
+    ///State transition - sets the `repo` field to Set
+    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepo<S> {}
+    impl<S: State> State for SetRepo<S> {
+        type Writes = S::Writes;
+        type Repo = Set<members::repo>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `repo` field
-        pub struct repo(());
         ///Marker type for the `writes` field
         pub struct writes(());
+        ///Marker type for the `repo` field
+        pub struct repo(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ApplyWritesBuilder<'a, S: apply_writes_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<Cid<'a>>,
         Option<bool>,
         Option<Vec<ApplyWritesWritesItem<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ApplyWrites<'a> {
@@ -1301,9 +1300,9 @@ impl<'a> ApplyWritesBuilder<'a, apply_writes_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ApplyWritesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1318,11 +1317,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> ApplyWritesBuilder<'a, apply_writes_state::SetRepo<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ApplyWritesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1330,12 +1329,12 @@ where
 impl<'a, S: apply_writes_state::State> ApplyWritesBuilder<'a, S> {
     /// Set the `swapCommit` field (optional)
     pub fn swap_commit(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `swapCommit` field to an Option value (optional)
     pub fn maybe_swap_commit(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1343,12 +1342,12 @@ impl<'a, S: apply_writes_state::State> ApplyWritesBuilder<'a, S> {
 impl<'a, S: apply_writes_state::State> ApplyWritesBuilder<'a, S> {
     /// Set the `validate` field (optional)
     pub fn validate(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `validate` field to an Option value (optional)
     pub fn maybe_validate(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1363,11 +1362,11 @@ where
         mut self,
         value: impl Into<Vec<ApplyWritesWritesItem<'a>>>,
     ) -> ApplyWritesBuilder<'a, apply_writes_state::SetWrites<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ApplyWritesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1375,16 +1374,16 @@ where
 impl<'a, S> ApplyWritesBuilder<'a, S>
 where
     S: apply_writes_state::State,
-    S::Repo: apply_writes_state::IsSet,
     S::Writes: apply_writes_state::IsSet,
+    S::Repo: apply_writes_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ApplyWrites<'a> {
         ApplyWrites {
-            repo: self.__unsafe_private_named.0.unwrap(),
-            swap_commit: self.__unsafe_private_named.1,
-            validate: self.__unsafe_private_named.2,
-            writes: self.__unsafe_private_named.3.unwrap(),
+            repo: self._fields.0.unwrap(),
+            swap_commit: self._fields.1,
+            validate: self._fields.2,
+            writes: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1394,10 +1393,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ApplyWrites<'a> {
         ApplyWrites {
-            repo: self.__unsafe_private_named.0.unwrap(),
-            swap_commit: self.__unsafe_private_named.1,
-            validate: self.__unsafe_private_named.2,
-            writes: self.__unsafe_private_named.3.unwrap(),
+            repo: self._fields.0.unwrap(),
+            swap_commit: self._fields.1,
+            validate: self._fields.2,
+            writes: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1463,13 +1462,9 @@ pub mod update_state {
 
 /// Builder for constructing an instance of this type
 pub struct UpdateBuilder<'a, S: update_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Nsid<'a>>,
-        Option<RecordKey<Rkey<'a>>>,
-        Option<Data<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Nsid<'a>>, Option<RecordKey<Rkey<'a>>>, Option<Data<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Update<'a> {
@@ -1483,9 +1478,9 @@ impl<'a> UpdateBuilder<'a, update_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1500,11 +1495,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> UpdateBuilder<'a, update_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UpdateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1519,11 +1514,11 @@ where
         mut self,
         value: impl Into<RecordKey<Rkey<'a>>>,
     ) -> UpdateBuilder<'a, update_state::SetRkey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UpdateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1538,11 +1533,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> UpdateBuilder<'a, update_state::SetValue<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         UpdateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1557,9 +1552,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Update<'a> {
         Update {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            rkey: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            collection: self._fields.0.unwrap(),
+            rkey: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1569,9 +1564,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Update<'a> {
         Update {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            rkey: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            collection: self._fields.0.unwrap(),
+            rkey: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1587,49 +1582,49 @@ pub mod update_result_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Cid;
         type Uri;
+        type Cid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Cid = Unset;
         type Uri = Unset;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type Cid = Set<members::cid>;
-        type Uri = S::Uri;
+        type Cid = Unset;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Cid = S::Cid;
         type Uri = Set<members::uri>;
+        type Cid = S::Cid;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Uri = S::Uri;
+        type Cid = Set<members::cid>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct UpdateResultBuilder<'a, S: update_result_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<AtUri<'a>>,
         Option<UpdateResultValidationStatus<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateResult<'a> {
@@ -1643,9 +1638,9 @@ impl<'a> UpdateResultBuilder<'a, update_result_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1660,11 +1655,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> UpdateResultBuilder<'a, update_result_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UpdateResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1679,11 +1674,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> UpdateResultBuilder<'a, update_result_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UpdateResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1694,7 +1689,7 @@ impl<'a, S: update_result_state::State> UpdateResultBuilder<'a, S> {
         mut self,
         value: impl Into<Option<UpdateResultValidationStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `validationStatus` field to an Option value (optional)
@@ -1702,7 +1697,7 @@ impl<'a, S: update_result_state::State> UpdateResultBuilder<'a, S> {
         mut self,
         value: Option<UpdateResultValidationStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1710,15 +1705,15 @@ impl<'a, S: update_result_state::State> UpdateResultBuilder<'a, S> {
 impl<'a, S> UpdateResultBuilder<'a, S>
 where
     S: update_result_state::State,
-    S::Cid: update_result_state::IsSet,
     S::Uri: update_result_state::IsSet,
+    S::Cid: update_result_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> UpdateResult<'a> {
         UpdateResult {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            validation_status: self.__unsafe_private_named.2,
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            validation_status: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -1728,9 +1723,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> UpdateResult<'a> {
         UpdateResult {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            validation_status: self.__unsafe_private_named.2,
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            validation_status: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/repo/create_record.rs b/crates/jacquard-api/src/com_atproto/repo/create_record.rs
index 291226ac..d94636e5 100644
--- a/crates/jacquard-api/src/com_atproto/repo/create_record.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/create_record.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -228,58 +231,58 @@ pub mod create_record_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Record;
         type Repo;
         type Collection;
-        type Record;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Record = Unset;
         type Repo = Unset;
         type Collection = Unset;
-        type Record = Unset;
+    }
+    ///State transition - sets the `record` field to Set
+    pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRecord<S> {}
+    impl<S: State> State for SetRecord<S> {
+        type Record = Set<members::record>;
+        type Repo = S::Repo;
+        type Collection = S::Collection;
     }
     ///State transition - sets the `repo` field to Set
     pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepo<S> {}
     impl<S: State> State for SetRepo<S> {
+        type Record = S::Record;
         type Repo = Set<members::repo>;
         type Collection = S::Collection;
-        type Record = S::Record;
     }
     ///State transition - sets the `collection` field to Set
     pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCollection<S> {}
     impl<S: State> State for SetCollection<S> {
-        type Repo = S::Repo;
-        type Collection = Set<members::collection>;
         type Record = S::Record;
-    }
-    ///State transition - sets the `record` field to Set
-    pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRecord<S> {}
-    impl<S: State> State for SetRecord<S> {
         type Repo = S::Repo;
-        type Collection = S::Collection;
-        type Record = Set<members::record>;
+        type Collection = Set<members::collection>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `record` field
+        pub struct record(());
         ///Marker type for the `repo` field
         pub struct repo(());
         ///Marker type for the `collection` field
         pub struct collection(());
-        ///Marker type for the `record` field
-        pub struct record(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CreateRecordBuilder<'a, S: create_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Nsid<'a>>,
         Option<Data<'a>>,
         Option<AtIdentifier<'a>>,
@@ -287,7 +290,7 @@ pub struct CreateRecordBuilder<'a, S: create_record_state::State> {
         Option<Cid<'a>>,
         Option<bool>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CreateRecord<'a> {
@@ -301,9 +304,9 @@ impl<'a> CreateRecordBuilder<'a, create_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreateRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -318,11 +321,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> CreateRecordBuilder<'a, create_record_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CreateRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -337,11 +340,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> CreateRecordBuilder<'a, create_record_state::SetRecord<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CreateRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -356,11 +359,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> CreateRecordBuilder<'a, create_record_state::SetRepo<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CreateRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -368,12 +371,12 @@ where
 impl<'a, S: create_record_state::State> CreateRecordBuilder<'a, S> {
     /// Set the `rkey` field (optional)
     pub fn rkey(mut self, value: impl Into<Option<RecordKey<Rkey<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `rkey` field to an Option value (optional)
     pub fn maybe_rkey(mut self, value: Option<RecordKey<Rkey<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -381,12 +384,12 @@ impl<'a, S: create_record_state::State> CreateRecordBuilder<'a, S> {
 impl<'a, S: create_record_state::State> CreateRecordBuilder<'a, S> {
     /// Set the `swapCommit` field (optional)
     pub fn swap_commit(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `swapCommit` field to an Option value (optional)
     pub fn maybe_swap_commit(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -394,12 +397,12 @@ impl<'a, S: create_record_state::State> CreateRecordBuilder<'a, S> {
 impl<'a, S: create_record_state::State> CreateRecordBuilder<'a, S> {
     /// Set the `validate` field (optional)
     pub fn validate(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `validate` field to an Option value (optional)
     pub fn maybe_validate(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -407,19 +410,19 @@ impl<'a, S: create_record_state::State> CreateRecordBuilder<'a, S> {
 impl<'a, S> CreateRecordBuilder<'a, S>
 where
     S: create_record_state::State,
+    S::Record: create_record_state::IsSet,
     S::Repo: create_record_state::IsSet,
     S::Collection: create_record_state::IsSet,
-    S::Record: create_record_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CreateRecord<'a> {
         CreateRecord {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            record: self.__unsafe_private_named.1.unwrap(),
-            repo: self.__unsafe_private_named.2.unwrap(),
-            rkey: self.__unsafe_private_named.3,
-            swap_commit: self.__unsafe_private_named.4,
-            validate: self.__unsafe_private_named.5,
+            collection: self._fields.0.unwrap(),
+            record: self._fields.1.unwrap(),
+            repo: self._fields.2.unwrap(),
+            rkey: self._fields.3,
+            swap_commit: self._fields.4,
+            validate: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -429,12 +432,12 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> CreateRecord<'a> {
         CreateRecord {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            record: self.__unsafe_private_named.1.unwrap(),
-            repo: self.__unsafe_private_named.2.unwrap(),
-            rkey: self.__unsafe_private_named.3,
-            swap_commit: self.__unsafe_private_named.4,
-            validate: self.__unsafe_private_named.5,
+            collection: self._fields.0.unwrap(),
+            record: self._fields.1.unwrap(),
+            repo: self._fields.2.unwrap(),
+            rkey: self._fields.3,
+            swap_commit: self._fields.4,
+            validate: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/repo/delete_record.rs b/crates/jacquard-api/src/com_atproto/repo/delete_record.rs
index f0d6c397..1e00c7fd 100644
--- a/crates/jacquard-api/src/com_atproto/repo/delete_record.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/delete_record.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -121,65 +124,65 @@ pub mod delete_record_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Repo;
         type Collection;
         type Rkey;
-        type Repo;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Repo = Unset;
         type Collection = Unset;
         type Rkey = Unset;
-        type Repo = Unset;
+    }
+    ///State transition - sets the `repo` field to Set
+    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepo<S> {}
+    impl<S: State> State for SetRepo<S> {
+        type Repo = Set<members::repo>;
+        type Collection = S::Collection;
+        type Rkey = S::Rkey;
     }
     ///State transition - sets the `collection` field to Set
     pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCollection<S> {}
     impl<S: State> State for SetCollection<S> {
+        type Repo = S::Repo;
         type Collection = Set<members::collection>;
         type Rkey = S::Rkey;
-        type Repo = S::Repo;
     }
     ///State transition - sets the `rkey` field to Set
     pub struct SetRkey<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRkey<S> {}
     impl<S: State> State for SetRkey<S> {
-        type Collection = S::Collection;
-        type Rkey = Set<members::rkey>;
         type Repo = S::Repo;
-    }
-    ///State transition - sets the `repo` field to Set
-    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepo<S> {}
-    impl<S: State> State for SetRepo<S> {
         type Collection = S::Collection;
-        type Rkey = S::Rkey;
-        type Repo = Set<members::repo>;
+        type Rkey = Set<members::rkey>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `repo` field
+        pub struct repo(());
         ///Marker type for the `collection` field
         pub struct collection(());
         ///Marker type for the `rkey` field
         pub struct rkey(());
-        ///Marker type for the `repo` field
-        pub struct repo(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DeleteRecordBuilder<'a, S: delete_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Nsid<'a>>,
         Option<AtIdentifier<'a>>,
         Option<RecordKey<Rkey<'a>>>,
         Option<Cid<'a>>,
         Option<Cid<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeleteRecord<'a> {
@@ -193,9 +196,9 @@ impl<'a> DeleteRecordBuilder<'a, delete_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,11 +213,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> DeleteRecordBuilder<'a, delete_record_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeleteRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -229,11 +232,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> DeleteRecordBuilder<'a, delete_record_state::SetRepo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DeleteRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -248,11 +251,11 @@ where
         mut self,
         value: impl Into<RecordKey<Rkey<'a>>>,
     ) -> DeleteRecordBuilder<'a, delete_record_state::SetRkey<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         DeleteRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -260,12 +263,12 @@ where
 impl<'a, S: delete_record_state::State> DeleteRecordBuilder<'a, S> {
     /// Set the `swapCommit` field (optional)
     pub fn swap_commit(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `swapCommit` field to an Option value (optional)
     pub fn maybe_swap_commit(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -273,12 +276,12 @@ impl<'a, S: delete_record_state::State> DeleteRecordBuilder<'a, S> {
 impl<'a, S: delete_record_state::State> DeleteRecordBuilder<'a, S> {
     /// Set the `swapRecord` field (optional)
     pub fn swap_record(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `swapRecord` field to an Option value (optional)
     pub fn maybe_swap_record(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -286,18 +289,18 @@ impl<'a, S: delete_record_state::State> DeleteRecordBuilder<'a, S> {
 impl<'a, S> DeleteRecordBuilder<'a, S>
 where
     S: delete_record_state::State,
+    S::Repo: delete_record_state::IsSet,
     S::Collection: delete_record_state::IsSet,
     S::Rkey: delete_record_state::IsSet,
-    S::Repo: delete_record_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DeleteRecord<'a> {
         DeleteRecord {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
-            rkey: self.__unsafe_private_named.2.unwrap(),
-            swap_commit: self.__unsafe_private_named.3,
-            swap_record: self.__unsafe_private_named.4,
+            collection: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
+            rkey: self._fields.2.unwrap(),
+            swap_commit: self._fields.3,
+            swap_record: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -310,11 +313,11 @@ where
         >,
     ) -> DeleteRecord<'a> {
         DeleteRecord {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
-            rkey: self.__unsafe_private_named.2.unwrap(),
-            swap_commit: self.__unsafe_private_named.3,
-            swap_record: self.__unsafe_private_named.4,
+            collection: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
+            rkey: self._fields.2.unwrap(),
+            swap_commit: self._fields.3,
+            swap_record: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/repo/describe_repo.rs b/crates/jacquard-api/src/com_atproto/repo/describe_repo.rs
index 3d4d6fbc..39c66c28 100644
--- a/crates/jacquard-api/src/com_atproto/repo/describe_repo.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/describe_repo.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_common::types::string::{Did, Handle, Nsid};
@@ -97,9 +100,9 @@ pub mod describe_repo_state {
 
 /// Builder for constructing an instance of this type
 pub struct DescribeRepoBuilder<'a, S: describe_repo_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DescribeRepo<'a> {
@@ -113,9 +116,9 @@ impl<'a> DescribeRepoBuilder<'a, describe_repo_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DescribeRepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -130,11 +133,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> DescribeRepoBuilder<'a, describe_repo_state::SetRepo<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DescribeRepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -147,7 +150,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DescribeRepo<'a> {
         DescribeRepo {
-            repo: self.__unsafe_private_named.0.unwrap(),
+            repo: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/repo/get_record.rs b/crates/jacquard-api/src/com_atproto/repo/get_record.rs
index 7cc0a9c2..a308ed84 100644
--- a/crates/jacquard-api/src/com_atproto/repo/get_record.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/get_record.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -112,64 +115,64 @@ pub mod get_record_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Rkey;
         type Repo;
         type Collection;
+        type Rkey;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Rkey = Unset;
         type Repo = Unset;
         type Collection = Unset;
-    }
-    ///State transition - sets the `rkey` field to Set
-    pub struct SetRkey<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRkey<S> {}
-    impl<S: State> State for SetRkey<S> {
-        type Rkey = Set<members::rkey>;
-        type Repo = S::Repo;
-        type Collection = S::Collection;
+        type Rkey = Unset;
     }
     ///State transition - sets the `repo` field to Set
     pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepo<S> {}
     impl<S: State> State for SetRepo<S> {
-        type Rkey = S::Rkey;
         type Repo = Set<members::repo>;
         type Collection = S::Collection;
+        type Rkey = S::Rkey;
     }
     ///State transition - sets the `collection` field to Set
     pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCollection<S> {}
     impl<S: State> State for SetCollection<S> {
-        type Rkey = S::Rkey;
         type Repo = S::Repo;
         type Collection = Set<members::collection>;
+        type Rkey = S::Rkey;
+    }
+    ///State transition - sets the `rkey` field to Set
+    pub struct SetRkey<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRkey<S> {}
+    impl<S: State> State for SetRkey<S> {
+        type Repo = S::Repo;
+        type Collection = S::Collection;
+        type Rkey = Set<members::rkey>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `rkey` field
-        pub struct rkey(());
         ///Marker type for the `repo` field
         pub struct repo(());
         ///Marker type for the `collection` field
         pub struct collection(());
+        ///Marker type for the `rkey` field
+        pub struct rkey(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GetRecordBuilder<'a, S: get_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<Nsid<'a>>,
         Option<AtIdentifier<'a>>,
         Option<RecordKey<Rkey<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetRecord<'a> {
@@ -183,9 +186,9 @@ impl<'a> GetRecordBuilder<'a, get_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -193,12 +196,12 @@ impl<'a> GetRecordBuilder<'a, get_record_state::Empty> {
 impl<'a, S: get_record_state::State> GetRecordBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -213,11 +216,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> GetRecordBuilder<'a, get_record_state::SetCollection<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,11 +235,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetRecordBuilder<'a, get_record_state::SetRepo<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -251,11 +254,11 @@ where
         mut self,
         value: impl Into<RecordKey<Rkey<'a>>>,
     ) -> GetRecordBuilder<'a, get_record_state::SetRkey<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         GetRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -263,17 +266,17 @@ where
 impl<'a, S> GetRecordBuilder<'a, S>
 where
     S: get_record_state::State,
-    S::Rkey: get_record_state::IsSet,
     S::Repo: get_record_state::IsSet,
     S::Collection: get_record_state::IsSet,
+    S::Rkey: get_record_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GetRecord<'a> {
         GetRecord {
-            cid: self.__unsafe_private_named.0,
-            collection: self.__unsafe_private_named.1.unwrap(),
-            repo: self.__unsafe_private_named.2.unwrap(),
-            rkey: self.__unsafe_private_named.3.unwrap(),
+            cid: self._fields.0,
+            collection: self._fields.1.unwrap(),
+            repo: self._fields.2.unwrap(),
+            rkey: self._fields.3.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/repo/import_repo.rs b/crates/jacquard-api/src/com_atproto/repo/import_repo.rs
index bd10bafc..040f4569 100644
--- a/crates/jacquard-api/src/com_atproto/repo/import_repo.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/import_repo.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::deps::bytes::Bytes;
 use jacquard_derive::IntoStatic;
diff --git a/crates/jacquard-api/src/com_atproto/repo/list_missing_blobs.rs b/crates/jacquard-api/src/com_atproto/repo/list_missing_blobs.rs
index 9ff86404..67cce5dd 100644
--- a/crates/jacquard-api/src/com_atproto/repo/list_missing_blobs.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/list_missing_blobs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -120,9 +123,9 @@ pub mod list_missing_blobs_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListMissingBlobsBuilder<'a, S: list_missing_blobs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListMissingBlobs<'a> {
@@ -136,9 +139,9 @@ impl<'a> ListMissingBlobsBuilder<'a, list_missing_blobs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListMissingBlobsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -146,12 +149,12 @@ impl<'a> ListMissingBlobsBuilder<'a, list_missing_blobs_state::Empty> {
 impl<'a, S: list_missing_blobs_state::State> ListMissingBlobsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -159,12 +162,12 @@ impl<'a, S: list_missing_blobs_state::State> ListMissingBlobsBuilder<'a, S> {
 impl<'a, S: list_missing_blobs_state::State> ListMissingBlobsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -176,8 +179,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ListMissingBlobs<'a> {
         ListMissingBlobs {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
@@ -192,45 +195,45 @@ pub mod record_blob_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type RecordUri;
         type Cid;
+        type RecordUri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type RecordUri = Unset;
         type Cid = Unset;
-    }
-    ///State transition - sets the `record_uri` field to Set
-    pub struct SetRecordUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRecordUri<S> {}
-    impl<S: State> State for SetRecordUri<S> {
-        type RecordUri = Set<members::record_uri>;
-        type Cid = S::Cid;
+        type RecordUri = Unset;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type RecordUri = S::RecordUri;
         type Cid = Set<members::cid>;
+        type RecordUri = S::RecordUri;
+    }
+    ///State transition - sets the `record_uri` field to Set
+    pub struct SetRecordUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRecordUri<S> {}
+    impl<S: State> State for SetRecordUri<S> {
+        type Cid = S::Cid;
+        type RecordUri = Set<members::record_uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `record_uri` field
-        pub struct record_uri(());
         ///Marker type for the `cid` field
         pub struct cid(());
+        ///Marker type for the `record_uri` field
+        pub struct record_uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RecordBlobBuilder<'a, S: record_blob_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RecordBlob<'a> {
@@ -244,9 +247,9 @@ impl<'a> RecordBlobBuilder<'a, record_blob_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordBlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -261,11 +264,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> RecordBlobBuilder<'a, record_blob_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordBlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -280,11 +283,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RecordBlobBuilder<'a, record_blob_state::SetRecordUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RecordBlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -292,14 +295,14 @@ where
 impl<'a, S> RecordBlobBuilder<'a, S>
 where
     S: record_blob_state::State,
-    S::RecordUri: record_blob_state::IsSet,
     S::Cid: record_blob_state::IsSet,
+    S::RecordUri: record_blob_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RecordBlob<'a> {
         RecordBlob {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            record_uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            record_uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -312,8 +315,8 @@ where
         >,
     ) -> RecordBlob<'a> {
         RecordBlob {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            record_uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            record_uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/repo/list_records.rs b/crates/jacquard-api/src/com_atproto/repo/list_records.rs
index 01f2c8bd..ce48c8a4 100644
--- a/crates/jacquard-api/src/com_atproto/repo/list_records.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/list_records.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -155,15 +158,15 @@ pub mod list_records_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListRecordsBuilder<'a, S: list_records_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Nsid<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<AtIdentifier<'a>>,
         Option<bool>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListRecords<'a> {
@@ -177,9 +180,9 @@ impl<'a> ListRecordsBuilder<'a, list_records_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListRecordsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -194,11 +197,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> ListRecordsBuilder<'a, list_records_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListRecordsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -206,12 +209,12 @@ where
 impl<'a, S: list_records_state::State> ListRecordsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -219,12 +222,12 @@ impl<'a, S: list_records_state::State> ListRecordsBuilder<'a, S> {
 impl<'a, S: list_records_state::State> ListRecordsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -239,11 +242,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> ListRecordsBuilder<'a, list_records_state::SetRepo<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ListRecordsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -251,12 +254,12 @@ where
 impl<'a, S: list_records_state::State> ListRecordsBuilder<'a, S> {
     /// Set the `reverse` field (optional)
     pub fn reverse(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `reverse` field to an Option value (optional)
     pub fn maybe_reverse(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -270,11 +273,11 @@ where
     /// Build the final struct
     pub fn build(self) -> ListRecords<'a> {
         ListRecords {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            repo: self.__unsafe_private_named.3.unwrap(),
-            reverse: self.__unsafe_private_named.4,
+            collection: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
+            repo: self._fields.3.unwrap(),
+            reverse: self._fields.4,
         }
     }
 }
@@ -339,9 +342,9 @@ pub mod record_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordBuilder<'a, S: record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>, Option<Data<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>, Option<Data<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Record<'a> {
@@ -355,9 +358,9 @@ impl<'a> RecordBuilder<'a, record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -372,11 +375,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> RecordBuilder<'a, record_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -391,11 +394,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RecordBuilder<'a, record_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -410,11 +413,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> RecordBuilder<'a, record_state::SetValue<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -429,9 +432,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Record<'a> {
         Record {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -441,9 +444,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Record<'a> {
         Record {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/repo/put_record.rs b/crates/jacquard-api/src/com_atproto/repo/put_record.rs
index 3a95c026..b83c9893 100644
--- a/crates/jacquard-api/src/com_atproto/repo/put_record.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/put_record.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -296,8 +299,8 @@ pub mod put_record_state {
 
 /// Builder for constructing an instance of this type
 pub struct PutRecordBuilder<'a, S: put_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Nsid<'a>>,
         Option<Data<'a>>,
         Option<AtIdentifier<'a>>,
@@ -306,7 +309,7 @@ pub struct PutRecordBuilder<'a, S: put_record_state::State> {
         Option<Cid<'a>>,
         Option<bool>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PutRecord<'a> {
@@ -320,9 +323,9 @@ impl<'a> PutRecordBuilder<'a, put_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PutRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -337,11 +340,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> PutRecordBuilder<'a, put_record_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PutRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -356,11 +359,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> PutRecordBuilder<'a, put_record_state::SetRecord<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PutRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -375,11 +378,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> PutRecordBuilder<'a, put_record_state::SetRepo<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PutRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -394,11 +397,11 @@ where
         mut self,
         value: impl Into<RecordKey<Rkey<'a>>>,
     ) -> PutRecordBuilder<'a, put_record_state::SetRkey<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PutRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -406,12 +409,12 @@ where
 impl<'a, S: put_record_state::State> PutRecordBuilder<'a, S> {
     /// Set the `swapCommit` field (optional)
     pub fn swap_commit(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `swapCommit` field to an Option value (optional)
     pub fn maybe_swap_commit(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -419,12 +422,12 @@ impl<'a, S: put_record_state::State> PutRecordBuilder<'a, S> {
 impl<'a, S: put_record_state::State> PutRecordBuilder<'a, S> {
     /// Set the `swapRecord` field (optional)
     pub fn swap_record(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `swapRecord` field to an Option value (optional)
     pub fn maybe_swap_record(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -432,12 +435,12 @@ impl<'a, S: put_record_state::State> PutRecordBuilder<'a, S> {
 impl<'a, S: put_record_state::State> PutRecordBuilder<'a, S> {
     /// Set the `validate` field (optional)
     pub fn validate(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `validate` field to an Option value (optional)
     pub fn maybe_validate(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -453,13 +456,13 @@ where
     /// Build the final struct
     pub fn build(self) -> PutRecord<'a> {
         PutRecord {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            record: self.__unsafe_private_named.1.unwrap(),
-            repo: self.__unsafe_private_named.2.unwrap(),
-            rkey: self.__unsafe_private_named.3.unwrap(),
-            swap_commit: self.__unsafe_private_named.4,
-            swap_record: self.__unsafe_private_named.5,
-            validate: self.__unsafe_private_named.6,
+            collection: self._fields.0.unwrap(),
+            record: self._fields.1.unwrap(),
+            repo: self._fields.2.unwrap(),
+            rkey: self._fields.3.unwrap(),
+            swap_commit: self._fields.4,
+            swap_record: self._fields.5,
+            validate: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -469,13 +472,13 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> PutRecord<'a> {
         PutRecord {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            record: self.__unsafe_private_named.1.unwrap(),
-            repo: self.__unsafe_private_named.2.unwrap(),
-            rkey: self.__unsafe_private_named.3.unwrap(),
-            swap_commit: self.__unsafe_private_named.4,
-            swap_record: self.__unsafe_private_named.5,
-            validate: self.__unsafe_private_named.6,
+            collection: self._fields.0.unwrap(),
+            record: self._fields.1.unwrap(),
+            repo: self._fields.2.unwrap(),
+            rkey: self._fields.3.unwrap(),
+            swap_commit: self._fields.4,
+            swap_record: self._fields.5,
+            validate: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/repo/strong_ref.rs b/crates/jacquard-api/src/com_atproto/repo/strong_ref.rs
index afa5eb6b..66872bd7 100644
--- a/crates/jacquard-api/src/com_atproto/repo/strong_ref.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/strong_ref.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -90,9 +93,9 @@ pub mod strong_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct StrongRefBuilder<'a, S: strong_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> StrongRef<'a> {
@@ -106,9 +109,9 @@ impl<'a> StrongRefBuilder<'a, strong_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StrongRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -123,11 +126,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> StrongRefBuilder<'a, strong_ref_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StrongRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,11 +145,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> StrongRefBuilder<'a, strong_ref_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StrongRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -160,8 +163,8 @@ where
     /// Build the final struct
     pub fn build(self) -> StrongRef<'a> {
         StrongRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -174,8 +177,8 @@ where
         >,
     ) -> StrongRef<'a> {
         StrongRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/repo/upload_blob.rs b/crates/jacquard-api/src/com_atproto/repo/upload_blob.rs
index 20363bca..cbdf238a 100644
--- a/crates/jacquard-api/src/com_atproto/repo/upload_blob.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/upload_blob.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::deps::bytes::Bytes;
 use jacquard_common::types::blob::BlobRef;
diff --git a/crates/jacquard-api/src/com_atproto/server.rs b/crates/jacquard-api/src/com_atproto/server.rs
index 30f08215..897f274a 100644
--- a/crates/jacquard-api/src/com_atproto/server.rs
+++ b/crates/jacquard-api/src/com_atproto/server.rs
@@ -31,7 +31,11 @@ pub mod reset_password;
 pub mod revoke_app_password;
 pub mod update_email;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -114,134 +118,134 @@ pub mod invite_code_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type ForAccount;
         type Disabled;
+        type Code;
         type Uses;
-        type ForAccount;
-        type CreatedBy;
         type CreatedAt;
         type Available;
-        type Code;
+        type CreatedBy;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type ForAccount = Unset;
         type Disabled = Unset;
+        type Code = Unset;
         type Uses = Unset;
-        type ForAccount = Unset;
-        type CreatedBy = Unset;
         type CreatedAt = Unset;
         type Available = Unset;
-        type Code = Unset;
+        type CreatedBy = Unset;
+    }
+    ///State transition - sets the `for_account` field to Set
+    pub struct SetForAccount<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetForAccount<S> {}
+    impl<S: State> State for SetForAccount<S> {
+        type ForAccount = Set<members::for_account>;
+        type Disabled = S::Disabled;
+        type Code = S::Code;
+        type Uses = S::Uses;
+        type CreatedAt = S::CreatedAt;
+        type Available = S::Available;
+        type CreatedBy = S::CreatedBy;
     }
     ///State transition - sets the `disabled` field to Set
     pub struct SetDisabled<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDisabled<S> {}
     impl<S: State> State for SetDisabled<S> {
+        type ForAccount = S::ForAccount;
         type Disabled = Set<members::disabled>;
+        type Code = S::Code;
         type Uses = S::Uses;
-        type ForAccount = S::ForAccount;
+        type CreatedAt = S::CreatedAt;
+        type Available = S::Available;
         type CreatedBy = S::CreatedBy;
+    }
+    ///State transition - sets the `code` field to Set
+    pub struct SetCode<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCode<S> {}
+    impl<S: State> State for SetCode<S> {
+        type ForAccount = S::ForAccount;
+        type Disabled = S::Disabled;
+        type Code = Set<members::code>;
+        type Uses = S::Uses;
         type CreatedAt = S::CreatedAt;
         type Available = S::Available;
-        type Code = S::Code;
+        type CreatedBy = S::CreatedBy;
     }
     ///State transition - sets the `uses` field to Set
     pub struct SetUses<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUses<S> {}
     impl<S: State> State for SetUses<S> {
-        type Disabled = S::Disabled;
-        type Uses = Set<members::uses>;
         type ForAccount = S::ForAccount;
-        type CreatedBy = S::CreatedBy;
-        type CreatedAt = S::CreatedAt;
-        type Available = S::Available;
-        type Code = S::Code;
-    }
-    ///State transition - sets the `for_account` field to Set
-    pub struct SetForAccount<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetForAccount<S> {}
-    impl<S: State> State for SetForAccount<S> {
         type Disabled = S::Disabled;
-        type Uses = S::Uses;
-        type ForAccount = Set<members::for_account>;
-        type CreatedBy = S::CreatedBy;
-        type CreatedAt = S::CreatedAt;
-        type Available = S::Available;
         type Code = S::Code;
-    }
-    ///State transition - sets the `created_by` field to Set
-    pub struct SetCreatedBy<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedBy<S> {}
-    impl<S: State> State for SetCreatedBy<S> {
-        type Disabled = S::Disabled;
-        type Uses = S::Uses;
-        type ForAccount = S::ForAccount;
-        type CreatedBy = Set<members::created_by>;
+        type Uses = Set<members::uses>;
         type CreatedAt = S::CreatedAt;
         type Available = S::Available;
-        type Code = S::Code;
+        type CreatedBy = S::CreatedBy;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type ForAccount = S::ForAccount;
         type Disabled = S::Disabled;
+        type Code = S::Code;
         type Uses = S::Uses;
-        type ForAccount = S::ForAccount;
-        type CreatedBy = S::CreatedBy;
         type CreatedAt = Set<members::created_at>;
         type Available = S::Available;
-        type Code = S::Code;
+        type CreatedBy = S::CreatedBy;
     }
     ///State transition - sets the `available` field to Set
     pub struct SetAvailable<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAvailable<S> {}
     impl<S: State> State for SetAvailable<S> {
+        type ForAccount = S::ForAccount;
         type Disabled = S::Disabled;
+        type Code = S::Code;
         type Uses = S::Uses;
-        type ForAccount = S::ForAccount;
-        type CreatedBy = S::CreatedBy;
         type CreatedAt = S::CreatedAt;
         type Available = Set<members::available>;
-        type Code = S::Code;
+        type CreatedBy = S::CreatedBy;
     }
-    ///State transition - sets the `code` field to Set
-    pub struct SetCode<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCode<S> {}
-    impl<S: State> State for SetCode<S> {
+    ///State transition - sets the `created_by` field to Set
+    pub struct SetCreatedBy<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedBy<S> {}
+    impl<S: State> State for SetCreatedBy<S> {
+        type ForAccount = S::ForAccount;
         type Disabled = S::Disabled;
+        type Code = S::Code;
         type Uses = S::Uses;
-        type ForAccount = S::ForAccount;
-        type CreatedBy = S::CreatedBy;
         type CreatedAt = S::CreatedAt;
         type Available = S::Available;
-        type Code = Set<members::code>;
+        type CreatedBy = Set<members::created_by>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `for_account` field
+        pub struct for_account(());
         ///Marker type for the `disabled` field
         pub struct disabled(());
+        ///Marker type for the `code` field
+        pub struct code(());
         ///Marker type for the `uses` field
         pub struct uses(());
-        ///Marker type for the `for_account` field
-        pub struct for_account(());
-        ///Marker type for the `created_by` field
-        pub struct created_by(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `available` field
         pub struct available(());
-        ///Marker type for the `code` field
-        pub struct code(());
+        ///Marker type for the `created_by` field
+        pub struct created_by(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct InviteCodeBuilder<'a, S: invite_code_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -250,7 +254,7 @@ pub struct InviteCodeBuilder<'a, S: invite_code_state::State> {
         Option<CowStr<'a>>,
         Option<Vec<server::InviteCodeUse<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> InviteCode<'a> {
@@ -264,9 +268,9 @@ impl<'a> InviteCodeBuilder<'a, invite_code_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         InviteCodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -281,11 +285,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> InviteCodeBuilder<'a, invite_code_state::SetAvailable<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         InviteCodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -300,11 +304,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> InviteCodeBuilder<'a, invite_code_state::SetCode<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         InviteCodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -319,11 +323,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> InviteCodeBuilder<'a, invite_code_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         InviteCodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -338,11 +342,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> InviteCodeBuilder<'a, invite_code_state::SetCreatedBy<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         InviteCodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -357,11 +361,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> InviteCodeBuilder<'a, invite_code_state::SetDisabled<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         InviteCodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -376,11 +380,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> InviteCodeBuilder<'a, invite_code_state::SetForAccount<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         InviteCodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -395,11 +399,11 @@ where
         mut self,
         value: impl Into<Vec<server::InviteCodeUse<'a>>>,
     ) -> InviteCodeBuilder<'a, invite_code_state::SetUses<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         InviteCodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -407,24 +411,24 @@ where
 impl<'a, S> InviteCodeBuilder<'a, S>
 where
     S: invite_code_state::State,
+    S::ForAccount: invite_code_state::IsSet,
     S::Disabled: invite_code_state::IsSet,
+    S::Code: invite_code_state::IsSet,
     S::Uses: invite_code_state::IsSet,
-    S::ForAccount: invite_code_state::IsSet,
-    S::CreatedBy: invite_code_state::IsSet,
     S::CreatedAt: invite_code_state::IsSet,
     S::Available: invite_code_state::IsSet,
-    S::Code: invite_code_state::IsSet,
+    S::CreatedBy: invite_code_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> InviteCode<'a> {
         InviteCode {
-            available: self.__unsafe_private_named.0.unwrap(),
-            code: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            created_by: self.__unsafe_private_named.3.unwrap(),
-            disabled: self.__unsafe_private_named.4.unwrap(),
-            for_account: self.__unsafe_private_named.5.unwrap(),
-            uses: self.__unsafe_private_named.6.unwrap(),
+            available: self._fields.0.unwrap(),
+            code: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            created_by: self._fields.3.unwrap(),
+            disabled: self._fields.4.unwrap(),
+            for_account: self._fields.5.unwrap(),
+            uses: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -437,13 +441,13 @@ where
         >,
     ) -> InviteCode<'a> {
         InviteCode {
-            available: self.__unsafe_private_named.0.unwrap(),
-            code: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            created_by: self.__unsafe_private_named.3.unwrap(),
-            disabled: self.__unsafe_private_named.4.unwrap(),
-            for_account: self.__unsafe_private_named.5.unwrap(),
-            uses: self.__unsafe_private_named.6.unwrap(),
+            available: self._fields.0.unwrap(),
+            code: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            created_by: self._fields.3.unwrap(),
+            disabled: self._fields.4.unwrap(),
+            for_account: self._fields.5.unwrap(),
+            uses: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -603,9 +607,9 @@ pub mod invite_code_use_state {
 
 /// Builder for constructing an instance of this type
 pub struct InviteCodeUseBuilder<'a, S: invite_code_use_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> InviteCodeUse<'a> {
@@ -619,9 +623,9 @@ impl<'a> InviteCodeUseBuilder<'a, invite_code_use_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         InviteCodeUseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -636,11 +640,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> InviteCodeUseBuilder<'a, invite_code_use_state::SetUsedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         InviteCodeUseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -655,11 +659,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> InviteCodeUseBuilder<'a, invite_code_use_state::SetUsedBy<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         InviteCodeUseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -673,8 +677,8 @@ where
     /// Build the final struct
     pub fn build(self) -> InviteCodeUse<'a> {
         InviteCodeUse {
-            used_at: self.__unsafe_private_named.0.unwrap(),
-            used_by: self.__unsafe_private_named.1.unwrap(),
+            used_at: self._fields.0.unwrap(),
+            used_by: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -687,8 +691,8 @@ where
         >,
     ) -> InviteCodeUse<'a> {
         InviteCodeUse {
-            used_at: self.__unsafe_private_named.0.unwrap(),
-            used_by: self.__unsafe_private_named.1.unwrap(),
+            used_at: self._fields.0.unwrap(),
+            used_by: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/server/activate_account.rs b/crates/jacquard-api/src/com_atproto/server/activate_account.rs
index ccb38d9e..52403ed1 100644
--- a/crates/jacquard-api/src/com_atproto/server/activate_account.rs
+++ b/crates/jacquard-api/src/com_atproto/server/activate_account.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::IntoStatic;
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/com_atproto/server/check_account_status.rs b/crates/jacquard-api/src/com_atproto/server/check_account_status.rs
index 04135eaa..fa5ece90 100644
--- a/crates/jacquard-api/src/com_atproto/server/check_account_status.rs
+++ b/crates/jacquard-api/src/com_atproto/server/check_account_status.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Cid;
diff --git a/crates/jacquard-api/src/com_atproto/server/confirm_email.rs b/crates/jacquard-api/src/com_atproto/server/confirm_email.rs
index 1627f941..560533d2 100644
--- a/crates/jacquard-api/src/com_atproto/server/confirm_email.rs
+++ b/crates/jacquard-api/src/com_atproto/server/confirm_email.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/com_atproto/server/create_account.rs b/crates/jacquard-api/src/com_atproto/server/create_account.rs
index 3a244f2e..c99d54c5 100644
--- a/crates/jacquard-api/src/com_atproto/server/create_account.rs
+++ b/crates/jacquard-api/src/com_atproto/server/create_account.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Handle};
@@ -222,8 +225,8 @@ pub mod create_account_state {
 
 /// Builder for constructing an instance of this type
 pub struct CreateAccountBuilder<'a, S: create_account_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Did<'a>>,
         Option<CowStr<'a>>,
         Option<Handle<'a>>,
@@ -234,7 +237,7 @@ pub struct CreateAccountBuilder<'a, S: create_account_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CreateAccount<'a> {
@@ -248,19 +251,9 @@ impl<'a> CreateAccountBuilder<'a, create_account_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreateAccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -268,12 +261,12 @@ impl<'a> CreateAccountBuilder<'a, create_account_state::Empty> {
 impl<'a, S: create_account_state::State> CreateAccountBuilder<'a, S> {
     /// Set the `did` field (optional)
     pub fn did(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `did` field to an Option value (optional)
     pub fn maybe_did(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -281,12 +274,12 @@ impl<'a, S: create_account_state::State> CreateAccountBuilder<'a, S> {
 impl<'a, S: create_account_state::State> CreateAccountBuilder<'a, S> {
     /// Set the `email` field (optional)
     pub fn email(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `email` field to an Option value (optional)
     pub fn maybe_email(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -301,11 +294,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> CreateAccountBuilder<'a, create_account_state::SetHandle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CreateAccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -313,12 +306,12 @@ where
 impl<'a, S: create_account_state::State> CreateAccountBuilder<'a, S> {
     /// Set the `inviteCode` field (optional)
     pub fn invite_code(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `inviteCode` field to an Option value (optional)
     pub fn maybe_invite_code(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -326,12 +319,12 @@ impl<'a, S: create_account_state::State> CreateAccountBuilder<'a, S> {
 impl<'a, S: create_account_state::State> CreateAccountBuilder<'a, S> {
     /// Set the `password` field (optional)
     pub fn password(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `password` field to an Option value (optional)
     pub fn maybe_password(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -339,12 +332,12 @@ impl<'a, S: create_account_state::State> CreateAccountBuilder<'a, S> {
 impl<'a, S: create_account_state::State> CreateAccountBuilder<'a, S> {
     /// Set the `plcOp` field (optional)
     pub fn plc_op(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `plcOp` field to an Option value (optional)
     pub fn maybe_plc_op(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -352,12 +345,12 @@ impl<'a, S: create_account_state::State> CreateAccountBuilder<'a, S> {
 impl<'a, S: create_account_state::State> CreateAccountBuilder<'a, S> {
     /// Set the `recoveryKey` field (optional)
     pub fn recovery_key(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `recoveryKey` field to an Option value (optional)
     pub fn maybe_recovery_key(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -365,12 +358,12 @@ impl<'a, S: create_account_state::State> CreateAccountBuilder<'a, S> {
 impl<'a, S: create_account_state::State> CreateAccountBuilder<'a, S> {
     /// Set the `verificationCode` field (optional)
     pub fn verification_code(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `verificationCode` field to an Option value (optional)
     pub fn maybe_verification_code(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -378,12 +371,12 @@ impl<'a, S: create_account_state::State> CreateAccountBuilder<'a, S> {
 impl<'a, S: create_account_state::State> CreateAccountBuilder<'a, S> {
     /// Set the `verificationPhone` field (optional)
     pub fn verification_phone(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `verificationPhone` field to an Option value (optional)
     pub fn maybe_verification_phone(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -396,15 +389,15 @@ where
     /// Build the final struct
     pub fn build(self) -> CreateAccount<'a> {
         CreateAccount {
-            did: self.__unsafe_private_named.0,
-            email: self.__unsafe_private_named.1,
-            handle: self.__unsafe_private_named.2.unwrap(),
-            invite_code: self.__unsafe_private_named.3,
-            password: self.__unsafe_private_named.4,
-            plc_op: self.__unsafe_private_named.5,
-            recovery_key: self.__unsafe_private_named.6,
-            verification_code: self.__unsafe_private_named.7,
-            verification_phone: self.__unsafe_private_named.8,
+            did: self._fields.0,
+            email: self._fields.1,
+            handle: self._fields.2.unwrap(),
+            invite_code: self._fields.3,
+            password: self._fields.4,
+            plc_op: self._fields.5,
+            recovery_key: self._fields.6,
+            verification_code: self._fields.7,
+            verification_phone: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -414,15 +407,15 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> CreateAccount<'a> {
         CreateAccount {
-            did: self.__unsafe_private_named.0,
-            email: self.__unsafe_private_named.1,
-            handle: self.__unsafe_private_named.2.unwrap(),
-            invite_code: self.__unsafe_private_named.3,
-            password: self.__unsafe_private_named.4,
-            plc_op: self.__unsafe_private_named.5,
-            recovery_key: self.__unsafe_private_named.6,
-            verification_code: self.__unsafe_private_named.7,
-            verification_phone: self.__unsafe_private_named.8,
+            did: self._fields.0,
+            email: self._fields.1,
+            handle: self._fields.2.unwrap(),
+            invite_code: self._fields.3,
+            password: self._fields.4,
+            plc_op: self._fields.5,
+            recovery_key: self._fields.6,
+            verification_code: self._fields.7,
+            verification_phone: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/server/create_app_password.rs b/crates/jacquard-api/src/com_atproto/server/create_app_password.rs
index 607c46a4..14cffe4e 100644
--- a/crates/jacquard-api/src/com_atproto/server/create_app_password.rs
+++ b/crates/jacquard-api/src/com_atproto/server/create_app_password.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,49 +149,49 @@ pub mod app_password_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type Password;
+        type Name;
         type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type Password = Unset;
+        type Name = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Password = S::Password;
-        type CreatedAt = S::CreatedAt;
-    }
     ///State transition - sets the `password` field to Set
     pub struct SetPassword<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPassword<S> {}
     impl<S: State> State for SetPassword<S> {
-        type Name = S::Name;
         type Password = Set<members::password>;
+        type Name = S::Name;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Password = S::Password;
+        type Name = Set<members::name>;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Name = S::Name;
         type Password = S::Password;
+        type Name = S::Name;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `password` field
         pub struct password(());
+        ///Marker type for the `name` field
+        pub struct name(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
     }
@@ -196,14 +199,9 @@ pub mod app_password_state {
 
 /// Builder for constructing an instance of this type
 pub struct AppPasswordBuilder<'a, S: app_password_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-        Option<bool>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AppPassword<'a> {
@@ -217,9 +215,9 @@ impl<'a> AppPasswordBuilder<'a, app_password_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AppPasswordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +232,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AppPasswordBuilder<'a, app_password_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AppPasswordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,11 +251,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AppPasswordBuilder<'a, app_password_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AppPasswordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -272,11 +270,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AppPasswordBuilder<'a, app_password_state::SetPassword<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AppPasswordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -284,12 +282,12 @@ where
 impl<'a, S: app_password_state::State> AppPasswordBuilder<'a, S> {
     /// Set the `privileged` field (optional)
     pub fn privileged(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `privileged` field to an Option value (optional)
     pub fn maybe_privileged(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -297,17 +295,17 @@ impl<'a, S: app_password_state::State> AppPasswordBuilder<'a, S> {
 impl<'a, S> AppPasswordBuilder<'a, S>
 where
     S: app_password_state::State,
-    S::Name: app_password_state::IsSet,
     S::Password: app_password_state::IsSet,
+    S::Name: app_password_state::IsSet,
     S::CreatedAt: app_password_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AppPassword<'a> {
         AppPassword {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            password: self.__unsafe_private_named.2.unwrap(),
-            privileged: self.__unsafe_private_named.3,
+            created_at: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            password: self._fields.2.unwrap(),
+            privileged: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -320,10 +318,10 @@ where
         >,
     ) -> AppPassword<'a> {
         AppPassword {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            password: self.__unsafe_private_named.2.unwrap(),
-            privileged: self.__unsafe_private_named.3,
+            created_at: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            password: self._fields.2.unwrap(),
+            privileged: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs b/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs
index 70338629..d28a5420 100644
--- a/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs
+++ b/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -93,9 +96,9 @@ pub mod create_invite_code_state {
 
 /// Builder for constructing an instance of this type
 pub struct CreateInviteCodeBuilder<'a, S: create_invite_code_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CreateInviteCode<'a> {
@@ -109,9 +112,9 @@ impl<'a> CreateInviteCodeBuilder<'a, create_invite_code_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreateInviteCodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,12 +122,12 @@ impl<'a> CreateInviteCodeBuilder<'a, create_invite_code_state::Empty> {
 impl<'a, S: create_invite_code_state::State> CreateInviteCodeBuilder<'a, S> {
     /// Set the `forAccount` field (optional)
     pub fn for_account(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `forAccount` field to an Option value (optional)
     pub fn maybe_for_account(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -139,11 +142,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CreateInviteCodeBuilder<'a, create_invite_code_state::SetUseCount<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CreateInviteCodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -156,8 +159,8 @@ where
     /// Build the final struct
     pub fn build(self) -> CreateInviteCode<'a> {
         CreateInviteCode {
-            for_account: self.__unsafe_private_named.0,
-            use_count: self.__unsafe_private_named.1.unwrap(),
+            for_account: self._fields.0,
+            use_count: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -170,8 +173,8 @@ where
         >,
     ) -> CreateInviteCode<'a> {
         CreateInviteCode {
-            for_account: self.__unsafe_private_named.0,
-            use_count: self.__unsafe_private_named.1.unwrap(),
+            for_account: self._fields.0,
+            use_count: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs b/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs
index 5dab3a14..8bcf9292 100644
--- a/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs
+++ b/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -107,45 +110,45 @@ pub mod account_codes_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Codes;
         type Account;
+        type Codes;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Codes = Unset;
         type Account = Unset;
-    }
-    ///State transition - sets the `codes` field to Set
-    pub struct SetCodes<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCodes<S> {}
-    impl<S: State> State for SetCodes<S> {
-        type Codes = Set<members::codes>;
-        type Account = S::Account;
+        type Codes = Unset;
     }
     ///State transition - sets the `account` field to Set
     pub struct SetAccount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAccount<S> {}
     impl<S: State> State for SetAccount<S> {
-        type Codes = S::Codes;
         type Account = Set<members::account>;
+        type Codes = S::Codes;
+    }
+    ///State transition - sets the `codes` field to Set
+    pub struct SetCodes<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCodes<S> {}
+    impl<S: State> State for SetCodes<S> {
+        type Account = S::Account;
+        type Codes = Set<members::codes>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `codes` field
-        pub struct codes(());
         ///Marker type for the `account` field
         pub struct account(());
+        ///Marker type for the `codes` field
+        pub struct codes(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AccountCodesBuilder<'a, S: account_codes_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Vec<CowStr<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Vec<CowStr<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AccountCodes<'a> {
@@ -159,9 +162,9 @@ impl<'a> AccountCodesBuilder<'a, account_codes_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AccountCodesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -176,11 +179,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AccountCodesBuilder<'a, account_codes_state::SetAccount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AccountCodesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -195,11 +198,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> AccountCodesBuilder<'a, account_codes_state::SetCodes<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AccountCodesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -207,14 +210,14 @@ where
 impl<'a, S> AccountCodesBuilder<'a, S>
 where
     S: account_codes_state::State,
-    S::Codes: account_codes_state::IsSet,
     S::Account: account_codes_state::IsSet,
+    S::Codes: account_codes_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AccountCodes<'a> {
         AccountCodes {
-            account: self.__unsafe_private_named.0.unwrap(),
-            codes: self.__unsafe_private_named.1.unwrap(),
+            account: self._fields.0.unwrap(),
+            codes: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -227,8 +230,8 @@ where
         >,
     ) -> AccountCodes<'a> {
         AccountCodes {
-            account: self.__unsafe_private_named.0.unwrap(),
-            codes: self.__unsafe_private_named.1.unwrap(),
+            account: self._fields.0.unwrap(),
+            codes: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -377,9 +380,9 @@ pub mod create_invite_codes_state {
 
 /// Builder for constructing an instance of this type
 pub struct CreateInviteCodesBuilder<'a, S: create_invite_codes_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Vec<Did<'a>>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Vec<Did<'a>>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CreateInviteCodes<'a> {
@@ -393,9 +396,9 @@ impl<'a> CreateInviteCodesBuilder<'a, create_invite_codes_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreateInviteCodesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -410,11 +413,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CreateInviteCodesBuilder<'a, create_invite_codes_state::SetCodeCount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CreateInviteCodesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -422,12 +425,12 @@ where
 impl<'a, S: create_invite_codes_state::State> CreateInviteCodesBuilder<'a, S> {
     /// Set the `forAccounts` field (optional)
     pub fn for_accounts(mut self, value: impl Into<Option<Vec<Did<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `forAccounts` field to an Option value (optional)
     pub fn maybe_for_accounts(mut self, value: Option<Vec<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -442,11 +445,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CreateInviteCodesBuilder<'a, create_invite_codes_state::SetUseCount<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CreateInviteCodesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -460,9 +463,9 @@ where
     /// Build the final struct
     pub fn build(self) -> CreateInviteCodes<'a> {
         CreateInviteCodes {
-            code_count: self.__unsafe_private_named.0.unwrap(),
-            for_accounts: self.__unsafe_private_named.1,
-            use_count: self.__unsafe_private_named.2.unwrap(),
+            code_count: self._fields.0.unwrap(),
+            for_accounts: self._fields.1,
+            use_count: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -475,9 +478,9 @@ where
         >,
     ) -> CreateInviteCodes<'a> {
         CreateInviteCodes {
-            code_count: self.__unsafe_private_named.0.unwrap(),
-            for_accounts: self.__unsafe_private_named.1,
-            use_count: self.__unsafe_private_named.2.unwrap(),
+            code_count: self._fields.0.unwrap(),
+            for_accounts: self._fields.1,
+            use_count: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/server/create_session.rs b/crates/jacquard-api/src/com_atproto/server/create_session.rs
index 0c5c0841..8e5cb528 100644
--- a/crates/jacquard-api/src/com_atproto/server/create_session.rs
+++ b/crates/jacquard-api/src/com_atproto/server/create_session.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Handle};
diff --git a/crates/jacquard-api/src/com_atproto/server/deactivate_account.rs b/crates/jacquard-api/src/com_atproto/server/deactivate_account.rs
index ae0e5471..98d99a53 100644
--- a/crates/jacquard-api/src/com_atproto/server/deactivate_account.rs
+++ b/crates/jacquard-api/src/com_atproto/server/deactivate_account.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Datetime;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/com_atproto/server/delete_account.rs b/crates/jacquard-api/src/com_atproto/server/delete_account.rs
index 8381b4a8..fa248efc 100644
--- a/crates/jacquard-api/src/com_atproto/server/delete_account.rs
+++ b/crates/jacquard-api/src/com_atproto/server/delete_account.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -107,59 +110,59 @@ pub mod delete_account_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Password;
         type Token;
         type Did;
-        type Password;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Password = Unset;
         type Token = Unset;
         type Did = Unset;
-        type Password = Unset;
+    }
+    ///State transition - sets the `password` field to Set
+    pub struct SetPassword<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPassword<S> {}
+    impl<S: State> State for SetPassword<S> {
+        type Password = Set<members::password>;
+        type Token = S::Token;
+        type Did = S::Did;
     }
     ///State transition - sets the `token` field to Set
     pub struct SetToken<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetToken<S> {}
     impl<S: State> State for SetToken<S> {
+        type Password = S::Password;
         type Token = Set<members::token>;
         type Did = S::Did;
-        type Password = S::Password;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type Token = S::Token;
-        type Did = Set<members::did>;
         type Password = S::Password;
-    }
-    ///State transition - sets the `password` field to Set
-    pub struct SetPassword<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPassword<S> {}
-    impl<S: State> State for SetPassword<S> {
         type Token = S::Token;
-        type Did = S::Did;
-        type Password = Set<members::password>;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `password` field
+        pub struct password(());
         ///Marker type for the `token` field
         pub struct token(());
         ///Marker type for the `did` field
         pub struct did(());
-        ///Marker type for the `password` field
-        pub struct password(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DeleteAccountBuilder<'a, S: delete_account_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeleteAccount<'a> {
@@ -173,9 +176,9 @@ impl<'a> DeleteAccountBuilder<'a, delete_account_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteAccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -190,11 +193,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> DeleteAccountBuilder<'a, delete_account_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeleteAccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,11 +212,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DeleteAccountBuilder<'a, delete_account_state::SetPassword<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DeleteAccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -228,11 +231,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DeleteAccountBuilder<'a, delete_account_state::SetToken<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         DeleteAccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -240,16 +243,16 @@ where
 impl<'a, S> DeleteAccountBuilder<'a, S>
 where
     S: delete_account_state::State,
+    S::Password: delete_account_state::IsSet,
     S::Token: delete_account_state::IsSet,
     S::Did: delete_account_state::IsSet,
-    S::Password: delete_account_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DeleteAccount<'a> {
         DeleteAccount {
-            did: self.__unsafe_private_named.0.unwrap(),
-            password: self.__unsafe_private_named.1.unwrap(),
-            token: self.__unsafe_private_named.2.unwrap(),
+            did: self._fields.0.unwrap(),
+            password: self._fields.1.unwrap(),
+            token: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -262,9 +265,9 @@ where
         >,
     ) -> DeleteAccount<'a> {
         DeleteAccount {
-            did: self.__unsafe_private_named.0.unwrap(),
-            password: self.__unsafe_private_named.1.unwrap(),
-            token: self.__unsafe_private_named.2.unwrap(),
+            did: self._fields.0.unwrap(),
+            password: self._fields.1.unwrap(),
+            token: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/server/delete_session.rs b/crates/jacquard-api/src/com_atproto/server/delete_session.rs
index 8a7c188f..d648b911 100644
--- a/crates/jacquard-api/src/com_atproto/server/delete_session.rs
+++ b/crates/jacquard-api/src/com_atproto/server/delete_session.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, open_union};
diff --git a/crates/jacquard-api/src/com_atproto/server/describe_server.rs b/crates/jacquard-api/src/com_atproto/server/describe_server.rs
index 43a74a7e..a2f95334 100644
--- a/crates/jacquard-api/src/com_atproto/server/describe_server.rs
+++ b/crates/jacquard-api/src/com_atproto/server/describe_server.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
diff --git a/crates/jacquard-api/src/com_atproto/server/get_account_invite_codes.rs b/crates/jacquard-api/src/com_atproto/server/get_account_invite_codes.rs
index 55daf1af..940a0f6e 100644
--- a/crates/jacquard-api/src/com_atproto/server/get_account_invite_codes.rs
+++ b/crates/jacquard-api/src/com_atproto/server/get_account_invite_codes.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -123,8 +126,8 @@ pub mod get_account_invite_codes_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetAccountInviteCodesBuilder<S: get_account_invite_codes_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<bool>),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<bool>),
 }
 
 impl GetAccountInviteCodes {
@@ -138,8 +141,8 @@ impl GetAccountInviteCodesBuilder<get_account_invite_codes_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetAccountInviteCodesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
+            _state: PhantomData,
+            _fields: (None, None),
         }
     }
 }
@@ -147,12 +150,12 @@ impl GetAccountInviteCodesBuilder<get_account_invite_codes_state::Empty> {
 impl<S: get_account_invite_codes_state::State> GetAccountInviteCodesBuilder<S> {
     /// Set the `createAvailable` field (optional)
     pub fn create_available(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createAvailable` field to an Option value (optional)
     pub fn maybe_create_available(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -160,12 +163,12 @@ impl<S: get_account_invite_codes_state::State> GetAccountInviteCodesBuilder<S> {
 impl<S: get_account_invite_codes_state::State> GetAccountInviteCodesBuilder<S> {
     /// Set the `includeUsed` field (optional)
     pub fn include_used(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `includeUsed` field to an Option value (optional)
     pub fn maybe_include_used(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -177,8 +180,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetAccountInviteCodes {
         GetAccountInviteCodes {
-            create_available: self.__unsafe_private_named.0,
-            include_used: self.__unsafe_private_named.1,
+            create_available: self._fields.0,
+            include_used: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/get_service_auth.rs b/crates/jacquard-api/src/com_atproto/server/get_service_auth.rs
index 7be9270e..09d060aa 100644
--- a/crates/jacquard-api/src/com_atproto/server/get_service_auth.rs
+++ b/crates/jacquard-api/src/com_atproto/server/get_service_auth.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Nsid};
@@ -128,9 +131,9 @@ pub mod get_service_auth_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetServiceAuthBuilder<'a, S: get_service_auth_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<i64>, Option<Nsid<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<i64>, Option<Nsid<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetServiceAuth<'a> {
@@ -144,9 +147,9 @@ impl<'a> GetServiceAuthBuilder<'a, get_service_auth_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetServiceAuthBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -161,11 +164,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetServiceAuthBuilder<'a, get_service_auth_state::SetAud<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetServiceAuthBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -173,12 +176,12 @@ where
 impl<'a, S: get_service_auth_state::State> GetServiceAuthBuilder<'a, S> {
     /// Set the `exp` field (optional)
     pub fn exp(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `exp` field to an Option value (optional)
     pub fn maybe_exp(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -186,12 +189,12 @@ impl<'a, S: get_service_auth_state::State> GetServiceAuthBuilder<'a, S> {
 impl<'a, S: get_service_auth_state::State> GetServiceAuthBuilder<'a, S> {
     /// Set the `lxm` field (optional)
     pub fn lxm(mut self, value: impl Into<Option<Nsid<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `lxm` field to an Option value (optional)
     pub fn maybe_lxm(mut self, value: Option<Nsid<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -204,9 +207,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetServiceAuth<'a> {
         GetServiceAuth {
-            aud: self.__unsafe_private_named.0.unwrap(),
-            exp: self.__unsafe_private_named.1,
-            lxm: self.__unsafe_private_named.2,
+            aud: self._fields.0.unwrap(),
+            exp: self._fields.1,
+            lxm: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/get_session.rs b/crates/jacquard-api/src/com_atproto/server/get_session.rs
index 3c1c47cd..7d8ecd03 100644
--- a/crates/jacquard-api/src/com_atproto/server/get_session.rs
+++ b/crates/jacquard-api/src/com_atproto/server/get_session.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Handle};
diff --git a/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs b/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs
index 7800802c..d69f6b52 100644
--- a/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs
+++ b/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -166,9 +169,9 @@ pub mod app_password_state {
 
 /// Builder for constructing an instance of this type
 pub struct AppPasswordBuilder<'a, S: app_password_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<bool>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AppPassword<'a> {
@@ -182,9 +185,9 @@ impl<'a> AppPasswordBuilder<'a, app_password_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AppPasswordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -199,11 +202,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AppPasswordBuilder<'a, app_password_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AppPasswordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -218,11 +221,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AppPasswordBuilder<'a, app_password_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AppPasswordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -230,12 +233,12 @@ where
 impl<'a, S: app_password_state::State> AppPasswordBuilder<'a, S> {
     /// Set the `privileged` field (optional)
     pub fn privileged(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `privileged` field to an Option value (optional)
     pub fn maybe_privileged(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -249,9 +252,9 @@ where
     /// Build the final struct
     pub fn build(self) -> AppPassword<'a> {
         AppPassword {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            privileged: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            privileged: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -264,9 +267,9 @@ where
         >,
     ) -> AppPassword<'a> {
         AppPassword {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            privileged: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            privileged: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/server/refresh_session.rs b/crates/jacquard-api/src/com_atproto/server/refresh_session.rs
index 1b77e2a4..2f8badfb 100644
--- a/crates/jacquard-api/src/com_atproto/server/refresh_session.rs
+++ b/crates/jacquard-api/src/com_atproto/server/refresh_session.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Handle};
diff --git a/crates/jacquard-api/src/com_atproto/server/request_account_delete.rs b/crates/jacquard-api/src/com_atproto/server/request_account_delete.rs
index 508ca464..9e15de7f 100644
--- a/crates/jacquard-api/src/com_atproto/server/request_account_delete.rs
+++ b/crates/jacquard-api/src/com_atproto/server/request_account_delete.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::IntoStatic;
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/com_atproto/server/request_email_confirmation.rs b/crates/jacquard-api/src/com_atproto/server/request_email_confirmation.rs
index 36227f23..15683edb 100644
--- a/crates/jacquard-api/src/com_atproto/server/request_email_confirmation.rs
+++ b/crates/jacquard-api/src/com_atproto/server/request_email_confirmation.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::IntoStatic;
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/com_atproto/server/request_email_update.rs b/crates/jacquard-api/src/com_atproto/server/request_email_update.rs
index f58d4092..448c1e02 100644
--- a/crates/jacquard-api/src/com_atproto/server/request_email_update.rs
+++ b/crates/jacquard-api/src/com_atproto/server/request_email_update.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/com_atproto/server/request_password_reset.rs b/crates/jacquard-api/src/com_atproto/server/request_password_reset.rs
index d761b831..97051683 100644
--- a/crates/jacquard-api/src/com_atproto/server/request_password_reset.rs
+++ b/crates/jacquard-api/src/com_atproto/server/request_password_reset.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/com_atproto/server/reserve_signing_key.rs b/crates/jacquard-api/src/com_atproto/server/reserve_signing_key.rs
index 72942dfd..e1d0bcb3 100644
--- a/crates/jacquard-api/src/com_atproto/server/reserve_signing_key.rs
+++ b/crates/jacquard-api/src/com_atproto/server/reserve_signing_key.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
diff --git a/crates/jacquard-api/src/com_atproto/server/reset_password.rs b/crates/jacquard-api/src/com_atproto/server/reset_password.rs
index 8c37c17b..9f0b5c89 100644
--- a/crates/jacquard-api/src/com_atproto/server/reset_password.rs
+++ b/crates/jacquard-api/src/com_atproto/server/reset_password.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/com_atproto/server/revoke_app_password.rs b/crates/jacquard-api/src/com_atproto/server/revoke_app_password.rs
index ddb814e0..1595d6f5 100644
--- a/crates/jacquard-api/src/com_atproto/server/revoke_app_password.rs
+++ b/crates/jacquard-api/src/com_atproto/server/revoke_app_password.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/com_atproto/server/update_email.rs b/crates/jacquard-api/src/com_atproto/server/update_email.rs
index 7c03abbb..2d6d2b95 100644
--- a/crates/jacquard-api/src/com_atproto/server/update_email.rs
+++ b/crates/jacquard-api/src/com_atproto/server/update_email.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_blob.rs b/crates/jacquard-api/src/com_atproto/sync/get_blob.rs
index 905bb79b..ff2b7300 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_blob.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_blob.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -185,9 +186,9 @@ pub mod get_blob_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetBlobBuilder<'a, S: get_blob_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetBlob<'a> {
@@ -201,9 +202,9 @@ impl<'a> GetBlobBuilder<'a, get_blob_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetBlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -218,11 +219,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> GetBlobBuilder<'a, get_blob_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetBlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -237,11 +238,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetBlobBuilder<'a, get_blob_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetBlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -255,8 +256,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetBlob<'a> {
         GetBlob {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_blocks.rs b/crates/jacquard-api/src/com_atproto/sync/get_blocks.rs
index f302f295..731b9655 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_blocks.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_blocks.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -149,45 +150,45 @@ pub mod get_blocks_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Cids;
         type Did;
+        type Cids;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Cids = Unset;
         type Did = Unset;
-    }
-    ///State transition - sets the `cids` field to Set
-    pub struct SetCids<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCids<S> {}
-    impl<S: State> State for SetCids<S> {
-        type Cids = Set<members::cids>;
-        type Did = S::Did;
+        type Cids = Unset;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type Cids = S::Cids;
         type Did = Set<members::did>;
+        type Cids = S::Cids;
+    }
+    ///State transition - sets the `cids` field to Set
+    pub struct SetCids<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCids<S> {}
+    impl<S: State> State for SetCids<S> {
+        type Did = S::Did;
+        type Cids = Set<members::cids>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `cids` field
-        pub struct cids(());
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `cids` field
+        pub struct cids(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GetBlocksBuilder<'a, S: get_blocks_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<Cid<'a>>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<Cid<'a>>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetBlocks<'a> {
@@ -201,9 +202,9 @@ impl<'a> GetBlocksBuilder<'a, get_blocks_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetBlocksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -218,11 +219,11 @@ where
         mut self,
         value: impl Into<Vec<Cid<'a>>>,
     ) -> GetBlocksBuilder<'a, get_blocks_state::SetCids<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetBlocksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -237,11 +238,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetBlocksBuilder<'a, get_blocks_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetBlocksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,14 +250,14 @@ where
 impl<'a, S> GetBlocksBuilder<'a, S>
 where
     S: get_blocks_state::State,
-    S::Cids: get_blocks_state::IsSet,
     S::Did: get_blocks_state::IsSet,
+    S::Cids: get_blocks_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GetBlocks<'a> {
         GetBlocks {
-            cids: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
+            cids: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_checkout.rs b/crates/jacquard-api/src/com_atproto/sync/get_checkout.rs
index b4a4e62f..26d569ff 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_checkout.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_checkout.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::deps::bytes::Bytes;
 use jacquard_common::types::string::Did;
@@ -98,9 +99,9 @@ pub mod get_checkout_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetCheckoutBuilder<'a, S: get_checkout_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetCheckout<'a> {
@@ -114,9 +115,9 @@ impl<'a> GetCheckoutBuilder<'a, get_checkout_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetCheckoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -131,11 +132,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetCheckoutBuilder<'a, get_checkout_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetCheckoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,7 +149,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetCheckout<'a> {
         GetCheckout {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_head.rs b/crates/jacquard-api/src/com_atproto/sync/get_head.rs
index 4ee3acfb..b64ea763 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_head.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_head.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Cid};
@@ -122,9 +125,9 @@ pub mod get_head_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetHeadBuilder<'a, S: get_head_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetHead<'a> {
@@ -138,9 +141,9 @@ impl<'a> GetHeadBuilder<'a, get_head_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetHeadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -155,11 +158,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetHeadBuilder<'a, get_head_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetHeadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -172,7 +175,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetHead<'a> {
         GetHead {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_host_status.rs b/crates/jacquard-api/src/com_atproto/sync/get_host_status.rs
index 72533790..fadc3103 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_host_status.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_host_status.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -131,9 +134,9 @@ pub mod get_host_status_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetHostStatusBuilder<'a, S: get_host_status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetHostStatus<'a> {
@@ -147,9 +150,9 @@ impl<'a> GetHostStatusBuilder<'a, get_host_status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetHostStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,11 +167,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetHostStatusBuilder<'a, get_host_status_state::SetHostname<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetHostStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,7 +184,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetHostStatus<'a> {
         GetHostStatus {
-            hostname: self.__unsafe_private_named.0.unwrap(),
+            hostname: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_latest_commit.rs b/crates/jacquard-api/src/com_atproto/sync/get_latest_commit.rs
index 20b1d578..abc86dcc 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_latest_commit.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_latest_commit.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Tid, Cid};
@@ -150,9 +153,9 @@ pub mod get_latest_commit_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetLatestCommitBuilder<'a, S: get_latest_commit_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetLatestCommit<'a> {
@@ -166,9 +169,9 @@ impl<'a> GetLatestCommitBuilder<'a, get_latest_commit_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetLatestCommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,11 +186,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetLatestCommitBuilder<'a, get_latest_commit_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetLatestCommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,7 +203,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetLatestCommit<'a> {
         GetLatestCommit {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_record.rs b/crates/jacquard-api/src/com_atproto/sync/get_record.rs
index 2c96d233..72911346 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_record.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_record.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -151,63 +152,59 @@ pub mod get_record_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Collection;
         type Did;
         type Rkey;
+        type Collection;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Collection = Unset;
         type Did = Unset;
         type Rkey = Unset;
-    }
-    ///State transition - sets the `collection` field to Set
-    pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCollection<S> {}
-    impl<S: State> State for SetCollection<S> {
-        type Collection = Set<members::collection>;
-        type Did = S::Did;
-        type Rkey = S::Rkey;
+        type Collection = Unset;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type Collection = S::Collection;
         type Did = Set<members::did>;
         type Rkey = S::Rkey;
+        type Collection = S::Collection;
     }
     ///State transition - sets the `rkey` field to Set
     pub struct SetRkey<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRkey<S> {}
     impl<S: State> State for SetRkey<S> {
-        type Collection = S::Collection;
         type Did = S::Did;
         type Rkey = Set<members::rkey>;
+        type Collection = S::Collection;
+    }
+    ///State transition - sets the `collection` field to Set
+    pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCollection<S> {}
+    impl<S: State> State for SetCollection<S> {
+        type Did = S::Did;
+        type Rkey = S::Rkey;
+        type Collection = Set<members::collection>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `collection` field
-        pub struct collection(());
         ///Marker type for the `did` field
         pub struct did(());
         ///Marker type for the `rkey` field
         pub struct rkey(());
+        ///Marker type for the `collection` field
+        pub struct collection(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GetRecordBuilder<'a, S: get_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Nsid<'a>>,
-        Option<Did<'a>>,
-        Option<RecordKey<Rkey<'a>>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Nsid<'a>>, Option<Did<'a>>, Option<RecordKey<Rkey<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetRecord<'a> {
@@ -221,9 +218,9 @@ impl<'a> GetRecordBuilder<'a, get_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -238,11 +235,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> GetRecordBuilder<'a, get_record_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -257,11 +254,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetRecordBuilder<'a, get_record_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -276,11 +273,11 @@ where
         mut self,
         value: impl Into<RecordKey<Rkey<'a>>>,
     ) -> GetRecordBuilder<'a, get_record_state::SetRkey<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -288,16 +285,16 @@ where
 impl<'a, S> GetRecordBuilder<'a, S>
 where
     S: get_record_state::State,
-    S::Collection: get_record_state::IsSet,
     S::Did: get_record_state::IsSet,
     S::Rkey: get_record_state::IsSet,
+    S::Collection: get_record_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GetRecord<'a> {
         GetRecord {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            rkey: self.__unsafe_private_named.2.unwrap(),
+            collection: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            rkey: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_repo.rs b/crates/jacquard-api/src/com_atproto/sync/get_repo.rs
index bb39529a..686e123e 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_repo.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_repo.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -164,9 +165,9 @@ pub mod get_repo_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetRepoBuilder<'a, S: get_repo_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Tid>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Tid>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetRepo<'a> {
@@ -180,9 +181,9 @@ impl<'a> GetRepoBuilder<'a, get_repo_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetRepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +198,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetRepoBuilder<'a, get_repo_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetRepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,12 +210,12 @@ where
 impl<'a, S: get_repo_state::State> GetRepoBuilder<'a, S> {
     /// Set the `since` field (optional)
     pub fn since(mut self, value: impl Into<Option<Tid>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `since` field to an Option value (optional)
     pub fn maybe_since(mut self, value: Option<Tid>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -227,8 +228,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetRepo<'a> {
         GetRepo {
-            did: self.__unsafe_private_named.0.unwrap(),
-            since: self.__unsafe_private_named.1,
+            did: self._fields.0.unwrap(),
+            since: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_repo_status.rs b/crates/jacquard-api/src/com_atproto/sync/get_repo_status.rs
index de3a46a7..e8eb2d82 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_repo_status.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_repo_status.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Tid};
@@ -246,9 +249,9 @@ pub mod get_repo_status_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetRepoStatusBuilder<'a, S: get_repo_status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetRepoStatus<'a> {
@@ -262,9 +265,9 @@ impl<'a> GetRepoStatusBuilder<'a, get_repo_status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetRepoStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -279,11 +282,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetRepoStatusBuilder<'a, get_repo_status_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetRepoStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -296,7 +299,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetRepoStatus<'a> {
         GetRepoStatus {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/list_blobs.rs b/crates/jacquard-api/src/com_atproto/sync/list_blobs.rs
index d3f17dac..de5751eb 100644
--- a/crates/jacquard-api/src/com_atproto/sync/list_blobs.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/list_blobs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Tid, Cid};
@@ -165,14 +168,9 @@ pub mod list_blobs_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListBlobsBuilder<'a, S: list_blobs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<Did<'a>>,
-        Option<i64>,
-        Option<Tid>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Did<'a>>, Option<i64>, Option<Tid>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListBlobs<'a> {
@@ -186,9 +184,9 @@ impl<'a> ListBlobsBuilder<'a, list_blobs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListBlobsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,12 +194,12 @@ impl<'a> ListBlobsBuilder<'a, list_blobs_state::Empty> {
 impl<'a, S: list_blobs_state::State> ListBlobsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -216,11 +214,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ListBlobsBuilder<'a, list_blobs_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListBlobsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -228,12 +226,12 @@ where
 impl<'a, S: list_blobs_state::State> ListBlobsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -241,12 +239,12 @@ impl<'a, S: list_blobs_state::State> ListBlobsBuilder<'a, S> {
 impl<'a, S: list_blobs_state::State> ListBlobsBuilder<'a, S> {
     /// Set the `since` field (optional)
     pub fn since(mut self, value: impl Into<Option<Tid>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `since` field to an Option value (optional)
     pub fn maybe_since(mut self, value: Option<Tid>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -259,10 +257,10 @@ where
     /// Build the final struct
     pub fn build(self) -> ListBlobs<'a> {
         ListBlobs {
-            cursor: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            limit: self.__unsafe_private_named.2,
-            since: self.__unsafe_private_named.3,
+            cursor: self._fields.0,
+            did: self._fields.1.unwrap(),
+            limit: self._fields.2,
+            since: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs b/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs
index 73ed8022..6f741a5d 100644
--- a/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -216,9 +219,9 @@ pub mod list_hosts_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListHostsBuilder<'a, S: list_hosts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListHosts<'a> {
@@ -232,9 +235,9 @@ impl<'a> ListHostsBuilder<'a, list_hosts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListHostsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -242,12 +245,12 @@ impl<'a> ListHostsBuilder<'a, list_hosts_state::Empty> {
 impl<'a, S: list_hosts_state::State> ListHostsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -255,12 +258,12 @@ impl<'a, S: list_hosts_state::State> ListHostsBuilder<'a, S> {
 impl<'a, S: list_hosts_state::State> ListHostsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -272,8 +275,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ListHosts<'a> {
         ListHosts {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/list_repos.rs b/crates/jacquard-api/src/com_atproto/sync/list_repos.rs
index 9f3d2651..a3ac7ff3 100644
--- a/crates/jacquard-api/src/com_atproto/sync/list_repos.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/list_repos.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -238,9 +241,9 @@ pub mod list_repos_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListReposBuilder<'a, S: list_repos_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListRepos<'a> {
@@ -254,9 +257,9 @@ impl<'a> ListReposBuilder<'a, list_repos_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListReposBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -264,12 +267,12 @@ impl<'a> ListReposBuilder<'a, list_repos_state::Empty> {
 impl<'a, S: list_repos_state::State> ListReposBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -277,12 +280,12 @@ impl<'a, S: list_repos_state::State> ListReposBuilder<'a, S> {
 impl<'a, S: list_repos_state::State> ListReposBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -294,8 +297,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ListRepos<'a> {
         ListRepos {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
@@ -310,65 +313,65 @@ pub mod repo_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Head;
         type Rev;
         type Did;
+        type Head;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Head = Unset;
         type Rev = Unset;
         type Did = Unset;
-    }
-    ///State transition - sets the `head` field to Set
-    pub struct SetHead<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHead<S> {}
-    impl<S: State> State for SetHead<S> {
-        type Head = Set<members::head>;
-        type Rev = S::Rev;
-        type Did = S::Did;
+        type Head = Unset;
     }
     ///State transition - sets the `rev` field to Set
     pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRev<S> {}
     impl<S: State> State for SetRev<S> {
-        type Head = S::Head;
         type Rev = Set<members::rev>;
         type Did = S::Did;
+        type Head = S::Head;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type Head = S::Head;
         type Rev = S::Rev;
         type Did = Set<members::did>;
+        type Head = S::Head;
+    }
+    ///State transition - sets the `head` field to Set
+    pub struct SetHead<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHead<S> {}
+    impl<S: State> State for SetHead<S> {
+        type Rev = S::Rev;
+        type Did = S::Did;
+        type Head = Set<members::head>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `head` field
-        pub struct head(());
         ///Marker type for the `rev` field
         pub struct rev(());
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `head` field
+        pub struct head(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RepoBuilder<'a, S: repo_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<Did<'a>>,
         Option<Cid<'a>>,
         Option<Tid>,
         Option<RepoStatus<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Repo<'a> {
@@ -382,9 +385,9 @@ impl<'a> RepoBuilder<'a, repo_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -392,12 +395,12 @@ impl<'a> RepoBuilder<'a, repo_state::Empty> {
 impl<'a, S: repo_state::State> RepoBuilder<'a, S> {
     /// Set the `active` field (optional)
     pub fn active(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `active` field to an Option value (optional)
     pub fn maybe_active(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -412,11 +415,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> RepoBuilder<'a, repo_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -431,11 +434,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> RepoBuilder<'a, repo_state::SetHead<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -450,11 +453,11 @@ where
         mut self,
         value: impl Into<Tid>,
     ) -> RepoBuilder<'a, repo_state::SetRev<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -462,12 +465,12 @@ where
 impl<'a, S: repo_state::State> RepoBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<RepoStatus<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<RepoStatus<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -475,18 +478,18 @@ impl<'a, S: repo_state::State> RepoBuilder<'a, S> {
 impl<'a, S> RepoBuilder<'a, S>
 where
     S: repo_state::State,
-    S::Head: repo_state::IsSet,
     S::Rev: repo_state::IsSet,
     S::Did: repo_state::IsSet,
+    S::Head: repo_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Repo<'a> {
         Repo {
-            active: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            head: self.__unsafe_private_named.2.unwrap(),
-            rev: self.__unsafe_private_named.3.unwrap(),
-            status: self.__unsafe_private_named.4,
+            active: self._fields.0,
+            did: self._fields.1.unwrap(),
+            head: self._fields.2.unwrap(),
+            rev: self._fields.3.unwrap(),
+            status: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -499,11 +502,11 @@ where
         >,
     ) -> Repo<'a> {
         Repo {
-            active: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            head: self.__unsafe_private_named.2.unwrap(),
-            rev: self.__unsafe_private_named.3.unwrap(),
-            status: self.__unsafe_private_named.4,
+            active: self._fields.0,
+            did: self._fields.1.unwrap(),
+            head: self._fields.2.unwrap(),
+            rev: self._fields.3.unwrap(),
+            status: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/sync/list_repos_by_collection.rs b/crates/jacquard-api/src/com_atproto/sync/list_repos_by_collection.rs
index c4899b3a..4568f54e 100644
--- a/crates/jacquard-api/src/com_atproto/sync/list_repos_by_collection.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/list_repos_by_collection.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -133,9 +136,9 @@ pub mod list_repos_by_collection_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListReposByCollectionBuilder<'a, S: list_repos_by_collection_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Nsid<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Nsid<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListReposByCollection<'a> {
@@ -152,9 +155,9 @@ impl<'a> ListReposByCollectionBuilder<'a, list_repos_by_collection_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListReposByCollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -172,11 +175,11 @@ where
         'a,
         list_repos_by_collection_state::SetCollection<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListReposByCollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -184,12 +187,12 @@ where
 impl<'a, S: list_repos_by_collection_state::State> ListReposByCollectionBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -197,12 +200,12 @@ impl<'a, S: list_repos_by_collection_state::State> ListReposByCollectionBuilder<
 impl<'a, S: list_repos_by_collection_state::State> ListReposByCollectionBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -215,9 +218,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ListReposByCollection<'a> {
         ListReposByCollection {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            collection: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
@@ -256,9 +259,9 @@ pub mod repo_state {
 
 /// Builder for constructing an instance of this type
 pub struct RepoBuilder<'a, S: repo_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Repo<'a> {
@@ -272,9 +275,9 @@ impl<'a> RepoBuilder<'a, repo_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -289,11 +292,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> RepoBuilder<'a, repo_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -306,7 +309,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Repo<'a> {
         Repo {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -319,7 +322,7 @@ where
         >,
     ) -> Repo<'a> {
         Repo {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/sync/notify_of_update.rs b/crates/jacquard-api/src/com_atproto/sync/notify_of_update.rs
index dd775e0f..7ab80b89 100644
--- a/crates/jacquard-api/src/com_atproto/sync/notify_of_update.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/notify_of_update.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/com_atproto/sync/request_crawl.rs b/crates/jacquard-api/src/com_atproto/sync/request_crawl.rs
index fbd68430..2a77ad29 100644
--- a/crates/jacquard-api/src/com_atproto/sync/request_crawl.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/request_crawl.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs b/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs
index 29cb424a..e0910125 100644
--- a/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -695,81 +698,81 @@ pub mod account_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Active;
-        type Did;
         type Time;
+        type Active;
         type Seq;
+        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Active = Unset;
-        type Did = Unset;
         type Time = Unset;
+        type Active = Unset;
         type Seq = Unset;
-    }
-    ///State transition - sets the `active` field to Set
-    pub struct SetActive<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetActive<S> {}
-    impl<S: State> State for SetActive<S> {
-        type Active = Set<members::active>;
-        type Did = S::Did;
-        type Time = S::Time;
-        type Seq = S::Seq;
-    }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Active = S::Active;
-        type Did = Set<members::did>;
-        type Time = S::Time;
-        type Seq = S::Seq;
+        type Did = Unset;
     }
     ///State transition - sets the `time` field to Set
     pub struct SetTime<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTime<S> {}
     impl<S: State> State for SetTime<S> {
+        type Time = Set<members::time>;
         type Active = S::Active;
+        type Seq = S::Seq;
         type Did = S::Did;
-        type Time = Set<members::time>;
+    }
+    ///State transition - sets the `active` field to Set
+    pub struct SetActive<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetActive<S> {}
+    impl<S: State> State for SetActive<S> {
+        type Time = S::Time;
+        type Active = Set<members::active>;
         type Seq = S::Seq;
+        type Did = S::Did;
     }
     ///State transition - sets the `seq` field to Set
     pub struct SetSeq<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSeq<S> {}
     impl<S: State> State for SetSeq<S> {
+        type Time = S::Time;
         type Active = S::Active;
+        type Seq = Set<members::seq>;
         type Did = S::Did;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
         type Time = S::Time;
-        type Seq = Set<members::seq>;
+        type Active = S::Active;
+        type Seq = S::Seq;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `active` field
-        pub struct active(());
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `time` field
         pub struct time(());
+        ///Marker type for the `active` field
+        pub struct active(());
         ///Marker type for the `seq` field
         pub struct seq(());
+        ///Marker type for the `did` field
+        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AccountBuilder<'a, S: account_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<Did<'a>>,
         Option<i64>,
         Option<AccountStatus<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Account<'a> {
@@ -783,9 +786,9 @@ impl<'a> AccountBuilder<'a, account_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -800,11 +803,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> AccountBuilder<'a, account_state::SetActive<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -819,11 +822,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> AccountBuilder<'a, account_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -838,11 +841,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AccountBuilder<'a, account_state::SetSeq<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -850,12 +853,12 @@ where
 impl<'a, S: account_state::State> AccountBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<AccountStatus<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<AccountStatus<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -870,11 +873,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AccountBuilder<'a, account_state::SetTime<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         AccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -882,19 +885,19 @@ where
 impl<'a, S> AccountBuilder<'a, S>
 where
     S: account_state::State,
-    S::Active: account_state::IsSet,
-    S::Did: account_state::IsSet,
     S::Time: account_state::IsSet,
+    S::Active: account_state::IsSet,
     S::Seq: account_state::IsSet,
+    S::Did: account_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Account<'a> {
         Account {
-            active: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            seq: self.__unsafe_private_named.2.unwrap(),
-            status: self.__unsafe_private_named.3,
-            time: self.__unsafe_private_named.4.unwrap(),
+            active: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            seq: self._fields.2.unwrap(),
+            status: self._fields.3,
+            time: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -907,11 +910,11 @@ where
         >,
     ) -> Account<'a> {
         Account {
-            active: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            seq: self.__unsafe_private_named.2.unwrap(),
-            status: self.__unsafe_private_named.3,
-            time: self.__unsafe_private_named.4.unwrap(),
+            active: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            seq: self._fields.2.unwrap(),
+            status: self._fields.3,
+            time: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1342,203 +1345,203 @@ pub mod commit_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Rebase;
-        type Blobs;
-        type Time;
+        type Seq;
+        type Ops;
+        type TooBig;
         type Rev;
         type Repo;
+        type Time;
+        type Rebase;
+        type Blobs;
         type Commit;
-        type Ops;
-        type TooBig;
-        type Seq;
         type Blocks;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Rebase = Unset;
-        type Blobs = Unset;
-        type Time = Unset;
+        type Seq = Unset;
+        type Ops = Unset;
+        type TooBig = Unset;
         type Rev = Unset;
         type Repo = Unset;
+        type Time = Unset;
+        type Rebase = Unset;
+        type Blobs = Unset;
         type Commit = Unset;
-        type Ops = Unset;
-        type TooBig = Unset;
-        type Seq = Unset;
         type Blocks = Unset;
     }
-    ///State transition - sets the `rebase` field to Set
-    pub struct SetRebase<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRebase<S> {}
-    impl<S: State> State for SetRebase<S> {
-        type Rebase = Set<members::rebase>;
-        type Blobs = S::Blobs;
-        type Time = S::Time;
+    ///State transition - sets the `seq` field to Set
+    pub struct SetSeq<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSeq<S> {}
+    impl<S: State> State for SetSeq<S> {
+        type Seq = Set<members::seq>;
+        type Ops = S::Ops;
+        type TooBig = S::TooBig;
         type Rev = S::Rev;
         type Repo = S::Repo;
+        type Time = S::Time;
+        type Rebase = S::Rebase;
+        type Blobs = S::Blobs;
         type Commit = S::Commit;
-        type Ops = S::Ops;
-        type TooBig = S::TooBig;
-        type Seq = S::Seq;
         type Blocks = S::Blocks;
     }
-    ///State transition - sets the `blobs` field to Set
-    pub struct SetBlobs<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBlobs<S> {}
-    impl<S: State> State for SetBlobs<S> {
-        type Rebase = S::Rebase;
-        type Blobs = Set<members::blobs>;
-        type Time = S::Time;
+    ///State transition - sets the `ops` field to Set
+    pub struct SetOps<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetOps<S> {}
+    impl<S: State> State for SetOps<S> {
+        type Seq = S::Seq;
+        type Ops = Set<members::ops>;
+        type TooBig = S::TooBig;
         type Rev = S::Rev;
         type Repo = S::Repo;
+        type Time = S::Time;
+        type Rebase = S::Rebase;
+        type Blobs = S::Blobs;
         type Commit = S::Commit;
-        type Ops = S::Ops;
-        type TooBig = S::TooBig;
-        type Seq = S::Seq;
         type Blocks = S::Blocks;
     }
-    ///State transition - sets the `time` field to Set
-    pub struct SetTime<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTime<S> {}
-    impl<S: State> State for SetTime<S> {
-        type Rebase = S::Rebase;
-        type Blobs = S::Blobs;
-        type Time = Set<members::time>;
+    ///State transition - sets the `too_big` field to Set
+    pub struct SetTooBig<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTooBig<S> {}
+    impl<S: State> State for SetTooBig<S> {
+        type Seq = S::Seq;
+        type Ops = S::Ops;
+        type TooBig = Set<members::too_big>;
         type Rev = S::Rev;
         type Repo = S::Repo;
+        type Time = S::Time;
+        type Rebase = S::Rebase;
+        type Blobs = S::Blobs;
         type Commit = S::Commit;
-        type Ops = S::Ops;
-        type TooBig = S::TooBig;
-        type Seq = S::Seq;
         type Blocks = S::Blocks;
     }
     ///State transition - sets the `rev` field to Set
     pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRev<S> {}
     impl<S: State> State for SetRev<S> {
-        type Rebase = S::Rebase;
-        type Blobs = S::Blobs;
-        type Time = S::Time;
+        type Seq = S::Seq;
+        type Ops = S::Ops;
+        type TooBig = S::TooBig;
         type Rev = Set<members::rev>;
         type Repo = S::Repo;
+        type Time = S::Time;
+        type Rebase = S::Rebase;
+        type Blobs = S::Blobs;
         type Commit = S::Commit;
-        type Ops = S::Ops;
-        type TooBig = S::TooBig;
-        type Seq = S::Seq;
         type Blocks = S::Blocks;
     }
     ///State transition - sets the `repo` field to Set
     pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepo<S> {}
     impl<S: State> State for SetRepo<S> {
-        type Rebase = S::Rebase;
-        type Blobs = S::Blobs;
-        type Time = S::Time;
+        type Seq = S::Seq;
+        type Ops = S::Ops;
+        type TooBig = S::TooBig;
         type Rev = S::Rev;
         type Repo = Set<members::repo>;
+        type Time = S::Time;
+        type Rebase = S::Rebase;
+        type Blobs = S::Blobs;
         type Commit = S::Commit;
-        type Ops = S::Ops;
-        type TooBig = S::TooBig;
-        type Seq = S::Seq;
         type Blocks = S::Blocks;
     }
-    ///State transition - sets the `commit` field to Set
-    pub struct SetCommit<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCommit<S> {}
-    impl<S: State> State for SetCommit<S> {
-        type Rebase = S::Rebase;
-        type Blobs = S::Blobs;
-        type Time = S::Time;
-        type Rev = S::Rev;
-        type Repo = S::Repo;
-        type Commit = Set<members::commit>;
+    ///State transition - sets the `time` field to Set
+    pub struct SetTime<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTime<S> {}
+    impl<S: State> State for SetTime<S> {
+        type Seq = S::Seq;
         type Ops = S::Ops;
         type TooBig = S::TooBig;
-        type Seq = S::Seq;
-        type Blocks = S::Blocks;
-    }
-    ///State transition - sets the `ops` field to Set
-    pub struct SetOps<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetOps<S> {}
-    impl<S: State> State for SetOps<S> {
-        type Rebase = S::Rebase;
-        type Blobs = S::Blobs;
-        type Time = S::Time;
         type Rev = S::Rev;
         type Repo = S::Repo;
+        type Time = Set<members::time>;
+        type Rebase = S::Rebase;
+        type Blobs = S::Blobs;
         type Commit = S::Commit;
-        type Ops = Set<members::ops>;
-        type TooBig = S::TooBig;
-        type Seq = S::Seq;
         type Blocks = S::Blocks;
     }
-    ///State transition - sets the `too_big` field to Set
-    pub struct SetTooBig<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTooBig<S> {}
-    impl<S: State> State for SetTooBig<S> {
-        type Rebase = S::Rebase;
-        type Blobs = S::Blobs;
-        type Time = S::Time;
+    ///State transition - sets the `rebase` field to Set
+    pub struct SetRebase<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRebase<S> {}
+    impl<S: State> State for SetRebase<S> {
+        type Seq = S::Seq;
+        type Ops = S::Ops;
+        type TooBig = S::TooBig;
         type Rev = S::Rev;
         type Repo = S::Repo;
+        type Time = S::Time;
+        type Rebase = Set<members::rebase>;
+        type Blobs = S::Blobs;
         type Commit = S::Commit;
-        type Ops = S::Ops;
-        type TooBig = Set<members::too_big>;
-        type Seq = S::Seq;
         type Blocks = S::Blocks;
     }
-    ///State transition - sets the `seq` field to Set
-    pub struct SetSeq<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSeq<S> {}
-    impl<S: State> State for SetSeq<S> {
-        type Rebase = S::Rebase;
-        type Blobs = S::Blobs;
-        type Time = S::Time;
+    ///State transition - sets the `blobs` field to Set
+    pub struct SetBlobs<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBlobs<S> {}
+    impl<S: State> State for SetBlobs<S> {
+        type Seq = S::Seq;
+        type Ops = S::Ops;
+        type TooBig = S::TooBig;
         type Rev = S::Rev;
         type Repo = S::Repo;
+        type Time = S::Time;
+        type Rebase = S::Rebase;
+        type Blobs = Set<members::blobs>;
         type Commit = S::Commit;
+        type Blocks = S::Blocks;
+    }
+    ///State transition - sets the `commit` field to Set
+    pub struct SetCommit<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCommit<S> {}
+    impl<S: State> State for SetCommit<S> {
+        type Seq = S::Seq;
         type Ops = S::Ops;
         type TooBig = S::TooBig;
-        type Seq = Set<members::seq>;
+        type Rev = S::Rev;
+        type Repo = S::Repo;
+        type Time = S::Time;
+        type Rebase = S::Rebase;
+        type Blobs = S::Blobs;
+        type Commit = Set<members::commit>;
         type Blocks = S::Blocks;
     }
     ///State transition - sets the `blocks` field to Set
     pub struct SetBlocks<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBlocks<S> {}
     impl<S: State> State for SetBlocks<S> {
-        type Rebase = S::Rebase;
-        type Blobs = S::Blobs;
-        type Time = S::Time;
+        type Seq = S::Seq;
+        type Ops = S::Ops;
+        type TooBig = S::TooBig;
         type Rev = S::Rev;
         type Repo = S::Repo;
+        type Time = S::Time;
+        type Rebase = S::Rebase;
+        type Blobs = S::Blobs;
         type Commit = S::Commit;
-        type Ops = S::Ops;
-        type TooBig = S::TooBig;
-        type Seq = S::Seq;
         type Blocks = Set<members::blocks>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `rebase` field
-        pub struct rebase(());
-        ///Marker type for the `blobs` field
-        pub struct blobs(());
-        ///Marker type for the `time` field
-        pub struct time(());
+        ///Marker type for the `seq` field
+        pub struct seq(());
+        ///Marker type for the `ops` field
+        pub struct ops(());
+        ///Marker type for the `too_big` field
+        pub struct too_big(());
         ///Marker type for the `rev` field
         pub struct rev(());
         ///Marker type for the `repo` field
         pub struct repo(());
+        ///Marker type for the `time` field
+        pub struct time(());
+        ///Marker type for the `rebase` field
+        pub struct rebase(());
+        ///Marker type for the `blobs` field
+        pub struct blobs(());
         ///Marker type for the `commit` field
         pub struct commit(());
-        ///Marker type for the `ops` field
-        pub struct ops(());
-        ///Marker type for the `too_big` field
-        pub struct too_big(());
-        ///Marker type for the `seq` field
-        pub struct seq(());
         ///Marker type for the `blocks` field
         pub struct blocks(());
     }
@@ -1546,8 +1549,8 @@ pub mod commit_state {
 
 /// Builder for constructing an instance of this type
 pub struct CommitBuilder<'a, S: commit_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<CidLink<'a>>>,
         Option<Bytes>,
         Option<CidLink<'a>>,
@@ -1561,7 +1564,7 @@ pub struct CommitBuilder<'a, S: commit_state::State> {
         Option<Datetime>,
         Option<bool>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Commit<'a> {
@@ -1575,8 +1578,8 @@ impl<'a> CommitBuilder<'a, commit_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -1590,7 +1593,7 @@ impl<'a> CommitBuilder<'a, commit_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1605,11 +1608,11 @@ where
         mut self,
         value: impl Into<Vec<CidLink<'a>>>,
     ) -> CommitBuilder<'a, commit_state::SetBlobs<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1624,11 +1627,11 @@ where
         mut self,
         value: impl Into<Bytes>,
     ) -> CommitBuilder<'a, commit_state::SetBlocks<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1643,11 +1646,11 @@ where
         mut self,
         value: impl Into<CidLink<'a>>,
     ) -> CommitBuilder<'a, commit_state::SetCommit<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1662,11 +1665,11 @@ where
         mut self,
         value: impl Into<Vec<subscribe_repos::RepoOp<'a>>>,
     ) -> CommitBuilder<'a, commit_state::SetOps<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1674,12 +1677,12 @@ where
 impl<'a, S: commit_state::State> CommitBuilder<'a, S> {
     /// Set the `prevData` field (optional)
     pub fn prev_data(mut self, value: impl Into<Option<CidLink<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `prevData` field to an Option value (optional)
     pub fn maybe_prev_data(mut self, value: Option<CidLink<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1694,11 +1697,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> CommitBuilder<'a, commit_state::SetRebase<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1713,11 +1716,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> CommitBuilder<'a, commit_state::SetRepo<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1732,11 +1735,11 @@ where
         mut self,
         value: impl Into<Tid>,
     ) -> CommitBuilder<'a, commit_state::SetRev<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1751,11 +1754,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CommitBuilder<'a, commit_state::SetSeq<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1763,12 +1766,12 @@ where
 impl<'a, S: commit_state::State> CommitBuilder<'a, S> {
     /// Set the `since` field (optional)
     pub fn since(mut self, value: impl Into<Option<Tid>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `since` field to an Option value (optional)
     pub fn maybe_since(mut self, value: Option<Tid>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -1783,11 +1786,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CommitBuilder<'a, commit_state::SetTime<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1802,11 +1805,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> CommitBuilder<'a, commit_state::SetTooBig<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1814,32 +1817,32 @@ where
 impl<'a, S> CommitBuilder<'a, S>
 where
     S: commit_state::State,
-    S::Rebase: commit_state::IsSet,
-    S::Blobs: commit_state::IsSet,
-    S::Time: commit_state::IsSet,
+    S::Seq: commit_state::IsSet,
+    S::Ops: commit_state::IsSet,
+    S::TooBig: commit_state::IsSet,
     S::Rev: commit_state::IsSet,
     S::Repo: commit_state::IsSet,
+    S::Time: commit_state::IsSet,
+    S::Rebase: commit_state::IsSet,
+    S::Blobs: commit_state::IsSet,
     S::Commit: commit_state::IsSet,
-    S::Ops: commit_state::IsSet,
-    S::TooBig: commit_state::IsSet,
-    S::Seq: commit_state::IsSet,
     S::Blocks: commit_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Commit<'a> {
         Commit {
-            blobs: self.__unsafe_private_named.0.unwrap(),
-            blocks: self.__unsafe_private_named.1.unwrap(),
-            commit: self.__unsafe_private_named.2.unwrap(),
-            ops: self.__unsafe_private_named.3.unwrap(),
-            prev_data: self.__unsafe_private_named.4,
-            rebase: self.__unsafe_private_named.5.unwrap(),
-            repo: self.__unsafe_private_named.6.unwrap(),
-            rev: self.__unsafe_private_named.7.unwrap(),
-            seq: self.__unsafe_private_named.8.unwrap(),
-            since: self.__unsafe_private_named.9,
-            time: self.__unsafe_private_named.10.unwrap(),
-            too_big: self.__unsafe_private_named.11.unwrap(),
+            blobs: self._fields.0.unwrap(),
+            blocks: self._fields.1.unwrap(),
+            commit: self._fields.2.unwrap(),
+            ops: self._fields.3.unwrap(),
+            prev_data: self._fields.4,
+            rebase: self._fields.5.unwrap(),
+            repo: self._fields.6.unwrap(),
+            rev: self._fields.7.unwrap(),
+            seq: self._fields.8.unwrap(),
+            since: self._fields.9,
+            time: self._fields.10.unwrap(),
+            too_big: self._fields.11.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1852,18 +1855,18 @@ where
         >,
     ) -> Commit<'a> {
         Commit {
-            blobs: self.__unsafe_private_named.0.unwrap(),
-            blocks: self.__unsafe_private_named.1.unwrap(),
-            commit: self.__unsafe_private_named.2.unwrap(),
-            ops: self.__unsafe_private_named.3.unwrap(),
-            prev_data: self.__unsafe_private_named.4,
-            rebase: self.__unsafe_private_named.5.unwrap(),
-            repo: self.__unsafe_private_named.6.unwrap(),
-            rev: self.__unsafe_private_named.7.unwrap(),
-            seq: self.__unsafe_private_named.8.unwrap(),
-            since: self.__unsafe_private_named.9,
-            time: self.__unsafe_private_named.10.unwrap(),
-            too_big: self.__unsafe_private_named.11.unwrap(),
+            blobs: self._fields.0.unwrap(),
+            blocks: self._fields.1.unwrap(),
+            commit: self._fields.2.unwrap(),
+            ops: self._fields.3.unwrap(),
+            prev_data: self._fields.4,
+            rebase: self._fields.5.unwrap(),
+            repo: self._fields.6.unwrap(),
+            rev: self._fields.7.unwrap(),
+            seq: self._fields.8.unwrap(),
+            since: self._fields.9,
+            time: self._fields.10.unwrap(),
+            too_big: self._fields.11.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1880,63 +1883,58 @@ pub mod identity_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Time;
-        type Seq;
         type Did;
+        type Seq;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Time = Unset;
-        type Seq = Unset;
         type Did = Unset;
+        type Seq = Unset;
     }
     ///State transition - sets the `time` field to Set
     pub struct SetTime<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTime<S> {}
     impl<S: State> State for SetTime<S> {
         type Time = Set<members::time>;
-        type Seq = S::Seq;
-        type Did = S::Did;
-    }
-    ///State transition - sets the `seq` field to Set
-    pub struct SetSeq<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSeq<S> {}
-    impl<S: State> State for SetSeq<S> {
-        type Time = S::Time;
-        type Seq = Set<members::seq>;
         type Did = S::Did;
+        type Seq = S::Seq;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
         type Time = S::Time;
-        type Seq = S::Seq;
         type Did = Set<members::did>;
+        type Seq = S::Seq;
+    }
+    ///State transition - sets the `seq` field to Set
+    pub struct SetSeq<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSeq<S> {}
+    impl<S: State> State for SetSeq<S> {
+        type Time = S::Time;
+        type Did = S::Did;
+        type Seq = Set<members::seq>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `time` field
         pub struct time(());
-        ///Marker type for the `seq` field
-        pub struct seq(());
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `seq` field
+        pub struct seq(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct IdentityBuilder<'a, S: identity_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Did<'a>>,
-        Option<Handle<'a>>,
-        Option<i64>,
-        Option<Datetime>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Handle<'a>>, Option<i64>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Identity<'a> {
@@ -1950,9 +1948,9 @@ impl<'a> IdentityBuilder<'a, identity_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IdentityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1967,11 +1965,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> IdentityBuilder<'a, identity_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         IdentityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1979,12 +1977,12 @@ where
 impl<'a, S: identity_state::State> IdentityBuilder<'a, S> {
     /// Set the `handle` field (optional)
     pub fn handle(mut self, value: impl Into<Option<Handle<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `handle` field to an Option value (optional)
     pub fn maybe_handle(mut self, value: Option<Handle<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1999,11 +1997,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> IdentityBuilder<'a, identity_state::SetSeq<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         IdentityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2018,11 +2016,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> IdentityBuilder<'a, identity_state::SetTime<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         IdentityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2031,16 +2029,16 @@ impl<'a, S> IdentityBuilder<'a, S>
 where
     S: identity_state::State,
     S::Time: identity_state::IsSet,
-    S::Seq: identity_state::IsSet,
     S::Did: identity_state::IsSet,
+    S::Seq: identity_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Identity<'a> {
         Identity {
-            did: self.__unsafe_private_named.0.unwrap(),
-            handle: self.__unsafe_private_named.1,
-            seq: self.__unsafe_private_named.2.unwrap(),
-            time: self.__unsafe_private_named.3.unwrap(),
+            did: self._fields.0.unwrap(),
+            handle: self._fields.1,
+            seq: self._fields.2.unwrap(),
+            time: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2053,10 +2051,10 @@ where
         >,
     ) -> Identity<'a> {
         Identity {
-            did: self.__unsafe_private_named.0.unwrap(),
-            handle: self.__unsafe_private_named.1,
-            seq: self.__unsafe_private_named.2.unwrap(),
-            time: self.__unsafe_private_named.3.unwrap(),
+            did: self._fields.0.unwrap(),
+            handle: self._fields.1,
+            seq: self._fields.2.unwrap(),
+            time: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2083,8 +2081,8 @@ pub mod subscribe_repos_state {
 
 /// Builder for constructing an instance of this type
 pub struct SubscribeReposBuilder<S: subscribe_repos_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
 }
 
 impl SubscribeRepos {
@@ -2098,8 +2096,8 @@ impl SubscribeReposBuilder<subscribe_repos_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubscribeReposBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -2107,12 +2105,12 @@ impl SubscribeReposBuilder<subscribe_repos_state::Empty> {
 impl<S: subscribe_repos_state::State> SubscribeReposBuilder<S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -2124,7 +2122,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SubscribeRepos {
         SubscribeRepos {
-            cursor: self.__unsafe_private_named.0,
+            cursor: self._fields.0,
         }
     }
 }
@@ -2175,14 +2173,14 @@ pub mod repo_op_state {
 
 /// Builder for constructing an instance of this type
 pub struct RepoOpBuilder<'a, S: repo_op_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<RepoOpAction<'a>>,
         Option<CidLink<'a>>,
         Option<CowStr<'a>>,
         Option<CidLink<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RepoOp<'a> {
@@ -2196,9 +2194,9 @@ impl<'a> RepoOpBuilder<'a, repo_op_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RepoOpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2213,11 +2211,11 @@ where
         mut self,
         value: impl Into<RepoOpAction<'a>>,
     ) -> RepoOpBuilder<'a, repo_op_state::SetAction<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RepoOpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2225,12 +2223,12 @@ where
 impl<'a, S: repo_op_state::State> RepoOpBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<CidLink<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<CidLink<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -2245,11 +2243,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RepoOpBuilder<'a, repo_op_state::SetPath<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RepoOpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2257,12 +2255,12 @@ where
 impl<'a, S: repo_op_state::State> RepoOpBuilder<'a, S> {
     /// Set the `prev` field (optional)
     pub fn prev(mut self, value: impl Into<Option<CidLink<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `prev` field to an Option value (optional)
     pub fn maybe_prev(mut self, value: Option<CidLink<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -2276,10 +2274,10 @@ where
     /// Build the final struct
     pub fn build(self) -> RepoOp<'a> {
         RepoOp {
-            action: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1,
-            path: self.__unsafe_private_named.2.unwrap(),
-            prev: self.__unsafe_private_named.3,
+            action: self._fields.0.unwrap(),
+            cid: self._fields.1,
+            path: self._fields.2.unwrap(),
+            prev: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -2292,10 +2290,10 @@ where
         >,
     ) -> RepoOp<'a> {
         RepoOp {
-            action: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1,
-            path: self.__unsafe_private_named.2.unwrap(),
-            prev: self.__unsafe_private_named.3,
+            action: self._fields.0.unwrap(),
+            cid: self._fields.1,
+            path: self._fields.2.unwrap(),
+            prev: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -2311,99 +2309,99 @@ pub mod sync_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Blocks;
+        type Did;
         type Seq;
-        type Time;
+        type Blocks;
         type Rev;
-        type Did;
+        type Time;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Blocks = Unset;
+        type Did = Unset;
         type Seq = Unset;
-        type Time = Unset;
+        type Blocks = Unset;
         type Rev = Unset;
-        type Did = Unset;
+        type Time = Unset;
     }
-    ///State transition - sets the `blocks` field to Set
-    pub struct SetBlocks<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBlocks<S> {}
-    impl<S: State> State for SetBlocks<S> {
-        type Blocks = Set<members::blocks>;
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Did = Set<members::did>;
         type Seq = S::Seq;
-        type Time = S::Time;
+        type Blocks = S::Blocks;
         type Rev = S::Rev;
-        type Did = S::Did;
+        type Time = S::Time;
     }
     ///State transition - sets the `seq` field to Set
     pub struct SetSeq<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSeq<S> {}
     impl<S: State> State for SetSeq<S> {
-        type Blocks = S::Blocks;
+        type Did = S::Did;
         type Seq = Set<members::seq>;
-        type Time = S::Time;
+        type Blocks = S::Blocks;
         type Rev = S::Rev;
-        type Did = S::Did;
+        type Time = S::Time;
     }
-    ///State transition - sets the `time` field to Set
-    pub struct SetTime<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTime<S> {}
-    impl<S: State> State for SetTime<S> {
-        type Blocks = S::Blocks;
+    ///State transition - sets the `blocks` field to Set
+    pub struct SetBlocks<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBlocks<S> {}
+    impl<S: State> State for SetBlocks<S> {
+        type Did = S::Did;
         type Seq = S::Seq;
-        type Time = Set<members::time>;
+        type Blocks = Set<members::blocks>;
         type Rev = S::Rev;
-        type Did = S::Did;
+        type Time = S::Time;
     }
     ///State transition - sets the `rev` field to Set
     pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRev<S> {}
     impl<S: State> State for SetRev<S> {
-        type Blocks = S::Blocks;
+        type Did = S::Did;
         type Seq = S::Seq;
-        type Time = S::Time;
+        type Blocks = S::Blocks;
         type Rev = Set<members::rev>;
-        type Did = S::Did;
+        type Time = S::Time;
     }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Blocks = S::Blocks;
+    ///State transition - sets the `time` field to Set
+    pub struct SetTime<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTime<S> {}
+    impl<S: State> State for SetTime<S> {
+        type Did = S::Did;
         type Seq = S::Seq;
-        type Time = S::Time;
+        type Blocks = S::Blocks;
         type Rev = S::Rev;
-        type Did = Set<members::did>;
+        type Time = Set<members::time>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `blocks` field
-        pub struct blocks(());
+        ///Marker type for the `did` field
+        pub struct did(());
         ///Marker type for the `seq` field
         pub struct seq(());
-        ///Marker type for the `time` field
-        pub struct time(());
+        ///Marker type for the `blocks` field
+        pub struct blocks(());
         ///Marker type for the `rev` field
         pub struct rev(());
-        ///Marker type for the `did` field
-        pub struct did(());
+        ///Marker type for the `time` field
+        pub struct time(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SyncBuilder<'a, S: sync_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Bytes>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Sync<'a> {
@@ -2417,9 +2415,9 @@ impl<'a> SyncBuilder<'a, sync_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SyncBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2434,11 +2432,11 @@ where
         mut self,
         value: impl Into<Bytes>,
     ) -> SyncBuilder<'a, sync_state::SetBlocks<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SyncBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2453,11 +2451,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> SyncBuilder<'a, sync_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SyncBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2472,11 +2470,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SyncBuilder<'a, sync_state::SetRev<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SyncBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2491,11 +2489,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SyncBuilder<'a, sync_state::SetSeq<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SyncBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2510,11 +2508,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SyncBuilder<'a, sync_state::SetTime<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         SyncBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2522,20 +2520,20 @@ where
 impl<'a, S> SyncBuilder<'a, S>
 where
     S: sync_state::State,
-    S::Blocks: sync_state::IsSet,
+    S::Did: sync_state::IsSet,
     S::Seq: sync_state::IsSet,
-    S::Time: sync_state::IsSet,
+    S::Blocks: sync_state::IsSet,
     S::Rev: sync_state::IsSet,
-    S::Did: sync_state::IsSet,
+    S::Time: sync_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Sync<'a> {
         Sync {
-            blocks: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            rev: self.__unsafe_private_named.2.unwrap(),
-            seq: self.__unsafe_private_named.3.unwrap(),
-            time: self.__unsafe_private_named.4.unwrap(),
+            blocks: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            rev: self._fields.2.unwrap(),
+            seq: self._fields.3.unwrap(),
+            time: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2548,11 +2546,11 @@ where
         >,
     ) -> Sync<'a> {
         Sync {
-            blocks: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            rev: self.__unsafe_private_named.2.unwrap(),
-            seq: self.__unsafe_private_named.3.unwrap(),
-            time: self.__unsafe_private_named.4.unwrap(),
+            blocks: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            rev: self._fields.2.unwrap(),
+            seq: self._fields.3.unwrap(),
+            time: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/temp/add_reserved_handle.rs b/crates/jacquard-api/src/com_atproto/temp/add_reserved_handle.rs
index 28d66126..d9af0afe 100644
--- a/crates/jacquard-api/src/com_atproto/temp/add_reserved_handle.rs
+++ b/crates/jacquard-api/src/com_atproto/temp/add_reserved_handle.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/com_atproto/temp/check_handle_availability.rs b/crates/jacquard-api/src/com_atproto/temp/check_handle_availability.rs
index 8108bf12..6ee4a9ba 100644
--- a/crates/jacquard-api/src/com_atproto/temp/check_handle_availability.rs
+++ b/crates/jacquard-api/src/com_atproto/temp/check_handle_availability.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -229,9 +232,9 @@ pub struct CheckHandleAvailabilityBuilder<
     'a,
     S: check_handle_availability_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<Handle<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<Handle<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CheckHandleAvailability<'a> {
@@ -248,9 +251,9 @@ impl<'a> CheckHandleAvailabilityBuilder<'a, check_handle_availability_state::Emp
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CheckHandleAvailabilityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -261,12 +264,12 @@ impl<
 > CheckHandleAvailabilityBuilder<'a, S> {
     /// Set the `birthDate` field (optional)
     pub fn birth_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `birthDate` field to an Option value (optional)
     pub fn maybe_birth_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -277,12 +280,12 @@ impl<
 > CheckHandleAvailabilityBuilder<'a, S> {
     /// Set the `email` field (optional)
     pub fn email(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `email` field to an Option value (optional)
     pub fn maybe_email(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -300,11 +303,11 @@ where
         'a,
         check_handle_availability_state::SetHandle<S>,
     > {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CheckHandleAvailabilityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -317,9 +320,9 @@ where
     /// Build the final struct
     pub fn build(self) -> CheckHandleAvailability<'a> {
         CheckHandleAvailability {
-            birth_date: self.__unsafe_private_named.0,
-            email: self.__unsafe_private_named.1,
-            handle: self.__unsafe_private_named.2.unwrap(),
+            birth_date: self._fields.0,
+            email: self._fields.1,
+            handle: self._fields.2.unwrap(),
         }
     }
 }
@@ -506,9 +509,9 @@ pub mod result_unavailable_state {
 
 /// Builder for constructing an instance of this type
 pub struct ResultUnavailableBuilder<'a, S: result_unavailable_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<check_handle_availability::Suggestion<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<check_handle_availability::Suggestion<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ResultUnavailable<'a> {
@@ -522,9 +525,9 @@ impl<'a> ResultUnavailableBuilder<'a, result_unavailable_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ResultUnavailableBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -539,11 +542,11 @@ where
         mut self,
         value: impl Into<Vec<check_handle_availability::Suggestion<'a>>>,
     ) -> ResultUnavailableBuilder<'a, result_unavailable_state::SetSuggestions<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ResultUnavailableBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -556,7 +559,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ResultUnavailable<'a> {
         ResultUnavailable {
-            suggestions: self.__unsafe_private_named.0.unwrap(),
+            suggestions: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -569,7 +572,7 @@ where
         >,
     ) -> ResultUnavailable<'a> {
         ResultUnavailable {
-            suggestions: self.__unsafe_private_named.0.unwrap(),
+            suggestions: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -621,9 +624,9 @@ pub mod suggestion_state {
 
 /// Builder for constructing an instance of this type
 pub struct SuggestionBuilder<'a, S: suggestion_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Handle<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Handle<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Suggestion<'a> {
@@ -637,9 +640,9 @@ impl<'a> SuggestionBuilder<'a, suggestion_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SuggestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -654,11 +657,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> SuggestionBuilder<'a, suggestion_state::SetHandle<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SuggestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -673,11 +676,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SuggestionBuilder<'a, suggestion_state::SetMethod<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SuggestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -691,8 +694,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Suggestion<'a> {
         Suggestion {
-            handle: self.__unsafe_private_named.0.unwrap(),
-            method: self.__unsafe_private_named.1.unwrap(),
+            handle: self._fields.0.unwrap(),
+            method: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -705,8 +708,8 @@ where
         >,
     ) -> Suggestion<'a> {
         Suggestion {
-            handle: self.__unsafe_private_named.0.unwrap(),
-            method: self.__unsafe_private_named.1.unwrap(),
+            handle: self._fields.0.unwrap(),
+            method: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atproto/temp/check_signup_queue.rs b/crates/jacquard-api/src/com_atproto/temp/check_signup_queue.rs
index fee14710..ef600c0c 100644
--- a/crates/jacquard-api/src/com_atproto/temp/check_signup_queue.rs
+++ b/crates/jacquard-api/src/com_atproto/temp/check_signup_queue.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/com_atproto/temp/dereference_scope.rs b/crates/jacquard-api/src/com_atproto/temp/dereference_scope.rs
index 069d1cd4..162cded6 100644
--- a/crates/jacquard-api/src/com_atproto/temp/dereference_scope.rs
+++ b/crates/jacquard-api/src/com_atproto/temp/dereference_scope.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -123,9 +126,9 @@ pub mod dereference_scope_state {
 
 /// Builder for constructing an instance of this type
 pub struct DereferenceScopeBuilder<'a, S: dereference_scope_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DereferenceScope<'a> {
@@ -139,9 +142,9 @@ impl<'a> DereferenceScopeBuilder<'a, dereference_scope_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DereferenceScopeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -156,11 +159,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DereferenceScopeBuilder<'a, dereference_scope_state::SetScope<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DereferenceScopeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -173,7 +176,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DereferenceScope<'a> {
         DereferenceScope {
-            scope: self.__unsafe_private_named.0.unwrap(),
+            scope: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/temp/fetch_labels.rs b/crates/jacquard-api/src/com_atproto/temp/fetch_labels.rs
index 54a3edde..547516a7 100644
--- a/crates/jacquard-api/src/com_atproto/temp/fetch_labels.rs
+++ b/crates/jacquard-api/src/com_atproto/temp/fetch_labels.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
@@ -80,8 +83,8 @@ pub mod fetch_labels_state {
 
 /// Builder for constructing an instance of this type
 pub struct FetchLabelsBuilder<S: fetch_labels_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
 }
 
 impl FetchLabels {
@@ -95,8 +98,8 @@ impl FetchLabelsBuilder<fetch_labels_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FetchLabelsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
+            _state: PhantomData,
+            _fields: (None, None),
         }
     }
 }
@@ -104,12 +107,12 @@ impl FetchLabelsBuilder<fetch_labels_state::Empty> {
 impl<S: fetch_labels_state::State> FetchLabelsBuilder<S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -117,12 +120,12 @@ impl<S: fetch_labels_state::State> FetchLabelsBuilder<S> {
 impl<S: fetch_labels_state::State> FetchLabelsBuilder<S> {
     /// Set the `since` field (optional)
     pub fn since(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `since` field to an Option value (optional)
     pub fn maybe_since(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -134,8 +137,8 @@ where
     /// Build the final struct
     pub fn build(self) -> FetchLabels {
         FetchLabels {
-            limit: self.__unsafe_private_named.0,
-            since: self.__unsafe_private_named.1,
+            limit: self._fields.0,
+            since: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/temp/request_phone_verification.rs b/crates/jacquard-api/src/com_atproto/temp/request_phone_verification.rs
index 8ce37533..1720e943 100644
--- a/crates/jacquard-api/src/com_atproto/temp/request_phone_verification.rs
+++ b/crates/jacquard-api/src/com_atproto/temp/request_phone_verification.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/com_atproto/temp/revoke_account_credentials.rs b/crates/jacquard-api/src/com_atproto/temp/revoke_account_credentials.rs
index cca4357e..06ede886 100644
--- a/crates/jacquard-api/src/com_atproto/temp/revoke_account_credentials.rs
+++ b/crates/jacquard-api/src/com_atproto/temp/revoke_account_credentials.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -84,9 +87,9 @@ pub struct RevokeAccountCredentialsBuilder<
     'a,
     S: revoke_account_credentials_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RevokeAccountCredentials<'a> {
@@ -103,9 +106,9 @@ impl<'a> RevokeAccountCredentialsBuilder<'a, revoke_account_credentials_state::E
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RevokeAccountCredentialsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -123,11 +126,11 @@ where
         'a,
         revoke_account_credentials_state::SetAccount<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RevokeAccountCredentialsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -140,7 +143,7 @@ where
     /// Build the final struct
     pub fn build(self) -> RevokeAccountCredentials<'a> {
         RevokeAccountCredentials {
-            account: self.__unsafe_private_named.0.unwrap(),
+            account: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -153,7 +156,7 @@ where
         >,
     ) -> RevokeAccountCredentials<'a> {
         RevokeAccountCredentials {
-            account: self.__unsafe_private_named.0.unwrap(),
+            account: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atprotofans/broker_proof.rs b/crates/jacquard-api/src/com_atprotofans/broker_proof.rs
index e6499553..77f47554 100644
--- a/crates/jacquard-api/src/com_atprotofans/broker_proof.rs
+++ b/crates/jacquard-api/src/com_atprotofans/broker_proof.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -141,9 +144,9 @@ pub mod broker_proof_state {
 
 /// Builder for constructing an instance of this type
 pub struct BrokerProofBuilder<'a, S: broker_proof_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<CowStr<'a>>, Option<Bytes>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<CowStr<'a>>, Option<Bytes>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BrokerProof<'a> {
@@ -157,9 +160,9 @@ impl<'a> BrokerProofBuilder<'a, broker_proof_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BrokerProofBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -174,11 +177,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> BrokerProofBuilder<'a, broker_proof_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BrokerProofBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -186,12 +189,12 @@ where
 impl<'a, S: broker_proof_state::State> BrokerProofBuilder<'a, S> {
     /// Set the `key` field (optional)
     pub fn key(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `key` field to an Option value (optional)
     pub fn maybe_key(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -199,12 +202,12 @@ impl<'a, S: broker_proof_state::State> BrokerProofBuilder<'a, S> {
 impl<'a, S: broker_proof_state::State> BrokerProofBuilder<'a, S> {
     /// Set the `signature` field (optional)
     pub fn signature(mut self, value: impl Into<Option<Bytes>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `signature` field to an Option value (optional)
     pub fn maybe_signature(mut self, value: Option<Bytes>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -217,9 +220,9 @@ where
     /// Build the final struct
     pub fn build(self) -> BrokerProof<'a> {
         BrokerProof {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1,
-            signature: self.__unsafe_private_named.2,
+            cid: self._fields.0.unwrap(),
+            key: self._fields.1,
+            signature: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -232,9 +235,9 @@ where
         >,
     ) -> BrokerProof<'a> {
         BrokerProof {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1,
-            signature: self.__unsafe_private_named.2,
+            cid: self._fields.0.unwrap(),
+            key: self._fields.1,
+            signature: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atprotofans/get_profile.rs b/crates/jacquard-api/src/com_atprotofans/get_profile.rs
index 4d74d106..7d5d35f5 100644
--- a/crates/jacquard-api/src/com_atprotofans/get_profile.rs
+++ b/crates/jacquard-api/src/com_atprotofans/get_profile.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -134,9 +135,9 @@ pub mod get_profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetProfileBuilder<'a, S: get_profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetProfile<'a> {
@@ -150,9 +151,9 @@ impl<'a> GetProfileBuilder<'a, get_profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -167,11 +168,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetProfileBuilder<'a, get_profile_state::SetSubject<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -184,7 +185,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetProfile<'a> {
         GetProfile {
-            subject: self.__unsafe_private_named.0.unwrap(),
+            subject: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atprotofans/get_supporters.rs b/crates/jacquard-api/src/com_atprotofans/get_supporters.rs
index ffa16d3b..7fd52448 100644
--- a/crates/jacquard-api/src/com_atprotofans/get_supporters.rs
+++ b/crates/jacquard-api/src/com_atprotofans/get_supporters.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -140,9 +143,9 @@ pub mod get_supporters_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSupportersBuilder<'a, S: get_supporters_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSupporters<'a> {
@@ -156,9 +159,9 @@ impl<'a> GetSupportersBuilder<'a, get_supporters_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSupportersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -166,12 +169,12 @@ impl<'a> GetSupportersBuilder<'a, get_supporters_state::Empty> {
 impl<'a, S: get_supporters_state::State> GetSupportersBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -179,12 +182,12 @@ impl<'a, S: get_supporters_state::State> GetSupportersBuilder<'a, S> {
 impl<'a, S: get_supporters_state::State> GetSupportersBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -199,11 +202,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetSupportersBuilder<'a, get_supporters_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetSupportersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,9 +219,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSupporters<'a> {
         GetSupporters {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            subject: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            subject: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atprotofans/hydrated_profile.rs b/crates/jacquard-api/src/com_atprotofans/hydrated_profile.rs
index 5f203e29..9c16c69a 100644
--- a/crates/jacquard-api/src/com_atprotofans/hydrated_profile.rs
+++ b/crates/jacquard-api/src/com_atprotofans/hydrated_profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -237,8 +240,8 @@ pub mod hydrated_profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct HydratedProfileBuilder<'a, S: hydrated_profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<BlobRef<'a>>,
         Option<BlobRef<'a>>,
@@ -249,7 +252,7 @@ pub struct HydratedProfileBuilder<'a, S: hydrated_profile_state::State> {
         Option<Handle<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> HydratedProfile<'a> {
@@ -263,19 +266,9 @@ impl<'a> HydratedProfileBuilder<'a, hydrated_profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HydratedProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -283,12 +276,12 @@ impl<'a> HydratedProfileBuilder<'a, hydrated_profile_state::Empty> {
 impl<'a, S: hydrated_profile_state::State> HydratedProfileBuilder<'a, S> {
     /// Set the `acceptingSupporters` field (optional)
     pub fn accepting_supporters(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `acceptingSupporters` field to an Option value (optional)
     pub fn maybe_accepting_supporters(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -296,12 +289,12 @@ impl<'a, S: hydrated_profile_state::State> HydratedProfileBuilder<'a, S> {
 impl<'a, S: hydrated_profile_state::State> HydratedProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -309,12 +302,12 @@ impl<'a, S: hydrated_profile_state::State> HydratedProfileBuilder<'a, S> {
 impl<'a, S: hydrated_profile_state::State> HydratedProfileBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -322,12 +315,12 @@ impl<'a, S: hydrated_profile_state::State> HydratedProfileBuilder<'a, S> {
 impl<'a, S: hydrated_profile_state::State> HydratedProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -342,11 +335,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> HydratedProfileBuilder<'a, hydrated_profile_state::SetDid<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         HydratedProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -354,12 +347,12 @@ where
 impl<'a, S: hydrated_profile_state::State> HydratedProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -367,12 +360,12 @@ impl<'a, S: hydrated_profile_state::State> HydratedProfileBuilder<'a, S> {
 impl<'a, S: hydrated_profile_state::State> HydratedProfileBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -380,12 +373,12 @@ impl<'a, S: hydrated_profile_state::State> HydratedProfileBuilder<'a, S> {
 impl<'a, S: hydrated_profile_state::State> HydratedProfileBuilder<'a, S> {
     /// Set the `handle` field (optional)
     pub fn handle(mut self, value: impl Into<Option<Handle<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `handle` field to an Option value (optional)
     pub fn maybe_handle(mut self, value: Option<Handle<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -393,12 +386,12 @@ impl<'a, S: hydrated_profile_state::State> HydratedProfileBuilder<'a, S> {
 impl<'a, S: hydrated_profile_state::State> HydratedProfileBuilder<'a, S> {
     /// Set the `supporterCount` field (optional)
     pub fn supporter_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `supporterCount` field to an Option value (optional)
     pub fn maybe_supporter_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -411,15 +404,15 @@ where
     /// Build the final struct
     pub fn build(self) -> HydratedProfile<'a> {
         HydratedProfile {
-            accepting_supporters: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            banner: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            did: self.__unsafe_private_named.4.unwrap(),
-            display_name: self.__unsafe_private_named.5,
-            facets: self.__unsafe_private_named.6,
-            handle: self.__unsafe_private_named.7,
-            supporter_count: self.__unsafe_private_named.8,
+            accepting_supporters: self._fields.0,
+            avatar: self._fields.1,
+            banner: self._fields.2,
+            description: self._fields.3,
+            did: self._fields.4.unwrap(),
+            display_name: self._fields.5,
+            facets: self._fields.6,
+            handle: self._fields.7,
+            supporter_count: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -432,15 +425,15 @@ where
         >,
     ) -> HydratedProfile<'a> {
         HydratedProfile {
-            accepting_supporters: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            banner: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            did: self.__unsafe_private_named.4.unwrap(),
-            display_name: self.__unsafe_private_named.5,
-            facets: self.__unsafe_private_named.6,
-            handle: self.__unsafe_private_named.7,
-            supporter_count: self.__unsafe_private_named.8,
+            accepting_supporters: self._fields.0,
+            avatar: self._fields.1,
+            banner: self._fields.2,
+            description: self._fields.3,
+            did: self._fields.4.unwrap(),
+            display_name: self._fields.5,
+            facets: self._fields.6,
+            handle: self._fields.7,
+            supporter_count: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atprotofans/profile.rs b/crates/jacquard-api/src/com_atprotofans/profile.rs
index a79f445e..799fd2ac 100644
--- a/crates/jacquard-api/src/com_atprotofans/profile.rs
+++ b/crates/jacquard-api/src/com_atprotofans/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -267,8 +270,8 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<BlobRef<'a>>,
         Option<BlobRef<'a>>,
@@ -276,7 +279,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<CowStr<'a>>,
         Option<Vec<Facet<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -290,9 +293,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -300,12 +303,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `acceptingSupporters` field (optional)
     pub fn accepting_supporters(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `acceptingSupporters` field to an Option value (optional)
     pub fn maybe_accepting_supporters(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -313,12 +316,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -326,12 +329,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -339,12 +342,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -352,12 +355,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -365,12 +368,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -382,12 +385,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            accepting_supporters: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            banner: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4,
-            facets: self.__unsafe_private_named.5,
+            accepting_supporters: self._fields.0,
+            avatar: self._fields.1,
+            banner: self._fields.2,
+            description: self._fields.3,
+            display_name: self._fields.4,
+            facets: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -400,12 +403,12 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            accepting_supporters: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            banner: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4,
-            facets: self.__unsafe_private_named.5,
+            accepting_supporters: self._fields.0,
+            avatar: self._fields.1,
+            banner: self._fields.2,
+            description: self._fields.3,
+            display_name: self._fields.4,
+            facets: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atprotofans/supporter.rs b/crates/jacquard-api/src/com_atprotofans/supporter.rs
index b09e808a..6f504372 100644
--- a/crates/jacquard-api/src/com_atprotofans/supporter.rs
+++ b/crates/jacquard-api/src/com_atprotofans/supporter.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -153,9 +156,9 @@ pub mod supporter_state {
 
 /// Builder for constructing an instance of this type
 pub struct SupporterBuilder<'a, S: supporter_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<SupporterSignaturesItem<'a>>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<SupporterSignaturesItem<'a>>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Supporter<'a> {
@@ -169,9 +172,9 @@ impl<'a> SupporterBuilder<'a, supporter_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SupporterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,7 +185,7 @@ impl<'a, S: supporter_state::State> SupporterBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<SupporterSignaturesItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `signatures` field to an Option value (optional)
@@ -190,7 +193,7 @@ impl<'a, S: supporter_state::State> SupporterBuilder<'a, S> {
         mut self,
         value: Option<Vec<SupporterSignaturesItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -205,11 +208,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> SupporterBuilder<'a, supporter_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SupporterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -222,8 +225,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Supporter<'a> {
         Supporter {
-            signatures: self.__unsafe_private_named.0,
-            subject: self.__unsafe_private_named.1.unwrap(),
+            signatures: self._fields.0,
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -236,8 +239,8 @@ where
         >,
     ) -> Supporter<'a> {
         Supporter {
-            signatures: self.__unsafe_private_named.0,
-            subject: self.__unsafe_private_named.1.unwrap(),
+            signatures: self._fields.0,
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atprotofans/supporter_proof.rs b/crates/jacquard-api/src/com_atprotofans/supporter_proof.rs
index bf5d7148..b3b71bce 100644
--- a/crates/jacquard-api/src/com_atprotofans/supporter_proof.rs
+++ b/crates/jacquard-api/src/com_atprotofans/supporter_proof.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -141,9 +144,9 @@ pub mod supporter_proof_state {
 
 /// Builder for constructing an instance of this type
 pub struct SupporterProofBuilder<'a, S: supporter_proof_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<CowStr<'a>>, Option<Bytes>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<CowStr<'a>>, Option<Bytes>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SupporterProof<'a> {
@@ -157,9 +160,9 @@ impl<'a> SupporterProofBuilder<'a, supporter_proof_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SupporterProofBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -174,11 +177,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> SupporterProofBuilder<'a, supporter_proof_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SupporterProofBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -186,12 +189,12 @@ where
 impl<'a, S: supporter_proof_state::State> SupporterProofBuilder<'a, S> {
     /// Set the `key` field (optional)
     pub fn key(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `key` field to an Option value (optional)
     pub fn maybe_key(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -199,12 +202,12 @@ impl<'a, S: supporter_proof_state::State> SupporterProofBuilder<'a, S> {
 impl<'a, S: supporter_proof_state::State> SupporterProofBuilder<'a, S> {
     /// Set the `signature` field (optional)
     pub fn signature(mut self, value: impl Into<Option<Bytes>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `signature` field to an Option value (optional)
     pub fn maybe_signature(mut self, value: Option<Bytes>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -217,9 +220,9 @@ where
     /// Build the final struct
     pub fn build(self) -> SupporterProof<'a> {
         SupporterProof {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1,
-            signature: self.__unsafe_private_named.2,
+            cid: self._fields.0.unwrap(),
+            key: self._fields.1,
+            signature: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -232,9 +235,9 @@ where
         >,
     ) -> SupporterProof<'a> {
         SupporterProof {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1,
-            signature: self.__unsafe_private_named.2,
+            cid: self._fields.0.unwrap(),
+            key: self._fields.1,
+            signature: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_atprotofans/validate_supporter.rs b/crates/jacquard-api/src/com_atprotofans/validate_supporter.rs
index 4e44d68d..ebf8af76 100644
--- a/crates/jacquard-api/src/com_atprotofans/validate_supporter.rs
+++ b/crates/jacquard-api/src/com_atprotofans/validate_supporter.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -108,59 +111,59 @@ pub mod validate_supporter_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Subject;
         type Signer;
         type Supporter;
-        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Subject = Unset;
         type Signer = Unset;
         type Supporter = Unset;
-        type Subject = Unset;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type Subject = Set<members::subject>;
+        type Signer = S::Signer;
+        type Supporter = S::Supporter;
     }
     ///State transition - sets the `signer` field to Set
     pub struct SetSigner<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSigner<S> {}
     impl<S: State> State for SetSigner<S> {
+        type Subject = S::Subject;
         type Signer = Set<members::signer>;
         type Supporter = S::Supporter;
-        type Subject = S::Subject;
     }
     ///State transition - sets the `supporter` field to Set
     pub struct SetSupporter<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSupporter<S> {}
     impl<S: State> State for SetSupporter<S> {
-        type Signer = S::Signer;
-        type Supporter = Set<members::supporter>;
         type Subject = S::Subject;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
         type Signer = S::Signer;
-        type Supporter = S::Supporter;
-        type Subject = Set<members::subject>;
+        type Supporter = Set<members::supporter>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `subject` field
+        pub struct subject(());
         ///Marker type for the `signer` field
         pub struct signer(());
         ///Marker type for the `supporter` field
         pub struct supporter(());
-        ///Marker type for the `subject` field
-        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ValidateSupporterBuilder<'a, S: validate_supporter_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Did<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Did<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ValidateSupporter<'a> {
@@ -174,9 +177,9 @@ impl<'a> ValidateSupporterBuilder<'a, validate_supporter_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ValidateSupporterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -191,11 +194,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ValidateSupporterBuilder<'a, validate_supporter_state::SetSigner<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ValidateSupporterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,11 +213,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ValidateSupporterBuilder<'a, validate_supporter_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ValidateSupporterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -229,11 +232,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ValidateSupporterBuilder<'a, validate_supporter_state::SetSupporter<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ValidateSupporterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -241,16 +244,16 @@ where
 impl<'a, S> ValidateSupporterBuilder<'a, S>
 where
     S: validate_supporter_state::State,
+    S::Subject: validate_supporter_state::IsSet,
     S::Signer: validate_supporter_state::IsSet,
     S::Supporter: validate_supporter_state::IsSet,
-    S::Subject: validate_supporter_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ValidateSupporter<'a> {
         ValidateSupporter {
-            signer: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            supporter: self.__unsafe_private_named.2.unwrap(),
+            signer: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            supporter: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_bad_example/identity/resolve_mini_doc.rs b/crates/jacquard-api/src/com_bad_example/identity/resolve_mini_doc.rs
index c4fb99f4..47fb63f2 100644
--- a/crates/jacquard-api/src/com_bad_example/identity/resolve_mini_doc.rs
+++ b/crates/jacquard-api/src/com_bad_example/identity/resolve_mini_doc.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -101,9 +104,9 @@ pub mod resolve_mini_doc_state {
 
 /// Builder for constructing an instance of this type
 pub struct ResolveMiniDocBuilder<'a, S: resolve_mini_doc_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ResolveMiniDoc<'a> {
@@ -117,9 +120,9 @@ impl<'a> ResolveMiniDocBuilder<'a, resolve_mini_doc_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ResolveMiniDocBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -134,11 +137,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> ResolveMiniDocBuilder<'a, resolve_mini_doc_state::SetIdentifier<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ResolveMiniDocBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -151,7 +154,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ResolveMiniDoc<'a> {
         ResolveMiniDoc {
-            identifier: self.__unsafe_private_named.0.unwrap(),
+            identifier: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_chrisvanderloo/project.rs b/crates/jacquard-api/src/com_chrisvanderloo/project.rs
index c60d730f..1bdb72bb 100644
--- a/crates/jacquard-api/src/com_chrisvanderloo/project.rs
+++ b/crates/jacquard-api/src/com_chrisvanderloo/project.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -171,80 +174,80 @@ pub mod project_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Repo;
-        type Language;
         type Title;
         type Description;
+        type Language;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Repo = Unset;
-        type Language = Unset;
         type Title = Unset;
         type Description = Unset;
+        type Language = Unset;
     }
     ///State transition - sets the `repo` field to Set
     pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepo<S> {}
     impl<S: State> State for SetRepo<S> {
         type Repo = Set<members::repo>;
-        type Language = S::Language;
-        type Title = S::Title;
-        type Description = S::Description;
-    }
-    ///State transition - sets the `language` field to Set
-    pub struct SetLanguage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLanguage<S> {}
-    impl<S: State> State for SetLanguage<S> {
-        type Repo = S::Repo;
-        type Language = Set<members::language>;
         type Title = S::Title;
         type Description = S::Description;
+        type Language = S::Language;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
         type Repo = S::Repo;
-        type Language = S::Language;
         type Title = Set<members::title>;
         type Description = S::Description;
+        type Language = S::Language;
     }
     ///State transition - sets the `description` field to Set
     pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDescription<S> {}
     impl<S: State> State for SetDescription<S> {
         type Repo = S::Repo;
-        type Language = S::Language;
         type Title = S::Title;
         type Description = Set<members::description>;
+        type Language = S::Language;
+    }
+    ///State transition - sets the `language` field to Set
+    pub struct SetLanguage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLanguage<S> {}
+    impl<S: State> State for SetLanguage<S> {
+        type Repo = S::Repo;
+        type Title = S::Title;
+        type Description = S::Description;
+        type Language = Set<members::language>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `repo` field
         pub struct repo(());
-        ///Marker type for the `language` field
-        pub struct language(());
         ///Marker type for the `title` field
         pub struct title(());
         ///Marker type for the `description` field
         pub struct description(());
+        ///Marker type for the `language` field
+        pub struct language(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ProjectBuilder<'a, S: project_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Project<'a> {
@@ -258,9 +261,9 @@ impl<'a> ProjectBuilder<'a, project_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -275,11 +278,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProjectBuilder<'a, project_state::SetDescription<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ProjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -294,11 +297,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProjectBuilder<'a, project_state::SetLanguage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ProjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -306,12 +309,12 @@ where
 impl<'a, S: project_state::State> ProjectBuilder<'a, S> {
     /// Set the `link` field (optional)
     pub fn link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `link` field to an Option value (optional)
     pub fn maybe_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -326,11 +329,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ProjectBuilder<'a, project_state::SetRepo<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ProjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -345,11 +348,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProjectBuilder<'a, project_state::SetTitle<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ProjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -358,18 +361,18 @@ impl<'a, S> ProjectBuilder<'a, S>
 where
     S: project_state::State,
     S::Repo: project_state::IsSet,
-    S::Language: project_state::IsSet,
     S::Title: project_state::IsSet,
     S::Description: project_state::IsSet,
+    S::Language: project_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Project<'a> {
         Project {
-            description: self.__unsafe_private_named.0.unwrap(),
-            language: self.__unsafe_private_named.1.unwrap(),
-            link: self.__unsafe_private_named.2,
-            repo: self.__unsafe_private_named.3.unwrap(),
-            title: self.__unsafe_private_named.4.unwrap(),
+            description: self._fields.0.unwrap(),
+            language: self._fields.1.unwrap(),
+            link: self._fields.2,
+            repo: self._fields.3.unwrap(),
+            title: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -382,11 +385,11 @@ where
         >,
     ) -> Project<'a> {
         Project {
-            description: self.__unsafe_private_named.0.unwrap(),
-            language: self.__unsafe_private_named.1.unwrap(),
-            link: self.__unsafe_private_named.2,
-            repo: self.__unsafe_private_named.3.unwrap(),
-            title: self.__unsafe_private_named.4.unwrap(),
+            description: self._fields.0.unwrap(),
+            language: self._fields.1.unwrap(),
+            link: self._fields.2,
+            repo: self._fields.3.unwrap(),
+            title: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_crabdance/nandi/post.rs b/crates/jacquard-api/src/com_crabdance/nandi/post.rs
index b4127b09..2d1b5db1 100644
--- a/crates/jacquard-api/src/com_crabdance/nandi/post.rs
+++ b/crates/jacquard-api/src/com_crabdance/nandi/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -193,58 +196,58 @@ pub mod post_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type CreatedAt;
         type Content;
         type Title;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type CreatedAt = Unset;
         type Content = Unset;
         type Title = Unset;
-        type CreatedAt = Unset;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type Content = S::Content;
+        type Title = S::Title;
     }
     ///State transition - sets the `content` field to Set
     pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContent<S> {}
     impl<S: State> State for SetContent<S> {
+        type CreatedAt = S::CreatedAt;
         type Content = Set<members::content>;
         type Title = S::Title;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Content = S::Content;
-        type Title = Set<members::title>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type Content = S::Content;
-        type Title = S::Title;
-        type CreatedAt = Set<members::created_at>;
+        type Title = Set<members::title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `content` field
         pub struct content(());
         ///Marker type for the `title` field
         pub struct title(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<bool>,
@@ -253,7 +256,7 @@ pub struct PostBuilder<'a, S: post_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -267,9 +270,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -284,11 +287,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -303,11 +306,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -315,12 +318,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `published` field (optional)
     pub fn published(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `published` field to an Option value (optional)
     pub fn maybe_published(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -328,12 +331,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `summary` field (optional)
     pub fn summary(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `summary` field to an Option value (optional)
     pub fn maybe_summary(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -341,12 +344,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -361,11 +364,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetTitle<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -373,12 +376,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -386,20 +389,20 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S> PostBuilder<'a, S>
 where
     S: post_state::State,
+    S::CreatedAt: post_state::IsSet,
     S::Content: post_state::IsSet,
     S::Title: post_state::IsSet,
-    S::CreatedAt: post_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            published: self.__unsafe_private_named.2.or_else(|| Some(false)),
-            summary: self.__unsafe_private_named.3,
-            tags: self.__unsafe_private_named.4,
-            title: self.__unsafe_private_named.5.unwrap(),
-            updated_at: self.__unsafe_private_named.6,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            published: self._fields.2.or_else(|| Some(false)),
+            summary: self._fields.3,
+            tags: self._fields.4,
+            title: self._fields.5.unwrap(),
+            updated_at: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -412,13 +415,13 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            published: self.__unsafe_private_named.2.or_else(|| Some(false)),
-            summary: self.__unsafe_private_named.3,
-            tags: self.__unsafe_private_named.4,
-            title: self.__unsafe_private_named.5.unwrap(),
-            updated_at: self.__unsafe_private_named.6,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            published: self._fields.2.or_else(|| Some(false)),
+            summary: self._fields.3,
+            tags: self._fields.4,
+            title: self._fields.5.unwrap(),
+            updated_at: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_deckbelcher.rs b/crates/jacquard-api/src/com_deckbelcher.rs
index ec3e4a75..89a23bb7 100644
--- a/crates/jacquard-api/src/com_deckbelcher.rs
+++ b/crates/jacquard-api/src/com_deckbelcher.rs
@@ -11,7 +11,11 @@ pub mod deck;
 pub mod richtext;
 pub mod social;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -64,45 +68,45 @@ pub mod card_ref_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type OracleUri;
         type ScryfallUri;
+        type OracleUri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type OracleUri = Unset;
         type ScryfallUri = Unset;
-    }
-    ///State transition - sets the `oracle_uri` field to Set
-    pub struct SetOracleUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetOracleUri<S> {}
-    impl<S: State> State for SetOracleUri<S> {
-        type OracleUri = Set<members::oracle_uri>;
-        type ScryfallUri = S::ScryfallUri;
+        type OracleUri = Unset;
     }
     ///State transition - sets the `scryfall_uri` field to Set
     pub struct SetScryfallUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetScryfallUri<S> {}
     impl<S: State> State for SetScryfallUri<S> {
-        type OracleUri = S::OracleUri;
         type ScryfallUri = Set<members::scryfall_uri>;
+        type OracleUri = S::OracleUri;
+    }
+    ///State transition - sets the `oracle_uri` field to Set
+    pub struct SetOracleUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetOracleUri<S> {}
+    impl<S: State> State for SetOracleUri<S> {
+        type ScryfallUri = S::ScryfallUri;
+        type OracleUri = Set<members::oracle_uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `oracle_uri` field
-        pub struct oracle_uri(());
         ///Marker type for the `scryfall_uri` field
         pub struct scryfall_uri(());
+        ///Marker type for the `oracle_uri` field
+        pub struct oracle_uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CardRefBuilder<'a, S: card_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CardRef<'a> {
@@ -116,9 +120,9 @@ impl<'a> CardRefBuilder<'a, card_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CardRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -133,11 +137,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> CardRefBuilder<'a, card_ref_state::SetOracleUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CardRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -152,11 +156,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> CardRefBuilder<'a, card_ref_state::SetScryfallUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CardRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,14 +168,14 @@ where
 impl<'a, S> CardRefBuilder<'a, S>
 where
     S: card_ref_state::State,
-    S::OracleUri: card_ref_state::IsSet,
     S::ScryfallUri: card_ref_state::IsSet,
+    S::OracleUri: card_ref_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CardRef<'a> {
         CardRef {
-            oracle_uri: self.__unsafe_private_named.0.unwrap(),
-            scryfall_uri: self.__unsafe_private_named.1.unwrap(),
+            oracle_uri: self._fields.0.unwrap(),
+            scryfall_uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -184,8 +188,8 @@ where
         >,
     ) -> CardRef<'a> {
         CardRef {
-            oracle_uri: self.__unsafe_private_named.0.unwrap(),
-            scryfall_uri: self.__unsafe_private_named.1.unwrap(),
+            oracle_uri: self._fields.0.unwrap(),
+            scryfall_uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_deckbelcher/actor/profile.rs b/crates/jacquard-api/src/com_deckbelcher/actor/profile.rs
index 88c834c5..36bab08d 100644
--- a/crates/jacquard-api/src/com_deckbelcher/actor/profile.rs
+++ b/crates/jacquard-api/src/com_deckbelcher/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -162,9 +165,9 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Document<'a>>, Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Document<'a>>, Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -178,9 +181,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -188,12 +191,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `bio` field (optional)
     pub fn bio(mut self, value: impl Into<Option<Document<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `bio` field to an Option value (optional)
     pub fn maybe_bio(mut self, value: Option<Document<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -208,11 +211,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ProfileBuilder<'a, profile_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -220,12 +223,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `pronouns` field (optional)
     pub fn pronouns(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `pronouns` field to an Option value (optional)
     pub fn maybe_pronouns(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -238,9 +241,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            bio: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            pronouns: self.__unsafe_private_named.2,
+            bio: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            pronouns: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -253,9 +256,9 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            bio: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            pronouns: self.__unsafe_private_named.2,
+            bio: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            pronouns: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_deckbelcher/collection/list.rs b/crates/jacquard-api/src/com_deckbelcher/collection/list.rs
index ead70ff3..68c09de4 100644
--- a/crates/jacquard-api/src/com_deckbelcher/collection/list.rs
+++ b/crates/jacquard-api/src/com_deckbelcher/collection/list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -252,9 +255,9 @@ pub mod card_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct CardItemBuilder<'a, S: card_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CardRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CardRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CardItem<'a> {
@@ -268,9 +271,9 @@ impl<'a> CardItemBuilder<'a, card_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CardItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -285,11 +288,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CardItemBuilder<'a, card_item_state::SetAddedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CardItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -304,11 +307,11 @@ where
         mut self,
         value: impl Into<CardRef<'a>>,
     ) -> CardItemBuilder<'a, card_item_state::SetRef<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CardItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -322,8 +325,8 @@ where
     /// Build the final struct
     pub fn build(self) -> CardItem<'a> {
         CardItem {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            r#ref: self.__unsafe_private_named.1.unwrap(),
+            added_at: self._fields.0.unwrap(),
+            r#ref: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -336,8 +339,8 @@ where
         >,
     ) -> CardItem<'a> {
         CardItem {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            r#ref: self.__unsafe_private_named.1.unwrap(),
+            added_at: self._fields.0.unwrap(),
+            r#ref: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -515,45 +518,45 @@ pub mod deck_item_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Ref;
         type AddedAt;
+        type Ref;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Ref = Unset;
         type AddedAt = Unset;
-    }
-    ///State transition - sets the `ref` field to Set
-    pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRef<S> {}
-    impl<S: State> State for SetRef<S> {
-        type Ref = Set<members::r#ref>;
-        type AddedAt = S::AddedAt;
+        type Ref = Unset;
     }
     ///State transition - sets the `added_at` field to Set
     pub struct SetAddedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAddedAt<S> {}
     impl<S: State> State for SetAddedAt<S> {
-        type Ref = S::Ref;
         type AddedAt = Set<members::added_at>;
+        type Ref = S::Ref;
+    }
+    ///State transition - sets the `ref` field to Set
+    pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRef<S> {}
+    impl<S: State> State for SetRef<S> {
+        type AddedAt = S::AddedAt;
+        type Ref = Set<members::r#ref>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `ref` field
-        pub struct r#ref(());
         ///Marker type for the `added_at` field
         pub struct added_at(());
+        ///Marker type for the `ref` field
+        pub struct r#ref(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DeckItemBuilder<'a, S: deck_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeckItem<'a> {
@@ -567,9 +570,9 @@ impl<'a> DeckItemBuilder<'a, deck_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeckItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -584,11 +587,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DeckItemBuilder<'a, deck_item_state::SetAddedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeckItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -603,11 +606,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> DeckItemBuilder<'a, deck_item_state::SetRef<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DeckItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -615,14 +618,14 @@ where
 impl<'a, S> DeckItemBuilder<'a, S>
 where
     S: deck_item_state::State,
-    S::Ref: deck_item_state::IsSet,
     S::AddedAt: deck_item_state::IsSet,
+    S::Ref: deck_item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DeckItem<'a> {
         DeckItem {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            r#ref: self.__unsafe_private_named.1.unwrap(),
+            added_at: self._fields.0.unwrap(),
+            r#ref: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -635,8 +638,8 @@ where
         >,
     ) -> DeckItem<'a> {
         DeckItem {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            r#ref: self.__unsafe_private_named.1.unwrap(),
+            added_at: self._fields.0.unwrap(),
+            r#ref: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -652,65 +655,65 @@ pub mod list_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type Items;
         type CreatedAt;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type Items = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Items = S::Items;
-        type CreatedAt = S::CreatedAt;
+        type Name = Unset;
     }
     ///State transition - sets the `items` field to Set
     pub struct SetItems<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetItems<S> {}
     impl<S: State> State for SetItems<S> {
-        type Name = S::Name;
         type Items = Set<members::items>;
         type CreatedAt = S::CreatedAt;
+        type Name = S::Name;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Name = S::Name;
         type Items = S::Items;
         type CreatedAt = Set<members::created_at>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Items = S::Items;
+        type CreatedAt = S::CreatedAt;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `items` field
         pub struct items(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ListBuilder<'a, S: list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Document<'a>>,
         Option<Vec<ListItemsItem<'a>>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> List<'a> {
@@ -724,9 +727,9 @@ impl<'a> ListBuilder<'a, list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -741,11 +744,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListBuilder<'a, list_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -753,12 +756,12 @@ where
 impl<'a, S: list_state::State> ListBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<Document<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<Document<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -773,11 +776,11 @@ where
         mut self,
         value: impl Into<Vec<ListItemsItem<'a>>>,
     ) -> ListBuilder<'a, list_state::SetItems<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -792,11 +795,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ListBuilder<'a, list_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -804,12 +807,12 @@ where
 impl<'a, S: list_state::State> ListBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -817,18 +820,18 @@ impl<'a, S: list_state::State> ListBuilder<'a, S> {
 impl<'a, S> ListBuilder<'a, S>
 where
     S: list_state::State,
-    S::Name: list_state::IsSet,
     S::Items: list_state::IsSet,
     S::CreatedAt: list_state::IsSet,
+    S::Name: list_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> List<'a> {
         List {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            items: self.__unsafe_private_named.2.unwrap(),
-            name: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            items: self._fields.2.unwrap(),
+            name: self._fields.3.unwrap(),
+            updated_at: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -841,11 +844,11 @@ where
         >,
     ) -> List<'a> {
         List {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            items: self.__unsafe_private_named.2.unwrap(),
-            name: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            items: self._fields.2.unwrap(),
+            name: self._fields.3.unwrap(),
+            updated_at: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_deckbelcher/deck/list.rs b/crates/jacquard-api/src/com_deckbelcher/deck/list.rs
index 24ed713a..b6f5fca7 100644
--- a/crates/jacquard-api/src/com_deckbelcher/deck/list.rs
+++ b/crates/jacquard-api/src/com_deckbelcher/deck/list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -579,63 +582,63 @@ pub mod card_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Ref;
-        type Section;
         type Quantity;
+        type Section;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Ref = Unset;
-        type Section = Unset;
         type Quantity = Unset;
+        type Section = Unset;
     }
     ///State transition - sets the `ref` field to Set
     pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRef<S> {}
     impl<S: State> State for SetRef<S> {
         type Ref = Set<members::r#ref>;
-        type Section = S::Section;
-        type Quantity = S::Quantity;
-    }
-    ///State transition - sets the `section` field to Set
-    pub struct SetSection<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSection<S> {}
-    impl<S: State> State for SetSection<S> {
-        type Ref = S::Ref;
-        type Section = Set<members::section>;
         type Quantity = S::Quantity;
+        type Section = S::Section;
     }
     ///State transition - sets the `quantity` field to Set
     pub struct SetQuantity<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetQuantity<S> {}
     impl<S: State> State for SetQuantity<S> {
         type Ref = S::Ref;
-        type Section = S::Section;
         type Quantity = Set<members::quantity>;
+        type Section = S::Section;
+    }
+    ///State transition - sets the `section` field to Set
+    pub struct SetSection<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSection<S> {}
+    impl<S: State> State for SetSection<S> {
+        type Ref = S::Ref;
+        type Quantity = S::Quantity;
+        type Section = Set<members::section>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `ref` field
         pub struct r#ref(());
-        ///Marker type for the `section` field
-        pub struct section(());
         ///Marker type for the `quantity` field
         pub struct quantity(());
+        ///Marker type for the `section` field
+        pub struct section(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CardBuilder<'a, S: card_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<CardRef<'a>>,
         Option<list::Section<'a>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Card<'a> {
@@ -649,9 +652,9 @@ impl<'a> CardBuilder<'a, card_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -666,11 +669,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CardBuilder<'a, card_state::SetQuantity<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -685,11 +688,11 @@ where
         mut self,
         value: impl Into<CardRef<'a>>,
     ) -> CardBuilder<'a, card_state::SetRef<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -704,11 +707,11 @@ where
         mut self,
         value: impl Into<list::Section<'a>>,
     ) -> CardBuilder<'a, card_state::SetSection<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -716,12 +719,12 @@ where
 impl<'a, S: card_state::State> CardBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -730,16 +733,16 @@ impl<'a, S> CardBuilder<'a, S>
 where
     S: card_state::State,
     S::Ref: card_state::IsSet,
-    S::Section: card_state::IsSet,
     S::Quantity: card_state::IsSet,
+    S::Section: card_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Card<'a> {
         Card {
-            quantity: self.__unsafe_private_named.0.unwrap(),
-            r#ref: self.__unsafe_private_named.1.unwrap(),
-            section: self.__unsafe_private_named.2.unwrap(),
-            tags: self.__unsafe_private_named.3,
+            quantity: self._fields.0.unwrap(),
+            r#ref: self._fields.1.unwrap(),
+            section: self._fields.2.unwrap(),
+            tags: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -752,10 +755,10 @@ where
         >,
     ) -> Card<'a> {
         Card {
-            quantity: self.__unsafe_private_named.0.unwrap(),
-            r#ref: self.__unsafe_private_named.1.unwrap(),
-            section: self.__unsafe_private_named.2.unwrap(),
-            tags: self.__unsafe_private_named.3,
+            quantity: self._fields.0.unwrap(),
+            r#ref: self._fields.1.unwrap(),
+            section: self._fields.2.unwrap(),
+            tags: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -1013,57 +1016,57 @@ pub mod list_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Cards;
-        type CreatedAt;
         type Name;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Cards = Unset;
-        type CreatedAt = Unset;
         type Name = Unset;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `cards` field to Set
     pub struct SetCards<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCards<S> {}
     impl<S: State> State for SetCards<S> {
         type Cards = Set<members::cards>;
-        type CreatedAt = S::CreatedAt;
-        type Name = S::Name;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type Cards = S::Cards;
-        type CreatedAt = Set<members::created_at>;
         type Name = S::Name;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
         type Cards = S::Cards;
-        type CreatedAt = S::CreatedAt;
         type Name = Set<members::name>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Cards = S::Cards;
+        type Name = S::Name;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `cards` field
         pub struct cards(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ListBuilder<'a, S: list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<list::Card<'a>>>,
         Option<Datetime>,
         Option<list::Format<'a>>,
@@ -1071,7 +1074,7 @@ pub struct ListBuilder<'a, S: list_state::State> {
         Option<ListPrimer<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> List<'a> {
@@ -1085,9 +1088,9 @@ impl<'a> ListBuilder<'a, list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1102,11 +1105,11 @@ where
         mut self,
         value: impl Into<Vec<list::Card<'a>>>,
     ) -> ListBuilder<'a, list_state::SetCards<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1121,11 +1124,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListBuilder<'a, list_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1133,12 +1136,12 @@ where
 impl<'a, S: list_state::State> ListBuilder<'a, S> {
     /// Set the `format` field (optional)
     pub fn format(mut self, value: impl Into<Option<list::Format<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `format` field to an Option value (optional)
     pub fn maybe_format(mut self, value: Option<list::Format<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1153,11 +1156,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ListBuilder<'a, list_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1165,12 +1168,12 @@ where
 impl<'a, S: list_state::State> ListBuilder<'a, S> {
     /// Set the `primer` field (optional)
     pub fn primer(mut self, value: impl Into<Option<ListPrimer<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `primer` field to an Option value (optional)
     pub fn maybe_primer(mut self, value: Option<ListPrimer<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1178,12 +1181,12 @@ impl<'a, S: list_state::State> ListBuilder<'a, S> {
 impl<'a, S: list_state::State> ListBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1192,18 +1195,18 @@ impl<'a, S> ListBuilder<'a, S>
 where
     S: list_state::State,
     S::Cards: list_state::IsSet,
-    S::CreatedAt: list_state::IsSet,
     S::Name: list_state::IsSet,
+    S::CreatedAt: list_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> List<'a> {
         List {
-            cards: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            format: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            primer: self.__unsafe_private_named.4,
-            updated_at: self.__unsafe_private_named.5,
+            cards: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            format: self._fields.2,
+            name: self._fields.3.unwrap(),
+            primer: self._fields.4,
+            updated_at: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -1216,12 +1219,12 @@ where
         >,
     ) -> List<'a> {
         List {
-            cards: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            format: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            primer: self.__unsafe_private_named.4,
-            updated_at: self.__unsafe_private_named.5,
+            cards: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            format: self._fields.2,
+            name: self._fields.3.unwrap(),
+            primer: self._fields.4,
+            updated_at: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
@@ -1261,9 +1264,9 @@ pub mod primer_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct PrimerRefBuilder<'a, S: primer_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PrimerRef<'a> {
@@ -1277,9 +1280,9 @@ impl<'a> PrimerRefBuilder<'a, primer_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PrimerRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1294,11 +1297,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> PrimerRefBuilder<'a, primer_ref_state::SetRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PrimerRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1311,7 +1314,7 @@ where
     /// Build the final struct
     pub fn build(self) -> PrimerRef<'a> {
         PrimerRef {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1324,7 +1327,7 @@ where
         >,
     ) -> PrimerRef<'a> {
         PrimerRef {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_deckbelcher/richtext.rs b/crates/jacquard-api/src/com_deckbelcher/richtext.rs
index 82c96d05..f30a06e5 100644
--- a/crates/jacquard-api/src/com_deckbelcher/richtext.rs
+++ b/crates/jacquard-api/src/com_deckbelcher/richtext.rs
@@ -7,7 +7,11 @@
 
 pub mod facet;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -481,9 +485,9 @@ pub mod bullet_list_block_state {
 
 /// Builder for constructing an instance of this type
 pub struct BulletListBlockBuilder<'a, S: bullet_list_block_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<richtext::ListItem<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<richtext::ListItem<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BulletListBlock<'a> {
@@ -497,9 +501,9 @@ impl<'a> BulletListBlockBuilder<'a, bullet_list_block_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BulletListBlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -514,11 +518,11 @@ where
         mut self,
         value: impl Into<Vec<richtext::ListItem<'a>>>,
     ) -> BulletListBlockBuilder<'a, bullet_list_block_state::SetItems<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BulletListBlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -531,7 +535,7 @@ where
     /// Build the final struct
     pub fn build(self) -> BulletListBlock<'a> {
         BulletListBlock {
-            items: self.__unsafe_private_named.0.unwrap(),
+            items: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -544,7 +548,7 @@ where
         >,
     ) -> BulletListBlock<'a> {
         BulletListBlock {
-            items: self.__unsafe_private_named.0.unwrap(),
+            items: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -946,9 +950,9 @@ pub mod document_state {
 
 /// Builder for constructing an instance of this type
 pub struct DocumentBuilder<'a, S: document_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<DocumentContentItem<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<DocumentContentItem<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Document<'a> {
@@ -962,9 +966,9 @@ impl<'a> DocumentBuilder<'a, document_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -979,11 +983,11 @@ where
         mut self,
         value: impl Into<Vec<DocumentContentItem<'a>>>,
     ) -> DocumentBuilder<'a, document_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -996,7 +1000,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Document<'a> {
         Document {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1009,7 +1013,7 @@ where
         >,
     ) -> Document<'a> {
         Document {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1049,9 +1053,9 @@ pub mod heading_block_state {
 
 /// Builder for constructing an instance of this type
 pub struct HeadingBlockBuilder<'a, S: heading_block_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<Facet<'a>>>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<Facet<'a>>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> HeadingBlock<'a> {
@@ -1065,9 +1069,9 @@ impl<'a> HeadingBlockBuilder<'a, heading_block_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HeadingBlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1075,12 +1079,12 @@ impl<'a> HeadingBlockBuilder<'a, heading_block_state::Empty> {
 impl<'a, S: heading_block_state::State> HeadingBlockBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1095,11 +1099,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> HeadingBlockBuilder<'a, heading_block_state::SetLevel<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         HeadingBlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1107,12 +1111,12 @@ where
 impl<'a, S: heading_block_state::State> HeadingBlockBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1125,9 +1129,9 @@ where
     /// Build the final struct
     pub fn build(self) -> HeadingBlock<'a> {
         HeadingBlock {
-            facets: self.__unsafe_private_named.0,
-            level: self.__unsafe_private_named.1.unwrap(),
-            text: self.__unsafe_private_named.2,
+            facets: self._fields.0,
+            level: self._fields.1.unwrap(),
+            text: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -1140,9 +1144,9 @@ where
         >,
     ) -> HeadingBlock<'a> {
         HeadingBlock {
-            facets: self.__unsafe_private_named.0,
-            level: self.__unsafe_private_named.1.unwrap(),
-            text: self.__unsafe_private_named.2,
+            facets: self._fields.0,
+            level: self._fields.1.unwrap(),
+            text: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -1182,9 +1186,9 @@ pub mod ordered_list_block_state {
 
 /// Builder for constructing an instance of this type
 pub struct OrderedListBlockBuilder<'a, S: ordered_list_block_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<richtext::ListItem<'a>>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<richtext::ListItem<'a>>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> OrderedListBlock<'a> {
@@ -1198,9 +1202,9 @@ impl<'a> OrderedListBlockBuilder<'a, ordered_list_block_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OrderedListBlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1215,11 +1219,11 @@ where
         mut self,
         value: impl Into<Vec<richtext::ListItem<'a>>>,
     ) -> OrderedListBlockBuilder<'a, ordered_list_block_state::SetItems<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         OrderedListBlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1227,12 +1231,12 @@ where
 impl<'a, S: ordered_list_block_state::State> OrderedListBlockBuilder<'a, S> {
     /// Set the `start` field (optional)
     pub fn start(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `start` field to an Option value (optional)
     pub fn maybe_start(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1245,8 +1249,8 @@ where
     /// Build the final struct
     pub fn build(self) -> OrderedListBlock<'a> {
         OrderedListBlock {
-            items: self.__unsafe_private_named.0.unwrap(),
-            start: self.__unsafe_private_named.1,
+            items: self._fields.0.unwrap(),
+            start: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -1259,8 +1263,8 @@ where
         >,
     ) -> OrderedListBlock<'a> {
         OrderedListBlock {
-            items: self.__unsafe_private_named.0.unwrap(),
-            start: self.__unsafe_private_named.1,
+            items: self._fields.0.unwrap(),
+            start: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_deckbelcher/richtext/facet.rs b/crates/jacquard-api/src/com_deckbelcher/richtext/facet.rs
index ebe9a663..2c0536d1 100644
--- a/crates/jacquard-api/src/com_deckbelcher/richtext/facet.rs
+++ b/crates/jacquard-api/src/com_deckbelcher/richtext/facet.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -605,45 +608,45 @@ pub mod byte_slice_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ByteStart;
         type ByteEnd;
+        type ByteStart;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ByteStart = Unset;
         type ByteEnd = Unset;
-    }
-    ///State transition - sets the `byte_start` field to Set
-    pub struct SetByteStart<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetByteStart<S> {}
-    impl<S: State> State for SetByteStart<S> {
-        type ByteStart = Set<members::byte_start>;
-        type ByteEnd = S::ByteEnd;
+        type ByteStart = Unset;
     }
     ///State transition - sets the `byte_end` field to Set
     pub struct SetByteEnd<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetByteEnd<S> {}
     impl<S: State> State for SetByteEnd<S> {
-        type ByteStart = S::ByteStart;
         type ByteEnd = Set<members::byte_end>;
+        type ByteStart = S::ByteStart;
+    }
+    ///State transition - sets the `byte_start` field to Set
+    pub struct SetByteStart<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetByteStart<S> {}
+    impl<S: State> State for SetByteStart<S> {
+        type ByteEnd = S::ByteEnd;
+        type ByteStart = Set<members::byte_start>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `byte_start` field
-        pub struct byte_start(());
         ///Marker type for the `byte_end` field
         pub struct byte_end(());
+        ///Marker type for the `byte_start` field
+        pub struct byte_start(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ByteSliceBuilder<'a, S: byte_slice_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ByteSlice<'a> {
@@ -657,9 +660,9 @@ impl<'a> ByteSliceBuilder<'a, byte_slice_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -674,11 +677,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteEnd<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -693,11 +696,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteStart<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -705,14 +708,14 @@ where
 impl<'a, S> ByteSliceBuilder<'a, S>
 where
     S: byte_slice_state::State,
-    S::ByteStart: byte_slice_state::IsSet,
     S::ByteEnd: byte_slice_state::IsSet,
+    S::ByteStart: byte_slice_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -725,8 +728,8 @@ where
         >,
     ) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -766,9 +769,9 @@ pub mod card_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct CardRefBuilder<'a, S: card_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<com_deckbelcher::CardRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<com_deckbelcher::CardRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CardRef<'a> {
@@ -782,9 +785,9 @@ impl<'a> CardRefBuilder<'a, card_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CardRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -799,11 +802,11 @@ where
         mut self,
         value: impl Into<com_deckbelcher::CardRef<'a>>,
     ) -> CardRefBuilder<'a, card_ref_state::SetRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CardRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -816,7 +819,7 @@ where
     /// Build the final struct
     pub fn build(self) -> CardRef<'a> {
         CardRef {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -829,7 +832,7 @@ where
         >,
     ) -> CardRef<'a> {
         CardRef {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -869,9 +872,9 @@ pub mod link_state {
 
 /// Builder for constructing an instance of this type
 pub struct LinkBuilder<'a, S: link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Link<'a> {
@@ -885,9 +888,9 @@ impl<'a> LinkBuilder<'a, link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -902,11 +905,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LinkBuilder<'a, link_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -919,7 +922,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Link<'a> {
         Link {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -932,7 +935,7 @@ where
         >,
     ) -> Link<'a> {
         Link {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -984,12 +987,9 @@ pub mod facet_state {
 
 /// Builder for constructing an instance of this type
 pub struct FacetBuilder<'a, S: facet_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<FacetFeaturesItem<'a>>>,
-        Option<facet::ByteSlice<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<FacetFeaturesItem<'a>>>, Option<facet::ByteSlice<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Facet<'a> {
@@ -1003,9 +1003,9 @@ impl<'a> FacetBuilder<'a, facet_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1020,11 +1020,11 @@ where
         mut self,
         value: impl Into<Vec<FacetFeaturesItem<'a>>>,
     ) -> FacetBuilder<'a, facet_state::SetFeatures<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1039,11 +1039,11 @@ where
         mut self,
         value: impl Into<facet::ByteSlice<'a>>,
     ) -> FacetBuilder<'a, facet_state::SetIndex<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1057,8 +1057,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1071,8 +1071,8 @@ where
         >,
     ) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1112,9 +1112,9 @@ pub mod mention_state {
 
 /// Builder for constructing an instance of this type
 pub struct MentionBuilder<'a, S: mention_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Mention<'a> {
@@ -1128,9 +1128,9 @@ impl<'a> MentionBuilder<'a, mention_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1145,11 +1145,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MentionBuilder<'a, mention_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1162,7 +1162,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Mention<'a> {
         Mention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1175,7 +1175,7 @@ where
         >,
     ) -> Mention<'a> {
         Mention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_deckbelcher/social/comment.rs b/crates/jacquard-api/src/com_deckbelcher/social/comment.rs
index db539ec3..a22fc481 100644
--- a/crates/jacquard-api/src/com_deckbelcher/social/comment.rs
+++ b/crates/jacquard-api/src/com_deckbelcher/social/comment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -372,9 +375,9 @@ pub mod card_subject_state {
 
 /// Builder for constructing an instance of this type
 pub struct CardSubjectBuilder<'a, S: card_subject_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CardRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CardRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CardSubject<'a> {
@@ -388,9 +391,9 @@ impl<'a> CardSubjectBuilder<'a, card_subject_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CardSubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -405,11 +408,11 @@ where
         mut self,
         value: impl Into<CardRef<'a>>,
     ) -> CardSubjectBuilder<'a, card_subject_state::SetRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CardSubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -422,7 +425,7 @@ where
     /// Build the final struct
     pub fn build(self) -> CardSubject<'a> {
         CardSubject {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -435,7 +438,7 @@ where
         >,
     ) -> CardSubject<'a> {
         CardSubject {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -713,9 +716,9 @@ pub mod card_target_state {
 
 /// Builder for constructing an instance of this type
 pub struct CardTargetBuilder<'a, S: card_target_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CardRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CardRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CardTarget<'a> {
@@ -729,9 +732,9 @@ impl<'a> CardTargetBuilder<'a, card_target_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CardTargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -746,11 +749,11 @@ where
         mut self,
         value: impl Into<CardRef<'a>>,
     ) -> CardTargetBuilder<'a, card_target_state::SetRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CardTargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -763,7 +766,7 @@ where
     /// Build the final struct
     pub fn build(self) -> CardTarget<'a> {
         CardTarget {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -776,7 +779,7 @@ where
         >,
     ) -> CardTarget<'a> {
         CardTarget {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -816,9 +819,9 @@ pub mod deck_target_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeckTargetBuilder<'a, S: deck_target_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeckTarget<'a> {
@@ -832,9 +835,9 @@ impl<'a> DeckTargetBuilder<'a, deck_target_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeckTargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -849,11 +852,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> DeckTargetBuilder<'a, deck_target_state::SetRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeckTargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -866,7 +869,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DeckTarget<'a> {
         DeckTarget {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -879,7 +882,7 @@ where
         >,
     ) -> DeckTarget<'a> {
         DeckTarget {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -895,65 +898,65 @@ pub mod comment_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type Content;
         type Subject;
+        type Content;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type Content = Unset;
         type Subject = Unset;
+        type Content = Unset;
+        type CreatedAt = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type Subject = Set<members::subject>;
         type Content = S::Content;
-        type Subject = S::Subject;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `content` field to Set
     pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContent<S> {}
     impl<S: State> State for SetContent<S> {
-        type CreatedAt = S::CreatedAt;
-        type Content = Set<members::content>;
         type Subject = S::Subject;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
+        type Content = Set<members::content>;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
         type Content = S::Content;
-        type Subject = Set<members::subject>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `content` field
-        pub struct content(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `content` field
+        pub struct content(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CommentBuilder<'a, S: comment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Document<'a>>,
         Option<Datetime>,
         Option<CommentSubject<'a>>,
         Option<CommentTarget<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Comment<'a> {
@@ -967,9 +970,9 @@ impl<'a> CommentBuilder<'a, comment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -984,11 +987,11 @@ where
         mut self,
         value: impl Into<Document<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1003,11 +1006,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CommentBuilder<'a, comment_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1022,11 +1025,11 @@ where
         mut self,
         value: impl Into<CommentSubject<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1034,12 +1037,12 @@ where
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `target` field (optional)
     pub fn target(mut self, value: impl Into<Option<CommentTarget<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `target` field to an Option value (optional)
     pub fn maybe_target(mut self, value: Option<CommentTarget<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1047,12 +1050,12 @@ impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1060,18 +1063,18 @@ impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
 impl<'a, S> CommentBuilder<'a, S>
 where
     S: comment_state::State,
-    S::CreatedAt: comment_state::IsSet,
-    S::Content: comment_state::IsSet,
     S::Subject: comment_state::IsSet,
+    S::Content: comment_state::IsSet,
+    S::CreatedAt: comment_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Comment<'a> {
         Comment {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
-            target: self.__unsafe_private_named.3,
-            updated_at: self.__unsafe_private_named.4,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
+            target: self._fields.3,
+            updated_at: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -1084,11 +1087,11 @@ where
         >,
     ) -> Comment<'a> {
         Comment {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
-            target: self.__unsafe_private_named.3,
-            updated_at: self.__unsafe_private_named.4,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
+            target: self._fields.3,
+            updated_at: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
@@ -1128,9 +1131,9 @@ pub mod record_subject_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordSubjectBuilder<'a, S: record_subject_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RecordSubject<'a> {
@@ -1144,9 +1147,9 @@ impl<'a> RecordSubjectBuilder<'a, record_subject_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordSubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1161,11 +1164,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> RecordSubjectBuilder<'a, record_subject_state::SetRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordSubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1178,7 +1181,7 @@ where
     /// Build the final struct
     pub fn build(self) -> RecordSubject<'a> {
         RecordSubject {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1191,7 +1194,7 @@ where
         >,
     ) -> RecordSubject<'a> {
         RecordSubject {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_deckbelcher/social/like.rs b/crates/jacquard-api/src/com_deckbelcher/social/like.rs
index 72010777..97781fc4 100644
--- a/crates/jacquard-api/src/com_deckbelcher/social/like.rs
+++ b/crates/jacquard-api/src/com_deckbelcher/social/like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -201,9 +204,9 @@ pub mod card_subject_state {
 
 /// Builder for constructing an instance of this type
 pub struct CardSubjectBuilder<'a, S: card_subject_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CardRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CardRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CardSubject<'a> {
@@ -217,9 +220,9 @@ impl<'a> CardSubjectBuilder<'a, card_subject_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CardSubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<CardRef<'a>>,
     ) -> CardSubjectBuilder<'a, card_subject_state::SetRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CardSubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -251,7 +254,7 @@ where
     /// Build the final struct
     pub fn build(self) -> CardSubject<'a> {
         CardSubject {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -264,7 +267,7 @@ where
         >,
     ) -> CardSubject<'a> {
         CardSubject {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -389,45 +392,45 @@ pub mod like_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type CreatedAt;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
+        type Subject = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<LikeSubject<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<LikeSubject<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -441,9 +444,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -458,11 +461,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -477,11 +480,11 @@ where
         mut self,
         value: impl Into<LikeSubject<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -489,14 +492,14 @@ where
 impl<'a, S> LikeBuilder<'a, S>
 where
     S: like_state::State,
-    S::Subject: like_state::IsSet,
     S::CreatedAt: like_state::IsSet,
+    S::Subject: like_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -509,8 +512,8 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -550,9 +553,9 @@ pub mod record_subject_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordSubjectBuilder<'a, S: record_subject_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RecordSubject<'a> {
@@ -566,9 +569,9 @@ impl<'a> RecordSubjectBuilder<'a, record_subject_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordSubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -583,11 +586,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> RecordSubjectBuilder<'a, record_subject_state::SetRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordSubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -600,7 +603,7 @@ where
     /// Build the final struct
     pub fn build(self) -> RecordSubject<'a> {
         RecordSubject {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -613,7 +616,7 @@ where
         >,
     ) -> RecordSubject<'a> {
         RecordSubject {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
+            r#ref: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_deckbelcher/social/reply.rs b/crates/jacquard-api/src/com_deckbelcher/social/reply.rs
index a387f99f..18eccdf7 100644
--- a/crates/jacquard-api/src/com_deckbelcher/social/reply.rs
+++ b/crates/jacquard-api/src/com_deckbelcher/social/reply.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -119,81 +122,81 @@ pub mod reply_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type Content;
-        type Root;
         type Parent;
+        type Root;
+        type Content;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type Content = Unset;
-        type Root = Unset;
         type Parent = Unset;
+        type Root = Unset;
+        type Content = Unset;
+        type CreatedAt = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Content = S::Content;
+    ///State transition - sets the `parent` field to Set
+    pub struct SetParent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetParent<S> {}
+    impl<S: State> State for SetParent<S> {
+        type Parent = Set<members::parent>;
         type Root = S::Root;
-        type Parent = S::Parent;
-    }
-    ///State transition - sets the `content` field to Set
-    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContent<S> {}
-    impl<S: State> State for SetContent<S> {
+        type Content = S::Content;
         type CreatedAt = S::CreatedAt;
-        type Content = Set<members::content>;
-        type Root = S::Root;
-        type Parent = S::Parent;
     }
     ///State transition - sets the `root` field to Set
     pub struct SetRoot<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRoot<S> {}
     impl<S: State> State for SetRoot<S> {
-        type CreatedAt = S::CreatedAt;
-        type Content = S::Content;
-        type Root = Set<members::root>;
         type Parent = S::Parent;
+        type Root = Set<members::root>;
+        type Content = S::Content;
+        type CreatedAt = S::CreatedAt;
     }
-    ///State transition - sets the `parent` field to Set
-    pub struct SetParent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetParent<S> {}
-    impl<S: State> State for SetParent<S> {
+    ///State transition - sets the `content` field to Set
+    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContent<S> {}
+    impl<S: State> State for SetContent<S> {
+        type Parent = S::Parent;
+        type Root = S::Root;
+        type Content = Set<members::content>;
         type CreatedAt = S::CreatedAt;
-        type Content = S::Content;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Parent = S::Parent;
         type Root = S::Root;
-        type Parent = Set<members::parent>;
+        type Content = S::Content;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `content` field
-        pub struct content(());
-        ///Marker type for the `root` field
-        pub struct root(());
         ///Marker type for the `parent` field
         pub struct parent(());
+        ///Marker type for the `root` field
+        pub struct root(());
+        ///Marker type for the `content` field
+        pub struct content(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReplyBuilder<'a, S: reply_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Document<'a>>,
         Option<Datetime>,
         Option<StrongRef<'a>>,
         Option<StrongRef<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Reply<'a> {
@@ -207,9 +210,9 @@ impl<'a> ReplyBuilder<'a, reply_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReplyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -224,11 +227,11 @@ where
         mut self,
         value: impl Into<Document<'a>>,
     ) -> ReplyBuilder<'a, reply_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReplyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -243,11 +246,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReplyBuilder<'a, reply_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReplyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -262,11 +265,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ReplyBuilder<'a, reply_state::SetParent<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReplyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -281,11 +284,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ReplyBuilder<'a, reply_state::SetRoot<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ReplyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -293,12 +296,12 @@ where
 impl<'a, S: reply_state::State> ReplyBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -306,19 +309,19 @@ impl<'a, S: reply_state::State> ReplyBuilder<'a, S> {
 impl<'a, S> ReplyBuilder<'a, S>
 where
     S: reply_state::State,
-    S::CreatedAt: reply_state::IsSet,
-    S::Content: reply_state::IsSet,
-    S::Root: reply_state::IsSet,
     S::Parent: reply_state::IsSet,
+    S::Root: reply_state::IsSet,
+    S::Content: reply_state::IsSet,
+    S::CreatedAt: reply_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Reply<'a> {
         Reply {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            parent: self.__unsafe_private_named.2.unwrap(),
-            root: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            parent: self._fields.2.unwrap(),
+            root: self._fields.3.unwrap(),
+            updated_at: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -331,11 +334,11 @@ where
         >,
     ) -> Reply<'a> {
         Reply {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            parent: self.__unsafe_private_named.2.unwrap(),
-            root: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            parent: self._fields.2.unwrap(),
+            root: self._fields.3.unwrap(),
+            updated_at: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_germnetwork/declaration.rs b/crates/jacquard-api/src/com_germnetwork/declaration.rs
index 0930c79a..ede81eb1 100644
--- a/crates/jacquard-api/src/com_germnetwork/declaration.rs
+++ b/crates/jacquard-api/src/com_germnetwork/declaration.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -361,15 +364,15 @@ pub mod declaration_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeclarationBuilder<'a, S: declaration_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<Bytes>>,
         Option<Bytes>,
         Option<Bytes>,
         Option<declaration::MessageMe<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Declaration<'a> {
@@ -383,9 +386,9 @@ impl<'a> DeclarationBuilder<'a, declaration_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeclarationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -393,12 +396,12 @@ impl<'a> DeclarationBuilder<'a, declaration_state::Empty> {
 impl<'a, S: declaration_state::State> DeclarationBuilder<'a, S> {
     /// Set the `continuityProofs` field (optional)
     pub fn continuity_proofs(mut self, value: impl Into<Option<Vec<Bytes>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `continuityProofs` field to an Option value (optional)
     pub fn maybe_continuity_proofs(mut self, value: Option<Vec<Bytes>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -413,11 +416,11 @@ where
         mut self,
         value: impl Into<Bytes>,
     ) -> DeclarationBuilder<'a, declaration_state::SetCurrentKey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DeclarationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -425,12 +428,12 @@ where
 impl<'a, S: declaration_state::State> DeclarationBuilder<'a, S> {
     /// Set the `keyPackage` field (optional)
     pub fn key_package(mut self, value: impl Into<Option<Bytes>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `keyPackage` field to an Option value (optional)
     pub fn maybe_key_package(mut self, value: Option<Bytes>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -441,7 +444,7 @@ impl<'a, S: declaration_state::State> DeclarationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<declaration::MessageMe<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `messageMe` field to an Option value (optional)
@@ -449,7 +452,7 @@ impl<'a, S: declaration_state::State> DeclarationBuilder<'a, S> {
         mut self,
         value: Option<declaration::MessageMe<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -464,11 +467,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DeclarationBuilder<'a, declaration_state::SetVersion<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         DeclarationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -482,11 +485,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Declaration<'a> {
         Declaration {
-            continuity_proofs: self.__unsafe_private_named.0,
-            current_key: self.__unsafe_private_named.1.unwrap(),
-            key_package: self.__unsafe_private_named.2,
-            message_me: self.__unsafe_private_named.3,
-            version: self.__unsafe_private_named.4.unwrap(),
+            continuity_proofs: self._fields.0,
+            current_key: self._fields.1.unwrap(),
+            key_package: self._fields.2,
+            message_me: self._fields.3,
+            version: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -499,11 +502,11 @@ where
         >,
     ) -> Declaration<'a> {
         Declaration {
-            continuity_proofs: self.__unsafe_private_named.0,
-            current_key: self.__unsafe_private_named.1.unwrap(),
-            key_package: self.__unsafe_private_named.2,
-            message_me: self.__unsafe_private_named.3,
-            version: self.__unsafe_private_named.4.unwrap(),
+            continuity_proofs: self._fields.0,
+            current_key: self._fields.1.unwrap(),
+            key_package: self._fields.2,
+            message_me: self._fields.3,
+            version: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -646,45 +649,45 @@ pub mod message_me_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type MessageMeUrl;
         type ShowButtonTo;
+        type MessageMeUrl;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type MessageMeUrl = Unset;
         type ShowButtonTo = Unset;
-    }
-    ///State transition - sets the `message_me_url` field to Set
-    pub struct SetMessageMeUrl<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMessageMeUrl<S> {}
-    impl<S: State> State for SetMessageMeUrl<S> {
-        type MessageMeUrl = Set<members::message_me_url>;
-        type ShowButtonTo = S::ShowButtonTo;
+        type MessageMeUrl = Unset;
     }
     ///State transition - sets the `show_button_to` field to Set
     pub struct SetShowButtonTo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetShowButtonTo<S> {}
     impl<S: State> State for SetShowButtonTo<S> {
-        type MessageMeUrl = S::MessageMeUrl;
         type ShowButtonTo = Set<members::show_button_to>;
+        type MessageMeUrl = S::MessageMeUrl;
+    }
+    ///State transition - sets the `message_me_url` field to Set
+    pub struct SetMessageMeUrl<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMessageMeUrl<S> {}
+    impl<S: State> State for SetMessageMeUrl<S> {
+        type ShowButtonTo = S::ShowButtonTo;
+        type MessageMeUrl = Set<members::message_me_url>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `message_me_url` field
-        pub struct message_me_url(());
         ///Marker type for the `show_button_to` field
         pub struct show_button_to(());
+        ///Marker type for the `message_me_url` field
+        pub struct message_me_url(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MessageMeBuilder<'a, S: message_me_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>, Option<MessageMeShowButtonTo<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>, Option<MessageMeShowButtonTo<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MessageMe<'a> {
@@ -698,9 +701,9 @@ impl<'a> MessageMeBuilder<'a, message_me_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MessageMeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -715,11 +718,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> MessageMeBuilder<'a, message_me_state::SetMessageMeUrl<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MessageMeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -734,11 +737,11 @@ where
         mut self,
         value: impl Into<MessageMeShowButtonTo<'a>>,
     ) -> MessageMeBuilder<'a, message_me_state::SetShowButtonTo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MessageMeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -746,14 +749,14 @@ where
 impl<'a, S> MessageMeBuilder<'a, S>
 where
     S: message_me_state::State,
-    S::MessageMeUrl: message_me_state::IsSet,
     S::ShowButtonTo: message_me_state::IsSet,
+    S::MessageMeUrl: message_me_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> MessageMe<'a> {
         MessageMe {
-            message_me_url: self.__unsafe_private_named.0.unwrap(),
-            show_button_to: self.__unsafe_private_named.1.unwrap(),
+            message_me_url: self._fields.0.unwrap(),
+            show_button_to: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -766,8 +769,8 @@ where
         >,
     ) -> MessageMe<'a> {
         MessageMe {
-            message_me_url: self.__unsafe_private_named.0.unwrap(),
-            show_button_to: self.__unsafe_private_named.1.unwrap(),
+            message_me_url: self._fields.0.unwrap(),
+            show_button_to: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_kipclip/annotation.rs b/crates/jacquard-api/src/com_kipclip/annotation.rs
index 030058e7..e85ad817 100644
--- a/crates/jacquard-api/src/com_kipclip/annotation.rs
+++ b/crates/jacquard-api/src/com_kipclip/annotation.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -191,8 +194,8 @@ pub mod annotation_state {
 
 /// Builder for constructing an instance of this type
 pub struct AnnotationBuilder<'a, S: annotation_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
@@ -201,7 +204,7 @@ pub struct AnnotationBuilder<'a, S: annotation_state::State> {
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Annotation<'a> {
@@ -215,9 +218,9 @@ impl<'a> AnnotationBuilder<'a, annotation_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AnnotationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,11 +235,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AnnotationBuilder<'a, annotation_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AnnotationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,12 +247,12 @@ where
 impl<'a, S: annotation_state::State> AnnotationBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -257,12 +260,12 @@ impl<'a, S: annotation_state::State> AnnotationBuilder<'a, S> {
 impl<'a, S: annotation_state::State> AnnotationBuilder<'a, S> {
     /// Set the `favicon` field (optional)
     pub fn favicon(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `favicon` field to an Option value (optional)
     pub fn maybe_favicon(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -270,12 +273,12 @@ impl<'a, S: annotation_state::State> AnnotationBuilder<'a, S> {
 impl<'a, S: annotation_state::State> AnnotationBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -283,12 +286,12 @@ impl<'a, S: annotation_state::State> AnnotationBuilder<'a, S> {
 impl<'a, S: annotation_state::State> AnnotationBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -303,11 +306,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> AnnotationBuilder<'a, annotation_state::SetSubject<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         AnnotationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -315,12 +318,12 @@ where
 impl<'a, S: annotation_state::State> AnnotationBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -334,13 +337,13 @@ where
     /// Build the final struct
     pub fn build(self) -> Annotation<'a> {
         Annotation {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            favicon: self.__unsafe_private_named.2,
-            image: self.__unsafe_private_named.3,
-            note: self.__unsafe_private_named.4,
-            subject: self.__unsafe_private_named.5.unwrap(),
-            title: self.__unsafe_private_named.6,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            favicon: self._fields.2,
+            image: self._fields.3,
+            note: self._fields.4,
+            subject: self._fields.5.unwrap(),
+            title: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -353,13 +356,13 @@ where
         >,
     ) -> Annotation<'a> {
         Annotation {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            favicon: self.__unsafe_private_named.2,
-            image: self.__unsafe_private_named.3,
-            note: self.__unsafe_private_named.4,
-            subject: self.__unsafe_private_named.5.unwrap(),
-            title: self.__unsafe_private_named.6,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            favicon: self._fields.2,
+            image: self._fields.3,
+            note: self._fields.4,
+            subject: self._fields.5.unwrap(),
+            title: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_kipclip/tag.rs b/crates/jacquard-api/src/com_kipclip/tag.rs
index 1c05d49e..6ee7edca 100644
--- a/crates/jacquard-api/src/com_kipclip/tag.rs
+++ b/crates/jacquard-api/src/com_kipclip/tag.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -121,45 +124,45 @@ pub mod tag_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Value;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Value = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Value = S::Value;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `value` field to Set
     pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetValue<S> {}
     impl<S: State> State for SetValue<S> {
-        type CreatedAt = S::CreatedAt;
         type Value = Set<members::value>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Value = S::Value;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `value` field
         pub struct value(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TagBuilder<'a, S: tag_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Tag<'a> {
@@ -173,9 +176,9 @@ impl<'a> TagBuilder<'a, tag_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -190,11 +193,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TagBuilder<'a, tag_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,11 +212,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TagBuilder<'a, tag_state::SetValue<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,14 +224,14 @@ where
 impl<'a, S> TagBuilder<'a, S>
 where
     S: tag_state::State,
-    S::CreatedAt: tag_state::IsSet,
     S::Value: tag_state::IsSet,
+    S::CreatedAt: tag_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Tag<'a> {
         Tag {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            value: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            value: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -241,8 +244,8 @@ where
         >,
     ) -> Tag<'a> {
         Tag {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            value: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            value: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/app_view_defs.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/app_view_defs.rs
index d1066dee..5cd2fa32 100644
--- a/crates/jacquard-api/src/com_shinolabs/pinksea/app_view_defs.rs
+++ b/crates/jacquard-api/src/com_shinolabs/pinksea/app_view_defs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -177,9 +180,9 @@ pub mod author_state {
 
 /// Builder for constructing an instance of this type
 pub struct AuthorBuilder<'a, S: author_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Handle<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Handle<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Author<'a> {
@@ -193,9 +196,9 @@ impl<'a> AuthorBuilder<'a, author_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AuthorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,11 +213,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> AuthorBuilder<'a, author_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AuthorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -229,11 +232,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> AuthorBuilder<'a, author_state::SetHandle<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AuthorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -247,8 +250,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Author<'a> {
         Author {
-            did: self.__unsafe_private_named.0.unwrap(),
-            handle: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            handle: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -261,8 +264,8 @@ where
         >,
     ) -> Author<'a> {
         Author {
-            did: self.__unsafe_private_named.0.unwrap(),
-            handle: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            handle: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -452,103 +455,103 @@ pub mod hydrated_oekaki_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Author;
-        type Cid;
-        type Nsfw;
         type At;
+        type Nsfw;
+        type Cid;
         type Image;
+        type Author;
         type CreationTime;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Author = Unset;
-        type Cid = Unset;
-        type Nsfw = Unset;
         type At = Unset;
+        type Nsfw = Unset;
+        type Cid = Unset;
         type Image = Unset;
+        type Author = Unset;
         type CreationTime = Unset;
     }
-    ///State transition - sets the `author` field to Set
-    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAuthor<S> {}
-    impl<S: State> State for SetAuthor<S> {
-        type Author = Set<members::author>;
-        type Cid = S::Cid;
+    ///State transition - sets the `at` field to Set
+    pub struct SetAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAt<S> {}
+    impl<S: State> State for SetAt<S> {
+        type At = Set<members::at>;
         type Nsfw = S::Nsfw;
-        type At = S::At;
+        type Cid = S::Cid;
         type Image = S::Image;
-        type CreationTime = S::CreationTime;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
         type Author = S::Author;
-        type Cid = Set<members::cid>;
-        type Nsfw = S::Nsfw;
-        type At = S::At;
-        type Image = S::Image;
         type CreationTime = S::CreationTime;
     }
     ///State transition - sets the `nsfw` field to Set
     pub struct SetNsfw<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetNsfw<S> {}
     impl<S: State> State for SetNsfw<S> {
-        type Author = S::Author;
-        type Cid = S::Cid;
-        type Nsfw = Set<members::nsfw>;
         type At = S::At;
+        type Nsfw = Set<members::nsfw>;
+        type Cid = S::Cid;
         type Image = S::Image;
+        type Author = S::Author;
         type CreationTime = S::CreationTime;
     }
-    ///State transition - sets the `at` field to Set
-    pub struct SetAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAt<S> {}
-    impl<S: State> State for SetAt<S> {
-        type Author = S::Author;
-        type Cid = S::Cid;
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type At = S::At;
         type Nsfw = S::Nsfw;
-        type At = Set<members::at>;
+        type Cid = Set<members::cid>;
         type Image = S::Image;
+        type Author = S::Author;
         type CreationTime = S::CreationTime;
     }
     ///State transition - sets the `image` field to Set
     pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetImage<S> {}
     impl<S: State> State for SetImage<S> {
-        type Author = S::Author;
-        type Cid = S::Cid;
-        type Nsfw = S::Nsfw;
         type At = S::At;
+        type Nsfw = S::Nsfw;
+        type Cid = S::Cid;
         type Image = Set<members::image>;
+        type Author = S::Author;
+        type CreationTime = S::CreationTime;
+    }
+    ///State transition - sets the `author` field to Set
+    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAuthor<S> {}
+    impl<S: State> State for SetAuthor<S> {
+        type At = S::At;
+        type Nsfw = S::Nsfw;
+        type Cid = S::Cid;
+        type Image = S::Image;
+        type Author = Set<members::author>;
         type CreationTime = S::CreationTime;
     }
     ///State transition - sets the `creation_time` field to Set
     pub struct SetCreationTime<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreationTime<S> {}
     impl<S: State> State for SetCreationTime<S> {
-        type Author = S::Author;
-        type Cid = S::Cid;
-        type Nsfw = S::Nsfw;
         type At = S::At;
+        type Nsfw = S::Nsfw;
+        type Cid = S::Cid;
         type Image = S::Image;
+        type Author = S::Author;
         type CreationTime = Set<members::creation_time>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `author` field
-        pub struct author(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
-        ///Marker type for the `nsfw` field
-        pub struct nsfw(());
         ///Marker type for the `at` field
         pub struct at(());
+        ///Marker type for the `nsfw` field
+        pub struct nsfw(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
         ///Marker type for the `image` field
         pub struct image(());
+        ///Marker type for the `author` field
+        pub struct author(());
         ///Marker type for the `creation_time` field
         pub struct creation_time(());
     }
@@ -556,8 +559,8 @@ pub mod hydrated_oekaki_state {
 
 /// Builder for constructing an instance of this type
 pub struct HydratedOekakiBuilder<'a, S: hydrated_oekaki_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<app_view_defs::Author<'a>>,
@@ -567,7 +570,7 @@ pub struct HydratedOekakiBuilder<'a, S: hydrated_oekaki_state::State> {
         Option<bool>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> HydratedOekaki<'a> {
@@ -581,9 +584,9 @@ impl<'a> HydratedOekakiBuilder<'a, hydrated_oekaki_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HydratedOekakiBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -591,12 +594,12 @@ impl<'a> HydratedOekakiBuilder<'a, hydrated_oekaki_state::Empty> {
 impl<'a, S: hydrated_oekaki_state::State> HydratedOekakiBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -611,11 +614,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> HydratedOekakiBuilder<'a, hydrated_oekaki_state::SetAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         HydratedOekakiBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -630,11 +633,11 @@ where
         mut self,
         value: impl Into<app_view_defs::Author<'a>>,
     ) -> HydratedOekakiBuilder<'a, hydrated_oekaki_state::SetAuthor<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         HydratedOekakiBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -649,11 +652,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> HydratedOekakiBuilder<'a, hydrated_oekaki_state::SetCid<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         HydratedOekakiBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -668,11 +671,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> HydratedOekakiBuilder<'a, hydrated_oekaki_state::SetCreationTime<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         HydratedOekakiBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -687,11 +690,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> HydratedOekakiBuilder<'a, hydrated_oekaki_state::SetImage<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         HydratedOekakiBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -706,11 +709,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> HydratedOekakiBuilder<'a, hydrated_oekaki_state::SetNsfw<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         HydratedOekakiBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -718,12 +721,12 @@ where
 impl<'a, S: hydrated_oekaki_state::State> HydratedOekakiBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -731,24 +734,24 @@ impl<'a, S: hydrated_oekaki_state::State> HydratedOekakiBuilder<'a, S> {
 impl<'a, S> HydratedOekakiBuilder<'a, S>
 where
     S: hydrated_oekaki_state::State,
-    S::Author: hydrated_oekaki_state::IsSet,
-    S::Cid: hydrated_oekaki_state::IsSet,
-    S::Nsfw: hydrated_oekaki_state::IsSet,
     S::At: hydrated_oekaki_state::IsSet,
+    S::Nsfw: hydrated_oekaki_state::IsSet,
+    S::Cid: hydrated_oekaki_state::IsSet,
     S::Image: hydrated_oekaki_state::IsSet,
+    S::Author: hydrated_oekaki_state::IsSet,
     S::CreationTime: hydrated_oekaki_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> HydratedOekaki<'a> {
         HydratedOekaki {
-            alt: self.__unsafe_private_named.0,
-            at: self.__unsafe_private_named.1.unwrap(),
-            author: self.__unsafe_private_named.2.unwrap(),
-            cid: self.__unsafe_private_named.3.unwrap(),
-            creation_time: self.__unsafe_private_named.4.unwrap(),
-            image: self.__unsafe_private_named.5.unwrap(),
-            nsfw: self.__unsafe_private_named.6.unwrap(),
-            tags: self.__unsafe_private_named.7,
+            alt: self._fields.0,
+            at: self._fields.1.unwrap(),
+            author: self._fields.2.unwrap(),
+            cid: self._fields.3.unwrap(),
+            creation_time: self._fields.4.unwrap(),
+            image: self._fields.5.unwrap(),
+            nsfw: self._fields.6.unwrap(),
+            tags: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -761,14 +764,14 @@ where
         >,
     ) -> HydratedOekaki<'a> {
         HydratedOekaki {
-            alt: self.__unsafe_private_named.0,
-            at: self.__unsafe_private_named.1.unwrap(),
-            author: self.__unsafe_private_named.2.unwrap(),
-            cid: self.__unsafe_private_named.3.unwrap(),
-            creation_time: self.__unsafe_private_named.4.unwrap(),
-            image: self.__unsafe_private_named.5.unwrap(),
-            nsfw: self.__unsafe_private_named.6.unwrap(),
-            tags: self.__unsafe_private_named.7,
+            alt: self._fields.0,
+            at: self._fields.1.unwrap(),
+            author: self._fields.2.unwrap(),
+            cid: self._fields.3.unwrap(),
+            creation_time: self._fields.4.unwrap(),
+            image: self._fields.5.unwrap(),
+            nsfw: self._fields.6.unwrap(),
+            tags: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
@@ -808,9 +811,9 @@ pub mod oekaki_tombstone_state {
 
 /// Builder for constructing an instance of this type
 pub struct OekakiTombstoneBuilder<'a, S: oekaki_tombstone_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> OekakiTombstone<'a> {
@@ -824,9 +827,9 @@ impl<'a> OekakiTombstoneBuilder<'a, oekaki_tombstone_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OekakiTombstoneBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -841,11 +844,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> OekakiTombstoneBuilder<'a, oekaki_tombstone_state::SetFormerAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         OekakiTombstoneBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -858,7 +861,7 @@ where
     /// Build the final struct
     pub fn build(self) -> OekakiTombstone<'a> {
         OekakiTombstone {
-            former_at: self.__unsafe_private_named.0.unwrap(),
+            former_at: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -871,7 +874,7 @@ where
         >,
     ) -> OekakiTombstone<'a> {
         OekakiTombstone {
-            former_at: self.__unsafe_private_named.0.unwrap(),
+            former_at: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/get_author_feed.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/get_author_feed.rs
index 78030118..7acaa63a 100644
--- a/crates/jacquard-api/src/com_shinolabs/pinksea/get_author_feed.rs
+++ b/crates/jacquard-api/src/com_shinolabs/pinksea/get_author_feed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_common::types::string::Datetime;
@@ -97,9 +100,9 @@ pub mod get_author_feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetAuthorFeedBuilder<'a, S: get_author_feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<i64>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<i64>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetAuthorFeed<'a> {
@@ -113,9 +116,9 @@ impl<'a> GetAuthorFeedBuilder<'a, get_author_feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetAuthorFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -130,11 +133,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetAuthorFeedBuilder<'a, get_author_feed_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetAuthorFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,12 +145,12 @@ where
 impl<'a, S: get_author_feed_state::State> GetAuthorFeedBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -155,12 +158,12 @@ impl<'a, S: get_author_feed_state::State> GetAuthorFeedBuilder<'a, S> {
 impl<'a, S: get_author_feed_state::State> GetAuthorFeedBuilder<'a, S> {
     /// Set the `since` field (optional)
     pub fn since(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `since` field to an Option value (optional)
     pub fn maybe_since(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -173,9 +176,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetAuthorFeed<'a> {
         GetAuthorFeed {
-            did: self.__unsafe_private_named.0.unwrap(),
-            limit: self.__unsafe_private_named.1,
-            since: self.__unsafe_private_named.2,
+            did: self._fields.0.unwrap(),
+            limit: self._fields.1,
+            since: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/get_author_replies.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/get_author_replies.rs
index 68a60332..3329355b 100644
--- a/crates/jacquard-api/src/com_shinolabs/pinksea/get_author_replies.rs
+++ b/crates/jacquard-api/src/com_shinolabs/pinksea/get_author_replies.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_common::types::string::Datetime;
@@ -97,9 +100,9 @@ pub mod get_author_replies_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetAuthorRepliesBuilder<'a, S: get_author_replies_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<i64>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<i64>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetAuthorReplies<'a> {
@@ -113,9 +116,9 @@ impl<'a> GetAuthorRepliesBuilder<'a, get_author_replies_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetAuthorRepliesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -130,11 +133,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetAuthorRepliesBuilder<'a, get_author_replies_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetAuthorRepliesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,12 +145,12 @@ where
 impl<'a, S: get_author_replies_state::State> GetAuthorRepliesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -155,12 +158,12 @@ impl<'a, S: get_author_replies_state::State> GetAuthorRepliesBuilder<'a, S> {
 impl<'a, S: get_author_replies_state::State> GetAuthorRepliesBuilder<'a, S> {
     /// Set the `since` field (optional)
     pub fn since(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `since` field to an Option value (optional)
     pub fn maybe_since(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -173,9 +176,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetAuthorReplies<'a> {
         GetAuthorReplies {
-            did: self.__unsafe_private_named.0.unwrap(),
-            limit: self.__unsafe_private_named.1,
-            since: self.__unsafe_private_named.2,
+            did: self._fields.0.unwrap(),
+            limit: self._fields.1,
+            since: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/get_handle_from_did.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/get_handle_from_did.rs
index 87fbdbfa..4a37d370 100644
--- a/crates/jacquard-api/src/com_shinolabs/pinksea/get_handle_from_did.rs
+++ b/crates/jacquard-api/src/com_shinolabs/pinksea/get_handle_from_did.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_common::types::string::Handle;
@@ -87,9 +90,9 @@ pub mod get_handle_from_did_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetHandleFromDidBuilder<'a, S: get_handle_from_did_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetHandleFromDid<'a> {
@@ -103,9 +106,9 @@ impl<'a> GetHandleFromDidBuilder<'a, get_handle_from_did_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetHandleFromDidBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,11 +123,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetHandleFromDidBuilder<'a, get_handle_from_did_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetHandleFromDidBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,7 +140,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetHandleFromDid<'a> {
         GetHandleFromDid {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/get_identity.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/get_identity.rs
index e9c2ad97..0908bb60 100644
--- a/crates/jacquard-api/src/com_shinolabs/pinksea/get_identity.rs
+++ b/crates/jacquard-api/src/com_shinolabs/pinksea/get_identity.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_common::types::string::Handle;
diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/get_oekaki.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/get_oekaki.rs
index cef93dcd..4080e619 100644
--- a/crates/jacquard-api/src/com_shinolabs/pinksea/get_oekaki.rs
+++ b/crates/jacquard-api/src/com_shinolabs/pinksea/get_oekaki.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -80,45 +83,45 @@ pub mod get_oekaki_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Did;
         type Rkey;
+        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Did = Unset;
         type Rkey = Unset;
-    }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Did = Set<members::did>;
-        type Rkey = S::Rkey;
+        type Did = Unset;
     }
     ///State transition - sets the `rkey` field to Set
     pub struct SetRkey<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRkey<S> {}
     impl<S: State> State for SetRkey<S> {
-        type Did = S::Did;
         type Rkey = Set<members::rkey>;
+        type Did = S::Did;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Rkey = S::Rkey;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `rkey` field
         pub struct rkey(());
+        ///Marker type for the `did` field
+        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GetOekakiBuilder<'a, S: get_oekaki_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetOekaki<'a> {
@@ -132,9 +135,9 @@ impl<'a> GetOekakiBuilder<'a, get_oekaki_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetOekakiBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,11 +152,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetOekakiBuilder<'a, get_oekaki_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetOekakiBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -168,11 +171,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetOekakiBuilder<'a, get_oekaki_state::SetRkey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetOekakiBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,14 +183,14 @@ where
 impl<'a, S> GetOekakiBuilder<'a, S>
 where
     S: get_oekaki_state::State,
-    S::Did: get_oekaki_state::IsSet,
     S::Rkey: get_oekaki_state::IsSet,
+    S::Did: get_oekaki_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GetOekaki<'a> {
         GetOekaki {
-            did: self.__unsafe_private_named.0.unwrap(),
-            rkey: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            rkey: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/get_parent_for_reply.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/get_parent_for_reply.rs
index 8eb3f265..74371182 100644
--- a/crates/jacquard-api/src/com_shinolabs/pinksea/get_parent_for_reply.rs
+++ b/crates/jacquard-api/src/com_shinolabs/pinksea/get_parent_for_reply.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -104,9 +107,9 @@ pub mod get_parent_for_reply_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetParentForReplyBuilder<'a, S: get_parent_for_reply_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetParentForReply<'a> {
@@ -120,9 +123,9 @@ impl<'a> GetParentForReplyBuilder<'a, get_parent_for_reply_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetParentForReplyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,11 +140,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetParentForReplyBuilder<'a, get_parent_for_reply_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetParentForReplyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -156,11 +159,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetParentForReplyBuilder<'a, get_parent_for_reply_state::SetRkey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetParentForReplyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -174,8 +177,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetParentForReply<'a> {
         GetParentForReply {
-            did: self.__unsafe_private_named.0.unwrap(),
-            rkey: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            rkey: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/get_recent.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/get_recent.rs
index 8d25d58d..94ced164 100644
--- a/crates/jacquard-api/src/com_shinolabs/pinksea/get_recent.rs
+++ b/crates/jacquard-api/src/com_shinolabs/pinksea/get_recent.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Datetime;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -81,8 +84,8 @@ pub mod get_recent_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetRecentBuilder<S: get_recent_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Datetime>),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Datetime>),
 }
 
 impl GetRecent {
@@ -96,8 +99,8 @@ impl GetRecentBuilder<get_recent_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetRecentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
+            _state: PhantomData,
+            _fields: (None, None),
         }
     }
 }
@@ -105,12 +108,12 @@ impl GetRecentBuilder<get_recent_state::Empty> {
 impl<S: get_recent_state::State> GetRecentBuilder<S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -118,12 +121,12 @@ impl<S: get_recent_state::State> GetRecentBuilder<S> {
 impl<S: get_recent_state::State> GetRecentBuilder<S> {
     /// Set the `since` field (optional)
     pub fn since(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `since` field to an Option value (optional)
     pub fn maybe_since(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -135,8 +138,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetRecent {
         GetRecent {
-            limit: self.__unsafe_private_named.0,
-            since: self.__unsafe_private_named.1,
+            limit: self._fields.0,
+            since: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/get_tag_feed.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/get_tag_feed.rs
index ea9031eb..0b0471fb 100644
--- a/crates/jacquard-api/src/com_shinolabs/pinksea/get_tag_feed.rs
+++ b/crates/jacquard-api/src/com_shinolabs/pinksea/get_tag_feed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Datetime;
@@ -97,9 +100,9 @@ pub mod get_tag_feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTagFeedBuilder<'a, S: get_tag_feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetTagFeed<'a> {
@@ -113,9 +116,9 @@ impl<'a> GetTagFeedBuilder<'a, get_tag_feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTagFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -123,12 +126,12 @@ impl<'a> GetTagFeedBuilder<'a, get_tag_feed_state::Empty> {
 impl<'a, S: get_tag_feed_state::State> GetTagFeedBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -136,12 +139,12 @@ impl<'a, S: get_tag_feed_state::State> GetTagFeedBuilder<'a, S> {
 impl<'a, S: get_tag_feed_state::State> GetTagFeedBuilder<'a, S> {
     /// Set the `since` field (optional)
     pub fn since(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `since` field to an Option value (optional)
     pub fn maybe_since(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -156,11 +159,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetTagFeedBuilder<'a, get_tag_feed_state::SetTag<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetTagFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -173,9 +176,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetTagFeed<'a> {
         GetTagFeed {
-            limit: self.__unsafe_private_named.0,
-            since: self.__unsafe_private_named.1,
-            tag: self.__unsafe_private_named.2.unwrap(),
+            limit: self._fields.0,
+            since: self._fields.1,
+            tag: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs
index de223eb0..7cc681f8 100644
--- a/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs
+++ b/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -227,45 +230,45 @@ pub mod image_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Blob;
         type ImageLink;
+        type Blob;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Blob = Unset;
         type ImageLink = Unset;
-    }
-    ///State transition - sets the `blob` field to Set
-    pub struct SetBlob<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBlob<S> {}
-    impl<S: State> State for SetBlob<S> {
-        type Blob = Set<members::blob>;
-        type ImageLink = S::ImageLink;
+        type Blob = Unset;
     }
     ///State transition - sets the `image_link` field to Set
     pub struct SetImageLink<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetImageLink<S> {}
     impl<S: State> State for SetImageLink<S> {
-        type Blob = S::Blob;
         type ImageLink = Set<members::image_link>;
+        type Blob = S::Blob;
+    }
+    ///State transition - sets the `blob` field to Set
+    pub struct SetBlob<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBlob<S> {}
+    impl<S: State> State for SetBlob<S> {
+        type ImageLink = S::ImageLink;
+        type Blob = Set<members::blob>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `blob` field
-        pub struct blob(());
         ///Marker type for the `image_link` field
         pub struct image_link(());
+        ///Marker type for the `blob` field
+        pub struct blob(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ImageBuilder<'a, S: image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>, Option<oekaki::ImageLink<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>, Option<oekaki::ImageLink<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Image<'a> {
@@ -279,9 +282,9 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -296,11 +299,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ImageBuilder<'a, image_state::SetBlob<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -315,11 +318,11 @@ where
         mut self,
         value: impl Into<oekaki::ImageLink<'a>>,
     ) -> ImageBuilder<'a, image_state::SetImageLink<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -327,14 +330,14 @@ where
 impl<'a, S> ImageBuilder<'a, S>
 where
     S: image_state::State,
-    S::Blob: image_state::IsSet,
     S::ImageLink: image_state::IsSet,
+    S::Blob: image_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Image<'a> {
         Image {
-            blob: self.__unsafe_private_named.0.unwrap(),
-            image_link: self.__unsafe_private_named.1.unwrap(),
+            blob: self._fields.0.unwrap(),
+            image_link: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -347,8 +350,8 @@ where
         >,
     ) -> Image<'a> {
         Image {
-            blob: self.__unsafe_private_named.0.unwrap(),
-            image_link: self.__unsafe_private_named.1.unwrap(),
+            blob: self._fields.0.unwrap(),
+            image_link: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -536,15 +539,15 @@ pub mod oekaki_state {
 
 /// Builder for constructing an instance of this type
 pub struct OekakiBuilder<'a, S: oekaki_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<oekaki::Image<'a>>,
         Option<StrongRef<'a>>,
         Option<bool>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Oekaki<'a> {
@@ -558,9 +561,9 @@ impl<'a> OekakiBuilder<'a, oekaki_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OekakiBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -575,11 +578,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> OekakiBuilder<'a, oekaki_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         OekakiBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -594,11 +597,11 @@ where
         mut self,
         value: impl Into<oekaki::Image<'a>>,
     ) -> OekakiBuilder<'a, oekaki_state::SetImage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         OekakiBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -606,12 +609,12 @@ where
 impl<'a, S: oekaki_state::State> OekakiBuilder<'a, S> {
     /// Set the `inResponseTo` field (optional)
     pub fn in_response_to(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `inResponseTo` field to an Option value (optional)
     pub fn maybe_in_response_to(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -619,12 +622,12 @@ impl<'a, S: oekaki_state::State> OekakiBuilder<'a, S> {
 impl<'a, S: oekaki_state::State> OekakiBuilder<'a, S> {
     /// Set the `nsfw` field (optional)
     pub fn nsfw(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `nsfw` field to an Option value (optional)
     pub fn maybe_nsfw(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -632,12 +635,12 @@ impl<'a, S: oekaki_state::State> OekakiBuilder<'a, S> {
 impl<'a, S: oekaki_state::State> OekakiBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -651,11 +654,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Oekaki<'a> {
         Oekaki {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            image: self.__unsafe_private_named.1.unwrap(),
-            in_response_to: self.__unsafe_private_named.2,
-            nsfw: self.__unsafe_private_named.3,
-            tags: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            image: self._fields.1.unwrap(),
+            in_response_to: self._fields.2,
+            nsfw: self._fields.3,
+            tags: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -668,11 +671,11 @@ where
         >,
     ) -> Oekaki<'a> {
         Oekaki {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            image: self.__unsafe_private_named.1.unwrap(),
-            in_response_to: self.__unsafe_private_named.2,
-            nsfw: self.__unsafe_private_named.3,
-            tags: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            image: self._fields.1.unwrap(),
+            in_response_to: self._fields.2,
+            nsfw: self._fields.3,
+            tags: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/profile.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/profile.rs
index 76954895..7c716690 100644
--- a/crates/jacquard-api/src/com_shinolabs/pinksea/profile.rs
+++ b/crates/jacquard-api/src/com_shinolabs/pinksea/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -240,14 +243,14 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<StrongRef<'a>>,
         Option<CowStr<'a>>,
         Option<Vec<profile::ProfileLink<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -261,9 +264,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -271,12 +274,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -284,12 +287,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `bio` field (optional)
     pub fn bio(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `bio` field to an Option value (optional)
     pub fn maybe_bio(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -300,12 +303,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<profile::ProfileLink<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `links` field to an Option value (optional)
     pub fn maybe_links(mut self, value: Option<Vec<profile::ProfileLink<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -313,12 +316,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `nickname` field (optional)
     pub fn nickname(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `nickname` field to an Option value (optional)
     pub fn maybe_nickname(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -330,10 +333,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            bio: self.__unsafe_private_named.1,
-            links: self.__unsafe_private_named.2,
-            nickname: self.__unsafe_private_named.3,
+            avatar: self._fields.0,
+            bio: self._fields.1,
+            links: self._fields.2,
+            nickname: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -346,10 +349,10 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            bio: self.__unsafe_private_named.1,
-            links: self.__unsafe_private_named.2,
-            nickname: self.__unsafe_private_named.3,
+            avatar: self._fields.0,
+            bio: self._fields.1,
+            links: self._fields.2,
+            nickname: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -514,9 +517,9 @@ pub mod profile_link_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileLinkBuilder<'a, S: profile_link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileLink<'a> {
@@ -530,9 +533,9 @@ impl<'a> ProfileLinkBuilder<'a, profile_link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -547,11 +550,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ProfileLinkBuilder<'a, profile_link_state::SetLink<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ProfileLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -566,11 +569,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProfileLinkBuilder<'a, profile_link_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ProfileLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -584,8 +587,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ProfileLink<'a> {
         ProfileLink {
-            link: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
+            link: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -598,8 +601,8 @@ where
         >,
     ) -> ProfileLink<'a> {
         ProfileLink {
-            link: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
+            link: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_suibari/atsumeat/config.rs b/crates/jacquard-api/src/com_suibari/atsumeat/config.rs
index d2573aa1..bef0c3d9 100644
--- a/crates/jacquard-api/src/com_suibari/atsumeat/config.rs
+++ b/crates/jacquard-api/src/com_suibari/atsumeat/config.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -131,9 +134,9 @@ pub mod config_state {
 
 /// Builder for constructing an instance of this type
 pub struct ConfigBuilder<'a, S: config_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Config<'a> {
@@ -147,9 +150,9 @@ impl<'a> ConfigBuilder<'a, config_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ConfigBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,11 +167,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ConfigBuilder<'a, config_state::SetHubRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ConfigBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,7 +184,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Config<'a> {
         Config {
-            hub_ref: self.__unsafe_private_named.0.unwrap(),
+            hub_ref: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -194,7 +197,7 @@ where
         >,
     ) -> Config<'a> {
         Config {
-            hub_ref: self.__unsafe_private_named.0.unwrap(),
+            hub_ref: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_suibari/atsumeat/sticker.rs b/crates/jacquard-api/src/com_suibari/atsumeat/sticker.rs
index 1fbaa9f2..54537bf5 100644
--- a/crates/jacquard-api/src/com_suibari/atsumeat/sticker.rs
+++ b/crates/jacquard-api/src/com_suibari/atsumeat/sticker.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -465,112 +468,112 @@ pub mod sticker_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type OriginalOwner;
-        type ObtainedAt;
-        type Signature;
+        type Image;
         type SignedPayload;
+        type ObtainedAt;
         type Model;
-        type Image;
+        type OriginalOwner;
+        type Signature;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type OriginalOwner = Unset;
-        type ObtainedAt = Unset;
-        type Signature = Unset;
+        type Image = Unset;
         type SignedPayload = Unset;
+        type ObtainedAt = Unset;
         type Model = Unset;
-        type Image = Unset;
+        type OriginalOwner = Unset;
+        type Signature = Unset;
     }
-    ///State transition - sets the `original_owner` field to Set
-    pub struct SetOriginalOwner<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetOriginalOwner<S> {}
-    impl<S: State> State for SetOriginalOwner<S> {
-        type OriginalOwner = Set<members::original_owner>;
-        type ObtainedAt = S::ObtainedAt;
-        type Signature = S::Signature;
+    ///State transition - sets the `image` field to Set
+    pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetImage<S> {}
+    impl<S: State> State for SetImage<S> {
+        type Image = Set<members::image>;
         type SignedPayload = S::SignedPayload;
+        type ObtainedAt = S::ObtainedAt;
         type Model = S::Model;
+        type OriginalOwner = S::OriginalOwner;
+        type Signature = S::Signature;
+    }
+    ///State transition - sets the `signed_payload` field to Set
+    pub struct SetSignedPayload<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSignedPayload<S> {}
+    impl<S: State> State for SetSignedPayload<S> {
         type Image = S::Image;
+        type SignedPayload = Set<members::signed_payload>;
+        type ObtainedAt = S::ObtainedAt;
+        type Model = S::Model;
+        type OriginalOwner = S::OriginalOwner;
+        type Signature = S::Signature;
     }
     ///State transition - sets the `obtained_at` field to Set
     pub struct SetObtainedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetObtainedAt<S> {}
     impl<S: State> State for SetObtainedAt<S> {
-        type OriginalOwner = S::OriginalOwner;
-        type ObtainedAt = Set<members::obtained_at>;
-        type Signature = S::Signature;
-        type SignedPayload = S::SignedPayload;
-        type Model = S::Model;
         type Image = S::Image;
-    }
-    ///State transition - sets the `signature` field to Set
-    pub struct SetSignature<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSignature<S> {}
-    impl<S: State> State for SetSignature<S> {
-        type OriginalOwner = S::OriginalOwner;
-        type ObtainedAt = S::ObtainedAt;
-        type Signature = Set<members::signature>;
         type SignedPayload = S::SignedPayload;
+        type ObtainedAt = Set<members::obtained_at>;
         type Model = S::Model;
-        type Image = S::Image;
-    }
-    ///State transition - sets the `signed_payload` field to Set
-    pub struct SetSignedPayload<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSignedPayload<S> {}
-    impl<S: State> State for SetSignedPayload<S> {
         type OriginalOwner = S::OriginalOwner;
-        type ObtainedAt = S::ObtainedAt;
         type Signature = S::Signature;
-        type SignedPayload = Set<members::signed_payload>;
-        type Model = S::Model;
-        type Image = S::Image;
     }
     ///State transition - sets the `model` field to Set
     pub struct SetModel<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetModel<S> {}
     impl<S: State> State for SetModel<S> {
-        type OriginalOwner = S::OriginalOwner;
-        type ObtainedAt = S::ObtainedAt;
-        type Signature = S::Signature;
+        type Image = S::Image;
         type SignedPayload = S::SignedPayload;
+        type ObtainedAt = S::ObtainedAt;
         type Model = Set<members::model>;
-        type Image = S::Image;
-    }
-    ///State transition - sets the `image` field to Set
-    pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetImage<S> {}
-    impl<S: State> State for SetImage<S> {
         type OriginalOwner = S::OriginalOwner;
+        type Signature = S::Signature;
+    }
+    ///State transition - sets the `original_owner` field to Set
+    pub struct SetOriginalOwner<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetOriginalOwner<S> {}
+    impl<S: State> State for SetOriginalOwner<S> {
+        type Image = S::Image;
+        type SignedPayload = S::SignedPayload;
         type ObtainedAt = S::ObtainedAt;
+        type Model = S::Model;
+        type OriginalOwner = Set<members::original_owner>;
         type Signature = S::Signature;
+    }
+    ///State transition - sets the `signature` field to Set
+    pub struct SetSignature<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSignature<S> {}
+    impl<S: State> State for SetSignature<S> {
+        type Image = S::Image;
         type SignedPayload = S::SignedPayload;
+        type ObtainedAt = S::ObtainedAt;
         type Model = S::Model;
-        type Image = Set<members::image>;
+        type OriginalOwner = S::OriginalOwner;
+        type Signature = Set<members::signature>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `original_owner` field
-        pub struct original_owner(());
-        ///Marker type for the `obtained_at` field
-        pub struct obtained_at(());
-        ///Marker type for the `signature` field
-        pub struct signature(());
+        ///Marker type for the `image` field
+        pub struct image(());
         ///Marker type for the `signed_payload` field
         pub struct signed_payload(());
+        ///Marker type for the `obtained_at` field
+        pub struct obtained_at(());
         ///Marker type for the `model` field
         pub struct model(());
-        ///Marker type for the `image` field
-        pub struct image(());
+        ///Marker type for the `original_owner` field
+        pub struct original_owner(());
+        ///Marker type for the `signature` field
+        pub struct signature(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct StickerBuilder<'a, S: sticker_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Data<'a>>,
         Option<StickerImageType<'a>>,
         Option<CowStr<'a>>,
@@ -585,7 +588,7 @@ pub struct StickerBuilder<'a, S: sticker_state::State> {
         Option<Did<'a>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Sticker<'a> {
@@ -599,8 +602,8 @@ impl<'a> StickerBuilder<'a, sticker_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StickerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -615,7 +618,7 @@ impl<'a> StickerBuilder<'a, sticker_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -630,11 +633,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> StickerBuilder<'a, sticker_state::SetImage<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StickerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -642,12 +645,12 @@ where
 impl<'a, S: sticker_state::State> StickerBuilder<'a, S> {
     /// Set the `imageType` field (optional)
     pub fn image_type(mut self, value: impl Into<Option<StickerImageType<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `imageType` field to an Option value (optional)
     pub fn maybe_image_type(mut self, value: Option<StickerImageType<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -655,12 +658,12 @@ impl<'a, S: sticker_state::State> StickerBuilder<'a, S> {
 impl<'a, S: sticker_state::State> StickerBuilder<'a, S> {
     /// Set the `message` field (optional)
     pub fn message(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `message` field to an Option value (optional)
     pub fn maybe_message(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -675,11 +678,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> StickerBuilder<'a, sticker_state::SetModel<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         StickerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -687,12 +690,12 @@ where
 impl<'a, S: sticker_state::State> StickerBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -707,11 +710,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StickerBuilder<'a, sticker_state::SetObtainedAt<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         StickerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -719,12 +722,12 @@ where
 impl<'a, S: sticker_state::State> StickerBuilder<'a, S> {
     /// Set the `obtainedFrom` field (optional)
     pub fn obtained_from(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `obtainedFrom` field to an Option value (optional)
     pub fn maybe_obtained_from(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -739,11 +742,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> StickerBuilder<'a, sticker_state::SetOriginalOwner<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         StickerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -751,12 +754,12 @@ where
 impl<'a, S: sticker_state::State> StickerBuilder<'a, S> {
     /// Set the `shape` field (optional)
     pub fn shape(mut self, value: impl Into<Option<StickerShape<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `shape` field to an Option value (optional)
     pub fn maybe_shape(mut self, value: Option<StickerShape<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -771,11 +774,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> StickerBuilder<'a, sticker_state::SetSignature<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         StickerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -790,11 +793,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> StickerBuilder<'a, sticker_state::SetSignedPayload<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         StickerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -802,12 +805,12 @@ where
 impl<'a, S: sticker_state::State> StickerBuilder<'a, S> {
     /// Set the `subjectDid` field (optional)
     pub fn subject_did(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `subjectDid` field to an Option value (optional)
     pub fn maybe_subject_did(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -815,12 +818,12 @@ impl<'a, S: sticker_state::State> StickerBuilder<'a, S> {
 impl<'a, S: sticker_state::State> StickerBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -828,29 +831,29 @@ impl<'a, S: sticker_state::State> StickerBuilder<'a, S> {
 impl<'a, S> StickerBuilder<'a, S>
 where
     S: sticker_state::State,
-    S::OriginalOwner: sticker_state::IsSet,
-    S::ObtainedAt: sticker_state::IsSet,
-    S::Signature: sticker_state::IsSet,
+    S::Image: sticker_state::IsSet,
     S::SignedPayload: sticker_state::IsSet,
+    S::ObtainedAt: sticker_state::IsSet,
     S::Model: sticker_state::IsSet,
-    S::Image: sticker_state::IsSet,
+    S::OriginalOwner: sticker_state::IsSet,
+    S::Signature: sticker_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Sticker<'a> {
         Sticker {
-            image: self.__unsafe_private_named.0.unwrap(),
-            image_type: self.__unsafe_private_named.1,
-            message: self.__unsafe_private_named.2,
-            model: self.__unsafe_private_named.3.unwrap(),
-            name: self.__unsafe_private_named.4,
-            obtained_at: self.__unsafe_private_named.5.unwrap(),
-            obtained_from: self.__unsafe_private_named.6,
-            original_owner: self.__unsafe_private_named.7.unwrap(),
-            shape: self.__unsafe_private_named.8,
-            signature: self.__unsafe_private_named.9.unwrap(),
-            signed_payload: self.__unsafe_private_named.10.unwrap(),
-            subject_did: self.__unsafe_private_named.11,
-            tags: self.__unsafe_private_named.12,
+            image: self._fields.0.unwrap(),
+            image_type: self._fields.1,
+            message: self._fields.2,
+            model: self._fields.3.unwrap(),
+            name: self._fields.4,
+            obtained_at: self._fields.5.unwrap(),
+            obtained_from: self._fields.6,
+            original_owner: self._fields.7.unwrap(),
+            shape: self._fields.8,
+            signature: self._fields.9.unwrap(),
+            signed_payload: self._fields.10.unwrap(),
+            subject_did: self._fields.11,
+            tags: self._fields.12,
             extra_data: Default::default(),
         }
     }
@@ -860,19 +863,19 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Sticker<'a> {
         Sticker {
-            image: self.__unsafe_private_named.0.unwrap(),
-            image_type: self.__unsafe_private_named.1,
-            message: self.__unsafe_private_named.2,
-            model: self.__unsafe_private_named.3.unwrap(),
-            name: self.__unsafe_private_named.4,
-            obtained_at: self.__unsafe_private_named.5.unwrap(),
-            obtained_from: self.__unsafe_private_named.6,
-            original_owner: self.__unsafe_private_named.7.unwrap(),
-            shape: self.__unsafe_private_named.8,
-            signature: self.__unsafe_private_named.9.unwrap(),
-            signed_payload: self.__unsafe_private_named.10.unwrap(),
-            subject_did: self.__unsafe_private_named.11,
-            tags: self.__unsafe_private_named.12,
+            image: self._fields.0.unwrap(),
+            image_type: self._fields.1,
+            message: self._fields.2,
+            model: self._fields.3.unwrap(),
+            name: self._fields.4,
+            obtained_at: self._fields.5.unwrap(),
+            obtained_from: self._fields.6,
+            original_owner: self._fields.7.unwrap(),
+            shape: self._fields.8,
+            signature: self._fields.9.unwrap(),
+            signed_payload: self._fields.10.unwrap(),
+            subject_did: self._fields.11,
+            tags: self._fields.12,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_suibari/atsumeat/sticker_like.rs b/crates/jacquard-api/src/com_suibari/atsumeat/sticker_like.rs
index 15c98d61..bf4e43e1 100644
--- a/crates/jacquard-api/src/com_suibari/atsumeat/sticker_like.rs
+++ b/crates/jacquard-api/src/com_suibari/atsumeat/sticker_like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -109,45 +112,45 @@ pub mod sticker_like_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type CreatedAt;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
+        type Subject = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct StickerLikeBuilder<'a, S: sticker_like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> StickerLike<'a> {
@@ -161,9 +164,9 @@ impl<'a> StickerLikeBuilder<'a, sticker_like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StickerLikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StickerLikeBuilder<'a, sticker_like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StickerLikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> StickerLikeBuilder<'a, sticker_like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StickerLikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,14 +212,14 @@ where
 impl<'a, S> StickerLikeBuilder<'a, S>
 where
     S: sticker_like_state::State,
-    S::Subject: sticker_like_state::IsSet,
     S::CreatedAt: sticker_like_state::IsSet,
+    S::Subject: sticker_like_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> StickerLike<'a> {
         StickerLike {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -229,8 +232,8 @@ where
         >,
     ) -> StickerLike<'a> {
         StickerLike {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_suibari/atsumeat/transaction.rs b/crates/jacquard-api/src/com_suibari/atsumeat/transaction.rs
index 3ff157f9..cec8adf5 100644
--- a/crates/jacquard-api/src/com_suibari/atsumeat/transaction.rs
+++ b/crates/jacquard-api/src/com_suibari/atsumeat/transaction.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -264,44 +267,44 @@ pub mod transaction_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Status;
         type CreatedAt;
+        type Status;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Status = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `status` field to Set
-    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStatus<S> {}
-    impl<S: State> State for SetStatus<S> {
-        type Status = Set<members::status>;
-        type CreatedAt = S::CreatedAt;
+        type Status = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Status = S::Status;
         type CreatedAt = Set<members::created_at>;
+        type Status = S::Status;
+    }
+    ///State transition - sets the `status` field to Set
+    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStatus<S> {}
+    impl<S: State> State for SetStatus<S> {
+        type CreatedAt = S::CreatedAt;
+        type Status = Set<members::status>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `status` field
-        pub struct status(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `status` field
+        pub struct status(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TransactionBuilder<'a, S: transaction_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<bool>,
         Option<CowStr<'a>>,
@@ -312,7 +315,7 @@ pub struct TransactionBuilder<'a, S: transaction_state::State> {
         Option<Vec<UriValue<'a>>>,
         Option<Vec<UriValue<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Transaction<'a> {
@@ -326,19 +329,9 @@ impl<'a> TransactionBuilder<'a, transaction_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TransactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -353,11 +346,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TransactionBuilder<'a, transaction_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TransactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -365,12 +358,12 @@ where
 impl<'a, S: transaction_state::State> TransactionBuilder<'a, S> {
     /// Set the `isEasyExchange` field (optional)
     pub fn is_easy_exchange(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `isEasyExchange` field to an Option value (optional)
     pub fn maybe_is_easy_exchange(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -378,12 +371,12 @@ impl<'a, S: transaction_state::State> TransactionBuilder<'a, S> {
 impl<'a, S: transaction_state::State> TransactionBuilder<'a, S> {
     /// Set the `message` field (optional)
     pub fn message(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `message` field to an Option value (optional)
     pub fn maybe_message(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -391,12 +384,12 @@ impl<'a, S: transaction_state::State> TransactionBuilder<'a, S> {
 impl<'a, S: transaction_state::State> TransactionBuilder<'a, S> {
     /// Set the `partner` field (optional)
     pub fn partner(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `partner` field to an Option value (optional)
     pub fn maybe_partner(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -404,12 +397,12 @@ impl<'a, S: transaction_state::State> TransactionBuilder<'a, S> {
 impl<'a, S: transaction_state::State> TransactionBuilder<'a, S> {
     /// Set the `refPartner` field (optional)
     pub fn ref_partner(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `refPartner` field to an Option value (optional)
     pub fn maybe_ref_partner(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -417,12 +410,12 @@ impl<'a, S: transaction_state::State> TransactionBuilder<'a, S> {
 impl<'a, S: transaction_state::State> TransactionBuilder<'a, S> {
     /// Set the `refTransaction` field (optional)
     pub fn ref_transaction(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `refTransaction` field to an Option value (optional)
     pub fn maybe_ref_transaction(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -437,11 +430,11 @@ where
         mut self,
         value: impl Into<TransactionStatus<'a>>,
     ) -> TransactionBuilder<'a, transaction_state::SetStatus<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         TransactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -449,12 +442,12 @@ where
 impl<'a, S: transaction_state::State> TransactionBuilder<'a, S> {
     /// Set the `stickerIn` field (optional)
     pub fn sticker_in(mut self, value: impl Into<Option<Vec<UriValue<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `stickerIn` field to an Option value (optional)
     pub fn maybe_sticker_in(mut self, value: Option<Vec<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -462,12 +455,12 @@ impl<'a, S: transaction_state::State> TransactionBuilder<'a, S> {
 impl<'a, S: transaction_state::State> TransactionBuilder<'a, S> {
     /// Set the `stickerOut` field (optional)
     pub fn sticker_out(mut self, value: impl Into<Option<Vec<UriValue<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `stickerOut` field to an Option value (optional)
     pub fn maybe_sticker_out(mut self, value: Option<Vec<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -475,21 +468,21 @@ impl<'a, S: transaction_state::State> TransactionBuilder<'a, S> {
 impl<'a, S> TransactionBuilder<'a, S>
 where
     S: transaction_state::State,
-    S::Status: transaction_state::IsSet,
     S::CreatedAt: transaction_state::IsSet,
+    S::Status: transaction_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Transaction<'a> {
         Transaction {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            is_easy_exchange: self.__unsafe_private_named.1,
-            message: self.__unsafe_private_named.2,
-            partner: self.__unsafe_private_named.3,
-            ref_partner: self.__unsafe_private_named.4,
-            ref_transaction: self.__unsafe_private_named.5,
-            status: self.__unsafe_private_named.6.unwrap(),
-            sticker_in: self.__unsafe_private_named.7,
-            sticker_out: self.__unsafe_private_named.8,
+            created_at: self._fields.0.unwrap(),
+            is_easy_exchange: self._fields.1,
+            message: self._fields.2,
+            partner: self._fields.3,
+            ref_partner: self._fields.4,
+            ref_transaction: self._fields.5,
+            status: self._fields.6.unwrap(),
+            sticker_in: self._fields.7,
+            sticker_out: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -502,15 +495,15 @@ where
         >,
     ) -> Transaction<'a> {
         Transaction {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            is_easy_exchange: self.__unsafe_private_named.1,
-            message: self.__unsafe_private_named.2,
-            partner: self.__unsafe_private_named.3,
-            ref_partner: self.__unsafe_private_named.4,
-            ref_transaction: self.__unsafe_private_named.5,
-            status: self.__unsafe_private_named.6.unwrap(),
-            sticker_in: self.__unsafe_private_named.7,
-            sticker_out: self.__unsafe_private_named.8,
+            created_at: self._fields.0.unwrap(),
+            is_easy_exchange: self._fields.1,
+            message: self._fields.2,
+            partner: self._fields.3,
+            ref_partner: self._fields.4,
+            ref_transaction: self._fields.5,
+            status: self._fields.6.unwrap(),
+            sticker_in: self._fields.7,
+            sticker_out: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_whtwnd/blog.rs b/crates/jacquard-api/src/com_whtwnd/blog.rs
index f754d6d7..bc1670e6 100644
--- a/crates/jacquard-api/src/com_whtwnd/blog.rs
+++ b/crates/jacquard-api/src/com_whtwnd/blog.rs
@@ -11,7 +11,11 @@ pub mod get_entry_metadata_by_name;
 pub mod get_mentions_by_entry;
 pub mod notify_of_new_entry;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -216,9 +220,9 @@ pub mod blob_metadata_state {
 
 /// Builder for constructing an instance of this type
 pub struct BlobMetadataBuilder<'a, S: blob_metadata_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BlobMetadata<'a> {
@@ -232,9 +236,9 @@ impl<'a> BlobMetadataBuilder<'a, blob_metadata_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlobMetadataBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,11 +253,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> BlobMetadataBuilder<'a, blob_metadata_state::SetBlobref<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlobMetadataBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -261,12 +265,12 @@ where
 impl<'a, S: blob_metadata_state::State> BlobMetadataBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -279,8 +283,8 @@ where
     /// Build the final struct
     pub fn build(self) -> BlobMetadata<'a> {
         BlobMetadata {
-            blobref: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1,
+            blobref: self._fields.0.unwrap(),
+            name: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -293,8 +297,8 @@ where
         >,
     ) -> BlobMetadata<'a> {
         BlobMetadata {
-            blobref: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1,
+            blobref: self._fields.0.unwrap(),
+            name: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
@@ -434,45 +438,45 @@ pub mod comment_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Content;
         type EntryUri;
+        type Content;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Content = Unset;
         type EntryUri = Unset;
-    }
-    ///State transition - sets the `content` field to Set
-    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContent<S> {}
-    impl<S: State> State for SetContent<S> {
-        type Content = Set<members::content>;
-        type EntryUri = S::EntryUri;
+        type Content = Unset;
     }
     ///State transition - sets the `entry_uri` field to Set
     pub struct SetEntryUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEntryUri<S> {}
     impl<S: State> State for SetEntryUri<S> {
-        type Content = S::Content;
         type EntryUri = Set<members::entry_uri>;
+        type Content = S::Content;
+    }
+    ///State transition - sets the `content` field to Set
+    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContent<S> {}
+    impl<S: State> State for SetContent<S> {
+        type EntryUri = S::EntryUri;
+        type Content = Set<members::content>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `content` field
-        pub struct content(());
         ///Marker type for the `entry_uri` field
         pub struct entry_uri(());
+        ///Marker type for the `content` field
+        pub struct content(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CommentBuilder<'a, S: comment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Comment<'a> {
@@ -486,9 +490,9 @@ impl<'a> CommentBuilder<'a, comment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -503,11 +507,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -522,11 +526,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetEntryUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -534,14 +538,14 @@ where
 impl<'a, S> CommentBuilder<'a, S>
 where
     S: comment_state::State,
-    S::Content: comment_state::IsSet,
     S::EntryUri: comment_state::IsSet,
+    S::Content: comment_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Comment<'a> {
         Comment {
-            content: self.__unsafe_private_named.0.unwrap(),
-            entry_uri: self.__unsafe_private_named.1.unwrap(),
+            content: self._fields.0.unwrap(),
+            entry_uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -554,8 +558,8 @@ where
         >,
     ) -> Comment<'a> {
         Comment {
-            content: self.__unsafe_private_named.0.unwrap(),
-            entry_uri: self.__unsafe_private_named.1.unwrap(),
+            content: self._fields.0.unwrap(),
+            entry_uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -595,9 +599,9 @@ pub mod ogp_state {
 
 /// Builder for constructing an instance of this type
 pub struct OgpBuilder<'a, S: ogp_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<UriValue<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<UriValue<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Ogp<'a> {
@@ -611,9 +615,9 @@ impl<'a> OgpBuilder<'a, ogp_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OgpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -621,12 +625,12 @@ impl<'a> OgpBuilder<'a, ogp_state::Empty> {
 impl<'a, S: ogp_state::State> OgpBuilder<'a, S> {
     /// Set the `height` field (optional)
     pub fn height(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `height` field to an Option value (optional)
     pub fn maybe_height(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -641,11 +645,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> OgpBuilder<'a, ogp_state::SetUrl<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         OgpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -653,12 +657,12 @@ where
 impl<'a, S: ogp_state::State> OgpBuilder<'a, S> {
     /// Set the `width` field (optional)
     pub fn width(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `width` field to an Option value (optional)
     pub fn maybe_width(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -671,9 +675,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Ogp<'a> {
         Ogp {
-            height: self.__unsafe_private_named.0,
-            url: self.__unsafe_private_named.1.unwrap(),
-            width: self.__unsafe_private_named.2,
+            height: self._fields.0,
+            url: self._fields.1.unwrap(),
+            width: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -686,9 +690,9 @@ where
         >,
     ) -> Ogp<'a> {
         Ogp {
-            height: self.__unsafe_private_named.0,
-            url: self.__unsafe_private_named.1.unwrap(),
-            width: self.__unsafe_private_named.2,
+            height: self._fields.0,
+            url: self._fields.1.unwrap(),
+            width: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_whtwnd/blog/entry.rs b/crates/jacquard-api/src/com_whtwnd/blog/entry.rs
index 1aa52145..d56a7d37 100644
--- a/crates/jacquard-api/src/com_whtwnd/blog/entry.rs
+++ b/crates/jacquard-api/src/com_whtwnd/blog/entry.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -193,8 +196,8 @@ pub mod entry_state {
 
 /// Builder for constructing an instance of this type
 pub struct EntryBuilder<'a, S: entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<BlobMetadata<'a>>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -205,7 +208,7 @@ pub struct EntryBuilder<'a, S: entry_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Entry<'a> {
@@ -219,19 +222,9 @@ impl<'a> EntryBuilder<'a, entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,12 +232,12 @@ impl<'a> EntryBuilder<'a, entry_state::Empty> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `blobs` field (optional)
     pub fn blobs(mut self, value: impl Into<Option<Vec<BlobMetadata<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `blobs` field to an Option value (optional)
     pub fn maybe_blobs(mut self, value: Option<Vec<BlobMetadata<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -259,11 +252,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EntryBuilder<'a, entry_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -271,12 +264,12 @@ where
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -284,12 +277,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `isDraft` field (optional)
     pub fn is_draft(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `isDraft` field to an Option value (optional)
     pub fn maybe_is_draft(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -297,12 +290,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `ogp` field (optional)
     pub fn ogp(mut self, value: impl Into<Option<Ogp<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `ogp` field to an Option value (optional)
     pub fn maybe_ogp(mut self, value: Option<Ogp<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -310,12 +303,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `subtitle` field (optional)
     pub fn subtitle(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `subtitle` field to an Option value (optional)
     pub fn maybe_subtitle(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -323,12 +316,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `theme` field (optional)
     pub fn theme(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `theme` field to an Option value (optional)
     pub fn maybe_theme(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -336,12 +329,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -349,12 +342,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `visibility` field (optional)
     pub fn visibility(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `visibility` field to an Option value (optional)
     pub fn maybe_visibility(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -367,18 +360,15 @@ where
     /// Build the final struct
     pub fn build(self) -> Entry<'a> {
         Entry {
-            blobs: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2,
-            is_draft: self.__unsafe_private_named.3,
-            ogp: self.__unsafe_private_named.4,
-            subtitle: self.__unsafe_private_named.5,
-            theme: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7,
-            visibility: self
-                .__unsafe_private_named
-                .8
-                .or_else(|| Some(CowStr::from("public"))),
+            blobs: self._fields.0,
+            content: self._fields.1.unwrap(),
+            created_at: self._fields.2,
+            is_draft: self._fields.3,
+            ogp: self._fields.4,
+            subtitle: self._fields.5,
+            theme: self._fields.6,
+            title: self._fields.7,
+            visibility: self._fields.8.or_else(|| Some(CowStr::from("public"))),
             extra_data: Default::default(),
         }
     }
@@ -391,18 +381,15 @@ where
         >,
     ) -> Entry<'a> {
         Entry {
-            blobs: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2,
-            is_draft: self.__unsafe_private_named.3,
-            ogp: self.__unsafe_private_named.4,
-            subtitle: self.__unsafe_private_named.5,
-            theme: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7,
-            visibility: self
-                .__unsafe_private_named
-                .8
-                .or_else(|| Some(CowStr::from("public"))),
+            blobs: self._fields.0,
+            content: self._fields.1.unwrap(),
+            created_at: self._fields.2,
+            is_draft: self._fields.3,
+            ogp: self._fields.4,
+            subtitle: self._fields.5,
+            theme: self._fields.6,
+            title: self._fields.7,
+            visibility: self._fields.8.or_else(|| Some(CowStr::from("public"))),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_whtwnd/blog/get_author_posts.rs b/crates/jacquard-api/src/com_whtwnd/blog/get_author_posts.rs
index 60988b07..bd2338ae 100644
--- a/crates/jacquard-api/src/com_whtwnd/blog/get_author_posts.rs
+++ b/crates/jacquard-api/src/com_whtwnd/blog/get_author_posts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_author_posts_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetAuthorPostsBuilder<'a, S: get_author_posts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetAuthorPosts<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetAuthorPostsBuilder<'a, get_author_posts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetAuthorPostsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetAuthorPostsBuilder<'a, get_author_posts_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetAuthorPostsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetAuthorPosts<'a> {
         GetAuthorPosts {
-            author: self.__unsafe_private_named.0.unwrap(),
+            author: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_whtwnd/blog/get_entry_metadata_by_name.rs b/crates/jacquard-api/src/com_whtwnd/blog/get_entry_metadata_by_name.rs
index 594e6374..4280f33b 100644
--- a/crates/jacquard-api/src/com_whtwnd/blog/get_entry_metadata_by_name.rs
+++ b/crates/jacquard-api/src/com_whtwnd/blog/get_entry_metadata_by_name.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -146,9 +149,9 @@ pub struct GetEntryMetadataByNameBuilder<
     'a,
     S: get_entry_metadata_by_name_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetEntryMetadataByName<'a> {
@@ -165,9 +168,9 @@ impl<'a> GetEntryMetadataByNameBuilder<'a, get_entry_metadata_by_name_state::Emp
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetEntryMetadataByNameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -185,11 +188,11 @@ where
         'a,
         get_entry_metadata_by_name_state::SetAuthor<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetEntryMetadataByNameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -207,11 +210,11 @@ where
         'a,
         get_entry_metadata_by_name_state::SetEntryTitle<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetEntryMetadataByNameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -225,8 +228,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetEntryMetadataByName<'a> {
         GetEntryMetadataByName {
-            author: self.__unsafe_private_named.0.unwrap(),
-            entry_title: self.__unsafe_private_named.1.unwrap(),
+            author: self._fields.0.unwrap(),
+            entry_title: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_whtwnd/blog/get_mentions_by_entry.rs b/crates/jacquard-api/src/com_whtwnd/blog/get_mentions_by_entry.rs
index 7868ea51..999e41e5 100644
--- a/crates/jacquard-api/src/com_whtwnd/blog/get_mentions_by_entry.rs
+++ b/crates/jacquard-api/src/com_whtwnd/blog/get_mentions_by_entry.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -85,9 +88,9 @@ pub mod get_mentions_by_entry_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetMentionsByEntryBuilder<'a, S: get_mentions_by_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetMentionsByEntry<'a> {
@@ -101,9 +104,9 @@ impl<'a> GetMentionsByEntryBuilder<'a, get_mentions_by_entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetMentionsByEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -118,11 +121,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetMentionsByEntryBuilder<'a, get_mentions_by_entry_state::SetPostUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetMentionsByEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -135,7 +138,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetMentionsByEntry<'a> {
         GetMentionsByEntry {
-            post_uri: self.__unsafe_private_named.0.unwrap(),
+            post_uri: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_whtwnd/blog/notify_of_new_entry.rs b/crates/jacquard-api/src/com_whtwnd/blog/notify_of_new_entry.rs
index 6287afbe..369c4d23 100644
--- a/crates/jacquard-api/src/com_whtwnd/blog/notify_of_new_entry.rs
+++ b/crates/jacquard-api/src/com_whtwnd/blog/notify_of_new_entry.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -111,9 +114,9 @@ pub mod notify_of_new_entry_state {
 
 /// Builder for constructing an instance of this type
 pub struct NotifyOfNewEntryBuilder<'a, S: notify_of_new_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> NotifyOfNewEntry<'a> {
@@ -127,9 +130,9 @@ impl<'a> NotifyOfNewEntryBuilder<'a, notify_of_new_entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NotifyOfNewEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -144,11 +147,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> NotifyOfNewEntryBuilder<'a, notify_of_new_entry_state::SetEntryUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NotifyOfNewEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -161,7 +164,7 @@ where
     /// Build the final struct
     pub fn build(self) -> NotifyOfNewEntry<'a> {
         NotifyOfNewEntry {
-            entry_uri: self.__unsafe_private_named.0.unwrap(),
+            entry_uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -174,7 +177,7 @@ where
         >,
     ) -> NotifyOfNewEntry<'a> {
         NotifyOfNewEntry {
-            entry_uri: self.__unsafe_private_named.0.unwrap(),
+            entry_uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/com_yuna0x0/guestbook/sign.rs b/crates/jacquard-api/src/com_yuna0x0/guestbook/sign.rs
index 264b72d7..397d5f4a 100644
--- a/crates/jacquard-api/src/com_yuna0x0/guestbook/sign.rs
+++ b/crates/jacquard-api/src/com_yuna0x0/guestbook/sign.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -123,62 +126,58 @@ pub mod sign_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Message;
-        type CreatedAt;
         type Subject;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Message = Unset;
-        type CreatedAt = Unset;
         type Subject = Unset;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `message` field to Set
     pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMessage<S> {}
     impl<S: State> State for SetMessage<S> {
         type Message = Set<members::message>;
-        type CreatedAt = S::CreatedAt;
-        type Subject = S::Subject;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type Message = S::Message;
-        type CreatedAt = Set<members::created_at>;
         type Subject = S::Subject;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
         type Message = S::Message;
-        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Message = S::Message;
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `message` field
         pub struct message(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SignBuilder<'a, S: sign_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<CowStr<'a>>,
-        Option<AtIdentifier<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<AtIdentifier<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Sign<'a> {
@@ -192,9 +191,9 @@ impl<'a> SignBuilder<'a, sign_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SignBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,11 +208,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SignBuilder<'a, sign_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SignBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -228,11 +227,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignBuilder<'a, sign_state::SetMessage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SignBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -247,11 +246,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> SignBuilder<'a, sign_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SignBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -260,15 +259,15 @@ impl<'a, S> SignBuilder<'a, S>
 where
     S: sign_state::State,
     S::Message: sign_state::IsSet,
-    S::CreatedAt: sign_state::IsSet,
     S::Subject: sign_state::IsSet,
+    S::CreatedAt: sign_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Sign<'a> {
         Sign {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -281,9 +280,9 @@ where
         >,
     ) -> Sign<'a> {
         Sign {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/community_lexicon/bookmarks/bookmark.rs b/crates/jacquard-api/src/community_lexicon/bookmarks/bookmark.rs
index a0e47910..d1876d45 100644
--- a/crates/jacquard-api/src/community_lexicon/bookmarks/bookmark.rs
+++ b/crates/jacquard-api/src/community_lexicon/bookmarks/bookmark.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -148,13 +151,9 @@ pub mod bookmark_state {
 
 /// Builder for constructing an instance of this type
 pub struct BookmarkBuilder<'a, S: bookmark_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<UriValue<'a>>,
-        Option<Vec<CowStr<'a>>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<UriValue<'a>>, Option<Vec<CowStr<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Bookmark<'a> {
@@ -168,9 +167,9 @@ impl<'a> BookmarkBuilder<'a, bookmark_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -185,11 +184,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BookmarkBuilder<'a, bookmark_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,11 +203,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> BookmarkBuilder<'a, bookmark_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,12 +215,12 @@ where
 impl<'a, S: bookmark_state::State> BookmarkBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -235,9 +234,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Bookmark<'a> {
         Bookmark {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            tags: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            tags: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -250,9 +249,9 @@ where
         >,
     ) -> Bookmark<'a> {
         Bookmark {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            tags: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            tags: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/community_lexicon/bookmarks/get_actor_bookmarks.rs b/crates/jacquard-api/src/community_lexicon/bookmarks/get_actor_bookmarks.rs
index fc8c27e8..e9001e4c 100644
--- a/crates/jacquard-api/src/community_lexicon/bookmarks/get_actor_bookmarks.rs
+++ b/crates/jacquard-api/src/community_lexicon/bookmarks/get_actor_bookmarks.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -88,9 +91,9 @@ pub mod get_actor_bookmarks_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorBookmarksBuilder<'a, S: get_actor_bookmarks_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<Vec<CowStr<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<Vec<CowStr<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorBookmarks<'a> {
@@ -104,9 +107,9 @@ impl<'a> GetActorBookmarksBuilder<'a, get_actor_bookmarks_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorBookmarksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,12 +117,12 @@ impl<'a> GetActorBookmarksBuilder<'a, get_actor_bookmarks_state::Empty> {
 impl<'a, S: get_actor_bookmarks_state::State> GetActorBookmarksBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -127,12 +130,12 @@ impl<'a, S: get_actor_bookmarks_state::State> GetActorBookmarksBuilder<'a, S> {
 impl<'a, S: get_actor_bookmarks_state::State> GetActorBookmarksBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -140,12 +143,12 @@ impl<'a, S: get_actor_bookmarks_state::State> GetActorBookmarksBuilder<'a, S> {
 impl<'a, S: get_actor_bookmarks_state::State> GetActorBookmarksBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -157,9 +160,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorBookmarks<'a> {
         GetActorBookmarks {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            tags: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            tags: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/community_lexicon/calendar/event.rs b/crates/jacquard-api/src/community_lexicon/calendar/event.rs
index b0408548..a75c4975 100644
--- a/crates/jacquard-api/src/community_lexicon/calendar/event.rs
+++ b/crates/jacquard-api/src/community_lexicon/calendar/event.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -556,8 +559,8 @@ pub mod event_state {
 
 /// Builder for constructing an instance of this type
 pub struct EventBuilder<'a, S: event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -568,7 +571,7 @@ pub struct EventBuilder<'a, S: event_state::State> {
         Option<event::Status<'a>>,
         Option<Vec<event::Uri<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Event<'a> {
@@ -582,19 +585,9 @@ impl<'a> EventBuilder<'a, event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -609,11 +602,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EventBuilder<'a, event_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -621,12 +614,12 @@ where
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -634,12 +627,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `endsAt` field (optional)
     pub fn ends_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `endsAt` field to an Option value (optional)
     pub fn maybe_ends_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -650,7 +643,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<EventLocationsItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `locations` field to an Option value (optional)
@@ -658,7 +651,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: Option<Vec<EventLocationsItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -666,12 +659,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `mode` field (optional)
     pub fn mode(mut self, value: impl Into<Option<event::Mode<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `mode` field to an Option value (optional)
     pub fn maybe_mode(mut self, value: Option<event::Mode<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -686,11 +679,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EventBuilder<'a, event_state::SetName<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -698,12 +691,12 @@ where
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `startsAt` field (optional)
     pub fn starts_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `startsAt` field to an Option value (optional)
     pub fn maybe_starts_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -711,12 +704,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<event::Status<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<event::Status<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -724,12 +717,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `uris` field (optional)
     pub fn uris(mut self, value: impl Into<Option<Vec<event::Uri<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `uris` field to an Option value (optional)
     pub fn maybe_uris(mut self, value: Option<Vec<event::Uri<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -743,15 +736,15 @@ where
     /// Build the final struct
     pub fn build(self) -> Event<'a> {
         Event {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            ends_at: self.__unsafe_private_named.2,
-            locations: self.__unsafe_private_named.3,
-            mode: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            starts_at: self.__unsafe_private_named.6,
-            status: self.__unsafe_private_named.7,
-            uris: self.__unsafe_private_named.8,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            ends_at: self._fields.2,
+            locations: self._fields.3,
+            mode: self._fields.4,
+            name: self._fields.5.unwrap(),
+            starts_at: self._fields.6,
+            status: self._fields.7,
+            uris: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -764,15 +757,15 @@ where
         >,
     ) -> Event<'a> {
         Event {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            ends_at: self.__unsafe_private_named.2,
-            locations: self.__unsafe_private_named.3,
-            mode: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            starts_at: self.__unsafe_private_named.6,
-            status: self.__unsafe_private_named.7,
-            uris: self.__unsafe_private_named.8,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            ends_at: self._fields.2,
+            locations: self._fields.3,
+            mode: self._fields.4,
+            name: self._fields.5.unwrap(),
+            starts_at: self._fields.6,
+            status: self._fields.7,
+            uris: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
@@ -1035,9 +1028,9 @@ pub mod uri_state {
 
 /// Builder for constructing an instance of this type
 pub struct UriBuilder<'a, S: uri_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Uri<'a> {
@@ -1051,9 +1044,9 @@ impl<'a> UriBuilder<'a, uri_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UriBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1061,12 +1054,12 @@ impl<'a> UriBuilder<'a, uri_state::Empty> {
 impl<'a, S: uri_state::State> UriBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1081,11 +1074,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> UriBuilder<'a, uri_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UriBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1098,8 +1091,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Uri<'a> {
         Uri {
-            name: self.__unsafe_private_named.0,
-            uri: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0,
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1112,8 +1105,8 @@ where
         >,
     ) -> Uri<'a> {
         Uri {
-            name: self.__unsafe_private_named.0,
-            uri: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0,
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/community_lexicon/calendar/get_event.rs b/crates/jacquard-api/src/community_lexicon/calendar/get_event.rs
index 6667e33f..64539709 100644
--- a/crates/jacquard-api/src/community_lexicon/calendar/get_event.rs
+++ b/crates/jacquard-api/src/community_lexicon/calendar/get_event.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -143,79 +146,74 @@ pub mod event_view_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type CountGoing;
-        type CountInterested;
-        type CountNotGoing;
         type Url;
+        type CountNotGoing;
+        type CountInterested;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type CountGoing = Unset;
-        type CountInterested = Unset;
-        type CountNotGoing = Unset;
         type Url = Unset;
+        type CountNotGoing = Unset;
+        type CountInterested = Unset;
     }
     ///State transition - sets the `count_going` field to Set
     pub struct SetCountGoing<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCountGoing<S> {}
     impl<S: State> State for SetCountGoing<S> {
         type CountGoing = Set<members::count_going>;
-        type CountInterested = S::CountInterested;
-        type CountNotGoing = S::CountNotGoing;
         type Url = S::Url;
+        type CountNotGoing = S::CountNotGoing;
+        type CountInterested = S::CountInterested;
     }
-    ///State transition - sets the `count_interested` field to Set
-    pub struct SetCountInterested<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCountInterested<S> {}
-    impl<S: State> State for SetCountInterested<S> {
+    ///State transition - sets the `url` field to Set
+    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUrl<S> {}
+    impl<S: State> State for SetUrl<S> {
         type CountGoing = S::CountGoing;
-        type CountInterested = Set<members::count_interested>;
+        type Url = Set<members::url>;
         type CountNotGoing = S::CountNotGoing;
-        type Url = S::Url;
+        type CountInterested = S::CountInterested;
     }
     ///State transition - sets the `count_not_going` field to Set
     pub struct SetCountNotGoing<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCountNotGoing<S> {}
     impl<S: State> State for SetCountNotGoing<S> {
         type CountGoing = S::CountGoing;
-        type CountInterested = S::CountInterested;
-        type CountNotGoing = Set<members::count_not_going>;
         type Url = S::Url;
+        type CountNotGoing = Set<members::count_not_going>;
+        type CountInterested = S::CountInterested;
     }
-    ///State transition - sets the `url` field to Set
-    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUrl<S> {}
-    impl<S: State> State for SetUrl<S> {
+    ///State transition - sets the `count_interested` field to Set
+    pub struct SetCountInterested<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCountInterested<S> {}
+    impl<S: State> State for SetCountInterested<S> {
         type CountGoing = S::CountGoing;
-        type CountInterested = S::CountInterested;
+        type Url = S::Url;
         type CountNotGoing = S::CountNotGoing;
-        type Url = Set<members::url>;
+        type CountInterested = Set<members::count_interested>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `count_going` field
         pub struct count_going(());
-        ///Marker type for the `count_interested` field
-        pub struct count_interested(());
-        ///Marker type for the `count_not_going` field
-        pub struct count_not_going(());
         ///Marker type for the `url` field
         pub struct url(());
+        ///Marker type for the `count_not_going` field
+        pub struct count_not_going(());
+        ///Marker type for the `count_interested` field
+        pub struct count_interested(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EventViewBuilder<'a, S: event_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<i64>,
-        Option<i64>,
-        Option<i64>,
-        Option<UriValue<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<i64>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> EventView<'a> {
@@ -229,9 +227,9 @@ impl<'a> EventViewBuilder<'a, event_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EventViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,11 +244,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> EventViewBuilder<'a, event_view_state::SetCountGoing<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EventViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -265,11 +263,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> EventViewBuilder<'a, event_view_state::SetCountInterested<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EventViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -284,11 +282,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> EventViewBuilder<'a, event_view_state::SetCountNotGoing<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EventViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -303,11 +301,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> EventViewBuilder<'a, event_view_state::SetUrl<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         EventViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -316,17 +314,17 @@ impl<'a, S> EventViewBuilder<'a, S>
 where
     S: event_view_state::State,
     S::CountGoing: event_view_state::IsSet,
-    S::CountInterested: event_view_state::IsSet,
-    S::CountNotGoing: event_view_state::IsSet,
     S::Url: event_view_state::IsSet,
+    S::CountNotGoing: event_view_state::IsSet,
+    S::CountInterested: event_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> EventView<'a> {
         EventView {
-            count_going: self.__unsafe_private_named.0.unwrap(),
-            count_interested: self.__unsafe_private_named.1.unwrap(),
-            count_not_going: self.__unsafe_private_named.2.unwrap(),
-            url: self.__unsafe_private_named.3.unwrap(),
+            count_going: self._fields.0.unwrap(),
+            count_interested: self._fields.1.unwrap(),
+            count_not_going: self._fields.2.unwrap(),
+            url: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -339,10 +337,10 @@ where
         >,
     ) -> EventView<'a> {
         EventView {
-            count_going: self.__unsafe_private_named.0.unwrap(),
-            count_interested: self.__unsafe_private_named.1.unwrap(),
-            count_not_going: self.__unsafe_private_named.2.unwrap(),
-            url: self.__unsafe_private_named.3.unwrap(),
+            count_going: self._fields.0.unwrap(),
+            count_interested: self._fields.1.unwrap(),
+            count_not_going: self._fields.2.unwrap(),
+            url: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -507,9 +505,9 @@ pub mod get_event_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetEventBuilder<'a, S: get_event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetEvent<'a> {
@@ -523,9 +521,9 @@ impl<'a> GetEventBuilder<'a, get_event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -540,11 +538,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetEventBuilder<'a, get_event_state::SetRecordKey<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -559,11 +557,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetEventBuilder<'a, get_event_state::SetRepository<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -577,8 +575,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetEvent<'a> {
         GetEvent {
-            record_key: self.__unsafe_private_named.0.unwrap(),
-            repository: self.__unsafe_private_named.1.unwrap(),
+            record_key: self._fields.0.unwrap(),
+            repository: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/community_lexicon/calendar/get_rsvp.rs b/crates/jacquard-api/src/community_lexicon/calendar/get_rsvp.rs
index 2838b00a..358a6daa 100644
--- a/crates/jacquard-api/src/community_lexicon/calendar/get_rsvp.rs
+++ b/crates/jacquard-api/src/community_lexicon/calendar/get_rsvp.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, AtUri};
@@ -108,45 +111,45 @@ pub mod get_rsvp_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Event;
         type Identity;
+        type Event;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Event = Unset;
         type Identity = Unset;
-    }
-    ///State transition - sets the `event` field to Set
-    pub struct SetEvent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetEvent<S> {}
-    impl<S: State> State for SetEvent<S> {
-        type Event = Set<members::event>;
-        type Identity = S::Identity;
+        type Event = Unset;
     }
     ///State transition - sets the `identity` field to Set
     pub struct SetIdentity<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIdentity<S> {}
     impl<S: State> State for SetIdentity<S> {
-        type Event = S::Event;
         type Identity = Set<members::identity>;
+        type Event = S::Event;
+    }
+    ///State transition - sets the `event` field to Set
+    pub struct SetEvent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetEvent<S> {}
+    impl<S: State> State for SetEvent<S> {
+        type Identity = S::Identity;
+        type Event = Set<members::event>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `event` field
-        pub struct event(());
         ///Marker type for the `identity` field
         pub struct identity(());
+        ///Marker type for the `event` field
+        pub struct event(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GetRsvpBuilder<'a, S: get_rsvp_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetRsvp<'a> {
@@ -160,9 +163,9 @@ impl<'a> GetRsvpBuilder<'a, get_rsvp_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetRsvpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -177,11 +180,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetRsvpBuilder<'a, get_rsvp_state::SetEvent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetRsvpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetRsvpBuilder<'a, get_rsvp_state::SetIdentity<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetRsvpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -208,14 +211,14 @@ where
 impl<'a, S> GetRsvpBuilder<'a, S>
 where
     S: get_rsvp_state::State,
-    S::Event: get_rsvp_state::IsSet,
     S::Identity: get_rsvp_state::IsSet,
+    S::Event: get_rsvp_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GetRsvp<'a> {
         GetRsvp {
-            event: self.__unsafe_private_named.0.unwrap(),
-            identity: self.__unsafe_private_named.1.unwrap(),
+            event: self._fields.0.unwrap(),
+            identity: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/community_lexicon/calendar/rsvp.rs b/crates/jacquard-api/src/community_lexicon/calendar/rsvp.rs
index dee98bb2..dcbeef7a 100644
--- a/crates/jacquard-api/src/community_lexicon/calendar/rsvp.rs
+++ b/crates/jacquard-api/src/community_lexicon/calendar/rsvp.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -270,9 +273,9 @@ pub mod rsvp_state {
 
 /// Builder for constructing an instance of this type
 pub struct RsvpBuilder<'a, S: rsvp_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<RsvpStatus<'a>>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<RsvpStatus<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Rsvp<'a> {
@@ -286,9 +289,9 @@ impl<'a> RsvpBuilder<'a, rsvp_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RsvpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -303,11 +306,11 @@ where
         mut self,
         value: impl Into<RsvpStatus<'a>>,
     ) -> RsvpBuilder<'a, rsvp_state::SetStatus<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RsvpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -322,11 +325,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> RsvpBuilder<'a, rsvp_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RsvpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -340,8 +343,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Rsvp<'a> {
         Rsvp {
-            status: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            status: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -354,8 +357,8 @@ where
         >,
     ) -> Rsvp<'a> {
         Rsvp {
-            status: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            status: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/community_lexicon/calendar/search_events.rs b/crates/jacquard-api/src/community_lexicon/calendar/search_events.rs
index 0283f968..e7870261 100644
--- a/crates/jacquard-api/src/community_lexicon/calendar/search_events.rs
+++ b/crates/jacquard-api/src/community_lexicon/calendar/search_events.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -170,79 +173,74 @@ pub mod event_view_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Url;
+        type CountNotGoing;
         type CountGoing;
         type CountInterested;
-        type CountNotGoing;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Url = Unset;
+        type CountNotGoing = Unset;
         type CountGoing = Unset;
         type CountInterested = Unset;
-        type CountNotGoing = Unset;
     }
     ///State transition - sets the `url` field to Set
     pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUrl<S> {}
     impl<S: State> State for SetUrl<S> {
         type Url = Set<members::url>;
+        type CountNotGoing = S::CountNotGoing;
+        type CountGoing = S::CountGoing;
+        type CountInterested = S::CountInterested;
+    }
+    ///State transition - sets the `count_not_going` field to Set
+    pub struct SetCountNotGoing<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCountNotGoing<S> {}
+    impl<S: State> State for SetCountNotGoing<S> {
+        type Url = S::Url;
+        type CountNotGoing = Set<members::count_not_going>;
         type CountGoing = S::CountGoing;
         type CountInterested = S::CountInterested;
-        type CountNotGoing = S::CountNotGoing;
     }
     ///State transition - sets the `count_going` field to Set
     pub struct SetCountGoing<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCountGoing<S> {}
     impl<S: State> State for SetCountGoing<S> {
         type Url = S::Url;
+        type CountNotGoing = S::CountNotGoing;
         type CountGoing = Set<members::count_going>;
         type CountInterested = S::CountInterested;
-        type CountNotGoing = S::CountNotGoing;
     }
     ///State transition - sets the `count_interested` field to Set
     pub struct SetCountInterested<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCountInterested<S> {}
     impl<S: State> State for SetCountInterested<S> {
         type Url = S::Url;
-        type CountGoing = S::CountGoing;
-        type CountInterested = Set<members::count_interested>;
         type CountNotGoing = S::CountNotGoing;
-    }
-    ///State transition - sets the `count_not_going` field to Set
-    pub struct SetCountNotGoing<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCountNotGoing<S> {}
-    impl<S: State> State for SetCountNotGoing<S> {
-        type Url = S::Url;
         type CountGoing = S::CountGoing;
-        type CountInterested = S::CountInterested;
-        type CountNotGoing = Set<members::count_not_going>;
+        type CountInterested = Set<members::count_interested>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `url` field
         pub struct url(());
+        ///Marker type for the `count_not_going` field
+        pub struct count_not_going(());
         ///Marker type for the `count_going` field
         pub struct count_going(());
         ///Marker type for the `count_interested` field
         pub struct count_interested(());
-        ///Marker type for the `count_not_going` field
-        pub struct count_not_going(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EventViewBuilder<'a, S: event_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<i64>,
-        Option<i64>,
-        Option<i64>,
-        Option<UriValue<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<i64>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> EventView<'a> {
@@ -256,9 +254,9 @@ impl<'a> EventViewBuilder<'a, event_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EventViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -273,11 +271,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> EventViewBuilder<'a, event_view_state::SetCountGoing<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EventViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -292,11 +290,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> EventViewBuilder<'a, event_view_state::SetCountInterested<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EventViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -311,11 +309,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> EventViewBuilder<'a, event_view_state::SetCountNotGoing<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EventViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -330,11 +328,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> EventViewBuilder<'a, event_view_state::SetUrl<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         EventViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -343,17 +341,17 @@ impl<'a, S> EventViewBuilder<'a, S>
 where
     S: event_view_state::State,
     S::Url: event_view_state::IsSet,
+    S::CountNotGoing: event_view_state::IsSet,
     S::CountGoing: event_view_state::IsSet,
     S::CountInterested: event_view_state::IsSet,
-    S::CountNotGoing: event_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> EventView<'a> {
         EventView {
-            count_going: self.__unsafe_private_named.0.unwrap(),
-            count_interested: self.__unsafe_private_named.1.unwrap(),
-            count_not_going: self.__unsafe_private_named.2.unwrap(),
-            url: self.__unsafe_private_named.3.unwrap(),
+            count_going: self._fields.0.unwrap(),
+            count_interested: self._fields.1.unwrap(),
+            count_not_going: self._fields.2.unwrap(),
+            url: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -366,10 +364,10 @@ where
         >,
     ) -> EventView<'a> {
         EventView {
-            count_going: self.__unsafe_private_named.0.unwrap(),
-            count_interested: self.__unsafe_private_named.1.unwrap(),
-            count_not_going: self.__unsafe_private_named.2.unwrap(),
-            url: self.__unsafe_private_named.3.unwrap(),
+            count_going: self._fields.0.unwrap(),
+            count_interested: self._fields.1.unwrap(),
+            count_not_going: self._fields.2.unwrap(),
+            url: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -519,14 +517,9 @@ pub mod search_events_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchEventsBuilder<'a, S: search_events_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<i64>,
-        Option<Vec<Cid<'a>>>,
-        Option<CowStr<'a>>,
-        Option<Did<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Vec<Cid<'a>>>, Option<CowStr<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchEvents<'a> {
@@ -540,9 +533,9 @@ impl<'a> SearchEventsBuilder<'a, search_events_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchEventsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -550,12 +543,12 @@ impl<'a> SearchEventsBuilder<'a, search_events_state::Empty> {
 impl<'a, S: search_events_state::State> SearchEventsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -563,12 +556,12 @@ impl<'a, S: search_events_state::State> SearchEventsBuilder<'a, S> {
 impl<'a, S: search_events_state::State> SearchEventsBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<Vec<Cid<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<Vec<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -576,12 +569,12 @@ impl<'a, S: search_events_state::State> SearchEventsBuilder<'a, S> {
 impl<'a, S: search_events_state::State> SearchEventsBuilder<'a, S> {
     /// Set the `query` field (optional)
     pub fn query(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `query` field to an Option value (optional)
     pub fn maybe_query(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -589,12 +582,12 @@ impl<'a, S: search_events_state::State> SearchEventsBuilder<'a, S> {
 impl<'a, S: search_events_state::State> SearchEventsBuilder<'a, S> {
     /// Set the `repository` field (optional)
     pub fn repository(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `repository` field to an Option value (optional)
     pub fn maybe_repository(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -606,10 +599,10 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchEvents<'a> {
         SearchEvents {
-            limit: self.__unsafe_private_named.0,
-            location: self.__unsafe_private_named.1,
-            query: self.__unsafe_private_named.2,
-            repository: self.__unsafe_private_named.3,
+            limit: self._fields.0,
+            location: self._fields.1,
+            query: self._fields.2,
+            repository: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/community_lexicon/interaction/like.rs b/crates/jacquard-api/src/community_lexicon/interaction/like.rs
index 0740a95e..0ccb5361 100644
--- a/crates/jacquard-api/src/community_lexicon/interaction/like.rs
+++ b/crates/jacquard-api/src/community_lexicon/interaction/like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -109,45 +112,45 @@ pub mod like_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type CreatedAt;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
+        type Subject = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -161,9 +164,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,14 +212,14 @@ where
 impl<'a, S> LikeBuilder<'a, S>
 where
     S: like_state::State,
-    S::Subject: like_state::IsSet,
     S::CreatedAt: like_state::IsSet,
+    S::Subject: like_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -229,8 +232,8 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/community_lexicon/payments/web_monetization.rs b/crates/jacquard-api/src/community_lexicon/payments/web_monetization.rs
index d5fb9505..969cbf51 100644
--- a/crates/jacquard-api/src/community_lexicon/payments/web_monetization.rs
+++ b/crates/jacquard-api/src/community_lexicon/payments/web_monetization.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -136,9 +139,9 @@ pub mod web_monetization_state {
 
 /// Builder for constructing an instance of this type
 pub struct WebMonetizationBuilder<'a, S: web_monetization_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> WebMonetization<'a> {
@@ -152,9 +155,9 @@ impl<'a> WebMonetizationBuilder<'a, web_monetization_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WebMonetizationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -169,11 +172,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> WebMonetizationBuilder<'a, web_monetization_state::SetAddress<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         WebMonetizationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,12 +184,12 @@ where
 impl<'a, S: web_monetization_state::State> WebMonetizationBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -199,8 +202,8 @@ where
     /// Build the final struct
     pub fn build(self) -> WebMonetization<'a> {
         WebMonetization {
-            address: self.__unsafe_private_named.0.unwrap(),
-            note: self.__unsafe_private_named.1,
+            address: self._fields.0.unwrap(),
+            note: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -213,8 +216,8 @@ where
         >,
     ) -> WebMonetization<'a> {
         WebMonetization {
-            address: self.__unsafe_private_named.0.unwrap(),
-            note: self.__unsafe_private_named.1,
+            address: self._fields.0.unwrap(),
+            note: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/computer_aesthetic/kidlisp.rs b/crates/jacquard-api/src/computer_aesthetic/kidlisp.rs
index 0550144e..cfc6c74c 100644
--- a/crates/jacquard-api/src/computer_aesthetic/kidlisp.rs
+++ b/crates/jacquard-api/src/computer_aesthetic/kidlisp.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -149,80 +152,80 @@ pub mod kidlisp_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Ref;
+        type Source;
         type When;
         type Code;
-        type Source;
+        type Ref;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Ref = Unset;
+        type Source = Unset;
         type When = Unset;
         type Code = Unset;
-        type Source = Unset;
+        type Ref = Unset;
     }
-    ///State transition - sets the `ref` field to Set
-    pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRef<S> {}
-    impl<S: State> State for SetRef<S> {
-        type Ref = Set<members::r#ref>;
+    ///State transition - sets the `source` field to Set
+    pub struct SetSource<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSource<S> {}
+    impl<S: State> State for SetSource<S> {
+        type Source = Set<members::source>;
         type When = S::When;
         type Code = S::Code;
-        type Source = S::Source;
+        type Ref = S::Ref;
     }
     ///State transition - sets the `when` field to Set
     pub struct SetWhen<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWhen<S> {}
     impl<S: State> State for SetWhen<S> {
-        type Ref = S::Ref;
+        type Source = S::Source;
         type When = Set<members::when>;
         type Code = S::Code;
-        type Source = S::Source;
+        type Ref = S::Ref;
     }
     ///State transition - sets the `code` field to Set
     pub struct SetCode<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCode<S> {}
     impl<S: State> State for SetCode<S> {
-        type Ref = S::Ref;
+        type Source = S::Source;
         type When = S::When;
         type Code = Set<members::code>;
-        type Source = S::Source;
-    }
-    ///State transition - sets the `source` field to Set
-    pub struct SetSource<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSource<S> {}
-    impl<S: State> State for SetSource<S> {
         type Ref = S::Ref;
+    }
+    ///State transition - sets the `ref` field to Set
+    pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRef<S> {}
+    impl<S: State> State for SetRef<S> {
+        type Source = S::Source;
         type When = S::When;
         type Code = S::Code;
-        type Source = Set<members::source>;
+        type Ref = Set<members::r#ref>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `ref` field
-        pub struct r#ref(());
+        ///Marker type for the `source` field
+        pub struct source(());
         ///Marker type for the `when` field
         pub struct when(());
         ///Marker type for the `code` field
         pub struct code(());
-        ///Marker type for the `source` field
-        pub struct source(());
+        ///Marker type for the `ref` field
+        pub struct r#ref(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct KidlispBuilder<'a, S: kidlisp_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Kidlisp<'a> {
@@ -236,9 +239,9 @@ impl<'a> KidlispBuilder<'a, kidlisp_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         KidlispBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,11 +256,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> KidlispBuilder<'a, kidlisp_state::SetCode<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         KidlispBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -272,11 +275,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> KidlispBuilder<'a, kidlisp_state::SetRef<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         KidlispBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -291,11 +294,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> KidlispBuilder<'a, kidlisp_state::SetSource<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         KidlispBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -310,11 +313,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> KidlispBuilder<'a, kidlisp_state::SetWhen<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         KidlispBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -322,18 +325,18 @@ where
 impl<'a, S> KidlispBuilder<'a, S>
 where
     S: kidlisp_state::State,
-    S::Ref: kidlisp_state::IsSet,
+    S::Source: kidlisp_state::IsSet,
     S::When: kidlisp_state::IsSet,
     S::Code: kidlisp_state::IsSet,
-    S::Source: kidlisp_state::IsSet,
+    S::Ref: kidlisp_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Kidlisp<'a> {
         Kidlisp {
-            code: self.__unsafe_private_named.0.unwrap(),
-            r#ref: self.__unsafe_private_named.1.unwrap(),
-            source: self.__unsafe_private_named.2.unwrap(),
-            when: self.__unsafe_private_named.3.unwrap(),
+            code: self._fields.0.unwrap(),
+            r#ref: self._fields.1.unwrap(),
+            source: self._fields.2.unwrap(),
+            when: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -346,10 +349,10 @@ where
         >,
     ) -> Kidlisp<'a> {
         Kidlisp {
-            code: self.__unsafe_private_named.0.unwrap(),
-            r#ref: self.__unsafe_private_named.1.unwrap(),
-            source: self.__unsafe_private_named.2.unwrap(),
-            when: self.__unsafe_private_named.3.unwrap(),
+            code: self._fields.0.unwrap(),
+            r#ref: self._fields.1.unwrap(),
+            source: self._fields.2.unwrap(),
+            when: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/computer_aesthetic/mood.rs b/crates/jacquard-api/src/computer_aesthetic/mood.rs
index 692fde5a..7c7f8baf 100644
--- a/crates/jacquard-api/src/computer_aesthetic/mood.rs
+++ b/crates/jacquard-api/src/computer_aesthetic/mood.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -125,58 +128,58 @@ pub mod mood_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type When;
-        type Ref;
         type Mood;
+        type Ref;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type When = Unset;
-        type Ref = Unset;
         type Mood = Unset;
+        type Ref = Unset;
     }
     ///State transition - sets the `when` field to Set
     pub struct SetWhen<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWhen<S> {}
     impl<S: State> State for SetWhen<S> {
         type When = Set<members::when>;
-        type Ref = S::Ref;
-        type Mood = S::Mood;
-    }
-    ///State transition - sets the `ref` field to Set
-    pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRef<S> {}
-    impl<S: State> State for SetRef<S> {
-        type When = S::When;
-        type Ref = Set<members::r#ref>;
         type Mood = S::Mood;
+        type Ref = S::Ref;
     }
     ///State transition - sets the `mood` field to Set
     pub struct SetMood<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMood<S> {}
     impl<S: State> State for SetMood<S> {
         type When = S::When;
-        type Ref = S::Ref;
         type Mood = Set<members::mood>;
+        type Ref = S::Ref;
+    }
+    ///State transition - sets the `ref` field to Set
+    pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRef<S> {}
+    impl<S: State> State for SetRef<S> {
+        type When = S::When;
+        type Mood = S::Mood;
+        type Ref = Set<members::r#ref>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `when` field
         pub struct when(());
-        ///Marker type for the `ref` field
-        pub struct r#ref(());
         ///Marker type for the `mood` field
         pub struct mood(());
+        ///Marker type for the `ref` field
+        pub struct r#ref(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MoodBuilder<'a, S: mood_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Mood<'a> {
@@ -190,9 +193,9 @@ impl<'a> MoodBuilder<'a, mood_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MoodBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -207,11 +210,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MoodBuilder<'a, mood_state::SetMood<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MoodBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -226,11 +229,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MoodBuilder<'a, mood_state::SetRef<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MoodBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -245,11 +248,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MoodBuilder<'a, mood_state::SetWhen<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         MoodBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -258,15 +261,15 @@ impl<'a, S> MoodBuilder<'a, S>
 where
     S: mood_state::State,
     S::When: mood_state::IsSet,
-    S::Ref: mood_state::IsSet,
     S::Mood: mood_state::IsSet,
+    S::Ref: mood_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Mood<'a> {
         Mood {
-            mood: self.__unsafe_private_named.0.unwrap(),
-            r#ref: self.__unsafe_private_named.1.unwrap(),
-            when: self.__unsafe_private_named.2.unwrap(),
+            mood: self._fields.0.unwrap(),
+            r#ref: self._fields.1.unwrap(),
+            when: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -279,9 +282,9 @@ where
         >,
     ) -> Mood<'a> {
         Mood {
-            mood: self.__unsafe_private_named.0.unwrap(),
-            r#ref: self.__unsafe_private_named.1.unwrap(),
-            when: self.__unsafe_private_named.2.unwrap(),
+            mood: self._fields.0.unwrap(),
+            r#ref: self._fields.1.unwrap(),
+            when: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/computer_aesthetic/painting.rs b/crates/jacquard-api/src/computer_aesthetic/painting.rs
index d9f7285b..74de1936 100644
--- a/crates/jacquard-api/src/computer_aesthetic/painting.rs
+++ b/crates/jacquard-api/src/computer_aesthetic/painting.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -222,83 +225,83 @@ pub mod painting_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Ref;
         type Slug;
         type Code;
         type When;
+        type Ref;
         type ImageUrl;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Ref = Unset;
         type Slug = Unset;
         type Code = Unset;
         type When = Unset;
+        type Ref = Unset;
         type ImageUrl = Unset;
     }
-    ///State transition - sets the `ref` field to Set
-    pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRef<S> {}
-    impl<S: State> State for SetRef<S> {
-        type Ref = Set<members::r#ref>;
-        type Slug = S::Slug;
-        type Code = S::Code;
-        type When = S::When;
-        type ImageUrl = S::ImageUrl;
-    }
     ///State transition - sets the `slug` field to Set
     pub struct SetSlug<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSlug<S> {}
     impl<S: State> State for SetSlug<S> {
-        type Ref = S::Ref;
         type Slug = Set<members::slug>;
         type Code = S::Code;
         type When = S::When;
+        type Ref = S::Ref;
         type ImageUrl = S::ImageUrl;
     }
     ///State transition - sets the `code` field to Set
     pub struct SetCode<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCode<S> {}
     impl<S: State> State for SetCode<S> {
-        type Ref = S::Ref;
         type Slug = S::Slug;
         type Code = Set<members::code>;
         type When = S::When;
+        type Ref = S::Ref;
         type ImageUrl = S::ImageUrl;
     }
     ///State transition - sets the `when` field to Set
     pub struct SetWhen<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWhen<S> {}
     impl<S: State> State for SetWhen<S> {
-        type Ref = S::Ref;
         type Slug = S::Slug;
         type Code = S::Code;
         type When = Set<members::when>;
+        type Ref = S::Ref;
+        type ImageUrl = S::ImageUrl;
+    }
+    ///State transition - sets the `ref` field to Set
+    pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRef<S> {}
+    impl<S: State> State for SetRef<S> {
+        type Slug = S::Slug;
+        type Code = S::Code;
+        type When = S::When;
+        type Ref = Set<members::r#ref>;
         type ImageUrl = S::ImageUrl;
     }
     ///State transition - sets the `image_url` field to Set
     pub struct SetImageUrl<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetImageUrl<S> {}
     impl<S: State> State for SetImageUrl<S> {
-        type Ref = S::Ref;
         type Slug = S::Slug;
         type Code = S::Code;
         type When = S::When;
+        type Ref = S::Ref;
         type ImageUrl = Set<members::image_url>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `ref` field
-        pub struct r#ref(());
         ///Marker type for the `slug` field
         pub struct slug(());
         ///Marker type for the `code` field
         pub struct code(());
         ///Marker type for the `when` field
         pub struct when(());
+        ///Marker type for the `ref` field
+        pub struct r#ref(());
         ///Marker type for the `image_url` field
         pub struct image_url(());
     }
@@ -306,8 +309,8 @@ pub mod painting_state {
 
 /// Builder for constructing an instance of this type
 pub struct PaintingBuilder<'a, S: painting_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<UriValue<'a>>,
@@ -316,7 +319,7 @@ pub struct PaintingBuilder<'a, S: painting_state::State> {
         Option<BlobRef<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Painting<'a> {
@@ -330,9 +333,9 @@ impl<'a> PaintingBuilder<'a, painting_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PaintingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -347,11 +350,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PaintingBuilder<'a, painting_state::SetCode<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PaintingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -366,11 +369,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> PaintingBuilder<'a, painting_state::SetImageUrl<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PaintingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -378,12 +381,12 @@ where
 impl<'a, S: painting_state::State> PaintingBuilder<'a, S> {
     /// Set the `recordingUrl` field (optional)
     pub fn recording_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `recordingUrl` field to an Option value (optional)
     pub fn maybe_recording_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -398,11 +401,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PaintingBuilder<'a, painting_state::SetRef<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PaintingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -417,11 +420,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PaintingBuilder<'a, painting_state::SetSlug<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PaintingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -429,12 +432,12 @@ where
 impl<'a, S: painting_state::State> PaintingBuilder<'a, S> {
     /// Set the `thumbnail` field (optional)
     pub fn thumbnail(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -449,11 +452,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PaintingBuilder<'a, painting_state::SetWhen<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         PaintingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -461,22 +464,22 @@ where
 impl<'a, S> PaintingBuilder<'a, S>
 where
     S: painting_state::State,
-    S::Ref: painting_state::IsSet,
     S::Slug: painting_state::IsSet,
     S::Code: painting_state::IsSet,
     S::When: painting_state::IsSet,
+    S::Ref: painting_state::IsSet,
     S::ImageUrl: painting_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Painting<'a> {
         Painting {
-            code: self.__unsafe_private_named.0.unwrap(),
-            image_url: self.__unsafe_private_named.1.unwrap(),
-            recording_url: self.__unsafe_private_named.2,
-            r#ref: self.__unsafe_private_named.3.unwrap(),
-            slug: self.__unsafe_private_named.4.unwrap(),
-            thumbnail: self.__unsafe_private_named.5,
-            when: self.__unsafe_private_named.6.unwrap(),
+            code: self._fields.0.unwrap(),
+            image_url: self._fields.1.unwrap(),
+            recording_url: self._fields.2,
+            r#ref: self._fields.3.unwrap(),
+            slug: self._fields.4.unwrap(),
+            thumbnail: self._fields.5,
+            when: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -489,13 +492,13 @@ where
         >,
     ) -> Painting<'a> {
         Painting {
-            code: self.__unsafe_private_named.0.unwrap(),
-            image_url: self.__unsafe_private_named.1.unwrap(),
-            recording_url: self.__unsafe_private_named.2,
-            r#ref: self.__unsafe_private_named.3.unwrap(),
-            slug: self.__unsafe_private_named.4.unwrap(),
-            thumbnail: self.__unsafe_private_named.5,
-            when: self.__unsafe_private_named.6.unwrap(),
+            code: self._fields.0.unwrap(),
+            image_url: self._fields.1.unwrap(),
+            recording_url: self._fields.2,
+            r#ref: self._fields.3.unwrap(),
+            slug: self._fields.4.unwrap(),
+            thumbnail: self._fields.5,
+            when: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/computer_aesthetic/piece.rs b/crates/jacquard-api/src/computer_aesthetic/piece.rs
index f5775fa0..d2ec1e14 100644
--- a/crates/jacquard-api/src/computer_aesthetic/piece.rs
+++ b/crates/jacquard-api/src/computer_aesthetic/piece.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -135,59 +138,59 @@ pub mod piece_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Ref;
         type Slug;
         type When;
+        type Ref;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Ref = Unset;
         type Slug = Unset;
         type When = Unset;
-    }
-    ///State transition - sets the `ref` field to Set
-    pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRef<S> {}
-    impl<S: State> State for SetRef<S> {
-        type Ref = Set<members::r#ref>;
-        type Slug = S::Slug;
-        type When = S::When;
+        type Ref = Unset;
     }
     ///State transition - sets the `slug` field to Set
     pub struct SetSlug<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSlug<S> {}
     impl<S: State> State for SetSlug<S> {
-        type Ref = S::Ref;
         type Slug = Set<members::slug>;
         type When = S::When;
+        type Ref = S::Ref;
     }
     ///State transition - sets the `when` field to Set
     pub struct SetWhen<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWhen<S> {}
     impl<S: State> State for SetWhen<S> {
-        type Ref = S::Ref;
         type Slug = S::Slug;
         type When = Set<members::when>;
+        type Ref = S::Ref;
+    }
+    ///State transition - sets the `ref` field to Set
+    pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRef<S> {}
+    impl<S: State> State for SetRef<S> {
+        type Slug = S::Slug;
+        type When = S::When;
+        type Ref = Set<members::r#ref>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `ref` field
-        pub struct r#ref(());
         ///Marker type for the `slug` field
         pub struct slug(());
         ///Marker type for the `when` field
         pub struct when(());
+        ///Marker type for the `ref` field
+        pub struct r#ref(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PieceBuilder<'a, S: piece_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Piece<'a> {
@@ -201,9 +204,9 @@ impl<'a> PieceBuilder<'a, piece_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PieceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -218,11 +221,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PieceBuilder<'a, piece_state::SetRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PieceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -237,11 +240,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PieceBuilder<'a, piece_state::SetSlug<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PieceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -256,11 +259,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PieceBuilder<'a, piece_state::SetWhen<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PieceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -268,16 +271,16 @@ where
 impl<'a, S> PieceBuilder<'a, S>
 where
     S: piece_state::State,
-    S::Ref: piece_state::IsSet,
     S::Slug: piece_state::IsSet,
     S::When: piece_state::IsSet,
+    S::Ref: piece_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Piece<'a> {
         Piece {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
-            slug: self.__unsafe_private_named.1.unwrap(),
-            when: self.__unsafe_private_named.2.unwrap(),
+            r#ref: self._fields.0.unwrap(),
+            slug: self._fields.1.unwrap(),
+            when: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -290,9 +293,9 @@ where
         >,
     ) -> Piece<'a> {
         Piece {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
-            slug: self.__unsafe_private_named.1.unwrap(),
-            when: self.__unsafe_private_named.2.unwrap(),
+            r#ref: self._fields.0.unwrap(),
+            slug: self._fields.1.unwrap(),
+            when: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/computer_aesthetic/tape.rs b/crates/jacquard-api/src/computer_aesthetic/tape.rs
index 6cdd4a3d..48882282 100644
--- a/crates/jacquard-api/src/computer_aesthetic/tape.rs
+++ b/crates/jacquard-api/src/computer_aesthetic/tape.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -211,58 +214,58 @@ pub mod tape_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type When;
-        type Code;
         type Slug;
+        type Code;
+        type When;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type When = Unset;
-        type Code = Unset;
         type Slug = Unset;
+        type Code = Unset;
+        type When = Unset;
     }
-    ///State transition - sets the `when` field to Set
-    pub struct SetWhen<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetWhen<S> {}
-    impl<S: State> State for SetWhen<S> {
-        type When = Set<members::when>;
+    ///State transition - sets the `slug` field to Set
+    pub struct SetSlug<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSlug<S> {}
+    impl<S: State> State for SetSlug<S> {
+        type Slug = Set<members::slug>;
         type Code = S::Code;
-        type Slug = S::Slug;
+        type When = S::When;
     }
     ///State transition - sets the `code` field to Set
     pub struct SetCode<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCode<S> {}
     impl<S: State> State for SetCode<S> {
-        type When = S::When;
-        type Code = Set<members::code>;
         type Slug = S::Slug;
-    }
-    ///State transition - sets the `slug` field to Set
-    pub struct SetSlug<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSlug<S> {}
-    impl<S: State> State for SetSlug<S> {
+        type Code = Set<members::code>;
         type When = S::When;
+    }
+    ///State transition - sets the `when` field to Set
+    pub struct SetWhen<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetWhen<S> {}
+    impl<S: State> State for SetWhen<S> {
+        type Slug = S::Slug;
         type Code = S::Code;
-        type Slug = Set<members::slug>;
+        type When = Set<members::when>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `when` field
-        pub struct when(());
-        ///Marker type for the `code` field
-        pub struct code(());
         ///Marker type for the `slug` field
         pub struct slug(());
+        ///Marker type for the `code` field
+        pub struct code(());
+        ///Marker type for the `when` field
+        pub struct when(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TapeBuilder<'a, S: tape_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -272,7 +275,7 @@ pub struct TapeBuilder<'a, S: tape_state::State> {
         Option<Datetime>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Tape<'a> {
@@ -286,9 +289,9 @@ impl<'a> TapeBuilder<'a, tape_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TapeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -296,12 +299,12 @@ impl<'a> TapeBuilder<'a, tape_state::Empty> {
 impl<'a, S: tape_state::State> TapeBuilder<'a, S> {
     /// Set the `acUrl` field (optional)
     pub fn ac_url(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `acUrl` field to an Option value (optional)
     pub fn maybe_ac_url(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -316,11 +319,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TapeBuilder<'a, tape_state::SetCode<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TapeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -328,12 +331,12 @@ where
 impl<'a, S: tape_state::State> TapeBuilder<'a, S> {
     /// Set the `ref` field (optional)
     pub fn r#ref(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `ref` field to an Option value (optional)
     pub fn maybe_ref(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -348,11 +351,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TapeBuilder<'a, tape_state::SetSlug<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TapeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -360,12 +363,12 @@ where
 impl<'a, S: tape_state::State> TapeBuilder<'a, S> {
     /// Set the `thumbnail` field (optional)
     pub fn thumbnail(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -373,12 +376,12 @@ impl<'a, S: tape_state::State> TapeBuilder<'a, S> {
 impl<'a, S: tape_state::State> TapeBuilder<'a, S> {
     /// Set the `video` field (optional)
     pub fn video(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `video` field to an Option value (optional)
     pub fn maybe_video(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -393,11 +396,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TapeBuilder<'a, tape_state::SetWhen<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         TapeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -405,12 +408,12 @@ where
 impl<'a, S: tape_state::State> TapeBuilder<'a, S> {
     /// Set the `zipUrl` field (optional)
     pub fn zip_url(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `zipUrl` field to an Option value (optional)
     pub fn maybe_zip_url(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -418,21 +421,21 @@ impl<'a, S: tape_state::State> TapeBuilder<'a, S> {
 impl<'a, S> TapeBuilder<'a, S>
 where
     S: tape_state::State,
-    S::When: tape_state::IsSet,
-    S::Code: tape_state::IsSet,
     S::Slug: tape_state::IsSet,
+    S::Code: tape_state::IsSet,
+    S::When: tape_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Tape<'a> {
         Tape {
-            ac_url: self.__unsafe_private_named.0,
-            code: self.__unsafe_private_named.1.unwrap(),
-            r#ref: self.__unsafe_private_named.2,
-            slug: self.__unsafe_private_named.3.unwrap(),
-            thumbnail: self.__unsafe_private_named.4,
-            video: self.__unsafe_private_named.5,
-            when: self.__unsafe_private_named.6.unwrap(),
-            zip_url: self.__unsafe_private_named.7,
+            ac_url: self._fields.0,
+            code: self._fields.1.unwrap(),
+            r#ref: self._fields.2,
+            slug: self._fields.3.unwrap(),
+            thumbnail: self._fields.4,
+            video: self._fields.5,
+            when: self._fields.6.unwrap(),
+            zip_url: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -445,14 +448,14 @@ where
         >,
     ) -> Tape<'a> {
         Tape {
-            ac_url: self.__unsafe_private_named.0,
-            code: self.__unsafe_private_named.1.unwrap(),
-            r#ref: self.__unsafe_private_named.2,
-            slug: self.__unsafe_private_named.3.unwrap(),
-            thumbnail: self.__unsafe_private_named.4,
-            video: self.__unsafe_private_named.5,
-            when: self.__unsafe_private_named.6.unwrap(),
-            zip_url: self.__unsafe_private_named.7,
+            ac_url: self._fields.0,
+            code: self._fields.1.unwrap(),
+            r#ref: self._fields.2,
+            slug: self._fields.3.unwrap(),
+            thumbnail: self._fields.4,
+            video: self._fields.5,
+            when: self._fields.6.unwrap(),
+            zip_url: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/coop_hypha/pollen/claim.rs b/crates/jacquard-api/src/coop_hypha/pollen/claim.rs
index 2fe13dcf..716543d6 100644
--- a/crates/jacquard-api/src/coop_hypha/pollen/claim.rs
+++ b/crates/jacquard-api/src/coop_hypha/pollen/claim.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -123,81 +126,81 @@ pub mod claim_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Pfp;
+        type Cid;
         type CreatedAt;
+        type Pfp;
         type Content;
-        type Cid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Pfp = Unset;
+        type Cid = Unset;
         type CreatedAt = Unset;
+        type Pfp = Unset;
         type Content = Unset;
-        type Cid = Unset;
     }
-    ///State transition - sets the `pfp` field to Set
-    pub struct SetPfp<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPfp<S> {}
-    impl<S: State> State for SetPfp<S> {
-        type Pfp = Set<members::pfp>;
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Cid = Set<members::cid>;
         type CreatedAt = S::CreatedAt;
+        type Pfp = S::Pfp;
         type Content = S::Content;
-        type Cid = S::Cid;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Pfp = S::Pfp;
+        type Cid = S::Cid;
         type CreatedAt = Set<members::created_at>;
+        type Pfp = S::Pfp;
         type Content = S::Content;
+    }
+    ///State transition - sets the `pfp` field to Set
+    pub struct SetPfp<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPfp<S> {}
+    impl<S: State> State for SetPfp<S> {
         type Cid = S::Cid;
+        type CreatedAt = S::CreatedAt;
+        type Pfp = Set<members::pfp>;
+        type Content = S::Content;
     }
     ///State transition - sets the `content` field to Set
     pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContent<S> {}
     impl<S: State> State for SetContent<S> {
-        type Pfp = S::Pfp;
-        type CreatedAt = S::CreatedAt;
-        type Content = Set<members::content>;
         type Cid = S::Cid;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type Pfp = S::Pfp;
         type CreatedAt = S::CreatedAt;
-        type Content = S::Content;
-        type Cid = Set<members::cid>;
+        type Pfp = S::Pfp;
+        type Content = Set<members::content>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `pfp` field
-        pub struct pfp(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `pfp` field
+        pub struct pfp(());
         ///Marker type for the `content` field
         pub struct content(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ClaimBuilder<'a, S: claim_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CidLink<'a>>,
         Option<Text<'a>>,
         Option<Datetime>,
         Option<Data<'a>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Claim<'a> {
@@ -211,9 +214,9 @@ impl<'a> ClaimBuilder<'a, claim_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ClaimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -228,11 +231,11 @@ where
         mut self,
         value: impl Into<CidLink<'a>>,
     ) -> ClaimBuilder<'a, claim_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ClaimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -247,11 +250,11 @@ where
         mut self,
         value: impl Into<Text<'a>>,
     ) -> ClaimBuilder<'a, claim_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ClaimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -266,11 +269,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ClaimBuilder<'a, claim_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ClaimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -285,11 +288,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> ClaimBuilder<'a, claim_state::SetPfp<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ClaimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -297,12 +300,12 @@ where
 impl<'a, S: claim_state::State> ClaimBuilder<'a, S> {
     /// Set the `subject` field (optional)
     pub fn subject(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `subject` field to an Option value (optional)
     pub fn maybe_subject(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -310,19 +313,19 @@ impl<'a, S: claim_state::State> ClaimBuilder<'a, S> {
 impl<'a, S> ClaimBuilder<'a, S>
 where
     S: claim_state::State,
-    S::Pfp: claim_state::IsSet,
+    S::Cid: claim_state::IsSet,
     S::CreatedAt: claim_state::IsSet,
+    S::Pfp: claim_state::IsSet,
     S::Content: claim_state::IsSet,
-    S::Cid: claim_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Claim<'a> {
         Claim {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            content: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            pfp: self.__unsafe_private_named.3.unwrap(),
-            subject: self.__unsafe_private_named.4,
+            cid: self._fields.0.unwrap(),
+            content: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            pfp: self._fields.3.unwrap(),
+            subject: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -332,11 +335,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Claim<'a> {
         Claim {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            content: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            pfp: self.__unsafe_private_named.3.unwrap(),
-            subject: self.__unsafe_private_named.4,
+            cid: self._fields.0.unwrap(),
+            content: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            pfp: self._fields.3.unwrap(),
+            subject: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/coop_hypha/spores/content/image.rs b/crates/jacquard-api/src/coop_hypha/spores/content/image.rs
index f42b3019..ff53d998 100644
--- a/crates/jacquard-api/src/coop_hypha/spores/content/image.rs
+++ b/crates/jacquard-api/src/coop_hypha/spores/content/image.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -182,50 +185,50 @@ pub mod image_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Image;
         type CreatedAt;
+        type Image;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Image = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `image` field to Set
-    pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetImage<S> {}
-    impl<S: State> State for SetImage<S> {
-        type Image = Set<members::image>;
-        type CreatedAt = S::CreatedAt;
+        type Image = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Image = S::Image;
         type CreatedAt = Set<members::created_at>;
+        type Image = S::Image;
+    }
+    ///State transition - sets the `image` field to Set
+    pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetImage<S> {}
+    impl<S: State> State for SetImage<S> {
+        type CreatedAt = S::CreatedAt;
+        type Image = Set<members::image>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `image` field
-        pub struct image(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `image` field
+        pub struct image(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ImageBuilder<'a, S: image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Data<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Image<'a> {
@@ -239,9 +242,9 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -256,11 +259,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ImageBuilder<'a, image_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -268,12 +271,12 @@ where
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `embed` field (optional)
     pub fn embed(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `embed` field to an Option value (optional)
     pub fn maybe_embed(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -288,11 +291,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ImageBuilder<'a, image_state::SetImage<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -300,12 +303,12 @@ where
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -313,16 +316,16 @@ impl<'a, S: image_state::State> ImageBuilder<'a, S> {
 impl<'a, S> ImageBuilder<'a, S>
 where
     S: image_state::State,
-    S::Image: image_state::IsSet,
     S::CreatedAt: image_state::IsSet,
+    S::Image: image_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Image<'a> {
         Image {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            embed: self.__unsafe_private_named.1,
-            image: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3,
+            created_at: self._fields.0.unwrap(),
+            embed: self._fields.1,
+            image: self._fields.2.unwrap(),
+            title: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -332,10 +335,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Image<'a> {
         Image {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            embed: self.__unsafe_private_named.1,
-            image: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3,
+            created_at: self._fields.0.unwrap(),
+            embed: self._fields.1,
+            image: self._fields.2.unwrap(),
+            title: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/coop_hypha/spores/content/text.rs b/crates/jacquard-api/src/coop_hypha/spores/content/text.rs
index 4fa63039..3e45a778 100644
--- a/crates/jacquard-api/src/coop_hypha/spores/content/text.rs
+++ b/crates/jacquard-api/src/coop_hypha/spores/content/text.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -259,50 +262,50 @@ pub mod text_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Content;
         type CreatedAt;
+        type Content;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Content = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `content` field to Set
-    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContent<S> {}
-    impl<S: State> State for SetContent<S> {
-        type Content = Set<members::content>;
-        type CreatedAt = S::CreatedAt;
+        type Content = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Content = S::Content;
         type CreatedAt = Set<members::created_at>;
+        type Content = S::Content;
+    }
+    ///State transition - sets the `content` field to Set
+    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContent<S> {}
+    impl<S: State> State for SetContent<S> {
+        type CreatedAt = S::CreatedAt;
+        type Content = Set<members::content>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `content` field
-        pub struct content(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `content` field
+        pub struct content(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TextBuilder<'a, S: text_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<TextFormat<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Text<'a> {
@@ -316,9 +319,9 @@ impl<'a> TextBuilder<'a, text_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TextBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -333,11 +336,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TextBuilder<'a, text_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TextBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -352,11 +355,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TextBuilder<'a, text_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TextBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -364,12 +367,12 @@ where
 impl<'a, S: text_state::State> TextBuilder<'a, S> {
     /// Set the `format` field (optional)
     pub fn format(mut self, value: impl Into<Option<TextFormat<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `format` field to an Option value (optional)
     pub fn maybe_format(mut self, value: Option<TextFormat<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -377,12 +380,12 @@ impl<'a, S: text_state::State> TextBuilder<'a, S> {
 impl<'a, S: text_state::State> TextBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -390,16 +393,16 @@ impl<'a, S: text_state::State> TextBuilder<'a, S> {
 impl<'a, S> TextBuilder<'a, S>
 where
     S: text_state::State,
-    S::Content: text_state::IsSet,
     S::CreatedAt: text_state::IsSet,
+    S::Content: text_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Text<'a> {
         Text {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            format: self.__unsafe_private_named.2,
-            title: self.__unsafe_private_named.3,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            format: self._fields.2,
+            title: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -412,10 +415,10 @@ where
         >,
     ) -> Text<'a> {
         Text {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            format: self.__unsafe_private_named.2,
-            title: self.__unsafe_private_named.3,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            format: self._fields.2,
+            title: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/coop_hypha/spores/item/special_spore.rs b/crates/jacquard-api/src/coop_hypha/spores/item/special_spore.rs
index 2f6de454..9db50d31 100644
--- a/crates/jacquard-api/src/coop_hypha/spores/item/special_spore.rs
+++ b/crates/jacquard-api/src/coop_hypha/spores/item/special_spore.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -110,45 +113,45 @@ pub mod special_spore_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type CreatedAt;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
+        type Subject = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SpecialSporeBuilder<'a, S: special_spore_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SpecialSpore<'a> {
@@ -162,9 +165,9 @@ impl<'a> SpecialSporeBuilder<'a, special_spore_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SpecialSporeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SpecialSporeBuilder<'a, special_spore_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SpecialSporeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> SpecialSporeBuilder<'a, special_spore_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SpecialSporeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,14 +213,14 @@ where
 impl<'a, S> SpecialSporeBuilder<'a, S>
 where
     S: special_spore_state::State,
-    S::Subject: special_spore_state::IsSet,
     S::CreatedAt: special_spore_state::IsSet,
+    S::Subject: special_spore_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SpecialSpore<'a> {
         SpecialSpore {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> SpecialSpore<'a> {
         SpecialSpore {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/coop_hypha/spores/site/config.rs b/crates/jacquard-api/src/coop_hypha/spores/site/config.rs
index ac0ae120..a06c8003 100644
--- a/crates/jacquard-api/src/coop_hypha/spores/site/config.rs
+++ b/crates/jacquard-api/src/coop_hypha/spores/site/config.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -624,8 +627,8 @@ pub mod config_state {
 
 /// Builder for constructing an instance of this type
 pub struct ConfigBuilder<'a, S: config_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ConfigBodyFont<'a>>,
         Option<ConfigFontBody<'a>>,
         Option<ConfigFontHeading<'a>>,
@@ -633,7 +636,7 @@ pub struct ConfigBuilder<'a, S: config_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Config<'a> {
@@ -647,9 +650,9 @@ impl<'a> ConfigBuilder<'a, config_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ConfigBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -657,12 +660,12 @@ impl<'a> ConfigBuilder<'a, config_state::Empty> {
 impl<'a, S: config_state::State> ConfigBuilder<'a, S> {
     /// Set the `bodyFont` field (optional)
     pub fn body_font(mut self, value: impl Into<Option<ConfigBodyFont<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `bodyFont` field to an Option value (optional)
     pub fn maybe_body_font(mut self, value: Option<ConfigBodyFont<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -670,12 +673,12 @@ impl<'a, S: config_state::State> ConfigBuilder<'a, S> {
 impl<'a, S: config_state::State> ConfigBuilder<'a, S> {
     /// Set the `fontBody` field (optional)
     pub fn font_body(mut self, value: impl Into<Option<ConfigFontBody<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `fontBody` field to an Option value (optional)
     pub fn maybe_font_body(mut self, value: Option<ConfigFontBody<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -686,12 +689,12 @@ impl<'a, S: config_state::State> ConfigBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ConfigFontHeading<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `fontHeading` field to an Option value (optional)
     pub fn maybe_font_heading(mut self, value: Option<ConfigFontHeading<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -702,12 +705,12 @@ impl<'a, S: config_state::State> ConfigBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ConfigHeadingFont<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `headingFont` field to an Option value (optional)
     pub fn maybe_heading_font(mut self, value: Option<ConfigHeadingFont<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -715,12 +718,12 @@ impl<'a, S: config_state::State> ConfigBuilder<'a, S> {
 impl<'a, S: config_state::State> ConfigBuilder<'a, S> {
     /// Set the `subtitle` field (optional)
     pub fn subtitle(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `subtitle` field to an Option value (optional)
     pub fn maybe_subtitle(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -728,12 +731,12 @@ impl<'a, S: config_state::State> ConfigBuilder<'a, S> {
 impl<'a, S: config_state::State> ConfigBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -745,12 +748,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Config<'a> {
         Config {
-            body_font: self.__unsafe_private_named.0,
-            font_body: self.__unsafe_private_named.1,
-            font_heading: self.__unsafe_private_named.2,
-            heading_font: self.__unsafe_private_named.3,
-            subtitle: self.__unsafe_private_named.4,
-            title: self.__unsafe_private_named.5,
+            body_font: self._fields.0,
+            font_body: self._fields.1,
+            font_heading: self._fields.2,
+            heading_font: self._fields.3,
+            subtitle: self._fields.4,
+            title: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -763,12 +766,12 @@ where
         >,
     ) -> Config<'a> {
         Config {
-            body_font: self.__unsafe_private_named.0,
-            font_body: self.__unsafe_private_named.1,
-            font_heading: self.__unsafe_private_named.2,
-            heading_font: self.__unsafe_private_named.3,
-            subtitle: self.__unsafe_private_named.4,
-            title: self.__unsafe_private_named.5,
+            body_font: self._fields.0,
+            font_body: self._fields.1,
+            font_heading: self._fields.2,
+            heading_font: self._fields.3,
+            subtitle: self._fields.4,
+            title: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/coop_hypha/spores/site/layout.rs b/crates/jacquard-api/src/coop_hypha/spores/site/layout.rs
index 272e6577..eac8494a 100644
--- a/crates/jacquard-api/src/coop_hypha/spores/site/layout.rs
+++ b/crates/jacquard-api/src/coop_hypha/spores/site/layout.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -132,9 +135,9 @@ pub mod layout_state {
 
 /// Builder for constructing an instance of this type
 pub struct LayoutBuilder<'a, S: layout_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<AtUri<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<AtUri<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Layout<'a> {
@@ -148,9 +151,9 @@ impl<'a> LayoutBuilder<'a, layout_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LayoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -165,11 +168,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> LayoutBuilder<'a, layout_state::SetSections<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LayoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,7 +185,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Layout<'a> {
         Layout {
-            sections: self.__unsafe_private_named.0.unwrap(),
+            sections: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -195,7 +198,7 @@ where
         >,
     ) -> Layout<'a> {
         Layout {
-            sections: self.__unsafe_private_named.0.unwrap(),
+            sections: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/coop_hypha/spores/site/profile.rs b/crates/jacquard-api/src/coop_hypha/spores/site/profile.rs
index 338badbd..5bf0f261 100644
--- a/crates/jacquard-api/src/coop_hypha/spores/site/profile.rs
+++ b/crates/jacquard-api/src/coop_hypha/spores/site/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -275,8 +278,8 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<BlobRef<'a>>,
         Option<Datetime>,
@@ -284,7 +287,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -298,9 +301,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -308,12 +311,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -321,12 +324,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -334,12 +337,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -347,12 +350,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -360,12 +363,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -373,12 +376,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -390,12 +393,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4,
-            updated_at: self.__unsafe_private_named.5,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            created_at: self._fields.2,
+            description: self._fields.3,
+            display_name: self._fields.4,
+            updated_at: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -408,12 +411,12 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4,
-            updated_at: self.__unsafe_private_named.5,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            created_at: self._fields.2,
+            description: self._fields.3,
+            display_name: self._fields.4,
+            updated_at: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/coop_hypha/spores/site/section.rs b/crates/jacquard-api/src/coop_hypha/spores/site/section.rs
index 21cb14b3..1c89fcd6 100644
--- a/crates/jacquard-api/src/coop_hypha/spores/site/section.rs
+++ b/crates/jacquard-api/src/coop_hypha/spores/site/section.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -562,8 +565,8 @@ pub mod section_state {
 
 /// Builder for constructing an instance of this type
 pub struct SectionBuilder<'a, S: section_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<SectionFormat<'a>>,
@@ -576,7 +579,7 @@ pub struct SectionBuilder<'a, S: section_state::State> {
         Option<CowStr<'a>>,
         Option<SectionType<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Section<'a> {
@@ -590,21 +593,9 @@ impl<'a> SectionBuilder<'a, section_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -612,12 +603,12 @@ impl<'a> SectionBuilder<'a, section_state::Empty> {
 impl<'a, S: section_state::State> SectionBuilder<'a, S> {
     /// Set the `collection` field (optional)
     pub fn collection(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `collection` field to an Option value (optional)
     pub fn maybe_collection(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -625,12 +616,12 @@ impl<'a, S: section_state::State> SectionBuilder<'a, S> {
 impl<'a, S: section_state::State> SectionBuilder<'a, S> {
     /// Set the `content` field (optional)
     pub fn content(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `content` field to an Option value (optional)
     pub fn maybe_content(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -638,12 +629,12 @@ impl<'a, S: section_state::State> SectionBuilder<'a, S> {
 impl<'a, S: section_state::State> SectionBuilder<'a, S> {
     /// Set the `format` field (optional)
     pub fn format(mut self, value: impl Into<Option<SectionFormat<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `format` field to an Option value (optional)
     pub fn maybe_format(mut self, value: Option<SectionFormat<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -651,12 +642,12 @@ impl<'a, S: section_state::State> SectionBuilder<'a, S> {
 impl<'a, S: section_state::State> SectionBuilder<'a, S> {
     /// Set the `hideHeader` field (optional)
     pub fn hide_header(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `hideHeader` field to an Option value (optional)
     pub fn maybe_hide_header(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -664,12 +655,12 @@ impl<'a, S: section_state::State> SectionBuilder<'a, S> {
 impl<'a, S: section_state::State> SectionBuilder<'a, S> {
     /// Set the `layout` field (optional)
     pub fn layout(mut self, value: impl Into<Option<SectionLayout<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `layout` field to an Option value (optional)
     pub fn maybe_layout(mut self, value: Option<SectionLayout<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -677,12 +668,12 @@ impl<'a, S: section_state::State> SectionBuilder<'a, S> {
 impl<'a, S: section_state::State> SectionBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -690,12 +681,12 @@ impl<'a, S: section_state::State> SectionBuilder<'a, S> {
 impl<'a, S: section_state::State> SectionBuilder<'a, S> {
     /// Set the `records` field (optional)
     pub fn records(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `records` field to an Option value (optional)
     pub fn maybe_records(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -703,12 +694,12 @@ impl<'a, S: section_state::State> SectionBuilder<'a, S> {
 impl<'a, S: section_state::State> SectionBuilder<'a, S> {
     /// Set the `ref` field (optional)
     pub fn r#ref(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `ref` field to an Option value (optional)
     pub fn maybe_ref(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -716,12 +707,12 @@ impl<'a, S: section_state::State> SectionBuilder<'a, S> {
 impl<'a, S: section_state::State> SectionBuilder<'a, S> {
     /// Set the `rkey` field (optional)
     pub fn rkey(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `rkey` field to an Option value (optional)
     pub fn maybe_rkey(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -729,12 +720,12 @@ impl<'a, S: section_state::State> SectionBuilder<'a, S> {
 impl<'a, S: section_state::State> SectionBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -749,11 +740,11 @@ where
         mut self,
         value: impl Into<SectionType<'a>>,
     ) -> SectionBuilder<'a, section_state::SetType<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         SectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -766,17 +757,17 @@ where
     /// Build the final struct
     pub fn build(self) -> Section<'a> {
         Section {
-            collection: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1,
-            format: self.__unsafe_private_named.2,
-            hide_header: self.__unsafe_private_named.3,
-            layout: self.__unsafe_private_named.4,
-            limit: self.__unsafe_private_named.5,
-            records: self.__unsafe_private_named.6,
-            r#ref: self.__unsafe_private_named.7,
-            rkey: self.__unsafe_private_named.8,
-            title: self.__unsafe_private_named.9,
-            r#type: self.__unsafe_private_named.10.unwrap(),
+            collection: self._fields.0,
+            content: self._fields.1,
+            format: self._fields.2,
+            hide_header: self._fields.3,
+            layout: self._fields.4,
+            limit: self._fields.5,
+            records: self._fields.6,
+            r#ref: self._fields.7,
+            rkey: self._fields.8,
+            title: self._fields.9,
+            r#type: self._fields.10.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -789,17 +780,17 @@ where
         >,
     ) -> Section<'a> {
         Section {
-            collection: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1,
-            format: self.__unsafe_private_named.2,
-            hide_header: self.__unsafe_private_named.3,
-            layout: self.__unsafe_private_named.4,
-            limit: self.__unsafe_private_named.5,
-            records: self.__unsafe_private_named.6,
-            r#ref: self.__unsafe_private_named.7,
-            rkey: self.__unsafe_private_named.8,
-            title: self.__unsafe_private_named.9,
-            r#type: self.__unsafe_private_named.10.unwrap(),
+            collection: self._fields.0,
+            content: self._fields.1,
+            format: self._fields.2,
+            hide_header: self._fields.3,
+            layout: self._fields.4,
+            limit: self._fields.5,
+            records: self._fields.6,
+            r#ref: self._fields.7,
+            rkey: self._fields.8,
+            title: self._fields.9,
+            r#type: self._fields.10.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/coop_hypha/spores/social/flower.rs b/crates/jacquard-api/src/coop_hypha/spores/social/flower.rs
index 5d82862f..7b52c6cf 100644
--- a/crates/jacquard-api/src/coop_hypha/spores/social/flower.rs
+++ b/crates/jacquard-api/src/coop_hypha/spores/social/flower.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -110,45 +113,45 @@ pub mod flower_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subject;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subject = S::Subject;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FlowerBuilder<'a, S: flower_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Flower<'a> {
@@ -162,9 +165,9 @@ impl<'a> FlowerBuilder<'a, flower_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FlowerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FlowerBuilder<'a, flower_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FlowerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> FlowerBuilder<'a, flower_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FlowerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,14 +213,14 @@ where
 impl<'a, S> FlowerBuilder<'a, S>
 where
     S: flower_state::State,
-    S::CreatedAt: flower_state::IsSet,
     S::Subject: flower_state::IsSet,
+    S::CreatedAt: flower_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Flower<'a> {
         Flower {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Flower<'a> {
         Flower {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/coop_hypha/spores/social/taken_flower.rs b/crates/jacquard-api/src/coop_hypha/spores/social/taken_flower.rs
index 0bca9bb7..035f9ab2 100644
--- a/crates/jacquard-api/src/coop_hypha/spores/social/taken_flower.rs
+++ b/crates/jacquard-api/src/coop_hypha/spores/social/taken_flower.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -172,9 +175,9 @@ pub mod taken_flower_state {
 
 /// Builder for constructing an instance of this type
 pub struct TakenFlowerBuilder<'a, S: taken_flower_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TakenFlower<'a> {
@@ -188,9 +191,9 @@ impl<'a> TakenFlowerBuilder<'a, taken_flower_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TakenFlowerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -205,11 +208,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TakenFlowerBuilder<'a, taken_flower_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TakenFlowerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -217,12 +220,12 @@ where
 impl<'a, S: taken_flower_state::State> TakenFlowerBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -237,11 +240,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> TakenFlowerBuilder<'a, taken_flower_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TakenFlowerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -255,9 +258,9 @@ where
     /// Build the final struct
     pub fn build(self) -> TakenFlower<'a> {
         TakenFlower {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            note: self.__unsafe_private_named.1,
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            note: self._fields.1,
+            subject: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -270,9 +273,9 @@ where
         >,
     ) -> TakenFlower<'a> {
         TakenFlower {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            note: self.__unsafe_private_named.1,
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            note: self._fields.1,
+            subject: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_baileytownsend/demo/example.rs b/crates/jacquard-api/src/dev_baileytownsend/demo/example.rs
index 5468c91c..8b149824 100644
--- a/crates/jacquard-api/src/dev_baileytownsend/demo/example.rs
+++ b/crates/jacquard-api/src/dev_baileytownsend/demo/example.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -180,9 +183,9 @@ pub mod example_state {
 
 /// Builder for constructing an instance of this type
 pub struct ExampleBuilder<'a, S: example_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Example<'a> {
@@ -196,9 +199,9 @@ impl<'a> ExampleBuilder<'a, example_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExampleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,11 +216,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ExampleBuilder<'a, example_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ExampleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,11 +235,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ExampleBuilder<'a, example_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ExampleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -250,8 +253,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Example<'a> {
         Example {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -264,8 +267,8 @@ where
         >,
     ) -> Example<'a> {
         Example {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_baileytownsend/health/calories.rs b/crates/jacquard-api/src/dev_baileytownsend/health/calories.rs
index 82e28be3..a3c9e8e7 100644
--- a/crates/jacquard-api/src/dev_baileytownsend/health/calories.rs
+++ b/crates/jacquard-api/src/dev_baileytownsend/health/calories.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -108,59 +111,59 @@ pub mod calories_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Intake;
         type CreatedAt;
         type Burned;
-        type Intake;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Intake = Unset;
         type CreatedAt = Unset;
         type Burned = Unset;
-        type Intake = Unset;
+    }
+    ///State transition - sets the `intake` field to Set
+    pub struct SetIntake<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIntake<S> {}
+    impl<S: State> State for SetIntake<S> {
+        type Intake = Set<members::intake>;
+        type CreatedAt = S::CreatedAt;
+        type Burned = S::Burned;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Intake = S::Intake;
         type CreatedAt = Set<members::created_at>;
         type Burned = S::Burned;
-        type Intake = S::Intake;
     }
     ///State transition - sets the `burned` field to Set
     pub struct SetBurned<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBurned<S> {}
     impl<S: State> State for SetBurned<S> {
-        type CreatedAt = S::CreatedAt;
-        type Burned = Set<members::burned>;
         type Intake = S::Intake;
-    }
-    ///State transition - sets the `intake` field to Set
-    pub struct SetIntake<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIntake<S> {}
-    impl<S: State> State for SetIntake<S> {
         type CreatedAt = S::CreatedAt;
-        type Burned = S::Burned;
-        type Intake = Set<members::intake>;
+        type Burned = Set<members::burned>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `intake` field
+        pub struct intake(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `burned` field
         pub struct burned(());
-        ///Marker type for the `intake` field
-        pub struct intake(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CaloriesBuilder<'a, S: calories_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Datetime>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Datetime>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Calories<'a> {
@@ -174,9 +177,9 @@ impl<'a> CaloriesBuilder<'a, calories_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CaloriesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -191,11 +194,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CaloriesBuilder<'a, calories_state::SetBurned<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CaloriesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,11 +213,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CaloriesBuilder<'a, calories_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CaloriesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -229,11 +232,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CaloriesBuilder<'a, calories_state::SetIntake<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CaloriesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -241,16 +244,16 @@ where
 impl<'a, S> CaloriesBuilder<'a, S>
 where
     S: calories_state::State,
+    S::Intake: calories_state::IsSet,
     S::CreatedAt: calories_state::IsSet,
     S::Burned: calories_state::IsSet,
-    S::Intake: calories_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Calories<'a> {
         Calories {
-            burned: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            intake: self.__unsafe_private_named.2.unwrap(),
+            burned: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            intake: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -263,9 +266,9 @@ where
         >,
     ) -> Calories<'a> {
         Calories {
-            burned: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            intake: self.__unsafe_private_named.2.unwrap(),
+            burned: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            intake: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_baileytownsend/health/rings.rs b/crates/jacquard-api/src/dev_baileytownsend/health/rings.rs
index 4d084b72..4430dc71 100644
--- a/crates/jacquard-api/src/dev_baileytownsend/health/rings.rs
+++ b/crates/jacquard-api/src/dev_baileytownsend/health/rings.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -118,134 +121,134 @@ pub mod rings_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Exercise;
+        type StandGoal;
         type ExerciseGoal;
-        type StandHours;
-        type CreatedAt;
         type MoveGoal;
-        type StandGoal;
         type Move;
-        type Exercise;
+        type StandHours;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Exercise = Unset;
+        type StandGoal = Unset;
         type ExerciseGoal = Unset;
-        type StandHours = Unset;
-        type CreatedAt = Unset;
         type MoveGoal = Unset;
-        type StandGoal = Unset;
         type Move = Unset;
-        type Exercise = Unset;
+        type StandHours = Unset;
+        type CreatedAt = Unset;
     }
-    ///State transition - sets the `exercise_goal` field to Set
-    pub struct SetExerciseGoal<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetExerciseGoal<S> {}
-    impl<S: State> State for SetExerciseGoal<S> {
-        type ExerciseGoal = Set<members::exercise_goal>;
-        type StandHours = S::StandHours;
-        type CreatedAt = S::CreatedAt;
-        type MoveGoal = S::MoveGoal;
+    ///State transition - sets the `exercise` field to Set
+    pub struct SetExercise<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetExercise<S> {}
+    impl<S: State> State for SetExercise<S> {
+        type Exercise = Set<members::exercise>;
         type StandGoal = S::StandGoal;
-        type Move = S::Move;
-        type Exercise = S::Exercise;
-    }
-    ///State transition - sets the `stand_hours` field to Set
-    pub struct SetStandHours<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStandHours<S> {}
-    impl<S: State> State for SetStandHours<S> {
         type ExerciseGoal = S::ExerciseGoal;
-        type StandHours = Set<members::stand_hours>;
-        type CreatedAt = S::CreatedAt;
         type MoveGoal = S::MoveGoal;
-        type StandGoal = S::StandGoal;
         type Move = S::Move;
-        type Exercise = S::Exercise;
+        type StandHours = S::StandHours;
+        type CreatedAt = S::CreatedAt;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+    ///State transition - sets the `stand_goal` field to Set
+    pub struct SetStandGoal<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStandGoal<S> {}
+    impl<S: State> State for SetStandGoal<S> {
+        type Exercise = S::Exercise;
+        type StandGoal = Set<members::stand_goal>;
         type ExerciseGoal = S::ExerciseGoal;
-        type StandHours = S::StandHours;
-        type CreatedAt = Set<members::created_at>;
         type MoveGoal = S::MoveGoal;
-        type StandGoal = S::StandGoal;
         type Move = S::Move;
+        type StandHours = S::StandHours;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `exercise_goal` field to Set
+    pub struct SetExerciseGoal<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetExerciseGoal<S> {}
+    impl<S: State> State for SetExerciseGoal<S> {
         type Exercise = S::Exercise;
+        type StandGoal = S::StandGoal;
+        type ExerciseGoal = Set<members::exercise_goal>;
+        type MoveGoal = S::MoveGoal;
+        type Move = S::Move;
+        type StandHours = S::StandHours;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `move_goal` field to Set
     pub struct SetMoveGoal<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMoveGoal<S> {}
     impl<S: State> State for SetMoveGoal<S> {
+        type Exercise = S::Exercise;
+        type StandGoal = S::StandGoal;
         type ExerciseGoal = S::ExerciseGoal;
-        type StandHours = S::StandHours;
-        type CreatedAt = S::CreatedAt;
         type MoveGoal = Set<members::move_goal>;
-        type StandGoal = S::StandGoal;
         type Move = S::Move;
-        type Exercise = S::Exercise;
-    }
-    ///State transition - sets the `stand_goal` field to Set
-    pub struct SetStandGoal<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStandGoal<S> {}
-    impl<S: State> State for SetStandGoal<S> {
-        type ExerciseGoal = S::ExerciseGoal;
         type StandHours = S::StandHours;
         type CreatedAt = S::CreatedAt;
-        type MoveGoal = S::MoveGoal;
-        type StandGoal = Set<members::stand_goal>;
-        type Move = S::Move;
-        type Exercise = S::Exercise;
     }
     ///State transition - sets the `move` field to Set
     pub struct SetMove<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMove<S> {}
     impl<S: State> State for SetMove<S> {
+        type Exercise = S::Exercise;
+        type StandGoal = S::StandGoal;
         type ExerciseGoal = S::ExerciseGoal;
-        type StandHours = S::StandHours;
-        type CreatedAt = S::CreatedAt;
         type MoveGoal = S::MoveGoal;
-        type StandGoal = S::StandGoal;
         type Move = Set<members::r#move>;
-        type Exercise = S::Exercise;
-    }
-    ///State transition - sets the `exercise` field to Set
-    pub struct SetExercise<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetExercise<S> {}
-    impl<S: State> State for SetExercise<S> {
-        type ExerciseGoal = S::ExerciseGoal;
         type StandHours = S::StandHours;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `stand_hours` field to Set
+    pub struct SetStandHours<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStandHours<S> {}
+    impl<S: State> State for SetStandHours<S> {
+        type Exercise = S::Exercise;
+        type StandGoal = S::StandGoal;
+        type ExerciseGoal = S::ExerciseGoal;
         type MoveGoal = S::MoveGoal;
+        type Move = S::Move;
+        type StandHours = Set<members::stand_hours>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Exercise = S::Exercise;
         type StandGoal = S::StandGoal;
+        type ExerciseGoal = S::ExerciseGoal;
+        type MoveGoal = S::MoveGoal;
         type Move = S::Move;
-        type Exercise = Set<members::exercise>;
+        type StandHours = S::StandHours;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `exercise` field
+        pub struct exercise(());
+        ///Marker type for the `stand_goal` field
+        pub struct stand_goal(());
         ///Marker type for the `exercise_goal` field
         pub struct exercise_goal(());
-        ///Marker type for the `stand_hours` field
-        pub struct stand_hours(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `move_goal` field
         pub struct move_goal(());
-        ///Marker type for the `stand_goal` field
-        pub struct stand_goal(());
         ///Marker type for the `move` field
         pub struct r#move(());
-        ///Marker type for the `exercise` field
-        pub struct exercise(());
+        ///Marker type for the `stand_hours` field
+        pub struct stand_hours(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RingsBuilder<'a, S: rings_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<i64>,
         Option<i64>,
@@ -254,7 +257,7 @@ pub struct RingsBuilder<'a, S: rings_state::State> {
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Rings<'a> {
@@ -268,9 +271,9 @@ impl<'a> RingsBuilder<'a, rings_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -285,11 +288,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RingsBuilder<'a, rings_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -304,11 +307,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingsBuilder<'a, rings_state::SetExercise<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -323,11 +326,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingsBuilder<'a, rings_state::SetExerciseGoal<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -342,11 +345,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingsBuilder<'a, rings_state::SetMove<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -361,11 +364,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingsBuilder<'a, rings_state::SetMoveGoal<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -380,11 +383,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingsBuilder<'a, rings_state::SetStandGoal<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         RingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -399,11 +402,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingsBuilder<'a, rings_state::SetStandHours<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         RingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -411,24 +414,24 @@ where
 impl<'a, S> RingsBuilder<'a, S>
 where
     S: rings_state::State,
+    S::Exercise: rings_state::IsSet,
+    S::StandGoal: rings_state::IsSet,
     S::ExerciseGoal: rings_state::IsSet,
-    S::StandHours: rings_state::IsSet,
-    S::CreatedAt: rings_state::IsSet,
     S::MoveGoal: rings_state::IsSet,
-    S::StandGoal: rings_state::IsSet,
     S::Move: rings_state::IsSet,
-    S::Exercise: rings_state::IsSet,
+    S::StandHours: rings_state::IsSet,
+    S::CreatedAt: rings_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Rings<'a> {
         Rings {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            exercise: self.__unsafe_private_named.1.unwrap(),
-            exercise_goal: self.__unsafe_private_named.2.unwrap(),
-            r#move: self.__unsafe_private_named.3.unwrap(),
-            move_goal: self.__unsafe_private_named.4.unwrap(),
-            stand_goal: self.__unsafe_private_named.5.unwrap(),
-            stand_hours: self.__unsafe_private_named.6.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            exercise: self._fields.1.unwrap(),
+            exercise_goal: self._fields.2.unwrap(),
+            r#move: self._fields.3.unwrap(),
+            move_goal: self._fields.4.unwrap(),
+            stand_goal: self._fields.5.unwrap(),
+            stand_hours: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -441,13 +444,13 @@ where
         >,
     ) -> Rings<'a> {
         Rings {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            exercise: self.__unsafe_private_named.1.unwrap(),
-            exercise_goal: self.__unsafe_private_named.2.unwrap(),
-            r#move: self.__unsafe_private_named.3.unwrap(),
-            move_goal: self.__unsafe_private_named.4.unwrap(),
-            stand_goal: self.__unsafe_private_named.5.unwrap(),
-            stand_hours: self.__unsafe_private_named.6.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            exercise: self._fields.1.unwrap(),
+            exercise_goal: self._fields.2.unwrap(),
+            r#move: self._fields.3.unwrap(),
+            move_goal: self._fields.4.unwrap(),
+            stand_goal: self._fields.5.unwrap(),
+            stand_hours: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_baileytownsend/health/steps.rs b/crates/jacquard-api/src/dev_baileytownsend/health/steps.rs
index f95094db..23556617 100644
--- a/crates/jacquard-api/src/dev_baileytownsend/health/steps.rs
+++ b/crates/jacquard-api/src/dev_baileytownsend/health/steps.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -106,45 +109,45 @@ pub mod steps_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Steps;
         type CreatedAt;
+        type Steps;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Steps = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `steps` field to Set
-    pub struct SetSteps<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSteps<S> {}
-    impl<S: State> State for SetSteps<S> {
-        type Steps = Set<members::steps>;
-        type CreatedAt = S::CreatedAt;
+        type Steps = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Steps = S::Steps;
         type CreatedAt = Set<members::created_at>;
+        type Steps = S::Steps;
+    }
+    ///State transition - sets the `steps` field to Set
+    pub struct SetSteps<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSteps<S> {}
+    impl<S: State> State for SetSteps<S> {
+        type CreatedAt = S::CreatedAt;
+        type Steps = Set<members::steps>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `steps` field
-        pub struct steps(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `steps` field
+        pub struct steps(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct StepsBuilder<'a, S: steps_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Steps<'a> {
@@ -158,9 +161,9 @@ impl<'a> StepsBuilder<'a, steps_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StepsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -175,11 +178,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StepsBuilder<'a, steps_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StepsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -194,11 +197,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> StepsBuilder<'a, steps_state::SetSteps<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StepsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -206,14 +209,14 @@ where
 impl<'a, S> StepsBuilder<'a, S>
 where
     S: steps_state::State,
-    S::Steps: steps_state::IsSet,
     S::CreatedAt: steps_state::IsSet,
+    S::Steps: steps_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Steps<'a> {
         Steps {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            steps: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            steps: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -226,8 +229,8 @@ where
         >,
     ) -> Steps<'a> {
         Steps {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            steps: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            steps: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_baileytownsend/health/workout.rs b/crates/jacquard-api/src/dev_baileytownsend/health/workout.rs
index 46c8b04b..04770a6c 100644
--- a/crates/jacquard-api/src/dev_baileytownsend/health/workout.rs
+++ b/crates/jacquard-api/src/dev_baileytownsend/health/workout.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -119,112 +122,112 @@ pub mod workout_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type Duration;
-        type EndTime;
         type Activity;
-        type CaloriesBurned;
         type StartTime;
+        type CaloriesBurned;
+        type EndTime;
+        type CreatedAt;
+        type Duration;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type Duration = Unset;
-        type EndTime = Unset;
         type Activity = Unset;
-        type CaloriesBurned = Unset;
         type StartTime = Unset;
+        type CaloriesBurned = Unset;
+        type EndTime = Unset;
+        type CreatedAt = Unset;
+        type Duration = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Duration = S::Duration;
-        type EndTime = S::EndTime;
-        type Activity = S::Activity;
-        type CaloriesBurned = S::CaloriesBurned;
+    ///State transition - sets the `activity` field to Set
+    pub struct SetActivity<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetActivity<S> {}
+    impl<S: State> State for SetActivity<S> {
+        type Activity = Set<members::activity>;
         type StartTime = S::StartTime;
-    }
-    ///State transition - sets the `duration` field to Set
-    pub struct SetDuration<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDuration<S> {}
-    impl<S: State> State for SetDuration<S> {
-        type CreatedAt = S::CreatedAt;
-        type Duration = Set<members::duration>;
-        type EndTime = S::EndTime;
-        type Activity = S::Activity;
         type CaloriesBurned = S::CaloriesBurned;
-        type StartTime = S::StartTime;
-    }
-    ///State transition - sets the `end_time` field to Set
-    pub struct SetEndTime<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetEndTime<S> {}
-    impl<S: State> State for SetEndTime<S> {
+        type EndTime = S::EndTime;
         type CreatedAt = S::CreatedAt;
         type Duration = S::Duration;
-        type EndTime = Set<members::end_time>;
+    }
+    ///State transition - sets the `start_time` field to Set
+    pub struct SetStartTime<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStartTime<S> {}
+    impl<S: State> State for SetStartTime<S> {
         type Activity = S::Activity;
+        type StartTime = Set<members::start_time>;
         type CaloriesBurned = S::CaloriesBurned;
-        type StartTime = S::StartTime;
-    }
-    ///State transition - sets the `activity` field to Set
-    pub struct SetActivity<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetActivity<S> {}
-    impl<S: State> State for SetActivity<S> {
+        type EndTime = S::EndTime;
         type CreatedAt = S::CreatedAt;
         type Duration = S::Duration;
-        type EndTime = S::EndTime;
-        type Activity = Set<members::activity>;
-        type CaloriesBurned = S::CaloriesBurned;
-        type StartTime = S::StartTime;
     }
     ///State transition - sets the `calories_burned` field to Set
     pub struct SetCaloriesBurned<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCaloriesBurned<S> {}
     impl<S: State> State for SetCaloriesBurned<S> {
+        type Activity = S::Activity;
+        type StartTime = S::StartTime;
+        type CaloriesBurned = Set<members::calories_burned>;
+        type EndTime = S::EndTime;
         type CreatedAt = S::CreatedAt;
         type Duration = S::Duration;
-        type EndTime = S::EndTime;
+    }
+    ///State transition - sets the `end_time` field to Set
+    pub struct SetEndTime<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetEndTime<S> {}
+    impl<S: State> State for SetEndTime<S> {
         type Activity = S::Activity;
-        type CaloriesBurned = Set<members::calories_burned>;
         type StartTime = S::StartTime;
-    }
-    ///State transition - sets the `start_time` field to Set
-    pub struct SetStartTime<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStartTime<S> {}
-    impl<S: State> State for SetStartTime<S> {
+        type CaloriesBurned = S::CaloriesBurned;
+        type EndTime = Set<members::end_time>;
         type CreatedAt = S::CreatedAt;
         type Duration = S::Duration;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Activity = S::Activity;
+        type StartTime = S::StartTime;
+        type CaloriesBurned = S::CaloriesBurned;
         type EndTime = S::EndTime;
+        type CreatedAt = Set<members::created_at>;
+        type Duration = S::Duration;
+    }
+    ///State transition - sets the `duration` field to Set
+    pub struct SetDuration<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDuration<S> {}
+    impl<S: State> State for SetDuration<S> {
         type Activity = S::Activity;
+        type StartTime = S::StartTime;
         type CaloriesBurned = S::CaloriesBurned;
-        type StartTime = Set<members::start_time>;
+        type EndTime = S::EndTime;
+        type CreatedAt = S::CreatedAt;
+        type Duration = Set<members::duration>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `duration` field
-        pub struct duration(());
-        ///Marker type for the `end_time` field
-        pub struct end_time(());
         ///Marker type for the `activity` field
         pub struct activity(());
-        ///Marker type for the `calories_burned` field
-        pub struct calories_burned(());
         ///Marker type for the `start_time` field
         pub struct start_time(());
+        ///Marker type for the `calories_burned` field
+        pub struct calories_burned(());
+        ///Marker type for the `end_time` field
+        pub struct end_time(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `duration` field
+        pub struct duration(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct WorkoutBuilder<'a, S: workout_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<i64>,
         Option<Datetime>,
@@ -233,7 +236,7 @@ pub struct WorkoutBuilder<'a, S: workout_state::State> {
         Option<Datetime>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Workout<'a> {
@@ -247,9 +250,9 @@ impl<'a> WorkoutBuilder<'a, workout_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WorkoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -264,11 +267,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WorkoutBuilder<'a, workout_state::SetActivity<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         WorkoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -283,11 +286,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> WorkoutBuilder<'a, workout_state::SetCaloriesBurned<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         WorkoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -302,11 +305,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> WorkoutBuilder<'a, workout_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         WorkoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -314,12 +317,12 @@ where
 impl<'a, S: workout_state::State> WorkoutBuilder<'a, S> {
     /// Set the `distance` field (optional)
     pub fn distance(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `distance` field to an Option value (optional)
     pub fn maybe_distance(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -334,11 +337,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WorkoutBuilder<'a, workout_state::SetDuration<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         WorkoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -353,11 +356,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> WorkoutBuilder<'a, workout_state::SetEndTime<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         WorkoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -372,11 +375,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> WorkoutBuilder<'a, workout_state::SetStartTime<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         WorkoutBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -384,23 +387,23 @@ where
 impl<'a, S> WorkoutBuilder<'a, S>
 where
     S: workout_state::State,
-    S::CreatedAt: workout_state::IsSet,
-    S::Duration: workout_state::IsSet,
-    S::EndTime: workout_state::IsSet,
     S::Activity: workout_state::IsSet,
-    S::CaloriesBurned: workout_state::IsSet,
     S::StartTime: workout_state::IsSet,
+    S::CaloriesBurned: workout_state::IsSet,
+    S::EndTime: workout_state::IsSet,
+    S::CreatedAt: workout_state::IsSet,
+    S::Duration: workout_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Workout<'a> {
         Workout {
-            activity: self.__unsafe_private_named.0.unwrap(),
-            calories_burned: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            distance: self.__unsafe_private_named.3,
-            duration: self.__unsafe_private_named.4.unwrap(),
-            end_time: self.__unsafe_private_named.5.unwrap(),
-            start_time: self.__unsafe_private_named.6.unwrap(),
+            activity: self._fields.0.unwrap(),
+            calories_burned: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            distance: self._fields.3,
+            duration: self._fields.4.unwrap(),
+            end_time: self._fields.5.unwrap(),
+            start_time: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -413,13 +416,13 @@ where
         >,
     ) -> Workout<'a> {
         Workout {
-            activity: self.__unsafe_private_named.0.unwrap(),
-            calories_burned: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            distance: self.__unsafe_private_named.3,
-            duration: self.__unsafe_private_named.4.unwrap(),
-            end_time: self.__unsafe_private_named.5.unwrap(),
-            start_time: self.__unsafe_private_named.6.unwrap(),
+            activity: self._fields.0.unwrap(),
+            calories_burned: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            distance: self._fields.3,
+            duration: self._fields.4.unwrap(),
+            end_time: self._fields.5.unwrap(),
+            start_time: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/post.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/post.rs
index c8c4e1f4..3941146f 100644
--- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/post.rs
+++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -177,112 +180,112 @@ pub mod post_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Category;
         type Content;
         type Title;
-        type Tags;
         type Forum;
+        type Tags;
         type CreatedAt;
-        type Category;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Category = Unset;
         type Content = Unset;
         type Title = Unset;
-        type Tags = Unset;
         type Forum = Unset;
+        type Tags = Unset;
         type CreatedAt = Unset;
-        type Category = Unset;
+    }
+    ///State transition - sets the `category` field to Set
+    pub struct SetCategory<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCategory<S> {}
+    impl<S: State> State for SetCategory<S> {
+        type Category = Set<members::category>;
+        type Content = S::Content;
+        type Title = S::Title;
+        type Forum = S::Forum;
+        type Tags = S::Tags;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `content` field to Set
     pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContent<S> {}
     impl<S: State> State for SetContent<S> {
+        type Category = S::Category;
         type Content = Set<members::content>;
         type Title = S::Title;
-        type Tags = S::Tags;
         type Forum = S::Forum;
+        type Tags = S::Tags;
         type CreatedAt = S::CreatedAt;
-        type Category = S::Category;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Content = S::Content;
-        type Title = Set<members::title>;
-        type Tags = S::Tags;
-        type Forum = S::Forum;
-        type CreatedAt = S::CreatedAt;
         type Category = S::Category;
-    }
-    ///State transition - sets the `tags` field to Set
-    pub struct SetTags<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTags<S> {}
-    impl<S: State> State for SetTags<S> {
         type Content = S::Content;
-        type Title = S::Title;
-        type Tags = Set<members::tags>;
+        type Title = Set<members::title>;
         type Forum = S::Forum;
+        type Tags = S::Tags;
         type CreatedAt = S::CreatedAt;
-        type Category = S::Category;
     }
     ///State transition - sets the `forum` field to Set
     pub struct SetForum<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetForum<S> {}
     impl<S: State> State for SetForum<S> {
+        type Category = S::Category;
         type Content = S::Content;
         type Title = S::Title;
-        type Tags = S::Tags;
         type Forum = Set<members::forum>;
+        type Tags = S::Tags;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `tags` field to Set
+    pub struct SetTags<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTags<S> {}
+    impl<S: State> State for SetTags<S> {
         type Category = S::Category;
+        type Content = S::Content;
+        type Title = S::Title;
+        type Forum = S::Forum;
+        type Tags = Set<members::tags>;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Content = S::Content;
-        type Title = S::Title;
-        type Tags = S::Tags;
-        type Forum = S::Forum;
-        type CreatedAt = Set<members::created_at>;
         type Category = S::Category;
-    }
-    ///State transition - sets the `category` field to Set
-    pub struct SetCategory<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCategory<S> {}
-    impl<S: State> State for SetCategory<S> {
         type Content = S::Content;
         type Title = S::Title;
-        type Tags = S::Tags;
         type Forum = S::Forum;
-        type CreatedAt = S::CreatedAt;
-        type Category = Set<members::category>;
+        type Tags = S::Tags;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `category` field
+        pub struct category(());
         ///Marker type for the `content` field
         pub struct content(());
         ///Marker type for the `title` field
         pub struct title(());
-        ///Marker type for the `tags` field
-        pub struct tags(());
         ///Marker type for the `forum` field
         pub struct forum(());
+        ///Marker type for the `tags` field
+        pub struct tags(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `category` field
-        pub struct category(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -292,7 +295,7 @@ pub struct PostBuilder<'a, S: post_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -306,9 +309,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -323,11 +326,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PostBuilder<'a, post_state::SetCategory<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -342,11 +345,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -361,11 +364,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -380,11 +383,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> PostBuilder<'a, post_state::SetForum<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -392,12 +395,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `solution` field (optional)
     pub fn solution(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `solution` field to an Option value (optional)
     pub fn maybe_solution(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -412,11 +415,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> PostBuilder<'a, post_state::SetTags<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -431,11 +434,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetTitle<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -443,12 +446,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -456,24 +459,24 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S> PostBuilder<'a, S>
 where
     S: post_state::State,
+    S::Category: post_state::IsSet,
     S::Content: post_state::IsSet,
     S::Title: post_state::IsSet,
-    S::Tags: post_state::IsSet,
     S::Forum: post_state::IsSet,
+    S::Tags: post_state::IsSet,
     S::CreatedAt: post_state::IsSet,
-    S::Category: post_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            category: self.__unsafe_private_named.0.unwrap(),
-            content: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            forum: self.__unsafe_private_named.3.unwrap(),
-            solution: self.__unsafe_private_named.4,
-            tags: self.__unsafe_private_named.5.unwrap(),
-            title: self.__unsafe_private_named.6.unwrap(),
-            updated_at: self.__unsafe_private_named.7,
+            category: self._fields.0.unwrap(),
+            content: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            forum: self._fields.3.unwrap(),
+            solution: self._fields.4,
+            tags: self._fields.5.unwrap(),
+            title: self._fields.6.unwrap(),
+            updated_at: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -486,14 +489,14 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            category: self.__unsafe_private_named.0.unwrap(),
-            content: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            forum: self.__unsafe_private_named.3.unwrap(),
-            solution: self.__unsafe_private_named.4,
-            tags: self.__unsafe_private_named.5.unwrap(),
-            title: self.__unsafe_private_named.6.unwrap(),
-            updated_at: self.__unsafe_private_named.7,
+            category: self._fields.0.unwrap(),
+            content: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            forum: self._fields.3.unwrap(),
+            solution: self._fields.4,
+            tags: self._fields.5.unwrap(),
+            title: self._fields.6.unwrap(),
+            updated_at: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/question.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/question.rs
index 76f397ae..0bffeabe 100644
--- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/question.rs
+++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/question.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -173,112 +176,112 @@ pub mod question_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Forum;
         type CreatedAt;
-        type Content;
-        type Tags;
         type Title;
+        type Tags;
         type IsOpen;
-        type Forum;
+        type Content;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Forum = Unset;
         type CreatedAt = Unset;
-        type Content = Unset;
-        type Tags = Unset;
         type Title = Unset;
+        type Tags = Unset;
         type IsOpen = Unset;
-        type Forum = Unset;
+        type Content = Unset;
+    }
+    ///State transition - sets the `forum` field to Set
+    pub struct SetForum<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetForum<S> {}
+    impl<S: State> State for SetForum<S> {
+        type Forum = Set<members::forum>;
+        type CreatedAt = S::CreatedAt;
+        type Title = S::Title;
+        type Tags = S::Tags;
+        type IsOpen = S::IsOpen;
+        type Content = S::Content;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Forum = S::Forum;
         type CreatedAt = Set<members::created_at>;
-        type Content = S::Content;
-        type Tags = S::Tags;
         type Title = S::Title;
+        type Tags = S::Tags;
         type IsOpen = S::IsOpen;
-        type Forum = S::Forum;
+        type Content = S::Content;
     }
-    ///State transition - sets the `content` field to Set
-    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContent<S> {}
-    impl<S: State> State for SetContent<S> {
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type Forum = S::Forum;
         type CreatedAt = S::CreatedAt;
-        type Content = Set<members::content>;
+        type Title = Set<members::title>;
         type Tags = S::Tags;
-        type Title = S::Title;
         type IsOpen = S::IsOpen;
-        type Forum = S::Forum;
+        type Content = S::Content;
     }
     ///State transition - sets the `tags` field to Set
     pub struct SetTags<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTags<S> {}
     impl<S: State> State for SetTags<S> {
+        type Forum = S::Forum;
         type CreatedAt = S::CreatedAt;
-        type Content = S::Content;
-        type Tags = Set<members::tags>;
         type Title = S::Title;
+        type Tags = Set<members::tags>;
         type IsOpen = S::IsOpen;
-        type Forum = S::Forum;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type CreatedAt = S::CreatedAt;
         type Content = S::Content;
-        type Tags = S::Tags;
-        type Title = Set<members::title>;
-        type IsOpen = S::IsOpen;
-        type Forum = S::Forum;
     }
     ///State transition - sets the `is_open` field to Set
     pub struct SetIsOpen<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIsOpen<S> {}
     impl<S: State> State for SetIsOpen<S> {
+        type Forum = S::Forum;
         type CreatedAt = S::CreatedAt;
-        type Content = S::Content;
-        type Tags = S::Tags;
         type Title = S::Title;
+        type Tags = S::Tags;
         type IsOpen = Set<members::is_open>;
-        type Forum = S::Forum;
+        type Content = S::Content;
     }
-    ///State transition - sets the `forum` field to Set
-    pub struct SetForum<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetForum<S> {}
-    impl<S: State> State for SetForum<S> {
+    ///State transition - sets the `content` field to Set
+    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContent<S> {}
+    impl<S: State> State for SetContent<S> {
+        type Forum = S::Forum;
         type CreatedAt = S::CreatedAt;
-        type Content = S::Content;
-        type Tags = S::Tags;
         type Title = S::Title;
+        type Tags = S::Tags;
         type IsOpen = S::IsOpen;
-        type Forum = Set<members::forum>;
+        type Content = Set<members::content>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `forum` field
+        pub struct forum(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `content` field
-        pub struct content(());
-        ///Marker type for the `tags` field
-        pub struct tags(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `tags` field
+        pub struct tags(());
         ///Marker type for the `is_open` field
         pub struct is_open(());
-        ///Marker type for the `forum` field
-        pub struct forum(());
+        ///Marker type for the `content` field
+        pub struct content(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct QuestionBuilder<'a, S: question_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<AtIdentifier<'a>>,
@@ -287,7 +290,7 @@ pub struct QuestionBuilder<'a, S: question_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Question<'a> {
@@ -301,9 +304,9 @@ impl<'a> QuestionBuilder<'a, question_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         QuestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -318,11 +321,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> QuestionBuilder<'a, question_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         QuestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -337,11 +340,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> QuestionBuilder<'a, question_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         QuestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -356,11 +359,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> QuestionBuilder<'a, question_state::SetForum<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         QuestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -375,11 +378,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> QuestionBuilder<'a, question_state::SetIsOpen<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         QuestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -394,11 +397,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> QuestionBuilder<'a, question_state::SetTags<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         QuestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -413,11 +416,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> QuestionBuilder<'a, question_state::SetTitle<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         QuestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -425,12 +428,12 @@ where
 impl<'a, S: question_state::State> QuestionBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -438,23 +441,23 @@ impl<'a, S: question_state::State> QuestionBuilder<'a, S> {
 impl<'a, S> QuestionBuilder<'a, S>
 where
     S: question_state::State,
+    S::Forum: question_state::IsSet,
     S::CreatedAt: question_state::IsSet,
-    S::Content: question_state::IsSet,
-    S::Tags: question_state::IsSet,
     S::Title: question_state::IsSet,
+    S::Tags: question_state::IsSet,
     S::IsOpen: question_state::IsSet,
-    S::Forum: question_state::IsSet,
+    S::Content: question_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Question<'a> {
         Question {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            forum: self.__unsafe_private_named.2.unwrap(),
-            is_open: self.__unsafe_private_named.3.unwrap(),
-            tags: self.__unsafe_private_named.4.unwrap(),
-            title: self.__unsafe_private_named.5.unwrap(),
-            updated_at: self.__unsafe_private_named.6,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            forum: self._fields.2.unwrap(),
+            is_open: self._fields.3.unwrap(),
+            tags: self._fields.4.unwrap(),
+            title: self._fields.5.unwrap(),
+            updated_at: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -467,13 +470,13 @@ where
         >,
     ) -> Question<'a> {
         Question {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            forum: self.__unsafe_private_named.2.unwrap(),
-            is_open: self.__unsafe_private_named.3.unwrap(),
-            tags: self.__unsafe_private_named.4.unwrap(),
-            title: self.__unsafe_private_named.5.unwrap(),
-            updated_at: self.__unsafe_private_named.6,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            forum: self._fields.2.unwrap(),
+            is_open: self._fields.3.unwrap(),
+            tags: self._fields.4.unwrap(),
+            title: self._fields.5.unwrap(),
+            updated_at: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/reply.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/reply.rs
index f7407f28..2d824734 100644
--- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/reply.rs
+++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/reply.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -123,64 +126,59 @@ pub mod reply_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Root;
         type Content;
         type CreatedAt;
-        type Root;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Root = Unset;
         type Content = Unset;
         type CreatedAt = Unset;
-        type Root = Unset;
+    }
+    ///State transition - sets the `root` field to Set
+    pub struct SetRoot<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRoot<S> {}
+    impl<S: State> State for SetRoot<S> {
+        type Root = Set<members::root>;
+        type Content = S::Content;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `content` field to Set
     pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContent<S> {}
     impl<S: State> State for SetContent<S> {
+        type Root = S::Root;
         type Content = Set<members::content>;
         type CreatedAt = S::CreatedAt;
-        type Root = S::Root;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Content = S::Content;
-        type CreatedAt = Set<members::created_at>;
         type Root = S::Root;
-    }
-    ///State transition - sets the `root` field to Set
-    pub struct SetRoot<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRoot<S> {}
-    impl<S: State> State for SetRoot<S> {
         type Content = S::Content;
-        type CreatedAt = S::CreatedAt;
-        type Root = Set<members::root>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `root` field
+        pub struct root(());
         ///Marker type for the `content` field
         pub struct content(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `root` field
-        pub struct root(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReplyBuilder<'a, S: reply_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<Datetime>,
-        Option<AtUri<'a>>,
-        Option<Datetime>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Datetime>, Option<AtUri<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Reply<'a> {
@@ -194,9 +192,9 @@ impl<'a> ReplyBuilder<'a, reply_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReplyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -211,11 +209,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReplyBuilder<'a, reply_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReplyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -230,11 +228,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReplyBuilder<'a, reply_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReplyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,11 +247,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ReplyBuilder<'a, reply_state::SetRoot<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReplyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -261,12 +259,12 @@ where
 impl<'a, S: reply_state::State> ReplyBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -274,17 +272,17 @@ impl<'a, S: reply_state::State> ReplyBuilder<'a, S> {
 impl<'a, S> ReplyBuilder<'a, S>
 where
     S: reply_state::State,
+    S::Root: reply_state::IsSet,
     S::Content: reply_state::IsSet,
     S::CreatedAt: reply_state::IsSet,
-    S::Root: reply_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Reply<'a> {
         Reply {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            root: self.__unsafe_private_named.2.unwrap(),
-            updated_at: self.__unsafe_private_named.3,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            root: self._fields.2.unwrap(),
+            updated_at: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -297,10 +295,10 @@ where
         >,
     ) -> Reply<'a> {
         Reply {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            root: self.__unsafe_private_named.2.unwrap(),
-            updated_at: self.__unsafe_private_named.3,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            root: self._fields.2.unwrap(),
+            updated_at: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/announcement.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/announcement.rs
index 2172de89..9b58a9b9 100644
--- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/announcement.rs
+++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/announcement.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -156,79 +159,79 @@ pub mod announcement_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Title;
+        type Body;
         type CreatedAt;
         type ExpiresAt;
-        type Body;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Title = Unset;
+        type Body = Unset;
         type CreatedAt = Unset;
         type ExpiresAt = Unset;
-        type Body = Unset;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
         type Title = Set<members::title>;
+        type Body = S::Body;
+        type CreatedAt = S::CreatedAt;
+        type ExpiresAt = S::ExpiresAt;
+    }
+    ///State transition - sets the `body` field to Set
+    pub struct SetBody<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBody<S> {}
+    impl<S: State> State for SetBody<S> {
+        type Title = S::Title;
+        type Body = Set<members::body>;
         type CreatedAt = S::CreatedAt;
         type ExpiresAt = S::ExpiresAt;
-        type Body = S::Body;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type Title = S::Title;
+        type Body = S::Body;
         type CreatedAt = Set<members::created_at>;
         type ExpiresAt = S::ExpiresAt;
-        type Body = S::Body;
     }
     ///State transition - sets the `expires_at` field to Set
     pub struct SetExpiresAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetExpiresAt<S> {}
     impl<S: State> State for SetExpiresAt<S> {
         type Title = S::Title;
-        type CreatedAt = S::CreatedAt;
-        type ExpiresAt = Set<members::expires_at>;
         type Body = S::Body;
-    }
-    ///State transition - sets the `body` field to Set
-    pub struct SetBody<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBody<S> {}
-    impl<S: State> State for SetBody<S> {
-        type Title = S::Title;
         type CreatedAt = S::CreatedAt;
-        type ExpiresAt = S::ExpiresAt;
-        type Body = Set<members::body>;
+        type ExpiresAt = Set<members::expires_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `body` field
+        pub struct body(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `expires_at` field
         pub struct expires_at(());
-        ///Marker type for the `body` field
-        pub struct body(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AnnouncementBuilder<'a, S: announcement_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<Datetime>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Announcement<'a> {
@@ -242,9 +245,9 @@ impl<'a> AnnouncementBuilder<'a, announcement_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AnnouncementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -259,11 +262,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AnnouncementBuilder<'a, announcement_state::SetBody<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AnnouncementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -278,11 +281,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AnnouncementBuilder<'a, announcement_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AnnouncementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -297,11 +300,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AnnouncementBuilder<'a, announcement_state::SetExpiresAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AnnouncementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -316,11 +319,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AnnouncementBuilder<'a, announcement_state::SetTitle<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         AnnouncementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -329,17 +332,17 @@ impl<'a, S> AnnouncementBuilder<'a, S>
 where
     S: announcement_state::State,
     S::Title: announcement_state::IsSet,
+    S::Body: announcement_state::IsSet,
     S::CreatedAt: announcement_state::IsSet,
     S::ExpiresAt: announcement_state::IsSet,
-    S::Body: announcement_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Announcement<'a> {
         Announcement {
-            body: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            expires_at: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3.unwrap(),
+            body: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            expires_at: self._fields.2.unwrap(),
+            title: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -352,10 +355,10 @@ where
         >,
     ) -> Announcement<'a> {
         Announcement {
-            body: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            expires_at: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3.unwrap(),
+            body: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            expires_at: self._fields.2.unwrap(),
+            title: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/category.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/category.rs
index 6693573e..0883a47e 100644
--- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/category.rs
+++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/category.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -207,14 +210,14 @@ pub mod category_state {
 
 /// Builder for constructing an instance of this type
 pub struct CategoryBuilder<'a, S: category_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Category<'a> {
@@ -228,9 +231,9 @@ impl<'a> CategoryBuilder<'a, category_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CategoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -245,11 +248,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CategoryBuilder<'a, category_state::SetCategoryType<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CategoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -257,12 +260,12 @@ where
 impl<'a, S: category_state::State> CategoryBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -277,11 +280,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CategoryBuilder<'a, category_state::SetGroup<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CategoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -296,11 +299,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CategoryBuilder<'a, category_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CategoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -315,10 +318,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Category<'a> {
         Category {
-            category_type: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            group: self.__unsafe_private_named.2.unwrap(),
-            name: self.__unsafe_private_named.3.unwrap(),
+            category_type: self._fields.0.unwrap(),
+            description: self._fields.1,
+            group: self._fields.2.unwrap(),
+            name: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -331,10 +334,10 @@ where
         >,
     ) -> Category<'a> {
         Category {
-            category_type: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            group: self.__unsafe_private_named.2.unwrap(),
-            name: self.__unsafe_private_named.3.unwrap(),
+            category_type: self._fields.0.unwrap(),
+            description: self._fields.1,
+            group: self._fields.2.unwrap(),
+            name: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/group.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/group.rs
index f3120522..64762433 100644
--- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/group.rs
+++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/group.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -166,9 +169,9 @@ pub mod group_state {
 
 /// Builder for constructing an instance of this type
 pub struct GroupBuilder<'a, S: group_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Group<'a> {
@@ -182,9 +185,9 @@ impl<'a> GroupBuilder<'a, group_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -192,12 +195,12 @@ impl<'a> GroupBuilder<'a, group_state::Empty> {
 impl<'a, S: group_state::State> GroupBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -212,11 +215,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GroupBuilder<'a, group_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -229,8 +232,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Group<'a> {
         Group {
-            description: self.__unsafe_private_named.0,
-            name: self.__unsafe_private_named.1.unwrap(),
+            description: self._fields.0,
+            name: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -243,8 +246,8 @@ where
         >,
     ) -> Group<'a> {
         Group {
-            description: self.__unsafe_private_named.0,
-            name: self.__unsafe_private_named.1.unwrap(),
+            description: self._fields.0,
+            name: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/identity.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/identity.rs
index f8b56880..37cfe2fb 100644
--- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/identity.rs
+++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/identity.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -178,9 +181,9 @@ pub mod identity_state {
 
 /// Builder for constructing an instance of this type
 pub struct IdentityBuilder<'a, S: identity_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Identity<'a> {
@@ -194,9 +197,9 @@ impl<'a> IdentityBuilder<'a, identity_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IdentityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,12 +207,12 @@ impl<'a> IdentityBuilder<'a, identity_state::Empty> {
 impl<'a, S: identity_state::State> IdentityBuilder<'a, S> {
     /// Set the `accent` field (optional)
     pub fn accent(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `accent` field to an Option value (optional)
     pub fn maybe_accent(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -217,12 +220,12 @@ impl<'a, S: identity_state::State> IdentityBuilder<'a, S> {
 impl<'a, S: identity_state::State> IdentityBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -237,11 +240,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> IdentityBuilder<'a, identity_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         IdentityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -254,9 +257,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Identity<'a> {
         Identity {
-            accent: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
+            accent: self._fields.0,
+            description: self._fields.1,
+            name: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -269,9 +272,9 @@ where
         >,
     ) -> Identity<'a> {
         Identity {
-            accent: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
+            accent: self._fields.0,
+            description: self._fields.1,
+            name: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_kanad/lexicon_test_2026_02_26/example_cat_lexicon.rs b/crates/jacquard-api/src/dev_kanad/lexicon_test_2026_02_26/example_cat_lexicon.rs
index 19aa2aa5..b56b7242 100644
--- a/crates/jacquard-api/src/dev_kanad/lexicon_test_2026_02_26/example_cat_lexicon.rs
+++ b/crates/jacquard-api/src/dev_kanad/lexicon_test_2026_02_26/example_cat_lexicon.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -225,9 +228,9 @@ pub mod example_cat_lexicon_state {
 
 /// Builder for constructing an instance of this type
 pub struct ExampleCatLexiconBuilder<'a, S: example_cat_lexicon_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>, Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>, Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ExampleCatLexicon<'a> {
@@ -241,9 +244,9 @@ impl<'a> ExampleCatLexiconBuilder<'a, example_cat_lexicon_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExampleCatLexiconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -251,12 +254,12 @@ impl<'a> ExampleCatLexiconBuilder<'a, example_cat_lexicon_state::Empty> {
 impl<'a, S: example_cat_lexicon_state::State> ExampleCatLexiconBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -271,11 +274,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ExampleCatLexiconBuilder<'a, example_cat_lexicon_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ExampleCatLexiconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -290,11 +293,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ExampleCatLexiconBuilder<'a, example_cat_lexicon_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ExampleCatLexiconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -308,9 +311,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ExampleCatLexicon<'a> {
         ExampleCatLexicon {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -323,9 +326,9 @@ where
         >,
     ) -> ExampleCatLexicon<'a> {
         ExampleCatLexicon {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_ocbwoy3/blueboard/board.rs b/crates/jacquard-api/src/dev_ocbwoy3/blueboard/board.rs
index b7703b60..9454e40f 100644
--- a/crates/jacquard-api/src/dev_ocbwoy3/blueboard/board.rs
+++ b/crates/jacquard-api/src/dev_ocbwoy3/blueboard/board.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -139,79 +142,74 @@ pub mod board_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Title;
-        type CreatedAt;
-        type Description;
         type Nsfw;
+        type Description;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Title = Unset;
-        type CreatedAt = Unset;
-        type Description = Unset;
         type Nsfw = Unset;
+        type Description = Unset;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
         type Title = Set<members::title>;
-        type CreatedAt = S::CreatedAt;
-        type Description = S::Description;
         type Nsfw = S::Nsfw;
+        type Description = S::Description;
+        type CreatedAt = S::CreatedAt;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+    ///State transition - sets the `nsfw` field to Set
+    pub struct SetNsfw<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetNsfw<S> {}
+    impl<S: State> State for SetNsfw<S> {
         type Title = S::Title;
-        type CreatedAt = Set<members::created_at>;
+        type Nsfw = Set<members::nsfw>;
         type Description = S::Description;
-        type Nsfw = S::Nsfw;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `description` field to Set
     pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDescription<S> {}
     impl<S: State> State for SetDescription<S> {
         type Title = S::Title;
-        type CreatedAt = S::CreatedAt;
-        type Description = Set<members::description>;
         type Nsfw = S::Nsfw;
+        type Description = Set<members::description>;
+        type CreatedAt = S::CreatedAt;
     }
-    ///State transition - sets the `nsfw` field to Set
-    pub struct SetNsfw<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetNsfw<S> {}
-    impl<S: State> State for SetNsfw<S> {
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
         type Title = S::Title;
-        type CreatedAt = S::CreatedAt;
+        type Nsfw = S::Nsfw;
         type Description = S::Description;
-        type Nsfw = Set<members::nsfw>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `title` field
         pub struct title(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `description` field
-        pub struct description(());
         ///Marker type for the `nsfw` field
         pub struct nsfw(());
+        ///Marker type for the `description` field
+        pub struct description(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BoardBuilder<'a, S: board_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<CowStr<'a>>,
-        Option<bool>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<bool>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Board<'a> {
@@ -225,9 +223,9 @@ impl<'a> BoardBuilder<'a, board_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BoardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -242,11 +240,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BoardBuilder<'a, board_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BoardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -261,11 +259,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BoardBuilder<'a, board_state::SetDescription<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BoardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -280,11 +278,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> BoardBuilder<'a, board_state::SetNsfw<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BoardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -299,11 +297,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BoardBuilder<'a, board_state::SetTitle<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BoardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -312,17 +310,17 @@ impl<'a, S> BoardBuilder<'a, S>
 where
     S: board_state::State,
     S::Title: board_state::IsSet,
-    S::CreatedAt: board_state::IsSet,
-    S::Description: board_state::IsSet,
     S::Nsfw: board_state::IsSet,
+    S::Description: board_state::IsSet,
+    S::CreatedAt: board_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Board<'a> {
         Board {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1.unwrap(),
-            nsfw: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1.unwrap(),
+            nsfw: self._fields.2.unwrap(),
+            title: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -335,10 +333,10 @@ where
         >,
     ) -> Board<'a> {
         Board {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1.unwrap(),
-            nsfw: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1.unwrap(),
+            nsfw: self._fields.2.unwrap(),
+            title: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_ocbwoy3/blueboard/post.rs b/crates/jacquard-api/src/dev_ocbwoy3/blueboard/post.rs
index c0092e07..ad848792 100644
--- a/crates/jacquard-api/src/dev_ocbwoy3/blueboard/post.rs
+++ b/crates/jacquard-api/src/dev_ocbwoy3/blueboard/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -166,64 +169,64 @@ pub mod post_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Text;
         type Parent;
         type CreatedAt;
-        type Text;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Text = Unset;
         type Parent = Unset;
         type CreatedAt = Unset;
-        type Text = Unset;
+    }
+    ///State transition - sets the `text` field to Set
+    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetText<S> {}
+    impl<S: State> State for SetText<S> {
+        type Text = Set<members::text>;
+        type Parent = S::Parent;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `parent` field to Set
     pub struct SetParent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetParent<S> {}
     impl<S: State> State for SetParent<S> {
+        type Text = S::Text;
         type Parent = Set<members::parent>;
         type CreatedAt = S::CreatedAt;
-        type Text = S::Text;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Parent = S::Parent;
-        type CreatedAt = Set<members::created_at>;
         type Text = S::Text;
-    }
-    ///State transition - sets the `text` field to Set
-    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetText<S> {}
-    impl<S: State> State for SetText<S> {
         type Parent = S::Parent;
-        type CreatedAt = S::CreatedAt;
-        type Text = Set<members::text>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `text` field
+        pub struct text(());
         ///Marker type for the `parent` field
         pub struct parent(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `text` field
-        pub struct text(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -237,9 +240,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -247,12 +250,12 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `attachment` field (optional)
     pub fn attachment(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `attachment` field to an Option value (optional)
     pub fn maybe_attachment(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -267,11 +270,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -286,11 +289,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PostBuilder<'a, post_state::SetParent<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -305,11 +308,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetText<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -317,17 +320,17 @@ where
 impl<'a, S> PostBuilder<'a, S>
 where
     S: post_state::State,
+    S::Text: post_state::IsSet,
     S::Parent: post_state::IsSet,
     S::CreatedAt: post_state::IsSet,
-    S::Text: post_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            attachment: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            parent: self.__unsafe_private_named.2.unwrap(),
-            text: self.__unsafe_private_named.3.unwrap(),
+            attachment: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            parent: self._fields.2.unwrap(),
+            text: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -340,10 +343,10 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            attachment: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            parent: self.__unsafe_private_named.2.unwrap(),
-            text: self.__unsafe_private_named.3.unwrap(),
+            attachment: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            parent: self._fields.2.unwrap(),
+            text: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_ocbwoy3/crack/alterego.rs b/crates/jacquard-api/src/dev_ocbwoy3/crack/alterego.rs
index 5530bc35..bcf24756 100644
--- a/crates/jacquard-api/src/dev_ocbwoy3/crack/alterego.rs
+++ b/crates/jacquard-api/src/dev_ocbwoy3/crack/alterego.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -267,15 +270,15 @@ pub mod alterego_state {
 
 /// Builder for constructing an instance of this type
 pub struct AlteregoBuilder<'a, S: alterego_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Alterego<'a> {
@@ -289,9 +292,9 @@ impl<'a> AlteregoBuilder<'a, alterego_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AlteregoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -299,12 +302,12 @@ impl<'a> AlteregoBuilder<'a, alterego_state::Empty> {
 impl<'a, S: alterego_state::State> AlteregoBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -312,12 +315,12 @@ impl<'a, S: alterego_state::State> AlteregoBuilder<'a, S> {
 impl<'a, S: alterego_state::State> AlteregoBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -325,12 +328,12 @@ impl<'a, S: alterego_state::State> AlteregoBuilder<'a, S> {
 impl<'a, S: alterego_state::State> AlteregoBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -338,12 +341,12 @@ impl<'a, S: alterego_state::State> AlteregoBuilder<'a, S> {
 impl<'a, S: alterego_state::State> AlteregoBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -351,12 +354,12 @@ impl<'a, S: alterego_state::State> AlteregoBuilder<'a, S> {
 impl<'a, S: alterego_state::State> AlteregoBuilder<'a, S> {
     /// Set the `handle` field (optional)
     pub fn handle(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `handle` field to an Option value (optional)
     pub fn maybe_handle(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -368,11 +371,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Alterego<'a> {
         Alterego {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3,
-            handle: self.__unsafe_private_named.4,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            description: self._fields.2,
+            display_name: self._fields.3,
+            handle: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -385,11 +388,11 @@ where
         >,
     ) -> Alterego<'a> {
         Alterego {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3,
-            handle: self.__unsafe_private_named.4,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            description: self._fields.2,
+            display_name: self._fields.3,
+            handle: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_regnault/webfishing/savefile.rs b/crates/jacquard-api/src/dev_regnault/webfishing/savefile.rs
index 597187e7..17e823b9 100644
--- a/crates/jacquard-api/src/dev_regnault/webfishing/savefile.rs
+++ b/crates/jacquard-api/src/dev_regnault/webfishing/savefile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -109,45 +112,45 @@ pub mod savefile_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type Name;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Name = S::Name;
+        type Uri = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Uri = S::Uri;
         type Name = Set<members::name>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Name = S::Name;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SavefileBuilder<'a, S: savefile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Savefile<'a> {
@@ -161,9 +164,9 @@ impl<'a> SavefileBuilder<'a, savefile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SavefileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SavefileBuilder<'a, savefile_state::SetName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SavefileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SavefileBuilder<'a, savefile_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SavefileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,14 +212,14 @@ where
 impl<'a, S> SavefileBuilder<'a, S>
 where
     S: savefile_state::State,
-    S::Uri: savefile_state::IsSet,
     S::Name: savefile_state::IsSet,
+    S::Uri: savefile_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Savefile<'a> {
         Savefile {
-            name: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -229,8 +232,8 @@ where
         >,
     ) -> Savefile<'a> {
         Savefile {
-            name: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_sensorthings/datastream.rs b/crates/jacquard-api/src/dev_sensorthings/datastream.rs
index e5880607..c65d7bf0 100644
--- a/crates/jacquard-api/src/dev_sensorthings/datastream.rs
+++ b/crates/jacquard-api/src/dev_sensorthings/datastream.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -222,134 +225,134 @@ pub mod datastream_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Sensor;
+        type ObservationType;
+        type ObservedProperty;
         type CreatedAt;
+        type Sensor;
         type UnitOfMeasurement;
-        type Thing;
-        type ObservedProperty;
         type Name;
-        type ObservationType;
+        type Thing;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Sensor = Unset;
+        type ObservationType = Unset;
+        type ObservedProperty = Unset;
         type CreatedAt = Unset;
+        type Sensor = Unset;
         type UnitOfMeasurement = Unset;
-        type Thing = Unset;
-        type ObservedProperty = Unset;
         type Name = Unset;
-        type ObservationType = Unset;
+        type Thing = Unset;
     }
-    ///State transition - sets the `sensor` field to Set
-    pub struct SetSensor<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSensor<S> {}
-    impl<S: State> State for SetSensor<S> {
-        type Sensor = Set<members::sensor>;
+    ///State transition - sets the `observation_type` field to Set
+    pub struct SetObservationType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetObservationType<S> {}
+    impl<S: State> State for SetObservationType<S> {
+        type ObservationType = Set<members::observation_type>;
+        type ObservedProperty = S::ObservedProperty;
         type CreatedAt = S::CreatedAt;
+        type Sensor = S::Sensor;
         type UnitOfMeasurement = S::UnitOfMeasurement;
-        type Thing = S::Thing;
-        type ObservedProperty = S::ObservedProperty;
         type Name = S::Name;
+        type Thing = S::Thing;
+    }
+    ///State transition - sets the `observed_property` field to Set
+    pub struct SetObservedProperty<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetObservedProperty<S> {}
+    impl<S: State> State for SetObservedProperty<S> {
         type ObservationType = S::ObservationType;
+        type ObservedProperty = Set<members::observed_property>;
+        type CreatedAt = S::CreatedAt;
+        type Sensor = S::Sensor;
+        type UnitOfMeasurement = S::UnitOfMeasurement;
+        type Name = S::Name;
+        type Thing = S::Thing;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Sensor = S::Sensor;
+        type ObservationType = S::ObservationType;
+        type ObservedProperty = S::ObservedProperty;
         type CreatedAt = Set<members::created_at>;
+        type Sensor = S::Sensor;
         type UnitOfMeasurement = S::UnitOfMeasurement;
+        type Name = S::Name;
         type Thing = S::Thing;
+    }
+    ///State transition - sets the `sensor` field to Set
+    pub struct SetSensor<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSensor<S> {}
+    impl<S: State> State for SetSensor<S> {
+        type ObservationType = S::ObservationType;
         type ObservedProperty = S::ObservedProperty;
+        type CreatedAt = S::CreatedAt;
+        type Sensor = Set<members::sensor>;
+        type UnitOfMeasurement = S::UnitOfMeasurement;
         type Name = S::Name;
-        type ObservationType = S::ObservationType;
+        type Thing = S::Thing;
     }
     ///State transition - sets the `unit_of_measurement` field to Set
     pub struct SetUnitOfMeasurement<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUnitOfMeasurement<S> {}
     impl<S: State> State for SetUnitOfMeasurement<S> {
-        type Sensor = S::Sensor;
-        type CreatedAt = S::CreatedAt;
-        type UnitOfMeasurement = Set<members::unit_of_measurement>;
-        type Thing = S::Thing;
-        type ObservedProperty = S::ObservedProperty;
-        type Name = S::Name;
         type ObservationType = S::ObservationType;
-    }
-    ///State transition - sets the `thing` field to Set
-    pub struct SetThing<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetThing<S> {}
-    impl<S: State> State for SetThing<S> {
-        type Sensor = S::Sensor;
-        type CreatedAt = S::CreatedAt;
-        type UnitOfMeasurement = S::UnitOfMeasurement;
-        type Thing = Set<members::thing>;
         type ObservedProperty = S::ObservedProperty;
-        type Name = S::Name;
-        type ObservationType = S::ObservationType;
-    }
-    ///State transition - sets the `observed_property` field to Set
-    pub struct SetObservedProperty<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetObservedProperty<S> {}
-    impl<S: State> State for SetObservedProperty<S> {
-        type Sensor = S::Sensor;
         type CreatedAt = S::CreatedAt;
-        type UnitOfMeasurement = S::UnitOfMeasurement;
-        type Thing = S::Thing;
-        type ObservedProperty = Set<members::observed_property>;
+        type Sensor = S::Sensor;
+        type UnitOfMeasurement = Set<members::unit_of_measurement>;
         type Name = S::Name;
-        type ObservationType = S::ObservationType;
+        type Thing = S::Thing;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Sensor = S::Sensor;
+        type ObservationType = S::ObservationType;
+        type ObservedProperty = S::ObservedProperty;
         type CreatedAt = S::CreatedAt;
+        type Sensor = S::Sensor;
         type UnitOfMeasurement = S::UnitOfMeasurement;
-        type Thing = S::Thing;
-        type ObservedProperty = S::ObservedProperty;
         type Name = Set<members::name>;
-        type ObservationType = S::ObservationType;
+        type Thing = S::Thing;
     }
-    ///State transition - sets the `observation_type` field to Set
-    pub struct SetObservationType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetObservationType<S> {}
-    impl<S: State> State for SetObservationType<S> {
-        type Sensor = S::Sensor;
+    ///State transition - sets the `thing` field to Set
+    pub struct SetThing<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetThing<S> {}
+    impl<S: State> State for SetThing<S> {
+        type ObservationType = S::ObservationType;
+        type ObservedProperty = S::ObservedProperty;
         type CreatedAt = S::CreatedAt;
+        type Sensor = S::Sensor;
         type UnitOfMeasurement = S::UnitOfMeasurement;
-        type Thing = S::Thing;
-        type ObservedProperty = S::ObservedProperty;
         type Name = S::Name;
-        type ObservationType = Set<members::observation_type>;
+        type Thing = Set<members::thing>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `sensor` field
-        pub struct sensor(());
+        ///Marker type for the `observation_type` field
+        pub struct observation_type(());
+        ///Marker type for the `observed_property` field
+        pub struct observed_property(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `sensor` field
+        pub struct sensor(());
         ///Marker type for the `unit_of_measurement` field
         pub struct unit_of_measurement(());
-        ///Marker type for the `thing` field
-        pub struct thing(());
-        ///Marker type for the `observed_property` field
-        pub struct observed_property(());
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `observation_type` field
-        pub struct observation_type(());
+        ///Marker type for the `thing` field
+        pub struct thing(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DatastreamBuilder<'a, S: datastream_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -362,7 +365,7 @@ pub struct DatastreamBuilder<'a, S: datastream_state::State> {
         Option<datastream::UnitOfMeasurement<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Datastream<'a> {
@@ -376,21 +379,9 @@ impl<'a> DatastreamBuilder<'a, datastream_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DatastreamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -405,11 +396,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DatastreamBuilder<'a, datastream_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DatastreamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -417,12 +408,12 @@ where
 impl<'a, S: datastream_state::State> DatastreamBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -437,11 +428,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DatastreamBuilder<'a, datastream_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         DatastreamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -456,11 +447,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> DatastreamBuilder<'a, datastream_state::SetObservationType<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         DatastreamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -468,12 +459,12 @@ where
 impl<'a, S: datastream_state::State> DatastreamBuilder<'a, S> {
     /// Set the `observedArea` field (optional)
     pub fn observed_area(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `observedArea` field to an Option value (optional)
     pub fn maybe_observed_area(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -488,11 +479,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> DatastreamBuilder<'a, datastream_state::SetObservedProperty<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         DatastreamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -500,12 +491,12 @@ where
 impl<'a, S: datastream_state::State> DatastreamBuilder<'a, S> {
     /// Set the `resultScaleFactor` field (optional)
     pub fn result_scale_factor(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `resultScaleFactor` field to an Option value (optional)
     pub fn maybe_result_scale_factor(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -520,11 +511,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> DatastreamBuilder<'a, datastream_state::SetSensor<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         DatastreamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -539,11 +530,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> DatastreamBuilder<'a, datastream_state::SetThing<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         DatastreamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -558,11 +549,11 @@ where
         mut self,
         value: impl Into<datastream::UnitOfMeasurement<'a>>,
     ) -> DatastreamBuilder<'a, datastream_state::SetUnitOfMeasurement<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         DatastreamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -570,12 +561,12 @@ where
 impl<'a, S: datastream_state::State> DatastreamBuilder<'a, S> {
     /// Set the `verticalDatum` field (optional)
     pub fn vertical_datum(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `verticalDatum` field to an Option value (optional)
     pub fn maybe_vertical_datum(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -583,28 +574,28 @@ impl<'a, S: datastream_state::State> DatastreamBuilder<'a, S> {
 impl<'a, S> DatastreamBuilder<'a, S>
 where
     S: datastream_state::State,
-    S::Sensor: datastream_state::IsSet,
+    S::ObservationType: datastream_state::IsSet,
+    S::ObservedProperty: datastream_state::IsSet,
     S::CreatedAt: datastream_state::IsSet,
+    S::Sensor: datastream_state::IsSet,
     S::UnitOfMeasurement: datastream_state::IsSet,
-    S::Thing: datastream_state::IsSet,
-    S::ObservedProperty: datastream_state::IsSet,
     S::Name: datastream_state::IsSet,
-    S::ObservationType: datastream_state::IsSet,
+    S::Thing: datastream_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Datastream<'a> {
         Datastream {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
-            observation_type: self.__unsafe_private_named.3.unwrap(),
-            observed_area: self.__unsafe_private_named.4,
-            observed_property: self.__unsafe_private_named.5.unwrap(),
-            result_scale_factor: self.__unsafe_private_named.6,
-            sensor: self.__unsafe_private_named.7.unwrap(),
-            thing: self.__unsafe_private_named.8.unwrap(),
-            unit_of_measurement: self.__unsafe_private_named.9.unwrap(),
-            vertical_datum: self.__unsafe_private_named.10,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            name: self._fields.2.unwrap(),
+            observation_type: self._fields.3.unwrap(),
+            observed_area: self._fields.4,
+            observed_property: self._fields.5.unwrap(),
+            result_scale_factor: self._fields.6,
+            sensor: self._fields.7.unwrap(),
+            thing: self._fields.8.unwrap(),
+            unit_of_measurement: self._fields.9.unwrap(),
+            vertical_datum: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -614,17 +605,17 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Datastream<'a> {
         Datastream {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
-            observation_type: self.__unsafe_private_named.3.unwrap(),
-            observed_area: self.__unsafe_private_named.4,
-            observed_property: self.__unsafe_private_named.5.unwrap(),
-            result_scale_factor: self.__unsafe_private_named.6,
-            sensor: self.__unsafe_private_named.7.unwrap(),
-            thing: self.__unsafe_private_named.8.unwrap(),
-            unit_of_measurement: self.__unsafe_private_named.9.unwrap(),
-            vertical_datum: self.__unsafe_private_named.10,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            name: self._fields.2.unwrap(),
+            observation_type: self._fields.3.unwrap(),
+            observed_area: self._fields.4,
+            observed_property: self._fields.5.unwrap(),
+            result_scale_factor: self._fields.6,
+            sensor: self._fields.7.unwrap(),
+            thing: self._fields.8.unwrap(),
+            unit_of_measurement: self._fields.9.unwrap(),
+            vertical_datum: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_sensorthings/feature_of_interest.rs b/crates/jacquard-api/src/dev_sensorthings/feature_of_interest.rs
index a0d07fe3..f543c223 100644
--- a/crates/jacquard-api/src/dev_sensorthings/feature_of_interest.rs
+++ b/crates/jacquard-api/src/dev_sensorthings/feature_of_interest.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -216,15 +219,15 @@ pub mod feature_of_interest_state {
 
 /// Builder for constructing an instance of this type
 pub struct FeatureOfInterestBuilder<'a, S: feature_of_interest_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Data<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> FeatureOfInterest<'a> {
@@ -238,9 +241,9 @@ impl<'a> FeatureOfInterestBuilder<'a, feature_of_interest_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FeatureOfInterestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -255,11 +258,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FeatureOfInterestBuilder<'a, feature_of_interest_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FeatureOfInterestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -267,12 +270,12 @@ where
 impl<'a, S: feature_of_interest_state::State> FeatureOfInterestBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -287,11 +290,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> FeatureOfInterestBuilder<'a, feature_of_interest_state::SetEncodingType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         FeatureOfInterestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -306,11 +309,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> FeatureOfInterestBuilder<'a, feature_of_interest_state::SetFeature<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         FeatureOfInterestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -325,11 +328,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> FeatureOfInterestBuilder<'a, feature_of_interest_state::SetName<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         FeatureOfInterestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -345,11 +348,11 @@ where
     /// Build the final struct
     pub fn build(self) -> FeatureOfInterest<'a> {
         FeatureOfInterest {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            encoding_type: self.__unsafe_private_named.2.unwrap(),
-            feature: self.__unsafe_private_named.3.unwrap(),
-            name: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            encoding_type: self._fields.2.unwrap(),
+            feature: self._fields.3.unwrap(),
+            name: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -359,11 +362,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> FeatureOfInterest<'a> {
         FeatureOfInterest {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            encoding_type: self.__unsafe_private_named.2.unwrap(),
-            feature: self.__unsafe_private_named.3.unwrap(),
-            name: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            encoding_type: self._fields.2.unwrap(),
+            feature: self._fields.3.unwrap(),
+            name: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_sensorthings/multi_observation.rs b/crates/jacquard-api/src/dev_sensorthings/multi_observation.rs
index a922066c..abcbfb52 100644
--- a/crates/jacquard-api/src/dev_sensorthings/multi_observation.rs
+++ b/crates/jacquard-api/src/dev_sensorthings/multi_observation.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -421,74 +424,74 @@ pub mod multi_observation_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type PhenomenonTime;
-        type Sensor;
         type Entries;
         type Thing;
+        type Sensor;
+        type PhenomenonTime;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type PhenomenonTime = Unset;
-        type Sensor = Unset;
         type Entries = Unset;
         type Thing = Unset;
-    }
-    ///State transition - sets the `phenomenon_time` field to Set
-    pub struct SetPhenomenonTime<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPhenomenonTime<S> {}
-    impl<S: State> State for SetPhenomenonTime<S> {
-        type PhenomenonTime = Set<members::phenomenon_time>;
-        type Sensor = S::Sensor;
-        type Entries = S::Entries;
-        type Thing = S::Thing;
-    }
-    ///State transition - sets the `sensor` field to Set
-    pub struct SetSensor<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSensor<S> {}
-    impl<S: State> State for SetSensor<S> {
-        type PhenomenonTime = S::PhenomenonTime;
-        type Sensor = Set<members::sensor>;
-        type Entries = S::Entries;
-        type Thing = S::Thing;
+        type Sensor = Unset;
+        type PhenomenonTime = Unset;
     }
     ///State transition - sets the `entries` field to Set
     pub struct SetEntries<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEntries<S> {}
     impl<S: State> State for SetEntries<S> {
-        type PhenomenonTime = S::PhenomenonTime;
-        type Sensor = S::Sensor;
         type Entries = Set<members::entries>;
         type Thing = S::Thing;
+        type Sensor = S::Sensor;
+        type PhenomenonTime = S::PhenomenonTime;
     }
     ///State transition - sets the `thing` field to Set
     pub struct SetThing<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetThing<S> {}
     impl<S: State> State for SetThing<S> {
-        type PhenomenonTime = S::PhenomenonTime;
-        type Sensor = S::Sensor;
         type Entries = S::Entries;
         type Thing = Set<members::thing>;
+        type Sensor = S::Sensor;
+        type PhenomenonTime = S::PhenomenonTime;
+    }
+    ///State transition - sets the `sensor` field to Set
+    pub struct SetSensor<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSensor<S> {}
+    impl<S: State> State for SetSensor<S> {
+        type Entries = S::Entries;
+        type Thing = S::Thing;
+        type Sensor = Set<members::sensor>;
+        type PhenomenonTime = S::PhenomenonTime;
+    }
+    ///State transition - sets the `phenomenon_time` field to Set
+    pub struct SetPhenomenonTime<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPhenomenonTime<S> {}
+    impl<S: State> State for SetPhenomenonTime<S> {
+        type Entries = S::Entries;
+        type Thing = S::Thing;
+        type Sensor = S::Sensor;
+        type PhenomenonTime = Set<members::phenomenon_time>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `phenomenon_time` field
-        pub struct phenomenon_time(());
-        ///Marker type for the `sensor` field
-        pub struct sensor(());
         ///Marker type for the `entries` field
         pub struct entries(());
         ///Marker type for the `thing` field
         pub struct thing(());
+        ///Marker type for the `sensor` field
+        pub struct sensor(());
+        ///Marker type for the `phenomenon_time` field
+        pub struct phenomenon_time(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MultiObservationBuilder<'a, S: multi_observation_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<AtUri<'a>>>,
         Option<Vec<multi_observation::MultiObservationEntry<'a>>>,
         Option<Datetime>,
@@ -498,7 +501,7 @@ pub struct MultiObservationBuilder<'a, S: multi_observation_state::State> {
         Option<AtUri<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MultiObservation<'a> {
@@ -512,9 +515,9 @@ impl<'a> MultiObservationBuilder<'a, multi_observation_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MultiObservationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -522,12 +525,12 @@ impl<'a> MultiObservationBuilder<'a, multi_observation_state::Empty> {
 impl<'a, S: multi_observation_state::State> MultiObservationBuilder<'a, S> {
     /// Set the `derivedFrom` field (optional)
     pub fn derived_from(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `derivedFrom` field to an Option value (optional)
     pub fn maybe_derived_from(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -542,11 +545,11 @@ where
         mut self,
         value: impl Into<Vec<multi_observation::MultiObservationEntry<'a>>>,
     ) -> MultiObservationBuilder<'a, multi_observation_state::SetEntries<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MultiObservationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -561,11 +564,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MultiObservationBuilder<'a, multi_observation_state::SetPhenomenonTime<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         MultiObservationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -573,12 +576,12 @@ where
 impl<'a, S: multi_observation_state::State> MultiObservationBuilder<'a, S> {
     /// Set the `phenomenonTimeEnd` field (optional)
     pub fn phenomenon_time_end(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `phenomenonTimeEnd` field to an Option value (optional)
     pub fn maybe_phenomenon_time_end(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -589,7 +592,7 @@ impl<'a, S: multi_observation_state::State> MultiObservationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MultiObservationResultQuality<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `resultQuality` field to an Option value (optional)
@@ -597,7 +600,7 @@ impl<'a, S: multi_observation_state::State> MultiObservationBuilder<'a, S> {
         mut self,
         value: Option<MultiObservationResultQuality<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -605,12 +608,12 @@ impl<'a, S: multi_observation_state::State> MultiObservationBuilder<'a, S> {
 impl<'a, S: multi_observation_state::State> MultiObservationBuilder<'a, S> {
     /// Set the `resultTime` field (optional)
     pub fn result_time(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `resultTime` field to an Option value (optional)
     pub fn maybe_result_time(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -625,11 +628,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> MultiObservationBuilder<'a, multi_observation_state::SetSensor<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         MultiObservationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -644,11 +647,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> MultiObservationBuilder<'a, multi_observation_state::SetThing<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         MultiObservationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -656,22 +659,22 @@ where
 impl<'a, S> MultiObservationBuilder<'a, S>
 where
     S: multi_observation_state::State,
-    S::PhenomenonTime: multi_observation_state::IsSet,
-    S::Sensor: multi_observation_state::IsSet,
     S::Entries: multi_observation_state::IsSet,
     S::Thing: multi_observation_state::IsSet,
+    S::Sensor: multi_observation_state::IsSet,
+    S::PhenomenonTime: multi_observation_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> MultiObservation<'a> {
         MultiObservation {
-            derived_from: self.__unsafe_private_named.0,
-            entries: self.__unsafe_private_named.1.unwrap(),
-            phenomenon_time: self.__unsafe_private_named.2.unwrap(),
-            phenomenon_time_end: self.__unsafe_private_named.3,
-            result_quality: self.__unsafe_private_named.4,
-            result_time: self.__unsafe_private_named.5,
-            sensor: self.__unsafe_private_named.6.unwrap(),
-            thing: self.__unsafe_private_named.7.unwrap(),
+            derived_from: self._fields.0,
+            entries: self._fields.1.unwrap(),
+            phenomenon_time: self._fields.2.unwrap(),
+            phenomenon_time_end: self._fields.3,
+            result_quality: self._fields.4,
+            result_time: self._fields.5,
+            sensor: self._fields.6.unwrap(),
+            thing: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -681,14 +684,14 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> MultiObservation<'a> {
         MultiObservation {
-            derived_from: self.__unsafe_private_named.0,
-            entries: self.__unsafe_private_named.1.unwrap(),
-            phenomenon_time: self.__unsafe_private_named.2.unwrap(),
-            phenomenon_time_end: self.__unsafe_private_named.3,
-            result_quality: self.__unsafe_private_named.4,
-            result_time: self.__unsafe_private_named.5,
-            sensor: self.__unsafe_private_named.6.unwrap(),
-            thing: self.__unsafe_private_named.7.unwrap(),
+            derived_from: self._fields.0,
+            entries: self._fields.1.unwrap(),
+            phenomenon_time: self._fields.2.unwrap(),
+            phenomenon_time_end: self._fields.3,
+            result_quality: self._fields.4,
+            result_time: self._fields.5,
+            sensor: self._fields.6.unwrap(),
+            thing: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -923,64 +926,64 @@ pub mod multi_observation_entry_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type ObservedProperty;
-        type UnitOfMeasurement;
         type Result;
+        type UnitOfMeasurement;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type ObservedProperty = Unset;
-        type UnitOfMeasurement = Unset;
         type Result = Unset;
+        type UnitOfMeasurement = Unset;
     }
     ///State transition - sets the `observed_property` field to Set
     pub struct SetObservedProperty<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetObservedProperty<S> {}
     impl<S: State> State for SetObservedProperty<S> {
         type ObservedProperty = Set<members::observed_property>;
-        type UnitOfMeasurement = S::UnitOfMeasurement;
-        type Result = S::Result;
-    }
-    ///State transition - sets the `unit_of_measurement` field to Set
-    pub struct SetUnitOfMeasurement<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUnitOfMeasurement<S> {}
-    impl<S: State> State for SetUnitOfMeasurement<S> {
-        type ObservedProperty = S::ObservedProperty;
-        type UnitOfMeasurement = Set<members::unit_of_measurement>;
         type Result = S::Result;
+        type UnitOfMeasurement = S::UnitOfMeasurement;
     }
     ///State transition - sets the `result` field to Set
     pub struct SetResult<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetResult<S> {}
     impl<S: State> State for SetResult<S> {
         type ObservedProperty = S::ObservedProperty;
-        type UnitOfMeasurement = S::UnitOfMeasurement;
         type Result = Set<members::result>;
+        type UnitOfMeasurement = S::UnitOfMeasurement;
+    }
+    ///State transition - sets the `unit_of_measurement` field to Set
+    pub struct SetUnitOfMeasurement<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUnitOfMeasurement<S> {}
+    impl<S: State> State for SetUnitOfMeasurement<S> {
+        type ObservedProperty = S::ObservedProperty;
+        type Result = S::Result;
+        type UnitOfMeasurement = Set<members::unit_of_measurement>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `observed_property` field
         pub struct observed_property(());
-        ///Marker type for the `unit_of_measurement` field
-        pub struct unit_of_measurement(());
         ///Marker type for the `result` field
         pub struct result(());
+        ///Marker type for the `unit_of_measurement` field
+        pub struct unit_of_measurement(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MultiObservationEntryBuilder<'a, S: multi_observation_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<MultiObservationEntryResult<'a>>,
         Option<MultiObservationEntryResultQuality<'a>>,
         Option<i64>,
         Option<UnitOfMeasurement<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MultiObservationEntry<'a> {
@@ -997,9 +1000,9 @@ impl<'a> MultiObservationEntryBuilder<'a, multi_observation_entry_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MultiObservationEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1017,11 +1020,11 @@ where
         'a,
         multi_observation_entry_state::SetObservedProperty<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MultiObservationEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1036,11 +1039,11 @@ where
         mut self,
         value: impl Into<MultiObservationEntryResult<'a>>,
     ) -> MultiObservationEntryBuilder<'a, multi_observation_entry_state::SetResult<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MultiObservationEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1051,7 +1054,7 @@ impl<'a, S: multi_observation_entry_state::State> MultiObservationEntryBuilder<'
         mut self,
         value: impl Into<Option<MultiObservationEntryResultQuality<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `resultQuality` field to an Option value (optional)
@@ -1059,7 +1062,7 @@ impl<'a, S: multi_observation_entry_state::State> MultiObservationEntryBuilder<'
         mut self,
         value: Option<MultiObservationEntryResultQuality<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1067,12 +1070,12 @@ impl<'a, S: multi_observation_entry_state::State> MultiObservationEntryBuilder<'
 impl<'a, S: multi_observation_entry_state::State> MultiObservationEntryBuilder<'a, S> {
     /// Set the `resultScaleFactor` field (optional)
     pub fn result_scale_factor(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `resultScaleFactor` field to an Option value (optional)
     pub fn maybe_result_scale_factor(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1090,11 +1093,11 @@ where
         'a,
         multi_observation_entry_state::SetUnitOfMeasurement<S>,
     > {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         MultiObservationEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1103,17 +1106,17 @@ impl<'a, S> MultiObservationEntryBuilder<'a, S>
 where
     S: multi_observation_entry_state::State,
     S::ObservedProperty: multi_observation_entry_state::IsSet,
-    S::UnitOfMeasurement: multi_observation_entry_state::IsSet,
     S::Result: multi_observation_entry_state::IsSet,
+    S::UnitOfMeasurement: multi_observation_entry_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> MultiObservationEntry<'a> {
         MultiObservationEntry {
-            observed_property: self.__unsafe_private_named.0.unwrap(),
-            result: self.__unsafe_private_named.1.unwrap(),
-            result_quality: self.__unsafe_private_named.2,
-            result_scale_factor: self.__unsafe_private_named.3,
-            unit_of_measurement: self.__unsafe_private_named.4.unwrap(),
+            observed_property: self._fields.0.unwrap(),
+            result: self._fields.1.unwrap(),
+            result_quality: self._fields.2,
+            result_scale_factor: self._fields.3,
+            unit_of_measurement: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1123,11 +1126,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> MultiObservationEntry<'a> {
         MultiObservationEntry {
-            observed_property: self.__unsafe_private_named.0.unwrap(),
-            result: self.__unsafe_private_named.1.unwrap(),
-            result_quality: self.__unsafe_private_named.2,
-            result_scale_factor: self.__unsafe_private_named.3,
-            unit_of_measurement: self.__unsafe_private_named.4.unwrap(),
+            observed_property: self._fields.0.unwrap(),
+            result: self._fields.1.unwrap(),
+            result_quality: self._fields.2,
+            result_scale_factor: self._fields.3,
+            unit_of_measurement: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_sensorthings/observation_batch.rs b/crates/jacquard-api/src/dev_sensorthings/observation_batch.rs
index 607dfde1..c5f276fa 100644
--- a/crates/jacquard-api/src/dev_sensorthings/observation_batch.rs
+++ b/crates/jacquard-api/src/dev_sensorthings/observation_batch.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -255,49 +258,45 @@ pub mod batch_entry_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type T;
         type Result;
+        type T;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type T = Unset;
         type Result = Unset;
-    }
-    ///State transition - sets the `t` field to Set
-    pub struct SetT<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetT<S> {}
-    impl<S: State> State for SetT<S> {
-        type T = Set<members::t>;
-        type Result = S::Result;
+        type T = Unset;
     }
     ///State transition - sets the `result` field to Set
     pub struct SetResult<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetResult<S> {}
     impl<S: State> State for SetResult<S> {
-        type T = S::T;
         type Result = Set<members::result>;
+        type T = S::T;
+    }
+    ///State transition - sets the `t` field to Set
+    pub struct SetT<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetT<S> {}
+    impl<S: State> State for SetT<S> {
+        type Result = S::Result;
+        type T = Set<members::t>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `t` field
-        pub struct t(());
         ///Marker type for the `result` field
         pub struct result(());
+        ///Marker type for the `t` field
+        pub struct t(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BatchEntryBuilder<'a, S: batch_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<BatchEntryQ<'a>>,
-        Option<BatchEntryResult<'a>>,
-        Option<Datetime>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BatchEntryQ<'a>>, Option<BatchEntryResult<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BatchEntry<'a> {
@@ -311,9 +310,9 @@ impl<'a> BatchEntryBuilder<'a, batch_entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BatchEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -321,12 +320,12 @@ impl<'a> BatchEntryBuilder<'a, batch_entry_state::Empty> {
 impl<'a, S: batch_entry_state::State> BatchEntryBuilder<'a, S> {
     /// Set the `q` field (optional)
     pub fn q(mut self, value: impl Into<Option<BatchEntryQ<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `q` field to an Option value (optional)
     pub fn maybe_q(mut self, value: Option<BatchEntryQ<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -341,11 +340,11 @@ where
         mut self,
         value: impl Into<BatchEntryResult<'a>>,
     ) -> BatchEntryBuilder<'a, batch_entry_state::SetResult<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BatchEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -360,11 +359,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BatchEntryBuilder<'a, batch_entry_state::SetT<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BatchEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -372,15 +371,15 @@ where
 impl<'a, S> BatchEntryBuilder<'a, S>
 where
     S: batch_entry_state::State,
-    S::T: batch_entry_state::IsSet,
     S::Result: batch_entry_state::IsSet,
+    S::T: batch_entry_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> BatchEntry<'a> {
         BatchEntry {
-            q: self.__unsafe_private_named.0,
-            result: self.__unsafe_private_named.1.unwrap(),
-            t: self.__unsafe_private_named.2.unwrap(),
+            q: self._fields.0,
+            result: self._fields.1.unwrap(),
+            t: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -390,9 +389,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> BatchEntry<'a> {
         BatchEntry {
-            q: self.__unsafe_private_named.0,
-            result: self.__unsafe_private_named.1.unwrap(),
-            t: self.__unsafe_private_named.2.unwrap(),
+            q: self._fields.0,
+            result: self._fields.1.unwrap(),
+            t: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -533,80 +532,80 @@ pub mod observation_batch_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Datastream;
         type Observations;
         type WindowStart;
         type WindowEnd;
+        type Datastream;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Datastream = Unset;
         type Observations = Unset;
         type WindowStart = Unset;
         type WindowEnd = Unset;
-    }
-    ///State transition - sets the `datastream` field to Set
-    pub struct SetDatastream<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDatastream<S> {}
-    impl<S: State> State for SetDatastream<S> {
-        type Datastream = Set<members::datastream>;
-        type Observations = S::Observations;
-        type WindowStart = S::WindowStart;
-        type WindowEnd = S::WindowEnd;
+        type Datastream = Unset;
     }
     ///State transition - sets the `observations` field to Set
     pub struct SetObservations<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetObservations<S> {}
     impl<S: State> State for SetObservations<S> {
-        type Datastream = S::Datastream;
         type Observations = Set<members::observations>;
         type WindowStart = S::WindowStart;
         type WindowEnd = S::WindowEnd;
+        type Datastream = S::Datastream;
     }
     ///State transition - sets the `window_start` field to Set
     pub struct SetWindowStart<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWindowStart<S> {}
     impl<S: State> State for SetWindowStart<S> {
-        type Datastream = S::Datastream;
         type Observations = S::Observations;
         type WindowStart = Set<members::window_start>;
         type WindowEnd = S::WindowEnd;
+        type Datastream = S::Datastream;
     }
     ///State transition - sets the `window_end` field to Set
     pub struct SetWindowEnd<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWindowEnd<S> {}
     impl<S: State> State for SetWindowEnd<S> {
-        type Datastream = S::Datastream;
         type Observations = S::Observations;
         type WindowStart = S::WindowStart;
         type WindowEnd = Set<members::window_end>;
+        type Datastream = S::Datastream;
+    }
+    ///State transition - sets the `datastream` field to Set
+    pub struct SetDatastream<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDatastream<S> {}
+    impl<S: State> State for SetDatastream<S> {
+        type Observations = S::Observations;
+        type WindowStart = S::WindowStart;
+        type WindowEnd = S::WindowEnd;
+        type Datastream = Set<members::datastream>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `datastream` field
-        pub struct datastream(());
         ///Marker type for the `observations` field
         pub struct observations(());
         ///Marker type for the `window_start` field
         pub struct window_start(());
         ///Marker type for the `window_end` field
         pub struct window_end(());
+        ///Marker type for the `datastream` field
+        pub struct datastream(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ObservationBatchBuilder<'a, S: observation_batch_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<Vec<observation_batch::BatchEntry<'a>>>,
         Option<Datetime>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ObservationBatch<'a> {
@@ -620,9 +619,9 @@ impl<'a> ObservationBatchBuilder<'a, observation_batch_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ObservationBatchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -637,11 +636,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ObservationBatchBuilder<'a, observation_batch_state::SetDatastream<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ObservationBatchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -656,11 +655,11 @@ where
         mut self,
         value: impl Into<Vec<observation_batch::BatchEntry<'a>>>,
     ) -> ObservationBatchBuilder<'a, observation_batch_state::SetObservations<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ObservationBatchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -675,11 +674,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ObservationBatchBuilder<'a, observation_batch_state::SetWindowEnd<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ObservationBatchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -694,11 +693,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ObservationBatchBuilder<'a, observation_batch_state::SetWindowStart<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ObservationBatchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -706,18 +705,18 @@ where
 impl<'a, S> ObservationBatchBuilder<'a, S>
 where
     S: observation_batch_state::State,
-    S::Datastream: observation_batch_state::IsSet,
     S::Observations: observation_batch_state::IsSet,
     S::WindowStart: observation_batch_state::IsSet,
     S::WindowEnd: observation_batch_state::IsSet,
+    S::Datastream: observation_batch_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ObservationBatch<'a> {
         ObservationBatch {
-            datastream: self.__unsafe_private_named.0.unwrap(),
-            observations: self.__unsafe_private_named.1.unwrap(),
-            window_end: self.__unsafe_private_named.2.unwrap(),
-            window_start: self.__unsafe_private_named.3.unwrap(),
+            datastream: self._fields.0.unwrap(),
+            observations: self._fields.1.unwrap(),
+            window_end: self._fields.2.unwrap(),
+            window_start: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -727,10 +726,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ObservationBatch<'a> {
         ObservationBatch {
-            datastream: self.__unsafe_private_named.0.unwrap(),
-            observations: self.__unsafe_private_named.1.unwrap(),
-            window_end: self.__unsafe_private_named.2.unwrap(),
-            window_start: self.__unsafe_private_named.3.unwrap(),
+            datastream: self._fields.0.unwrap(),
+            observations: self._fields.1.unwrap(),
+            window_end: self._fields.2.unwrap(),
+            window_start: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_sensorthings/observed_property.rs b/crates/jacquard-api/src/dev_sensorthings/observed_property.rs
index ca93ca9c..96b3b6de 100644
--- a/crates/jacquard-api/src/dev_sensorthings/observed_property.rs
+++ b/crates/jacquard-api/src/dev_sensorthings/observed_property.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -135,64 +138,64 @@ pub mod observed_property_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type CreatedAt;
         type Definition;
         type Name;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type CreatedAt = Unset;
         type Definition = Unset;
         type Name = Unset;
-        type CreatedAt = Unset;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type Definition = S::Definition;
+        type Name = S::Name;
     }
     ///State transition - sets the `definition` field to Set
     pub struct SetDefinition<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDefinition<S> {}
     impl<S: State> State for SetDefinition<S> {
+        type CreatedAt = S::CreatedAt;
         type Definition = Set<members::definition>;
         type Name = S::Name;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Definition = S::Definition;
-        type Name = Set<members::name>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type Definition = S::Definition;
-        type Name = S::Name;
-        type CreatedAt = Set<members::created_at>;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `definition` field
         pub struct definition(());
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ObservedPropertyBuilder<'a, S: observed_property_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ObservedProperty<'a> {
@@ -206,9 +209,9 @@ impl<'a> ObservedPropertyBuilder<'a, observed_property_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ObservedPropertyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -223,11 +226,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ObservedPropertyBuilder<'a, observed_property_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ObservedPropertyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -242,11 +245,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ObservedPropertyBuilder<'a, observed_property_state::SetDefinition<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ObservedPropertyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -254,12 +257,12 @@ where
 impl<'a, S: observed_property_state::State> ObservedPropertyBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -274,11 +277,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ObservedPropertyBuilder<'a, observed_property_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ObservedPropertyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -286,17 +289,17 @@ where
 impl<'a, S> ObservedPropertyBuilder<'a, S>
 where
     S: observed_property_state::State,
+    S::CreatedAt: observed_property_state::IsSet,
     S::Definition: observed_property_state::IsSet,
     S::Name: observed_property_state::IsSet,
-    S::CreatedAt: observed_property_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ObservedProperty<'a> {
         ObservedProperty {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            definition: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            definition: self._fields.1.unwrap(),
+            description: self._fields.2,
+            name: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -309,10 +312,10 @@ where
         >,
     ) -> ObservedProperty<'a> {
         ObservedProperty {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            definition: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            definition: self._fields.1.unwrap(),
+            description: self._fields.2,
+            name: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_sensorthings/sensor.rs b/crates/jacquard-api/src/dev_sensorthings/sensor.rs
index f31f1bde..5f9de2d4 100644
--- a/crates/jacquard-api/src/dev_sensorthings/sensor.rs
+++ b/crates/jacquard-api/src/dev_sensorthings/sensor.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -160,49 +163,49 @@ pub mod sensor_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type EncodingType;
         type CreatedAt;
+        type EncodingType;
         type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type EncodingType = Unset;
         type CreatedAt = Unset;
+        type EncodingType = Unset;
         type Name = Unset;
     }
-    ///State transition - sets the `encoding_type` field to Set
-    pub struct SetEncodingType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetEncodingType<S> {}
-    impl<S: State> State for SetEncodingType<S> {
-        type EncodingType = Set<members::encoding_type>;
-        type CreatedAt = S::CreatedAt;
-        type Name = S::Name;
-    }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type EncodingType = S::EncodingType;
         type CreatedAt = Set<members::created_at>;
+        type EncodingType = S::EncodingType;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `encoding_type` field to Set
+    pub struct SetEncodingType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetEncodingType<S> {}
+    impl<S: State> State for SetEncodingType<S> {
+        type CreatedAt = S::CreatedAt;
+        type EncodingType = Set<members::encoding_type>;
         type Name = S::Name;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type EncodingType = S::EncodingType;
         type CreatedAt = S::CreatedAt;
+        type EncodingType = S::EncodingType;
         type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `encoding_type` field
-        pub struct encoding_type(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `encoding_type` field
+        pub struct encoding_type(());
         ///Marker type for the `name` field
         pub struct name(());
     }
@@ -210,15 +213,15 @@ pub mod sensor_state {
 
 /// Builder for constructing an instance of this type
 pub struct SensorBuilder<'a, S: sensor_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Sensor<'a> {
@@ -232,9 +235,9 @@ impl<'a> SensorBuilder<'a, sensor_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SensorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,11 +252,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SensorBuilder<'a, sensor_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SensorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -261,12 +264,12 @@ where
 impl<'a, S: sensor_state::State> SensorBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -281,11 +284,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SensorBuilder<'a, sensor_state::SetEncodingType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SensorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -293,12 +296,12 @@ where
 impl<'a, S: sensor_state::State> SensorBuilder<'a, S> {
     /// Set the `metadata` field (optional)
     pub fn metadata(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `metadata` field to an Option value (optional)
     pub fn maybe_metadata(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -313,11 +316,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SensorBuilder<'a, sensor_state::SetName<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         SensorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -325,18 +328,18 @@ where
 impl<'a, S> SensorBuilder<'a, S>
 where
     S: sensor_state::State,
-    S::EncodingType: sensor_state::IsSet,
     S::CreatedAt: sensor_state::IsSet,
+    S::EncodingType: sensor_state::IsSet,
     S::Name: sensor_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Sensor<'a> {
         Sensor {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            encoding_type: self.__unsafe_private_named.2.unwrap(),
-            metadata: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            encoding_type: self._fields.2.unwrap(),
+            metadata: self._fields.3,
+            name: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -349,11 +352,11 @@ where
         >,
     ) -> Sensor<'a> {
         Sensor {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            encoding_type: self.__unsafe_private_named.2.unwrap(),
-            metadata: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            encoding_type: self._fields.2.unwrap(),
+            metadata: self._fields.3,
+            name: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_tsunagite/chart.rs b/crates/jacquard-api/src/dev_tsunagite/chart.rs
index b685b679..9edb19d2 100644
--- a/crates/jacquard-api/src/dev_tsunagite/chart.rs
+++ b/crates/jacquard-api/src/dev_tsunagite/chart.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -191,65 +194,65 @@ pub mod chart_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Game;
         type Song;
         type Difficulty;
-        type Game;
         type Rating;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Game = Unset;
         type Song = Unset;
         type Difficulty = Unset;
-        type Game = Unset;
         type Rating = Unset;
     }
+    ///State transition - sets the `game` field to Set
+    pub struct SetGame<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetGame<S> {}
+    impl<S: State> State for SetGame<S> {
+        type Game = Set<members::game>;
+        type Song = S::Song;
+        type Difficulty = S::Difficulty;
+        type Rating = S::Rating;
+    }
     ///State transition - sets the `song` field to Set
     pub struct SetSong<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSong<S> {}
     impl<S: State> State for SetSong<S> {
+        type Game = S::Game;
         type Song = Set<members::song>;
         type Difficulty = S::Difficulty;
-        type Game = S::Game;
         type Rating = S::Rating;
     }
     ///State transition - sets the `difficulty` field to Set
     pub struct SetDifficulty<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDifficulty<S> {}
     impl<S: State> State for SetDifficulty<S> {
-        type Song = S::Song;
-        type Difficulty = Set<members::difficulty>;
         type Game = S::Game;
-        type Rating = S::Rating;
-    }
-    ///State transition - sets the `game` field to Set
-    pub struct SetGame<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetGame<S> {}
-    impl<S: State> State for SetGame<S> {
         type Song = S::Song;
-        type Difficulty = S::Difficulty;
-        type Game = Set<members::game>;
+        type Difficulty = Set<members::difficulty>;
         type Rating = S::Rating;
     }
     ///State transition - sets the `rating` field to Set
     pub struct SetRating<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRating<S> {}
     impl<S: State> State for SetRating<S> {
+        type Game = S::Game;
         type Song = S::Song;
         type Difficulty = S::Difficulty;
-        type Game = S::Game;
         type Rating = Set<members::rating>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `game` field
+        pub struct game(());
         ///Marker type for the `song` field
         pub struct song(());
         ///Marker type for the `difficulty` field
         pub struct difficulty(());
-        ///Marker type for the `game` field
-        pub struct game(());
         ///Marker type for the `rating` field
         pub struct rating(());
     }
@@ -257,8 +260,8 @@ pub mod chart_state {
 
 /// Builder for constructing an instance of this type
 pub struct ChartBuilder<'a, S: chart_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ChartDifficulty<'a>>,
         Option<AtUri<'a>>,
         Option<BlobRef<'a>>,
@@ -267,7 +270,7 @@ pub struct ChartBuilder<'a, S: chart_state::State> {
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Chart<'a> {
@@ -281,9 +284,9 @@ impl<'a> ChartBuilder<'a, chart_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ChartBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -298,11 +301,11 @@ where
         mut self,
         value: impl Into<ChartDifficulty<'a>>,
     ) -> ChartBuilder<'a, chart_state::SetDifficulty<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ChartBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -317,11 +320,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ChartBuilder<'a, chart_state::SetGame<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ChartBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -329,12 +332,12 @@ where
 impl<'a, S: chart_state::State> ChartBuilder<'a, S> {
     /// Set the `jacket` field (optional)
     pub fn jacket(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `jacket` field to an Option value (optional)
     pub fn maybe_jacket(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -342,12 +345,12 @@ impl<'a, S: chart_state::State> ChartBuilder<'a, S> {
 impl<'a, S: chart_state::State> ChartBuilder<'a, S> {
     /// Set the `jacketArtist` field (optional)
     pub fn jacket_artist(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `jacketArtist` field to an Option value (optional)
     pub fn maybe_jacket_artist(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -355,12 +358,12 @@ impl<'a, S: chart_state::State> ChartBuilder<'a, S> {
 impl<'a, S: chart_state::State> ChartBuilder<'a, S> {
     /// Set the `rankedVersions` field (optional)
     pub fn ranked_versions(mut self, value: impl Into<Option<Vec<Bytes>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `rankedVersions` field to an Option value (optional)
     pub fn maybe_ranked_versions(mut self, value: Option<Vec<Bytes>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -375,11 +378,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ChartBuilder<'a, chart_state::SetRating<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ChartBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -394,11 +397,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ChartBuilder<'a, chart_state::SetSong<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ChartBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -406,21 +409,21 @@ where
 impl<'a, S> ChartBuilder<'a, S>
 where
     S: chart_state::State,
+    S::Game: chart_state::IsSet,
     S::Song: chart_state::IsSet,
     S::Difficulty: chart_state::IsSet,
-    S::Game: chart_state::IsSet,
     S::Rating: chart_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Chart<'a> {
         Chart {
-            difficulty: self.__unsafe_private_named.0.unwrap(),
-            game: self.__unsafe_private_named.1.unwrap(),
-            jacket: self.__unsafe_private_named.2,
-            jacket_artist: self.__unsafe_private_named.3,
-            ranked_versions: self.__unsafe_private_named.4,
-            rating: self.__unsafe_private_named.5.unwrap(),
-            song: self.__unsafe_private_named.6.unwrap(),
+            difficulty: self._fields.0.unwrap(),
+            game: self._fields.1.unwrap(),
+            jacket: self._fields.2,
+            jacket_artist: self._fields.3,
+            ranked_versions: self._fields.4,
+            rating: self._fields.5.unwrap(),
+            song: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -430,13 +433,13 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Chart<'a> {
         Chart {
-            difficulty: self.__unsafe_private_named.0.unwrap(),
-            game: self.__unsafe_private_named.1.unwrap(),
-            jacket: self.__unsafe_private_named.2,
-            jacket_artist: self.__unsafe_private_named.3,
-            ranked_versions: self.__unsafe_private_named.4,
-            rating: self.__unsafe_private_named.5.unwrap(),
-            song: self.__unsafe_private_named.6.unwrap(),
+            difficulty: self._fields.0.unwrap(),
+            game: self._fields.1.unwrap(),
+            jacket: self._fields.2,
+            jacket_artist: self._fields.3,
+            ranked_versions: self._fields.4,
+            rating: self._fields.5.unwrap(),
+            song: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_tsunagite/difficulty.rs b/crates/jacquard-api/src/dev_tsunagite/difficulty.rs
index a2195fb4..0b0b866c 100644
--- a/crates/jacquard-api/src/dev_tsunagite/difficulty.rs
+++ b/crates/jacquard-api/src/dev_tsunagite/difficulty.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -137,9 +140,9 @@ pub mod difficulty_state {
 
 /// Builder for constructing an instance of this type
 pub struct DifficultyBuilder<'a, S: difficulty_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Data<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Data<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Difficulty<'a> {
@@ -153,9 +156,9 @@ impl<'a> DifficultyBuilder<'a, difficulty_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DifficultyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -163,12 +166,12 @@ impl<'a> DifficultyBuilder<'a, difficulty_state::Empty> {
 impl<'a, S: difficulty_state::State> DifficultyBuilder<'a, S> {
     /// Set the `color` field (optional)
     pub fn color(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `color` field to an Option value (optional)
     pub fn maybe_color(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -183,11 +186,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> DifficultyBuilder<'a, difficulty_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DifficultyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,8 +203,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Difficulty<'a> {
         Difficulty {
-            color: self.__unsafe_private_named.0,
-            name: self.__unsafe_private_named.1.unwrap(),
+            color: self._fields.0,
+            name: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -211,8 +214,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Difficulty<'a> {
         Difficulty {
-            color: self.__unsafe_private_named.0,
-            name: self.__unsafe_private_named.1.unwrap(),
+            color: self._fields.0,
+            name: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_tsunagite/game.rs b/crates/jacquard-api/src/dev_tsunagite/game.rs
index 71c80118..28086a05 100644
--- a/crates/jacquard-api/src/dev_tsunagite/game.rs
+++ b/crates/jacquard-api/src/dev_tsunagite/game.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -412,62 +415,58 @@ pub mod enum_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Values;
-        type Name;
         type Id;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Values = Unset;
-        type Name = Unset;
         type Id = Unset;
+        type Name = Unset;
     }
     ///State transition - sets the `values` field to Set
     pub struct SetValues<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetValues<S> {}
     impl<S: State> State for SetValues<S> {
         type Values = Set<members::values>;
-        type Name = S::Name;
-        type Id = S::Id;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Values = S::Values;
-        type Name = Set<members::name>;
         type Id = S::Id;
+        type Name = S::Name;
     }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetId<S> {}
     impl<S: State> State for SetId<S> {
         type Values = S::Values;
-        type Name = S::Name;
         type Id = Set<members::id>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Values = S::Values;
+        type Id = S::Id;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `values` field
         pub struct values(());
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `id` field
         pub struct id(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EnumBuilder<'a, S: enum_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<RecordKey<Rkey<'a>>>,
-        Option<Data<'a>>,
-        Option<Vec<Indexable<'a>>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<RecordKey<Rkey<'a>>>, Option<Data<'a>>, Option<Vec<Indexable<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Enum<'a> {
@@ -481,9 +480,9 @@ impl<'a> EnumBuilder<'a, enum_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EnumBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -498,11 +497,11 @@ where
         mut self,
         value: impl Into<RecordKey<Rkey<'a>>>,
     ) -> EnumBuilder<'a, enum_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EnumBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -517,11 +516,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> EnumBuilder<'a, enum_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EnumBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -536,11 +535,11 @@ where
         mut self,
         value: impl Into<Vec<Indexable<'a>>>,
     ) -> EnumBuilder<'a, enum_state::SetValues<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EnumBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -549,15 +548,15 @@ impl<'a, S> EnumBuilder<'a, S>
 where
     S: enum_state::State,
     S::Values: enum_state::IsSet,
-    S::Name: enum_state::IsSet,
     S::Id: enum_state::IsSet,
+    S::Name: enum_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Enum<'a> {
         Enum {
-            id: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            values: self.__unsafe_private_named.2.unwrap(),
+            id: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            values: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -567,9 +566,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Enum<'a> {
         Enum {
-            id: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            values: self.__unsafe_private_named.2.unwrap(),
+            id: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            values: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -918,74 +917,74 @@ pub mod game_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type ScoreComponents;
+        type DefaultComponent;
         type Name;
         type Judgments;
-        type DefaultComponent;
-        type ScoreComponents;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type ScoreComponents = Unset;
+        type DefaultComponent = Unset;
         type Name = Unset;
         type Judgments = Unset;
-        type DefaultComponent = Unset;
-        type ScoreComponents = Unset;
+    }
+    ///State transition - sets the `score_components` field to Set
+    pub struct SetScoreComponents<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetScoreComponents<S> {}
+    impl<S: State> State for SetScoreComponents<S> {
+        type ScoreComponents = Set<members::score_components>;
+        type DefaultComponent = S::DefaultComponent;
+        type Name = S::Name;
+        type Judgments = S::Judgments;
+    }
+    ///State transition - sets the `default_component` field to Set
+    pub struct SetDefaultComponent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDefaultComponent<S> {}
+    impl<S: State> State for SetDefaultComponent<S> {
+        type ScoreComponents = S::ScoreComponents;
+        type DefaultComponent = Set<members::default_component>;
+        type Name = S::Name;
+        type Judgments = S::Judgments;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
+        type ScoreComponents = S::ScoreComponents;
+        type DefaultComponent = S::DefaultComponent;
         type Name = Set<members::name>;
         type Judgments = S::Judgments;
-        type DefaultComponent = S::DefaultComponent;
-        type ScoreComponents = S::ScoreComponents;
     }
     ///State transition - sets the `judgments` field to Set
     pub struct SetJudgments<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetJudgments<S> {}
     impl<S: State> State for SetJudgments<S> {
-        type Name = S::Name;
-        type Judgments = Set<members::judgments>;
-        type DefaultComponent = S::DefaultComponent;
         type ScoreComponents = S::ScoreComponents;
-    }
-    ///State transition - sets the `default_component` field to Set
-    pub struct SetDefaultComponent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDefaultComponent<S> {}
-    impl<S: State> State for SetDefaultComponent<S> {
-        type Name = S::Name;
-        type Judgments = S::Judgments;
-        type DefaultComponent = Set<members::default_component>;
-        type ScoreComponents = S::ScoreComponents;
-    }
-    ///State transition - sets the `score_components` field to Set
-    pub struct SetScoreComponents<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetScoreComponents<S> {}
-    impl<S: State> State for SetScoreComponents<S> {
-        type Name = S::Name;
-        type Judgments = S::Judgments;
         type DefaultComponent = S::DefaultComponent;
-        type ScoreComponents = Set<members::score_components>;
+        type Name = S::Name;
+        type Judgments = Set<members::judgments>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `score_components` field
+        pub struct score_components(());
+        ///Marker type for the `default_component` field
+        pub struct default_component(());
         ///Marker type for the `name` field
         pub struct name(());
         ///Marker type for the `judgments` field
         pub struct judgments(());
-        ///Marker type for the `default_component` field
-        pub struct default_component(());
-        ///Marker type for the `score_components` field
-        pub struct score_components(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GameBuilder<'a, S: game_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<RecordKey<Rkey<'a>>>,
         Option<Vec<CowStr<'a>>>,
         Option<Vec<Indexable<'a>>>,
@@ -994,7 +993,7 @@ pub struct GameBuilder<'a, S: game_state::State> {
         Option<Data<'a>>,
         Option<Vec<GameScoreComponentsItem<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Game<'a> {
@@ -1008,9 +1007,9 @@ impl<'a> GameBuilder<'a, game_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1025,11 +1024,11 @@ where
         mut self,
         value: impl Into<RecordKey<Rkey<'a>>>,
     ) -> GameBuilder<'a, game_state::SetDefaultComponent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1037,12 +1036,12 @@ where
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `inputMethods` field (optional)
     pub fn input_methods(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `inputMethods` field to an Option value (optional)
     pub fn maybe_input_methods(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1057,11 +1056,11 @@ where
         mut self,
         value: impl Into<Vec<Indexable<'a>>>,
     ) -> GameBuilder<'a, game_state::SetJudgments<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1069,12 +1068,12 @@ where
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `logo` field (optional)
     pub fn logo(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `logo` field to an Option value (optional)
     pub fn maybe_logo(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1082,12 +1081,12 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `modes` field (optional)
     pub fn modes(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `modes` field to an Option value (optional)
     pub fn maybe_modes(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1102,11 +1101,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> GameBuilder<'a, game_state::SetName<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1121,11 +1120,11 @@ where
         mut self,
         value: impl Into<Vec<GameScoreComponentsItem<'a>>>,
     ) -> GameBuilder<'a, game_state::SetScoreComponents<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1133,21 +1132,21 @@ where
 impl<'a, S> GameBuilder<'a, S>
 where
     S: game_state::State,
+    S::ScoreComponents: game_state::IsSet,
+    S::DefaultComponent: game_state::IsSet,
     S::Name: game_state::IsSet,
     S::Judgments: game_state::IsSet,
-    S::DefaultComponent: game_state::IsSet,
-    S::ScoreComponents: game_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Game<'a> {
         Game {
-            default_component: self.__unsafe_private_named.0.unwrap(),
-            input_methods: self.__unsafe_private_named.1,
-            judgments: self.__unsafe_private_named.2.unwrap(),
-            logo: self.__unsafe_private_named.3,
-            modes: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            score_components: self.__unsafe_private_named.6.unwrap(),
+            default_component: self._fields.0.unwrap(),
+            input_methods: self._fields.1,
+            judgments: self._fields.2.unwrap(),
+            logo: self._fields.3,
+            modes: self._fields.4,
+            name: self._fields.5.unwrap(),
+            score_components: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1157,13 +1156,13 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Game<'a> {
         Game {
-            default_component: self.__unsafe_private_named.0.unwrap(),
-            input_methods: self.__unsafe_private_named.1,
-            judgments: self.__unsafe_private_named.2.unwrap(),
-            logo: self.__unsafe_private_named.3,
-            modes: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            score_components: self.__unsafe_private_named.6.unwrap(),
+            default_component: self._fields.0.unwrap(),
+            input_methods: self._fields.1,
+            judgments: self._fields.2.unwrap(),
+            logo: self._fields.3,
+            modes: self._fields.4,
+            name: self._fields.5.unwrap(),
+            score_components: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1187,80 +1186,75 @@ pub mod percentage_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
-        type Precision;
         type Maximum;
+        type Name;
         type Id;
+        type Precision;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
-        type Precision = Unset;
         type Maximum = Unset;
+        type Name = Unset;
         type Id = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Precision = S::Precision;
-        type Maximum = S::Maximum;
-        type Id = S::Id;
-    }
-    ///State transition - sets the `precision` field to Set
-    pub struct SetPrecision<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPrecision<S> {}
-    impl<S: State> State for SetPrecision<S> {
-        type Name = S::Name;
-        type Precision = Set<members::precision>;
-        type Maximum = S::Maximum;
-        type Id = S::Id;
+        type Precision = Unset;
     }
     ///State transition - sets the `maximum` field to Set
     pub struct SetMaximum<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMaximum<S> {}
     impl<S: State> State for SetMaximum<S> {
+        type Maximum = Set<members::maximum>;
         type Name = S::Name;
+        type Id = S::Id;
         type Precision = S::Precision;
-        type Maximum = Set<members::maximum>;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Maximum = S::Maximum;
+        type Name = Set<members::name>;
         type Id = S::Id;
+        type Precision = S::Precision;
     }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetId<S> {}
     impl<S: State> State for SetId<S> {
+        type Maximum = S::Maximum;
         type Name = S::Name;
+        type Id = Set<members::id>;
         type Precision = S::Precision;
+    }
+    ///State transition - sets the `precision` field to Set
+    pub struct SetPrecision<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPrecision<S> {}
+    impl<S: State> State for SetPrecision<S> {
         type Maximum = S::Maximum;
-        type Id = Set<members::id>;
+        type Name = S::Name;
+        type Id = S::Id;
+        type Precision = Set<members::precision>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
-        ///Marker type for the `precision` field
-        pub struct precision(());
         ///Marker type for the `maximum` field
         pub struct maximum(());
+        ///Marker type for the `name` field
+        pub struct name(());
         ///Marker type for the `id` field
         pub struct id(());
+        ///Marker type for the `precision` field
+        pub struct precision(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PercentageBuilder<'a, S: percentage_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<RecordKey<Rkey<'a>>>,
-        Option<i64>,
-        Option<Data<'a>>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<RecordKey<Rkey<'a>>>, Option<i64>, Option<Data<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Percentage<'a> {
@@ -1274,9 +1268,9 @@ impl<'a> PercentageBuilder<'a, percentage_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PercentageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1291,11 +1285,11 @@ where
         mut self,
         value: impl Into<RecordKey<Rkey<'a>>>,
     ) -> PercentageBuilder<'a, percentage_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PercentageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1310,11 +1304,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PercentageBuilder<'a, percentage_state::SetMaximum<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PercentageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1329,11 +1323,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> PercentageBuilder<'a, percentage_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PercentageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1348,11 +1342,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PercentageBuilder<'a, percentage_state::SetPrecision<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PercentageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1360,18 +1354,18 @@ where
 impl<'a, S> PercentageBuilder<'a, S>
 where
     S: percentage_state::State,
-    S::Name: percentage_state::IsSet,
-    S::Precision: percentage_state::IsSet,
     S::Maximum: percentage_state::IsSet,
+    S::Name: percentage_state::IsSet,
     S::Id: percentage_state::IsSet,
+    S::Precision: percentage_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Percentage<'a> {
         Percentage {
-            id: self.__unsafe_private_named.0.unwrap(),
-            maximum: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            precision: self.__unsafe_private_named.3.unwrap(),
+            id: self._fields.0.unwrap(),
+            maximum: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            precision: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1381,10 +1375,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Percentage<'a> {
         Percentage {
-            id: self.__unsafe_private_named.0.unwrap(),
-            maximum: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            precision: self.__unsafe_private_named.3.unwrap(),
+            id: self._fields.0.unwrap(),
+            maximum: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            precision: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1400,45 +1394,45 @@ pub mod points_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Id;
         type Name;
+        type Id;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Id = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `id` field to Set
-    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetId<S> {}
-    impl<S: State> State for SetId<S> {
-        type Id = Set<members::id>;
-        type Name = S::Name;
+        type Id = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Id = S::Id;
         type Name = Set<members::name>;
+        type Id = S::Id;
+    }
+    ///State transition - sets the `id` field to Set
+    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetId<S> {}
+    impl<S: State> State for SetId<S> {
+        type Name = S::Name;
+        type Id = Set<members::id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `id` field
-        pub struct id(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `id` field
+        pub struct id(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PointsBuilder<'a, S: points_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<RecordKey<Rkey<'a>>>, Option<i64>, Option<Data<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<RecordKey<Rkey<'a>>>, Option<i64>, Option<Data<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Points<'a> {
@@ -1452,9 +1446,9 @@ impl<'a> PointsBuilder<'a, points_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PointsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1469,11 +1463,11 @@ where
         mut self,
         value: impl Into<RecordKey<Rkey<'a>>>,
     ) -> PointsBuilder<'a, points_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PointsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1481,12 +1475,12 @@ where
 impl<'a, S: points_state::State> PointsBuilder<'a, S> {
     /// Set the `maximum` field (optional)
     pub fn maximum(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `maximum` field to an Option value (optional)
     pub fn maybe_maximum(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1501,11 +1495,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> PointsBuilder<'a, points_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PointsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1513,15 +1507,15 @@ where
 impl<'a, S> PointsBuilder<'a, S>
 where
     S: points_state::State,
-    S::Id: points_state::IsSet,
     S::Name: points_state::IsSet,
+    S::Id: points_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Points<'a> {
         Points {
-            id: self.__unsafe_private_named.0.unwrap(),
-            maximum: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
+            id: self._fields.0.unwrap(),
+            maximum: self._fields.1,
+            name: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1531,9 +1525,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Points<'a> {
         Points {
-            id: self.__unsafe_private_named.0.unwrap(),
-            maximum: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
+            id: self._fields.0.unwrap(),
+            maximum: self._fields.1,
+            name: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1585,9 +1579,9 @@ pub mod text_state {
 
 /// Builder for constructing an instance of this type
 pub struct TextBuilder<'a, S: text_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<RecordKey<Rkey<'a>>>, Option<Data<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<RecordKey<Rkey<'a>>>, Option<Data<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Text<'a> {
@@ -1601,9 +1595,9 @@ impl<'a> TextBuilder<'a, text_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TextBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1618,11 +1612,11 @@ where
         mut self,
         value: impl Into<RecordKey<Rkey<'a>>>,
     ) -> TextBuilder<'a, text_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TextBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1637,11 +1631,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> TextBuilder<'a, text_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TextBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1655,8 +1649,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Text<'a> {
         Text {
-            id: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
+            id: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1666,8 +1660,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Text<'a> {
         Text {
-            id: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
+            id: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_tsunagite/song.rs b/crates/jacquard-api/src/dev_tsunagite/song.rs
index 2e4f3284..f5f1d10e 100644
--- a/crates/jacquard-api/src/dev_tsunagite/song.rs
+++ b/crates/jacquard-api/src/dev_tsunagite/song.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -182,58 +185,58 @@ pub mod song_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Composer;
         type Game;
         type Title;
+        type Composer;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Composer = Unset;
         type Game = Unset;
         type Title = Unset;
-    }
-    ///State transition - sets the `composer` field to Set
-    pub struct SetComposer<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetComposer<S> {}
-    impl<S: State> State for SetComposer<S> {
-        type Composer = Set<members::composer>;
-        type Game = S::Game;
-        type Title = S::Title;
+        type Composer = Unset;
     }
     ///State transition - sets the `game` field to Set
     pub struct SetGame<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetGame<S> {}
     impl<S: State> State for SetGame<S> {
-        type Composer = S::Composer;
         type Game = Set<members::game>;
         type Title = S::Title;
+        type Composer = S::Composer;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Composer = S::Composer;
         type Game = S::Game;
         type Title = Set<members::title>;
+        type Composer = S::Composer;
+    }
+    ///State transition - sets the `composer` field to Set
+    pub struct SetComposer<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetComposer<S> {}
+    impl<S: State> State for SetComposer<S> {
+        type Game = S::Game;
+        type Title = S::Title;
+        type Composer = Set<members::composer>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `composer` field
-        pub struct composer(());
         ///Marker type for the `game` field
         pub struct game(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `composer` field
+        pub struct composer(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SongBuilder<'a, S: song_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Data<'a>>,
         Option<Vec<AtUri<'a>>>,
         Option<Data<'a>>,
@@ -243,7 +246,7 @@ pub struct SongBuilder<'a, S: song_state::State> {
         Option<Data<'a>>,
         Option<Data<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Song<'a> {
@@ -257,9 +260,9 @@ impl<'a> SongBuilder<'a, song_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -274,11 +277,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> SongBuilder<'a, song_state::SetComposer<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -293,11 +296,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> SongBuilder<'a, song_state::SetGame<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -305,12 +308,12 @@ where
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -318,12 +321,12 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `jacket` field (optional)
     pub fn jacket(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `jacket` field to an Option value (optional)
     pub fn maybe_jacket(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -331,12 +334,12 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `jacketArtist` field (optional)
     pub fn jacket_artist(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `jacketArtist` field to an Option value (optional)
     pub fn maybe_jacket_artist(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -344,12 +347,12 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `source` field (optional)
     pub fn source(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `source` field to an Option value (optional)
     pub fn maybe_source(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -357,12 +360,12 @@ impl<'a, S: song_state::State> SongBuilder<'a, S> {
 impl<'a, S: song_state::State> SongBuilder<'a, S> {
     /// Set the `subtitle` field (optional)
     pub fn subtitle(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `subtitle` field to an Option value (optional)
     pub fn maybe_subtitle(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -377,11 +380,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> SongBuilder<'a, song_state::SetTitle<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         SongBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -389,21 +392,21 @@ where
 impl<'a, S> SongBuilder<'a, S>
 where
     S: song_state::State,
-    S::Composer: song_state::IsSet,
     S::Game: song_state::IsSet,
     S::Title: song_state::IsSet,
+    S::Composer: song_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Song<'a> {
         Song {
-            composer: self.__unsafe_private_named.0.unwrap(),
-            game: self.__unsafe_private_named.1.unwrap(),
-            genre: self.__unsafe_private_named.2,
-            jacket: self.__unsafe_private_named.3,
-            jacket_artist: self.__unsafe_private_named.4,
-            source: self.__unsafe_private_named.5,
-            subtitle: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7.unwrap(),
+            composer: self._fields.0.unwrap(),
+            game: self._fields.1.unwrap(),
+            genre: self._fields.2,
+            jacket: self._fields.3,
+            jacket_artist: self._fields.4,
+            source: self._fields.5,
+            subtitle: self._fields.6,
+            title: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -413,14 +416,14 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Song<'a> {
         Song {
-            composer: self.__unsafe_private_named.0.unwrap(),
-            game: self.__unsafe_private_named.1.unwrap(),
-            genre: self.__unsafe_private_named.2,
-            jacket: self.__unsafe_private_named.3,
-            jacket_artist: self.__unsafe_private_named.4,
-            source: self.__unsafe_private_named.5,
-            subtitle: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7.unwrap(),
+            composer: self._fields.0.unwrap(),
+            game: self._fields.1.unwrap(),
+            genre: self._fields.2,
+            jacket: self._fields.3,
+            jacket_artist: self._fields.4,
+            source: self._fields.5,
+            subtitle: self._fields.6,
+            title: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_tsunagite/types.rs b/crates/jacquard-api/src/dev_tsunagite/types.rs
index d0758adf..e90a6762 100644
--- a/crates/jacquard-api/src/dev_tsunagite/types.rs
+++ b/crates/jacquard-api/src/dev_tsunagite/types.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -113,59 +116,59 @@ pub mod indexable_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type Index;
         type Id;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type Index = Unset;
         type Id = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Index = S::Index;
-        type Id = S::Id;
+        type Name = Unset;
     }
     ///State transition - sets the `index` field to Set
     pub struct SetIndex<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIndex<S> {}
     impl<S: State> State for SetIndex<S> {
-        type Name = S::Name;
         type Index = Set<members::index>;
         type Id = S::Id;
+        type Name = S::Name;
     }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetId<S> {}
     impl<S: State> State for SetId<S> {
-        type Name = S::Name;
         type Index = S::Index;
         type Id = Set<members::id>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Index = S::Index;
+        type Id = S::Id;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `index` field
         pub struct index(());
         ///Marker type for the `id` field
         pub struct id(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct IndexableBuilder<'a, S: indexable_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<RecordKey<Rkey<'a>>>, Option<i64>, Option<Data<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<RecordKey<Rkey<'a>>>, Option<i64>, Option<Data<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Indexable<'a> {
@@ -179,9 +182,9 @@ impl<'a> IndexableBuilder<'a, indexable_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IndexableBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<RecordKey<Rkey<'a>>>,
     ) -> IndexableBuilder<'a, indexable_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         IndexableBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> IndexableBuilder<'a, indexable_state::SetIndex<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         IndexableBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> IndexableBuilder<'a, indexable_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         IndexableBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,16 +249,16 @@ where
 impl<'a, S> IndexableBuilder<'a, S>
 where
     S: indexable_state::State,
-    S::Name: indexable_state::IsSet,
     S::Index: indexable_state::IsSet,
     S::Id: indexable_state::IsSet,
+    S::Name: indexable_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Indexable<'a> {
         Indexable {
-            id: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            id: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -265,9 +268,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Indexable<'a> {
         Indexable {
-            id: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            id: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_vielle/dnd/astral.rs b/crates/jacquard-api/src/dev_vielle/dnd/astral.rs
index 393a39ec..2f737f7c 100644
--- a/crates/jacquard-api/src/dev_vielle/dnd/astral.rs
+++ b/crates/jacquard-api/src/dev_vielle/dnd/astral.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -340,9 +343,9 @@ pub mod astral_state {
 
 /// Builder for constructing an instance of this type
 pub struct AstralBuilder<'a, S: astral_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Vec<astral::Power<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Vec<astral::Power<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Astral<'a> {
@@ -356,9 +359,9 @@ impl<'a> AstralBuilder<'a, astral_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AstralBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -373,11 +376,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AstralBuilder<'a, astral_state::SetPoints<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AstralBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -392,11 +395,11 @@ where
         mut self,
         value: impl Into<Vec<astral::Power<'a>>>,
     ) -> AstralBuilder<'a, astral_state::SetPowers<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AstralBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -410,8 +413,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Astral<'a> {
         Astral {
-            points: self.__unsafe_private_named.0.unwrap(),
-            powers: self.__unsafe_private_named.1.unwrap(),
+            points: self._fields.0.unwrap(),
+            powers: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -424,8 +427,8 @@ where
         >,
     ) -> Astral<'a> {
         Astral {
-            points: self.__unsafe_private_named.0.unwrap(),
-            powers: self.__unsafe_private_named.1.unwrap(),
+            points: self._fields.0.unwrap(),
+            powers: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_vielle/guestbook/book.rs b/crates/jacquard-api/src/dev_vielle/guestbook/book.rs
index fb741da0..b4407ac1 100644
--- a/crates/jacquard-api/src/dev_vielle/guestbook/book.rs
+++ b/crates/jacquard-api/src/dev_vielle/guestbook/book.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -133,9 +136,9 @@ pub mod book_state {
 
 /// Builder for constructing an instance of this type
 pub struct BookBuilder<'a, S: book_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Book<'a> {
@@ -149,9 +152,9 @@ impl<'a> BookBuilder<'a, book_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -166,11 +169,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> BookBuilder<'a, book_state::SetSite<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,12 +181,12 @@ where
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -196,8 +199,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Book<'a> {
         Book {
-            site: self.__unsafe_private_named.0.unwrap(),
-            title: self.__unsafe_private_named.1,
+            site: self._fields.0.unwrap(),
+            title: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -210,8 +213,8 @@ where
         >,
     ) -> Book<'a> {
         Book {
-            site: self.__unsafe_private_named.0.unwrap(),
-            title: self.__unsafe_private_named.1,
+            site: self._fields.0.unwrap(),
+            title: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/dev_vielle/guestbook/entry.rs b/crates/jacquard-api/src/dev_vielle/guestbook/entry.rs
index 0f6c5d74..b0f7444d 100644
--- a/crates/jacquard-api/src/dev_vielle/guestbook/entry.rs
+++ b/crates/jacquard-api/src/dev_vielle/guestbook/entry.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -108,45 +111,45 @@ pub mod entry_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Book;
         type Contents;
+        type Book;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Book = Unset;
         type Contents = Unset;
-    }
-    ///State transition - sets the `book` field to Set
-    pub struct SetBook<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBook<S> {}
-    impl<S: State> State for SetBook<S> {
-        type Book = Set<members::book>;
-        type Contents = S::Contents;
+        type Book = Unset;
     }
     ///State transition - sets the `contents` field to Set
     pub struct SetContents<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContents<S> {}
     impl<S: State> State for SetContents<S> {
-        type Book = S::Book;
         type Contents = Set<members::contents>;
+        type Book = S::Book;
+    }
+    ///State transition - sets the `book` field to Set
+    pub struct SetBook<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBook<S> {}
+    impl<S: State> State for SetBook<S> {
+        type Contents = S::Contents;
+        type Book = Set<members::book>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `book` field
-        pub struct book(());
         ///Marker type for the `contents` field
         pub struct contents(());
+        ///Marker type for the `book` field
+        pub struct book(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EntryBuilder<'a, S: entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Entry<'a> {
@@ -160,9 +163,9 @@ impl<'a> EntryBuilder<'a, entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -177,11 +180,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> EntryBuilder<'a, entry_state::SetBook<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EntryBuilder<'a, entry_state::SetContents<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -208,14 +211,14 @@ where
 impl<'a, S> EntryBuilder<'a, S>
 where
     S: entry_state::State,
-    S::Book: entry_state::IsSet,
     S::Contents: entry_state::IsSet,
+    S::Book: entry_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Entry<'a> {
         Entry {
-            book: self.__unsafe_private_named.0.unwrap(),
-            contents: self.__unsafe_private_named.1.unwrap(),
+            book: self._fields.0.unwrap(),
+            contents: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -228,8 +231,8 @@ where
         >,
     ) -> Entry<'a> {
         Entry {
-            book: self.__unsafe_private_named.0.unwrap(),
-            contents: self.__unsafe_private_named.1.unwrap(),
+            book: self._fields.0.unwrap(),
+            contents: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/directory_evnt/event.rs b/crates/jacquard-api/src/directory_evnt/event.rs
index f38d040f..c640d1f2 100644
--- a/crates/jacquard-api/src/directory_evnt/event.rs
+++ b/crates/jacquard-api/src/directory_evnt/event.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -693,45 +696,45 @@ pub mod coordinates_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Lat;
         type Lng;
+        type Lat;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Lat = Unset;
         type Lng = Unset;
-    }
-    ///State transition - sets the `lat` field to Set
-    pub struct SetLat<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLat<S> {}
-    impl<S: State> State for SetLat<S> {
-        type Lat = Set<members::lat>;
-        type Lng = S::Lng;
+        type Lat = Unset;
     }
     ///State transition - sets the `lng` field to Set
     pub struct SetLng<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLng<S> {}
     impl<S: State> State for SetLng<S> {
-        type Lat = S::Lat;
         type Lng = Set<members::lng>;
+        type Lat = S::Lat;
+    }
+    ///State transition - sets the `lat` field to Set
+    pub struct SetLat<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLat<S> {}
+    impl<S: State> State for SetLat<S> {
+        type Lng = S::Lng;
+        type Lat = Set<members::lat>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `lat` field
-        pub struct lat(());
         ///Marker type for the `lng` field
         pub struct lng(());
+        ///Marker type for the `lat` field
+        pub struct lat(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CoordinatesBuilder<'a, S: coordinates_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Coordinates<'a> {
@@ -745,9 +748,9 @@ impl<'a> CoordinatesBuilder<'a, coordinates_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CoordinatesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -762,11 +765,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CoordinatesBuilder<'a, coordinates_state::SetLat<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CoordinatesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -781,11 +784,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CoordinatesBuilder<'a, coordinates_state::SetLng<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CoordinatesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -793,14 +796,14 @@ where
 impl<'a, S> CoordinatesBuilder<'a, S>
 where
     S: coordinates_state::State,
-    S::Lat: coordinates_state::IsSet,
     S::Lng: coordinates_state::IsSet,
+    S::Lat: coordinates_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Coordinates<'a> {
         Coordinates {
-            lat: self.__unsafe_private_named.0.unwrap(),
-            lng: self.__unsafe_private_named.1.unwrap(),
+            lat: self._fields.0.unwrap(),
+            lng: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -810,8 +813,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Coordinates<'a> {
         Coordinates {
-            lat: self.__unsafe_private_named.0.unwrap(),
-            lng: self.__unsafe_private_named.1.unwrap(),
+            lat: self._fields.0.unwrap(),
+            lng: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -863,9 +866,9 @@ pub mod event_component_state {
 
 /// Builder for constructing an instance of this type
 pub struct EventComponentBuilder<'a, S: event_component_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Data<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Data<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> EventComponent<'a> {
@@ -879,9 +882,9 @@ impl<'a> EventComponentBuilder<'a, event_component_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EventComponentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -896,11 +899,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> EventComponentBuilder<'a, event_component_state::SetData<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EventComponentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -915,11 +918,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EventComponentBuilder<'a, event_component_state::SetType<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EventComponentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -933,8 +936,8 @@ where
     /// Build the final struct
     pub fn build(self) -> EventComponent<'a> {
         EventComponent {
-            data: self.__unsafe_private_named.0.unwrap(),
-            r#type: self.__unsafe_private_named.1.unwrap(),
+            data: self._fields.0.unwrap(),
+            r#type: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -944,8 +947,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> EventComponent<'a> {
         EventComponent {
-            data: self.__unsafe_private_named.0.unwrap(),
-            r#type: self.__unsafe_private_named.1.unwrap(),
+            data: self._fields.0.unwrap(),
+            r#type: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -961,64 +964,64 @@ pub mod online_venue_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Id;
         type Type;
         type Name;
+        type Id;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Id = Unset;
         type Type = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `id` field to Set
-    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetId<S> {}
-    impl<S: State> State for SetId<S> {
-        type Id = Set<members::id>;
-        type Type = S::Type;
-        type Name = S::Name;
+        type Id = Unset;
     }
     ///State transition - sets the `type` field to Set
     pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetType<S> {}
     impl<S: State> State for SetType<S> {
-        type Id = S::Id;
         type Type = Set<members::r#type>;
         type Name = S::Name;
+        type Id = S::Id;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Id = S::Id;
         type Type = S::Type;
         type Name = Set<members::name>;
+        type Id = S::Id;
+    }
+    ///State transition - sets the `id` field to Set
+    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetId<S> {}
+    impl<S: State> State for SetId<S> {
+        type Type = S::Type;
+        type Name = S::Name;
+        type Id = Set<members::id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `id` field
-        pub struct id(());
         ///Marker type for the `type` field
         pub struct r#type(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `id` field
+        pub struct id(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct OnlineVenueBuilder<'a, S: online_venue_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Data<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> OnlineVenue<'a> {
@@ -1032,9 +1035,9 @@ impl<'a> OnlineVenueBuilder<'a, online_venue_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OnlineVenueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1049,11 +1052,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> OnlineVenueBuilder<'a, online_venue_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         OnlineVenueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1068,11 +1071,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> OnlineVenueBuilder<'a, online_venue_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         OnlineVenueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1087,11 +1090,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> OnlineVenueBuilder<'a, online_venue_state::SetType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         OnlineVenueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1099,12 +1102,12 @@ where
 impl<'a, S: online_venue_state::State> OnlineVenueBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1112,17 +1115,17 @@ impl<'a, S: online_venue_state::State> OnlineVenueBuilder<'a, S> {
 impl<'a, S> OnlineVenueBuilder<'a, S>
 where
     S: online_venue_state::State,
-    S::Id: online_venue_state::IsSet,
     S::Type: online_venue_state::IsSet,
     S::Name: online_venue_state::IsSet,
+    S::Id: online_venue_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> OnlineVenue<'a> {
         OnlineVenue {
-            id: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
-            url: self.__unsafe_private_named.3,
+            id: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
+            url: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -1132,10 +1135,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> OnlineVenue<'a> {
         OnlineVenue {
-            id: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
-            url: self.__unsafe_private_named.3,
+            id: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
+            url: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -1152,64 +1155,64 @@ pub mod physical_venue_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Id;
-        type Name;
         type Type;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Id = Unset;
-        type Name = Unset;
         type Type = Unset;
+        type Name = Unset;
     }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetId<S> {}
     impl<S: State> State for SetId<S> {
         type Id = Set<members::id>;
-        type Name = S::Name;
-        type Type = S::Type;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Id = S::Id;
-        type Name = Set<members::name>;
         type Type = S::Type;
+        type Name = S::Name;
     }
     ///State transition - sets the `type` field to Set
     pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetType<S> {}
     impl<S: State> State for SetType<S> {
         type Id = S::Id;
-        type Name = S::Name;
         type Type = Set<members::r#type>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Id = S::Id;
+        type Type = S::Type;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `id` field
         pub struct id(());
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `type` field
         pub struct r#type(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PhysicalVenueBuilder<'a, S: physical_venue_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Data<'a>>,
         Option<Data<'a>>,
         Option<CowStr<'a>>,
         Option<Data<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PhysicalVenue<'a> {
@@ -1223,9 +1226,9 @@ impl<'a> PhysicalVenueBuilder<'a, physical_venue_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PhysicalVenueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1233,12 +1236,12 @@ impl<'a> PhysicalVenueBuilder<'a, physical_venue_state::Empty> {
 impl<'a, S: physical_venue_state::State> PhysicalVenueBuilder<'a, S> {
     /// Set the `address` field (optional)
     pub fn address(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `address` field to an Option value (optional)
     pub fn maybe_address(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1246,12 +1249,12 @@ impl<'a, S: physical_venue_state::State> PhysicalVenueBuilder<'a, S> {
 impl<'a, S: physical_venue_state::State> PhysicalVenueBuilder<'a, S> {
     /// Set the `coordinates` field (optional)
     pub fn coordinates(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `coordinates` field to an Option value (optional)
     pub fn maybe_coordinates(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1266,11 +1269,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PhysicalVenueBuilder<'a, physical_venue_state::SetId<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PhysicalVenueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1285,11 +1288,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> PhysicalVenueBuilder<'a, physical_venue_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PhysicalVenueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1304,11 +1307,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PhysicalVenueBuilder<'a, physical_venue_state::SetType<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PhysicalVenueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1317,17 +1320,17 @@ impl<'a, S> PhysicalVenueBuilder<'a, S>
 where
     S: physical_venue_state::State,
     S::Id: physical_venue_state::IsSet,
-    S::Name: physical_venue_state::IsSet,
     S::Type: physical_venue_state::IsSet,
+    S::Name: physical_venue_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PhysicalVenue<'a> {
         PhysicalVenue {
-            address: self.__unsafe_private_named.0,
-            coordinates: self.__unsafe_private_named.1,
-            id: self.__unsafe_private_named.2.unwrap(),
-            name: self.__unsafe_private_named.3.unwrap(),
-            r#type: self.__unsafe_private_named.4.unwrap(),
+            address: self._fields.0,
+            coordinates: self._fields.1,
+            id: self._fields.2.unwrap(),
+            name: self._fields.3.unwrap(),
+            r#type: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1337,11 +1340,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> PhysicalVenue<'a> {
         PhysicalVenue {
-            address: self.__unsafe_private_named.0,
-            coordinates: self.__unsafe_private_named.1,
-            id: self.__unsafe_private_named.2.unwrap(),
-            name: self.__unsafe_private_named.3.unwrap(),
-            r#type: self.__unsafe_private_named.4.unwrap(),
+            address: self._fields.0,
+            coordinates: self._fields.1,
+            id: self._fields.2.unwrap(),
+            name: self._fields.3.unwrap(),
+            r#type: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1357,59 +1360,59 @@ pub mod unknown_venue_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Id;
         type Type;
         type Name;
+        type Id;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Id = Unset;
         type Type = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `id` field to Set
-    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetId<S> {}
-    impl<S: State> State for SetId<S> {
-        type Id = Set<members::id>;
-        type Type = S::Type;
-        type Name = S::Name;
+        type Id = Unset;
     }
     ///State transition - sets the `type` field to Set
     pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetType<S> {}
     impl<S: State> State for SetType<S> {
-        type Id = S::Id;
         type Type = Set<members::r#type>;
         type Name = S::Name;
+        type Id = S::Id;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Id = S::Id;
         type Type = S::Type;
         type Name = Set<members::name>;
+        type Id = S::Id;
+    }
+    ///State transition - sets the `id` field to Set
+    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetId<S> {}
+    impl<S: State> State for SetId<S> {
+        type Type = S::Type;
+        type Name = S::Name;
+        type Id = Set<members::id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `id` field
-        pub struct id(());
         ///Marker type for the `type` field
         pub struct r#type(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `id` field
+        pub struct id(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct UnknownVenueBuilder<'a, S: unknown_venue_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Data<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Data<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UnknownVenue<'a> {
@@ -1423,9 +1426,9 @@ impl<'a> UnknownVenueBuilder<'a, unknown_venue_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UnknownVenueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1440,11 +1443,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> UnknownVenueBuilder<'a, unknown_venue_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UnknownVenueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1459,11 +1462,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> UnknownVenueBuilder<'a, unknown_venue_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UnknownVenueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1478,11 +1481,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> UnknownVenueBuilder<'a, unknown_venue_state::SetType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         UnknownVenueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1490,16 +1493,16 @@ where
 impl<'a, S> UnknownVenueBuilder<'a, S>
 where
     S: unknown_venue_state::State,
-    S::Id: unknown_venue_state::IsSet,
     S::Type: unknown_venue_state::IsSet,
     S::Name: unknown_venue_state::IsSet,
+    S::Id: unknown_venue_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> UnknownVenue<'a> {
         UnknownVenue {
-            id: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
+            id: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1509,9 +1512,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> UnknownVenue<'a> {
         UnknownVenue {
-            id: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
+            id: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1527,44 +1530,44 @@ pub mod event_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type V;
         type Name;
+        type V;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type V = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `v` field to Set
-    pub struct SetV<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetV<S> {}
-    impl<S: State> State for SetV<S> {
-        type V = Set<members::v>;
-        type Name = S::Name;
+        type V = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type V = S::V;
         type Name = Set<members::name>;
+        type V = S::V;
+    }
+    ///State transition - sets the `v` field to Set
+    pub struct SetV<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetV<S> {}
+    impl<S: State> State for SetV<S> {
+        type Name = S::Name;
+        type V = Set<members::v>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `v` field
-        pub struct v(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `v` field
+        pub struct v(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EventBuilder<'a, S: event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<Data<'a>>>,
         Option<Vec<Data<'a>>>,
         Option<Data<'a>>,
@@ -1573,7 +1576,7 @@ pub struct EventBuilder<'a, S: event_state::State> {
         Option<i64>,
         Option<Vec<EventVenuesItem<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Event<'a> {
@@ -1587,9 +1590,9 @@ impl<'a> EventBuilder<'a, event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1597,12 +1600,12 @@ impl<'a> EventBuilder<'a, event_state::Empty> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `components` field (optional)
     pub fn components(mut self, value: impl Into<Option<Vec<Data<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `components` field to an Option value (optional)
     pub fn maybe_components(mut self, value: Option<Vec<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1610,12 +1613,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `instances` field (optional)
     pub fn instances(mut self, value: impl Into<Option<Vec<Data<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `instances` field to an Option value (optional)
     pub fn maybe_instances(mut self, value: Option<Vec<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1623,12 +1626,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `label` field (optional)
     pub fn label(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `label` field to an Option value (optional)
     pub fn maybe_label(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1643,11 +1646,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> EventBuilder<'a, event_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1655,12 +1658,12 @@ where
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1672,11 +1675,11 @@ where
 {
     /// Set the `v` field (required)
     pub fn v(mut self, value: impl Into<i64>) -> EventBuilder<'a, event_state::SetV<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1684,12 +1687,12 @@ where
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `venues` field (optional)
     pub fn venues(mut self, value: impl Into<Option<Vec<EventVenuesItem<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `venues` field to an Option value (optional)
     pub fn maybe_venues(mut self, value: Option<Vec<EventVenuesItem<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1697,19 +1700,19 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S> EventBuilder<'a, S>
 where
     S: event_state::State,
-    S::V: event_state::IsSet,
     S::Name: event_state::IsSet,
+    S::V: event_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Event<'a> {
         Event {
-            components: self.__unsafe_private_named.0,
-            instances: self.__unsafe_private_named.1,
-            label: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            status: self.__unsafe_private_named.4,
-            v: self.__unsafe_private_named.5.unwrap(),
-            venues: self.__unsafe_private_named.6,
+            components: self._fields.0,
+            instances: self._fields.1,
+            label: self._fields.2,
+            name: self._fields.3.unwrap(),
+            status: self._fields.4,
+            v: self._fields.5.unwrap(),
+            venues: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -1719,13 +1722,13 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Event<'a> {
         Event {
-            components: self.__unsafe_private_named.0,
-            instances: self.__unsafe_private_named.1,
-            label: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            status: self.__unsafe_private_named.4,
-            v: self.__unsafe_private_named.5.unwrap(),
-            venues: self.__unsafe_private_named.6,
+            components: self._fields.0,
+            instances: self._fields.1,
+            label: self._fields.2,
+            name: self._fields.3.unwrap(),
+            status: self._fields.4,
+            v: self._fields.5.unwrap(),
+            venues: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/diy_razorgirl/winter/fact.rs b/crates/jacquard-api/src/diy_razorgirl/winter/fact.rs
index 89d81c5e..3a29d921 100644
--- a/crates/jacquard-api/src/diy_razorgirl/winter/fact.rs
+++ b/crates/jacquard-api/src/diy_razorgirl/winter/fact.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -158,58 +161,58 @@ pub mod fact_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Args;
         type CreatedAt;
         type Predicate;
+        type Args;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Args = Unset;
         type CreatedAt = Unset;
         type Predicate = Unset;
-    }
-    ///State transition - sets the `args` field to Set
-    pub struct SetArgs<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetArgs<S> {}
-    impl<S: State> State for SetArgs<S> {
-        type Args = Set<members::args>;
-        type CreatedAt = S::CreatedAt;
-        type Predicate = S::Predicate;
+        type Args = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Args = S::Args;
         type CreatedAt = Set<members::created_at>;
         type Predicate = S::Predicate;
+        type Args = S::Args;
     }
     ///State transition - sets the `predicate` field to Set
     pub struct SetPredicate<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPredicate<S> {}
     impl<S: State> State for SetPredicate<S> {
-        type Args = S::Args;
         type CreatedAt = S::CreatedAt;
         type Predicate = Set<members::predicate>;
+        type Args = S::Args;
+    }
+    ///State transition - sets the `args` field to Set
+    pub struct SetArgs<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetArgs<S> {}
+    impl<S: State> State for SetArgs<S> {
+        type CreatedAt = S::CreatedAt;
+        type Predicate = S::Predicate;
+        type Args = Set<members::args>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `args` field
-        pub struct args(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `predicate` field
         pub struct predicate(());
+        ///Marker type for the `args` field
+        pub struct args(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FactBuilder<'a, S: fact_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -219,7 +222,7 @@ pub struct FactBuilder<'a, S: fact_state::State> {
         Option<CowStr<'a>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Fact<'a> {
@@ -233,9 +236,9 @@ impl<'a> FactBuilder<'a, fact_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FactBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -250,11 +253,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> FactBuilder<'a, fact_state::SetArgs<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FactBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -262,12 +265,12 @@ where
 impl<'a, S: fact_state::State> FactBuilder<'a, S> {
     /// Set the `confidence` field (optional)
     pub fn confidence(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `confidence` field to an Option value (optional)
     pub fn maybe_confidence(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -282,11 +285,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FactBuilder<'a, fact_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         FactBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -294,12 +297,12 @@ where
 impl<'a, S: fact_state::State> FactBuilder<'a, S> {
     /// Set the `expiresAt` field (optional)
     pub fn expires_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `expiresAt` field to an Option value (optional)
     pub fn maybe_expires_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -314,11 +317,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> FactBuilder<'a, fact_state::SetPredicate<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         FactBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -326,12 +329,12 @@ where
 impl<'a, S: fact_state::State> FactBuilder<'a, S> {
     /// Set the `source` field (optional)
     pub fn source(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `source` field to an Option value (optional)
     pub fn maybe_source(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -339,12 +342,12 @@ impl<'a, S: fact_state::State> FactBuilder<'a, S> {
 impl<'a, S: fact_state::State> FactBuilder<'a, S> {
     /// Set the `supersedes` field (optional)
     pub fn supersedes(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `supersedes` field to an Option value (optional)
     pub fn maybe_supersedes(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -352,12 +355,12 @@ impl<'a, S: fact_state::State> FactBuilder<'a, S> {
 impl<'a, S: fact_state::State> FactBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -365,21 +368,21 @@ impl<'a, S: fact_state::State> FactBuilder<'a, S> {
 impl<'a, S> FactBuilder<'a, S>
 where
     S: fact_state::State,
-    S::Args: fact_state::IsSet,
     S::CreatedAt: fact_state::IsSet,
     S::Predicate: fact_state::IsSet,
+    S::Args: fact_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Fact<'a> {
         Fact {
-            args: self.__unsafe_private_named.0.unwrap(),
-            confidence: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            expires_at: self.__unsafe_private_named.3,
-            predicate: self.__unsafe_private_named.4.unwrap(),
-            source: self.__unsafe_private_named.5,
-            supersedes: self.__unsafe_private_named.6,
-            tags: self.__unsafe_private_named.7,
+            args: self._fields.0.unwrap(),
+            confidence: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            expires_at: self._fields.3,
+            predicate: self._fields.4.unwrap(),
+            source: self._fields.5,
+            supersedes: self._fields.6,
+            tags: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -392,14 +395,14 @@ where
         >,
     ) -> Fact<'a> {
         Fact {
-            args: self.__unsafe_private_named.0.unwrap(),
-            confidence: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            expires_at: self.__unsafe_private_named.3,
-            predicate: self.__unsafe_private_named.4.unwrap(),
-            source: self.__unsafe_private_named.5,
-            supersedes: self.__unsafe_private_named.6,
-            tags: self.__unsafe_private_named.7,
+            args: self._fields.0.unwrap(),
+            confidence: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            expires_at: self._fields.3,
+            predicate: self._fields.4.unwrap(),
+            source: self._fields.5,
+            supersedes: self._fields.6,
+            tags: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/diy_razorgirl/winter/job.rs b/crates/jacquard-api/src/diy_razorgirl/winter/job.rs
index 0230155e..e4fa2e21 100644
--- a/crates/jacquard-api/src/diy_razorgirl/winter/job.rs
+++ b/crates/jacquard-api/src/diy_razorgirl/winter/job.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -306,45 +309,45 @@ pub mod interval_schedule_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Type;
         type Seconds;
+        type Type;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Type = Unset;
         type Seconds = Unset;
-    }
-    ///State transition - sets the `type` field to Set
-    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetType<S> {}
-    impl<S: State> State for SetType<S> {
-        type Type = Set<members::r#type>;
-        type Seconds = S::Seconds;
+        type Type = Unset;
     }
     ///State transition - sets the `seconds` field to Set
     pub struct SetSeconds<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSeconds<S> {}
     impl<S: State> State for SetSeconds<S> {
-        type Type = S::Type;
         type Seconds = Set<members::seconds>;
+        type Type = S::Type;
+    }
+    ///State transition - sets the `type` field to Set
+    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetType<S> {}
+    impl<S: State> State for SetType<S> {
+        type Seconds = S::Seconds;
+        type Type = Set<members::r#type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `type` field
-        pub struct r#type(());
         ///Marker type for the `seconds` field
         pub struct seconds(());
+        ///Marker type for the `type` field
+        pub struct r#type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct IntervalScheduleBuilder<'a, S: interval_schedule_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> IntervalSchedule<'a> {
@@ -358,9 +361,9 @@ impl<'a> IntervalScheduleBuilder<'a, interval_schedule_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IntervalScheduleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -375,11 +378,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> IntervalScheduleBuilder<'a, interval_schedule_state::SetSeconds<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         IntervalScheduleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -394,11 +397,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> IntervalScheduleBuilder<'a, interval_schedule_state::SetType<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         IntervalScheduleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -406,14 +409,14 @@ where
 impl<'a, S> IntervalScheduleBuilder<'a, S>
 where
     S: interval_schedule_state::State,
-    S::Type: interval_schedule_state::IsSet,
     S::Seconds: interval_schedule_state::IsSet,
+    S::Type: interval_schedule_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> IntervalSchedule<'a> {
         IntervalSchedule {
-            seconds: self.__unsafe_private_named.0.unwrap(),
-            r#type: self.__unsafe_private_named.1.unwrap(),
+            seconds: self._fields.0.unwrap(),
+            r#type: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -426,8 +429,8 @@ where
         >,
     ) -> IntervalSchedule<'a> {
         IntervalSchedule {
-            seconds: self.__unsafe_private_named.0.unwrap(),
-            r#type: self.__unsafe_private_named.1.unwrap(),
+            seconds: self._fields.0.unwrap(),
+            r#type: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -592,74 +595,74 @@ pub mod job_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
+        type Name;
         type Schedule;
         type Instructions;
-        type Name;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
+        type Name = Unset;
         type Schedule = Unset;
         type Instructions = Unset;
-        type Name = Unset;
+        type CreatedAt = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Name = Set<members::name>;
         type Schedule = S::Schedule;
         type Instructions = S::Instructions;
-        type Name = S::Name;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `schedule` field to Set
     pub struct SetSchedule<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSchedule<S> {}
     impl<S: State> State for SetSchedule<S> {
-        type CreatedAt = S::CreatedAt;
+        type Name = S::Name;
         type Schedule = Set<members::schedule>;
         type Instructions = S::Instructions;
-        type Name = S::Name;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `instructions` field to Set
     pub struct SetInstructions<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetInstructions<S> {}
     impl<S: State> State for SetInstructions<S> {
-        type CreatedAt = S::CreatedAt;
+        type Name = S::Name;
         type Schedule = S::Schedule;
         type Instructions = Set<members::instructions>;
-        type Name = S::Name;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Name = S::Name;
         type Schedule = S::Schedule;
         type Instructions = S::Instructions;
-        type Name = Set<members::name>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
+        ///Marker type for the `name` field
+        pub struct name(());
         ///Marker type for the `schedule` field
         pub struct schedule(());
         ///Marker type for the `instructions` field
         pub struct instructions(());
-        ///Marker type for the `name` field
-        pub struct name(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct JobBuilder<'a, S: job_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<i64>,
         Option<CowStr<'a>>,
@@ -669,7 +672,7 @@ pub struct JobBuilder<'a, S: job_state::State> {
         Option<JobSchedule<'a>>,
         Option<JobStatus<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Job<'a> {
@@ -683,9 +686,9 @@ impl<'a> JobBuilder<'a, job_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         JobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -700,11 +703,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> JobBuilder<'a, job_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         JobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -712,12 +715,12 @@ where
 impl<'a, S: job_state::State> JobBuilder<'a, S> {
     /// Set the `failureCount` field (optional)
     pub fn failure_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `failureCount` field to an Option value (optional)
     pub fn maybe_failure_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -732,11 +735,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> JobBuilder<'a, job_state::SetInstructions<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         JobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -744,12 +747,12 @@ where
 impl<'a, S: job_state::State> JobBuilder<'a, S> {
     /// Set the `lastRun` field (optional)
     pub fn last_run(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `lastRun` field to an Option value (optional)
     pub fn maybe_last_run(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -764,11 +767,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> JobBuilder<'a, job_state::SetName<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         JobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -776,12 +779,12 @@ where
 impl<'a, S: job_state::State> JobBuilder<'a, S> {
     /// Set the `nextRun` field (optional)
     pub fn next_run(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `nextRun` field to an Option value (optional)
     pub fn maybe_next_run(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -796,11 +799,11 @@ where
         mut self,
         value: impl Into<JobSchedule<'a>>,
     ) -> JobBuilder<'a, job_state::SetSchedule<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         JobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -808,12 +811,12 @@ where
 impl<'a, S: job_state::State> JobBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<JobStatus<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<JobStatus<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -821,22 +824,22 @@ impl<'a, S: job_state::State> JobBuilder<'a, S> {
 impl<'a, S> JobBuilder<'a, S>
 where
     S: job_state::State,
-    S::CreatedAt: job_state::IsSet,
+    S::Name: job_state::IsSet,
     S::Schedule: job_state::IsSet,
     S::Instructions: job_state::IsSet,
-    S::Name: job_state::IsSet,
+    S::CreatedAt: job_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Job<'a> {
         Job {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            failure_count: self.__unsafe_private_named.1.or_else(|| Some(0i64)),
-            instructions: self.__unsafe_private_named.2.unwrap(),
-            last_run: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            next_run: self.__unsafe_private_named.5,
-            schedule: self.__unsafe_private_named.6.unwrap(),
-            status: self.__unsafe_private_named.7,
+            created_at: self._fields.0.unwrap(),
+            failure_count: self._fields.1.or_else(|| Some(0i64)),
+            instructions: self._fields.2.unwrap(),
+            last_run: self._fields.3,
+            name: self._fields.4.unwrap(),
+            next_run: self._fields.5,
+            schedule: self._fields.6.unwrap(),
+            status: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -849,14 +852,14 @@ where
         >,
     ) -> Job<'a> {
         Job {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            failure_count: self.__unsafe_private_named.1.or_else(|| Some(0i64)),
-            instructions: self.__unsafe_private_named.2.unwrap(),
-            last_run: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            next_run: self.__unsafe_private_named.5,
-            schedule: self.__unsafe_private_named.6.unwrap(),
-            status: self.__unsafe_private_named.7,
+            created_at: self._fields.0.unwrap(),
+            failure_count: self._fields.1.or_else(|| Some(0i64)),
+            instructions: self._fields.2.unwrap(),
+            last_run: self._fields.3,
+            name: self._fields.4.unwrap(),
+            next_run: self._fields.5,
+            schedule: self._fields.6.unwrap(),
+            status: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
@@ -872,45 +875,45 @@ pub mod once_schedule_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Type;
         type RunAt;
+        type Type;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Type = Unset;
         type RunAt = Unset;
-    }
-    ///State transition - sets the `type` field to Set
-    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetType<S> {}
-    impl<S: State> State for SetType<S> {
-        type Type = Set<members::r#type>;
-        type RunAt = S::RunAt;
+        type Type = Unset;
     }
     ///State transition - sets the `run_at` field to Set
     pub struct SetRunAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRunAt<S> {}
     impl<S: State> State for SetRunAt<S> {
-        type Type = S::Type;
         type RunAt = Set<members::run_at>;
+        type Type = S::Type;
+    }
+    ///State transition - sets the `type` field to Set
+    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetType<S> {}
+    impl<S: State> State for SetType<S> {
+        type RunAt = S::RunAt;
+        type Type = Set<members::r#type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `type` field
-        pub struct r#type(());
         ///Marker type for the `run_at` field
         pub struct run_at(());
+        ///Marker type for the `type` field
+        pub struct r#type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct OnceScheduleBuilder<'a, S: once_schedule_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> OnceSchedule<'a> {
@@ -924,9 +927,9 @@ impl<'a> OnceScheduleBuilder<'a, once_schedule_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OnceScheduleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -941,11 +944,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> OnceScheduleBuilder<'a, once_schedule_state::SetRunAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         OnceScheduleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -960,11 +963,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> OnceScheduleBuilder<'a, once_schedule_state::SetType<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         OnceScheduleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -972,14 +975,14 @@ where
 impl<'a, S> OnceScheduleBuilder<'a, S>
 where
     S: once_schedule_state::State,
-    S::Type: once_schedule_state::IsSet,
     S::RunAt: once_schedule_state::IsSet,
+    S::Type: once_schedule_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> OnceSchedule<'a> {
         OnceSchedule {
-            run_at: self.__unsafe_private_named.0.unwrap(),
-            r#type: self.__unsafe_private_named.1.unwrap(),
+            run_at: self._fields.0.unwrap(),
+            r#type: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -992,8 +995,8 @@ where
         >,
     ) -> OnceSchedule<'a> {
         OnceSchedule {
-            run_at: self.__unsafe_private_named.0.unwrap(),
-            r#type: self.__unsafe_private_named.1.unwrap(),
+            run_at: self._fields.0.unwrap(),
+            r#type: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/diy_razorgirl/winter/note.rs b/crates/jacquard-api/src/diy_razorgirl/winter/note.rs
index 65ed4350..0909ddae 100644
--- a/crates/jacquard-api/src/diy_razorgirl/winter/note.rs
+++ b/crates/jacquard-api/src/diy_razorgirl/winter/note.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -162,74 +165,74 @@ pub mod note_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Title;
+        type CreatedAt;
         type Content;
+        type Title;
         type LastUpdated;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Title = Unset;
+        type CreatedAt = Unset;
         type Content = Unset;
+        type Title = Unset;
         type LastUpdated = Unset;
-        type CreatedAt = Unset;
     }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Title = Set<members::title>;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
         type Content = S::Content;
+        type Title = S::Title;
         type LastUpdated = S::LastUpdated;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `content` field to Set
     pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContent<S> {}
     impl<S: State> State for SetContent<S> {
-        type Title = S::Title;
+        type CreatedAt = S::CreatedAt;
         type Content = Set<members::content>;
+        type Title = S::Title;
         type LastUpdated = S::LastUpdated;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
         type CreatedAt = S::CreatedAt;
+        type Content = S::Content;
+        type Title = Set<members::title>;
+        type LastUpdated = S::LastUpdated;
     }
     ///State transition - sets the `last_updated` field to Set
     pub struct SetLastUpdated<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLastUpdated<S> {}
     impl<S: State> State for SetLastUpdated<S> {
-        type Title = S::Title;
-        type Content = S::Content;
-        type LastUpdated = Set<members::last_updated>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type Title = S::Title;
         type Content = S::Content;
-        type LastUpdated = S::LastUpdated;
-        type CreatedAt = Set<members::created_at>;
+        type Title = S::Title;
+        type LastUpdated = Set<members::last_updated>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `title` field
-        pub struct title(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `content` field
         pub struct content(());
+        ///Marker type for the `title` field
+        pub struct title(());
         ///Marker type for the `last_updated` field
         pub struct last_updated(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct NoteBuilder<'a, S: note_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -238,7 +241,7 @@ pub struct NoteBuilder<'a, S: note_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Note<'a> {
@@ -252,9 +255,9 @@ impl<'a> NoteBuilder<'a, note_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -262,12 +265,12 @@ impl<'a> NoteBuilder<'a, note_state::Empty> {
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -282,11 +285,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> NoteBuilder<'a, note_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -301,11 +304,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> NoteBuilder<'a, note_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -320,11 +323,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> NoteBuilder<'a, note_state::SetLastUpdated<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -332,12 +335,12 @@ where
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `relatedFacts` field (optional)
     pub fn related_facts(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `relatedFacts` field to an Option value (optional)
     pub fn maybe_related_facts(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -345,12 +348,12 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -365,11 +368,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> NoteBuilder<'a, note_state::SetTitle<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -377,21 +380,21 @@ where
 impl<'a, S> NoteBuilder<'a, S>
 where
     S: note_state::State,
-    S::Title: note_state::IsSet,
+    S::CreatedAt: note_state::IsSet,
     S::Content: note_state::IsSet,
+    S::Title: note_state::IsSet,
     S::LastUpdated: note_state::IsSet,
-    S::CreatedAt: note_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Note<'a> {
         Note {
-            category: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            last_updated: self.__unsafe_private_named.3.unwrap(),
-            related_facts: self.__unsafe_private_named.4,
-            tags: self.__unsafe_private_named.5,
-            title: self.__unsafe_private_named.6.unwrap(),
+            category: self._fields.0,
+            content: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            last_updated: self._fields.3.unwrap(),
+            related_facts: self._fields.4,
+            tags: self._fields.5,
+            title: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -404,13 +407,13 @@ where
         >,
     ) -> Note<'a> {
         Note {
-            category: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            last_updated: self.__unsafe_private_named.3.unwrap(),
-            related_facts: self.__unsafe_private_named.4,
-            tags: self.__unsafe_private_named.5,
-            title: self.__unsafe_private_named.6.unwrap(),
+            category: self._fields.0,
+            content: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            last_updated: self._fields.3.unwrap(),
+            related_facts: self._fields.4,
+            tags: self._fields.5,
+            title: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/diy_razorgirl/winter/thought.rs b/crates/jacquard-api/src/diy_razorgirl/winter/thought.rs
index cfa90732..f6029362 100644
--- a/crates/jacquard-api/src/diy_razorgirl/winter/thought.rs
+++ b/crates/jacquard-api/src/diy_razorgirl/winter/thought.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -304,8 +307,8 @@ pub mod thought_state {
 
 /// Builder for constructing an instance of this type
 pub struct ThoughtBuilder<'a, S: thought_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<i64>,
@@ -313,7 +316,7 @@ pub struct ThoughtBuilder<'a, S: thought_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Thought<'a> {
@@ -327,9 +330,9 @@ impl<'a> ThoughtBuilder<'a, thought_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ThoughtBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -344,11 +347,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ThoughtBuilder<'a, thought_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ThoughtBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -363,11 +366,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ThoughtBuilder<'a, thought_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ThoughtBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -375,12 +378,12 @@ where
 impl<'a, S: thought_state::State> ThoughtBuilder<'a, S> {
     /// Set the `durationMs` field (optional)
     pub fn duration_ms(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `durationMs` field to an Option value (optional)
     pub fn maybe_duration_ms(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -395,11 +398,11 @@ where
         mut self,
         value: impl Into<ThoughtKind<'a>>,
     ) -> ThoughtBuilder<'a, thought_state::SetKind<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ThoughtBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -407,12 +410,12 @@ where
 impl<'a, S: thought_state::State> ThoughtBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -420,12 +423,12 @@ impl<'a, S: thought_state::State> ThoughtBuilder<'a, S> {
 impl<'a, S: thought_state::State> ThoughtBuilder<'a, S> {
     /// Set the `trigger` field (optional)
     pub fn trigger(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `trigger` field to an Option value (optional)
     pub fn maybe_trigger(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -440,12 +443,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Thought<'a> {
         Thought {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            duration_ms: self.__unsafe_private_named.2,
-            kind: self.__unsafe_private_named.3.unwrap(),
-            tags: self.__unsafe_private_named.4,
-            trigger: self.__unsafe_private_named.5,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            duration_ms: self._fields.2,
+            kind: self._fields.3.unwrap(),
+            tags: self._fields.4,
+            trigger: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -458,12 +461,12 @@ where
         >,
     ) -> Thought<'a> {
         Thought {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            duration_ms: self.__unsafe_private_named.2,
-            kind: self.__unsafe_private_named.3.unwrap(),
-            tags: self.__unsafe_private_named.4,
-            trigger: self.__unsafe_private_named.5,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            duration_ms: self._fields.2,
+            kind: self._fields.3.unwrap(),
+            tags: self._fields.4,
+            trigger: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/diy_razorgirl/winter/tool.rs b/crates/jacquard-api/src/diy_razorgirl/winter/tool.rs
index e9a5e326..17e45a0b 100644
--- a/crates/jacquard-api/src/diy_razorgirl/winter/tool.rs
+++ b/crates/jacquard-api/src/diy_razorgirl/winter/tool.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -167,92 +170,92 @@ pub mod tool_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type Description;
-        type InputSchema;
         type CreatedAt;
         type Code;
+        type Name;
+        type InputSchema;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type Description = Unset;
-        type InputSchema = Unset;
         type CreatedAt = Unset;
         type Code = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Description = S::Description;
-        type InputSchema = S::InputSchema;
-        type CreatedAt = S::CreatedAt;
-        type Code = S::Code;
+        type Name = Unset;
+        type InputSchema = Unset;
     }
     ///State transition - sets the `description` field to Set
     pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDescription<S> {}
     impl<S: State> State for SetDescription<S> {
-        type Name = S::Name;
         type Description = Set<members::description>;
-        type InputSchema = S::InputSchema;
         type CreatedAt = S::CreatedAt;
         type Code = S::Code;
-    }
-    ///State transition - sets the `input_schema` field to Set
-    pub struct SetInputSchema<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetInputSchema<S> {}
-    impl<S: State> State for SetInputSchema<S> {
         type Name = S::Name;
-        type Description = S::Description;
-        type InputSchema = Set<members::input_schema>;
-        type CreatedAt = S::CreatedAt;
-        type Code = S::Code;
+        type InputSchema = S::InputSchema;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Name = S::Name;
         type Description = S::Description;
-        type InputSchema = S::InputSchema;
         type CreatedAt = Set<members::created_at>;
         type Code = S::Code;
+        type Name = S::Name;
+        type InputSchema = S::InputSchema;
     }
     ///State transition - sets the `code` field to Set
     pub struct SetCode<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCode<S> {}
     impl<S: State> State for SetCode<S> {
+        type Description = S::Description;
+        type CreatedAt = S::CreatedAt;
+        type Code = Set<members::code>;
         type Name = S::Name;
+        type InputSchema = S::InputSchema;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
         type Description = S::Description;
+        type CreatedAt = S::CreatedAt;
+        type Code = S::Code;
+        type Name = Set<members::name>;
         type InputSchema = S::InputSchema;
+    }
+    ///State transition - sets the `input_schema` field to Set
+    pub struct SetInputSchema<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetInputSchema<S> {}
+    impl<S: State> State for SetInputSchema<S> {
+        type Description = S::Description;
         type CreatedAt = S::CreatedAt;
-        type Code = Set<members::code>;
+        type Code = S::Code;
+        type Name = S::Name;
+        type InputSchema = Set<members::input_schema>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `description` field
         pub struct description(());
-        ///Marker type for the `input_schema` field
-        pub struct input_schema(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `code` field
         pub struct code(());
+        ///Marker type for the `name` field
+        pub struct name(());
+        ///Marker type for the `input_schema` field
+        pub struct input_schema(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ToolBuilder<'a, S: tool_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -266,7 +269,7 @@ pub struct ToolBuilder<'a, S: tool_state::State> {
         Option<bool>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Tool<'a> {
@@ -280,8 +283,8 @@ impl<'a> ToolBuilder<'a, tool_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ToolBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -295,7 +298,7 @@ impl<'a> ToolBuilder<'a, tool_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -310,11 +313,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ToolBuilder<'a, tool_state::SetCode<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ToolBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -329,11 +332,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ToolBuilder<'a, tool_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ToolBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -348,11 +351,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ToolBuilder<'a, tool_state::SetDescription<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ToolBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -367,11 +370,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> ToolBuilder<'a, tool_state::SetInputSchema<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ToolBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -379,12 +382,12 @@ where
 impl<'a, S: tool_state::State> ToolBuilder<'a, S> {
     /// Set the `lastUpdated` field (optional)
     pub fn last_updated(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `lastUpdated` field to an Option value (optional)
     pub fn maybe_last_updated(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -399,11 +402,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ToolBuilder<'a, tool_state::SetName<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ToolBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -414,12 +417,12 @@ impl<'a, S: tool_state::State> ToolBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<CowStr<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `requiredCommands` field to an Option value (optional)
     pub fn maybe_required_commands(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -430,12 +433,12 @@ impl<'a, S: tool_state::State> ToolBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<CowStr<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `requiredSecrets` field to an Option value (optional)
     pub fn maybe_required_secrets(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -443,12 +446,12 @@ impl<'a, S: tool_state::State> ToolBuilder<'a, S> {
 impl<'a, S: tool_state::State> ToolBuilder<'a, S> {
     /// Set the `requiredTools` field (optional)
     pub fn required_tools(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `requiredTools` field to an Option value (optional)
     pub fn maybe_required_tools(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -456,12 +459,12 @@ impl<'a, S: tool_state::State> ToolBuilder<'a, S> {
 impl<'a, S: tool_state::State> ToolBuilder<'a, S> {
     /// Set the `requiresNetwork` field (optional)
     pub fn requires_network(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `requiresNetwork` field to an Option value (optional)
     pub fn maybe_requires_network(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -469,12 +472,12 @@ impl<'a, S: tool_state::State> ToolBuilder<'a, S> {
 impl<'a, S: tool_state::State> ToolBuilder<'a, S> {
     /// Set the `requiresWorkspace` field (optional)
     pub fn requires_workspace(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `requiresWorkspace` field to an Option value (optional)
     pub fn maybe_requires_workspace(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -482,12 +485,12 @@ impl<'a, S: tool_state::State> ToolBuilder<'a, S> {
 impl<'a, S: tool_state::State> ToolBuilder<'a, S> {
     /// Set the `version` field (optional)
     pub fn version(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `version` field to an Option value (optional)
     pub fn maybe_version(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -495,27 +498,27 @@ impl<'a, S: tool_state::State> ToolBuilder<'a, S> {
 impl<'a, S> ToolBuilder<'a, S>
 where
     S: tool_state::State,
-    S::Name: tool_state::IsSet,
     S::Description: tool_state::IsSet,
-    S::InputSchema: tool_state::IsSet,
     S::CreatedAt: tool_state::IsSet,
     S::Code: tool_state::IsSet,
+    S::Name: tool_state::IsSet,
+    S::InputSchema: tool_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Tool<'a> {
         Tool {
-            code: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2.unwrap(),
-            input_schema: self.__unsafe_private_named.3.unwrap(),
-            last_updated: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            required_commands: self.__unsafe_private_named.6,
-            required_secrets: self.__unsafe_private_named.7,
-            required_tools: self.__unsafe_private_named.8,
-            requires_network: self.__unsafe_private_named.9,
-            requires_workspace: self.__unsafe_private_named.10,
-            version: self.__unsafe_private_named.11,
+            code: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2.unwrap(),
+            input_schema: self._fields.3.unwrap(),
+            last_updated: self._fields.4,
+            name: self._fields.5.unwrap(),
+            required_commands: self._fields.6,
+            required_secrets: self._fields.7,
+            required_tools: self._fields.8,
+            requires_network: self._fields.9,
+            requires_workspace: self._fields.10,
+            version: self._fields.11,
             extra_data: Default::default(),
         }
     }
@@ -525,18 +528,18 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Tool<'a> {
         Tool {
-            code: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2.unwrap(),
-            input_schema: self.__unsafe_private_named.3.unwrap(),
-            last_updated: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            required_commands: self.__unsafe_private_named.6,
-            required_secrets: self.__unsafe_private_named.7,
-            required_tools: self.__unsafe_private_named.8,
-            requires_network: self.__unsafe_private_named.9,
-            requires_workspace: self.__unsafe_private_named.10,
-            version: self.__unsafe_private_named.11,
+            code: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2.unwrap(),
+            input_schema: self._fields.3.unwrap(),
+            last_updated: self._fields.4,
+            name: self._fields.5.unwrap(),
+            required_commands: self._fields.6,
+            required_secrets: self._fields.7,
+            required_tools: self._fields.8,
+            requires_network: self._fields.9,
+            requires_workspace: self._fields.10,
+            version: self._fields.11,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/diy_razorgirl/winter/wiki_entry.rs b/crates/jacquard-api/src/diy_razorgirl/winter/wiki_entry.rs
index a8b82171..03272d7c 100644
--- a/crates/jacquard-api/src/diy_razorgirl/winter/wiki_entry.rs
+++ b/crates/jacquard-api/src/diy_razorgirl/winter/wiki_entry.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -286,92 +289,92 @@ pub mod wiki_entry_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type Content;
         type Title;
-        type Slug;
+        type Content;
         type LastUpdated;
+        type CreatedAt;
+        type Slug;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type Content = Unset;
         type Title = Unset;
-        type Slug = Unset;
+        type Content = Unset;
         type LastUpdated = Unset;
+        type CreatedAt = Unset;
+        type Slug = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type Title = Set<members::title>;
         type Content = S::Content;
-        type Title = S::Title;
-        type Slug = S::Slug;
         type LastUpdated = S::LastUpdated;
+        type CreatedAt = S::CreatedAt;
+        type Slug = S::Slug;
     }
     ///State transition - sets the `content` field to Set
     pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContent<S> {}
     impl<S: State> State for SetContent<S> {
-        type CreatedAt = S::CreatedAt;
-        type Content = Set<members::content>;
         type Title = S::Title;
-        type Slug = S::Slug;
+        type Content = Set<members::content>;
         type LastUpdated = S::LastUpdated;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
         type CreatedAt = S::CreatedAt;
+        type Slug = S::Slug;
+    }
+    ///State transition - sets the `last_updated` field to Set
+    pub struct SetLastUpdated<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLastUpdated<S> {}
+    impl<S: State> State for SetLastUpdated<S> {
+        type Title = S::Title;
         type Content = S::Content;
-        type Title = Set<members::title>;
+        type LastUpdated = Set<members::last_updated>;
+        type CreatedAt = S::CreatedAt;
         type Slug = S::Slug;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Title = S::Title;
+        type Content = S::Content;
         type LastUpdated = S::LastUpdated;
+        type CreatedAt = Set<members::created_at>;
+        type Slug = S::Slug;
     }
     ///State transition - sets the `slug` field to Set
     pub struct SetSlug<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSlug<S> {}
     impl<S: State> State for SetSlug<S> {
-        type CreatedAt = S::CreatedAt;
-        type Content = S::Content;
         type Title = S::Title;
-        type Slug = Set<members::slug>;
+        type Content = S::Content;
         type LastUpdated = S::LastUpdated;
-    }
-    ///State transition - sets the `last_updated` field to Set
-    pub struct SetLastUpdated<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLastUpdated<S> {}
-    impl<S: State> State for SetLastUpdated<S> {
         type CreatedAt = S::CreatedAt;
-        type Content = S::Content;
-        type Title = S::Title;
-        type Slug = S::Slug;
-        type LastUpdated = Set<members::last_updated>;
+        type Slug = Set<members::slug>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `content` field
-        pub struct content(());
         ///Marker type for the `title` field
         pub struct title(());
-        ///Marker type for the `slug` field
-        pub struct slug(());
+        ///Marker type for the `content` field
+        pub struct content(());
         ///Marker type for the `last_updated` field
         pub struct last_updated(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `slug` field
+        pub struct slug(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct WikiEntryBuilder<'a, S: wiki_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -383,7 +386,7 @@ pub struct WikiEntryBuilder<'a, S: wiki_entry_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> WikiEntry<'a> {
@@ -397,20 +400,9 @@ impl<'a> WikiEntryBuilder<'a, wiki_entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WikiEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -418,12 +410,12 @@ impl<'a> WikiEntryBuilder<'a, wiki_entry_state::Empty> {
 impl<'a, S: wiki_entry_state::State> WikiEntryBuilder<'a, S> {
     /// Set the `aliases` field (optional)
     pub fn aliases(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `aliases` field to an Option value (optional)
     pub fn maybe_aliases(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -438,11 +430,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WikiEntryBuilder<'a, wiki_entry_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         WikiEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -457,11 +449,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> WikiEntryBuilder<'a, wiki_entry_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         WikiEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -476,11 +468,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> WikiEntryBuilder<'a, wiki_entry_state::SetLastUpdated<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         WikiEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -495,11 +487,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WikiEntryBuilder<'a, wiki_entry_state::SetSlug<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         WikiEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -507,12 +499,12 @@ where
 impl<'a, S: wiki_entry_state::State> WikiEntryBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<WikiEntryStatus<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<WikiEntryStatus<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -520,12 +512,12 @@ impl<'a, S: wiki_entry_state::State> WikiEntryBuilder<'a, S> {
 impl<'a, S: wiki_entry_state::State> WikiEntryBuilder<'a, S> {
     /// Set the `summary` field (optional)
     pub fn summary(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `summary` field to an Option value (optional)
     pub fn maybe_summary(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -533,12 +525,12 @@ impl<'a, S: wiki_entry_state::State> WikiEntryBuilder<'a, S> {
 impl<'a, S: wiki_entry_state::State> WikiEntryBuilder<'a, S> {
     /// Set the `supersedes` field (optional)
     pub fn supersedes(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `supersedes` field to an Option value (optional)
     pub fn maybe_supersedes(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -546,12 +538,12 @@ impl<'a, S: wiki_entry_state::State> WikiEntryBuilder<'a, S> {
 impl<'a, S: wiki_entry_state::State> WikiEntryBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -566,11 +558,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WikiEntryBuilder<'a, wiki_entry_state::SetTitle<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         WikiEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -578,25 +570,25 @@ where
 impl<'a, S> WikiEntryBuilder<'a, S>
 where
     S: wiki_entry_state::State,
-    S::CreatedAt: wiki_entry_state::IsSet,
-    S::Content: wiki_entry_state::IsSet,
     S::Title: wiki_entry_state::IsSet,
-    S::Slug: wiki_entry_state::IsSet,
+    S::Content: wiki_entry_state::IsSet,
     S::LastUpdated: wiki_entry_state::IsSet,
+    S::CreatedAt: wiki_entry_state::IsSet,
+    S::Slug: wiki_entry_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> WikiEntry<'a> {
         WikiEntry {
-            aliases: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            last_updated: self.__unsafe_private_named.3.unwrap(),
-            slug: self.__unsafe_private_named.4.unwrap(),
-            status: self.__unsafe_private_named.5,
-            summary: self.__unsafe_private_named.6,
-            supersedes: self.__unsafe_private_named.7,
-            tags: self.__unsafe_private_named.8,
-            title: self.__unsafe_private_named.9.unwrap(),
+            aliases: self._fields.0,
+            content: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            last_updated: self._fields.3.unwrap(),
+            slug: self._fields.4.unwrap(),
+            status: self._fields.5,
+            summary: self._fields.6,
+            supersedes: self._fields.7,
+            tags: self._fields.8,
+            title: self._fields.9.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -609,16 +601,16 @@ where
         >,
     ) -> WikiEntry<'a> {
         WikiEntry {
-            aliases: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            last_updated: self.__unsafe_private_named.3.unwrap(),
-            slug: self.__unsafe_private_named.4.unwrap(),
-            status: self.__unsafe_private_named.5,
-            summary: self.__unsafe_private_named.6,
-            supersedes: self.__unsafe_private_named.7,
-            tags: self.__unsafe_private_named.8,
-            title: self.__unsafe_private_named.9.unwrap(),
+            aliases: self._fields.0,
+            content: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            last_updated: self._fields.3.unwrap(),
+            slug: self._fields.4.unwrap(),
+            status: self._fields.5,
+            summary: self._fields.6,
+            supersedes: self._fields.7,
+            tags: self._fields.8,
+            title: self._fields.9.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/diy_razorgirl/winter/wiki_link.rs b/crates/jacquard-api/src/diy_razorgirl/winter/wiki_link.rs
index 1999bd58..fe6e650c 100644
--- a/crates/jacquard-api/src/diy_razorgirl/winter/wiki_link.rs
+++ b/crates/jacquard-api/src/diy_razorgirl/winter/wiki_link.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -257,74 +260,74 @@ pub mod wiki_link_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Target;
         type CreatedAt;
-        type Source;
+        type Target;
         type LinkType;
+        type Source;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Target = Unset;
         type CreatedAt = Unset;
-        type Source = Unset;
+        type Target = Unset;
         type LinkType = Unset;
-    }
-    ///State transition - sets the `target` field to Set
-    pub struct SetTarget<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTarget<S> {}
-    impl<S: State> State for SetTarget<S> {
-        type Target = Set<members::target>;
-        type CreatedAt = S::CreatedAt;
-        type Source = S::Source;
-        type LinkType = S::LinkType;
+        type Source = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Target = S::Target;
         type CreatedAt = Set<members::created_at>;
-        type Source = S::Source;
+        type Target = S::Target;
         type LinkType = S::LinkType;
+        type Source = S::Source;
     }
-    ///State transition - sets the `source` field to Set
-    pub struct SetSource<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSource<S> {}
-    impl<S: State> State for SetSource<S> {
-        type Target = S::Target;
+    ///State transition - sets the `target` field to Set
+    pub struct SetTarget<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTarget<S> {}
+    impl<S: State> State for SetTarget<S> {
         type CreatedAt = S::CreatedAt;
-        type Source = Set<members::source>;
+        type Target = Set<members::target>;
         type LinkType = S::LinkType;
+        type Source = S::Source;
     }
     ///State transition - sets the `link_type` field to Set
     pub struct SetLinkType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLinkType<S> {}
     impl<S: State> State for SetLinkType<S> {
-        type Target = S::Target;
         type CreatedAt = S::CreatedAt;
-        type Source = S::Source;
+        type Target = S::Target;
         type LinkType = Set<members::link_type>;
+        type Source = S::Source;
+    }
+    ///State transition - sets the `source` field to Set
+    pub struct SetSource<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSource<S> {}
+    impl<S: State> State for SetSource<S> {
+        type CreatedAt = S::CreatedAt;
+        type Target = S::Target;
+        type LinkType = S::LinkType;
+        type Source = Set<members::source>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `target` field
-        pub struct target(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `source` field
-        pub struct source(());
+        ///Marker type for the `target` field
+        pub struct target(());
         ///Marker type for the `link_type` field
         pub struct link_type(());
+        ///Marker type for the `source` field
+        pub struct source(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct WikiLinkBuilder<'a, S: wiki_link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<WikiLinkLinkType<'a>>,
@@ -333,7 +336,7 @@ pub struct WikiLinkBuilder<'a, S: wiki_link_state::State> {
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> WikiLink<'a> {
@@ -347,9 +350,9 @@ impl<'a> WikiLinkBuilder<'a, wiki_link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WikiLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -357,12 +360,12 @@ impl<'a> WikiLinkBuilder<'a, wiki_link_state::Empty> {
 impl<'a, S: wiki_link_state::State> WikiLinkBuilder<'a, S> {
     /// Set the `context` field (optional)
     pub fn context(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `context` field to an Option value (optional)
     pub fn maybe_context(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -377,11 +380,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> WikiLinkBuilder<'a, wiki_link_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         WikiLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -396,11 +399,11 @@ where
         mut self,
         value: impl Into<WikiLinkLinkType<'a>>,
     ) -> WikiLinkBuilder<'a, wiki_link_state::SetLinkType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         WikiLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -415,11 +418,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> WikiLinkBuilder<'a, wiki_link_state::SetSource<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         WikiLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -427,12 +430,12 @@ where
 impl<'a, S: wiki_link_state::State> WikiLinkBuilder<'a, S> {
     /// Set the `sourceAnchor` field (optional)
     pub fn source_anchor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `sourceAnchor` field to an Option value (optional)
     pub fn maybe_source_anchor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -447,11 +450,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> WikiLinkBuilder<'a, wiki_link_state::SetTarget<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         WikiLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -459,12 +462,12 @@ where
 impl<'a, S: wiki_link_state::State> WikiLinkBuilder<'a, S> {
     /// Set the `targetAnchor` field (optional)
     pub fn target_anchor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `targetAnchor` field to an Option value (optional)
     pub fn maybe_target_anchor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -472,21 +475,21 @@ impl<'a, S: wiki_link_state::State> WikiLinkBuilder<'a, S> {
 impl<'a, S> WikiLinkBuilder<'a, S>
 where
     S: wiki_link_state::State,
-    S::Target: wiki_link_state::IsSet,
     S::CreatedAt: wiki_link_state::IsSet,
-    S::Source: wiki_link_state::IsSet,
+    S::Target: wiki_link_state::IsSet,
     S::LinkType: wiki_link_state::IsSet,
+    S::Source: wiki_link_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> WikiLink<'a> {
         WikiLink {
-            context: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            link_type: self.__unsafe_private_named.2.unwrap(),
-            source: self.__unsafe_private_named.3.unwrap(),
-            source_anchor: self.__unsafe_private_named.4,
-            target: self.__unsafe_private_named.5.unwrap(),
-            target_anchor: self.__unsafe_private_named.6,
+            context: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            link_type: self._fields.2.unwrap(),
+            source: self._fields.3.unwrap(),
+            source_anchor: self._fields.4,
+            target: self._fields.5.unwrap(),
+            target_anchor: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -499,13 +502,13 @@ where
         >,
     ) -> WikiLink<'a> {
         WikiLink {
-            context: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            link_type: self.__unsafe_private_named.2.unwrap(),
-            source: self.__unsafe_private_named.3.unwrap(),
-            source_anchor: self.__unsafe_private_named.4,
-            target: self.__unsafe_private_named.5.unwrap(),
-            target_anchor: self.__unsafe_private_named.6,
+            context: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            link_type: self._fields.2.unwrap(),
+            source: self._fields.3.unwrap(),
+            source_anchor: self._fields.4,
+            target: self._fields.5.unwrap(),
+            target_anchor: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/download_darkworld/deltarune.rs b/crates/jacquard-api/src/download_darkworld/deltarune.rs
index bd436577..90a98819 100644
--- a/crates/jacquard-api/src/download_darkworld/deltarune.rs
+++ b/crates/jacquard-api/src/download_darkworld/deltarune.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -553,13 +556,9 @@ pub mod deltarune_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeltaruneBuilder<'a, S: deltarune_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<DeltaruneTool<'a>>,
-        Option<DeltaruneWhere<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<DeltaruneTool<'a>>, Option<DeltaruneWhere<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Deltarune<'a> {
@@ -573,9 +572,9 @@ impl<'a> DeltaruneBuilder<'a, deltarune_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeltaruneBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -590,11 +589,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DeltaruneBuilder<'a, deltarune_state::SetTime<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeltaruneBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -602,12 +601,12 @@ where
 impl<'a, S: deltarune_state::State> DeltaruneBuilder<'a, S> {
     /// Set the `tool` field (optional)
     pub fn tool(mut self, value: impl Into<Option<DeltaruneTool<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `tool` field to an Option value (optional)
     pub fn maybe_tool(mut self, value: Option<DeltaruneTool<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -615,12 +614,12 @@ impl<'a, S: deltarune_state::State> DeltaruneBuilder<'a, S> {
 impl<'a, S: deltarune_state::State> DeltaruneBuilder<'a, S> {
     /// Set the `where` field (optional)
     pub fn r#where(mut self, value: impl Into<Option<DeltaruneWhere<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `where` field to an Option value (optional)
     pub fn maybe_where(mut self, value: Option<DeltaruneWhere<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -633,9 +632,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Deltarune<'a> {
         Deltarune {
-            time: self.__unsafe_private_named.0.unwrap(),
-            tool: self.__unsafe_private_named.1,
-            r#where: self.__unsafe_private_named.2,
+            time: self._fields.0.unwrap(),
+            tool: self._fields.1,
+            r#where: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -648,9 +647,9 @@ where
         >,
     ) -> Deltarune<'a> {
         Deltarune {
-            time: self.__unsafe_private_named.0.unwrap(),
-            tool: self.__unsafe_private_named.1,
-            r#where: self.__unsafe_private_named.2,
+            time: self._fields.0.unwrap(),
+            tool: self._fields.1,
+            r#where: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/download_darkworld/site/get_state.rs b/crates/jacquard-api/src/download_darkworld/site/get_state.rs
index 003a9985..814a722e 100644
--- a/crates/jacquard-api/src/download_darkworld/site/get_state.rs
+++ b/crates/jacquard-api/src/download_darkworld/site/get_state.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -207,112 +210,112 @@ pub mod output_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type FavoriteDeltaruneCharacters;
-        type FavoriteAlbums;
-        type UseSusieProphecy;
-        type FavoriteGames;
         type TitleColors;
         type FavoriteArtists;
+        type FavoriteAlbums;
+        type FavoriteGames;
+        type FavoriteDeltaruneCharacters;
+        type UseSusieProphecy;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type FavoriteDeltaruneCharacters = Unset;
-        type FavoriteAlbums = Unset;
-        type UseSusieProphecy = Unset;
-        type FavoriteGames = Unset;
         type TitleColors = Unset;
         type FavoriteArtists = Unset;
+        type FavoriteAlbums = Unset;
+        type FavoriteGames = Unset;
+        type FavoriteDeltaruneCharacters = Unset;
+        type UseSusieProphecy = Unset;
     }
-    ///State transition - sets the `favorite_deltarune_characters` field to Set
-    pub struct SetFavoriteDeltaruneCharacters<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetFavoriteDeltaruneCharacters<S> {}
-    impl<S: State> State for SetFavoriteDeltaruneCharacters<S> {
-        type FavoriteDeltaruneCharacters = Set<members::favorite_deltarune_characters>;
+    ///State transition - sets the `title_colors` field to Set
+    pub struct SetTitleColors<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitleColors<S> {}
+    impl<S: State> State for SetTitleColors<S> {
+        type TitleColors = Set<members::title_colors>;
+        type FavoriteArtists = S::FavoriteArtists;
         type FavoriteAlbums = S::FavoriteAlbums;
-        type UseSusieProphecy = S::UseSusieProphecy;
         type FavoriteGames = S::FavoriteGames;
+        type FavoriteDeltaruneCharacters = S::FavoriteDeltaruneCharacters;
+        type UseSusieProphecy = S::UseSusieProphecy;
+    }
+    ///State transition - sets the `favorite_artists` field to Set
+    pub struct SetFavoriteArtists<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetFavoriteArtists<S> {}
+    impl<S: State> State for SetFavoriteArtists<S> {
         type TitleColors = S::TitleColors;
-        type FavoriteArtists = S::FavoriteArtists;
+        type FavoriteArtists = Set<members::favorite_artists>;
+        type FavoriteAlbums = S::FavoriteAlbums;
+        type FavoriteGames = S::FavoriteGames;
+        type FavoriteDeltaruneCharacters = S::FavoriteDeltaruneCharacters;
+        type UseSusieProphecy = S::UseSusieProphecy;
     }
     ///State transition - sets the `favorite_albums` field to Set
     pub struct SetFavoriteAlbums<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetFavoriteAlbums<S> {}
     impl<S: State> State for SetFavoriteAlbums<S> {
-        type FavoriteDeltaruneCharacters = S::FavoriteDeltaruneCharacters;
-        type FavoriteAlbums = Set<members::favorite_albums>;
-        type UseSusieProphecy = S::UseSusieProphecy;
-        type FavoriteGames = S::FavoriteGames;
         type TitleColors = S::TitleColors;
         type FavoriteArtists = S::FavoriteArtists;
-    }
-    ///State transition - sets the `use_susie_prophecy` field to Set
-    pub struct SetUseSusieProphecy<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUseSusieProphecy<S> {}
-    impl<S: State> State for SetUseSusieProphecy<S> {
-        type FavoriteDeltaruneCharacters = S::FavoriteDeltaruneCharacters;
-        type FavoriteAlbums = S::FavoriteAlbums;
-        type UseSusieProphecy = Set<members::use_susie_prophecy>;
+        type FavoriteAlbums = Set<members::favorite_albums>;
         type FavoriteGames = S::FavoriteGames;
-        type TitleColors = S::TitleColors;
-        type FavoriteArtists = S::FavoriteArtists;
+        type FavoriteDeltaruneCharacters = S::FavoriteDeltaruneCharacters;
+        type UseSusieProphecy = S::UseSusieProphecy;
     }
     ///State transition - sets the `favorite_games` field to Set
     pub struct SetFavoriteGames<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetFavoriteGames<S> {}
     impl<S: State> State for SetFavoriteGames<S> {
-        type FavoriteDeltaruneCharacters = S::FavoriteDeltaruneCharacters;
+        type TitleColors = S::TitleColors;
+        type FavoriteArtists = S::FavoriteArtists;
         type FavoriteAlbums = S::FavoriteAlbums;
-        type UseSusieProphecy = S::UseSusieProphecy;
         type FavoriteGames = Set<members::favorite_games>;
+        type FavoriteDeltaruneCharacters = S::FavoriteDeltaruneCharacters;
+        type UseSusieProphecy = S::UseSusieProphecy;
+    }
+    ///State transition - sets the `favorite_deltarune_characters` field to Set
+    pub struct SetFavoriteDeltaruneCharacters<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetFavoriteDeltaruneCharacters<S> {}
+    impl<S: State> State for SetFavoriteDeltaruneCharacters<S> {
         type TitleColors = S::TitleColors;
         type FavoriteArtists = S::FavoriteArtists;
-    }
-    ///State transition - sets the `title_colors` field to Set
-    pub struct SetTitleColors<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitleColors<S> {}
-    impl<S: State> State for SetTitleColors<S> {
-        type FavoriteDeltaruneCharacters = S::FavoriteDeltaruneCharacters;
         type FavoriteAlbums = S::FavoriteAlbums;
-        type UseSusieProphecy = S::UseSusieProphecy;
         type FavoriteGames = S::FavoriteGames;
-        type TitleColors = Set<members::title_colors>;
-        type FavoriteArtists = S::FavoriteArtists;
+        type FavoriteDeltaruneCharacters = Set<members::favorite_deltarune_characters>;
+        type UseSusieProphecy = S::UseSusieProphecy;
     }
-    ///State transition - sets the `favorite_artists` field to Set
-    pub struct SetFavoriteArtists<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetFavoriteArtists<S> {}
-    impl<S: State> State for SetFavoriteArtists<S> {
-        type FavoriteDeltaruneCharacters = S::FavoriteDeltaruneCharacters;
+    ///State transition - sets the `use_susie_prophecy` field to Set
+    pub struct SetUseSusieProphecy<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUseSusieProphecy<S> {}
+    impl<S: State> State for SetUseSusieProphecy<S> {
+        type TitleColors = S::TitleColors;
+        type FavoriteArtists = S::FavoriteArtists;
         type FavoriteAlbums = S::FavoriteAlbums;
-        type UseSusieProphecy = S::UseSusieProphecy;
         type FavoriteGames = S::FavoriteGames;
-        type TitleColors = S::TitleColors;
-        type FavoriteArtists = Set<members::favorite_artists>;
+        type FavoriteDeltaruneCharacters = S::FavoriteDeltaruneCharacters;
+        type UseSusieProphecy = Set<members::use_susie_prophecy>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `favorite_deltarune_characters` field
-        pub struct favorite_deltarune_characters(());
-        ///Marker type for the `favorite_albums` field
-        pub struct favorite_albums(());
-        ///Marker type for the `use_susie_prophecy` field
-        pub struct use_susie_prophecy(());
-        ///Marker type for the `favorite_games` field
-        pub struct favorite_games(());
         ///Marker type for the `title_colors` field
         pub struct title_colors(());
         ///Marker type for the `favorite_artists` field
         pub struct favorite_artists(());
+        ///Marker type for the `favorite_albums` field
+        pub struct favorite_albums(());
+        ///Marker type for the `favorite_games` field
+        pub struct favorite_games(());
+        ///Marker type for the `favorite_deltarune_characters` field
+        pub struct favorite_deltarune_characters(());
+        ///Marker type for the `use_susie_prophecy` field
+        pub struct use_susie_prophecy(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct OutputBuilder<'a, S: output_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<CowStr<'a>>>,
         Option<Vec<CowStr<'a>>>,
         Option<Vec<CowStr<'a>>>,
@@ -320,7 +323,7 @@ pub struct OutputBuilder<'a, S: output_state::State> {
         Option<OutputTitleColors<'a>>,
         Option<bool>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Output<'a> {
@@ -334,9 +337,9 @@ impl<'a> OutputBuilder<'a, output_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OutputBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -351,11 +354,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> OutputBuilder<'a, output_state::SetFavoriteAlbums<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         OutputBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -370,11 +373,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> OutputBuilder<'a, output_state::SetFavoriteArtists<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         OutputBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -389,11 +392,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> OutputBuilder<'a, output_state::SetFavoriteDeltaruneCharacters<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         OutputBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -408,11 +411,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> OutputBuilder<'a, output_state::SetFavoriteGames<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         OutputBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -427,11 +430,11 @@ where
         mut self,
         value: impl Into<OutputTitleColors<'a>>,
     ) -> OutputBuilder<'a, output_state::SetTitleColors<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         OutputBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -446,11 +449,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> OutputBuilder<'a, output_state::SetUseSusieProphecy<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         OutputBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -458,22 +461,22 @@ where
 impl<'a, S> OutputBuilder<'a, S>
 where
     S: output_state::State,
-    S::FavoriteDeltaruneCharacters: output_state::IsSet,
-    S::FavoriteAlbums: output_state::IsSet,
-    S::UseSusieProphecy: output_state::IsSet,
-    S::FavoriteGames: output_state::IsSet,
     S::TitleColors: output_state::IsSet,
     S::FavoriteArtists: output_state::IsSet,
+    S::FavoriteAlbums: output_state::IsSet,
+    S::FavoriteGames: output_state::IsSet,
+    S::FavoriteDeltaruneCharacters: output_state::IsSet,
+    S::UseSusieProphecy: output_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Output<'a> {
         Output {
-            favorite_albums: self.__unsafe_private_named.0.unwrap(),
-            favorite_artists: self.__unsafe_private_named.1.unwrap(),
-            favorite_deltarune_characters: self.__unsafe_private_named.2.unwrap(),
-            favorite_games: self.__unsafe_private_named.3.unwrap(),
-            title_colors: self.__unsafe_private_named.4.unwrap(),
-            use_susie_prophecy: self.__unsafe_private_named.5.unwrap(),
+            favorite_albums: self._fields.0.unwrap(),
+            favorite_artists: self._fields.1.unwrap(),
+            favorite_deltarune_characters: self._fields.2.unwrap(),
+            favorite_games: self._fields.3.unwrap(),
+            title_colors: self._fields.4.unwrap(),
+            use_susie_prophecy: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -486,12 +489,12 @@ where
         >,
     ) -> Output<'a> {
         Output {
-            favorite_albums: self.__unsafe_private_named.0.unwrap(),
-            favorite_artists: self.__unsafe_private_named.1.unwrap(),
-            favorite_deltarune_characters: self.__unsafe_private_named.2.unwrap(),
-            favorite_games: self.__unsafe_private_named.3.unwrap(),
-            title_colors: self.__unsafe_private_named.4.unwrap(),
-            use_susie_prophecy: self.__unsafe_private_named.5.unwrap(),
+            favorite_albums: self._fields.0.unwrap(),
+            favorite_artists: self._fields.1.unwrap(),
+            favorite_deltarune_characters: self._fields.2.unwrap(),
+            favorite_games: self._fields.3.unwrap(),
+            title_colors: self._fields.4.unwrap(),
+            use_susie_prophecy: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/download_darkworld/state.rs b/crates/jacquard-api/src/download_darkworld/state.rs
index e78eac5c..09109ab2 100644
--- a/crates/jacquard-api/src/download_darkworld/state.rs
+++ b/crates/jacquard-api/src/download_darkworld/state.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -270,80 +273,80 @@ pub mod favorite_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Artist;
+        type DeltaruneCharacter;
         type Game;
         type Album;
-        type DeltaruneCharacter;
+        type Artist;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Artist = Unset;
+        type DeltaruneCharacter = Unset;
         type Game = Unset;
         type Album = Unset;
-        type DeltaruneCharacter = Unset;
+        type Artist = Unset;
     }
-    ///State transition - sets the `artist` field to Set
-    pub struct SetArtist<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetArtist<S> {}
-    impl<S: State> State for SetArtist<S> {
-        type Artist = Set<members::artist>;
+    ///State transition - sets the `deltarune_character` field to Set
+    pub struct SetDeltaruneCharacter<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDeltaruneCharacter<S> {}
+    impl<S: State> State for SetDeltaruneCharacter<S> {
+        type DeltaruneCharacter = Set<members::deltarune_character>;
         type Game = S::Game;
         type Album = S::Album;
-        type DeltaruneCharacter = S::DeltaruneCharacter;
+        type Artist = S::Artist;
     }
     ///State transition - sets the `game` field to Set
     pub struct SetGame<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetGame<S> {}
     impl<S: State> State for SetGame<S> {
-        type Artist = S::Artist;
+        type DeltaruneCharacter = S::DeltaruneCharacter;
         type Game = Set<members::game>;
         type Album = S::Album;
-        type DeltaruneCharacter = S::DeltaruneCharacter;
+        type Artist = S::Artist;
     }
     ///State transition - sets the `album` field to Set
     pub struct SetAlbum<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAlbum<S> {}
     impl<S: State> State for SetAlbum<S> {
-        type Artist = S::Artist;
+        type DeltaruneCharacter = S::DeltaruneCharacter;
         type Game = S::Game;
         type Album = Set<members::album>;
-        type DeltaruneCharacter = S::DeltaruneCharacter;
-    }
-    ///State transition - sets the `deltarune_character` field to Set
-    pub struct SetDeltaruneCharacter<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDeltaruneCharacter<S> {}
-    impl<S: State> State for SetDeltaruneCharacter<S> {
         type Artist = S::Artist;
+    }
+    ///State transition - sets the `artist` field to Set
+    pub struct SetArtist<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetArtist<S> {}
+    impl<S: State> State for SetArtist<S> {
+        type DeltaruneCharacter = S::DeltaruneCharacter;
         type Game = S::Game;
         type Album = S::Album;
-        type DeltaruneCharacter = Set<members::deltarune_character>;
+        type Artist = Set<members::artist>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `artist` field
-        pub struct artist(());
+        ///Marker type for the `deltarune_character` field
+        pub struct deltarune_character(());
         ///Marker type for the `game` field
         pub struct game(());
         ///Marker type for the `album` field
         pub struct album(());
-        ///Marker type for the `deltarune_character` field
-        pub struct deltarune_character(());
+        ///Marker type for the `artist` field
+        pub struct artist(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FavoriteBuilder<'a, S: favorite_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<CowStr<'a>>>,
         Option<Vec<CowStr<'a>>>,
         Option<Vec<CowStr<'a>>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Favorite<'a> {
@@ -357,9 +360,9 @@ impl<'a> FavoriteBuilder<'a, favorite_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FavoriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -374,11 +377,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> FavoriteBuilder<'a, favorite_state::SetAlbum<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FavoriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -393,11 +396,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> FavoriteBuilder<'a, favorite_state::SetArtist<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FavoriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -412,11 +415,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> FavoriteBuilder<'a, favorite_state::SetDeltaruneCharacter<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         FavoriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -431,11 +434,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> FavoriteBuilder<'a, favorite_state::SetGame<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         FavoriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -443,18 +446,18 @@ where
 impl<'a, S> FavoriteBuilder<'a, S>
 where
     S: favorite_state::State,
-    S::Artist: favorite_state::IsSet,
+    S::DeltaruneCharacter: favorite_state::IsSet,
     S::Game: favorite_state::IsSet,
     S::Album: favorite_state::IsSet,
-    S::DeltaruneCharacter: favorite_state::IsSet,
+    S::Artist: favorite_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Favorite<'a> {
         Favorite {
-            album: self.__unsafe_private_named.0.unwrap(),
-            artist: self.__unsafe_private_named.1.unwrap(),
-            deltarune_character: self.__unsafe_private_named.2.unwrap(),
-            game: self.__unsafe_private_named.3.unwrap(),
+            album: self._fields.0.unwrap(),
+            artist: self._fields.1.unwrap(),
+            deltarune_character: self._fields.2.unwrap(),
+            game: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -467,10 +470,10 @@ where
         >,
     ) -> Favorite<'a> {
         Favorite {
-            album: self.__unsafe_private_named.0.unwrap(),
-            artist: self.__unsafe_private_named.1.unwrap(),
-            deltarune_character: self.__unsafe_private_named.2.unwrap(),
-            game: self.__unsafe_private_named.3.unwrap(),
+            album: self._fields.0.unwrap(),
+            artist: self._fields.1.unwrap(),
+            deltarune_character: self._fields.2.unwrap(),
+            game: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -666,9 +669,9 @@ pub mod state_state {
 
 /// Builder for constructing an instance of this type
 pub struct StateBuilder<'a, S: state_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<state::Favorite<'a>>, Option<state::Site<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<state::Favorite<'a>>, Option<state::Site<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> State<'a> {
@@ -682,9 +685,9 @@ impl<'a> StateBuilder<'a, state_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -699,11 +702,11 @@ where
         mut self,
         value: impl Into<state::Favorite<'a>>,
     ) -> StateBuilder<'a, state_state::SetFavorite<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -718,11 +721,11 @@ where
         mut self,
         value: impl Into<state::Site<'a>>,
     ) -> StateBuilder<'a, state_state::SetSite<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -736,8 +739,8 @@ where
     /// Build the final struct
     pub fn build(self) -> State<'a> {
         State {
-            favorite: self.__unsafe_private_named.0.unwrap(),
-            site: self.__unsafe_private_named.1.unwrap(),
+            favorite: self._fields.0.unwrap(),
+            site: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -750,8 +753,8 @@ where
         >,
     ) -> State<'a> {
         State {
-            favorite: self.__unsafe_private_named.0.unwrap(),
-            site: self.__unsafe_private_named.1.unwrap(),
+            favorite: self._fields.0.unwrap(),
+            site: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -791,9 +794,9 @@ pub mod site_state {
 
 /// Builder for constructing an instance of this type
 pub struct SiteBuilder<'a, S: site_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<SiteTitleColors<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<SiteTitleColors<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Site<'a> {
@@ -807,9 +810,9 @@ impl<'a> SiteBuilder<'a, site_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SiteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -824,11 +827,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> SiteBuilder<'a, site_state::SetSusieProphecy<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SiteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -839,12 +842,12 @@ impl<'a, S: site_state::State> SiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<SiteTitleColors<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `titleColors` field to an Option value (optional)
     pub fn maybe_title_colors(mut self, value: Option<SiteTitleColors<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -857,8 +860,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Site<'a> {
         Site {
-            susie_prophecy: self.__unsafe_private_named.0.unwrap(),
-            title_colors: self.__unsafe_private_named.1,
+            susie_prophecy: self._fields.0.unwrap(),
+            title_colors: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -871,8 +874,8 @@ where
         >,
     ) -> Site<'a> {
         Site {
-            susie_prophecy: self.__unsafe_private_named.0.unwrap(),
-            title_colors: self.__unsafe_private_named.1,
+            susie_prophecy: self._fields.0.unwrap(),
+            title_colors: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/eu_atchef/recipe.rs b/crates/jacquard-api/src/eu_atchef/recipe.rs
index 1d9d6f3c..4588c51c 100644
--- a/crates/jacquard-api/src/eu_atchef/recipe.rs
+++ b/crates/jacquard-api/src/eu_atchef/recipe.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -334,8 +337,8 @@ pub mod recipe_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecipeBuilder<'a, S: recipe_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<i64>,
         Option<Datetime>,
@@ -347,7 +350,7 @@ pub struct RecipeBuilder<'a, S: recipe_state::State> {
         Option<i64>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Recipe<'a> {
@@ -361,20 +364,9 @@ impl<'a> RecipeBuilder<'a, recipe_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -389,11 +381,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RecipeBuilder<'a, recipe_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -401,12 +393,12 @@ where
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `cookTime` field (optional)
     pub fn cook_time(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cookTime` field to an Option value (optional)
     pub fn maybe_cook_time(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -421,11 +413,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RecipeBuilder<'a, recipe_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -433,12 +425,12 @@ where
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -446,12 +438,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -466,11 +458,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RecipeBuilder<'a, recipe_state::SetName<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         RecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -478,12 +470,12 @@ where
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `portions` field (optional)
     pub fn portions(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `portions` field to an Option value (optional)
     pub fn maybe_portions(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -491,12 +483,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `prepTime` field (optional)
     pub fn prep_time(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `prepTime` field to an Option value (optional)
     pub fn maybe_prep_time(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -504,12 +496,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `time` field (optional)
     pub fn time(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `time` field to an Option value (optional)
     pub fn maybe_time(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -517,12 +509,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -537,16 +529,16 @@ where
     /// Build the final struct
     pub fn build(self) -> Recipe<'a> {
         Recipe {
-            content: self.__unsafe_private_named.0.unwrap(),
-            cook_time: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            image: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            portions: self.__unsafe_private_named.6,
-            prep_time: self.__unsafe_private_named.7,
-            time: self.__unsafe_private_named.8,
-            updated_at: self.__unsafe_private_named.9,
+            content: self._fields.0.unwrap(),
+            cook_time: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            image: self._fields.4,
+            name: self._fields.5.unwrap(),
+            portions: self._fields.6,
+            prep_time: self._fields.7,
+            time: self._fields.8,
+            updated_at: self._fields.9,
             extra_data: Default::default(),
         }
     }
@@ -559,16 +551,16 @@ where
         >,
     ) -> Recipe<'a> {
         Recipe {
-            content: self.__unsafe_private_named.0.unwrap(),
-            cook_time: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            image: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            portions: self.__unsafe_private_named.6,
-            prep_time: self.__unsafe_private_named.7,
-            time: self.__unsafe_private_named.8,
-            updated_at: self.__unsafe_private_named.9,
+            content: self._fields.0.unwrap(),
+            cook_time: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            image: self._fields.4,
+            name: self._fields.5.unwrap(),
+            portions: self._fields.6,
+            prep_time: self._fields.7,
+            time: self._fields.8,
+            updated_at: self._fields.9,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/events_smokesignal/calendar/acceptance.rs b/crates/jacquard-api/src/events_smokesignal/calendar/acceptance.rs
index 31a18c0a..dbf8066b 100644
--- a/crates/jacquard-api/src/events_smokesignal/calendar/acceptance.rs
+++ b/crates/jacquard-api/src/events_smokesignal/calendar/acceptance.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -132,9 +135,9 @@ pub mod acceptance_state {
 
 /// Builder for constructing an instance of this type
 pub struct AcceptanceBuilder<'a, S: acceptance_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Acceptance<'a> {
@@ -148,9 +151,9 @@ impl<'a> AcceptanceBuilder<'a, acceptance_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AcceptanceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -165,11 +168,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> AcceptanceBuilder<'a, acceptance_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AcceptanceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,7 +185,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Acceptance<'a> {
         Acceptance {
-            cid: self.__unsafe_private_named.0.unwrap(),
+            cid: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -195,7 +198,7 @@ where
         >,
     ) -> Acceptance<'a> {
         Acceptance {
-            cid: self.__unsafe_private_named.0.unwrap(),
+            cid: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/events_smokesignal/calendar/event_configuration.rs b/crates/jacquard-api/src/events_smokesignal/calendar/event_configuration.rs
index f7866b9b..63e81e3b 100644
--- a/crates/jacquard-api/src/events_smokesignal/calendar/event_configuration.rs
+++ b/crates/jacquard-api/src/events_smokesignal/calendar/event_configuration.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -136,9 +139,9 @@ pub mod event_configuration_state {
 
 /// Builder for constructing an instance of this type
 pub struct EventConfigurationBuilder<'a, S: event_configuration_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<bool>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<bool>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> EventConfiguration<'a> {
@@ -152,9 +155,9 @@ impl<'a> EventConfigurationBuilder<'a, event_configuration_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EventConfigurationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -162,12 +165,12 @@ impl<'a> EventConfigurationBuilder<'a, event_configuration_state::Empty> {
 impl<'a, S: event_configuration_state::State> EventConfigurationBuilder<'a, S> {
     /// Set the `disableDirectRsvp` field (optional)
     pub fn disable_direct_rsvp(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `disableDirectRsvp` field to an Option value (optional)
     pub fn maybe_disable_direct_rsvp(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -175,12 +178,12 @@ impl<'a, S: event_configuration_state::State> EventConfigurationBuilder<'a, S> {
 impl<'a, S: event_configuration_state::State> EventConfigurationBuilder<'a, S> {
     /// Set the `requireConfirmedEmail` field (optional)
     pub fn require_confirmed_email(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `requireConfirmedEmail` field to an Option value (optional)
     pub fn maybe_require_confirmed_email(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -188,12 +191,12 @@ impl<'a, S: event_configuration_state::State> EventConfigurationBuilder<'a, S> {
 impl<'a, S: event_configuration_state::State> EventConfigurationBuilder<'a, S> {
     /// Set the `rsvpRedirectUrl` field (optional)
     pub fn rsvp_redirect_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `rsvpRedirectUrl` field to an Option value (optional)
     pub fn maybe_rsvp_redirect_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -205,9 +208,9 @@ where
     /// Build the final struct
     pub fn build(self) -> EventConfiguration<'a> {
         EventConfiguration {
-            disable_direct_rsvp: self.__unsafe_private_named.0,
-            require_confirmed_email: self.__unsafe_private_named.1,
-            rsvp_redirect_url: self.__unsafe_private_named.2,
+            disable_direct_rsvp: self._fields.0,
+            require_confirmed_email: self._fields.1,
+            rsvp_redirect_url: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -220,9 +223,9 @@ where
         >,
     ) -> EventConfiguration<'a> {
         EventConfiguration {
-            disable_direct_rsvp: self.__unsafe_private_named.0,
-            require_confirmed_email: self.__unsafe_private_named.1,
-            rsvp_redirect_url: self.__unsafe_private_named.2,
+            disable_direct_rsvp: self._fields.0,
+            require_confirmed_email: self._fields.1,
+            rsvp_redirect_url: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/events_smokesignal/event/configure.rs b/crates/jacquard-api/src/events_smokesignal/event/configure.rs
index e1763f14..4268f687 100644
--- a/crates/jacquard-api/src/events_smokesignal/event/configure.rs
+++ b/crates/jacquard-api/src/events_smokesignal/event/configure.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{AtUri, UriValue};
@@ -155,14 +158,9 @@ pub mod configure_state {
 
 /// Builder for constructing an instance of this type
 pub struct ConfigureBuilder<'a, S: configure_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<bool>,
-        Option<AtUri<'a>>,
-        Option<bool>,
-        Option<UriValue<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<AtUri<'a>>, Option<bool>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Configure<'a> {
@@ -176,9 +174,9 @@ impl<'a> ConfigureBuilder<'a, configure_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ConfigureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -186,12 +184,12 @@ impl<'a> ConfigureBuilder<'a, configure_state::Empty> {
 impl<'a, S: configure_state::State> ConfigureBuilder<'a, S> {
     /// Set the `disableDirectRsvp` field (optional)
     pub fn disable_direct_rsvp(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `disableDirectRsvp` field to an Option value (optional)
     pub fn maybe_disable_direct_rsvp(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -206,11 +204,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ConfigureBuilder<'a, configure_state::SetEvent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ConfigureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -218,12 +216,12 @@ where
 impl<'a, S: configure_state::State> ConfigureBuilder<'a, S> {
     /// Set the `requireConfirmedEmail` field (optional)
     pub fn require_confirmed_email(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `requireConfirmedEmail` field to an Option value (optional)
     pub fn maybe_require_confirmed_email(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -231,12 +229,12 @@ impl<'a, S: configure_state::State> ConfigureBuilder<'a, S> {
 impl<'a, S: configure_state::State> ConfigureBuilder<'a, S> {
     /// Set the `rsvpRedirectUrl` field (optional)
     pub fn rsvp_redirect_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `rsvpRedirectUrl` field to an Option value (optional)
     pub fn maybe_rsvp_redirect_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -249,10 +247,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Configure<'a> {
         Configure {
-            disable_direct_rsvp: self.__unsafe_private_named.0,
-            event: self.__unsafe_private_named.1.unwrap(),
-            require_confirmed_email: self.__unsafe_private_named.2,
-            rsvp_redirect_url: self.__unsafe_private_named.3,
+            disable_direct_rsvp: self._fields.0,
+            event: self._fields.1.unwrap(),
+            require_confirmed_email: self._fields.2,
+            rsvp_redirect_url: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -265,10 +263,10 @@ where
         >,
     ) -> Configure<'a> {
         Configure {
-            disable_direct_rsvp: self.__unsafe_private_named.0,
-            event: self.__unsafe_private_named.1.unwrap(),
-            require_confirmed_email: self.__unsafe_private_named.2,
-            rsvp_redirect_url: self.__unsafe_private_named.3,
+            disable_direct_rsvp: self._fields.0,
+            event: self._fields.1.unwrap(),
+            require_confirmed_email: self._fields.2,
+            rsvp_redirect_url: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/events_smokesignal/lfg.rs b/crates/jacquard-api/src/events_smokesignal/lfg.rs
index 09952621..d8e89314 100644
--- a/crates/jacquard-api/src/events_smokesignal/lfg.rs
+++ b/crates/jacquard-api/src/events_smokesignal/lfg.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -148,112 +151,112 @@ pub mod lfg_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Active;
-        type Tags;
         type StartsAt;
-        type EndsAt;
+        type Active;
         type Location;
         type CreatedAt;
+        type Tags;
+        type EndsAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Active = Unset;
-        type Tags = Unset;
         type StartsAt = Unset;
-        type EndsAt = Unset;
+        type Active = Unset;
         type Location = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `active` field to Set
-    pub struct SetActive<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetActive<S> {}
-    impl<S: State> State for SetActive<S> {
-        type Active = Set<members::active>;
-        type Tags = S::Tags;
-        type StartsAt = S::StartsAt;
-        type EndsAt = S::EndsAt;
-        type Location = S::Location;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `tags` field to Set
-    pub struct SetTags<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTags<S> {}
-    impl<S: State> State for SetTags<S> {
-        type Active = S::Active;
-        type Tags = Set<members::tags>;
-        type StartsAt = S::StartsAt;
-        type EndsAt = S::EndsAt;
-        type Location = S::Location;
-        type CreatedAt = S::CreatedAt;
+        type Tags = Unset;
+        type EndsAt = Unset;
     }
     ///State transition - sets the `starts_at` field to Set
     pub struct SetStartsAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStartsAt<S> {}
     impl<S: State> State for SetStartsAt<S> {
-        type Active = S::Active;
-        type Tags = S::Tags;
         type StartsAt = Set<members::starts_at>;
-        type EndsAt = S::EndsAt;
+        type Active = S::Active;
         type Location = S::Location;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `ends_at` field to Set
-    pub struct SetEndsAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetEndsAt<S> {}
-    impl<S: State> State for SetEndsAt<S> {
-        type Active = S::Active;
         type Tags = S::Tags;
+        type EndsAt = S::EndsAt;
+    }
+    ///State transition - sets the `active` field to Set
+    pub struct SetActive<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetActive<S> {}
+    impl<S: State> State for SetActive<S> {
         type StartsAt = S::StartsAt;
-        type EndsAt = Set<members::ends_at>;
+        type Active = Set<members::active>;
         type Location = S::Location;
         type CreatedAt = S::CreatedAt;
+        type Tags = S::Tags;
+        type EndsAt = S::EndsAt;
     }
     ///State transition - sets the `location` field to Set
     pub struct SetLocation<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLocation<S> {}
     impl<S: State> State for SetLocation<S> {
-        type Active = S::Active;
-        type Tags = S::Tags;
         type StartsAt = S::StartsAt;
-        type EndsAt = S::EndsAt;
+        type Active = S::Active;
         type Location = Set<members::location>;
         type CreatedAt = S::CreatedAt;
+        type Tags = S::Tags;
+        type EndsAt = S::EndsAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type StartsAt = S::StartsAt;
         type Active = S::Active;
+        type Location = S::Location;
+        type CreatedAt = Set<members::created_at>;
         type Tags = S::Tags;
+        type EndsAt = S::EndsAt;
+    }
+    ///State transition - sets the `tags` field to Set
+    pub struct SetTags<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTags<S> {}
+    impl<S: State> State for SetTags<S> {
         type StartsAt = S::StartsAt;
+        type Active = S::Active;
+        type Location = S::Location;
+        type CreatedAt = S::CreatedAt;
+        type Tags = Set<members::tags>;
         type EndsAt = S::EndsAt;
+    }
+    ///State transition - sets the `ends_at` field to Set
+    pub struct SetEndsAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetEndsAt<S> {}
+    impl<S: State> State for SetEndsAt<S> {
+        type StartsAt = S::StartsAt;
+        type Active = S::Active;
         type Location = S::Location;
-        type CreatedAt = Set<members::created_at>;
+        type CreatedAt = S::CreatedAt;
+        type Tags = S::Tags;
+        type EndsAt = Set<members::ends_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `active` field
-        pub struct active(());
-        ///Marker type for the `tags` field
-        pub struct tags(());
         ///Marker type for the `starts_at` field
         pub struct starts_at(());
-        ///Marker type for the `ends_at` field
-        pub struct ends_at(());
+        ///Marker type for the `active` field
+        pub struct active(());
         ///Marker type for the `location` field
         pub struct location(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `tags` field
+        pub struct tags(());
+        ///Marker type for the `ends_at` field
+        pub struct ends_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LfgBuilder<'a, S: lfg_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<Datetime>,
         Option<Datetime>,
@@ -261,7 +264,7 @@ pub struct LfgBuilder<'a, S: lfg_state::State> {
         Option<Datetime>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Lfg<'a> {
@@ -275,9 +278,9 @@ impl<'a> LfgBuilder<'a, lfg_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LfgBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -292,11 +295,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> LfgBuilder<'a, lfg_state::SetActive<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LfgBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -311,11 +314,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LfgBuilder<'a, lfg_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LfgBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -330,11 +333,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LfgBuilder<'a, lfg_state::SetEndsAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LfgBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -349,11 +352,11 @@ where
         mut self,
         value: impl Into<LfgLocation<'a>>,
     ) -> LfgBuilder<'a, lfg_state::SetLocation<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LfgBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -368,11 +371,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LfgBuilder<'a, lfg_state::SetStartsAt<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         LfgBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -387,11 +390,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> LfgBuilder<'a, lfg_state::SetTags<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         LfgBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -399,22 +402,22 @@ where
 impl<'a, S> LfgBuilder<'a, S>
 where
     S: lfg_state::State,
-    S::Active: lfg_state::IsSet,
-    S::Tags: lfg_state::IsSet,
     S::StartsAt: lfg_state::IsSet,
-    S::EndsAt: lfg_state::IsSet,
+    S::Active: lfg_state::IsSet,
     S::Location: lfg_state::IsSet,
     S::CreatedAt: lfg_state::IsSet,
+    S::Tags: lfg_state::IsSet,
+    S::EndsAt: lfg_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Lfg<'a> {
         Lfg {
-            active: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            ends_at: self.__unsafe_private_named.2.unwrap(),
-            location: self.__unsafe_private_named.3.unwrap(),
-            starts_at: self.__unsafe_private_named.4.unwrap(),
-            tags: self.__unsafe_private_named.5.unwrap(),
+            active: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            ends_at: self._fields.2.unwrap(),
+            location: self._fields.3.unwrap(),
+            starts_at: self._fields.4.unwrap(),
+            tags: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -424,12 +427,12 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Lfg<'a> {
         Lfg {
-            active: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            ends_at: self.__unsafe_private_named.2.unwrap(),
-            location: self.__unsafe_private_named.3.unwrap(),
-            starts_at: self.__unsafe_private_named.4.unwrap(),
-            tags: self.__unsafe_private_named.5.unwrap(),
+            active: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            ends_at: self._fields.2.unwrap(),
+            location: self._fields.3.unwrap(),
+            starts_at: self._fields.4.unwrap(),
+            tags: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/events_smokesignal/profile.rs b/crates/jacquard-api/src/events_smokesignal/profile.rs
index 9ea2402c..be90007b 100644
--- a/crates/jacquard-api/src/events_smokesignal/profile.rs
+++ b/crates/jacquard-api/src/events_smokesignal/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -405,8 +408,8 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
@@ -414,7 +417,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<Vec<Facet<'a>>>,
         Option<ProfileProfileHost<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -428,9 +431,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -438,12 +441,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -451,12 +454,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -464,12 +467,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -477,12 +480,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -490,12 +493,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -506,12 +509,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProfileProfileHost<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `profileHost` field to an Option value (optional)
     pub fn maybe_profile_host(mut self, value: Option<ProfileProfileHost<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -523,12 +526,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3,
-            facets: self.__unsafe_private_named.4,
-            profile_host: self.__unsafe_private_named.5,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            description: self._fields.2,
+            display_name: self._fields.3,
+            facets: self._fields.4,
+            profile_host: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -541,12 +544,12 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3,
-            facets: self.__unsafe_private_named.4,
-            profile_host: self.__unsafe_private_named.5,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            description: self._fields.2,
+            display_name: self._fields.3,
+            facets: self._fields.4,
+            profile_host: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fm_teal/alpha/actor/get_profile.rs b/crates/jacquard-api/src/fm_teal/alpha/actor/get_profile.rs
index b9b48957..a698196e 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/actor/get_profile.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/actor/get_profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetProfileBuilder<'a, S: get_profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetProfile<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetProfileBuilder<'a, get_profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetProfileBuilder<'a, get_profile_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetProfile<'a> {
         GetProfile {
-            actor: self.__unsafe_private_named.0.unwrap(),
+            actor: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/fm_teal/alpha/actor/get_profiles.rs b/crates/jacquard-api/src/fm_teal/alpha/actor/get_profiles.rs
index 17558a47..23148106 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/actor/get_profiles.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/actor/get_profiles.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_profiles_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetProfilesBuilder<'a, S: get_profiles_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<AtIdentifier<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<AtIdentifier<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetProfiles<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetProfilesBuilder<'a, get_profiles_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetProfilesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<Vec<AtIdentifier<'a>>>,
     ) -> GetProfilesBuilder<'a, get_profiles_state::SetActors<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetProfilesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetProfiles<'a> {
         GetProfiles {
-            actors: self.__unsafe_private_named.0.unwrap(),
+            actors: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/fm_teal/alpha/actor/profile.rs b/crates/jacquard-api/src/fm_teal/alpha/actor/profile.rs
index b71c46e1..cdd8fa15 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/actor/profile.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -422,8 +425,8 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<BlobRef<'a>>,
         Option<Datetime>,
@@ -432,7 +435,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<CowStr<'a>>,
         Option<profile::FeaturedItem<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -446,9 +449,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -456,12 +459,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -469,12 +472,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -482,12 +485,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -495,12 +498,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -511,12 +514,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `descriptionFacets` field to an Option value (optional)
     pub fn maybe_description_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -524,12 +527,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -540,7 +543,7 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: impl Into<Option<profile::FeaturedItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `featuredItem` field to an Option value (optional)
@@ -548,7 +551,7 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: Option<profile::FeaturedItem<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -560,13 +563,13 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            description_facets: self.__unsafe_private_named.4,
-            display_name: self.__unsafe_private_named.5,
-            featured_item: self.__unsafe_private_named.6,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            created_at: self._fields.2,
+            description: self._fields.3,
+            description_facets: self._fields.4,
+            display_name: self._fields.5,
+            featured_item: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -579,13 +582,13 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            description_facets: self.__unsafe_private_named.4,
-            display_name: self.__unsafe_private_named.5,
-            featured_item: self.__unsafe_private_named.6,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            created_at: self._fields.2,
+            description: self._fields.3,
+            description_facets: self._fields.4,
+            display_name: self._fields.5,
+            featured_item: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fm_teal/alpha/actor/profile_status.rs b/crates/jacquard-api/src/fm_teal/alpha/actor/profile_status.rs
index 15589b83..29b2e05c 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/actor/profile_status.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/actor/profile_status.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -248,13 +251,13 @@ pub mod profile_status_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileStatusBuilder<'a, S: profile_status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileStatusCompletedOnboarding<'a>>,
         Option<Datetime>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileStatus<'a> {
@@ -268,9 +271,9 @@ impl<'a> ProfileStatusBuilder<'a, profile_status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -285,11 +288,11 @@ where
         mut self,
         value: impl Into<ProfileStatusCompletedOnboarding<'a>>,
     ) -> ProfileStatusBuilder<'a, profile_status_state::SetCompletedOnboarding<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ProfileStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -297,12 +300,12 @@ where
 impl<'a, S: profile_status_state::State> ProfileStatusBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -310,12 +313,12 @@ impl<'a, S: profile_status_state::State> ProfileStatusBuilder<'a, S> {
 impl<'a, S: profile_status_state::State> ProfileStatusBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -328,9 +331,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ProfileStatus<'a> {
         ProfileStatus {
-            completed_onboarding: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1,
-            updated_at: self.__unsafe_private_named.2,
+            completed_onboarding: self._fields.0.unwrap(),
+            created_at: self._fields.1,
+            updated_at: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -343,9 +346,9 @@ where
         >,
     ) -> ProfileStatus<'a> {
         ProfileStatus {
-            completed_onboarding: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1,
-            updated_at: self.__unsafe_private_named.2,
+            completed_onboarding: self._fields.0.unwrap(),
+            created_at: self._fields.1,
+            updated_at: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fm_teal/alpha/actor/search_actors.rs b/crates/jacquard-api/src/fm_teal/alpha/actor/search_actors.rs
index 83877b97..67330de8 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/actor/search_actors.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/actor/search_actors.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -96,9 +99,9 @@ pub mod search_actors_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchActorsBuilder<'a, S: search_actors_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchActors<'a> {
@@ -112,9 +115,9 @@ impl<'a> SearchActorsBuilder<'a, search_actors_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchActorsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -122,12 +125,12 @@ impl<'a> SearchActorsBuilder<'a, search_actors_state::Empty> {
 impl<'a, S: search_actors_state::State> SearchActorsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -135,12 +138,12 @@ impl<'a, S: search_actors_state::State> SearchActorsBuilder<'a, S> {
 impl<'a, S: search_actors_state::State> SearchActorsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -155,11 +158,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SearchActorsBuilder<'a, search_actors_state::SetQ<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SearchActorsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -172,9 +175,9 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchActors<'a> {
         SearchActors {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            q: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            q: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/fm_teal/alpha/actor/status.rs b/crates/jacquard-api/src/fm_teal/alpha/actor/status.rs
index 8373c60f..97d5247b 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/actor/status.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/actor/status.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -149,9 +152,9 @@ pub mod status_state {
 
 /// Builder for constructing an instance of this type
 pub struct StatusBuilder<'a, S: status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<PlayView<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<PlayView<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Status<'a> {
@@ -165,9 +168,9 @@ impl<'a> StatusBuilder<'a, status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -175,12 +178,12 @@ impl<'a> StatusBuilder<'a, status_state::Empty> {
 impl<'a, S: status_state::State> StatusBuilder<'a, S> {
     /// Set the `expiry` field (optional)
     pub fn expiry(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `expiry` field to an Option value (optional)
     pub fn maybe_expiry(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -195,11 +198,11 @@ where
         mut self,
         value: impl Into<PlayView<'a>>,
     ) -> StatusBuilder<'a, status_state::SetItem<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -214,11 +217,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StatusBuilder<'a, status_state::SetTime<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,9 +235,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Status<'a> {
         Status {
-            expiry: self.__unsafe_private_named.0,
-            item: self.__unsafe_private_named.1.unwrap(),
-            time: self.__unsafe_private_named.2.unwrap(),
+            expiry: self._fields.0,
+            item: self._fields.1.unwrap(),
+            time: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -247,9 +250,9 @@ where
         >,
     ) -> Status<'a> {
         Status {
-            expiry: self.__unsafe_private_named.0,
-            item: self.__unsafe_private_named.1.unwrap(),
-            time: self.__unsafe_private_named.2.unwrap(),
+            expiry: self._fields.0,
+            item: self._fields.1.unwrap(),
+            time: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fm_teal/alpha/feed.rs b/crates/jacquard-api/src/fm_teal/alpha/feed.rs
index fdf748df..348eae01 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/feed.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/feed.rs
@@ -9,7 +9,11 @@ pub mod get_actor_feed;
 pub mod get_play;
 pub mod play;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -474,8 +478,8 @@ pub mod play_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct PlayViewBuilder<'a, S: play_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<feed::Artist<'a>>>,
         Option<i64>,
         Option<CowStr<'a>>,
@@ -489,7 +493,7 @@ pub struct PlayViewBuilder<'a, S: play_view_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PlayView<'a> {
@@ -503,8 +507,8 @@ impl<'a> PlayViewBuilder<'a, play_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PlayViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -518,7 +522,7 @@ impl<'a> PlayViewBuilder<'a, play_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -533,11 +537,11 @@ where
         mut self,
         value: impl Into<Vec<feed::Artist<'a>>>,
     ) -> PlayViewBuilder<'a, play_view_state::SetArtists<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PlayViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -545,12 +549,12 @@ where
 impl<'a, S: play_view_state::State> PlayViewBuilder<'a, S> {
     /// Set the `duration` field (optional)
     pub fn duration(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `duration` field to an Option value (optional)
     pub fn maybe_duration(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -558,12 +562,12 @@ impl<'a, S: play_view_state::State> PlayViewBuilder<'a, S> {
 impl<'a, S: play_view_state::State> PlayViewBuilder<'a, S> {
     /// Set the `isrc` field (optional)
     pub fn isrc(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `isrc` field to an Option value (optional)
     pub fn maybe_isrc(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -574,12 +578,12 @@ impl<'a, S: play_view_state::State> PlayViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `musicServiceBaseDomain` field to an Option value (optional)
     pub fn maybe_music_service_base_domain(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -587,12 +591,12 @@ impl<'a, S: play_view_state::State> PlayViewBuilder<'a, S> {
 impl<'a, S: play_view_state::State> PlayViewBuilder<'a, S> {
     /// Set the `originUrl` field (optional)
     pub fn origin_url(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `originUrl` field to an Option value (optional)
     pub fn maybe_origin_url(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -600,12 +604,12 @@ impl<'a, S: play_view_state::State> PlayViewBuilder<'a, S> {
 impl<'a, S: play_view_state::State> PlayViewBuilder<'a, S> {
     /// Set the `playedTime` field (optional)
     pub fn played_time(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `playedTime` field to an Option value (optional)
     pub fn maybe_played_time(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -613,12 +617,12 @@ impl<'a, S: play_view_state::State> PlayViewBuilder<'a, S> {
 impl<'a, S: play_view_state::State> PlayViewBuilder<'a, S> {
     /// Set the `recordingMbId` field (optional)
     pub fn recording_mb_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `recordingMbId` field to an Option value (optional)
     pub fn maybe_recording_mb_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -626,12 +630,12 @@ impl<'a, S: play_view_state::State> PlayViewBuilder<'a, S> {
 impl<'a, S: play_view_state::State> PlayViewBuilder<'a, S> {
     /// Set the `releaseMbId` field (optional)
     pub fn release_mb_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `releaseMbId` field to an Option value (optional)
     pub fn maybe_release_mb_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -639,12 +643,12 @@ impl<'a, S: play_view_state::State> PlayViewBuilder<'a, S> {
 impl<'a, S: play_view_state::State> PlayViewBuilder<'a, S> {
     /// Set the `releaseName` field (optional)
     pub fn release_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `releaseName` field to an Option value (optional)
     pub fn maybe_release_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -655,12 +659,12 @@ impl<'a, S: play_view_state::State> PlayViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `submissionClientAgent` field to an Option value (optional)
     pub fn maybe_submission_client_agent(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -668,12 +672,12 @@ impl<'a, S: play_view_state::State> PlayViewBuilder<'a, S> {
 impl<'a, S: play_view_state::State> PlayViewBuilder<'a, S> {
     /// Set the `trackMbId` field (optional)
     pub fn track_mb_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `trackMbId` field to an Option value (optional)
     pub fn maybe_track_mb_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -688,11 +692,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PlayViewBuilder<'a, play_view_state::SetTrackName<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         PlayViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -706,18 +710,18 @@ where
     /// Build the final struct
     pub fn build(self) -> PlayView<'a> {
         PlayView {
-            artists: self.__unsafe_private_named.0.unwrap(),
-            duration: self.__unsafe_private_named.1,
-            isrc: self.__unsafe_private_named.2,
-            music_service_base_domain: self.__unsafe_private_named.3,
-            origin_url: self.__unsafe_private_named.4,
-            played_time: self.__unsafe_private_named.5,
-            recording_mb_id: self.__unsafe_private_named.6,
-            release_mb_id: self.__unsafe_private_named.7,
-            release_name: self.__unsafe_private_named.8,
-            submission_client_agent: self.__unsafe_private_named.9,
-            track_mb_id: self.__unsafe_private_named.10,
-            track_name: self.__unsafe_private_named.11.unwrap(),
+            artists: self._fields.0.unwrap(),
+            duration: self._fields.1,
+            isrc: self._fields.2,
+            music_service_base_domain: self._fields.3,
+            origin_url: self._fields.4,
+            played_time: self._fields.5,
+            recording_mb_id: self._fields.6,
+            release_mb_id: self._fields.7,
+            release_name: self._fields.8,
+            submission_client_agent: self._fields.9,
+            track_mb_id: self._fields.10,
+            track_name: self._fields.11.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -730,18 +734,18 @@ where
         >,
     ) -> PlayView<'a> {
         PlayView {
-            artists: self.__unsafe_private_named.0.unwrap(),
-            duration: self.__unsafe_private_named.1,
-            isrc: self.__unsafe_private_named.2,
-            music_service_base_domain: self.__unsafe_private_named.3,
-            origin_url: self.__unsafe_private_named.4,
-            played_time: self.__unsafe_private_named.5,
-            recording_mb_id: self.__unsafe_private_named.6,
-            release_mb_id: self.__unsafe_private_named.7,
-            release_name: self.__unsafe_private_named.8,
-            submission_client_agent: self.__unsafe_private_named.9,
-            track_mb_id: self.__unsafe_private_named.10,
-            track_name: self.__unsafe_private_named.11.unwrap(),
+            artists: self._fields.0.unwrap(),
+            duration: self._fields.1,
+            isrc: self._fields.2,
+            music_service_base_domain: self._fields.3,
+            origin_url: self._fields.4,
+            played_time: self._fields.5,
+            recording_mb_id: self._fields.6,
+            release_mb_id: self._fields.7,
+            release_name: self._fields.8,
+            submission_client_agent: self._fields.9,
+            track_mb_id: self._fields.10,
+            track_name: self._fields.11.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fm_teal/alpha/feed/get_actor_feed.rs b/crates/jacquard-api/src/fm_teal/alpha/feed/get_actor_feed.rs
index 09a7bdd2..2c3c91e9 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/feed/get_actor_feed.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/feed/get_actor_feed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -92,9 +95,9 @@ pub mod get_actor_feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorFeedBuilder<'a, S: get_actor_feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorFeed<'a> {
@@ -108,9 +111,9 @@ impl<'a> GetActorFeedBuilder<'a, get_actor_feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -125,11 +128,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorFeedBuilder<'a, get_actor_feed_state::SetAuthorDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,12 +140,12 @@ where
 impl<'a, S: get_actor_feed_state::State> GetActorFeedBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -150,12 +153,12 @@ impl<'a, S: get_actor_feed_state::State> GetActorFeedBuilder<'a, S> {
 impl<'a, S: get_actor_feed_state::State> GetActorFeedBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -168,9 +171,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorFeed<'a> {
         GetActorFeed {
-            author_did: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            author_did: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/fm_teal/alpha/feed/get_play.rs b/crates/jacquard-api/src/fm_teal/alpha/feed/get_play.rs
index aa1a712f..9a0698db 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/feed/get_play.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/feed/get_play.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -101,9 +104,9 @@ pub mod get_play_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetPlayBuilder<'a, S: get_play_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetPlay<'a> {
@@ -117,9 +120,9 @@ impl<'a> GetPlayBuilder<'a, get_play_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetPlayBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -134,11 +137,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetPlayBuilder<'a, get_play_state::SetAuthorDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetPlayBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -153,11 +156,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetPlayBuilder<'a, get_play_state::SetRkey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetPlayBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -171,8 +174,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetPlay<'a> {
         GetPlay {
-            author_did: self.__unsafe_private_named.0.unwrap(),
-            rkey: self.__unsafe_private_named.1.unwrap(),
+            author_did: self._fields.0.unwrap(),
+            rkey: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/fm_teal/alpha/feed/play.rs b/crates/jacquard-api/src/fm_teal/alpha/feed/play.rs
index 6850811d..2669dc32 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/feed/play.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/feed/play.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -313,8 +316,8 @@ pub mod play_state {
 
 /// Builder for constructing an instance of this type
 pub struct PlayBuilder<'a, S: play_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<CowStr<'a>>>,
         Option<Vec<CowStr<'a>>>,
         Option<Vec<Artist<'a>>>,
@@ -332,7 +335,7 @@ pub struct PlayBuilder<'a, S: play_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Play<'a> {
@@ -346,8 +349,8 @@ impl<'a> PlayBuilder<'a, play_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PlayBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -365,7 +368,7 @@ impl<'a> PlayBuilder<'a, play_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -373,12 +376,12 @@ impl<'a> PlayBuilder<'a, play_state::Empty> {
 impl<'a, S: play_state::State> PlayBuilder<'a, S> {
     /// Set the `artistMbIds` field (optional)
     pub fn artist_mb_ids(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `artistMbIds` field to an Option value (optional)
     pub fn maybe_artist_mb_ids(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -386,12 +389,12 @@ impl<'a, S: play_state::State> PlayBuilder<'a, S> {
 impl<'a, S: play_state::State> PlayBuilder<'a, S> {
     /// Set the `artistNames` field (optional)
     pub fn artist_names(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `artistNames` field to an Option value (optional)
     pub fn maybe_artist_names(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -399,12 +402,12 @@ impl<'a, S: play_state::State> PlayBuilder<'a, S> {
 impl<'a, S: play_state::State> PlayBuilder<'a, S> {
     /// Set the `artists` field (optional)
     pub fn artists(mut self, value: impl Into<Option<Vec<Artist<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `artists` field to an Option value (optional)
     pub fn maybe_artists(mut self, value: Option<Vec<Artist<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -412,12 +415,12 @@ impl<'a, S: play_state::State> PlayBuilder<'a, S> {
 impl<'a, S: play_state::State> PlayBuilder<'a, S> {
     /// Set the `duration` field (optional)
     pub fn duration(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `duration` field to an Option value (optional)
     pub fn maybe_duration(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -425,12 +428,12 @@ impl<'a, S: play_state::State> PlayBuilder<'a, S> {
 impl<'a, S: play_state::State> PlayBuilder<'a, S> {
     /// Set the `isrc` field (optional)
     pub fn isrc(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `isrc` field to an Option value (optional)
     pub fn maybe_isrc(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -441,12 +444,12 @@ impl<'a, S: play_state::State> PlayBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `musicServiceBaseDomain` field to an Option value (optional)
     pub fn maybe_music_service_base_domain(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -454,12 +457,12 @@ impl<'a, S: play_state::State> PlayBuilder<'a, S> {
 impl<'a, S: play_state::State> PlayBuilder<'a, S> {
     /// Set the `originUrl` field (optional)
     pub fn origin_url(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `originUrl` field to an Option value (optional)
     pub fn maybe_origin_url(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -467,12 +470,12 @@ impl<'a, S: play_state::State> PlayBuilder<'a, S> {
 impl<'a, S: play_state::State> PlayBuilder<'a, S> {
     /// Set the `playedTime` field (optional)
     pub fn played_time(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `playedTime` field to an Option value (optional)
     pub fn maybe_played_time(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -480,12 +483,12 @@ impl<'a, S: play_state::State> PlayBuilder<'a, S> {
 impl<'a, S: play_state::State> PlayBuilder<'a, S> {
     /// Set the `recordingMbId` field (optional)
     pub fn recording_mb_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `recordingMbId` field to an Option value (optional)
     pub fn maybe_recording_mb_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -493,12 +496,12 @@ impl<'a, S: play_state::State> PlayBuilder<'a, S> {
 impl<'a, S: play_state::State> PlayBuilder<'a, S> {
     /// Set the `releaseDiscriminant` field (optional)
     pub fn release_discriminant(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `releaseDiscriminant` field to an Option value (optional)
     pub fn maybe_release_discriminant(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -506,12 +509,12 @@ impl<'a, S: play_state::State> PlayBuilder<'a, S> {
 impl<'a, S: play_state::State> PlayBuilder<'a, S> {
     /// Set the `releaseMbId` field (optional)
     pub fn release_mb_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `releaseMbId` field to an Option value (optional)
     pub fn maybe_release_mb_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -519,12 +522,12 @@ impl<'a, S: play_state::State> PlayBuilder<'a, S> {
 impl<'a, S: play_state::State> PlayBuilder<'a, S> {
     /// Set the `releaseName` field (optional)
     pub fn release_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `releaseName` field to an Option value (optional)
     pub fn maybe_release_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -535,12 +538,12 @@ impl<'a, S: play_state::State> PlayBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `submissionClientAgent` field to an Option value (optional)
     pub fn maybe_submission_client_agent(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -548,12 +551,12 @@ impl<'a, S: play_state::State> PlayBuilder<'a, S> {
 impl<'a, S: play_state::State> PlayBuilder<'a, S> {
     /// Set the `trackDiscriminant` field (optional)
     pub fn track_discriminant(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `trackDiscriminant` field to an Option value (optional)
     pub fn maybe_track_discriminant(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -561,12 +564,12 @@ impl<'a, S: play_state::State> PlayBuilder<'a, S> {
 impl<'a, S: play_state::State> PlayBuilder<'a, S> {
     /// Set the `trackMbId` field (optional)
     pub fn track_mb_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `trackMbId` field to an Option value (optional)
     pub fn maybe_track_mb_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -581,11 +584,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PlayBuilder<'a, play_state::SetTrackName<S>> {
-        self.__unsafe_private_named.15 = Option::Some(value.into());
+        self._fields.15 = Option::Some(value.into());
         PlayBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -598,22 +601,22 @@ where
     /// Build the final struct
     pub fn build(self) -> Play<'a> {
         Play {
-            artist_mb_ids: self.__unsafe_private_named.0,
-            artist_names: self.__unsafe_private_named.1,
-            artists: self.__unsafe_private_named.2,
-            duration: self.__unsafe_private_named.3,
-            isrc: self.__unsafe_private_named.4,
-            music_service_base_domain: self.__unsafe_private_named.5,
-            origin_url: self.__unsafe_private_named.6,
-            played_time: self.__unsafe_private_named.7,
-            recording_mb_id: self.__unsafe_private_named.8,
-            release_discriminant: self.__unsafe_private_named.9,
-            release_mb_id: self.__unsafe_private_named.10,
-            release_name: self.__unsafe_private_named.11,
-            submission_client_agent: self.__unsafe_private_named.12,
-            track_discriminant: self.__unsafe_private_named.13,
-            track_mb_id: self.__unsafe_private_named.14,
-            track_name: self.__unsafe_private_named.15.unwrap(),
+            artist_mb_ids: self._fields.0,
+            artist_names: self._fields.1,
+            artists: self._fields.2,
+            duration: self._fields.3,
+            isrc: self._fields.4,
+            music_service_base_domain: self._fields.5,
+            origin_url: self._fields.6,
+            played_time: self._fields.7,
+            recording_mb_id: self._fields.8,
+            release_discriminant: self._fields.9,
+            release_mb_id: self._fields.10,
+            release_name: self._fields.11,
+            submission_client_agent: self._fields.12,
+            track_discriminant: self._fields.13,
+            track_mb_id: self._fields.14,
+            track_name: self._fields.15.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -626,22 +629,22 @@ where
         >,
     ) -> Play<'a> {
         Play {
-            artist_mb_ids: self.__unsafe_private_named.0,
-            artist_names: self.__unsafe_private_named.1,
-            artists: self.__unsafe_private_named.2,
-            duration: self.__unsafe_private_named.3,
-            isrc: self.__unsafe_private_named.4,
-            music_service_base_domain: self.__unsafe_private_named.5,
-            origin_url: self.__unsafe_private_named.6,
-            played_time: self.__unsafe_private_named.7,
-            recording_mb_id: self.__unsafe_private_named.8,
-            release_discriminant: self.__unsafe_private_named.9,
-            release_mb_id: self.__unsafe_private_named.10,
-            release_name: self.__unsafe_private_named.11,
-            submission_client_agent: self.__unsafe_private_named.12,
-            track_discriminant: self.__unsafe_private_named.13,
-            track_mb_id: self.__unsafe_private_named.14,
-            track_name: self.__unsafe_private_named.15.unwrap(),
+            artist_mb_ids: self._fields.0,
+            artist_names: self._fields.1,
+            artists: self._fields.2,
+            duration: self._fields.3,
+            isrc: self._fields.4,
+            music_service_base_domain: self._fields.5,
+            origin_url: self._fields.6,
+            played_time: self._fields.7,
+            recording_mb_id: self._fields.8,
+            release_discriminant: self._fields.9,
+            release_mb_id: self._fields.10,
+            release_name: self._fields.11,
+            submission_client_agent: self._fields.12,
+            track_discriminant: self._fields.13,
+            track_mb_id: self._fields.14,
+            track_name: self._fields.15.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fm_teal/alpha/stats.rs b/crates/jacquard-api/src/fm_teal/alpha/stats.rs
index 78067728..9f517776 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/stats.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/stats.rs
@@ -11,7 +11,11 @@ pub mod get_top_releases;
 pub mod get_user_top_artists;
 pub mod get_user_top_releases;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -124,59 +128,59 @@ pub mod artist_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Mbid;
         type Name;
         type PlayCount;
-        type Mbid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Mbid = Unset;
         type Name = Unset;
         type PlayCount = Unset;
-        type Mbid = Unset;
+    }
+    ///State transition - sets the `mbid` field to Set
+    pub struct SetMbid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMbid<S> {}
+    impl<S: State> State for SetMbid<S> {
+        type Mbid = Set<members::mbid>;
+        type Name = S::Name;
+        type PlayCount = S::PlayCount;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
+        type Mbid = S::Mbid;
         type Name = Set<members::name>;
         type PlayCount = S::PlayCount;
-        type Mbid = S::Mbid;
     }
     ///State transition - sets the `play_count` field to Set
     pub struct SetPlayCount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPlayCount<S> {}
     impl<S: State> State for SetPlayCount<S> {
-        type Name = S::Name;
-        type PlayCount = Set<members::play_count>;
         type Mbid = S::Mbid;
-    }
-    ///State transition - sets the `mbid` field to Set
-    pub struct SetMbid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMbid<S> {}
-    impl<S: State> State for SetMbid<S> {
         type Name = S::Name;
-        type PlayCount = S::PlayCount;
-        type Mbid = Set<members::mbid>;
+        type PlayCount = Set<members::play_count>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `mbid` field
+        pub struct mbid(());
         ///Marker type for the `name` field
         pub struct name(());
         ///Marker type for the `play_count` field
         pub struct play_count(());
-        ///Marker type for the `mbid` field
-        pub struct mbid(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ArtistViewBuilder<'a, S: artist_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ArtistView<'a> {
@@ -190,9 +194,9 @@ impl<'a> ArtistViewBuilder<'a, artist_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ArtistViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -207,11 +211,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ArtistViewBuilder<'a, artist_view_state::SetMbid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ArtistViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -226,11 +230,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ArtistViewBuilder<'a, artist_view_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ArtistViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -245,11 +249,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ArtistViewBuilder<'a, artist_view_state::SetPlayCount<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ArtistViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -257,16 +261,16 @@ where
 impl<'a, S> ArtistViewBuilder<'a, S>
 where
     S: artist_view_state::State,
+    S::Mbid: artist_view_state::IsSet,
     S::Name: artist_view_state::IsSet,
     S::PlayCount: artist_view_state::IsSet,
-    S::Mbid: artist_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ArtistView<'a> {
         ArtistView {
-            mbid: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            play_count: self.__unsafe_private_named.2.unwrap(),
+            mbid: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            play_count: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -279,9 +283,9 @@ where
         >,
     ) -> ArtistView<'a> {
         ArtistView {
-            mbid: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            play_count: self.__unsafe_private_named.2.unwrap(),
+            mbid: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            play_count: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -482,9 +486,9 @@ pub mod recording_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordingViewBuilder<'a, S: recording_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RecordingView<'a> {
@@ -498,9 +502,9 @@ impl<'a> RecordingViewBuilder<'a, recording_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordingViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -515,11 +519,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RecordingViewBuilder<'a, recording_view_state::SetMbid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordingViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -534,11 +538,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RecordingViewBuilder<'a, recording_view_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RecordingViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -553,11 +557,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RecordingViewBuilder<'a, recording_view_state::SetPlayCount<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RecordingViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -572,9 +576,9 @@ where
     /// Build the final struct
     pub fn build(self) -> RecordingView<'a> {
         RecordingView {
-            mbid: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            play_count: self.__unsafe_private_named.2.unwrap(),
+            mbid: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            play_count: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -587,9 +591,9 @@ where
         >,
     ) -> RecordingView<'a> {
         RecordingView {
-            mbid: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            play_count: self.__unsafe_private_named.2.unwrap(),
+            mbid: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            play_count: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -605,49 +609,49 @@ pub mod release_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Mbid;
         type PlayCount;
+        type Mbid;
         type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Mbid = Unset;
         type PlayCount = Unset;
+        type Mbid = Unset;
         type Name = Unset;
     }
-    ///State transition - sets the `mbid` field to Set
-    pub struct SetMbid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMbid<S> {}
-    impl<S: State> State for SetMbid<S> {
-        type Mbid = Set<members::mbid>;
-        type PlayCount = S::PlayCount;
-        type Name = S::Name;
-    }
     ///State transition - sets the `play_count` field to Set
     pub struct SetPlayCount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPlayCount<S> {}
     impl<S: State> State for SetPlayCount<S> {
-        type Mbid = S::Mbid;
         type PlayCount = Set<members::play_count>;
+        type Mbid = S::Mbid;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `mbid` field to Set
+    pub struct SetMbid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMbid<S> {}
+    impl<S: State> State for SetMbid<S> {
+        type PlayCount = S::PlayCount;
+        type Mbid = Set<members::mbid>;
         type Name = S::Name;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Mbid = S::Mbid;
         type PlayCount = S::PlayCount;
+        type Mbid = S::Mbid;
         type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `mbid` field
-        pub struct mbid(());
         ///Marker type for the `play_count` field
         pub struct play_count(());
+        ///Marker type for the `mbid` field
+        pub struct mbid(());
         ///Marker type for the `name` field
         pub struct name(());
     }
@@ -655,9 +659,9 @@ pub mod release_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReleaseViewBuilder<'a, S: release_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReleaseView<'a> {
@@ -671,9 +675,9 @@ impl<'a> ReleaseViewBuilder<'a, release_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReleaseViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -688,11 +692,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReleaseViewBuilder<'a, release_view_state::SetMbid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReleaseViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -707,11 +711,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReleaseViewBuilder<'a, release_view_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReleaseViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -726,11 +730,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ReleaseViewBuilder<'a, release_view_state::SetPlayCount<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReleaseViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -738,16 +742,16 @@ where
 impl<'a, S> ReleaseViewBuilder<'a, S>
 where
     S: release_view_state::State,
-    S::Mbid: release_view_state::IsSet,
     S::PlayCount: release_view_state::IsSet,
+    S::Mbid: release_view_state::IsSet,
     S::Name: release_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ReleaseView<'a> {
         ReleaseView {
-            mbid: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            play_count: self.__unsafe_private_named.2.unwrap(),
+            mbid: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            play_count: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -760,9 +764,9 @@ where
         >,
     ) -> ReleaseView<'a> {
         ReleaseView {
-            mbid: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            play_count: self.__unsafe_private_named.2.unwrap(),
+            mbid: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            play_count: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fm_teal/alpha/stats/get_latest.rs b/crates/jacquard-api/src/fm_teal/alpha/stats/get_latest.rs
index 37d617da..e0c5e501 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/stats/get_latest.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/stats/get_latest.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
@@ -78,8 +81,8 @@ pub mod get_latest_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetLatestBuilder<S: get_latest_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
 }
 
 impl GetLatest {
@@ -93,8 +96,8 @@ impl GetLatestBuilder<get_latest_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetLatestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -102,12 +105,12 @@ impl GetLatestBuilder<get_latest_state::Empty> {
 impl<S: get_latest_state::State> GetLatestBuilder<S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -118,8 +121,6 @@ where
 {
     /// Build the final struct
     pub fn build(self) -> GetLatest {
-        GetLatest {
-            limit: self.__unsafe_private_named.0,
-        }
+        GetLatest { limit: self._fields.0 }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/fm_teal/alpha/stats/get_top_artists.rs b/crates/jacquard-api/src/fm_teal/alpha/stats/get_top_artists.rs
index 3030cc9e..e3c9010d 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/stats/get_top_artists.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/stats/get_top_artists.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -95,9 +98,9 @@ pub mod get_top_artists_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTopArtistsBuilder<'a, S: get_top_artists_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetTopArtists<'a> {
@@ -111,9 +114,9 @@ impl<'a> GetTopArtistsBuilder<'a, get_top_artists_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTopArtistsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -121,12 +124,12 @@ impl<'a> GetTopArtistsBuilder<'a, get_top_artists_state::Empty> {
 impl<'a, S: get_top_artists_state::State> GetTopArtistsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -134,12 +137,12 @@ impl<'a, S: get_top_artists_state::State> GetTopArtistsBuilder<'a, S> {
 impl<'a, S: get_top_artists_state::State> GetTopArtistsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -147,12 +150,12 @@ impl<'a, S: get_top_artists_state::State> GetTopArtistsBuilder<'a, S> {
 impl<'a, S: get_top_artists_state::State> GetTopArtistsBuilder<'a, S> {
     /// Set the `period` field (optional)
     pub fn period(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `period` field to an Option value (optional)
     pub fn maybe_period(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -164,9 +167,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetTopArtists<'a> {
         GetTopArtists {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            period: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            period: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/fm_teal/alpha/stats/get_top_releases.rs b/crates/jacquard-api/src/fm_teal/alpha/stats/get_top_releases.rs
index 0b6ea1fe..eb62d115 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/stats/get_top_releases.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/stats/get_top_releases.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -95,9 +98,9 @@ pub mod get_top_releases_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTopReleasesBuilder<'a, S: get_top_releases_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetTopReleases<'a> {
@@ -111,9 +114,9 @@ impl<'a> GetTopReleasesBuilder<'a, get_top_releases_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTopReleasesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -121,12 +124,12 @@ impl<'a> GetTopReleasesBuilder<'a, get_top_releases_state::Empty> {
 impl<'a, S: get_top_releases_state::State> GetTopReleasesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -134,12 +137,12 @@ impl<'a, S: get_top_releases_state::State> GetTopReleasesBuilder<'a, S> {
 impl<'a, S: get_top_releases_state::State> GetTopReleasesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -147,12 +150,12 @@ impl<'a, S: get_top_releases_state::State> GetTopReleasesBuilder<'a, S> {
 impl<'a, S: get_top_releases_state::State> GetTopReleasesBuilder<'a, S> {
     /// Set the `period` field (optional)
     pub fn period(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `period` field to an Option value (optional)
     pub fn maybe_period(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -164,9 +167,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetTopReleases<'a> {
         GetTopReleases {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            period: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            period: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/fm_teal/alpha/stats/get_user_top_artists.rs b/crates/jacquard-api/src/fm_teal/alpha/stats/get_user_top_artists.rs
index f7c22fe0..1658c1d2 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/stats/get_user_top_artists.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/stats/get_user_top_artists.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -111,14 +114,14 @@ pub mod get_user_top_artists_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetUserTopArtistsBuilder<'a, S: get_user_top_artists_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetUserTopArtists<'a> {
@@ -132,9 +135,9 @@ impl<'a> GetUserTopArtistsBuilder<'a, get_user_top_artists_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetUserTopArtistsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,11 +152,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetUserTopArtistsBuilder<'a, get_user_top_artists_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetUserTopArtistsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -161,12 +164,12 @@ where
 impl<'a, S: get_user_top_artists_state::State> GetUserTopArtistsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -174,12 +177,12 @@ impl<'a, S: get_user_top_artists_state::State> GetUserTopArtistsBuilder<'a, S> {
 impl<'a, S: get_user_top_artists_state::State> GetUserTopArtistsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -187,12 +190,12 @@ impl<'a, S: get_user_top_artists_state::State> GetUserTopArtistsBuilder<'a, S> {
 impl<'a, S: get_user_top_artists_state::State> GetUserTopArtistsBuilder<'a, S> {
     /// Set the `period` field (optional)
     pub fn period(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `period` field to an Option value (optional)
     pub fn maybe_period(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -205,10 +208,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetUserTopArtists<'a> {
         GetUserTopArtists {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            period: self.__unsafe_private_named.3,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
+            period: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/fm_teal/alpha/stats/get_user_top_releases.rs b/crates/jacquard-api/src/fm_teal/alpha/stats/get_user_top_releases.rs
index be8c346c..f4b1a749 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/stats/get_user_top_releases.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/stats/get_user_top_releases.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -111,14 +114,14 @@ pub mod get_user_top_releases_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetUserTopReleasesBuilder<'a, S: get_user_top_releases_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetUserTopReleases<'a> {
@@ -132,9 +135,9 @@ impl<'a> GetUserTopReleasesBuilder<'a, get_user_top_releases_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetUserTopReleasesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,11 +152,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetUserTopReleasesBuilder<'a, get_user_top_releases_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetUserTopReleasesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -161,12 +164,12 @@ where
 impl<'a, S: get_user_top_releases_state::State> GetUserTopReleasesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -174,12 +177,12 @@ impl<'a, S: get_user_top_releases_state::State> GetUserTopReleasesBuilder<'a, S>
 impl<'a, S: get_user_top_releases_state::State> GetUserTopReleasesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -187,12 +190,12 @@ impl<'a, S: get_user_top_releases_state::State> GetUserTopReleasesBuilder<'a, S>
 impl<'a, S: get_user_top_releases_state::State> GetUserTopReleasesBuilder<'a, S> {
     /// Set the `period` field (optional)
     pub fn period(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `period` field to an Option value (optional)
     pub fn maybe_period(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -205,10 +208,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetUserTopReleases<'a> {
         GetUserTopReleases {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            period: self.__unsafe_private_named.3,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
+            period: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/fyi_frontpage/feed/comment.rs b/crates/jacquard-api/src/fyi_frontpage/feed/comment.rs
index 7a3858eb..a44a666b 100644
--- a/crates/jacquard-api/src/fyi_frontpage/feed/comment.rs
+++ b/crates/jacquard-api/src/fyi_frontpage/feed/comment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -128,49 +131,49 @@ pub mod comment_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Post;
         type CreatedAt;
+        type Post;
         type Blocks;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Post = Unset;
         type CreatedAt = Unset;
+        type Post = Unset;
         type Blocks = Unset;
     }
-    ///State transition - sets the `post` field to Set
-    pub struct SetPost<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPost<S> {}
-    impl<S: State> State for SetPost<S> {
-        type Post = Set<members::post>;
-        type CreatedAt = S::CreatedAt;
-        type Blocks = S::Blocks;
-    }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Post = S::Post;
         type CreatedAt = Set<members::created_at>;
+        type Post = S::Post;
+        type Blocks = S::Blocks;
+    }
+    ///State transition - sets the `post` field to Set
+    pub struct SetPost<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPost<S> {}
+    impl<S: State> State for SetPost<S> {
+        type CreatedAt = S::CreatedAt;
+        type Post = Set<members::post>;
         type Blocks = S::Blocks;
     }
     ///State transition - sets the `blocks` field to Set
     pub struct SetBlocks<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBlocks<S> {}
     impl<S: State> State for SetBlocks<S> {
-        type Post = S::Post;
         type CreatedAt = S::CreatedAt;
+        type Post = S::Post;
         type Blocks = Set<members::blocks>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `post` field
-        pub struct post(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `post` field
+        pub struct post(());
         ///Marker type for the `blocks` field
         pub struct blocks(());
     }
@@ -178,14 +181,14 @@ pub mod comment_state {
 
 /// Builder for constructing an instance of this type
 pub struct CommentBuilder<'a, S: comment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<Block<'a>>>,
         Option<Datetime>,
         Option<StrongRef<'a>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Comment<'a> {
@@ -199,9 +202,9 @@ impl<'a> CommentBuilder<'a, comment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,11 +219,11 @@ where
         mut self,
         value: impl Into<Vec<Block<'a>>>,
     ) -> CommentBuilder<'a, comment_state::SetBlocks<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -235,11 +238,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CommentBuilder<'a, comment_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -247,12 +250,12 @@ where
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -267,11 +270,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetPost<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -279,17 +282,17 @@ where
 impl<'a, S> CommentBuilder<'a, S>
 where
     S: comment_state::State,
-    S::Post: comment_state::IsSet,
     S::CreatedAt: comment_state::IsSet,
+    S::Post: comment_state::IsSet,
     S::Blocks: comment_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Comment<'a> {
         Comment {
-            blocks: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            parent: self.__unsafe_private_named.2,
-            post: self.__unsafe_private_named.3.unwrap(),
+            blocks: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            parent: self._fields.2,
+            post: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -302,10 +305,10 @@ where
         >,
     ) -> Comment<'a> {
         Comment {
-            blocks: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            parent: self.__unsafe_private_named.2,
-            post: self.__unsafe_private_named.3.unwrap(),
+            blocks: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            parent: self._fields.2,
+            post: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fyi_frontpage/feed/post.rs b/crates/jacquard-api/src/fyi_frontpage/feed/post.rs
index 32352ab2..7509dbf8 100644
--- a/crates/jacquard-api/src/fyi_frontpage/feed/post.rs
+++ b/crates/jacquard-api/src/fyi_frontpage/feed/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -212,13 +215,9 @@ pub mod post_state {
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<post::UrlSubject<'a>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<post::UrlSubject<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -232,9 +231,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,11 +248,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -268,11 +267,11 @@ where
         mut self,
         value: impl Into<post::UrlSubject<'a>>,
     ) -> PostBuilder<'a, post_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -287,11 +286,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetTitle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -306,9 +305,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            title: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            title: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -321,9 +320,9 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            title: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            title: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -458,9 +457,9 @@ pub mod url_subject_state {
 
 /// Builder for constructing an instance of this type
 pub struct UrlSubjectBuilder<'a, S: url_subject_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UrlSubject<'a> {
@@ -474,9 +473,9 @@ impl<'a> UrlSubjectBuilder<'a, url_subject_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UrlSubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -491,11 +490,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> UrlSubjectBuilder<'a, url_subject_state::SetUrl<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UrlSubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -508,7 +507,7 @@ where
     /// Build the final struct
     pub fn build(self) -> UrlSubject<'a> {
         UrlSubject {
-            url: self.__unsafe_private_named.0.unwrap(),
+            url: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -521,7 +520,7 @@ where
         >,
     ) -> UrlSubject<'a> {
         UrlSubject {
-            url: self.__unsafe_private_named.0.unwrap(),
+            url: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fyi_frontpage/feed/vote.rs b/crates/jacquard-api/src/fyi_frontpage/feed/vote.rs
index b6f4169a..9a29abaa 100644
--- a/crates/jacquard-api/src/fyi_frontpage/feed/vote.rs
+++ b/crates/jacquard-api/src/fyi_frontpage/feed/vote.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -147,9 +150,9 @@ pub mod vote_state {
 
 /// Builder for constructing an instance of this type
 pub struct VoteBuilder<'a, S: vote_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Vote<'a> {
@@ -163,9 +166,9 @@ impl<'a> VoteBuilder<'a, vote_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,11 +183,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> VoteBuilder<'a, vote_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -199,11 +202,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> VoteBuilder<'a, vote_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -217,8 +220,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Vote<'a> {
         Vote {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -231,8 +234,8 @@ where
         >,
     ) -> Vote<'a> {
         Vote {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fyi_frontpage/richtext/block.rs b/crates/jacquard-api/src/fyi_frontpage/richtext/block.rs
index 85af0b7c..5f89a2d1 100644
--- a/crates/jacquard-api/src/fyi_frontpage/richtext/block.rs
+++ b/crates/jacquard-api/src/fyi_frontpage/richtext/block.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -125,9 +128,9 @@ pub mod block_state {
 
 /// Builder for constructing an instance of this type
 pub struct BlockBuilder<'a, S: block_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<block::PlaintextParagraph<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<block::PlaintextParagraph<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Block<'a> {
@@ -141,9 +144,9 @@ impl<'a> BlockBuilder<'a, block_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -158,11 +161,11 @@ where
         mut self,
         value: impl Into<block::PlaintextParagraph<'a>>,
     ) -> BlockBuilder<'a, block_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -175,7 +178,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Block<'a> {
         Block {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -188,7 +191,7 @@ where
         >,
     ) -> Block<'a> {
         Block {
-            content: self.__unsafe_private_named.0.unwrap(),
+            content: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fyi_questionable/actor/profile.rs b/crates/jacquard-api/src/fyi_questionable/actor/profile.rs
index 85b4a5f6..24b1d870 100644
--- a/crates/jacquard-api/src/fyi_questionable/actor/profile.rs
+++ b/crates/jacquard-api/src/fyi_questionable/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -168,9 +171,9 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -184,9 +187,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -194,12 +197,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -207,12 +210,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -220,12 +223,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -237,9 +240,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            created_at: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            display_name: self.__unsafe_private_named.2,
+            created_at: self._fields.0,
+            description: self._fields.1,
+            display_name: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -252,9 +255,9 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            created_at: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            display_name: self.__unsafe_private_named.2,
+            created_at: self._fields.0,
+            description: self._fields.1,
+            display_name: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fyi_questionable/answer.rs b/crates/jacquard-api/src/fyi_questionable/answer.rs
index 4b3b5326..acd36232 100644
--- a/crates/jacquard-api/src/fyi_questionable/answer.rs
+++ b/crates/jacquard-api/src/fyi_questionable/answer.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -125,64 +128,64 @@ pub mod answer_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Content;
         type CreatedAt;
         type Question;
+        type Content;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Content = Unset;
         type CreatedAt = Unset;
         type Question = Unset;
-    }
-    ///State transition - sets the `content` field to Set
-    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContent<S> {}
-    impl<S: State> State for SetContent<S> {
-        type Content = Set<members::content>;
-        type CreatedAt = S::CreatedAt;
-        type Question = S::Question;
+        type Content = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Content = S::Content;
         type CreatedAt = Set<members::created_at>;
         type Question = S::Question;
+        type Content = S::Content;
     }
     ///State transition - sets the `question` field to Set
     pub struct SetQuestion<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetQuestion<S> {}
     impl<S: State> State for SetQuestion<S> {
-        type Content = S::Content;
         type CreatedAt = S::CreatedAt;
         type Question = Set<members::question>;
+        type Content = S::Content;
+    }
+    ///State transition - sets the `content` field to Set
+    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContent<S> {}
+    impl<S: State> State for SetContent<S> {
+        type CreatedAt = S::CreatedAt;
+        type Question = S::Question;
+        type Content = Set<members::content>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `content` field
-        pub struct content(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `question` field
         pub struct question(());
+        ///Marker type for the `content` field
+        pub struct content(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AnswerBuilder<'a, S: answer_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Content<'a>>,
         Option<Datetime>,
         Option<Vec<Language>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Answer<'a> {
@@ -196,9 +199,9 @@ impl<'a> AnswerBuilder<'a, answer_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AnswerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,11 +216,11 @@ where
         mut self,
         value: impl Into<Content<'a>>,
     ) -> AnswerBuilder<'a, answer_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AnswerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,11 +235,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AnswerBuilder<'a, answer_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AnswerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,12 +247,12 @@ where
 impl<'a, S: answer_state::State> AnswerBuilder<'a, S> {
     /// Set the `languages` field (optional)
     pub fn languages(mut self, value: impl Into<Option<Vec<Language>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `languages` field to an Option value (optional)
     pub fn maybe_languages(mut self, value: Option<Vec<Language>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -264,11 +267,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> AnswerBuilder<'a, answer_state::SetQuestion<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         AnswerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -276,17 +279,17 @@ where
 impl<'a, S> AnswerBuilder<'a, S>
 where
     S: answer_state::State,
-    S::Content: answer_state::IsSet,
     S::CreatedAt: answer_state::IsSet,
     S::Question: answer_state::IsSet,
+    S::Content: answer_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Answer<'a> {
         Answer {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            languages: self.__unsafe_private_named.2,
-            question: self.__unsafe_private_named.3.unwrap(),
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            languages: self._fields.2,
+            question: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -299,10 +302,10 @@ where
         >,
     ) -> Answer<'a> {
         Answer {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            languages: self.__unsafe_private_named.2,
-            question: self.__unsafe_private_named.3.unwrap(),
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            languages: self._fields.2,
+            question: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fyi_questionable/question.rs b/crates/jacquard-api/src/fyi_questionable/question.rs
index 87b2cfe7..3693653d 100644
--- a/crates/jacquard-api/src/fyi_questionable/question.rs
+++ b/crates/jacquard-api/src/fyi_questionable/question.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -165,49 +168,49 @@ pub mod question_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Content;
         type CreatedAt;
+        type Content;
         type Summary;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Content = Unset;
         type CreatedAt = Unset;
+        type Content = Unset;
         type Summary = Unset;
     }
-    ///State transition - sets the `content` field to Set
-    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContent<S> {}
-    impl<S: State> State for SetContent<S> {
-        type Content = Set<members::content>;
-        type CreatedAt = S::CreatedAt;
-        type Summary = S::Summary;
-    }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Content = S::Content;
         type CreatedAt = Set<members::created_at>;
+        type Content = S::Content;
+        type Summary = S::Summary;
+    }
+    ///State transition - sets the `content` field to Set
+    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContent<S> {}
+    impl<S: State> State for SetContent<S> {
+        type CreatedAt = S::CreatedAt;
+        type Content = Set<members::content>;
         type Summary = S::Summary;
     }
     ///State transition - sets the `summary` field to Set
     pub struct SetSummary<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSummary<S> {}
     impl<S: State> State for SetSummary<S> {
-        type Content = S::Content;
         type CreatedAt = S::CreatedAt;
+        type Content = S::Content;
         type Summary = Set<members::summary>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `content` field
-        pub struct content(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `content` field
+        pub struct content(());
         ///Marker type for the `summary` field
         pub struct summary(());
     }
@@ -215,15 +218,15 @@ pub mod question_state {
 
 /// Builder for constructing an instance of this type
 pub struct QuestionBuilder<'a, S: question_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Content<'a>>,
         Option<StrongRef<'a>>,
         Option<Datetime>,
         Option<Vec<Language>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Question<'a> {
@@ -237,9 +240,9 @@ impl<'a> QuestionBuilder<'a, question_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         QuestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -254,11 +257,11 @@ where
         mut self,
         value: impl Into<Content<'a>>,
     ) -> QuestionBuilder<'a, question_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         QuestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -266,12 +269,12 @@ where
 impl<'a, S: question_state::State> QuestionBuilder<'a, S> {
     /// Set the `contextRef` field (optional)
     pub fn context_ref(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `contextRef` field to an Option value (optional)
     pub fn maybe_context_ref(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -286,11 +289,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> QuestionBuilder<'a, question_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         QuestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -298,12 +301,12 @@ where
 impl<'a, S: question_state::State> QuestionBuilder<'a, S> {
     /// Set the `languages` field (optional)
     pub fn languages(mut self, value: impl Into<Option<Vec<Language>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `languages` field to an Option value (optional)
     pub fn maybe_languages(mut self, value: Option<Vec<Language>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -318,11 +321,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> QuestionBuilder<'a, question_state::SetSummary<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         QuestionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -330,18 +333,18 @@ where
 impl<'a, S> QuestionBuilder<'a, S>
 where
     S: question_state::State,
-    S::Content: question_state::IsSet,
     S::CreatedAt: question_state::IsSet,
+    S::Content: question_state::IsSet,
     S::Summary: question_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Question<'a> {
         Question {
-            content: self.__unsafe_private_named.0.unwrap(),
-            context_ref: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            languages: self.__unsafe_private_named.3,
-            summary: self.__unsafe_private_named.4.unwrap(),
+            content: self._fields.0.unwrap(),
+            context_ref: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            languages: self._fields.3,
+            summary: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -354,11 +357,11 @@ where
         >,
     ) -> Question<'a> {
         Question {
-            content: self.__unsafe_private_named.0.unwrap(),
-            context_ref: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            languages: self.__unsafe_private_named.3,
-            summary: self.__unsafe_private_named.4.unwrap(),
+            content: self._fields.0.unwrap(),
+            context_ref: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            languages: self._fields.3,
+            summary: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fyi_questionable/richtext/bsky_post.rs b/crates/jacquard-api/src/fyi_questionable/richtext/bsky_post.rs
index 74319ded..cd3ff43a 100644
--- a/crates/jacquard-api/src/fyi_questionable/richtext/bsky_post.rs
+++ b/crates/jacquard-api/src/fyi_questionable/richtext/bsky_post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -76,9 +79,9 @@ pub mod bsky_post_state {
 
 /// Builder for constructing an instance of this type
 pub struct BskyPostBuilder<'a, S: bsky_post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BskyPost<'a> {
@@ -92,9 +95,9 @@ impl<'a> BskyPostBuilder<'a, bsky_post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BskyPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -109,11 +112,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> BskyPostBuilder<'a, bsky_post_state::SetPostRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BskyPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -126,7 +129,7 @@ where
     /// Build the final struct
     pub fn build(self) -> BskyPost<'a> {
         BskyPost {
-            post_ref: self.__unsafe_private_named.0.unwrap(),
+            post_ref: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -139,7 +142,7 @@ where
         >,
     ) -> BskyPost<'a> {
         BskyPost {
-            post_ref: self.__unsafe_private_named.0.unwrap(),
+            post_ref: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fyi_questionable/richtext/content.rs b/crates/jacquard-api/src/fyi_questionable/richtext/content.rs
index 6dff6d39..7171d14f 100644
--- a/crates/jacquard-api/src/fyi_questionable/richtext/content.rs
+++ b/crates/jacquard-api/src/fyi_questionable/richtext/content.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -125,9 +128,9 @@ pub mod content_state {
 
 /// Builder for constructing an instance of this type
 pub struct ContentBuilder<'a, S: content_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<ContentItemsItem<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<ContentItemsItem<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Content<'a> {
@@ -141,9 +144,9 @@ impl<'a> ContentBuilder<'a, content_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ContentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -158,11 +161,11 @@ where
         mut self,
         value: impl Into<Vec<ContentItemsItem<'a>>>,
     ) -> ContentBuilder<'a, content_state::SetItems<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ContentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -175,7 +178,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Content<'a> {
         Content {
-            items: self.__unsafe_private_named.0.unwrap(),
+            items: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -188,7 +191,7 @@ where
         >,
     ) -> Content<'a> {
         Content {
-            items: self.__unsafe_private_named.0.unwrap(),
+            items: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fyi_questionable/richtext/facet.rs b/crates/jacquard-api/src/fyi_questionable/richtext/facet.rs
index ec0f8499..1f729837 100644
--- a/crates/jacquard-api/src/fyi_questionable/richtext/facet.rs
+++ b/crates/jacquard-api/src/fyi_questionable/richtext/facet.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -568,9 +571,9 @@ pub mod byte_slice_state {
 
 /// Builder for constructing an instance of this type
 pub struct ByteSliceBuilder<'a, S: byte_slice_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ByteSlice<'a> {
@@ -584,9 +587,9 @@ impl<'a> ByteSliceBuilder<'a, byte_slice_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -601,11 +604,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteEnd<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -620,11 +623,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteStart<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -638,8 +641,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -652,8 +655,8 @@ where
         >,
     ) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -693,9 +696,9 @@ pub mod link_state {
 
 /// Builder for constructing an instance of this type
 pub struct LinkBuilder<'a, S: link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Link<'a> {
@@ -709,9 +712,9 @@ impl<'a> LinkBuilder<'a, link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -726,11 +729,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LinkBuilder<'a, link_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -743,7 +746,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Link<'a> {
         Link {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -756,7 +759,7 @@ where
         >,
     ) -> Link<'a> {
         Link {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -808,12 +811,9 @@ pub mod facet_state {
 
 /// Builder for constructing an instance of this type
 pub struct FacetBuilder<'a, S: facet_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<FacetFeaturesItem<'a>>>,
-        Option<facet::ByteSlice<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<FacetFeaturesItem<'a>>>, Option<facet::ByteSlice<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Facet<'a> {
@@ -827,9 +827,9 @@ impl<'a> FacetBuilder<'a, facet_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -844,11 +844,11 @@ where
         mut self,
         value: impl Into<Vec<FacetFeaturesItem<'a>>>,
     ) -> FacetBuilder<'a, facet_state::SetFeatures<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -863,11 +863,11 @@ where
         mut self,
         value: impl Into<facet::ByteSlice<'a>>,
     ) -> FacetBuilder<'a, facet_state::SetIndex<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -881,8 +881,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -895,8 +895,8 @@ where
         >,
     ) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -936,9 +936,9 @@ pub mod mention_state {
 
 /// Builder for constructing an instance of this type
 pub struct MentionBuilder<'a, S: mention_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Mention<'a> {
@@ -952,9 +952,9 @@ impl<'a> MentionBuilder<'a, mention_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -969,11 +969,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MentionBuilder<'a, mention_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -986,7 +986,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Mention<'a> {
         Mention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -999,7 +999,7 @@ where
         >,
     ) -> Mention<'a> {
         Mention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fyi_questionable/richtext/header.rs b/crates/jacquard-api/src/fyi_questionable/richtext/header.rs
index 4860fc16..32f45ded 100644
--- a/crates/jacquard-api/src/fyi_questionable/richtext/header.rs
+++ b/crates/jacquard-api/src/fyi_questionable/richtext/header.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -137,9 +140,9 @@ pub mod header_state {
 
 /// Builder for constructing an instance of this type
 pub struct HeaderBuilder<'a, S: header_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<Facet<'a>>>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<Facet<'a>>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Header<'a> {
@@ -153,9 +156,9 @@ impl<'a> HeaderBuilder<'a, header_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HeaderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -163,12 +166,12 @@ impl<'a> HeaderBuilder<'a, header_state::Empty> {
 impl<'a, S: header_state::State> HeaderBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -183,11 +186,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> HeaderBuilder<'a, header_state::SetLevel<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         HeaderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -202,11 +205,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> HeaderBuilder<'a, header_state::SetPlaintext<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         HeaderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -220,9 +223,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Header<'a> {
         Header {
-            facets: self.__unsafe_private_named.0,
-            level: self.__unsafe_private_named.1.unwrap(),
-            plaintext: self.__unsafe_private_named.2.unwrap(),
+            facets: self._fields.0,
+            level: self._fields.1.unwrap(),
+            plaintext: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -235,9 +238,9 @@ where
         >,
     ) -> Header<'a> {
         Header {
-            facets: self.__unsafe_private_named.0,
-            level: self.__unsafe_private_named.1.unwrap(),
-            plaintext: self.__unsafe_private_named.2.unwrap(),
+            facets: self._fields.0,
+            level: self._fields.1.unwrap(),
+            plaintext: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fyi_questionable/richtext/image.rs b/crates/jacquard-api/src/fyi_questionable/richtext/image.rs
index fff1e2b8..8596e202 100644
--- a/crates/jacquard-api/src/fyi_questionable/richtext/image.rs
+++ b/crates/jacquard-api/src/fyi_questionable/richtext/image.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,45 +149,45 @@ pub mod aspect_ratio_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Height;
         type Width;
+        type Height;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Height = Unset;
         type Width = Unset;
-    }
-    ///State transition - sets the `height` field to Set
-    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHeight<S> {}
-    impl<S: State> State for SetHeight<S> {
-        type Height = Set<members::height>;
-        type Width = S::Width;
+        type Height = Unset;
     }
     ///State transition - sets the `width` field to Set
     pub struct SetWidth<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWidth<S> {}
     impl<S: State> State for SetWidth<S> {
-        type Height = S::Height;
         type Width = Set<members::width>;
+        type Height = S::Height;
+    }
+    ///State transition - sets the `height` field to Set
+    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHeight<S> {}
+    impl<S: State> State for SetHeight<S> {
+        type Width = S::Width;
+        type Height = Set<members::height>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `height` field
-        pub struct height(());
         ///Marker type for the `width` field
         pub struct width(());
+        ///Marker type for the `height` field
+        pub struct height(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AspectRatioBuilder<'a, S: aspect_ratio_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AspectRatio<'a> {
@@ -198,9 +201,9 @@ impl<'a> AspectRatioBuilder<'a, aspect_ratio_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetWidth<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,14 +249,14 @@ where
 impl<'a, S> AspectRatioBuilder<'a, S>
 where
     S: aspect_ratio_state::State,
-    S::Height: aspect_ratio_state::IsSet,
     S::Width: aspect_ratio_state::IsSet,
+    S::Height: aspect_ratio_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -266,8 +269,8 @@ where
         >,
     ) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -366,49 +369,45 @@ pub mod image_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Image;
         type AspectRatio;
+        type Image;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Image = Unset;
         type AspectRatio = Unset;
-    }
-    ///State transition - sets the `image` field to Set
-    pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetImage<S> {}
-    impl<S: State> State for SetImage<S> {
-        type Image = Set<members::image>;
-        type AspectRatio = S::AspectRatio;
+        type Image = Unset;
     }
     ///State transition - sets the `aspect_ratio` field to Set
     pub struct SetAspectRatio<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAspectRatio<S> {}
     impl<S: State> State for SetAspectRatio<S> {
-        type Image = S::Image;
         type AspectRatio = Set<members::aspect_ratio>;
+        type Image = S::Image;
+    }
+    ///State transition - sets the `image` field to Set
+    pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetImage<S> {}
+    impl<S: State> State for SetImage<S> {
+        type AspectRatio = S::AspectRatio;
+        type Image = Set<members::image>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `image` field
-        pub struct image(());
         ///Marker type for the `aspect_ratio` field
         pub struct aspect_ratio(());
+        ///Marker type for the `image` field
+        pub struct image(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ImageBuilder<'a, S: image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<image::AspectRatio<'a>>,
-        Option<BlobRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<image::AspectRatio<'a>>, Option<BlobRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Image<'a> {
@@ -422,9 +421,9 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -432,12 +431,12 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -452,11 +451,11 @@ where
         mut self,
         value: impl Into<image::AspectRatio<'a>>,
     ) -> ImageBuilder<'a, image_state::SetAspectRatio<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -471,11 +470,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ImageBuilder<'a, image_state::SetImage<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -483,15 +482,15 @@ where
 impl<'a, S> ImageBuilder<'a, S>
 where
     S: image_state::State,
-    S::Image: image_state::IsSet,
     S::AspectRatio: image_state::IsSet,
+    S::Image: image_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0,
-            aspect_ratio: self.__unsafe_private_named.1.unwrap(),
-            image: self.__unsafe_private_named.2.unwrap(),
+            alt: self._fields.0,
+            aspect_ratio: self._fields.1.unwrap(),
+            image: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -504,9 +503,9 @@ where
         >,
     ) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0,
-            aspect_ratio: self.__unsafe_private_named.1.unwrap(),
-            image: self.__unsafe_private_named.2.unwrap(),
+            alt: self._fields.0,
+            aspect_ratio: self._fields.1.unwrap(),
+            image: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fyi_questionable/richtext/list.rs b/crates/jacquard-api/src/fyi_questionable/richtext/list.rs
index 4254f3ba..21fa1f21 100644
--- a/crates/jacquard-api/src/fyi_questionable/richtext/list.rs
+++ b/crates/jacquard-api/src/fyi_questionable/richtext/list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -97,9 +100,9 @@ pub mod list_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListBuilder<'a, S: list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<ListItemsItem<'a>>>, Option<bool>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<ListItemsItem<'a>>>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> List<'a> {
@@ -113,9 +116,9 @@ impl<'a> ListBuilder<'a, list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -130,11 +133,11 @@ where
         mut self,
         value: impl Into<Vec<ListItemsItem<'a>>>,
     ) -> ListBuilder<'a, list_state::SetItems<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,12 +145,12 @@ where
 impl<'a, S: list_state::State> ListBuilder<'a, S> {
     /// Set the `ordered` field (optional)
     pub fn ordered(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `ordered` field to an Option value (optional)
     pub fn maybe_ordered(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -160,8 +163,8 @@ where
     /// Build the final struct
     pub fn build(self) -> List<'a> {
         List {
-            items: self.__unsafe_private_named.0.unwrap(),
-            ordered: self.__unsafe_private_named.1.or_else(|| Some(false)),
+            items: self._fields.0.unwrap(),
+            ordered: self._fields.1.or_else(|| Some(false)),
             extra_data: Default::default(),
         }
     }
@@ -174,8 +177,8 @@ where
         >,
     ) -> List<'a> {
         List {
-            items: self.__unsafe_private_named.0.unwrap(),
-            ordered: self.__unsafe_private_named.1.or_else(|| Some(false)),
+            items: self._fields.0.unwrap(),
+            ordered: self._fields.1.or_else(|| Some(false)),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fyi_questionable/richtext/website.rs b/crates/jacquard-api/src/fyi_questionable/richtext/website.rs
index 8f4e2424..c7c10e28 100644
--- a/crates/jacquard-api/src/fyi_questionable/richtext/website.rs
+++ b/crates/jacquard-api/src/fyi_questionable/richtext/website.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -169,14 +172,14 @@ pub mod website_state {
 
 /// Builder for constructing an instance of this type
 pub struct WebsiteBuilder<'a, S: website_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Website<'a> {
@@ -190,9 +193,9 @@ impl<'a> WebsiteBuilder<'a, website_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WebsiteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,12 +203,12 @@ impl<'a> WebsiteBuilder<'a, website_state::Empty> {
 impl<'a, S: website_state::State> WebsiteBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -213,12 +216,12 @@ impl<'a, S: website_state::State> WebsiteBuilder<'a, S> {
 impl<'a, S: website_state::State> WebsiteBuilder<'a, S> {
     /// Set the `previewImage` field (optional)
     pub fn preview_image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `previewImage` field to an Option value (optional)
     pub fn maybe_preview_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -226,12 +229,12 @@ impl<'a, S: website_state::State> WebsiteBuilder<'a, S> {
 impl<'a, S: website_state::State> WebsiteBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -246,11 +249,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> WebsiteBuilder<'a, website_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         WebsiteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -263,10 +266,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Website<'a> {
         Website {
-            description: self.__unsafe_private_named.0,
-            preview_image: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0,
+            preview_image: self._fields.1,
+            title: self._fields.2,
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -279,10 +282,10 @@ where
         >,
     ) -> Website<'a> {
         Website {
-            description: self.__unsafe_private_named.0,
-            preview_image: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0,
+            preview_image: self._fields.1,
+            title: self._fields.2,
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fyi_questionable/selected_answer.rs b/crates/jacquard-api/src/fyi_questionable/selected_answer.rs
index 538aac7c..8b3c985b 100644
--- a/crates/jacquard-api/src/fyi_questionable/selected_answer.rs
+++ b/crates/jacquard-api/src/fyi_questionable/selected_answer.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -112,63 +115,59 @@ pub mod selected_answer_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type AnswerRef;
         type CreatedAt;
         type QuestionRef;
-        type AnswerRef;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type AnswerRef = Unset;
         type CreatedAt = Unset;
         type QuestionRef = Unset;
-        type AnswerRef = Unset;
+    }
+    ///State transition - sets the `answer_ref` field to Set
+    pub struct SetAnswerRef<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAnswerRef<S> {}
+    impl<S: State> State for SetAnswerRef<S> {
+        type AnswerRef = Set<members::answer_ref>;
+        type CreatedAt = S::CreatedAt;
+        type QuestionRef = S::QuestionRef;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type AnswerRef = S::AnswerRef;
         type CreatedAt = Set<members::created_at>;
         type QuestionRef = S::QuestionRef;
-        type AnswerRef = S::AnswerRef;
     }
     ///State transition - sets the `question_ref` field to Set
     pub struct SetQuestionRef<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetQuestionRef<S> {}
     impl<S: State> State for SetQuestionRef<S> {
-        type CreatedAt = S::CreatedAt;
-        type QuestionRef = Set<members::question_ref>;
         type AnswerRef = S::AnswerRef;
-    }
-    ///State transition - sets the `answer_ref` field to Set
-    pub struct SetAnswerRef<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAnswerRef<S> {}
-    impl<S: State> State for SetAnswerRef<S> {
         type CreatedAt = S::CreatedAt;
-        type QuestionRef = S::QuestionRef;
-        type AnswerRef = Set<members::answer_ref>;
+        type QuestionRef = Set<members::question_ref>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `answer_ref` field
+        pub struct answer_ref(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `question_ref` field
         pub struct question_ref(());
-        ///Marker type for the `answer_ref` field
-        pub struct answer_ref(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SelectedAnswerBuilder<'a, S: selected_answer_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<StrongRef<'a>>,
-        Option<Datetime>,
-        Option<StrongRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>, Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SelectedAnswer<'a> {
@@ -182,9 +181,9 @@ impl<'a> SelectedAnswerBuilder<'a, selected_answer_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SelectedAnswerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -199,11 +198,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> SelectedAnswerBuilder<'a, selected_answer_state::SetAnswerRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SelectedAnswerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -218,11 +217,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SelectedAnswerBuilder<'a, selected_answer_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SelectedAnswerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -237,11 +236,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> SelectedAnswerBuilder<'a, selected_answer_state::SetQuestionRef<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SelectedAnswerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,16 +248,16 @@ where
 impl<'a, S> SelectedAnswerBuilder<'a, S>
 where
     S: selected_answer_state::State,
+    S::AnswerRef: selected_answer_state::IsSet,
     S::CreatedAt: selected_answer_state::IsSet,
     S::QuestionRef: selected_answer_state::IsSet,
-    S::AnswerRef: selected_answer_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SelectedAnswer<'a> {
         SelectedAnswer {
-            answer_ref: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            question_ref: self.__unsafe_private_named.2.unwrap(),
+            answer_ref: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            question_ref: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -271,9 +270,9 @@ where
         >,
     ) -> SelectedAnswer<'a> {
         SelectedAnswer {
-            answer_ref: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            question_ref: self.__unsafe_private_named.2.unwrap(),
+            answer_ref: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            question_ref: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fyi_unravel/frontpage/comment.rs b/crates/jacquard-api/src/fyi_unravel/frontpage/comment.rs
index 22df9414..29ebb619 100644
--- a/crates/jacquard-api/src/fyi_unravel/frontpage/comment.rs
+++ b/crates/jacquard-api/src/fyi_unravel/frontpage/comment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -190,14 +193,14 @@ pub mod comment_state {
 
 /// Builder for constructing an instance of this type
 pub struct CommentBuilder<'a, S: comment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<StrongRef<'a>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Comment<'a> {
@@ -211,9 +214,9 @@ impl<'a> CommentBuilder<'a, comment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -228,11 +231,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -247,11 +250,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CommentBuilder<'a, comment_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -259,12 +262,12 @@ where
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -279,11 +282,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetPost<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -298,10 +301,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Comment<'a> {
         Comment {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            parent: self.__unsafe_private_named.2,
-            post: self.__unsafe_private_named.3.unwrap(),
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            parent: self._fields.2,
+            post: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -314,10 +317,10 @@ where
         >,
     ) -> Comment<'a> {
         Comment {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            parent: self.__unsafe_private_named.2,
-            post: self.__unsafe_private_named.3.unwrap(),
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            parent: self._fields.2,
+            post: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fyi_unravel/frontpage/post.rs b/crates/jacquard-api/src/fyi_unravel/frontpage/post.rs
index f944e73f..2777314c 100644
--- a/crates/jacquard-api/src/fyi_unravel/frontpage/post.rs
+++ b/crates/jacquard-api/src/fyi_unravel/frontpage/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -187,9 +190,9 @@ pub mod post_state {
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -203,9 +206,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -220,11 +223,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,11 +242,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetTitle<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -258,11 +261,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> PostBuilder<'a, post_state::SetUrl<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -277,9 +280,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            title: self.__unsafe_private_named.1.unwrap(),
-            url: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            title: self._fields.1.unwrap(),
+            url: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -292,9 +295,9 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            title: self.__unsafe_private_named.1.unwrap(),
-            url: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            title: self._fields.1.unwrap(),
+            url: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/fyi_unravel/frontpage/vote.rs b/crates/jacquard-api/src/fyi_unravel/frontpage/vote.rs
index d08dcdd7..e208d3c9 100644
--- a/crates/jacquard-api/src/fyi_unravel/frontpage/vote.rs
+++ b/crates/jacquard-api/src/fyi_unravel/frontpage/vote.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,9 +149,9 @@ pub mod vote_state {
 
 /// Builder for constructing an instance of this type
 pub struct VoteBuilder<'a, S: vote_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Vote<'a> {
@@ -162,9 +165,9 @@ impl<'a> VoteBuilder<'a, vote_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> VoteBuilder<'a, vote_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> VoteBuilder<'a, vote_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,8 +219,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Vote<'a> {
         Vote {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Vote<'a> {
         Vote {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_firehose/barklesheep/place_sheeps.rs b/crates/jacquard-api/src/games_firehose/barklesheep/place_sheeps.rs
index 6a2ab201..d4bbc26a 100644
--- a/crates/jacquard-api/src/games_firehose/barklesheep/place_sheeps.rs
+++ b/crates/jacquard-api/src/games_firehose/barklesheep/place_sheeps.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -139,12 +142,9 @@ pub mod place_sheeps_state {
 
 /// Builder for constructing an instance of this type
 pub struct PlaceSheepsBuilder<'a, S: place_sheeps_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<Vec<place_sheeps::SheepPlacement<'a>>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Vec<place_sheeps::SheepPlacement<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PlaceSheeps<'a> {
@@ -158,9 +158,9 @@ impl<'a> PlaceSheepsBuilder<'a, place_sheeps_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PlaceSheepsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -175,11 +175,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PlaceSheepsBuilder<'a, place_sheeps_state::SetGameId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PlaceSheepsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -194,11 +194,11 @@ where
         mut self,
         value: impl Into<Vec<place_sheeps::SheepPlacement<'a>>>,
     ) -> PlaceSheepsBuilder<'a, place_sheeps_state::SetSheeps<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PlaceSheepsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,8 +212,8 @@ where
     /// Build the final struct
     pub fn build(self) -> PlaceSheeps<'a> {
         PlaceSheeps {
-            game_id: self.__unsafe_private_named.0.unwrap(),
-            sheeps: self.__unsafe_private_named.1.unwrap(),
+            game_id: self._fields.0.unwrap(),
+            sheeps: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -226,8 +226,8 @@ where
         >,
     ) -> PlaceSheeps<'a> {
         PlaceSheeps {
-            game_id: self.__unsafe_private_named.0.unwrap(),
-            sheeps: self.__unsafe_private_named.1.unwrap(),
+            game_id: self._fields.0.unwrap(),
+            sheeps: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -243,59 +243,59 @@ pub mod sheep_placement_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Type;
-        type Horizontal;
         type Start;
+        type Horizontal;
+        type Type;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Type = Unset;
-        type Horizontal = Unset;
         type Start = Unset;
+        type Horizontal = Unset;
+        type Type = Unset;
     }
-    ///State transition - sets the `type` field to Set
-    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetType<S> {}
-    impl<S: State> State for SetType<S> {
-        type Type = Set<members::r#type>;
+    ///State transition - sets the `start` field to Set
+    pub struct SetStart<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStart<S> {}
+    impl<S: State> State for SetStart<S> {
+        type Start = Set<members::start>;
         type Horizontal = S::Horizontal;
-        type Start = S::Start;
+        type Type = S::Type;
     }
     ///State transition - sets the `horizontal` field to Set
     pub struct SetHorizontal<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHorizontal<S> {}
     impl<S: State> State for SetHorizontal<S> {
-        type Type = S::Type;
-        type Horizontal = Set<members::horizontal>;
         type Start = S::Start;
-    }
-    ///State transition - sets the `start` field to Set
-    pub struct SetStart<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStart<S> {}
-    impl<S: State> State for SetStart<S> {
+        type Horizontal = Set<members::horizontal>;
         type Type = S::Type;
+    }
+    ///State transition - sets the `type` field to Set
+    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetType<S> {}
+    impl<S: State> State for SetType<S> {
+        type Start = S::Start;
         type Horizontal = S::Horizontal;
-        type Start = Set<members::start>;
+        type Type = Set<members::r#type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `type` field
-        pub struct r#type(());
-        ///Marker type for the `horizontal` field
-        pub struct horizontal(());
         ///Marker type for the `start` field
         pub struct start(());
+        ///Marker type for the `horizontal` field
+        pub struct horizontal(());
+        ///Marker type for the `type` field
+        pub struct r#type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SheepPlacementBuilder<'a, S: sheep_placement_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SheepPlacement<'a> {
@@ -309,9 +309,9 @@ impl<'a> SheepPlacementBuilder<'a, sheep_placement_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SheepPlacementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -326,11 +326,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> SheepPlacementBuilder<'a, sheep_placement_state::SetHorizontal<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SheepPlacementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -345,11 +345,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SheepPlacementBuilder<'a, sheep_placement_state::SetStart<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SheepPlacementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -364,11 +364,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SheepPlacementBuilder<'a, sheep_placement_state::SetType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SheepPlacementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -376,16 +376,16 @@ where
 impl<'a, S> SheepPlacementBuilder<'a, S>
 where
     S: sheep_placement_state::State,
-    S::Type: sheep_placement_state::IsSet,
-    S::Horizontal: sheep_placement_state::IsSet,
     S::Start: sheep_placement_state::IsSet,
+    S::Horizontal: sheep_placement_state::IsSet,
+    S::Type: sheep_placement_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SheepPlacement<'a> {
         SheepPlacement {
-            horizontal: self.__unsafe_private_named.0.unwrap(),
-            start: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
+            horizontal: self._fields.0.unwrap(),
+            start: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -398,9 +398,9 @@ where
         >,
     ) -> SheepPlacement<'a> {
         SheepPlacement {
-            horizontal: self.__unsafe_private_named.0.unwrap(),
-            start: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
+            horizontal: self._fields.0.unwrap(),
+            start: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_firehose/barklesheep/reaction.rs b/crates/jacquard-api/src/games_firehose/barklesheep/reaction.rs
index 9c52155c..5862fd60 100644
--- a/crates/jacquard-api/src/games_firehose/barklesheep/reaction.rs
+++ b/crates/jacquard-api/src/games_firehose/barklesheep/reaction.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -121,49 +124,49 @@ pub mod reaction_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type GameId;
+        type CreatedAt;
         type Emoji;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type GameId = Unset;
+        type CreatedAt = Unset;
         type Emoji = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type GameId = S::GameId;
-        type Emoji = S::Emoji;
-    }
     ///State transition - sets the `game_id` field to Set
     pub struct SetGameId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetGameId<S> {}
     impl<S: State> State for SetGameId<S> {
-        type CreatedAt = S::CreatedAt;
         type GameId = Set<members::game_id>;
+        type CreatedAt = S::CreatedAt;
+        type Emoji = S::Emoji;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type GameId = S::GameId;
+        type CreatedAt = Set<members::created_at>;
         type Emoji = S::Emoji;
     }
     ///State transition - sets the `emoji` field to Set
     pub struct SetEmoji<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEmoji<S> {}
     impl<S: State> State for SetEmoji<S> {
-        type CreatedAt = S::CreatedAt;
         type GameId = S::GameId;
+        type CreatedAt = S::CreatedAt;
         type Emoji = Set<members::emoji>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `game_id` field
         pub struct game_id(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `emoji` field
         pub struct emoji(());
     }
@@ -171,9 +174,9 @@ pub mod reaction_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReactionBuilder<'a, S: reaction_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Reaction<'a> {
@@ -187,9 +190,9 @@ impl<'a> ReactionBuilder<'a, reaction_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,11 +207,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReactionBuilder<'a, reaction_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -223,11 +226,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReactionBuilder<'a, reaction_state::SetEmoji<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -242,11 +245,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReactionBuilder<'a, reaction_state::SetGameId<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -254,16 +257,16 @@ where
 impl<'a, S> ReactionBuilder<'a, S>
 where
     S: reaction_state::State,
-    S::CreatedAt: reaction_state::IsSet,
     S::GameId: reaction_state::IsSet,
+    S::CreatedAt: reaction_state::IsSet,
     S::Emoji: reaction_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Reaction<'a> {
         Reaction {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            emoji: self.__unsafe_private_named.1.unwrap(),
-            game_id: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            emoji: self._fields.1.unwrap(),
+            game_id: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -276,9 +279,9 @@ where
         >,
     ) -> Reaction<'a> {
         Reaction {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            emoji: self.__unsafe_private_named.1.unwrap(),
-            game_id: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            emoji: self._fields.1.unwrap(),
+            game_id: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames.rs
index 7266b1cf..cf7831be 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames.rs
@@ -35,7 +35,11 @@ pub mod search_profiles_typeahead;
 pub mod search_slugs;
 pub mod slug;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -3677,50 +3681,50 @@ pub mod actor_credit_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type Credits;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type Credits = Unset;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Credits = S::Credits;
+        type Uri = Unset;
     }
     ///State transition - sets the `credits` field to Set
     pub struct SetCredits<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCredits<S> {}
     impl<S: State> State for SetCredits<S> {
-        type Uri = S::Uri;
         type Credits = Set<members::credits>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Credits = S::Credits;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `credits` field
         pub struct credits(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ActorCreditViewBuilder<'a, S: actor_credit_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<Vec<games_gamesgamesgamesgames::CreditEntry<'a>>>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ActorCreditView<'a> {
@@ -3734,9 +3738,9 @@ impl<'a> ActorCreditViewBuilder<'a, actor_credit_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ActorCreditViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3744,12 +3748,12 @@ impl<'a> ActorCreditViewBuilder<'a, actor_credit_view_state::Empty> {
 impl<'a, S: actor_credit_view_state::State> ActorCreditViewBuilder<'a, S> {
     /// Set the `actorUri` field (optional)
     pub fn actor_uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `actorUri` field to an Option value (optional)
     pub fn maybe_actor_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -3764,11 +3768,11 @@ where
         mut self,
         value: impl Into<Vec<games_gamesgamesgamesgames::CreditEntry<'a>>>,
     ) -> ActorCreditViewBuilder<'a, actor_credit_view_state::SetCredits<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ActorCreditViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3776,12 +3780,12 @@ where
 impl<'a, S: actor_credit_view_state::State> ActorCreditViewBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -3796,11 +3800,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ActorCreditViewBuilder<'a, actor_credit_view_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ActorCreditViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3808,16 +3812,16 @@ where
 impl<'a, S> ActorCreditViewBuilder<'a, S>
 where
     S: actor_credit_view_state::State,
-    S::Uri: actor_credit_view_state::IsSet,
     S::Credits: actor_credit_view_state::IsSet,
+    S::Uri: actor_credit_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ActorCreditView<'a> {
         ActorCreditView {
-            actor_uri: self.__unsafe_private_named.0,
-            credits: self.__unsafe_private_named.1.unwrap(),
-            display_name: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            actor_uri: self._fields.0,
+            credits: self._fields.1.unwrap(),
+            display_name: self._fields.2,
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3830,10 +3834,10 @@ where
         >,
     ) -> ActorCreditView<'a> {
         ActorCreditView {
-            actor_uri: self.__unsafe_private_named.0,
-            credits: self.__unsafe_private_named.1.unwrap(),
-            display_name: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            actor_uri: self._fields.0,
+            credits: self._fields.1.unwrap(),
+            display_name: self._fields.2,
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -5626,8 +5630,8 @@ pub mod actor_profile_detail_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ActorProfileDetailViewBuilder<'a, S: actor_profile_detail_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -5638,7 +5642,7 @@ pub struct ActorProfileDetailViewBuilder<'a, S: actor_profile_detail_view_state:
         Option<AtUri<'a>>,
         Option<Vec<games_gamesgamesgamesgames::Website<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ActorProfileDetailView<'a> {
@@ -5655,19 +5659,9 @@ impl<'a> ActorProfileDetailViewBuilder<'a, actor_profile_detail_view_state::Empt
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ActorProfileDetailViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5678,12 +5672,12 @@ impl<
 > ActorProfileDetailViewBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -5694,12 +5688,12 @@ impl<
 > ActorProfileDetailViewBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -5710,12 +5704,12 @@ impl<
 > ActorProfileDetailViewBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -5729,12 +5723,12 @@ impl<
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `descriptionFacets` field to an Option value (optional)
     pub fn maybe_description_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -5749,11 +5743,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ActorProfileDetailViewBuilder<'a, actor_profile_detail_view_state::SetDid<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ActorProfileDetailViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5764,12 +5758,12 @@ impl<
 > ActorProfileDetailViewBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -5780,12 +5774,12 @@ impl<
 > ActorProfileDetailViewBuilder<'a, S> {
     /// Set the `pronouns` field (optional)
     pub fn pronouns(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `pronouns` field to an Option value (optional)
     pub fn maybe_pronouns(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -5800,11 +5794,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ActorProfileDetailViewBuilder<'a, actor_profile_detail_view_state::SetUri<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ActorProfileDetailViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5818,7 +5812,7 @@ impl<
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::Website<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `websites` field to an Option value (optional)
@@ -5826,7 +5820,7 @@ impl<
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::Website<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -5840,15 +5834,15 @@ where
     /// Build the final struct
     pub fn build(self) -> ActorProfileDetailView<'a> {
         ActorProfileDetailView {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            description_facets: self.__unsafe_private_named.3,
-            did: self.__unsafe_private_named.4.unwrap(),
-            display_name: self.__unsafe_private_named.5,
-            pronouns: self.__unsafe_private_named.6,
-            uri: self.__unsafe_private_named.7.unwrap(),
-            websites: self.__unsafe_private_named.8,
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            description: self._fields.2,
+            description_facets: self._fields.3,
+            did: self._fields.4.unwrap(),
+            display_name: self._fields.5,
+            pronouns: self._fields.6,
+            uri: self._fields.7.unwrap(),
+            websites: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -5861,15 +5855,15 @@ where
         >,
     ) -> ActorProfileDetailView<'a> {
         ActorProfileDetailView {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            description_facets: self.__unsafe_private_named.3,
-            did: self.__unsafe_private_named.4.unwrap(),
-            display_name: self.__unsafe_private_named.5,
-            pronouns: self.__unsafe_private_named.6,
-            uri: self.__unsafe_private_named.7.unwrap(),
-            websites: self.__unsafe_private_named.8,
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            description: self._fields.2,
+            description_facets: self._fields.3,
+            did: self._fields.4.unwrap(),
+            display_name: self._fields.5,
+            pronouns: self._fields.6,
+            uri: self._fields.7.unwrap(),
+            websites: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
@@ -5924,14 +5918,14 @@ pub struct ActorProfileSummaryViewBuilder<
     'a,
     S: actor_profile_summary_view_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ActorProfileSummaryView<'a> {
@@ -5948,9 +5942,9 @@ impl<'a> ActorProfileSummaryViewBuilder<'a, actor_profile_summary_view_state::Em
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ActorProfileSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5961,12 +5955,12 @@ impl<
 > ActorProfileSummaryViewBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -5984,11 +5978,11 @@ where
         'a,
         actor_profile_summary_view_state::SetDid<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ActorProfileSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5999,12 +5993,12 @@ impl<
 > ActorProfileSummaryViewBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -6022,11 +6016,11 @@ where
         'a,
         actor_profile_summary_view_state::SetUri<S>,
     > {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ActorProfileSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6040,10 +6034,10 @@ where
     /// Build the final struct
     pub fn build(self) -> ActorProfileSummaryView<'a> {
         ActorProfileSummaryView {
-            avatar: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            display_name: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            avatar: self._fields.0,
+            did: self._fields.1.unwrap(),
+            display_name: self._fields.2,
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -6056,10 +6050,10 @@ where
         >,
     ) -> ActorProfileSummaryView<'a> {
         ActorProfileSummaryView {
-            avatar: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            display_name: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            avatar: self._fields.0,
+            did: self._fields.1.unwrap(),
+            display_name: self._fields.2,
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -6111,14 +6105,14 @@ pub mod collection_summary_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct CollectionSummaryViewBuilder<'a, S: collection_summary_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CollectionSummaryViewType<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CollectionSummaryView<'a> {
@@ -6135,9 +6129,9 @@ impl<'a> CollectionSummaryViewBuilder<'a, collection_summary_view_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6152,11 +6146,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CollectionSummaryViewBuilder<'a, collection_summary_view_state::SetName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6164,12 +6158,12 @@ where
 impl<'a, S: collection_summary_view_state::State> CollectionSummaryViewBuilder<'a, S> {
     /// Set the `slug` field (optional)
     pub fn slug(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `slug` field to an Option value (optional)
     pub fn maybe_slug(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -6180,12 +6174,12 @@ impl<'a, S: collection_summary_view_state::State> CollectionSummaryViewBuilder<'
         mut self,
         value: impl Into<Option<CollectionSummaryViewType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `type` field to an Option value (optional)
     pub fn maybe_type(mut self, value: Option<CollectionSummaryViewType<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -6200,11 +6194,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CollectionSummaryViewBuilder<'a, collection_summary_view_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CollectionSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6218,10 +6212,10 @@ where
     /// Build the final struct
     pub fn build(self) -> CollectionSummaryView<'a> {
         CollectionSummaryView {
-            name: self.__unsafe_private_named.0.unwrap(),
-            slug: self.__unsafe_private_named.1,
-            r#type: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            name: self._fields.0.unwrap(),
+            slug: self._fields.1,
+            r#type: self._fields.2,
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -6234,10 +6228,10 @@ where
         >,
     ) -> CollectionSummaryView<'a> {
         CollectionSummaryView {
-            name: self.__unsafe_private_named.0.unwrap(),
-            slug: self.__unsafe_private_named.1,
-            r#type: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            name: self._fields.0.unwrap(),
+            slug: self._fields.1,
+            r#type: self._fields.2,
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -6277,12 +6271,12 @@ pub mod credit_entry_state {
 
 /// Builder for constructing an instance of this type
 pub struct CreditEntryBuilder<'a, S: credit_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<games_gamesgamesgamesgames::IndividualRole<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CreditEntry<'a> {
@@ -6296,9 +6290,9 @@ impl<'a> CreditEntryBuilder<'a, credit_entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreditEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6306,12 +6300,12 @@ impl<'a> CreditEntryBuilder<'a, credit_entry_state::Empty> {
 impl<'a, S: credit_entry_state::State> CreditEntryBuilder<'a, S> {
     /// Set the `department` field (optional)
     pub fn department(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `department` field to an Option value (optional)
     pub fn maybe_department(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -6326,11 +6320,11 @@ where
         mut self,
         value: impl Into<games_gamesgamesgamesgames::IndividualRole<'a>>,
     ) -> CreditEntryBuilder<'a, credit_entry_state::SetRole<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CreditEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6343,8 +6337,8 @@ where
     /// Build the final struct
     pub fn build(self) -> CreditEntry<'a> {
         CreditEntry {
-            department: self.__unsafe_private_named.0,
-            role: self.__unsafe_private_named.1.unwrap(),
+            department: self._fields.0,
+            role: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -6357,8 +6351,8 @@ where
         >,
     ) -> CreditEntry<'a> {
         CreditEntry {
-            department: self.__unsafe_private_named.0,
-            role: self.__unsafe_private_named.1.unwrap(),
+            department: self._fields.0,
+            role: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -6374,45 +6368,45 @@ pub mod engine_summary_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type Name;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Name = S::Name;
+        type Uri = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Uri = S::Uri;
         type Name = Set<members::name>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Name = S::Name;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EngineSummaryViewBuilder<'a, S: engine_summary_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> EngineSummaryView<'a> {
@@ -6426,9 +6420,9 @@ impl<'a> EngineSummaryViewBuilder<'a, engine_summary_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EngineSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6443,11 +6437,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EngineSummaryViewBuilder<'a, engine_summary_view_state::SetName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EngineSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6455,12 +6449,12 @@ where
 impl<'a, S: engine_summary_view_state::State> EngineSummaryViewBuilder<'a, S> {
     /// Set the `slug` field (optional)
     pub fn slug(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `slug` field to an Option value (optional)
     pub fn maybe_slug(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -6475,11 +6469,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> EngineSummaryViewBuilder<'a, engine_summary_view_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EngineSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6487,15 +6481,15 @@ where
 impl<'a, S> EngineSummaryViewBuilder<'a, S>
 where
     S: engine_summary_view_state::State,
-    S::Uri: engine_summary_view_state::IsSet,
     S::Name: engine_summary_view_state::IsSet,
+    S::Uri: engine_summary_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> EngineSummaryView<'a> {
         EngineSummaryView {
-            name: self.__unsafe_private_named.0.unwrap(),
-            slug: self.__unsafe_private_named.1,
-            uri: self.__unsafe_private_named.2.unwrap(),
+            name: self._fields.0.unwrap(),
+            slug: self._fields.1,
+            uri: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -6508,9 +6502,9 @@ where
         >,
     ) -> EngineSummaryView<'a> {
         EngineSummaryView {
-            name: self.__unsafe_private_named.0.unwrap(),
-            slug: self.__unsafe_private_named.1,
-            uri: self.__unsafe_private_named.2.unwrap(),
+            name: self._fields.0.unwrap(),
+            slug: self._fields.1,
+            uri: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -6526,58 +6520,58 @@ pub mod game_detail_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Name;
         type CreatedAt;
         type Uri;
-        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Name = Unset;
         type CreatedAt = Unset;
         type Uri = Unset;
-        type Name = Unset;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Name = Set<members::name>;
+        type CreatedAt = S::CreatedAt;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Name = S::Name;
         type CreatedAt = Set<members::created_at>;
         type Uri = S::Uri;
-        type Name = S::Name;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type CreatedAt = S::CreatedAt;
-        type Uri = Set<members::uri>;
         type Name = S::Name;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
         type CreatedAt = S::CreatedAt;
-        type Uri = S::Uri;
-        type Name = Set<members::name>;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `name` field
+        pub struct name(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `name` field
-        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GameDetailViewBuilder<'a, S: game_detail_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<games_gamesgamesgamesgames::ActorCreditView<'a>>>,
         Option<Vec<games_gamesgamesgamesgames::AgeRating<'a>>>,
         Option<Vec<games_gamesgamesgamesgames::AlternativeName<'a>>>,
@@ -6607,7 +6601,7 @@ pub struct GameDetailViewBuilder<'a, S: game_detail_view_state::State> {
         Option<Vec<games_gamesgamesgamesgames::ExternalVideo<'a>>>,
         Option<Vec<games_gamesgamesgamesgames::Website<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GameDetailView<'a> {
@@ -6621,8 +6615,8 @@ impl<'a> GameDetailViewBuilder<'a, game_detail_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GameDetailViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -6652,7 +6646,7 @@ impl<'a> GameDetailViewBuilder<'a, game_detail_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6663,7 +6657,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::ActorCreditView<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `actorCredits` field to an Option value (optional)
@@ -6671,7 +6665,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::ActorCreditView<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -6682,7 +6676,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::AgeRating<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `ageRatings` field to an Option value (optional)
@@ -6690,7 +6684,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::AgeRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -6701,7 +6695,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::AlternativeName<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `alternativeNames` field to an Option value (optional)
@@ -6709,7 +6703,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::AlternativeName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -6720,7 +6714,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<games_gamesgamesgamesgames::ApplicationType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `applicationType` field to an Option value (optional)
@@ -6728,7 +6722,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: Option<games_gamesgamesgamesgames::ApplicationType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -6736,12 +6730,12 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
 impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
     /// Set the `collections` field (optional)
     pub fn collections(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `collections` field to an Option value (optional)
     pub fn maybe_collections(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -6756,11 +6750,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> GameDetailViewBuilder<'a, game_detail_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         GameDetailViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6768,12 +6762,12 @@ where
 impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
     /// Set the `engines` field (optional)
     pub fn engines(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `engines` field to an Option value (optional)
     pub fn maybe_engines(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -6784,7 +6778,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<games_gamesgamesgamesgames::ExternalIds<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `externalIds` field to an Option value (optional)
@@ -6792,7 +6786,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: Option<games_gamesgamesgamesgames::ExternalIds<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -6803,7 +6797,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::Genre<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `genres` field to an Option value (optional)
@@ -6811,7 +6805,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::Genre<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -6819,12 +6813,12 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
 impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -6835,7 +6829,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::LanguageSupport<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `languageSupports` field to an Option value (optional)
@@ -6843,7 +6837,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::LanguageSupport<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -6854,7 +6848,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::MediaItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `media` field to an Option value (optional)
@@ -6862,7 +6856,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::MediaItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -6873,7 +6867,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::Mode<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `modes` field to an Option value (optional)
@@ -6881,7 +6875,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::Mode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -6892,7 +6886,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::MultiplayerMode<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `multiplayerModes` field to an Option value (optional)
@@ -6900,7 +6894,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::MultiplayerMode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -6915,11 +6909,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GameDetailViewBuilder<'a, game_detail_view_state::SetName<S>> {
-        self.__unsafe_private_named.14 = Option::Some(value.into());
+        self._fields.14 = Option::Some(value.into());
         GameDetailViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6930,7 +6924,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::OrgCreditView<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `orgCredits` field to an Option value (optional)
@@ -6938,7 +6932,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::OrgCreditView<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -6946,12 +6940,12 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
 impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -6962,7 +6956,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::PlayerPerspective<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `playerPerspectives` field to an Option value (optional)
@@ -6970,7 +6964,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::PlayerPerspective<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -6978,12 +6972,12 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
 impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
     /// Set the `publishedAt` field (optional)
     pub fn published_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `publishedAt` field to an Option value (optional)
     pub fn maybe_published_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -6994,7 +6988,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::Release<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `releases` field to an Option value (optional)
@@ -7002,7 +6996,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::Release<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -7010,12 +7004,12 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
 impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
     /// Set the `slug` field (optional)
     pub fn slug(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `slug` field to an Option value (optional)
     pub fn maybe_slug(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -7023,12 +7017,12 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
 impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
     /// Set the `storyline` field (optional)
     pub fn storyline(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `storyline` field to an Option value (optional)
     pub fn maybe_storyline(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -7036,12 +7030,12 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
 impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
     /// Set the `summary` field (optional)
     pub fn summary(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `summary` field to an Option value (optional)
     pub fn maybe_summary(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -7052,7 +7046,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::Theme<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `themes` field to an Option value (optional)
@@ -7060,7 +7054,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::Theme<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -7071,7 +7065,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<games_gamesgamesgamesgames::TimeToBeat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `timeToBeat` field to an Option value (optional)
@@ -7079,7 +7073,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: Option<games_gamesgamesgamesgames::TimeToBeat<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -7094,11 +7088,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GameDetailViewBuilder<'a, game_detail_view_state::SetUri<S>> {
-        self.__unsafe_private_named.25 = Option::Some(value.into());
+        self._fields.25 = Option::Some(value.into());
         GameDetailViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7109,7 +7103,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::ExternalVideo<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `videos` field to an Option value (optional)
@@ -7117,7 +7111,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::ExternalVideo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -7128,7 +7122,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::Website<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `websites` field to an Option value (optional)
@@ -7136,7 +7130,7 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::Website<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -7144,41 +7138,41 @@ impl<'a, S: game_detail_view_state::State> GameDetailViewBuilder<'a, S> {
 impl<'a, S> GameDetailViewBuilder<'a, S>
 where
     S: game_detail_view_state::State,
+    S::Name: game_detail_view_state::IsSet,
     S::CreatedAt: game_detail_view_state::IsSet,
     S::Uri: game_detail_view_state::IsSet,
-    S::Name: game_detail_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GameDetailView<'a> {
         GameDetailView {
-            actor_credits: self.__unsafe_private_named.0,
-            age_ratings: self.__unsafe_private_named.1,
-            alternative_names: self.__unsafe_private_named.2,
-            application_type: self.__unsafe_private_named.3,
-            collections: self.__unsafe_private_named.4,
-            created_at: self.__unsafe_private_named.5.unwrap(),
-            engines: self.__unsafe_private_named.6,
-            external_ids: self.__unsafe_private_named.7,
-            genres: self.__unsafe_private_named.8,
-            keywords: self.__unsafe_private_named.9,
-            language_supports: self.__unsafe_private_named.10,
-            media: self.__unsafe_private_named.11,
-            modes: self.__unsafe_private_named.12,
-            multiplayer_modes: self.__unsafe_private_named.13,
-            name: self.__unsafe_private_named.14.unwrap(),
-            org_credits: self.__unsafe_private_named.15,
-            parent: self.__unsafe_private_named.16,
-            player_perspectives: self.__unsafe_private_named.17,
-            published_at: self.__unsafe_private_named.18,
-            releases: self.__unsafe_private_named.19,
-            slug: self.__unsafe_private_named.20,
-            storyline: self.__unsafe_private_named.21,
-            summary: self.__unsafe_private_named.22,
-            themes: self.__unsafe_private_named.23,
-            time_to_beat: self.__unsafe_private_named.24,
-            uri: self.__unsafe_private_named.25.unwrap(),
-            videos: self.__unsafe_private_named.26,
-            websites: self.__unsafe_private_named.27,
+            actor_credits: self._fields.0,
+            age_ratings: self._fields.1,
+            alternative_names: self._fields.2,
+            application_type: self._fields.3,
+            collections: self._fields.4,
+            created_at: self._fields.5.unwrap(),
+            engines: self._fields.6,
+            external_ids: self._fields.7,
+            genres: self._fields.8,
+            keywords: self._fields.9,
+            language_supports: self._fields.10,
+            media: self._fields.11,
+            modes: self._fields.12,
+            multiplayer_modes: self._fields.13,
+            name: self._fields.14.unwrap(),
+            org_credits: self._fields.15,
+            parent: self._fields.16,
+            player_perspectives: self._fields.17,
+            published_at: self._fields.18,
+            releases: self._fields.19,
+            slug: self._fields.20,
+            storyline: self._fields.21,
+            summary: self._fields.22,
+            themes: self._fields.23,
+            time_to_beat: self._fields.24,
+            uri: self._fields.25.unwrap(),
+            videos: self._fields.26,
+            websites: self._fields.27,
             extra_data: Default::default(),
         }
     }
@@ -7191,34 +7185,34 @@ where
         >,
     ) -> GameDetailView<'a> {
         GameDetailView {
-            actor_credits: self.__unsafe_private_named.0,
-            age_ratings: self.__unsafe_private_named.1,
-            alternative_names: self.__unsafe_private_named.2,
-            application_type: self.__unsafe_private_named.3,
-            collections: self.__unsafe_private_named.4,
-            created_at: self.__unsafe_private_named.5.unwrap(),
-            engines: self.__unsafe_private_named.6,
-            external_ids: self.__unsafe_private_named.7,
-            genres: self.__unsafe_private_named.8,
-            keywords: self.__unsafe_private_named.9,
-            language_supports: self.__unsafe_private_named.10,
-            media: self.__unsafe_private_named.11,
-            modes: self.__unsafe_private_named.12,
-            multiplayer_modes: self.__unsafe_private_named.13,
-            name: self.__unsafe_private_named.14.unwrap(),
-            org_credits: self.__unsafe_private_named.15,
-            parent: self.__unsafe_private_named.16,
-            player_perspectives: self.__unsafe_private_named.17,
-            published_at: self.__unsafe_private_named.18,
-            releases: self.__unsafe_private_named.19,
-            slug: self.__unsafe_private_named.20,
-            storyline: self.__unsafe_private_named.21,
-            summary: self.__unsafe_private_named.22,
-            themes: self.__unsafe_private_named.23,
-            time_to_beat: self.__unsafe_private_named.24,
-            uri: self.__unsafe_private_named.25.unwrap(),
-            videos: self.__unsafe_private_named.26,
-            websites: self.__unsafe_private_named.27,
+            actor_credits: self._fields.0,
+            age_ratings: self._fields.1,
+            alternative_names: self._fields.2,
+            application_type: self._fields.3,
+            collections: self._fields.4,
+            created_at: self._fields.5.unwrap(),
+            engines: self._fields.6,
+            external_ids: self._fields.7,
+            genres: self._fields.8,
+            keywords: self._fields.9,
+            language_supports: self._fields.10,
+            media: self._fields.11,
+            modes: self._fields.12,
+            multiplayer_modes: self._fields.13,
+            name: self._fields.14.unwrap(),
+            org_credits: self._fields.15,
+            parent: self._fields.16,
+            player_perspectives: self._fields.17,
+            published_at: self._fields.18,
+            releases: self._fields.19,
+            slug: self._fields.20,
+            storyline: self._fields.21,
+            summary: self._fields.22,
+            themes: self._fields.23,
+            time_to_beat: self._fields.24,
+            uri: self._fields.25.unwrap(),
+            videos: self._fields.26,
+            websites: self._fields.27,
             extra_data: Some(extra_data),
         }
     }
@@ -7258,12 +7252,9 @@ pub mod game_feed_view_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct GameFeedViewItemBuilder<'a, S: game_feed_view_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<games_gamesgamesgamesgames::GameView<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<games_gamesgamesgamesgames::GameView<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GameFeedViewItem<'a> {
@@ -7277,9 +7268,9 @@ impl<'a> GameFeedViewItemBuilder<'a, game_feed_view_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GameFeedViewItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7287,12 +7278,12 @@ impl<'a> GameFeedViewItemBuilder<'a, game_feed_view_item_state::Empty> {
 impl<'a, S: game_feed_view_item_state::State> GameFeedViewItemBuilder<'a, S> {
     /// Set the `feedContext` field (optional)
     pub fn feed_context(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `feedContext` field to an Option value (optional)
     pub fn maybe_feed_context(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -7307,11 +7298,11 @@ where
         mut self,
         value: impl Into<games_gamesgamesgamesgames::GameView<'a>>,
     ) -> GameFeedViewItemBuilder<'a, game_feed_view_item_state::SetGame<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GameFeedViewItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7324,8 +7315,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GameFeedViewItem<'a> {
         GameFeedViewItem {
-            feed_context: self.__unsafe_private_named.0,
-            game: self.__unsafe_private_named.1.unwrap(),
+            feed_context: self._fields.0,
+            game: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -7338,8 +7329,8 @@ where
         >,
     ) -> GameFeedViewItem<'a> {
         GameFeedViewItem {
-            feed_context: self.__unsafe_private_named.0,
-            game: self.__unsafe_private_named.1.unwrap(),
+            feed_context: self._fields.0,
+            game: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -7391,8 +7382,8 @@ pub mod game_summary_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct GameSummaryViewBuilder<'a, S: game_summary_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<games_gamesgamesgamesgames::ApplicationType<'a>>,
         Option<i64>,
         Option<Vec<games_gamesgamesgamesgames::MediaItem<'a>>>,
@@ -7401,7 +7392,7 @@ pub struct GameSummaryViewBuilder<'a, S: game_summary_view_state::State> {
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GameSummaryView<'a> {
@@ -7415,9 +7406,9 @@ impl<'a> GameSummaryViewBuilder<'a, game_summary_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GameSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7428,7 +7419,7 @@ impl<'a, S: game_summary_view_state::State> GameSummaryViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<games_gamesgamesgamesgames::ApplicationType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `applicationType` field to an Option value (optional)
@@ -7436,7 +7427,7 @@ impl<'a, S: game_summary_view_state::State> GameSummaryViewBuilder<'a, S> {
         mut self,
         value: Option<games_gamesgamesgamesgames::ApplicationType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -7444,12 +7435,12 @@ impl<'a, S: game_summary_view_state::State> GameSummaryViewBuilder<'a, S> {
 impl<'a, S: game_summary_view_state::State> GameSummaryViewBuilder<'a, S> {
     /// Set the `firstReleaseDate` field (optional)
     pub fn first_release_date(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `firstReleaseDate` field to an Option value (optional)
     pub fn maybe_first_release_date(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -7460,7 +7451,7 @@ impl<'a, S: game_summary_view_state::State> GameSummaryViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::MediaItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `media` field to an Option value (optional)
@@ -7468,7 +7459,7 @@ impl<'a, S: game_summary_view_state::State> GameSummaryViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::MediaItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -7483,11 +7474,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GameSummaryViewBuilder<'a, game_summary_view_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         GameSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7495,12 +7486,12 @@ where
 impl<'a, S: game_summary_view_state::State> GameSummaryViewBuilder<'a, S> {
     /// Set the `slug` field (optional)
     pub fn slug(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `slug` field to an Option value (optional)
     pub fn maybe_slug(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -7508,12 +7499,12 @@ impl<'a, S: game_summary_view_state::State> GameSummaryViewBuilder<'a, S> {
 impl<'a, S: game_summary_view_state::State> GameSummaryViewBuilder<'a, S> {
     /// Set the `summary` field (optional)
     pub fn summary(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `summary` field to an Option value (optional)
     pub fn maybe_summary(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -7528,11 +7519,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GameSummaryViewBuilder<'a, game_summary_view_state::SetUri<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         GameSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7546,13 +7537,13 @@ where
     /// Build the final struct
     pub fn build(self) -> GameSummaryView<'a> {
         GameSummaryView {
-            application_type: self.__unsafe_private_named.0,
-            first_release_date: self.__unsafe_private_named.1,
-            media: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            slug: self.__unsafe_private_named.4,
-            summary: self.__unsafe_private_named.5,
-            uri: self.__unsafe_private_named.6.unwrap(),
+            application_type: self._fields.0,
+            first_release_date: self._fields.1,
+            media: self._fields.2,
+            name: self._fields.3.unwrap(),
+            slug: self._fields.4,
+            summary: self._fields.5,
+            uri: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -7565,13 +7556,13 @@ where
         >,
     ) -> GameSummaryView<'a> {
         GameSummaryView {
-            application_type: self.__unsafe_private_named.0,
-            first_release_date: self.__unsafe_private_named.1,
-            media: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            slug: self.__unsafe_private_named.4,
-            summary: self.__unsafe_private_named.5,
-            uri: self.__unsafe_private_named.6.unwrap(),
+            application_type: self._fields.0,
+            first_release_date: self._fields.1,
+            media: self._fields.2,
+            name: self._fields.3.unwrap(),
+            slug: self._fields.4,
+            summary: self._fields.5,
+            uri: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -7587,58 +7578,58 @@ pub mod game_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type ApplicationType;
         type Uri;
         type Name;
-        type ApplicationType;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type ApplicationType = Unset;
         type Uri = Unset;
         type Name = Unset;
-        type ApplicationType = Unset;
+    }
+    ///State transition - sets the `application_type` field to Set
+    pub struct SetApplicationType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetApplicationType<S> {}
+    impl<S: State> State for SetApplicationType<S> {
+        type ApplicationType = Set<members::application_type>;
+        type Uri = S::Uri;
+        type Name = S::Name;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
+        type ApplicationType = S::ApplicationType;
         type Uri = Set<members::uri>;
         type Name = S::Name;
-        type ApplicationType = S::ApplicationType;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Uri = S::Uri;
-        type Name = Set<members::name>;
         type ApplicationType = S::ApplicationType;
-    }
-    ///State transition - sets the `application_type` field to Set
-    pub struct SetApplicationType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetApplicationType<S> {}
-    impl<S: State> State for SetApplicationType<S> {
         type Uri = S::Uri;
-        type Name = S::Name;
-        type ApplicationType = Set<members::application_type>;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `application_type` field
+        pub struct application_type(());
         ///Marker type for the `uri` field
         pub struct uri(());
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `application_type` field
-        pub struct application_type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GameViewBuilder<'a, S: game_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<games_gamesgamesgamesgames::ApplicationType<'a>>,
         Option<Vec<games_gamesgamesgamesgames::Genre<'a>>>,
         Option<i64>,
@@ -7651,7 +7642,7 @@ pub struct GameViewBuilder<'a, S: game_view_state::State> {
         Option<AtUri<'a>>,
         Option<games_gamesgamesgamesgames::ViewerState<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GameView<'a> {
@@ -7665,21 +7656,9 @@ impl<'a> GameViewBuilder<'a, game_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GameViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7694,11 +7673,11 @@ where
         mut self,
         value: impl Into<games_gamesgamesgamesgames::ApplicationType<'a>>,
     ) -> GameViewBuilder<'a, game_view_state::SetApplicationType<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GameViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7709,7 +7688,7 @@ impl<'a, S: game_view_state::State> GameViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::Genre<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `genres` field to an Option value (optional)
@@ -7717,7 +7696,7 @@ impl<'a, S: game_view_state::State> GameViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::Genre<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -7725,12 +7704,12 @@ impl<'a, S: game_view_state::State> GameViewBuilder<'a, S> {
 impl<'a, S: game_view_state::State> GameViewBuilder<'a, S> {
     /// Set the `likeCount` field (optional)
     pub fn like_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `likeCount` field to an Option value (optional)
     pub fn maybe_like_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -7741,7 +7720,7 @@ impl<'a, S: game_view_state::State> GameViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::MediaItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `media` field to an Option value (optional)
@@ -7749,7 +7728,7 @@ impl<'a, S: game_view_state::State> GameViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::MediaItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -7764,11 +7743,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GameViewBuilder<'a, game_view_state::SetName<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         GameViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7779,7 +7758,7 @@ impl<'a, S: game_view_state::State> GameViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::Release<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `releases` field to an Option value (optional)
@@ -7787,7 +7766,7 @@ impl<'a, S: game_view_state::State> GameViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::Release<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -7795,12 +7774,12 @@ impl<'a, S: game_view_state::State> GameViewBuilder<'a, S> {
 impl<'a, S: game_view_state::State> GameViewBuilder<'a, S> {
     /// Set the `slug` field (optional)
     pub fn slug(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `slug` field to an Option value (optional)
     pub fn maybe_slug(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -7808,12 +7787,12 @@ impl<'a, S: game_view_state::State> GameViewBuilder<'a, S> {
 impl<'a, S: game_view_state::State> GameViewBuilder<'a, S> {
     /// Set the `summary` field (optional)
     pub fn summary(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `summary` field to an Option value (optional)
     pub fn maybe_summary(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -7824,7 +7803,7 @@ impl<'a, S: game_view_state::State> GameViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::Theme<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `themes` field to an Option value (optional)
@@ -7832,7 +7811,7 @@ impl<'a, S: game_view_state::State> GameViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::Theme<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -7847,11 +7826,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GameViewBuilder<'a, game_view_state::SetUri<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         GameViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7862,7 +7841,7 @@ impl<'a, S: game_view_state::State> GameViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<games_gamesgamesgamesgames::ViewerState<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
@@ -7870,7 +7849,7 @@ impl<'a, S: game_view_state::State> GameViewBuilder<'a, S> {
         mut self,
         value: Option<games_gamesgamesgamesgames::ViewerState<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -7878,24 +7857,24 @@ impl<'a, S: game_view_state::State> GameViewBuilder<'a, S> {
 impl<'a, S> GameViewBuilder<'a, S>
 where
     S: game_view_state::State,
+    S::ApplicationType: game_view_state::IsSet,
     S::Uri: game_view_state::IsSet,
     S::Name: game_view_state::IsSet,
-    S::ApplicationType: game_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GameView<'a> {
         GameView {
-            application_type: self.__unsafe_private_named.0.unwrap(),
-            genres: self.__unsafe_private_named.1,
-            like_count: self.__unsafe_private_named.2,
-            media: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            releases: self.__unsafe_private_named.5,
-            slug: self.__unsafe_private_named.6,
-            summary: self.__unsafe_private_named.7,
-            themes: self.__unsafe_private_named.8,
-            uri: self.__unsafe_private_named.9.unwrap(),
-            viewer: self.__unsafe_private_named.10,
+            application_type: self._fields.0.unwrap(),
+            genres: self._fields.1,
+            like_count: self._fields.2,
+            media: self._fields.3,
+            name: self._fields.4.unwrap(),
+            releases: self._fields.5,
+            slug: self._fields.6,
+            summary: self._fields.7,
+            themes: self._fields.8,
+            uri: self._fields.9.unwrap(),
+            viewer: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -7908,17 +7887,17 @@ where
         >,
     ) -> GameView<'a> {
         GameView {
-            application_type: self.__unsafe_private_named.0.unwrap(),
-            genres: self.__unsafe_private_named.1,
-            like_count: self.__unsafe_private_named.2,
-            media: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            releases: self.__unsafe_private_named.5,
-            slug: self.__unsafe_private_named.6,
-            summary: self.__unsafe_private_named.7,
-            themes: self.__unsafe_private_named.8,
-            uri: self.__unsafe_private_named.9.unwrap(),
-            viewer: self.__unsafe_private_named.10,
+            application_type: self._fields.0.unwrap(),
+            genres: self._fields.1,
+            like_count: self._fields.2,
+            media: self._fields.3,
+            name: self._fields.4.unwrap(),
+            releases: self._fields.5,
+            slug: self._fields.6,
+            summary: self._fields.7,
+            themes: self._fields.8,
+            uri: self._fields.9.unwrap(),
+            viewer: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
@@ -7970,14 +7949,14 @@ pub mod org_credit_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct OrgCreditViewBuilder<'a, S: org_credit_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
         Option<Vec<games_gamesgamesgamesgames::CompanyRole<'a>>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> OrgCreditView<'a> {
@@ -7991,9 +7970,9 @@ impl<'a> OrgCreditViewBuilder<'a, org_credit_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OrgCreditViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8001,12 +7980,12 @@ impl<'a> OrgCreditViewBuilder<'a, org_credit_view_state::Empty> {
 impl<'a, S: org_credit_view_state::State> OrgCreditViewBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -8014,12 +7993,12 @@ impl<'a, S: org_credit_view_state::State> OrgCreditViewBuilder<'a, S> {
 impl<'a, S: org_credit_view_state::State> OrgCreditViewBuilder<'a, S> {
     /// Set the `orgUri` field (optional)
     pub fn org_uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `orgUri` field to an Option value (optional)
     pub fn maybe_org_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -8034,11 +8013,11 @@ where
         mut self,
         value: impl Into<Vec<games_gamesgamesgamesgames::CompanyRole<'a>>>,
     ) -> OrgCreditViewBuilder<'a, org_credit_view_state::SetRoles<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         OrgCreditViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8053,11 +8032,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> OrgCreditViewBuilder<'a, org_credit_view_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         OrgCreditViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8071,10 +8050,10 @@ where
     /// Build the final struct
     pub fn build(self) -> OrgCreditView<'a> {
         OrgCreditView {
-            display_name: self.__unsafe_private_named.0,
-            org_uri: self.__unsafe_private_named.1,
-            roles: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            display_name: self._fields.0,
+            org_uri: self._fields.1,
+            roles: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -8087,10 +8066,10 @@ where
         >,
     ) -> OrgCreditView<'a> {
         OrgCreditView {
-            display_name: self.__unsafe_private_named.0,
-            org_uri: self.__unsafe_private_named.1,
-            roles: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            display_name: self._fields.0,
+            org_uri: self._fields.1,
+            roles: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -8106,44 +8085,44 @@ pub mod org_profile_detail_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type Did;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type Did = Unset;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Did = S::Did;
+        type Uri = Unset;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type Uri = S::Uri;
         type Did = Set<members::did>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Did = S::Did;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct OrgProfileDetailViewBuilder<'a, S: org_profile_detail_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -8158,7 +8137,7 @@ pub struct OrgProfileDetailViewBuilder<'a, S: org_profile_detail_view_state::Sta
         Option<AtUri<'a>>,
         Option<Vec<games_gamesgamesgamesgames::Website<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> OrgProfileDetailView<'a> {
@@ -8175,8 +8154,8 @@ impl<'a> OrgProfileDetailViewBuilder<'a, org_profile_detail_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OrgProfileDetailViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -8191,7 +8170,7 @@ impl<'a> OrgProfileDetailViewBuilder<'a, org_profile_detail_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8199,12 +8178,12 @@ impl<'a> OrgProfileDetailViewBuilder<'a, org_profile_detail_view_state::Empty> {
 impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -8212,12 +8191,12 @@ impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a
 impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a, S> {
     /// Set the `country` field (optional)
     pub fn country(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `country` field to an Option value (optional)
     pub fn maybe_country(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -8225,12 +8204,12 @@ impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a
 impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -8238,12 +8217,12 @@ impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a
 impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -8254,12 +8233,12 @@ impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `descriptionFacets` field to an Option value (optional)
     pub fn maybe_description_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -8274,11 +8253,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> OrgProfileDetailViewBuilder<'a, org_profile_detail_view_state::SetDid<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         OrgProfileDetailViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8286,12 +8265,12 @@ where
 impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -8299,12 +8278,12 @@ impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a
 impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a, S> {
     /// Set the `foundedAt` field (optional)
     pub fn founded_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `foundedAt` field to an Option value (optional)
     pub fn maybe_founded_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -8315,7 +8294,7 @@ impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::MediaItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `media` field to an Option value (optional)
@@ -8323,7 +8302,7 @@ impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::MediaItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -8331,12 +8310,12 @@ impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a
 impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -8347,7 +8326,7 @@ impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a
         mut self,
         value: impl Into<Option<OrgProfileDetailViewStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
@@ -8355,7 +8334,7 @@ impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a
         mut self,
         value: Option<OrgProfileDetailViewStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -8370,11 +8349,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> OrgProfileDetailViewBuilder<'a, org_profile_detail_view_state::SetUri<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         OrgProfileDetailViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8385,7 +8364,7 @@ impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a
         mut self,
         value: impl Into<Option<Vec<games_gamesgamesgamesgames::Website<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `websites` field to an Option value (optional)
@@ -8393,7 +8372,7 @@ impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a
         mut self,
         value: Option<Vec<games_gamesgamesgamesgames::Website<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -8401,25 +8380,25 @@ impl<'a, S: org_profile_detail_view_state::State> OrgProfileDetailViewBuilder<'a
 impl<'a, S> OrgProfileDetailViewBuilder<'a, S>
 where
     S: org_profile_detail_view_state::State,
-    S::Uri: org_profile_detail_view_state::IsSet,
     S::Did: org_profile_detail_view_state::IsSet,
+    S::Uri: org_profile_detail_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> OrgProfileDetailView<'a> {
         OrgProfileDetailView {
-            avatar: self.__unsafe_private_named.0,
-            country: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            description_facets: self.__unsafe_private_named.4,
-            did: self.__unsafe_private_named.5.unwrap(),
-            display_name: self.__unsafe_private_named.6,
-            founded_at: self.__unsafe_private_named.7,
-            media: self.__unsafe_private_named.8,
-            parent: self.__unsafe_private_named.9,
-            status: self.__unsafe_private_named.10,
-            uri: self.__unsafe_private_named.11.unwrap(),
-            websites: self.__unsafe_private_named.12,
+            avatar: self._fields.0,
+            country: self._fields.1,
+            created_at: self._fields.2,
+            description: self._fields.3,
+            description_facets: self._fields.4,
+            did: self._fields.5.unwrap(),
+            display_name: self._fields.6,
+            founded_at: self._fields.7,
+            media: self._fields.8,
+            parent: self._fields.9,
+            status: self._fields.10,
+            uri: self._fields.11.unwrap(),
+            websites: self._fields.12,
             extra_data: Default::default(),
         }
     }
@@ -8432,19 +8411,19 @@ where
         >,
     ) -> OrgProfileDetailView<'a> {
         OrgProfileDetailView {
-            avatar: self.__unsafe_private_named.0,
-            country: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            description_facets: self.__unsafe_private_named.4,
-            did: self.__unsafe_private_named.5.unwrap(),
-            display_name: self.__unsafe_private_named.6,
-            founded_at: self.__unsafe_private_named.7,
-            media: self.__unsafe_private_named.8,
-            parent: self.__unsafe_private_named.9,
-            status: self.__unsafe_private_named.10,
-            uri: self.__unsafe_private_named.11.unwrap(),
-            websites: self.__unsafe_private_named.12,
+            avatar: self._fields.0,
+            country: self._fields.1,
+            created_at: self._fields.2,
+            description: self._fields.3,
+            description_facets: self._fields.4,
+            did: self._fields.5.unwrap(),
+            display_name: self._fields.6,
+            founded_at: self._fields.7,
+            media: self._fields.8,
+            parent: self._fields.9,
+            status: self._fields.10,
+            uri: self._fields.11.unwrap(),
+            websites: self._fields.12,
             extra_data: Some(extra_data),
         }
     }
@@ -8496,14 +8475,14 @@ pub mod org_profile_summary_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct OrgProfileSummaryViewBuilder<'a, S: org_profile_summary_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> OrgProfileSummaryView<'a> {
@@ -8520,9 +8499,9 @@ impl<'a> OrgProfileSummaryViewBuilder<'a, org_profile_summary_view_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OrgProfileSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8530,12 +8509,12 @@ impl<'a> OrgProfileSummaryViewBuilder<'a, org_profile_summary_view_state::Empty>
 impl<'a, S: org_profile_summary_view_state::State> OrgProfileSummaryViewBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -8550,11 +8529,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> OrgProfileSummaryViewBuilder<'a, org_profile_summary_view_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         OrgProfileSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8562,12 +8541,12 @@ where
 impl<'a, S: org_profile_summary_view_state::State> OrgProfileSummaryViewBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -8582,11 +8561,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> OrgProfileSummaryViewBuilder<'a, org_profile_summary_view_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         OrgProfileSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8600,10 +8579,10 @@ where
     /// Build the final struct
     pub fn build(self) -> OrgProfileSummaryView<'a> {
         OrgProfileSummaryView {
-            avatar: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            display_name: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            avatar: self._fields.0,
+            did: self._fields.1.unwrap(),
+            display_name: self._fields.2,
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -8616,10 +8595,10 @@ where
         >,
     ) -> OrgProfileSummaryView<'a> {
         OrgProfileSummaryView {
-            avatar: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            display_name: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            avatar: self._fields.0,
+            did: self._fields.1.unwrap(),
+            display_name: self._fields.2,
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -8635,48 +8614,45 @@ pub mod platform_features_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Features;
         type Platform;
+        type Features;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Features = Unset;
         type Platform = Unset;
-    }
-    ///State transition - sets the `features` field to Set
-    pub struct SetFeatures<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetFeatures<S> {}
-    impl<S: State> State for SetFeatures<S> {
-        type Features = Set<members::features>;
-        type Platform = S::Platform;
+        type Features = Unset;
     }
     ///State transition - sets the `platform` field to Set
     pub struct SetPlatform<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPlatform<S> {}
     impl<S: State> State for SetPlatform<S> {
-        type Features = S::Features;
         type Platform = Set<members::platform>;
+        type Features = S::Features;
+    }
+    ///State transition - sets the `features` field to Set
+    pub struct SetFeatures<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetFeatures<S> {}
+    impl<S: State> State for SetFeatures<S> {
+        type Platform = S::Platform;
+        type Features = Set<members::features>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `features` field
-        pub struct features(());
         ///Marker type for the `platform` field
         pub struct platform(());
+        ///Marker type for the `features` field
+        pub struct features(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PlatformFeaturesBuilder<'a, S: platform_features_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<CowStr<'a>>>,
-        Option<PlatformFeaturesPlatform<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<CowStr<'a>>>, Option<PlatformFeaturesPlatform<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PlatformFeatures<'a> {
@@ -8690,9 +8666,9 @@ impl<'a> PlatformFeaturesBuilder<'a, platform_features_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PlatformFeaturesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8707,11 +8683,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> PlatformFeaturesBuilder<'a, platform_features_state::SetFeatures<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PlatformFeaturesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8726,11 +8702,11 @@ where
         mut self,
         value: impl Into<PlatformFeaturesPlatform<'a>>,
     ) -> PlatformFeaturesBuilder<'a, platform_features_state::SetPlatform<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PlatformFeaturesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8738,14 +8714,14 @@ where
 impl<'a, S> PlatformFeaturesBuilder<'a, S>
 where
     S: platform_features_state::State,
-    S::Features: platform_features_state::IsSet,
     S::Platform: platform_features_state::IsSet,
+    S::Features: platform_features_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PlatformFeatures<'a> {
         PlatformFeatures {
-            features: self.__unsafe_private_named.0.unwrap(),
-            platform: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            platform: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -8758,8 +8734,8 @@ where
         >,
     ) -> PlatformFeatures<'a> {
         PlatformFeatures {
-            features: self.__unsafe_private_named.0.unwrap(),
-            platform: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            platform: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -8775,51 +8751,51 @@ pub mod platform_summary_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type Name;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Name = S::Name;
+        type Uri = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Uri = S::Uri;
         type Name = Set<members::name>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Name = S::Name;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PlatformSummaryViewBuilder<'a, S: platform_summary_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<games_gamesgamesgamesgames::PlatformCategory<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PlatformSummaryView<'a> {
@@ -8833,9 +8809,9 @@ impl<'a> PlatformSummaryViewBuilder<'a, platform_summary_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PlatformSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8843,12 +8819,12 @@ impl<'a> PlatformSummaryViewBuilder<'a, platform_summary_view_state::Empty> {
 impl<'a, S: platform_summary_view_state::State> PlatformSummaryViewBuilder<'a, S> {
     /// Set the `abbreviation` field (optional)
     pub fn abbreviation(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `abbreviation` field to an Option value (optional)
     pub fn maybe_abbreviation(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -8859,7 +8835,7 @@ impl<'a, S: platform_summary_view_state::State> PlatformSummaryViewBuilder<'a, S
         mut self,
         value: impl Into<Option<games_gamesgamesgamesgames::PlatformCategory<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
@@ -8867,7 +8843,7 @@ impl<'a, S: platform_summary_view_state::State> PlatformSummaryViewBuilder<'a, S
         mut self,
         value: Option<games_gamesgamesgamesgames::PlatformCategory<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -8882,11 +8858,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PlatformSummaryViewBuilder<'a, platform_summary_view_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PlatformSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8894,12 +8870,12 @@ where
 impl<'a, S: platform_summary_view_state::State> PlatformSummaryViewBuilder<'a, S> {
     /// Set the `slug` field (optional)
     pub fn slug(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `slug` field to an Option value (optional)
     pub fn maybe_slug(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -8914,11 +8890,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PlatformSummaryViewBuilder<'a, platform_summary_view_state::SetUri<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PlatformSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8926,17 +8902,17 @@ where
 impl<'a, S> PlatformSummaryViewBuilder<'a, S>
 where
     S: platform_summary_view_state::State,
-    S::Uri: platform_summary_view_state::IsSet,
     S::Name: platform_summary_view_state::IsSet,
+    S::Uri: platform_summary_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PlatformSummaryView<'a> {
         PlatformSummaryView {
-            abbreviation: self.__unsafe_private_named.0,
-            category: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
-            slug: self.__unsafe_private_named.3,
-            uri: self.__unsafe_private_named.4.unwrap(),
+            abbreviation: self._fields.0,
+            category: self._fields.1,
+            name: self._fields.2.unwrap(),
+            slug: self._fields.3,
+            uri: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -8949,11 +8925,11 @@ where
         >,
     ) -> PlatformSummaryView<'a> {
         PlatformSummaryView {
-            abbreviation: self.__unsafe_private_named.0,
-            category: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
-            slug: self.__unsafe_private_named.3,
-            uri: self.__unsafe_private_named.4.unwrap(),
+            abbreviation: self._fields.0,
+            category: self._fields.1,
+            name: self._fields.2.unwrap(),
+            slug: self._fields.3,
+            uri: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -8969,49 +8945,49 @@ pub mod profile_summary_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Did;
         type ProfileType;
+        type Did;
         type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Did = Unset;
         type ProfileType = Unset;
+        type Did = Unset;
         type Uri = Unset;
     }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Did = Set<members::did>;
-        type ProfileType = S::ProfileType;
-        type Uri = S::Uri;
-    }
     ///State transition - sets the `profile_type` field to Set
     pub struct SetProfileType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetProfileType<S> {}
     impl<S: State> State for SetProfileType<S> {
-        type Did = S::Did;
         type ProfileType = Set<members::profile_type>;
+        type Did = S::Did;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type ProfileType = S::ProfileType;
+        type Did = Set<members::did>;
         type Uri = S::Uri;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Did = S::Did;
         type ProfileType = S::ProfileType;
+        type Did = S::Did;
         type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `profile_type` field
         pub struct profile_type(());
+        ///Marker type for the `did` field
+        pub struct did(());
         ///Marker type for the `uri` field
         pub struct uri(());
     }
@@ -9019,15 +8995,15 @@ pub mod profile_summary_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileSummaryViewBuilder<'a, S: profile_summary_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
         Option<ProfileSummaryViewProfileType<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileSummaryView<'a> {
@@ -9041,9 +9017,9 @@ impl<'a> ProfileSummaryViewBuilder<'a, profile_summary_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9051,12 +9027,12 @@ impl<'a> ProfileSummaryViewBuilder<'a, profile_summary_view_state::Empty> {
 impl<'a, S: profile_summary_view_state::State> ProfileSummaryViewBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -9071,11 +9047,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ProfileSummaryViewBuilder<'a, profile_summary_view_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ProfileSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9083,12 +9059,12 @@ where
 impl<'a, S: profile_summary_view_state::State> ProfileSummaryViewBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -9103,11 +9079,11 @@ where
         mut self,
         value: impl Into<ProfileSummaryViewProfileType<'a>>,
     ) -> ProfileSummaryViewBuilder<'a, profile_summary_view_state::SetProfileType<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ProfileSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9122,11 +9098,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ProfileSummaryViewBuilder<'a, profile_summary_view_state::SetUri<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ProfileSummaryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9134,18 +9110,18 @@ where
 impl<'a, S> ProfileSummaryViewBuilder<'a, S>
 where
     S: profile_summary_view_state::State,
-    S::Did: profile_summary_view_state::IsSet,
     S::ProfileType: profile_summary_view_state::IsSet,
+    S::Did: profile_summary_view_state::IsSet,
     S::Uri: profile_summary_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ProfileSummaryView<'a> {
         ProfileSummaryView {
-            avatar: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            display_name: self.__unsafe_private_named.2,
-            profile_type: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            avatar: self._fields.0,
+            did: self._fields.1.unwrap(),
+            display_name: self._fields.2,
+            profile_type: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -9158,11 +9134,11 @@ where
         >,
     ) -> ProfileSummaryView<'a> {
         ProfileSummaryView {
-            avatar: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            display_name: self.__unsafe_private_named.2,
-            profile_type: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            avatar: self._fields.0,
+            did: self._fields.1.unwrap(),
+            display_name: self._fields.2,
+            profile_type: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -9202,9 +9178,9 @@ pub mod skeleton_game_feed_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct SkeletonGameFeedItemBuilder<'a, S: skeleton_game_feed_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SkeletonGameFeedItem<'a> {
@@ -9221,9 +9197,9 @@ impl<'a> SkeletonGameFeedItemBuilder<'a, skeleton_game_feed_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SkeletonGameFeedItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9231,12 +9207,12 @@ impl<'a> SkeletonGameFeedItemBuilder<'a, skeleton_game_feed_item_state::Empty> {
 impl<'a, S: skeleton_game_feed_item_state::State> SkeletonGameFeedItemBuilder<'a, S> {
     /// Set the `feedContext` field (optional)
     pub fn feed_context(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `feedContext` field to an Option value (optional)
     pub fn maybe_feed_context(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -9251,11 +9227,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SkeletonGameFeedItemBuilder<'a, skeleton_game_feed_item_state::SetGame<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SkeletonGameFeedItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9268,8 +9244,8 @@ where
     /// Build the final struct
     pub fn build(self) -> SkeletonGameFeedItem<'a> {
         SkeletonGameFeedItem {
-            feed_context: self.__unsafe_private_named.0,
-            game: self.__unsafe_private_named.1.unwrap(),
+            feed_context: self._fields.0,
+            game: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -9282,8 +9258,8 @@ where
         >,
     ) -> SkeletonGameFeedItem<'a> {
         SkeletonGameFeedItem {
-            feed_context: self.__unsafe_private_named.0,
-            game: self.__unsafe_private_named.1.unwrap(),
+            feed_context: self._fields.0,
+            game: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -9323,9 +9299,9 @@ pub mod website_state {
 
 /// Builder for constructing an instance of this type
 pub struct WebsiteBuilder<'a, S: website_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<WebsiteType<'a>>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<WebsiteType<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Website<'a> {
@@ -9339,9 +9315,9 @@ impl<'a> WebsiteBuilder<'a, website_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WebsiteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9349,12 +9325,12 @@ impl<'a> WebsiteBuilder<'a, website_state::Empty> {
 impl<'a, S: website_state::State> WebsiteBuilder<'a, S> {
     /// Set the `type` field (optional)
     pub fn r#type(mut self, value: impl Into<Option<WebsiteType<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `type` field to an Option value (optional)
     pub fn maybe_type(mut self, value: Option<WebsiteType<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -9369,11 +9345,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> WebsiteBuilder<'a, website_state::SetUrl<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         WebsiteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9386,8 +9362,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Website<'a> {
         Website {
-            r#type: self.__unsafe_private_named.0,
-            url: self.__unsafe_private_named.1.unwrap(),
+            r#type: self._fields.0,
+            url: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -9400,8 +9376,8 @@ where
         >,
     ) -> Website<'a> {
         Website {
-            r#type: self.__unsafe_private_named.0,
-            url: self.__unsafe_private_named.1.unwrap(),
+            r#type: self._fields.0,
+            url: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/create_profile.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/create_profile.rs
index 59b59373..1cd2c9e0 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/create_profile.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/create_profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::blob::BlobRef;
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/credit.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/credit.rs
index 08d44e29..a5e5149a 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/credit.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/credit.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -166,14 +169,14 @@ pub mod credit_state {
 
 /// Builder for constructing an instance of this type
 pub struct CreditBuilder<'a, S: credit_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<StrongRef<'a>>,
         Option<Vec<CreditEntry<'a>>>,
         Option<CowStr<'a>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Credit<'a> {
@@ -187,9 +190,9 @@ impl<'a> CreditBuilder<'a, credit_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreditBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,12 +200,12 @@ impl<'a> CreditBuilder<'a, credit_state::Empty> {
 impl<'a, S: credit_state::State> CreditBuilder<'a, S> {
     /// Set the `actor` field (optional)
     pub fn actor(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `actor` field to an Option value (optional)
     pub fn maybe_actor(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -217,11 +220,11 @@ where
         mut self,
         value: impl Into<Vec<CreditEntry<'a>>>,
     ) -> CreditBuilder<'a, credit_state::SetCredits<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CreditBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -229,12 +232,12 @@ where
 impl<'a, S: credit_state::State> CreditBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -249,11 +252,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> CreditBuilder<'a, credit_state::SetGame<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CreditBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -267,10 +270,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Credit<'a> {
         Credit {
-            actor: self.__unsafe_private_named.0,
-            credits: self.__unsafe_private_named.1.unwrap(),
-            display_name: self.__unsafe_private_named.2,
-            game: self.__unsafe_private_named.3.unwrap(),
+            actor: self._fields.0,
+            credits: self._fields.1.unwrap(),
+            display_name: self._fields.2,
+            game: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -283,10 +286,10 @@ where
         >,
     ) -> Credit<'a> {
         Credit {
-            actor: self.__unsafe_private_named.0,
-            credits: self.__unsafe_private_named.1.unwrap(),
-            display_name: self.__unsafe_private_named.2,
-            game: self.__unsafe_private_named.3.unwrap(),
+            actor: self._fields.0,
+            credits: self._fields.1.unwrap(),
+            display_name: self._fields.2,
+            game: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/game.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/game.rs
index 56c2d52e..51e8a778 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/game.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/game.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -414,64 +417,64 @@ pub mod game_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Platform;
         type CreatedAt;
         type Game;
-        type Platform;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Platform = Unset;
         type CreatedAt = Unset;
         type Game = Unset;
-        type Platform = Unset;
+    }
+    ///State transition - sets the `platform` field to Set
+    pub struct SetPlatform<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPlatform<S> {}
+    impl<S: State> State for SetPlatform<S> {
+        type Platform = Set<members::platform>;
+        type CreatedAt = S::CreatedAt;
+        type Game = S::Game;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Platform = S::Platform;
         type CreatedAt = Set<members::created_at>;
         type Game = S::Game;
-        type Platform = S::Platform;
     }
     ///State transition - sets the `game` field to Set
     pub struct SetGame<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetGame<S> {}
     impl<S: State> State for SetGame<S> {
-        type CreatedAt = S::CreatedAt;
-        type Game = Set<members::game>;
         type Platform = S::Platform;
-    }
-    ///State transition - sets the `platform` field to Set
-    pub struct SetPlatform<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPlatform<S> {}
-    impl<S: State> State for SetPlatform<S> {
         type CreatedAt = S::CreatedAt;
-        type Game = S::Game;
-        type Platform = Set<members::platform>;
+        type Game = Set<members::game>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `platform` field
+        pub struct platform(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `game` field
         pub struct game(());
-        ///Marker type for the `platform` field
-        pub struct platform(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GameBuilder<'a, S: game_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<game::GameRef<'a>>,
         Option<GamePlatform<'a>>,
         Option<Vec<GameSignaturesItem<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Game<'a> {
@@ -485,9 +488,9 @@ impl<'a> GameBuilder<'a, game_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -502,11 +505,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> GameBuilder<'a, game_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -521,11 +524,11 @@ where
         mut self,
         value: impl Into<game::GameRef<'a>>,
     ) -> GameBuilder<'a, game_state::SetGame<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -540,11 +543,11 @@ where
         mut self,
         value: impl Into<GamePlatform<'a>>,
     ) -> GameBuilder<'a, game_state::SetPlatform<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -555,7 +558,7 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<GameSignaturesItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `signatures` field to an Option value (optional)
@@ -563,7 +566,7 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
         mut self,
         value: Option<Vec<GameSignaturesItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -571,17 +574,17 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
 impl<'a, S> GameBuilder<'a, S>
 where
     S: game_state::State,
+    S::Platform: game_state::IsSet,
     S::CreatedAt: game_state::IsSet,
     S::Game: game_state::IsSet,
-    S::Platform: game_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Game<'a> {
         Game {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            game: self.__unsafe_private_named.1.unwrap(),
-            platform: self.__unsafe_private_named.2.unwrap(),
-            signatures: self.__unsafe_private_named.3,
+            created_at: self._fields.0.unwrap(),
+            game: self._fields.1.unwrap(),
+            platform: self._fields.2.unwrap(),
+            signatures: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -591,10 +594,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Game<'a> {
         Game {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            game: self.__unsafe_private_named.1.unwrap(),
-            platform: self.__unsafe_private_named.2.unwrap(),
-            signatures: self.__unsafe_private_named.3,
+            created_at: self._fields.0.unwrap(),
+            game: self._fields.1.unwrap(),
+            platform: self._fields.2.unwrap(),
+            signatures: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/get_profile.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/get_profile.rs
index 5e849579..7b02752d 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/get_profile.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/get_profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/profile.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/profile.rs
index d332bd4c..feb89adf 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/profile.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -201,44 +204,44 @@ pub mod profile_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type DisplayName;
         type CreatedAt;
+        type DisplayName;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type DisplayName = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `display_name` field to Set
-    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
-    impl<S: State> State for SetDisplayName<S> {
-        type DisplayName = Set<members::display_name>;
-        type CreatedAt = S::CreatedAt;
+        type DisplayName = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type DisplayName = S::DisplayName;
         type CreatedAt = Set<members::created_at>;
+        type DisplayName = S::DisplayName;
+    }
+    ///State transition - sets the `display_name` field to Set
+    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
+    impl<S: State> State for SetDisplayName<S> {
+        type CreatedAt = S::CreatedAt;
+        type DisplayName = Set<members::display_name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `display_name` field
-        pub struct display_name(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `display_name` field
+        pub struct display_name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -247,7 +250,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<CowStr<'a>>,
         Option<Vec<Website<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -261,9 +264,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -271,12 +274,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -291,11 +294,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ProfileBuilder<'a, profile_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -303,12 +306,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -319,12 +322,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `descriptionFacets` field to an Option value (optional)
     pub fn maybe_description_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -339,11 +342,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProfileBuilder<'a, profile_state::SetDisplayName<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -351,12 +354,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `pronouns` field (optional)
     pub fn pronouns(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `pronouns` field to an Option value (optional)
     pub fn maybe_pronouns(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -364,12 +367,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `websites` field (optional)
     pub fn websites(mut self, value: impl Into<Option<Vec<Website<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `websites` field to an Option value (optional)
     pub fn maybe_websites(mut self, value: Option<Vec<Website<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -377,19 +380,19 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S> ProfileBuilder<'a, S>
 where
     S: profile_state::State,
-    S::DisplayName: profile_state::IsSet,
     S::CreatedAt: profile_state::IsSet,
+    S::DisplayName: profile_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            description_facets: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4.unwrap(),
-            pronouns: self.__unsafe_private_named.5,
-            websites: self.__unsafe_private_named.6,
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            description_facets: self._fields.3,
+            display_name: self._fields.4.unwrap(),
+            pronouns: self._fields.5,
+            websites: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -402,13 +405,13 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            description_facets: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4.unwrap(),
-            pronouns: self.__unsafe_private_named.5,
-            websites: self.__unsafe_private_named.6,
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            description_facets: self._fields.3,
+            display_name: self._fields.4.unwrap(),
+            pronouns: self._fields.5,
+            websites: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/put_profile.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/put_profile.rs
index e8beeb25..35ef0d3c 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/put_profile.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/actor/put_profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::blob::BlobRef;
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/claim.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/claim.rs
index 9479f33a..338b3262 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/claim.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/claim.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -270,8 +273,8 @@ pub mod claim_state {
 
 /// Builder for constructing an instance of this type
 pub struct ClaimBuilder<'a, S: claim_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<Vec<AtUri<'a>>>,
@@ -279,7 +282,7 @@ pub struct ClaimBuilder<'a, S: claim_state::State> {
         Option<AtUri<'a>>,
         Option<ClaimType<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Claim<'a> {
@@ -293,9 +296,9 @@ impl<'a> ClaimBuilder<'a, claim_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ClaimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -303,12 +306,12 @@ impl<'a> ClaimBuilder<'a, claim_state::Empty> {
 impl<'a, S: claim_state::State> ClaimBuilder<'a, S> {
     /// Set the `contact` field (optional)
     pub fn contact(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `contact` field to an Option value (optional)
     pub fn maybe_contact(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -323,11 +326,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ClaimBuilder<'a, claim_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ClaimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -335,12 +338,12 @@ where
 impl<'a, S: claim_state::State> ClaimBuilder<'a, S> {
     /// Set the `games` field (optional)
     pub fn games(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `games` field to an Option value (optional)
     pub fn maybe_games(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -348,12 +351,12 @@ impl<'a, S: claim_state::State> ClaimBuilder<'a, S> {
 impl<'a, S: claim_state::State> ClaimBuilder<'a, S> {
     /// Set the `message` field (optional)
     pub fn message(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `message` field to an Option value (optional)
     pub fn maybe_message(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -361,12 +364,12 @@ impl<'a, S: claim_state::State> ClaimBuilder<'a, S> {
 impl<'a, S: claim_state::State> ClaimBuilder<'a, S> {
     /// Set the `org` field (optional)
     pub fn org(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `org` field to an Option value (optional)
     pub fn maybe_org(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -381,11 +384,11 @@ where
         mut self,
         value: impl Into<ClaimType<'a>>,
     ) -> ClaimBuilder<'a, claim_state::SetType<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ClaimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -399,12 +402,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Claim<'a> {
         Claim {
-            contact: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            games: self.__unsafe_private_named.2,
-            message: self.__unsafe_private_named.3,
-            org: self.__unsafe_private_named.4,
-            r#type: self.__unsafe_private_named.5.unwrap(),
+            contact: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            games: self._fields.2,
+            message: self._fields.3,
+            org: self._fields.4,
+            r#type: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -417,12 +420,12 @@ where
         >,
     ) -> Claim<'a> {
         Claim {
-            contact: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            games: self.__unsafe_private_named.2,
-            message: self.__unsafe_private_named.3,
-            org: self.__unsafe_private_named.4,
-            r#type: self.__unsafe_private_named.5.unwrap(),
+            contact: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            games: self._fields.2,
+            message: self._fields.3,
+            org: self._fields.4,
+            r#type: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/claim_review.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/claim_review.rs
index a2fe1f56..52a8eb9a 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/claim_review.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/claim_review.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -220,74 +223,74 @@ pub mod claim_review_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Claim;
+        type ReviewedBy;
         type CreatedAt;
         type Status;
-        type ReviewedBy;
-        type Claim;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Claim = Unset;
+        type ReviewedBy = Unset;
         type CreatedAt = Unset;
         type Status = Unset;
-        type ReviewedBy = Unset;
-        type Claim = Unset;
+    }
+    ///State transition - sets the `claim` field to Set
+    pub struct SetClaim<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetClaim<S> {}
+    impl<S: State> State for SetClaim<S> {
+        type Claim = Set<members::claim>;
+        type ReviewedBy = S::ReviewedBy;
+        type CreatedAt = S::CreatedAt;
+        type Status = S::Status;
+    }
+    ///State transition - sets the `reviewed_by` field to Set
+    pub struct SetReviewedBy<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetReviewedBy<S> {}
+    impl<S: State> State for SetReviewedBy<S> {
+        type Claim = S::Claim;
+        type ReviewedBy = Set<members::reviewed_by>;
+        type CreatedAt = S::CreatedAt;
+        type Status = S::Status;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Claim = S::Claim;
+        type ReviewedBy = S::ReviewedBy;
         type CreatedAt = Set<members::created_at>;
         type Status = S::Status;
-        type ReviewedBy = S::ReviewedBy;
-        type Claim = S::Claim;
     }
     ///State transition - sets the `status` field to Set
     pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStatus<S> {}
     impl<S: State> State for SetStatus<S> {
-        type CreatedAt = S::CreatedAt;
-        type Status = Set<members::status>;
-        type ReviewedBy = S::ReviewedBy;
         type Claim = S::Claim;
-    }
-    ///State transition - sets the `reviewed_by` field to Set
-    pub struct SetReviewedBy<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetReviewedBy<S> {}
-    impl<S: State> State for SetReviewedBy<S> {
-        type CreatedAt = S::CreatedAt;
-        type Status = S::Status;
-        type ReviewedBy = Set<members::reviewed_by>;
-        type Claim = S::Claim;
-    }
-    ///State transition - sets the `claim` field to Set
-    pub struct SetClaim<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetClaim<S> {}
-    impl<S: State> State for SetClaim<S> {
-        type CreatedAt = S::CreatedAt;
-        type Status = S::Status;
         type ReviewedBy = S::ReviewedBy;
-        type Claim = Set<members::claim>;
+        type CreatedAt = S::CreatedAt;
+        type Status = Set<members::status>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `claim` field
+        pub struct claim(());
+        ///Marker type for the `reviewed_by` field
+        pub struct reviewed_by(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `status` field
         pub struct status(());
-        ///Marker type for the `reviewed_by` field
-        pub struct reviewed_by(());
-        ///Marker type for the `claim` field
-        pub struct claim(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ClaimReviewBuilder<'a, S: claim_review_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<AtUri<'a>>>,
         Option<StrongRef<'a>>,
         Option<Datetime>,
@@ -295,7 +298,7 @@ pub struct ClaimReviewBuilder<'a, S: claim_review_state::State> {
         Option<Did<'a>>,
         Option<ClaimReviewStatus<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ClaimReview<'a> {
@@ -309,9 +312,9 @@ impl<'a> ClaimReviewBuilder<'a, claim_review_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ClaimReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -319,12 +322,12 @@ impl<'a> ClaimReviewBuilder<'a, claim_review_state::Empty> {
 impl<'a, S: claim_review_state::State> ClaimReviewBuilder<'a, S> {
     /// Set the `approvedGames` field (optional)
     pub fn approved_games(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `approvedGames` field to an Option value (optional)
     pub fn maybe_approved_games(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -339,11 +342,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ClaimReviewBuilder<'a, claim_review_state::SetClaim<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ClaimReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -358,11 +361,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ClaimReviewBuilder<'a, claim_review_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ClaimReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -370,12 +373,12 @@ where
 impl<'a, S: claim_review_state::State> ClaimReviewBuilder<'a, S> {
     /// Set the `reason` field (optional)
     pub fn reason(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `reason` field to an Option value (optional)
     pub fn maybe_reason(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -390,11 +393,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ClaimReviewBuilder<'a, claim_review_state::SetReviewedBy<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ClaimReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -409,11 +412,11 @@ where
         mut self,
         value: impl Into<ClaimReviewStatus<'a>>,
     ) -> ClaimReviewBuilder<'a, claim_review_state::SetStatus<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ClaimReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -421,20 +424,20 @@ where
 impl<'a, S> ClaimReviewBuilder<'a, S>
 where
     S: claim_review_state::State,
+    S::Claim: claim_review_state::IsSet,
+    S::ReviewedBy: claim_review_state::IsSet,
     S::CreatedAt: claim_review_state::IsSet,
     S::Status: claim_review_state::IsSet,
-    S::ReviewedBy: claim_review_state::IsSet,
-    S::Claim: claim_review_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ClaimReview<'a> {
         ClaimReview {
-            approved_games: self.__unsafe_private_named.0,
-            claim: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            reason: self.__unsafe_private_named.3,
-            reviewed_by: self.__unsafe_private_named.4.unwrap(),
-            status: self.__unsafe_private_named.5.unwrap(),
+            approved_games: self._fields.0,
+            claim: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            reason: self._fields.3,
+            reviewed_by: self._fields.4.unwrap(),
+            status: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -447,12 +450,12 @@ where
         >,
     ) -> ClaimReview<'a> {
         ClaimReview {
-            approved_games: self.__unsafe_private_named.0,
-            claim: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            reason: self.__unsafe_private_named.3,
-            reviewed_by: self.__unsafe_private_named.4.unwrap(),
-            status: self.__unsafe_private_named.5.unwrap(),
+            approved_games: self._fields.0,
+            claim: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            reason: self._fields.3,
+            reviewed_by: self._fields.4.unwrap(),
+            status: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/collection.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/collection.rs
index 670d5ecc..c91fe94e 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/collection.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/collection.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -222,44 +225,44 @@ pub mod collection_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type CreatedAt;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type CreatedAt = S::CreatedAt;
+        type Name = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Name = S::Name;
         type CreatedAt = Set<members::created_at>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type CreatedAt = S::CreatedAt;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CollectionBuilder<'a, S: collection_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Vec<AtUri<'a>>>,
@@ -269,7 +272,7 @@ pub struct CollectionBuilder<'a, S: collection_state::State> {
         Option<CollectionType<'a>>,
         Option<Vec<Website<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Collection<'a> {
@@ -283,9 +286,9 @@ impl<'a> CollectionBuilder<'a, collection_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -300,11 +303,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionBuilder<'a, collection_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -312,12 +315,12 @@ where
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -325,12 +328,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `games` field (optional)
     pub fn games(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `games` field to an Option value (optional)
     pub fn maybe_games(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -338,12 +341,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `media` field (optional)
     pub fn media(mut self, value: impl Into<Option<Vec<MediaItem<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `media` field to an Option value (optional)
     pub fn maybe_media(mut self, value: Option<Vec<MediaItem<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -358,11 +361,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CollectionBuilder<'a, collection_state::SetName<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -370,12 +373,12 @@ where
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -383,12 +386,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `type` field (optional)
     pub fn r#type(mut self, value: impl Into<Option<CollectionType<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `type` field to an Option value (optional)
     pub fn maybe_type(mut self, value: Option<CollectionType<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -396,12 +399,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `websites` field (optional)
     pub fn websites(mut self, value: impl Into<Option<Vec<Website<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `websites` field to an Option value (optional)
     pub fn maybe_websites(mut self, value: Option<Vec<Website<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -409,20 +412,20 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S> CollectionBuilder<'a, S>
 where
     S: collection_state::State,
-    S::Name: collection_state::IsSet,
     S::CreatedAt: collection_state::IsSet,
+    S::Name: collection_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Collection<'a> {
         Collection {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            games: self.__unsafe_private_named.2,
-            media: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            parent: self.__unsafe_private_named.5,
-            r#type: self.__unsafe_private_named.6,
-            websites: self.__unsafe_private_named.7,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            games: self._fields.2,
+            media: self._fields.3,
+            name: self._fields.4.unwrap(),
+            parent: self._fields.5,
+            r#type: self._fields.6,
+            websites: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -435,14 +438,14 @@ where
         >,
     ) -> Collection<'a> {
         Collection {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            games: self.__unsafe_private_named.2,
-            media: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            parent: self.__unsafe_private_named.5,
-            r#type: self.__unsafe_private_named.6,
-            websites: self.__unsafe_private_named.7,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            games: self._fields.2,
+            media: self._fields.3,
+            name: self._fields.4.unwrap(),
+            parent: self._fields.5,
+            r#type: self._fields.6,
+            websites: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/create_claim.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/create_claim.rs
index 64ec3245..c2a2df6a 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/create_claim.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/create_claim.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/create_game.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/create_game.rs
index 51f03261..f6a8e4ab 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/create_game.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/create_game.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/engine.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/engine.rs
index 9e2e5564..82b17eea 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/engine.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/engine.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -125,44 +128,44 @@ pub mod engine_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type CreatedAt;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type CreatedAt = S::CreatedAt;
+        type Name = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Name = S::Name;
         type CreatedAt = Set<members::created_at>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type CreatedAt = S::CreatedAt;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EngineBuilder<'a, S: engine_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<AtUri<'a>>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -171,7 +174,7 @@ pub struct EngineBuilder<'a, S: engine_state::State> {
         Option<Vec<AtUri<'a>>>,
         Option<Vec<Website<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Engine<'a> {
@@ -185,9 +188,9 @@ impl<'a> EngineBuilder<'a, engine_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EngineBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -195,12 +198,12 @@ impl<'a> EngineBuilder<'a, engine_state::Empty> {
 impl<'a, S: engine_state::State> EngineBuilder<'a, S> {
     /// Set the `companies` field (optional)
     pub fn companies(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `companies` field to an Option value (optional)
     pub fn maybe_companies(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EngineBuilder<'a, engine_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EngineBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -227,12 +230,12 @@ where
 impl<'a, S: engine_state::State> EngineBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -240,12 +243,12 @@ impl<'a, S: engine_state::State> EngineBuilder<'a, S> {
 impl<'a, S: engine_state::State> EngineBuilder<'a, S> {
     /// Set the `media` field (optional)
     pub fn media(mut self, value: impl Into<Option<Vec<MediaItem<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `media` field to an Option value (optional)
     pub fn maybe_media(mut self, value: Option<Vec<MediaItem<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -260,11 +263,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EngineBuilder<'a, engine_state::SetName<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         EngineBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -272,12 +275,12 @@ where
 impl<'a, S: engine_state::State> EngineBuilder<'a, S> {
     /// Set the `platforms` field (optional)
     pub fn platforms(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `platforms` field to an Option value (optional)
     pub fn maybe_platforms(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -285,12 +288,12 @@ impl<'a, S: engine_state::State> EngineBuilder<'a, S> {
 impl<'a, S: engine_state::State> EngineBuilder<'a, S> {
     /// Set the `websites` field (optional)
     pub fn websites(mut self, value: impl Into<Option<Vec<Website<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `websites` field to an Option value (optional)
     pub fn maybe_websites(mut self, value: Option<Vec<Website<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -298,19 +301,19 @@ impl<'a, S: engine_state::State> EngineBuilder<'a, S> {
 impl<'a, S> EngineBuilder<'a, S>
 where
     S: engine_state::State,
-    S::Name: engine_state::IsSet,
     S::CreatedAt: engine_state::IsSet,
+    S::Name: engine_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Engine<'a> {
         Engine {
-            companies: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            media: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            platforms: self.__unsafe_private_named.5,
-            websites: self.__unsafe_private_named.6,
+            companies: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            media: self._fields.3,
+            name: self._fields.4.unwrap(),
+            platforms: self._fields.5,
+            websites: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -323,13 +326,13 @@ where
         >,
     ) -> Engine<'a> {
         Engine {
-            companies: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            media: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            platforms: self.__unsafe_private_named.5,
-            websites: self.__unsafe_private_named.6,
+            companies: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            media: self._fields.3,
+            name: self._fields.4.unwrap(),
+            platforms: self._fields.5,
+            websites: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/describe_feed_generator.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/describe_feed_generator.rs
index 9c90ba62..8f0a4d8d 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/describe_feed_generator.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/describe_feed_generator.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -148,9 +151,9 @@ pub mod feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct FeedBuilder<'a, S: feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Feed<'a> {
@@ -164,9 +167,9 @@ impl<'a> FeedBuilder<'a, feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,11 +184,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> FeedBuilder<'a, feed_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,7 +201,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Feed<'a> {
         Feed {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -211,7 +214,7 @@ where
         >,
     ) -> Feed<'a> {
         Feed {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/generator.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/generator.rs
index bf034f08..71cd4682 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/generator.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/generator.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -206,57 +209,57 @@ pub mod generator_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type CreatedAt;
-        type DisplayName;
         type Did;
+        type DisplayName;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type CreatedAt = Unset;
-        type DisplayName = Unset;
         type Did = Unset;
+        type DisplayName = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type CreatedAt = Set<members::created_at>;
-        type DisplayName = S::DisplayName;
-        type Did = S::Did;
-    }
-    ///State transition - sets the `display_name` field to Set
-    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
-    impl<S: State> State for SetDisplayName<S> {
-        type CreatedAt = S::CreatedAt;
-        type DisplayName = Set<members::display_name>;
         type Did = S::Did;
+        type DisplayName = S::DisplayName;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
         type CreatedAt = S::CreatedAt;
-        type DisplayName = S::DisplayName;
         type Did = Set<members::did>;
+        type DisplayName = S::DisplayName;
+    }
+    ///State transition - sets the `display_name` field to Set
+    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
+    impl<S: State> State for SetDisplayName<S> {
+        type CreatedAt = S::CreatedAt;
+        type Did = S::Did;
+        type DisplayName = Set<members::display_name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `display_name` field
-        pub struct display_name(());
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `display_name` field
+        pub struct display_name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GeneratorBuilder<'a, S: generator_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<BlobRef<'a>>,
         Option<Datetime>,
@@ -264,7 +267,7 @@ pub struct GeneratorBuilder<'a, S: generator_state::State> {
         Option<Did<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Generator<'a> {
@@ -278,9 +281,9 @@ impl<'a> GeneratorBuilder<'a, generator_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GeneratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -288,12 +291,12 @@ impl<'a> GeneratorBuilder<'a, generator_state::Empty> {
 impl<'a, S: generator_state::State> GeneratorBuilder<'a, S> {
     /// Set the `acceptsInteractions` field (optional)
     pub fn accepts_interactions(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `acceptsInteractions` field to an Option value (optional)
     pub fn maybe_accepts_interactions(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -301,12 +304,12 @@ impl<'a, S: generator_state::State> GeneratorBuilder<'a, S> {
 impl<'a, S: generator_state::State> GeneratorBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -321,11 +324,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> GeneratorBuilder<'a, generator_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GeneratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -333,12 +336,12 @@ where
 impl<'a, S: generator_state::State> GeneratorBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -353,11 +356,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GeneratorBuilder<'a, generator_state::SetDid<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         GeneratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -372,11 +375,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GeneratorBuilder<'a, generator_state::SetDisplayName<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         GeneratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -385,18 +388,18 @@ impl<'a, S> GeneratorBuilder<'a, S>
 where
     S: generator_state::State,
     S::CreatedAt: generator_state::IsSet,
-    S::DisplayName: generator_state::IsSet,
     S::Did: generator_state::IsSet,
+    S::DisplayName: generator_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Generator<'a> {
         Generator {
-            accepts_interactions: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            did: self.__unsafe_private_named.4.unwrap(),
-            display_name: self.__unsafe_private_named.5.unwrap(),
+            accepts_interactions: self._fields.0,
+            avatar: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            did: self._fields.4.unwrap(),
+            display_name: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -409,12 +412,12 @@ where
         >,
     ) -> Generator<'a> {
         Generator {
-            accepts_interactions: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            did: self.__unsafe_private_named.4.unwrap(),
-            display_name: self.__unsafe_private_named.5.unwrap(),
+            accepts_interactions: self._fields.0,
+            avatar: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            did: self._fields.4.unwrap(),
+            display_name: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_feed_skeleton.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_feed_skeleton.rs
index 6ac5bb63..4faebec5 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_feed_skeleton.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_feed_skeleton.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -137,9 +140,9 @@ pub mod get_feed_skeleton_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFeedSkeletonBuilder<'a, S: get_feed_skeleton_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFeedSkeleton<'a> {
@@ -153,9 +156,9 @@ impl<'a> GetFeedSkeletonBuilder<'a, get_feed_skeleton_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFeedSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -163,12 +166,12 @@ impl<'a> GetFeedSkeletonBuilder<'a, get_feed_skeleton_state::Empty> {
 impl<'a, S: get_feed_skeleton_state::State> GetFeedSkeletonBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -183,11 +186,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetFeedSkeletonBuilder<'a, get_feed_skeleton_state::SetFeed<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetFeedSkeletonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -195,12 +198,12 @@ where
 impl<'a, S: get_feed_skeleton_state::State> GetFeedSkeletonBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -213,9 +216,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFeedSkeleton<'a> {
         GetFeedSkeleton {
-            cursor: self.__unsafe_private_named.0,
-            feed: self.__unsafe_private_named.1.unwrap(),
-            limit: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            feed: self._fields.1.unwrap(),
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_game_feed.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_game_feed.rs
index e27ac9cf..66c0ff64 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_game_feed.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_game_feed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -137,9 +140,9 @@ pub mod get_game_feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetGameFeedBuilder<'a, S: get_game_feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetGameFeed<'a> {
@@ -153,9 +156,9 @@ impl<'a> GetGameFeedBuilder<'a, get_game_feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetGameFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -163,12 +166,12 @@ impl<'a> GetGameFeedBuilder<'a, get_game_feed_state::Empty> {
 impl<'a, S: get_game_feed_state::State> GetGameFeedBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -183,11 +186,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetGameFeedBuilder<'a, get_game_feed_state::SetFeed<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetGameFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -195,12 +198,12 @@ where
 impl<'a, S: get_game_feed_state::State> GetGameFeedBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -213,9 +216,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetGameFeed<'a> {
         GetGameFeed {
-            cursor: self.__unsafe_private_named.0,
-            feed: self.__unsafe_private_named.1.unwrap(),
-            limit: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            feed: self._fields.1.unwrap(),
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_hot_games_feed.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_hot_games_feed.rs
index ac76194f..6c3d0b6f 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_hot_games_feed.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_hot_games_feed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -85,9 +88,9 @@ pub mod get_hot_games_feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetHotGamesFeedBuilder<'a, S: get_hot_games_feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetHotGamesFeed<'a> {
@@ -101,9 +104,9 @@ impl<'a> GetHotGamesFeedBuilder<'a, get_hot_games_feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetHotGamesFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -111,12 +114,12 @@ impl<'a> GetHotGamesFeedBuilder<'a, get_hot_games_feed_state::Empty> {
 impl<'a, S: get_hot_games_feed_state::State> GetHotGamesFeedBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -124,12 +127,12 @@ impl<'a, S: get_hot_games_feed_state::State> GetHotGamesFeedBuilder<'a, S> {
 impl<'a, S: get_hot_games_feed_state::State> GetHotGamesFeedBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -141,8 +144,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetHotGamesFeed<'a> {
         GetHotGamesFeed {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_likes_feed.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_likes_feed.rs
index 96e5828d..96abca1a 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_likes_feed.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_likes_feed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -100,9 +103,9 @@ pub mod get_likes_feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetLikesFeedBuilder<'a, S: get_likes_feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetLikesFeed<'a> {
@@ -116,9 +119,9 @@ impl<'a> GetLikesFeedBuilder<'a, get_likes_feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetLikesFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -126,12 +129,12 @@ impl<'a> GetLikesFeedBuilder<'a, get_likes_feed_state::Empty> {
 impl<'a, S: get_likes_feed_state::State> GetLikesFeedBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -146,11 +149,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetLikesFeedBuilder<'a, get_likes_feed_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetLikesFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -158,12 +161,12 @@ where
 impl<'a, S: get_likes_feed_state::State> GetLikesFeedBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -176,9 +179,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetLikesFeed<'a> {
         GetLikesFeed {
-            cursor: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            limit: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            did: self._fields.1.unwrap(),
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_personalized_feed.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_personalized_feed.rs
index a5eed709..56297bdf 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_personalized_feed.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_personalized_feed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -85,9 +88,9 @@ pub mod get_personalized_feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetPersonalizedFeedBuilder<'a, S: get_personalized_feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetPersonalizedFeed<'a> {
@@ -101,9 +104,9 @@ impl<'a> GetPersonalizedFeedBuilder<'a, get_personalized_feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetPersonalizedFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -111,12 +114,12 @@ impl<'a> GetPersonalizedFeedBuilder<'a, get_personalized_feed_state::Empty> {
 impl<'a, S: get_personalized_feed_state::State> GetPersonalizedFeedBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -124,12 +127,12 @@ impl<'a, S: get_personalized_feed_state::State> GetPersonalizedFeedBuilder<'a, S
 impl<'a, S: get_personalized_feed_state::State> GetPersonalizedFeedBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -141,8 +144,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetPersonalizedFeed<'a> {
         GetPersonalizedFeed {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_recently_updated_feed.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_recently_updated_feed.rs
index 59b7dd1f..92057d2c 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_recently_updated_feed.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_recently_updated_feed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -85,9 +88,9 @@ pub mod get_recently_updated_feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetRecentlyUpdatedFeedBuilder<'a, S: get_recently_updated_feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetRecentlyUpdatedFeed<'a> {
@@ -104,9 +107,9 @@ impl<'a> GetRecentlyUpdatedFeedBuilder<'a, get_recently_updated_feed_state::Empt
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetRecentlyUpdatedFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -117,12 +120,12 @@ impl<
 > GetRecentlyUpdatedFeedBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -133,12 +136,12 @@ impl<
 > GetRecentlyUpdatedFeedBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -150,8 +153,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetRecentlyUpdatedFeed<'a> {
         GetRecentlyUpdatedFeed {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_similar_games_feed.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_similar_games_feed.rs
index df5e1122..d4a0d465 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_similar_games_feed.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_similar_games_feed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -94,9 +97,9 @@ pub mod get_similar_games_feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSimilarGamesFeedBuilder<'a, S: get_similar_games_feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSimilarGamesFeed<'a> {
@@ -110,9 +113,9 @@ impl<'a> GetSimilarGamesFeedBuilder<'a, get_similar_games_feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSimilarGamesFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,12 +123,12 @@ impl<'a> GetSimilarGamesFeedBuilder<'a, get_similar_games_feed_state::Empty> {
 impl<'a, S: get_similar_games_feed_state::State> GetSimilarGamesFeedBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -140,11 +143,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetSimilarGamesFeedBuilder<'a, get_similar_games_feed_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetSimilarGamesFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -157,8 +160,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSimilarGamesFeed<'a> {
         GetSimilarGamesFeed {
-            limit: self.__unsafe_private_named.0,
-            uri: self.__unsafe_private_named.1.unwrap(),
+            limit: self._fields.0,
+            uri: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_upcoming_releases_feed.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_upcoming_releases_feed.rs
index fb2fa335..ab806663 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_upcoming_releases_feed.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/feed/get_upcoming_releases_feed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -88,9 +91,9 @@ pub struct GetUpcomingReleasesFeedBuilder<
     'a,
     S: get_upcoming_releases_feed_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetUpcomingReleasesFeed<'a> {
@@ -107,9 +110,9 @@ impl<'a> GetUpcomingReleasesFeedBuilder<'a, get_upcoming_releases_feed_state::Em
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetUpcomingReleasesFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,12 +123,12 @@ impl<
 > GetUpcomingReleasesFeedBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -136,12 +139,12 @@ impl<
 > GetUpcomingReleasesFeedBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -153,8 +156,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetUpcomingReleasesFeed<'a> {
         GetUpcomingReleasesFeed {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/game.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/game.rs
index e775946c..d9207f04 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/game.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/game.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -205,49 +208,49 @@ pub mod game_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type ApplicationType;
+        type CreatedAt;
         type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type ApplicationType = Unset;
+        type CreatedAt = Unset;
         type Name = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type ApplicationType = S::ApplicationType;
-        type Name = S::Name;
-    }
     ///State transition - sets the `application_type` field to Set
     pub struct SetApplicationType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetApplicationType<S> {}
     impl<S: State> State for SetApplicationType<S> {
-        type CreatedAt = S::CreatedAt;
         type ApplicationType = Set<members::application_type>;
+        type CreatedAt = S::CreatedAt;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type ApplicationType = S::ApplicationType;
+        type CreatedAt = Set<members::created_at>;
         type Name = S::Name;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type CreatedAt = S::CreatedAt;
         type ApplicationType = S::ApplicationType;
+        type CreatedAt = S::CreatedAt;
         type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `application_type` field
         pub struct application_type(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `name` field
         pub struct name(());
     }
@@ -255,8 +258,8 @@ pub mod game_state {
 
 /// Builder for constructing an instance of this type
 pub struct GameBuilder<'a, S: game_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<AgeRating<'a>>>,
         Option<Vec<AlternativeName<'a>>>,
         Option<ApplicationType<'a>>,
@@ -285,7 +288,7 @@ pub struct GameBuilder<'a, S: game_state::State> {
         Option<Vec<ExternalVideo<'a>>>,
         Option<Vec<Website<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Game<'a> {
@@ -299,8 +302,8 @@ impl<'a> GameBuilder<'a, game_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -329,7 +332,7 @@ impl<'a> GameBuilder<'a, game_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -337,12 +340,12 @@ impl<'a> GameBuilder<'a, game_state::Empty> {
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `ageRatings` field (optional)
     pub fn age_ratings(mut self, value: impl Into<Option<Vec<AgeRating<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `ageRatings` field to an Option value (optional)
     pub fn maybe_age_ratings(mut self, value: Option<Vec<AgeRating<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -353,7 +356,7 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<AlternativeName<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `alternativeNames` field to an Option value (optional)
@@ -361,7 +364,7 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
         mut self,
         value: Option<Vec<AlternativeName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -376,11 +379,11 @@ where
         mut self,
         value: impl Into<ApplicationType<'a>>,
     ) -> GameBuilder<'a, game_state::SetApplicationType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -395,11 +398,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> GameBuilder<'a, game_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -407,12 +410,12 @@ where
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -423,12 +426,12 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `descriptionFacets` field to an Option value (optional)
     pub fn maybe_description_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -436,12 +439,12 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `engines` field (optional)
     pub fn engines(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `engines` field to an Option value (optional)
     pub fn maybe_engines(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -449,12 +452,12 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `externalIds` field (optional)
     pub fn external_ids(mut self, value: impl Into<Option<ExternalIds<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `externalIds` field to an Option value (optional)
     pub fn maybe_external_ids(mut self, value: Option<ExternalIds<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -462,12 +465,12 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `genres` field (optional)
     pub fn genres(mut self, value: impl Into<Option<Vec<Genre<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `genres` field to an Option value (optional)
     pub fn maybe_genres(mut self, value: Option<Vec<Genre<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -475,12 +478,12 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -491,7 +494,7 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<LanguageSupport<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `languageSupports` field to an Option value (optional)
@@ -499,7 +502,7 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
         mut self,
         value: Option<Vec<LanguageSupport<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -507,12 +510,12 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `media` field (optional)
     pub fn media(mut self, value: impl Into<Option<Vec<MediaItem<'a>>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `media` field to an Option value (optional)
     pub fn maybe_media(mut self, value: Option<Vec<MediaItem<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -520,12 +523,12 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `modes` field (optional)
     pub fn modes(mut self, value: impl Into<Option<Vec<Mode<'a>>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `modes` field to an Option value (optional)
     pub fn maybe_modes(mut self, value: Option<Vec<Mode<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -536,7 +539,7 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<MultiplayerMode<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `multiplayerModes` field to an Option value (optional)
@@ -544,7 +547,7 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
         mut self,
         value: Option<Vec<MultiplayerMode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -559,11 +562,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GameBuilder<'a, game_state::SetName<S>> {
-        self.__unsafe_private_named.14 = Option::Some(value.into());
+        self._fields.14 = Option::Some(value.into());
         GameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -571,12 +574,12 @@ where
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -587,7 +590,7 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<PlatformFeatures<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `platformFeatures` field to an Option value (optional)
@@ -595,7 +598,7 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
         mut self,
         value: Option<Vec<PlatformFeatures<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -606,7 +609,7 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<PlayerPerspective<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `playerPerspectives` field to an Option value (optional)
@@ -614,7 +617,7 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
         mut self,
         value: Option<Vec<PlayerPerspective<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -622,12 +625,12 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `publishedAt` field (optional)
     pub fn published_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `publishedAt` field to an Option value (optional)
     pub fn maybe_published_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -635,12 +638,12 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `releases` field (optional)
     pub fn releases(mut self, value: impl Into<Option<Vec<Release<'a>>>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `releases` field to an Option value (optional)
     pub fn maybe_releases(mut self, value: Option<Vec<Release<'a>>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -648,12 +651,12 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `storyline` field (optional)
     pub fn storyline(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `storyline` field to an Option value (optional)
     pub fn maybe_storyline(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -661,12 +664,12 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `summary` field (optional)
     pub fn summary(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `summary` field to an Option value (optional)
     pub fn maybe_summary(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -677,7 +680,7 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<SystemRequirements<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `systemRequirements` field to an Option value (optional)
@@ -685,7 +688,7 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
         mut self,
         value: Option<Vec<SystemRequirements<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -693,12 +696,12 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `themes` field (optional)
     pub fn themes(mut self, value: impl Into<Option<Vec<Theme<'a>>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `themes` field to an Option value (optional)
     pub fn maybe_themes(mut self, value: Option<Vec<Theme<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -706,12 +709,12 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `timeToBeat` field (optional)
     pub fn time_to_beat(mut self, value: impl Into<Option<TimeToBeat<'a>>>) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `timeToBeat` field to an Option value (optional)
     pub fn maybe_time_to_beat(mut self, value: Option<TimeToBeat<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -719,12 +722,12 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `videos` field (optional)
     pub fn videos(mut self, value: impl Into<Option<Vec<ExternalVideo<'a>>>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `videos` field to an Option value (optional)
     pub fn maybe_videos(mut self, value: Option<Vec<ExternalVideo<'a>>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -732,12 +735,12 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
 impl<'a, S: game_state::State> GameBuilder<'a, S> {
     /// Set the `websites` field (optional)
     pub fn websites(mut self, value: impl Into<Option<Vec<Website<'a>>>>) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `websites` field to an Option value (optional)
     pub fn maybe_websites(mut self, value: Option<Vec<Website<'a>>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -745,40 +748,40 @@ impl<'a, S: game_state::State> GameBuilder<'a, S> {
 impl<'a, S> GameBuilder<'a, S>
 where
     S: game_state::State,
-    S::CreatedAt: game_state::IsSet,
     S::ApplicationType: game_state::IsSet,
+    S::CreatedAt: game_state::IsSet,
     S::Name: game_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Game<'a> {
         Game {
-            age_ratings: self.__unsafe_private_named.0,
-            alternative_names: self.__unsafe_private_named.1,
-            application_type: self.__unsafe_private_named.2.unwrap(),
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            description: self.__unsafe_private_named.4,
-            description_facets: self.__unsafe_private_named.5,
-            engines: self.__unsafe_private_named.6,
-            external_ids: self.__unsafe_private_named.7,
-            genres: self.__unsafe_private_named.8,
-            keywords: self.__unsafe_private_named.9,
-            language_supports: self.__unsafe_private_named.10,
-            media: self.__unsafe_private_named.11,
-            modes: self.__unsafe_private_named.12,
-            multiplayer_modes: self.__unsafe_private_named.13,
-            name: self.__unsafe_private_named.14.unwrap(),
-            parent: self.__unsafe_private_named.15,
-            platform_features: self.__unsafe_private_named.16,
-            player_perspectives: self.__unsafe_private_named.17,
-            published_at: self.__unsafe_private_named.18,
-            releases: self.__unsafe_private_named.19,
-            storyline: self.__unsafe_private_named.20,
-            summary: self.__unsafe_private_named.21,
-            system_requirements: self.__unsafe_private_named.22,
-            themes: self.__unsafe_private_named.23,
-            time_to_beat: self.__unsafe_private_named.24,
-            videos: self.__unsafe_private_named.25,
-            websites: self.__unsafe_private_named.26,
+            age_ratings: self._fields.0,
+            alternative_names: self._fields.1,
+            application_type: self._fields.2.unwrap(),
+            created_at: self._fields.3.unwrap(),
+            description: self._fields.4,
+            description_facets: self._fields.5,
+            engines: self._fields.6,
+            external_ids: self._fields.7,
+            genres: self._fields.8,
+            keywords: self._fields.9,
+            language_supports: self._fields.10,
+            media: self._fields.11,
+            modes: self._fields.12,
+            multiplayer_modes: self._fields.13,
+            name: self._fields.14.unwrap(),
+            parent: self._fields.15,
+            platform_features: self._fields.16,
+            player_perspectives: self._fields.17,
+            published_at: self._fields.18,
+            releases: self._fields.19,
+            storyline: self._fields.20,
+            summary: self._fields.21,
+            system_requirements: self._fields.22,
+            themes: self._fields.23,
+            time_to_beat: self._fields.24,
+            videos: self._fields.25,
+            websites: self._fields.26,
             extra_data: Default::default(),
         }
     }
@@ -791,33 +794,33 @@ where
         >,
     ) -> Game<'a> {
         Game {
-            age_ratings: self.__unsafe_private_named.0,
-            alternative_names: self.__unsafe_private_named.1,
-            application_type: self.__unsafe_private_named.2.unwrap(),
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            description: self.__unsafe_private_named.4,
-            description_facets: self.__unsafe_private_named.5,
-            engines: self.__unsafe_private_named.6,
-            external_ids: self.__unsafe_private_named.7,
-            genres: self.__unsafe_private_named.8,
-            keywords: self.__unsafe_private_named.9,
-            language_supports: self.__unsafe_private_named.10,
-            media: self.__unsafe_private_named.11,
-            modes: self.__unsafe_private_named.12,
-            multiplayer_modes: self.__unsafe_private_named.13,
-            name: self.__unsafe_private_named.14.unwrap(),
-            parent: self.__unsafe_private_named.15,
-            platform_features: self.__unsafe_private_named.16,
-            player_perspectives: self.__unsafe_private_named.17,
-            published_at: self.__unsafe_private_named.18,
-            releases: self.__unsafe_private_named.19,
-            storyline: self.__unsafe_private_named.20,
-            summary: self.__unsafe_private_named.21,
-            system_requirements: self.__unsafe_private_named.22,
-            themes: self.__unsafe_private_named.23,
-            time_to_beat: self.__unsafe_private_named.24,
-            videos: self.__unsafe_private_named.25,
-            websites: self.__unsafe_private_named.26,
+            age_ratings: self._fields.0,
+            alternative_names: self._fields.1,
+            application_type: self._fields.2.unwrap(),
+            created_at: self._fields.3.unwrap(),
+            description: self._fields.4,
+            description_facets: self._fields.5,
+            engines: self._fields.6,
+            external_ids: self._fields.7,
+            genres: self._fields.8,
+            keywords: self._fields.9,
+            language_supports: self._fields.10,
+            media: self._fields.11,
+            modes: self._fields.12,
+            multiplayer_modes: self._fields.13,
+            name: self._fields.14.unwrap(),
+            parent: self._fields.15,
+            platform_features: self._fields.16,
+            player_perspectives: self._fields.17,
+            published_at: self._fields.18,
+            releases: self._fields.19,
+            storyline: self._fields.20,
+            summary: self._fields.21,
+            system_requirements: self._fields.22,
+            themes: self._fields.23,
+            time_to_beat: self._fields.24,
+            videos: self._fields.25,
+            websites: self._fields.26,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/get_claim.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/get_claim.rs
index c255c47e..ce11dcfb 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/get_claim.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/get_claim.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -332,91 +335,91 @@ pub mod claim_view_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type ClaimantDid;
-        type Type;
         type CreatedAt;
-        type Uri;
         type Cid;
+        type Uri;
+        type Type;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type ClaimantDid = Unset;
-        type Type = Unset;
         type CreatedAt = Unset;
-        type Uri = Unset;
         type Cid = Unset;
+        type Uri = Unset;
+        type Type = Unset;
     }
     ///State transition - sets the `claimant_did` field to Set
     pub struct SetClaimantDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetClaimantDid<S> {}
     impl<S: State> State for SetClaimantDid<S> {
         type ClaimantDid = Set<members::claimant_did>;
-        type Type = S::Type;
         type CreatedAt = S::CreatedAt;
-        type Uri = S::Uri;
         type Cid = S::Cid;
-    }
-    ///State transition - sets the `type` field to Set
-    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetType<S> {}
-    impl<S: State> State for SetType<S> {
-        type ClaimantDid = S::ClaimantDid;
-        type Type = Set<members::r#type>;
-        type CreatedAt = S::CreatedAt;
         type Uri = S::Uri;
-        type Cid = S::Cid;
+        type Type = S::Type;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type ClaimantDid = S::ClaimantDid;
-        type Type = S::Type;
         type CreatedAt = Set<members::created_at>;
-        type Uri = S::Uri;
         type Cid = S::Cid;
+        type Uri = S::Uri;
+        type Type = S::Type;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type ClaimantDid = S::ClaimantDid;
+        type CreatedAt = S::CreatedAt;
+        type Cid = Set<members::cid>;
+        type Uri = S::Uri;
+        type Type = S::Type;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
         type ClaimantDid = S::ClaimantDid;
-        type Type = S::Type;
         type CreatedAt = S::CreatedAt;
-        type Uri = Set<members::uri>;
         type Cid = S::Cid;
+        type Uri = Set<members::uri>;
+        type Type = S::Type;
     }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
+    ///State transition - sets the `type` field to Set
+    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetType<S> {}
+    impl<S: State> State for SetType<S> {
         type ClaimantDid = S::ClaimantDid;
-        type Type = S::Type;
         type CreatedAt = S::CreatedAt;
+        type Cid = S::Cid;
         type Uri = S::Uri;
-        type Cid = Set<members::cid>;
+        type Type = Set<members::r#type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `claimant_did` field
         pub struct claimant_did(());
-        ///Marker type for the `type` field
-        pub struct r#type(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `cid` field
         pub struct cid(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
+        ///Marker type for the `type` field
+        pub struct r#type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ClaimViewBuilder<'a, S: claim_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
@@ -428,7 +431,7 @@ pub struct ClaimViewBuilder<'a, S: claim_view_state::State> {
         Option<ClaimViewType<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ClaimView<'a> {
@@ -442,20 +445,9 @@ impl<'a> ClaimViewBuilder<'a, claim_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ClaimViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -470,11 +462,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ClaimViewBuilder<'a, claim_view_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ClaimViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -489,11 +481,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ClaimViewBuilder<'a, claim_view_state::SetClaimantDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ClaimViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -501,12 +493,12 @@ where
 impl<'a, S: claim_view_state::State> ClaimViewBuilder<'a, S> {
     /// Set the `contact` field (optional)
     pub fn contact(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `contact` field to an Option value (optional)
     pub fn maybe_contact(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -521,11 +513,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ClaimViewBuilder<'a, claim_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ClaimViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -533,12 +525,12 @@ where
 impl<'a, S: claim_view_state::State> ClaimViewBuilder<'a, S> {
     /// Set the `games` field (optional)
     pub fn games(mut self, value: impl Into<Option<Vec<GameSummaryView<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `games` field to an Option value (optional)
     pub fn maybe_games(mut self, value: Option<Vec<GameSummaryView<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -546,12 +538,12 @@ impl<'a, S: claim_view_state::State> ClaimViewBuilder<'a, S> {
 impl<'a, S: claim_view_state::State> ClaimViewBuilder<'a, S> {
     /// Set the `message` field (optional)
     pub fn message(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `message` field to an Option value (optional)
     pub fn maybe_message(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -559,12 +551,12 @@ impl<'a, S: claim_view_state::State> ClaimViewBuilder<'a, S> {
 impl<'a, S: claim_view_state::State> ClaimViewBuilder<'a, S> {
     /// Set the `org` field (optional)
     pub fn org(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `org` field to an Option value (optional)
     pub fn maybe_org(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -575,12 +567,12 @@ impl<'a, S: claim_view_state::State> ClaimViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<get_claim::ReviewView<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<get_claim::ReviewView<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -595,11 +587,11 @@ where
         mut self,
         value: impl Into<ClaimViewType<'a>>,
     ) -> ClaimViewBuilder<'a, claim_view_state::SetType<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         ClaimViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -614,11 +606,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ClaimViewBuilder<'a, claim_view_state::SetUri<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ClaimViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -627,24 +619,24 @@ impl<'a, S> ClaimViewBuilder<'a, S>
 where
     S: claim_view_state::State,
     S::ClaimantDid: claim_view_state::IsSet,
-    S::Type: claim_view_state::IsSet,
     S::CreatedAt: claim_view_state::IsSet,
-    S::Uri: claim_view_state::IsSet,
     S::Cid: claim_view_state::IsSet,
+    S::Uri: claim_view_state::IsSet,
+    S::Type: claim_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ClaimView<'a> {
         ClaimView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            claimant_did: self.__unsafe_private_named.1.unwrap(),
-            contact: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            games: self.__unsafe_private_named.4,
-            message: self.__unsafe_private_named.5,
-            org: self.__unsafe_private_named.6,
-            review: self.__unsafe_private_named.7,
-            r#type: self.__unsafe_private_named.8.unwrap(),
-            uri: self.__unsafe_private_named.9.unwrap(),
+            cid: self._fields.0.unwrap(),
+            claimant_did: self._fields.1.unwrap(),
+            contact: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            games: self._fields.4,
+            message: self._fields.5,
+            org: self._fields.6,
+            review: self._fields.7,
+            r#type: self._fields.8.unwrap(),
+            uri: self._fields.9.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -657,16 +649,16 @@ where
         >,
     ) -> ClaimView<'a> {
         ClaimView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            claimant_did: self.__unsafe_private_named.1.unwrap(),
-            contact: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            games: self.__unsafe_private_named.4,
-            message: self.__unsafe_private_named.5,
-            org: self.__unsafe_private_named.6,
-            review: self.__unsafe_private_named.7,
-            r#type: self.__unsafe_private_named.8.unwrap(),
-            uri: self.__unsafe_private_named.9.unwrap(),
+            cid: self._fields.0.unwrap(),
+            claimant_did: self._fields.1.unwrap(),
+            contact: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            games: self._fields.4,
+            message: self._fields.5,
+            org: self._fields.6,
+            review: self._fields.7,
+            r#type: self._fields.8.unwrap(),
+            uri: self._fields.9.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -885,9 +877,9 @@ pub mod get_claim_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetClaimBuilder<'a, S: get_claim_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetClaim<'a> {
@@ -901,9 +893,9 @@ impl<'a> GetClaimBuilder<'a, get_claim_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetClaimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -918,11 +910,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetClaimBuilder<'a, get_claim_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetClaimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -935,7 +927,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetClaim<'a> {
         GetClaim {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
         }
     }
 }
@@ -950,74 +942,74 @@ pub mod review_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ReviewedBy;
         type Status;
-        type CreatedAt;
         type Uri;
+        type CreatedAt;
+        type ReviewedBy;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ReviewedBy = Unset;
         type Status = Unset;
-        type CreatedAt = Unset;
         type Uri = Unset;
-    }
-    ///State transition - sets the `reviewed_by` field to Set
-    pub struct SetReviewedBy<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetReviewedBy<S> {}
-    impl<S: State> State for SetReviewedBy<S> {
-        type ReviewedBy = Set<members::reviewed_by>;
-        type Status = S::Status;
-        type CreatedAt = S::CreatedAt;
-        type Uri = S::Uri;
+        type CreatedAt = Unset;
+        type ReviewedBy = Unset;
     }
     ///State transition - sets the `status` field to Set
     pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStatus<S> {}
     impl<S: State> State for SetStatus<S> {
-        type ReviewedBy = S::ReviewedBy;
         type Status = Set<members::status>;
-        type CreatedAt = S::CreatedAt;
         type Uri = S::Uri;
+        type CreatedAt = S::CreatedAt;
+        type ReviewedBy = S::ReviewedBy;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Status = S::Status;
+        type Uri = Set<members::uri>;
+        type CreatedAt = S::CreatedAt;
+        type ReviewedBy = S::ReviewedBy;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type ReviewedBy = S::ReviewedBy;
         type Status = S::Status;
-        type CreatedAt = Set<members::created_at>;
         type Uri = S::Uri;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
+        type CreatedAt = Set<members::created_at>;
         type ReviewedBy = S::ReviewedBy;
+    }
+    ///State transition - sets the `reviewed_by` field to Set
+    pub struct SetReviewedBy<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetReviewedBy<S> {}
+    impl<S: State> State for SetReviewedBy<S> {
         type Status = S::Status;
+        type Uri = S::Uri;
         type CreatedAt = S::CreatedAt;
-        type Uri = Set<members::uri>;
+        type ReviewedBy = Set<members::reviewed_by>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `reviewed_by` field
-        pub struct reviewed_by(());
         ///Marker type for the `status` field
         pub struct status(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `reviewed_by` field
+        pub struct reviewed_by(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReviewViewBuilder<'a, S: review_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<AtUri<'a>>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -1025,7 +1017,7 @@ pub struct ReviewViewBuilder<'a, S: review_view_state::State> {
         Option<ReviewViewStatus<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReviewView<'a> {
@@ -1039,9 +1031,9 @@ impl<'a> ReviewViewBuilder<'a, review_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReviewViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1049,12 +1041,12 @@ impl<'a> ReviewViewBuilder<'a, review_view_state::Empty> {
 impl<'a, S: review_view_state::State> ReviewViewBuilder<'a, S> {
     /// Set the `approvedGames` field (optional)
     pub fn approved_games(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `approvedGames` field to an Option value (optional)
     pub fn maybe_approved_games(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1069,11 +1061,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReviewViewBuilder<'a, review_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReviewViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1081,12 +1073,12 @@ where
 impl<'a, S: review_view_state::State> ReviewViewBuilder<'a, S> {
     /// Set the `reason` field (optional)
     pub fn reason(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `reason` field to an Option value (optional)
     pub fn maybe_reason(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1101,11 +1093,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ReviewViewBuilder<'a, review_view_state::SetReviewedBy<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ReviewViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1120,11 +1112,11 @@ where
         mut self,
         value: impl Into<ReviewViewStatus<'a>>,
     ) -> ReviewViewBuilder<'a, review_view_state::SetStatus<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ReviewViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1139,11 +1131,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ReviewViewBuilder<'a, review_view_state::SetUri<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ReviewViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1151,20 +1143,20 @@ where
 impl<'a, S> ReviewViewBuilder<'a, S>
 where
     S: review_view_state::State,
-    S::ReviewedBy: review_view_state::IsSet,
     S::Status: review_view_state::IsSet,
-    S::CreatedAt: review_view_state::IsSet,
     S::Uri: review_view_state::IsSet,
+    S::CreatedAt: review_view_state::IsSet,
+    S::ReviewedBy: review_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ReviewView<'a> {
         ReviewView {
-            approved_games: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            reason: self.__unsafe_private_named.2,
-            reviewed_by: self.__unsafe_private_named.3.unwrap(),
-            status: self.__unsafe_private_named.4.unwrap(),
-            uri: self.__unsafe_private_named.5.unwrap(),
+            approved_games: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            reason: self._fields.2,
+            reviewed_by: self._fields.3.unwrap(),
+            status: self._fields.4.unwrap(),
+            uri: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1177,12 +1169,12 @@ where
         >,
     ) -> ReviewView<'a> {
         ReviewView {
-            approved_games: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            reason: self.__unsafe_private_named.2,
-            reviewed_by: self.__unsafe_private_named.3.unwrap(),
-            status: self.__unsafe_private_named.4.unwrap(),
-            uri: self.__unsafe_private_named.5.unwrap(),
+            approved_games: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            reason: self._fields.2,
+            reviewed_by: self._fields.3.unwrap(),
+            status: self._fields.4.unwrap(),
+            uri: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/get_game.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/get_game.rs
index 1f110022..d44ebcc6 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/get_game.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/get_game.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -112,8 +115,8 @@ pub mod get_game_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetGameBuilder<'a, S: get_game_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -129,7 +132,7 @@ pub struct GetGameBuilder<'a, S: get_game_state::State> {
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetGame<'a> {
@@ -143,8 +146,8 @@ impl<'a> GetGameBuilder<'a, get_game_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetGameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -160,7 +163,7 @@ impl<'a> GetGameBuilder<'a, get_game_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -168,12 +171,12 @@ impl<'a> GetGameBuilder<'a, get_game_state::Empty> {
 impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
     /// Set the `appleAppStoreId` field (optional)
     pub fn apple_app_store_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `appleAppStoreId` field to an Option value (optional)
     pub fn maybe_apple_app_store_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -181,12 +184,12 @@ impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
 impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
     /// Set the `epicGamesId` field (optional)
     pub fn epic_games_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `epicGamesId` field to an Option value (optional)
     pub fn maybe_epic_games_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -194,12 +197,12 @@ impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
 impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
     /// Set the `gogId` field (optional)
     pub fn gog_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `gogId` field to an Option value (optional)
     pub fn maybe_gog_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -207,12 +210,12 @@ impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
 impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
     /// Set the `googlePlayId` field (optional)
     pub fn google_play_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `googlePlayId` field to an Option value (optional)
     pub fn maybe_google_play_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -220,12 +223,12 @@ impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
 impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
     /// Set the `humbleBundleId` field (optional)
     pub fn humble_bundle_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `humbleBundleId` field to an Option value (optional)
     pub fn maybe_humble_bundle_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -233,12 +236,12 @@ impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
 impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
     /// Set the `igdbId` field (optional)
     pub fn igdb_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `igdbId` field to an Option value (optional)
     pub fn maybe_igdb_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -246,12 +249,12 @@ impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
 impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
     /// Set the `includeActorCredits` field (optional)
     pub fn include_actor_credits(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `includeActorCredits` field to an Option value (optional)
     pub fn maybe_include_actor_credits(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -259,12 +262,12 @@ impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
 impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
     /// Set the `includeOrgCredits` field (optional)
     pub fn include_org_credits(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `includeOrgCredits` field to an Option value (optional)
     pub fn maybe_include_org_credits(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -272,12 +275,12 @@ impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
 impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
     /// Set the `nintendoEshopId` field (optional)
     pub fn nintendo_eshop_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `nintendoEshopId` field to an Option value (optional)
     pub fn maybe_nintendo_eshop_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -285,12 +288,12 @@ impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
 impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
     /// Set the `playStationId` field (optional)
     pub fn play_station_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `playStationId` field to an Option value (optional)
     pub fn maybe_play_station_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -298,12 +301,12 @@ impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
 impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
     /// Set the `slug` field (optional)
     pub fn slug(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `slug` field to an Option value (optional)
     pub fn maybe_slug(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -311,12 +314,12 @@ impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
 impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
     /// Set the `steamId` field (optional)
     pub fn steam_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `steamId` field to an Option value (optional)
     pub fn maybe_steam_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -324,12 +327,12 @@ impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
 impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
     /// Set the `uri` field (optional)
     pub fn uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `uri` field to an Option value (optional)
     pub fn maybe_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -337,12 +340,12 @@ impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
 impl<'a, S: get_game_state::State> GetGameBuilder<'a, S> {
     /// Set the `xboxId` field (optional)
     pub fn xbox_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `xboxId` field to an Option value (optional)
     pub fn maybe_xbox_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -354,20 +357,20 @@ where
     /// Build the final struct
     pub fn build(self) -> GetGame<'a> {
         GetGame {
-            apple_app_store_id: self.__unsafe_private_named.0,
-            epic_games_id: self.__unsafe_private_named.1,
-            gog_id: self.__unsafe_private_named.2,
-            google_play_id: self.__unsafe_private_named.3,
-            humble_bundle_id: self.__unsafe_private_named.4,
-            igdb_id: self.__unsafe_private_named.5,
-            include_actor_credits: self.__unsafe_private_named.6,
-            include_org_credits: self.__unsafe_private_named.7,
-            nintendo_eshop_id: self.__unsafe_private_named.8,
-            play_station_id: self.__unsafe_private_named.9,
-            slug: self.__unsafe_private_named.10,
-            steam_id: self.__unsafe_private_named.11,
-            uri: self.__unsafe_private_named.12,
-            xbox_id: self.__unsafe_private_named.13,
+            apple_app_store_id: self._fields.0,
+            epic_games_id: self._fields.1,
+            gog_id: self._fields.2,
+            google_play_id: self._fields.3,
+            humble_bundle_id: self._fields.4,
+            igdb_id: self._fields.5,
+            include_actor_credits: self._fields.6,
+            include_org_credits: self._fields.7,
+            nintendo_eshop_id: self._fields.8,
+            play_station_id: self._fields.9,
+            slug: self._fields.10,
+            steam_id: self._fields.11,
+            uri: self._fields.12,
+            xbox_id: self._fields.13,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/get_profile.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/get_profile.rs
index bf8bacb4..9626b1b4 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/get_profile.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/get_profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -186,9 +189,9 @@ pub mod get_profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetProfileBuilder<'a, S: get_profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetProfile<'a> {
@@ -202,9 +205,9 @@ impl<'a> GetProfileBuilder<'a, get_profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,12 +215,12 @@ impl<'a> GetProfileBuilder<'a, get_profile_state::Empty> {
 impl<'a, S: get_profile_state::State> GetProfileBuilder<'a, S> {
     /// Set the `handle` field (optional)
     pub fn handle(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `handle` field to an Option value (optional)
     pub fn maybe_handle(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -229,7 +232,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetProfile<'a> {
         GetProfile {
-            handle: self.__unsafe_private_named.0,
+            handle: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/get_reviews.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/get_reviews.rs
index fb09b06a..58a1683f 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/get_reviews.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/get_reviews.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -172,9 +175,9 @@ pub mod get_reviews_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetReviewsBuilder<'a, S: get_reviews_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetReviews<'a> {
@@ -188,9 +191,9 @@ impl<'a> GetReviewsBuilder<'a, get_reviews_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetReviewsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,12 +201,12 @@ impl<'a> GetReviewsBuilder<'a, get_reviews_state::Empty> {
 impl<'a, S: get_reviews_state::State> GetReviewsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -211,12 +214,12 @@ impl<'a, S: get_reviews_state::State> GetReviewsBuilder<'a, S> {
 impl<'a, S: get_reviews_state::State> GetReviewsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -231,11 +234,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetReviewsBuilder<'a, get_reviews_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetReviewsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -248,9 +251,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetReviews<'a> {
         GetReviews {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            uri: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            uri: self._fields.2.unwrap(),
         }
     }
 }
@@ -265,65 +268,65 @@ pub mod popfeed_review_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Uri;
         type Did;
         type Rating;
-        type Uri;
         type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Uri = Unset;
         type Did = Unset;
         type Rating = Unset;
-        type Uri = Unset;
         type CreatedAt = Unset;
     }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Uri = Set<members::uri>;
+        type Did = S::Did;
+        type Rating = S::Rating;
+        type CreatedAt = S::CreatedAt;
+    }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
+        type Uri = S::Uri;
         type Did = Set<members::did>;
         type Rating = S::Rating;
-        type Uri = S::Uri;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `rating` field to Set
     pub struct SetRating<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRating<S> {}
     impl<S: State> State for SetRating<S> {
-        type Did = S::Did;
-        type Rating = Set<members::rating>;
         type Uri = S::Uri;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
         type Did = S::Did;
-        type Rating = S::Rating;
-        type Uri = Set<members::uri>;
+        type Rating = Set<members::rating>;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Uri = S::Uri;
         type Did = S::Did;
         type Rating = S::Rating;
-        type Uri = S::Uri;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `uri` field
+        pub struct uri(());
         ///Marker type for the `did` field
         pub struct did(());
         ///Marker type for the `rating` field
         pub struct rating(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
     }
@@ -331,8 +334,8 @@ pub mod popfeed_review_state {
 
 /// Builder for constructing an instance of this type
 pub struct PopfeedReviewBuilder<'a, S: popfeed_review_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<Datetime>,
         Option<Did<'a>>,
@@ -343,7 +346,7 @@ pub struct PopfeedReviewBuilder<'a, S: popfeed_review_state::State> {
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PopfeedReview<'a> {
@@ -357,19 +360,9 @@ impl<'a> PopfeedReviewBuilder<'a, popfeed_review_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PopfeedReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -377,12 +370,12 @@ impl<'a> PopfeedReviewBuilder<'a, popfeed_review_state::Empty> {
 impl<'a, S: popfeed_review_state::State> PopfeedReviewBuilder<'a, S> {
     /// Set the `containsSpoilers` field (optional)
     pub fn contains_spoilers(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `containsSpoilers` field to an Option value (optional)
     pub fn maybe_contains_spoilers(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -397,11 +390,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PopfeedReviewBuilder<'a, popfeed_review_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PopfeedReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -416,11 +409,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> PopfeedReviewBuilder<'a, popfeed_review_state::SetDid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PopfeedReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -428,12 +421,12 @@ where
 impl<'a, S: popfeed_review_state::State> PopfeedReviewBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Data<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -448,11 +441,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PopfeedReviewBuilder<'a, popfeed_review_state::SetRating<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PopfeedReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -460,12 +453,12 @@ where
 impl<'a, S: popfeed_review_state::State> PopfeedReviewBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -473,12 +466,12 @@ impl<'a, S: popfeed_review_state::State> PopfeedReviewBuilder<'a, S> {
 impl<'a, S: popfeed_review_state::State> PopfeedReviewBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -486,12 +479,12 @@ impl<'a, S: popfeed_review_state::State> PopfeedReviewBuilder<'a, S> {
 impl<'a, S: popfeed_review_state::State> PopfeedReviewBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -506,11 +499,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PopfeedReviewBuilder<'a, popfeed_review_state::SetUri<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         PopfeedReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -518,23 +511,23 @@ where
 impl<'a, S> PopfeedReviewBuilder<'a, S>
 where
     S: popfeed_review_state::State,
+    S::Uri: popfeed_review_state::IsSet,
     S::Did: popfeed_review_state::IsSet,
     S::Rating: popfeed_review_state::IsSet,
-    S::Uri: popfeed_review_state::IsSet,
     S::CreatedAt: popfeed_review_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PopfeedReview<'a> {
         PopfeedReview {
-            contains_spoilers: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            did: self.__unsafe_private_named.2.unwrap(),
-            facets: self.__unsafe_private_named.3,
-            rating: self.__unsafe_private_named.4.unwrap(),
-            tags: self.__unsafe_private_named.5,
-            text: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7,
-            uri: self.__unsafe_private_named.8.unwrap(),
+            contains_spoilers: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            did: self._fields.2.unwrap(),
+            facets: self._fields.3,
+            rating: self._fields.4.unwrap(),
+            tags: self._fields.5,
+            text: self._fields.6,
+            title: self._fields.7,
+            uri: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -544,15 +537,15 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> PopfeedReview<'a> {
         PopfeedReview {
-            contains_spoilers: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            did: self.__unsafe_private_named.2.unwrap(),
-            facets: self.__unsafe_private_named.3,
-            rating: self.__unsafe_private_named.4.unwrap(),
-            tags: self.__unsafe_private_named.5,
-            text: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7,
-            uri: self.__unsafe_private_named.8.unwrap(),
+            contains_spoilers: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            did: self._fields.2.unwrap(),
+            facets: self._fields.3,
+            rating: self._fields.4.unwrap(),
+            tags: self._fields.5,
+            text: self._fields.6,
+            title: self._fields.7,
+            uri: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/graph/get_likes.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/graph/get_likes.rs
index a497650d..832bb50c 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/graph/get_likes.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/graph/get_likes.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -87,9 +90,9 @@ pub mod get_likes_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetLikesBuilder<'a, S: get_likes_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetLikes<'a> {
@@ -103,9 +106,9 @@ impl<'a> GetLikesBuilder<'a, get_likes_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetLikesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,11 +123,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetLikesBuilder<'a, get_likes_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetLikesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,7 +140,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetLikes<'a> {
         GetLikes {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/graph/like.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/graph/like.rs
index 298a3185..8953dc12 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/graph/like.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/graph/like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -145,9 +148,9 @@ pub mod like_state {
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -161,9 +164,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,8 +218,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -229,8 +232,8 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/graph/toggle_like.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/graph/toggle_like.rs
index 2205590b..71e371f7 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/graph/toggle_like.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/graph/toggle_like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -193,9 +196,9 @@ pub mod toggle_like_state {
 
 /// Builder for constructing an instance of this type
 pub struct ToggleLikeBuilder<'a, S: toggle_like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ToggleLike<'a> {
@@ -209,9 +212,9 @@ impl<'a> ToggleLikeBuilder<'a, toggle_like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ToggleLikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -226,11 +229,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ToggleLikeBuilder<'a, toggle_like_state::SetSubject<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ToggleLikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -243,7 +246,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ToggleLike<'a> {
         ToggleLike {
-            subject: self.__unsafe_private_named.0.unwrap(),
+            subject: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -256,7 +259,7 @@ where
         >,
     ) -> ToggleLike<'a> {
         ToggleLike {
-            subject: self.__unsafe_private_named.0.unwrap(),
+            subject: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/list_claims.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/list_claims.rs
index dd6ffdaa..121cd8d7 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/list_claims.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/list_claims.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -88,9 +91,9 @@ pub mod list_claims_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListClaimsBuilder<'a, S: list_claims_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListClaims<'a> {
@@ -104,9 +107,9 @@ impl<'a> ListClaimsBuilder<'a, list_claims_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListClaimsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -114,12 +117,12 @@ impl<'a> ListClaimsBuilder<'a, list_claims_state::Empty> {
 impl<'a, S: list_claims_state::State> ListClaimsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -127,12 +130,12 @@ impl<'a, S: list_claims_state::State> ListClaimsBuilder<'a, S> {
 impl<'a, S: list_claims_state::State> ListClaimsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -140,12 +143,12 @@ impl<'a, S: list_claims_state::State> ListClaimsBuilder<'a, S> {
 impl<'a, S: list_claims_state::State> ListClaimsBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -157,9 +160,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ListClaims<'a> {
         ListClaims {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            status: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            status: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/list_games.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/list_games.rs
index 4342b7a4..9d7f0ace 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/list_games.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/list_games.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -107,15 +110,15 @@ pub mod list_games_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListGamesBuilder<'a, S: list_games_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Did<'a>>,
         Option<i64>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListGames<'a> {
@@ -129,9 +132,9 @@ impl<'a> ListGamesBuilder<'a, list_games_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListGamesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -139,12 +142,12 @@ impl<'a> ListGamesBuilder<'a, list_games_state::Empty> {
 impl<'a, S: list_games_state::State> ListGamesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -152,12 +155,12 @@ impl<'a, S: list_games_state::State> ListGamesBuilder<'a, S> {
 impl<'a, S: list_games_state::State> ListGamesBuilder<'a, S> {
     /// Set the `did` field (optional)
     pub fn did(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `did` field to an Option value (optional)
     pub fn maybe_did(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -165,12 +168,12 @@ impl<'a, S: list_games_state::State> ListGamesBuilder<'a, S> {
 impl<'a, S: list_games_state::State> ListGamesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -178,12 +181,12 @@ impl<'a, S: list_games_state::State> ListGamesBuilder<'a, S> {
 impl<'a, S: list_games_state::State> ListGamesBuilder<'a, S> {
     /// Set the `sort` field (optional)
     pub fn sort(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `sort` field to an Option value (optional)
     pub fn maybe_sort(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -191,12 +194,12 @@ impl<'a, S: list_games_state::State> ListGamesBuilder<'a, S> {
 impl<'a, S: list_games_state::State> ListGamesBuilder<'a, S> {
     /// Set the `sortDirection` field (optional)
     pub fn sort_direction(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `sortDirection` field to an Option value (optional)
     pub fn maybe_sort_direction(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -208,11 +211,11 @@ where
     /// Build the final struct
     pub fn build(self) -> ListGames<'a> {
         ListGames {
-            cursor: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            sort: self.__unsafe_private_named.3,
-            sort_direction: self.__unsafe_private_named.4,
+            cursor: self._fields.0,
+            did: self._fields.1,
+            limit: self._fields.2,
+            sort: self._fields.3,
+            sort_direction: self._fields.4,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/list_org_games.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/list_org_games.rs
index 7ab207a3..122984ba 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/list_org_games.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/list_org_games.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -101,9 +104,9 @@ pub mod list_org_games_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListOrgGamesBuilder<'a, S: list_org_games_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListOrgGames<'a> {
@@ -117,9 +120,9 @@ impl<'a> ListOrgGamesBuilder<'a, list_org_games_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListOrgGamesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -127,12 +130,12 @@ impl<'a> ListOrgGamesBuilder<'a, list_org_games_state::Empty> {
 impl<'a, S: list_org_games_state::State> ListOrgGamesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -140,12 +143,12 @@ impl<'a, S: list_org_games_state::State> ListOrgGamesBuilder<'a, S> {
 impl<'a, S: list_org_games_state::State> ListOrgGamesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -160,11 +163,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListOrgGamesBuilder<'a, list_org_games_state::SetOrg<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ListOrgGamesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -177,9 +180,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ListOrgGames<'a> {
         ListOrgGames {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            org: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            org: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/migrate_claim.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/migrate_claim.rs
index 4beee9d7..a1dded24 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/migrate_claim.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/migrate_claim.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -242,9 +245,9 @@ pub mod migrate_claim_state {
 
 /// Builder for constructing an instance of this type
 pub struct MigrateClaimBuilder<'a, S: migrate_claim_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MigrateClaim<'a> {
@@ -258,9 +261,9 @@ impl<'a> MigrateClaimBuilder<'a, migrate_claim_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MigrateClaimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -275,11 +278,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> MigrateClaimBuilder<'a, migrate_claim_state::SetClaim<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MigrateClaimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -294,11 +297,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> MigrateClaimBuilder<'a, migrate_claim_state::SetClaimReview<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MigrateClaimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -312,8 +315,8 @@ where
     /// Build the final struct
     pub fn build(self) -> MigrateClaim<'a> {
         MigrateClaim {
-            claim: self.__unsafe_private_named.0.unwrap(),
-            claim_review: self.__unsafe_private_named.1.unwrap(),
+            claim: self._fields.0.unwrap(),
+            claim_review: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -326,8 +329,8 @@ where
         >,
     ) -> MigrateClaim<'a> {
         MigrateClaim {
-            claim: self.__unsafe_private_named.0.unwrap(),
-            claim_review: self.__unsafe_private_named.1.unwrap(),
+            claim: self._fields.0.unwrap(),
+            claim_review: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -379,14 +382,14 @@ pub mod migration_result_state {
 
 /// Builder for constructing an instance of this type
 pub struct MigrationResultBuilder<'a, S: migration_result_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
         Option<AtUri<'a>>,
         Option<MigrationResultStatus<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MigrationResult<'a> {
@@ -400,9 +403,9 @@ impl<'a> MigrationResultBuilder<'a, migration_result_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MigrationResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -410,12 +413,12 @@ impl<'a> MigrationResultBuilder<'a, migration_result_state::Empty> {
 impl<'a, S: migration_result_state::State> MigrationResultBuilder<'a, S> {
     /// Set the `error` field (optional)
     pub fn error(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `error` field to an Option value (optional)
     pub fn maybe_error(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -430,11 +433,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> MigrationResultBuilder<'a, migration_result_state::SetGameUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MigrationResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -442,12 +445,12 @@ where
 impl<'a, S: migration_result_state::State> MigrationResultBuilder<'a, S> {
     /// Set the `newUri` field (optional)
     pub fn new_uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `newUri` field to an Option value (optional)
     pub fn maybe_new_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -462,11 +465,11 @@ where
         mut self,
         value: impl Into<MigrationResultStatus<'a>>,
     ) -> MigrationResultBuilder<'a, migration_result_state::SetStatus<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         MigrationResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -480,10 +483,10 @@ where
     /// Build the final struct
     pub fn build(self) -> MigrationResult<'a> {
         MigrationResult {
-            error: self.__unsafe_private_named.0,
-            game_uri: self.__unsafe_private_named.1.unwrap(),
-            new_uri: self.__unsafe_private_named.2,
-            status: self.__unsafe_private_named.3.unwrap(),
+            error: self._fields.0,
+            game_uri: self._fields.1.unwrap(),
+            new_uri: self._fields.2,
+            status: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -496,10 +499,10 @@ where
         >,
     ) -> MigrationResult<'a> {
         MigrationResult {
-            error: self.__unsafe_private_named.0,
-            game_uri: self.__unsafe_private_named.1.unwrap(),
-            new_uri: self.__unsafe_private_named.2,
-            status: self.__unsafe_private_named.3.unwrap(),
+            error: self._fields.0,
+            game_uri: self._fields.1.unwrap(),
+            new_uri: self._fields.2,
+            status: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/org/create_profile.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/org/create_profile.rs
index f173751e..67eb7365 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/org/create_profile.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/org/create_profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::blob::BlobRef;
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/org/credit.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/org/credit.rs
index a7d3ee62..63a6eee7 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/org/credit.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/org/credit.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -180,15 +183,15 @@ pub mod credit_state {
 
 /// Builder for constructing an instance of this type
 pub struct CreditBuilder<'a, S: credit_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<StrongRef<'a>>,
         Option<StrongRef<'a>>,
         Option<Vec<CompanyRole<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Credit<'a> {
@@ -202,9 +205,9 @@ impl<'a> CreditBuilder<'a, credit_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreditBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,12 +215,12 @@ impl<'a> CreditBuilder<'a, credit_state::Empty> {
 impl<'a, S: credit_state::State> CreditBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -225,12 +228,12 @@ impl<'a, S: credit_state::State> CreditBuilder<'a, S> {
 impl<'a, S: credit_state::State> CreditBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -245,11 +248,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> CreditBuilder<'a, credit_state::SetGame<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CreditBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -264,11 +267,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> CreditBuilder<'a, credit_state::SetOrg<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CreditBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -283,11 +286,11 @@ where
         mut self,
         value: impl Into<Vec<CompanyRole<'a>>>,
     ) -> CreditBuilder<'a, credit_state::SetRoles<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         CreditBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -302,11 +305,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Credit<'a> {
         Credit {
-            created_at: self.__unsafe_private_named.0,
-            display_name: self.__unsafe_private_named.1,
-            game: self.__unsafe_private_named.2.unwrap(),
-            org: self.__unsafe_private_named.3.unwrap(),
-            roles: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0,
+            display_name: self._fields.1,
+            game: self._fields.2.unwrap(),
+            org: self._fields.3.unwrap(),
+            roles: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -319,11 +322,11 @@ where
         >,
     ) -> Credit<'a> {
         Credit {
-            created_at: self.__unsafe_private_named.0,
-            display_name: self.__unsafe_private_named.1,
-            game: self.__unsafe_private_named.2.unwrap(),
-            org: self.__unsafe_private_named.3.unwrap(),
-            roles: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0,
+            display_name: self._fields.1,
+            game: self._fields.2.unwrap(),
+            org: self._fields.3.unwrap(),
+            roles: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/org/get_profile.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/org/get_profile.rs
index c24f8993..c42beebc 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/org/get_profile.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/org/get_profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/org/profile.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/org/profile.rs
index e8b429e3..2d9959db 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/org/profile.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/org/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -306,44 +309,44 @@ pub mod profile_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type DisplayName;
         type CreatedAt;
+        type DisplayName;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type DisplayName = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `display_name` field to Set
-    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
-    impl<S: State> State for SetDisplayName<S> {
-        type DisplayName = Set<members::display_name>;
-        type CreatedAt = S::CreatedAt;
+        type DisplayName = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type DisplayName = S::DisplayName;
         type CreatedAt = Set<members::created_at>;
+        type DisplayName = S::DisplayName;
+    }
+    ///State transition - sets the `display_name` field to Set
+    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
+    impl<S: State> State for SetDisplayName<S> {
+        type CreatedAt = S::CreatedAt;
+        type DisplayName = Set<members::display_name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `display_name` field
-        pub struct display_name(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `display_name` field
+        pub struct display_name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -356,7 +359,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<ProfileStatus<'a>>,
         Option<Vec<Website<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -370,21 +373,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -392,12 +383,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -405,12 +396,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `country` field (optional)
     pub fn country(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `country` field to an Option value (optional)
     pub fn maybe_country(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -425,11 +416,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ProfileBuilder<'a, profile_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -437,12 +428,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -453,12 +444,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `descriptionFacets` field to an Option value (optional)
     pub fn maybe_description_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -473,11 +464,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProfileBuilder<'a, profile_state::SetDisplayName<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -485,12 +476,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `foundedAt` field (optional)
     pub fn founded_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `foundedAt` field to an Option value (optional)
     pub fn maybe_founded_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -498,12 +489,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `media` field (optional)
     pub fn media(mut self, value: impl Into<Option<Vec<MediaItem<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `media` field to an Option value (optional)
     pub fn maybe_media(mut self, value: Option<Vec<MediaItem<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -511,12 +502,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -524,12 +515,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<ProfileStatus<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<ProfileStatus<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -537,12 +528,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `websites` field (optional)
     pub fn websites(mut self, value: impl Into<Option<Vec<Website<'a>>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `websites` field to an Option value (optional)
     pub fn maybe_websites(mut self, value: Option<Vec<Website<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -550,23 +541,23 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S> ProfileBuilder<'a, S>
 where
     S: profile_state::State,
-    S::DisplayName: profile_state::IsSet,
     S::CreatedAt: profile_state::IsSet,
+    S::DisplayName: profile_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            country: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            description_facets: self.__unsafe_private_named.4,
-            display_name: self.__unsafe_private_named.5.unwrap(),
-            founded_at: self.__unsafe_private_named.6,
-            media: self.__unsafe_private_named.7,
-            parent: self.__unsafe_private_named.8,
-            status: self.__unsafe_private_named.9,
-            websites: self.__unsafe_private_named.10,
+            avatar: self._fields.0,
+            country: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            description_facets: self._fields.4,
+            display_name: self._fields.5.unwrap(),
+            founded_at: self._fields.6,
+            media: self._fields.7,
+            parent: self._fields.8,
+            status: self._fields.9,
+            websites: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -579,17 +570,17 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            country: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            description_facets: self.__unsafe_private_named.4,
-            display_name: self.__unsafe_private_named.5.unwrap(),
-            founded_at: self.__unsafe_private_named.6,
-            media: self.__unsafe_private_named.7,
-            parent: self.__unsafe_private_named.8,
-            status: self.__unsafe_private_named.9,
-            websites: self.__unsafe_private_named.10,
+            avatar: self._fields.0,
+            country: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            description_facets: self._fields.4,
+            display_name: self._fields.5.unwrap(),
+            founded_at: self._fields.6,
+            media: self._fields.7,
+            parent: self._fields.8,
+            status: self._fields.9,
+            websites: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/org/put_profile.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/org/put_profile.rs
index 75cfa1ba..f07f5900 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/org/put_profile.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/org/put_profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::blob::BlobRef;
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/platform.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/platform.rs
index 60aafd00..9d4cc291 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/platform.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/platform.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -138,44 +141,44 @@ pub mod platform_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type CreatedAt;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type CreatedAt = S::CreatedAt;
+        type Name = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Name = S::Name;
         type CreatedAt = Set<members::created_at>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type CreatedAt = S::CreatedAt;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PlatformBuilder<'a, S: platform_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<PlatformCategory<'a>>,
@@ -188,7 +191,7 @@ pub struct PlatformBuilder<'a, S: platform_state::State> {
         Option<Vec<PlatformVersion<'a>>>,
         Option<Vec<Website<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Platform<'a> {
@@ -202,21 +205,9 @@ impl<'a> PlatformBuilder<'a, platform_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PlatformBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -224,12 +215,12 @@ impl<'a> PlatformBuilder<'a, platform_state::Empty> {
 impl<'a, S: platform_state::State> PlatformBuilder<'a, S> {
     /// Set the `abbreviation` field (optional)
     pub fn abbreviation(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `abbreviation` field to an Option value (optional)
     pub fn maybe_abbreviation(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -237,12 +228,12 @@ impl<'a, S: platform_state::State> PlatformBuilder<'a, S> {
 impl<'a, S: platform_state::State> PlatformBuilder<'a, S> {
     /// Set the `alternativeName` field (optional)
     pub fn alternative_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `alternativeName` field to an Option value (optional)
     pub fn maybe_alternative_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -250,12 +241,12 @@ impl<'a, S: platform_state::State> PlatformBuilder<'a, S> {
 impl<'a, S: platform_state::State> PlatformBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<PlatformCategory<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<PlatformCategory<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -270,11 +261,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PlatformBuilder<'a, platform_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PlatformBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -282,12 +273,12 @@ where
 impl<'a, S: platform_state::State> PlatformBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -295,12 +286,12 @@ impl<'a, S: platform_state::State> PlatformBuilder<'a, S> {
 impl<'a, S: platform_state::State> PlatformBuilder<'a, S> {
     /// Set the `family` field (optional)
     pub fn family(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `family` field to an Option value (optional)
     pub fn maybe_family(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -308,12 +299,12 @@ impl<'a, S: platform_state::State> PlatformBuilder<'a, S> {
 impl<'a, S: platform_state::State> PlatformBuilder<'a, S> {
     /// Set the `generation` field (optional)
     pub fn generation(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `generation` field to an Option value (optional)
     pub fn maybe_generation(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -321,12 +312,12 @@ impl<'a, S: platform_state::State> PlatformBuilder<'a, S> {
 impl<'a, S: platform_state::State> PlatformBuilder<'a, S> {
     /// Set the `media` field (optional)
     pub fn media(mut self, value: impl Into<Option<Vec<MediaItem<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `media` field to an Option value (optional)
     pub fn maybe_media(mut self, value: Option<Vec<MediaItem<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -341,11 +332,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PlatformBuilder<'a, platform_state::SetName<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         PlatformBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -356,12 +347,12 @@ impl<'a, S: platform_state::State> PlatformBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<PlatformVersion<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `versions` field to an Option value (optional)
     pub fn maybe_versions(mut self, value: Option<Vec<PlatformVersion<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -369,12 +360,12 @@ impl<'a, S: platform_state::State> PlatformBuilder<'a, S> {
 impl<'a, S: platform_state::State> PlatformBuilder<'a, S> {
     /// Set the `websites` field (optional)
     pub fn websites(mut self, value: impl Into<Option<Vec<Website<'a>>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `websites` field to an Option value (optional)
     pub fn maybe_websites(mut self, value: Option<Vec<Website<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -382,23 +373,23 @@ impl<'a, S: platform_state::State> PlatformBuilder<'a, S> {
 impl<'a, S> PlatformBuilder<'a, S>
 where
     S: platform_state::State,
-    S::Name: platform_state::IsSet,
     S::CreatedAt: platform_state::IsSet,
+    S::Name: platform_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Platform<'a> {
         Platform {
-            abbreviation: self.__unsafe_private_named.0,
-            alternative_name: self.__unsafe_private_named.1,
-            category: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            description: self.__unsafe_private_named.4,
-            family: self.__unsafe_private_named.5,
-            generation: self.__unsafe_private_named.6,
-            media: self.__unsafe_private_named.7,
-            name: self.__unsafe_private_named.8.unwrap(),
-            versions: self.__unsafe_private_named.9,
-            websites: self.__unsafe_private_named.10,
+            abbreviation: self._fields.0,
+            alternative_name: self._fields.1,
+            category: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            description: self._fields.4,
+            family: self._fields.5,
+            generation: self._fields.6,
+            media: self._fields.7,
+            name: self._fields.8.unwrap(),
+            versions: self._fields.9,
+            websites: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -411,17 +402,17 @@ where
         >,
     ) -> Platform<'a> {
         Platform {
-            abbreviation: self.__unsafe_private_named.0,
-            alternative_name: self.__unsafe_private_named.1,
-            category: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            description: self.__unsafe_private_named.4,
-            family: self.__unsafe_private_named.5,
-            generation: self.__unsafe_private_named.6,
-            media: self.__unsafe_private_named.7,
-            name: self.__unsafe_private_named.8.unwrap(),
-            versions: self.__unsafe_private_named.9,
-            websites: self.__unsafe_private_named.10,
+            abbreviation: self._fields.0,
+            alternative_name: self._fields.1,
+            category: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            description: self._fields.4,
+            family: self._fields.5,
+            generation: self._fields.6,
+            media: self._fields.7,
+            name: self._fields.8.unwrap(),
+            versions: self._fields.9,
+            websites: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/platform_family.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/platform_family.rs
index ed2472e2..f3b2881f 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/platform_family.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/platform_family.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -111,45 +114,45 @@ pub mod platform_family_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Name;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Name = S::Name;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type CreatedAt = S::CreatedAt;
         type Name = Set<members::name>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Name = S::Name;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PlatformFamilyBuilder<'a, S: platform_family_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PlatformFamily<'a> {
@@ -163,9 +166,9 @@ impl<'a> PlatformFamilyBuilder<'a, platform_family_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PlatformFamilyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,11 +183,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PlatformFamilyBuilder<'a, platform_family_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PlatformFamilyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -192,12 +195,12 @@ where
 impl<'a, S: platform_family_state::State> PlatformFamilyBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -212,11 +215,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PlatformFamilyBuilder<'a, platform_family_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PlatformFamilyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -224,15 +227,15 @@ where
 impl<'a, S> PlatformFamilyBuilder<'a, S>
 where
     S: platform_family_state::State,
-    S::CreatedAt: platform_family_state::IsSet,
     S::Name: platform_family_state::IsSet,
+    S::CreatedAt: platform_family_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PlatformFamily<'a> {
         PlatformFamily {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            name: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -245,9 +248,9 @@ where
         >,
     ) -> PlatformFamily<'a> {
         PlatformFamily {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            name: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/put_game.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/put_game.rs
index ee765954..d732f275 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/put_game.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/put_game.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{AtUri, Datetime};
@@ -146,44 +149,44 @@ pub mod put_game_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type Uri;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type Uri = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Uri = S::Uri;
+        type Name = Unset;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Name = S::Name;
         type Uri = Set<members::uri>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Uri = S::Uri;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PutGameBuilder<'a, S: put_game_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<AgeRating<'a>>>,
         Option<Vec<AlternativeName<'a>>>,
         Option<ApplicationType<'a>>,
@@ -208,7 +211,7 @@ pub struct PutGameBuilder<'a, S: put_game_state::State> {
         Option<Vec<ExternalVideo<'a>>>,
         Option<Vec<Website<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PutGame<'a> {
@@ -222,8 +225,8 @@ impl<'a> PutGameBuilder<'a, put_game_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PutGameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -248,7 +251,7 @@ impl<'a> PutGameBuilder<'a, put_game_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -256,12 +259,12 @@ impl<'a> PutGameBuilder<'a, put_game_state::Empty> {
 impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
     /// Set the `ageRatings` field (optional)
     pub fn age_ratings(mut self, value: impl Into<Option<Vec<AgeRating<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `ageRatings` field to an Option value (optional)
     pub fn maybe_age_ratings(mut self, value: Option<Vec<AgeRating<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -272,7 +275,7 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<AlternativeName<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `alternativeNames` field to an Option value (optional)
@@ -280,7 +283,7 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
         mut self,
         value: Option<Vec<AlternativeName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -291,12 +294,12 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApplicationType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `applicationType` field to an Option value (optional)
     pub fn maybe_application_type(mut self, value: Option<ApplicationType<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -304,12 +307,12 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
 impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -317,12 +320,12 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
 impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
     /// Set the `engines` field (optional)
     pub fn engines(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `engines` field to an Option value (optional)
     pub fn maybe_engines(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -330,12 +333,12 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
 impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
     /// Set the `genres` field (optional)
     pub fn genres(mut self, value: impl Into<Option<Vec<Genre<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `genres` field to an Option value (optional)
     pub fn maybe_genres(mut self, value: Option<Vec<Genre<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -343,12 +346,12 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
 impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -359,7 +362,7 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<LanguageSupport<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `languageSupports` field to an Option value (optional)
@@ -367,7 +370,7 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
         mut self,
         value: Option<Vec<LanguageSupport<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -375,12 +378,12 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
 impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
     /// Set the `media` field (optional)
     pub fn media(mut self, value: impl Into<Option<Vec<MediaItem<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `media` field to an Option value (optional)
     pub fn maybe_media(mut self, value: Option<Vec<MediaItem<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -388,12 +391,12 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
 impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
     /// Set the `modes` field (optional)
     pub fn modes(mut self, value: impl Into<Option<Vec<Mode<'a>>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `modes` field to an Option value (optional)
     pub fn maybe_modes(mut self, value: Option<Vec<Mode<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -404,7 +407,7 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<MultiplayerMode<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `multiplayerModes` field to an Option value (optional)
@@ -412,7 +415,7 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
         mut self,
         value: Option<Vec<MultiplayerMode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -427,11 +430,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PutGameBuilder<'a, put_game_state::SetName<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         PutGameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -439,12 +442,12 @@ where
 impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -455,7 +458,7 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<PlayerPerspective<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `playerPerspectives` field to an Option value (optional)
@@ -463,7 +466,7 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
         mut self,
         value: Option<Vec<PlayerPerspective<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -471,12 +474,12 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
 impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
     /// Set the `releases` field (optional)
     pub fn releases(mut self, value: impl Into<Option<Vec<Release<'a>>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `releases` field to an Option value (optional)
     pub fn maybe_releases(mut self, value: Option<Vec<Release<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -484,12 +487,12 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
 impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
     /// Set the `shouldPublish` field (optional)
     pub fn should_publish(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `shouldPublish` field to an Option value (optional)
     pub fn maybe_should_publish(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -497,12 +500,12 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
 impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
     /// Set the `storyline` field (optional)
     pub fn storyline(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `storyline` field to an Option value (optional)
     pub fn maybe_storyline(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -510,12 +513,12 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
 impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
     /// Set the `summary` field (optional)
     pub fn summary(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `summary` field to an Option value (optional)
     pub fn maybe_summary(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -523,12 +526,12 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
 impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
     /// Set the `themes` field (optional)
     pub fn themes(mut self, value: impl Into<Option<Vec<Theme<'a>>>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `themes` field to an Option value (optional)
     pub fn maybe_themes(mut self, value: Option<Vec<Theme<'a>>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -536,12 +539,12 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
 impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
     /// Set the `timeToBeat` field (optional)
     pub fn time_to_beat(mut self, value: impl Into<Option<TimeToBeat<'a>>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `timeToBeat` field to an Option value (optional)
     pub fn maybe_time_to_beat(mut self, value: Option<TimeToBeat<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -556,11 +559,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PutGameBuilder<'a, put_game_state::SetUri<S>> {
-        self.__unsafe_private_named.20 = Option::Some(value.into());
+        self._fields.20 = Option::Some(value.into());
         PutGameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -568,12 +571,12 @@ where
 impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
     /// Set the `videos` field (optional)
     pub fn videos(mut self, value: impl Into<Option<Vec<ExternalVideo<'a>>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `videos` field to an Option value (optional)
     pub fn maybe_videos(mut self, value: Option<Vec<ExternalVideo<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -581,12 +584,12 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
 impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
     /// Set the `websites` field (optional)
     pub fn websites(mut self, value: impl Into<Option<Vec<Website<'a>>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `websites` field to an Option value (optional)
     pub fn maybe_websites(mut self, value: Option<Vec<Website<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -594,35 +597,35 @@ impl<'a, S: put_game_state::State> PutGameBuilder<'a, S> {
 impl<'a, S> PutGameBuilder<'a, S>
 where
     S: put_game_state::State,
-    S::Name: put_game_state::IsSet,
     S::Uri: put_game_state::IsSet,
+    S::Name: put_game_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PutGame<'a> {
         PutGame {
-            age_ratings: self.__unsafe_private_named.0,
-            alternative_names: self.__unsafe_private_named.1,
-            application_type: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3,
-            engines: self.__unsafe_private_named.4,
-            genres: self.__unsafe_private_named.5,
-            keywords: self.__unsafe_private_named.6,
-            language_supports: self.__unsafe_private_named.7,
-            media: self.__unsafe_private_named.8,
-            modes: self.__unsafe_private_named.9,
-            multiplayer_modes: self.__unsafe_private_named.10,
-            name: self.__unsafe_private_named.11.unwrap(),
-            parent: self.__unsafe_private_named.12,
-            player_perspectives: self.__unsafe_private_named.13,
-            releases: self.__unsafe_private_named.14,
-            should_publish: self.__unsafe_private_named.15,
-            storyline: self.__unsafe_private_named.16,
-            summary: self.__unsafe_private_named.17,
-            themes: self.__unsafe_private_named.18,
-            time_to_beat: self.__unsafe_private_named.19,
-            uri: self.__unsafe_private_named.20.unwrap(),
-            videos: self.__unsafe_private_named.21,
-            websites: self.__unsafe_private_named.22,
+            age_ratings: self._fields.0,
+            alternative_names: self._fields.1,
+            application_type: self._fields.2,
+            created_at: self._fields.3,
+            engines: self._fields.4,
+            genres: self._fields.5,
+            keywords: self._fields.6,
+            language_supports: self._fields.7,
+            media: self._fields.8,
+            modes: self._fields.9,
+            multiplayer_modes: self._fields.10,
+            name: self._fields.11.unwrap(),
+            parent: self._fields.12,
+            player_perspectives: self._fields.13,
+            releases: self._fields.14,
+            should_publish: self._fields.15,
+            storyline: self._fields.16,
+            summary: self._fields.17,
+            themes: self._fields.18,
+            time_to_beat: self._fields.19,
+            uri: self._fields.20.unwrap(),
+            videos: self._fields.21,
+            websites: self._fields.22,
             extra_data: Default::default(),
         }
     }
@@ -635,29 +638,29 @@ where
         >,
     ) -> PutGame<'a> {
         PutGame {
-            age_ratings: self.__unsafe_private_named.0,
-            alternative_names: self.__unsafe_private_named.1,
-            application_type: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3,
-            engines: self.__unsafe_private_named.4,
-            genres: self.__unsafe_private_named.5,
-            keywords: self.__unsafe_private_named.6,
-            language_supports: self.__unsafe_private_named.7,
-            media: self.__unsafe_private_named.8,
-            modes: self.__unsafe_private_named.9,
-            multiplayer_modes: self.__unsafe_private_named.10,
-            name: self.__unsafe_private_named.11.unwrap(),
-            parent: self.__unsafe_private_named.12,
-            player_perspectives: self.__unsafe_private_named.13,
-            releases: self.__unsafe_private_named.14,
-            should_publish: self.__unsafe_private_named.15,
-            storyline: self.__unsafe_private_named.16,
-            summary: self.__unsafe_private_named.17,
-            themes: self.__unsafe_private_named.18,
-            time_to_beat: self.__unsafe_private_named.19,
-            uri: self.__unsafe_private_named.20.unwrap(),
-            videos: self.__unsafe_private_named.21,
-            websites: self.__unsafe_private_named.22,
+            age_ratings: self._fields.0,
+            alternative_names: self._fields.1,
+            application_type: self._fields.2,
+            created_at: self._fields.3,
+            engines: self._fields.4,
+            genres: self._fields.5,
+            keywords: self._fields.6,
+            language_supports: self._fields.7,
+            media: self._fields.8,
+            modes: self._fields.9,
+            multiplayer_modes: self._fields.10,
+            name: self._fields.11.unwrap(),
+            parent: self._fields.12,
+            player_perspectives: self._fields.13,
+            releases: self._fields.14,
+            should_publish: self._fields.15,
+            storyline: self._fields.16,
+            summary: self._fields.17,
+            themes: self._fields.18,
+            time_to_beat: self._fields.19,
+            uri: self._fields.20.unwrap(),
+            videos: self._fields.21,
+            websites: self._fields.22,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/redirect.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/redirect.rs
index b54c235c..682cdd42 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/redirect.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/redirect.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -112,80 +115,75 @@ pub mod redirect_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Collection;
         type SourceUri;
-        type TargetUri;
         type CreatedAt;
+        type TargetUri;
+        type Collection;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Collection = Unset;
         type SourceUri = Unset;
-        type TargetUri = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `collection` field to Set
-    pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCollection<S> {}
-    impl<S: State> State for SetCollection<S> {
-        type Collection = Set<members::collection>;
-        type SourceUri = S::SourceUri;
-        type TargetUri = S::TargetUri;
-        type CreatedAt = S::CreatedAt;
+        type TargetUri = Unset;
+        type Collection = Unset;
     }
     ///State transition - sets the `source_uri` field to Set
     pub struct SetSourceUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSourceUri<S> {}
     impl<S: State> State for SetSourceUri<S> {
-        type Collection = S::Collection;
         type SourceUri = Set<members::source_uri>;
-        type TargetUri = S::TargetUri;
         type CreatedAt = S::CreatedAt;
+        type TargetUri = S::TargetUri;
+        type Collection = S::Collection;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type SourceUri = S::SourceUri;
+        type CreatedAt = Set<members::created_at>;
+        type TargetUri = S::TargetUri;
+        type Collection = S::Collection;
     }
     ///State transition - sets the `target_uri` field to Set
     pub struct SetTargetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTargetUri<S> {}
     impl<S: State> State for SetTargetUri<S> {
-        type Collection = S::Collection;
         type SourceUri = S::SourceUri;
-        type TargetUri = Set<members::target_uri>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+        type TargetUri = Set<members::target_uri>;
         type Collection = S::Collection;
+    }
+    ///State transition - sets the `collection` field to Set
+    pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCollection<S> {}
+    impl<S: State> State for SetCollection<S> {
         type SourceUri = S::SourceUri;
+        type CreatedAt = S::CreatedAt;
         type TargetUri = S::TargetUri;
-        type CreatedAt = Set<members::created_at>;
+        type Collection = Set<members::collection>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `collection` field
-        pub struct collection(());
         ///Marker type for the `source_uri` field
         pub struct source_uri(());
-        ///Marker type for the `target_uri` field
-        pub struct target_uri(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `target_uri` field
+        pub struct target_uri(());
+        ///Marker type for the `collection` field
+        pub struct collection(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RedirectBuilder<'a, S: redirect_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Nsid<'a>>,
-        Option<Datetime>,
-        Option<AtUri<'a>>,
-        Option<AtUri<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Nsid<'a>>, Option<Datetime>, Option<AtUri<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Redirect<'a> {
@@ -199,9 +197,9 @@ impl<'a> RedirectBuilder<'a, redirect_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RedirectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,11 +214,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> RedirectBuilder<'a, redirect_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RedirectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -235,11 +233,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RedirectBuilder<'a, redirect_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RedirectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -254,11 +252,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RedirectBuilder<'a, redirect_state::SetSourceUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RedirectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -273,11 +271,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RedirectBuilder<'a, redirect_state::SetTargetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RedirectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -285,18 +283,18 @@ where
 impl<'a, S> RedirectBuilder<'a, S>
 where
     S: redirect_state::State,
-    S::Collection: redirect_state::IsSet,
     S::SourceUri: redirect_state::IsSet,
-    S::TargetUri: redirect_state::IsSet,
     S::CreatedAt: redirect_state::IsSet,
+    S::TargetUri: redirect_state::IsSet,
+    S::Collection: redirect_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Redirect<'a> {
         Redirect {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            source_uri: self.__unsafe_private_named.2.unwrap(),
-            target_uri: self.__unsafe_private_named.3.unwrap(),
+            collection: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            source_uri: self._fields.2.unwrap(),
+            target_uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -309,10 +307,10 @@ where
         >,
     ) -> Redirect<'a> {
         Redirect {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            source_uri: self.__unsafe_private_named.2.unwrap(),
-            target_uri: self.__unsafe_private_named.3.unwrap(),
+            collection: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            source_uri: self._fields.2.unwrap(),
+            target_uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/review_claim.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/review_claim.rs
index 75b525e4..5f6e71e0 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/review_claim.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/review_claim.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -165,50 +168,50 @@ pub mod review_claim_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Claim;
         type Status;
+        type Claim;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Claim = Unset;
         type Status = Unset;
-    }
-    ///State transition - sets the `claim` field to Set
-    pub struct SetClaim<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetClaim<S> {}
-    impl<S: State> State for SetClaim<S> {
-        type Claim = Set<members::claim>;
-        type Status = S::Status;
+        type Claim = Unset;
     }
     ///State transition - sets the `status` field to Set
     pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStatus<S> {}
     impl<S: State> State for SetStatus<S> {
-        type Claim = S::Claim;
         type Status = Set<members::status>;
+        type Claim = S::Claim;
+    }
+    ///State transition - sets the `claim` field to Set
+    pub struct SetClaim<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetClaim<S> {}
+    impl<S: State> State for SetClaim<S> {
+        type Status = S::Status;
+        type Claim = Set<members::claim>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `claim` field
-        pub struct claim(());
         ///Marker type for the `status` field
         pub struct status(());
+        ///Marker type for the `claim` field
+        pub struct claim(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReviewClaimBuilder<'a, S: review_claim_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<AtUri<'a>>>,
         Option<StrongRef<'a>>,
         Option<CowStr<'a>>,
         Option<ReviewClaimStatus<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReviewClaim<'a> {
@@ -222,9 +225,9 @@ impl<'a> ReviewClaimBuilder<'a, review_claim_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReviewClaimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,12 +235,12 @@ impl<'a> ReviewClaimBuilder<'a, review_claim_state::Empty> {
 impl<'a, S: review_claim_state::State> ReviewClaimBuilder<'a, S> {
     /// Set the `approvedGames` field (optional)
     pub fn approved_games(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `approvedGames` field to an Option value (optional)
     pub fn maybe_approved_games(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -252,11 +255,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ReviewClaimBuilder<'a, review_claim_state::SetClaim<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReviewClaimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -264,12 +267,12 @@ where
 impl<'a, S: review_claim_state::State> ReviewClaimBuilder<'a, S> {
     /// Set the `reason` field (optional)
     pub fn reason(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `reason` field to an Option value (optional)
     pub fn maybe_reason(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -284,11 +287,11 @@ where
         mut self,
         value: impl Into<ReviewClaimStatus<'a>>,
     ) -> ReviewClaimBuilder<'a, review_claim_state::SetStatus<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ReviewClaimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -296,16 +299,16 @@ where
 impl<'a, S> ReviewClaimBuilder<'a, S>
 where
     S: review_claim_state::State,
-    S::Claim: review_claim_state::IsSet,
     S::Status: review_claim_state::IsSet,
+    S::Claim: review_claim_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ReviewClaim<'a> {
         ReviewClaim {
-            approved_games: self.__unsafe_private_named.0,
-            claim: self.__unsafe_private_named.1.unwrap(),
-            reason: self.__unsafe_private_named.2,
-            status: self.__unsafe_private_named.3.unwrap(),
+            approved_games: self._fields.0,
+            claim: self._fields.1.unwrap(),
+            reason: self._fields.2,
+            status: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -318,10 +321,10 @@ where
         >,
     ) -> ReviewClaim<'a> {
         ReviewClaim {
-            approved_games: self.__unsafe_private_named.0,
-            claim: self.__unsafe_private_named.1.unwrap(),
-            reason: self.__unsafe_private_named.2,
-            status: self.__unsafe_private_named.3.unwrap(),
+            approved_games: self._fields.0,
+            claim: self._fields.1.unwrap(),
+            reason: self._fields.2,
+            status: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/richtext/facet.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/richtext/facet.rs
index 1e4fd745..0f13c0aa 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/richtext/facet.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/richtext/facet.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -836,9 +839,9 @@ pub mod byte_slice_state {
 
 /// Builder for constructing an instance of this type
 pub struct ByteSliceBuilder<'a, S: byte_slice_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ByteSlice<'a> {
@@ -852,9 +855,9 @@ impl<'a> ByteSliceBuilder<'a, byte_slice_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -869,11 +872,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteEnd<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -888,11 +891,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteStart<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -906,8 +909,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -920,8 +923,8 @@ where
         >,
     ) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -961,9 +964,9 @@ pub mod heading_state {
 
 /// Builder for constructing an instance of this type
 pub struct HeadingBuilder<'a, S: heading_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Heading<'a> {
@@ -977,9 +980,9 @@ impl<'a> HeadingBuilder<'a, heading_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HeadingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -994,11 +997,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> HeadingBuilder<'a, heading_state::SetLevel<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         HeadingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1011,7 +1014,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Heading<'a> {
         Heading {
-            level: self.__unsafe_private_named.0.unwrap(),
+            level: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1024,7 +1027,7 @@ where
         >,
     ) -> Heading<'a> {
         Heading {
-            level: self.__unsafe_private_named.0.unwrap(),
+            level: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1064,14 +1067,9 @@ pub mod image_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImageBuilder<'a, S: image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<BlobRef<'a>>,
-        Option<i64>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<BlobRef<'a>>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Image<'a> {
@@ -1085,9 +1083,9 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1095,12 +1093,12 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1115,11 +1113,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ImageBuilder<'a, image_state::SetBlob<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1127,12 +1125,12 @@ where
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `height` field (optional)
     pub fn height(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `height` field to an Option value (optional)
     pub fn maybe_height(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1140,12 +1138,12 @@ impl<'a, S: image_state::State> ImageBuilder<'a, S> {
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `width` field (optional)
     pub fn width(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `width` field to an Option value (optional)
     pub fn maybe_width(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1158,10 +1156,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0,
-            blob: self.__unsafe_private_named.1.unwrap(),
-            height: self.__unsafe_private_named.2,
-            width: self.__unsafe_private_named.3,
+            alt: self._fields.0,
+            blob: self._fields.1.unwrap(),
+            height: self._fields.2,
+            width: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -1174,10 +1172,10 @@ where
         >,
     ) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0,
-            blob: self.__unsafe_private_named.1.unwrap(),
-            height: self.__unsafe_private_named.2,
-            width: self.__unsafe_private_named.3,
+            alt: self._fields.0,
+            blob: self._fields.1.unwrap(),
+            height: self._fields.2,
+            width: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -1217,9 +1215,9 @@ pub mod link_state {
 
 /// Builder for constructing an instance of this type
 pub struct LinkBuilder<'a, S: link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Link<'a> {
@@ -1233,9 +1231,9 @@ impl<'a> LinkBuilder<'a, link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1250,11 +1248,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LinkBuilder<'a, link_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1267,7 +1265,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Link<'a> {
         Link {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1280,7 +1278,7 @@ where
         >,
     ) -> Link<'a> {
         Link {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1346,12 +1344,9 @@ pub mod facet_state {
 
 /// Builder for constructing an instance of this type
 pub struct FacetBuilder<'a, S: facet_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<FacetFeaturesItem<'a>>>,
-        Option<facet::ByteSlice<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<FacetFeaturesItem<'a>>>, Option<facet::ByteSlice<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Facet<'a> {
@@ -1365,9 +1360,9 @@ impl<'a> FacetBuilder<'a, facet_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1382,11 +1377,11 @@ where
         mut self,
         value: impl Into<Vec<FacetFeaturesItem<'a>>>,
     ) -> FacetBuilder<'a, facet_state::SetFeatures<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1401,11 +1396,11 @@ where
         mut self,
         value: impl Into<facet::ByteSlice<'a>>,
     ) -> FacetBuilder<'a, facet_state::SetIndex<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1419,8 +1414,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1433,8 +1428,8 @@ where
         >,
     ) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1474,9 +1469,9 @@ pub mod mention_state {
 
 /// Builder for constructing an instance of this type
 pub struct MentionBuilder<'a, S: mention_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Mention<'a> {
@@ -1490,9 +1485,9 @@ impl<'a> MentionBuilder<'a, mention_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1507,11 +1502,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MentionBuilder<'a, mention_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1524,7 +1519,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Mention<'a> {
         Mention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1537,7 +1532,7 @@ where
         >,
     ) -> Mention<'a> {
         Mention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/search.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/search.rs
index 6670b4cd..f8a82829 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/search.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/search.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -165,8 +168,8 @@ pub mod search_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchBuilder<'a, S: search_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<CowStr<'a>>>,
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
@@ -181,7 +184,7 @@ pub struct SearchBuilder<'a, S: search_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Search<'a> {
@@ -195,8 +198,8 @@ impl<'a> SearchBuilder<'a, search_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -211,7 +214,7 @@ impl<'a> SearchBuilder<'a, search_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -219,12 +222,12 @@ impl<'a> SearchBuilder<'a, search_state::Empty> {
 impl<'a, S: search_state::State> SearchBuilder<'a, S> {
     /// Set the `ageRatings` field (optional)
     pub fn age_ratings(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `ageRatings` field to an Option value (optional)
     pub fn maybe_age_ratings(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -235,12 +238,12 @@ impl<'a, S: search_state::State> SearchBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<CowStr<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `applicationTypes` field to an Option value (optional)
     pub fn maybe_application_types(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -248,12 +251,12 @@ impl<'a, S: search_state::State> SearchBuilder<'a, S> {
 impl<'a, S: search_state::State> SearchBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -261,12 +264,12 @@ impl<'a, S: search_state::State> SearchBuilder<'a, S> {
 impl<'a, S: search_state::State> SearchBuilder<'a, S> {
     /// Set the `genres` field (optional)
     pub fn genres(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `genres` field to an Option value (optional)
     pub fn maybe_genres(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -274,12 +277,12 @@ impl<'a, S: search_state::State> SearchBuilder<'a, S> {
 impl<'a, S: search_state::State> SearchBuilder<'a, S> {
     /// Set the `includeCancelled` field (optional)
     pub fn include_cancelled(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `includeCancelled` field to an Option value (optional)
     pub fn maybe_include_cancelled(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -287,12 +290,12 @@ impl<'a, S: search_state::State> SearchBuilder<'a, S> {
 impl<'a, S: search_state::State> SearchBuilder<'a, S> {
     /// Set the `includeUnrated` field (optional)
     pub fn include_unrated(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `includeUnrated` field to an Option value (optional)
     pub fn maybe_include_unrated(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -300,12 +303,12 @@ impl<'a, S: search_state::State> SearchBuilder<'a, S> {
 impl<'a, S: search_state::State> SearchBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -313,12 +316,12 @@ impl<'a, S: search_state::State> SearchBuilder<'a, S> {
 impl<'a, S: search_state::State> SearchBuilder<'a, S> {
     /// Set the `modes` field (optional)
     pub fn modes(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `modes` field to an Option value (optional)
     pub fn maybe_modes(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -329,12 +332,12 @@ impl<'a, S: search_state::State> SearchBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<CowStr<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `playerPerspectives` field to an Option value (optional)
     pub fn maybe_player_perspectives(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -349,11 +352,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SearchBuilder<'a, search_state::SetQ<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         SearchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -361,12 +364,12 @@ where
 impl<'a, S: search_state::State> SearchBuilder<'a, S> {
     /// Set the `sort` field (optional)
     pub fn sort(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `sort` field to an Option value (optional)
     pub fn maybe_sort(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -374,12 +377,12 @@ impl<'a, S: search_state::State> SearchBuilder<'a, S> {
 impl<'a, S: search_state::State> SearchBuilder<'a, S> {
     /// Set the `themes` field (optional)
     pub fn themes(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `themes` field to an Option value (optional)
     pub fn maybe_themes(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -387,12 +390,12 @@ impl<'a, S: search_state::State> SearchBuilder<'a, S> {
 impl<'a, S: search_state::State> SearchBuilder<'a, S> {
     /// Set the `types` field (optional)
     pub fn types(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `types` field to an Option value (optional)
     pub fn maybe_types(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -405,19 +408,19 @@ where
     /// Build the final struct
     pub fn build(self) -> Search<'a> {
         Search {
-            age_ratings: self.__unsafe_private_named.0,
-            application_types: self.__unsafe_private_named.1,
-            cursor: self.__unsafe_private_named.2,
-            genres: self.__unsafe_private_named.3,
-            include_cancelled: self.__unsafe_private_named.4,
-            include_unrated: self.__unsafe_private_named.5,
-            limit: self.__unsafe_private_named.6,
-            modes: self.__unsafe_private_named.7,
-            player_perspectives: self.__unsafe_private_named.8,
-            q: self.__unsafe_private_named.9.unwrap(),
-            sort: self.__unsafe_private_named.10,
-            themes: self.__unsafe_private_named.11,
-            types: self.__unsafe_private_named.12,
+            age_ratings: self._fields.0,
+            application_types: self._fields.1,
+            cursor: self._fields.2,
+            genres: self._fields.3,
+            include_cancelled: self._fields.4,
+            include_unrated: self._fields.5,
+            limit: self._fields.6,
+            modes: self._fields.7,
+            player_perspectives: self._fields.8,
+            q: self._fields.9.unwrap(),
+            sort: self._fields.10,
+            themes: self._fields.11,
+            types: self._fields.12,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/search_profiles_typeahead.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/search_profiles_typeahead.rs
index 93ca55b1..b8064cbf 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/search_profiles_typeahead.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/search_profiles_typeahead.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -97,9 +100,9 @@ pub struct SearchProfilesTypeaheadBuilder<
     'a,
     S: search_profiles_typeahead_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchProfilesTypeahead<'a> {
@@ -116,9 +119,9 @@ impl<'a> SearchProfilesTypeaheadBuilder<'a, search_profiles_typeahead_state::Emp
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchProfilesTypeaheadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -129,12 +132,12 @@ impl<
 > SearchProfilesTypeaheadBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -149,11 +152,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SearchProfilesTypeaheadBuilder<'a, search_profiles_typeahead_state::SetQ<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SearchProfilesTypeaheadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -166,8 +169,8 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchProfilesTypeahead<'a> {
         SearchProfilesTypeahead {
-            limit: self.__unsafe_private_named.0,
-            q: self.__unsafe_private_named.1.unwrap(),
+            limit: self._fields.0,
+            q: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/search_slugs.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/search_slugs.rs
index e0467972..42ffb453 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/search_slugs.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/search_slugs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -129,9 +132,9 @@ pub mod search_slugs_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchSlugsBuilder<'a, S: search_slugs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchSlugs<'a> {
@@ -145,9 +148,9 @@ impl<'a> SearchSlugsBuilder<'a, search_slugs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchSlugsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -155,12 +158,12 @@ impl<'a> SearchSlugsBuilder<'a, search_slugs_state::Empty> {
 impl<'a, S: search_slugs_state::State> SearchSlugsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -175,11 +178,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SearchSlugsBuilder<'a, search_slugs_state::SetSlug<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SearchSlugsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -192,8 +195,8 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchSlugs<'a> {
         SearchSlugs {
-            limit: self.__unsafe_private_named.0,
-            slug: self.__unsafe_private_named.1.unwrap(),
+            limit: self._fields.0,
+            slug: self._fields.1.unwrap(),
         }
     }
 }
@@ -244,9 +247,9 @@ pub mod slug_result_state {
 
 /// Builder for constructing an instance of this type
 pub struct SlugResultBuilder<'a, S: slug_result_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SlugResult<'a> {
@@ -260,9 +263,9 @@ impl<'a> SlugResultBuilder<'a, slug_result_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SlugResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -277,11 +280,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SlugResultBuilder<'a, slug_result_state::SetRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SlugResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -296,11 +299,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SlugResultBuilder<'a, slug_result_state::SetSlug<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SlugResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -314,8 +317,8 @@ where
     /// Build the final struct
     pub fn build(self) -> SlugResult<'a> {
         SlugResult {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
-            slug: self.__unsafe_private_named.1.unwrap(),
+            r#ref: self._fields.0.unwrap(),
+            slug: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -328,8 +331,8 @@ where
         >,
     ) -> SlugResult<'a> {
         SlugResult {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
-            slug: self.__unsafe_private_named.1.unwrap(),
+            r#ref: self._fields.0.unwrap(),
+            slug: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/games_gamesgamesgamesgames/slug.rs b/crates/jacquard-api/src/games_gamesgamesgamesgames/slug.rs
index 0e38846c..5f43ef8c 100644
--- a/crates/jacquard-api/src/games_gamesgamesgamesgames/slug.rs
+++ b/crates/jacquard-api/src/games_gamesgamesgamesgames/slug.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -133,45 +136,45 @@ pub mod slug_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Slug;
         type Ref;
+        type Slug;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Slug = Unset;
         type Ref = Unset;
-    }
-    ///State transition - sets the `slug` field to Set
-    pub struct SetSlug<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSlug<S> {}
-    impl<S: State> State for SetSlug<S> {
-        type Slug = Set<members::slug>;
-        type Ref = S::Ref;
+        type Slug = Unset;
     }
     ///State transition - sets the `ref` field to Set
     pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRef<S> {}
     impl<S: State> State for SetRef<S> {
-        type Slug = S::Slug;
         type Ref = Set<members::r#ref>;
+        type Slug = S::Slug;
+    }
+    ///State transition - sets the `slug` field to Set
+    pub struct SetSlug<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSlug<S> {}
+    impl<S: State> State for SetSlug<S> {
+        type Ref = S::Ref;
+        type Slug = Set<members::slug>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `slug` field
-        pub struct slug(());
         ///Marker type for the `ref` field
         pub struct r#ref(());
+        ///Marker type for the `slug` field
+        pub struct slug(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SlugBuilder<'a, S: slug_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Slug<'a> {
@@ -185,9 +188,9 @@ impl<'a> SlugBuilder<'a, slug_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SlugBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -202,11 +205,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SlugBuilder<'a, slug_state::SetRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SlugBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,11 +224,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SlugBuilder<'a, slug_state::SetSlug<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SlugBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -233,14 +236,14 @@ where
 impl<'a, S> SlugBuilder<'a, S>
 where
     S: slug_state::State,
-    S::Slug: slug_state::IsSet,
     S::Ref: slug_state::IsSet,
+    S::Slug: slug_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Slug<'a> {
         Slug {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
-            slug: self.__unsafe_private_named.1.unwrap(),
+            r#ref: self._fields.0.unwrap(),
+            slug: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -253,8 +256,8 @@ where
         >,
     ) -> Slug<'a> {
         Slug {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
-            slug: self.__unsafe_private_named.1.unwrap(),
+            r#ref: self._fields.0.unwrap(),
+            slug: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/garden_goals/category.rs b/crates/jacquard-api/src/garden_goals/category.rs
index df1ebd01..a69928a3 100644
--- a/crates/jacquard-api/src/garden_goals/category.rs
+++ b/crates/jacquard-api/src/garden_goals/category.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -185,9 +188,9 @@ pub mod category_state {
 
 /// Builder for constructing an instance of this type
 pub struct CategoryBuilder<'a, S: category_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Category<'a> {
@@ -201,9 +204,9 @@ impl<'a> CategoryBuilder<'a, category_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CategoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -218,11 +221,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CategoryBuilder<'a, category_state::SetCategoryId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CategoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -237,11 +240,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CategoryBuilder<'a, category_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CategoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -256,11 +259,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CategoryBuilder<'a, category_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CategoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -275,9 +278,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Category<'a> {
         Category {
-            category_id: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            category_id: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -290,9 +293,9 @@ where
         >,
     ) -> Category<'a> {
         Category {
-            category_id: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            category_id: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/garden_goals/completion.rs b/crates/jacquard-api/src/garden_goals/completion.rs
index 45612081..7770d50f 100644
--- a/crates/jacquard-api/src/garden_goals/completion.rs
+++ b/crates/jacquard-api/src/garden_goals/completion.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -250,92 +253,92 @@ pub mod completion_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CompletedAt;
         type GoalId;
-        type Day;
         type Month;
+        type Day;
         type Year;
+        type CompletedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CompletedAt = Unset;
         type GoalId = Unset;
-        type Day = Unset;
         type Month = Unset;
+        type Day = Unset;
         type Year = Unset;
-    }
-    ///State transition - sets the `completed_at` field to Set
-    pub struct SetCompletedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCompletedAt<S> {}
-    impl<S: State> State for SetCompletedAt<S> {
-        type CompletedAt = Set<members::completed_at>;
-        type GoalId = S::GoalId;
-        type Day = S::Day;
-        type Month = S::Month;
-        type Year = S::Year;
+        type CompletedAt = Unset;
     }
     ///State transition - sets the `goal_id` field to Set
     pub struct SetGoalId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetGoalId<S> {}
     impl<S: State> State for SetGoalId<S> {
-        type CompletedAt = S::CompletedAt;
         type GoalId = Set<members::goal_id>;
-        type Day = S::Day;
         type Month = S::Month;
+        type Day = S::Day;
         type Year = S::Year;
-    }
-    ///State transition - sets the `day` field to Set
-    pub struct SetDay<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDay<S> {}
-    impl<S: State> State for SetDay<S> {
         type CompletedAt = S::CompletedAt;
-        type GoalId = S::GoalId;
-        type Day = Set<members::day>;
-        type Month = S::Month;
-        type Year = S::Year;
     }
     ///State transition - sets the `month` field to Set
     pub struct SetMonth<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMonth<S> {}
     impl<S: State> State for SetMonth<S> {
-        type CompletedAt = S::CompletedAt;
         type GoalId = S::GoalId;
-        type Day = S::Day;
         type Month = Set<members::month>;
+        type Day = S::Day;
         type Year = S::Year;
+        type CompletedAt = S::CompletedAt;
+    }
+    ///State transition - sets the `day` field to Set
+    pub struct SetDay<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDay<S> {}
+    impl<S: State> State for SetDay<S> {
+        type GoalId = S::GoalId;
+        type Month = S::Month;
+        type Day = Set<members::day>;
+        type Year = S::Year;
+        type CompletedAt = S::CompletedAt;
     }
     ///State transition - sets the `year` field to Set
     pub struct SetYear<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetYear<S> {}
     impl<S: State> State for SetYear<S> {
-        type CompletedAt = S::CompletedAt;
         type GoalId = S::GoalId;
-        type Day = S::Day;
         type Month = S::Month;
+        type Day = S::Day;
         type Year = Set<members::year>;
+        type CompletedAt = S::CompletedAt;
+    }
+    ///State transition - sets the `completed_at` field to Set
+    pub struct SetCompletedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCompletedAt<S> {}
+    impl<S: State> State for SetCompletedAt<S> {
+        type GoalId = S::GoalId;
+        type Month = S::Month;
+        type Day = S::Day;
+        type Year = S::Year;
+        type CompletedAt = Set<members::completed_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `completed_at` field
-        pub struct completed_at(());
         ///Marker type for the `goal_id` field
         pub struct goal_id(());
-        ///Marker type for the `day` field
-        pub struct day(());
         ///Marker type for the `month` field
         pub struct month(());
+        ///Marker type for the `day` field
+        pub struct day(());
         ///Marker type for the `year` field
         pub struct year(());
+        ///Marker type for the `completed_at` field
+        pub struct completed_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CompletionBuilder<'a, S: completion_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<i64>,
         Option<CowStr<'a>>,
@@ -346,7 +349,7 @@ pub struct CompletionBuilder<'a, S: completion_state::State> {
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Completion<'a> {
@@ -360,19 +363,9 @@ impl<'a> CompletionBuilder<'a, completion_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CompletionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -387,11 +380,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CompletionBuilder<'a, completion_state::SetCompletedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CompletionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -406,11 +399,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CompletionBuilder<'a, completion_state::SetDay<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CompletionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -425,11 +418,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CompletionBuilder<'a, completion_state::SetGoalId<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CompletionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -437,12 +430,12 @@ where
 impl<'a, S: completion_state::State> CompletionBuilder<'a, S> {
     /// Set the `goalUri` field (optional)
     pub fn goal_uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `goalUri` field to an Option value (optional)
     pub fn maybe_goal_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -457,11 +450,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CompletionBuilder<'a, completion_state::SetMonth<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         CompletionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -469,12 +462,12 @@ where
 impl<'a, S: completion_state::State> CompletionBuilder<'a, S> {
     /// Set the `notes` field (optional)
     pub fn notes(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `notes` field to an Option value (optional)
     pub fn maybe_notes(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -482,12 +475,12 @@ impl<'a, S: completion_state::State> CompletionBuilder<'a, S> {
 impl<'a, S: completion_state::State> CompletionBuilder<'a, S> {
     /// Set the `photoBlob` field (optional)
     pub fn photo_blob(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `photoBlob` field to an Option value (optional)
     pub fn maybe_photo_blob(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -495,12 +488,12 @@ impl<'a, S: completion_state::State> CompletionBuilder<'a, S> {
 impl<'a, S: completion_state::State> CompletionBuilder<'a, S> {
     /// Set the `sequenceNum` field (optional)
     pub fn sequence_num(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `sequenceNum` field to an Option value (optional)
     pub fn maybe_sequence_num(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -515,11 +508,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CompletionBuilder<'a, completion_state::SetYear<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         CompletionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -527,24 +520,24 @@ where
 impl<'a, S> CompletionBuilder<'a, S>
 where
     S: completion_state::State,
-    S::CompletedAt: completion_state::IsSet,
     S::GoalId: completion_state::IsSet,
-    S::Day: completion_state::IsSet,
     S::Month: completion_state::IsSet,
+    S::Day: completion_state::IsSet,
     S::Year: completion_state::IsSet,
+    S::CompletedAt: completion_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Completion<'a> {
         Completion {
-            completed_at: self.__unsafe_private_named.0.unwrap(),
-            day: self.__unsafe_private_named.1.unwrap(),
-            goal_id: self.__unsafe_private_named.2.unwrap(),
-            goal_uri: self.__unsafe_private_named.3,
-            month: self.__unsafe_private_named.4.unwrap(),
-            notes: self.__unsafe_private_named.5,
-            photo_blob: self.__unsafe_private_named.6,
-            sequence_num: self.__unsafe_private_named.7,
-            year: self.__unsafe_private_named.8.unwrap(),
+            completed_at: self._fields.0.unwrap(),
+            day: self._fields.1.unwrap(),
+            goal_id: self._fields.2.unwrap(),
+            goal_uri: self._fields.3,
+            month: self._fields.4.unwrap(),
+            notes: self._fields.5,
+            photo_blob: self._fields.6,
+            sequence_num: self._fields.7,
+            year: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -557,15 +550,15 @@ where
         >,
     ) -> Completion<'a> {
         Completion {
-            completed_at: self.__unsafe_private_named.0.unwrap(),
-            day: self.__unsafe_private_named.1.unwrap(),
-            goal_id: self.__unsafe_private_named.2.unwrap(),
-            goal_uri: self.__unsafe_private_named.3,
-            month: self.__unsafe_private_named.4.unwrap(),
-            notes: self.__unsafe_private_named.5,
-            photo_blob: self.__unsafe_private_named.6,
-            sequence_num: self.__unsafe_private_named.7,
-            year: self.__unsafe_private_named.8.unwrap(),
+            completed_at: self._fields.0.unwrap(),
+            day: self._fields.1.unwrap(),
+            goal_id: self._fields.2.unwrap(),
+            goal_uri: self._fields.3,
+            month: self._fields.4.unwrap(),
+            notes: self._fields.5,
+            photo_blob: self._fields.6,
+            sequence_num: self._fields.7,
+            year: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/garden_goals/completion_details.rs b/crates/jacquard-api/src/garden_goals/completion_details.rs
index 696c3f92..604daa7f 100644
--- a/crates/jacquard-api/src/garden_goals/completion_details.rs
+++ b/crates/jacquard-api/src/garden_goals/completion_details.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -252,92 +255,92 @@ pub mod completion_details_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Year;
-        type UpdatedAt;
-        type GoalId;
         type Day;
+        type GoalId;
+        type UpdatedAt;
         type Month;
+        type Year;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Year = Unset;
-        type UpdatedAt = Unset;
-        type GoalId = Unset;
         type Day = Unset;
+        type GoalId = Unset;
+        type UpdatedAt = Unset;
         type Month = Unset;
+        type Year = Unset;
     }
-    ///State transition - sets the `year` field to Set
-    pub struct SetYear<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetYear<S> {}
-    impl<S: State> State for SetYear<S> {
-        type Year = Set<members::year>;
-        type UpdatedAt = S::UpdatedAt;
+    ///State transition - sets the `day` field to Set
+    pub struct SetDay<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDay<S> {}
+    impl<S: State> State for SetDay<S> {
+        type Day = Set<members::day>;
         type GoalId = S::GoalId;
-        type Day = S::Day;
+        type UpdatedAt = S::UpdatedAt;
         type Month = S::Month;
-    }
-    ///State transition - sets the `updated_at` field to Set
-    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
-    impl<S: State> State for SetUpdatedAt<S> {
         type Year = S::Year;
-        type UpdatedAt = Set<members::updated_at>;
-        type GoalId = S::GoalId;
-        type Day = S::Day;
-        type Month = S::Month;
     }
     ///State transition - sets the `goal_id` field to Set
     pub struct SetGoalId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetGoalId<S> {}
     impl<S: State> State for SetGoalId<S> {
-        type Year = S::Year;
-        type UpdatedAt = S::UpdatedAt;
-        type GoalId = Set<members::goal_id>;
         type Day = S::Day;
+        type GoalId = Set<members::goal_id>;
+        type UpdatedAt = S::UpdatedAt;
         type Month = S::Month;
-    }
-    ///State transition - sets the `day` field to Set
-    pub struct SetDay<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDay<S> {}
-    impl<S: State> State for SetDay<S> {
         type Year = S::Year;
-        type UpdatedAt = S::UpdatedAt;
+    }
+    ///State transition - sets the `updated_at` field to Set
+    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
+    impl<S: State> State for SetUpdatedAt<S> {
+        type Day = S::Day;
         type GoalId = S::GoalId;
-        type Day = Set<members::day>;
+        type UpdatedAt = Set<members::updated_at>;
         type Month = S::Month;
+        type Year = S::Year;
     }
     ///State transition - sets the `month` field to Set
     pub struct SetMonth<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMonth<S> {}
     impl<S: State> State for SetMonth<S> {
-        type Year = S::Year;
-        type UpdatedAt = S::UpdatedAt;
-        type GoalId = S::GoalId;
         type Day = S::Day;
+        type GoalId = S::GoalId;
+        type UpdatedAt = S::UpdatedAt;
         type Month = Set<members::month>;
+        type Year = S::Year;
+    }
+    ///State transition - sets the `year` field to Set
+    pub struct SetYear<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetYear<S> {}
+    impl<S: State> State for SetYear<S> {
+        type Day = S::Day;
+        type GoalId = S::GoalId;
+        type UpdatedAt = S::UpdatedAt;
+        type Month = S::Month;
+        type Year = Set<members::year>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `year` field
-        pub struct year(());
-        ///Marker type for the `updated_at` field
-        pub struct updated_at(());
-        ///Marker type for the `goal_id` field
-        pub struct goal_id(());
         ///Marker type for the `day` field
         pub struct day(());
+        ///Marker type for the `goal_id` field
+        pub struct goal_id(());
+        ///Marker type for the `updated_at` field
+        pub struct updated_at(());
         ///Marker type for the `month` field
         pub struct month(());
+        ///Marker type for the `year` field
+        pub struct year(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CompletionDetailsBuilder<'a, S: completion_details_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
@@ -348,7 +351,7 @@ pub struct CompletionDetailsBuilder<'a, S: completion_details_state::State> {
         Option<Datetime>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CompletionDetails<'a> {
@@ -362,19 +365,9 @@ impl<'a> CompletionDetailsBuilder<'a, completion_details_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CompletionDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -389,11 +382,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CompletionDetailsBuilder<'a, completion_details_state::SetDay<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CompletionDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -408,11 +401,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CompletionDetailsBuilder<'a, completion_details_state::SetGoalId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CompletionDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -420,12 +413,12 @@ where
 impl<'a, S: completion_details_state::State> CompletionDetailsBuilder<'a, S> {
     /// Set the `goalUri` field (optional)
     pub fn goal_uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `goalUri` field to an Option value (optional)
     pub fn maybe_goal_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -440,11 +433,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CompletionDetailsBuilder<'a, completion_details_state::SetMonth<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CompletionDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -452,12 +445,12 @@ where
 impl<'a, S: completion_details_state::State> CompletionDetailsBuilder<'a, S> {
     /// Set the `notes` field (optional)
     pub fn notes(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `notes` field to an Option value (optional)
     pub fn maybe_notes(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -465,12 +458,12 @@ impl<'a, S: completion_details_state::State> CompletionDetailsBuilder<'a, S> {
 impl<'a, S: completion_details_state::State> CompletionDetailsBuilder<'a, S> {
     /// Set the `photoAlt` field (optional)
     pub fn photo_alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `photoAlt` field to an Option value (optional)
     pub fn maybe_photo_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -478,12 +471,12 @@ impl<'a, S: completion_details_state::State> CompletionDetailsBuilder<'a, S> {
 impl<'a, S: completion_details_state::State> CompletionDetailsBuilder<'a, S> {
     /// Set the `photoBlob` field (optional)
     pub fn photo_blob(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `photoBlob` field to an Option value (optional)
     pub fn maybe_photo_blob(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -498,11 +491,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CompletionDetailsBuilder<'a, completion_details_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         CompletionDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -517,11 +510,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CompletionDetailsBuilder<'a, completion_details_state::SetYear<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         CompletionDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -529,24 +522,24 @@ where
 impl<'a, S> CompletionDetailsBuilder<'a, S>
 where
     S: completion_details_state::State,
-    S::Year: completion_details_state::IsSet,
-    S::UpdatedAt: completion_details_state::IsSet,
-    S::GoalId: completion_details_state::IsSet,
     S::Day: completion_details_state::IsSet,
+    S::GoalId: completion_details_state::IsSet,
+    S::UpdatedAt: completion_details_state::IsSet,
     S::Month: completion_details_state::IsSet,
+    S::Year: completion_details_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CompletionDetails<'a> {
         CompletionDetails {
-            day: self.__unsafe_private_named.0.unwrap(),
-            goal_id: self.__unsafe_private_named.1.unwrap(),
-            goal_uri: self.__unsafe_private_named.2,
-            month: self.__unsafe_private_named.3.unwrap(),
-            notes: self.__unsafe_private_named.4,
-            photo_alt: self.__unsafe_private_named.5,
-            photo_blob: self.__unsafe_private_named.6,
-            updated_at: self.__unsafe_private_named.7.unwrap(),
-            year: self.__unsafe_private_named.8.unwrap(),
+            day: self._fields.0.unwrap(),
+            goal_id: self._fields.1.unwrap(),
+            goal_uri: self._fields.2,
+            month: self._fields.3.unwrap(),
+            notes: self._fields.4,
+            photo_alt: self._fields.5,
+            photo_blob: self._fields.6,
+            updated_at: self._fields.7.unwrap(),
+            year: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -559,15 +552,15 @@ where
         >,
     ) -> CompletionDetails<'a> {
         CompletionDetails {
-            day: self.__unsafe_private_named.0.unwrap(),
-            goal_id: self.__unsafe_private_named.1.unwrap(),
-            goal_uri: self.__unsafe_private_named.2,
-            month: self.__unsafe_private_named.3.unwrap(),
-            notes: self.__unsafe_private_named.4,
-            photo_alt: self.__unsafe_private_named.5,
-            photo_blob: self.__unsafe_private_named.6,
-            updated_at: self.__unsafe_private_named.7.unwrap(),
-            year: self.__unsafe_private_named.8.unwrap(),
+            day: self._fields.0.unwrap(),
+            goal_id: self._fields.1.unwrap(),
+            goal_uri: self._fields.2,
+            month: self._fields.3.unwrap(),
+            notes: self._fields.4,
+            photo_alt: self._fields.5,
+            photo_blob: self._fields.6,
+            updated_at: self._fields.7.unwrap(),
+            year: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/garden_goals/goal.rs b/crates/jacquard-api/src/garden_goals/goal.rs
index a0d1294d..d6045b9d 100644
--- a/crates/jacquard-api/src/garden_goals/goal.rs
+++ b/crates/jacquard-api/src/garden_goals/goal.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -326,65 +329,65 @@ pub mod goal_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Year;
         type CreatedAt;
         type Name;
-        type Year;
         type GoalId;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Year = Unset;
         type CreatedAt = Unset;
         type Name = Unset;
-        type Year = Unset;
         type GoalId = Unset;
     }
+    ///State transition - sets the `year` field to Set
+    pub struct SetYear<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetYear<S> {}
+    impl<S: State> State for SetYear<S> {
+        type Year = Set<members::year>;
+        type CreatedAt = S::CreatedAt;
+        type Name = S::Name;
+        type GoalId = S::GoalId;
+    }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Year = S::Year;
         type CreatedAt = Set<members::created_at>;
         type Name = S::Name;
-        type Year = S::Year;
         type GoalId = S::GoalId;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type CreatedAt = S::CreatedAt;
-        type Name = Set<members::name>;
         type Year = S::Year;
-        type GoalId = S::GoalId;
-    }
-    ///State transition - sets the `year` field to Set
-    pub struct SetYear<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetYear<S> {}
-    impl<S: State> State for SetYear<S> {
         type CreatedAt = S::CreatedAt;
-        type Name = S::Name;
-        type Year = Set<members::year>;
+        type Name = Set<members::name>;
         type GoalId = S::GoalId;
     }
     ///State transition - sets the `goal_id` field to Set
     pub struct SetGoalId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetGoalId<S> {}
     impl<S: State> State for SetGoalId<S> {
+        type Year = S::Year;
         type CreatedAt = S::CreatedAt;
         type Name = S::Name;
-        type Year = S::Year;
         type GoalId = Set<members::goal_id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `year` field
+        pub struct year(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `year` field
-        pub struct year(());
         ///Marker type for the `goal_id` field
         pub struct goal_id(());
     }
@@ -392,8 +395,8 @@ pub mod goal_state {
 
 /// Builder for constructing an instance of this type
 pub struct GoalBuilder<'a, S: goal_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
@@ -410,7 +413,7 @@ pub struct GoalBuilder<'a, S: goal_state::State> {
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Goal<'a> {
@@ -424,8 +427,8 @@ impl<'a> GoalBuilder<'a, goal_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GoalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -442,7 +445,7 @@ impl<'a> GoalBuilder<'a, goal_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -450,12 +453,12 @@ impl<'a> GoalBuilder<'a, goal_state::Empty> {
 impl<'a, S: goal_state::State> GoalBuilder<'a, S> {
     /// Set the `accentColor` field (optional)
     pub fn accent_color(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `accentColor` field to an Option value (optional)
     pub fn maybe_accent_color(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -463,12 +466,12 @@ impl<'a, S: goal_state::State> GoalBuilder<'a, S> {
 impl<'a, S: goal_state::State> GoalBuilder<'a, S> {
     /// Set the `categories` field (optional)
     pub fn categories(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `categories` field to an Option value (optional)
     pub fn maybe_categories(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -479,12 +482,12 @@ impl<'a, S: goal_state::State> GoalBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `completedAccentColor` field to an Option value (optional)
     pub fn maybe_completed_accent_color(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -492,12 +495,12 @@ impl<'a, S: goal_state::State> GoalBuilder<'a, S> {
 impl<'a, S: goal_state::State> GoalBuilder<'a, S> {
     /// Set the `completedPiece` field (optional)
     pub fn completed_piece(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `completedPiece` field to an Option value (optional)
     pub fn maybe_completed_piece(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -508,12 +511,12 @@ impl<'a, S: goal_state::State> GoalBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BlobRef<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `completedPieceBlob` field to an Option value (optional)
     pub fn maybe_completed_piece_blob(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -524,12 +527,12 @@ impl<'a, S: goal_state::State> GoalBuilder<'a, S> {
         mut self,
         value: impl Into<Option<UriValue<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `completedPieceUrl` field to an Option value (optional)
     pub fn maybe_completed_piece_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -544,11 +547,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> GoalBuilder<'a, goal_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         GoalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -556,12 +559,12 @@ where
 impl<'a, S: goal_state::State> GoalBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -576,11 +579,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GoalBuilder<'a, goal_state::SetGoalId<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         GoalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -595,11 +598,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GoalBuilder<'a, goal_state::SetName<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         GoalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -607,12 +610,12 @@ where
 impl<'a, S: goal_state::State> GoalBuilder<'a, S> {
     /// Set the `piece` field (optional)
     pub fn piece(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `piece` field to an Option value (optional)
     pub fn maybe_piece(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -620,12 +623,12 @@ impl<'a, S: goal_state::State> GoalBuilder<'a, S> {
 impl<'a, S: goal_state::State> GoalBuilder<'a, S> {
     /// Set the `pieceBlob` field (optional)
     pub fn piece_blob(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `pieceBlob` field to an Option value (optional)
     pub fn maybe_piece_blob(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -633,12 +636,12 @@ impl<'a, S: goal_state::State> GoalBuilder<'a, S> {
 impl<'a, S: goal_state::State> GoalBuilder<'a, S> {
     /// Set the `pieceUrl` field (optional)
     pub fn piece_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `pieceUrl` field to an Option value (optional)
     pub fn maybe_piece_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -646,12 +649,12 @@ impl<'a, S: goal_state::State> GoalBuilder<'a, S> {
 impl<'a, S: goal_state::State> GoalBuilder<'a, S> {
     /// Set the `targetCount` field (optional)
     pub fn target_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `targetCount` field to an Option value (optional)
     pub fn maybe_target_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -666,11 +669,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> GoalBuilder<'a, goal_state::SetYear<S>> {
-        self.__unsafe_private_named.14 = Option::Some(value.into());
+        self._fields.14 = Option::Some(value.into());
         GoalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -678,29 +681,29 @@ where
 impl<'a, S> GoalBuilder<'a, S>
 where
     S: goal_state::State,
+    S::Year: goal_state::IsSet,
     S::CreatedAt: goal_state::IsSet,
     S::Name: goal_state::IsSet,
-    S::Year: goal_state::IsSet,
     S::GoalId: goal_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Goal<'a> {
         Goal {
-            accent_color: self.__unsafe_private_named.0,
-            categories: self.__unsafe_private_named.1,
-            completed_accent_color: self.__unsafe_private_named.2,
-            completed_piece: self.__unsafe_private_named.3,
-            completed_piece_blob: self.__unsafe_private_named.4,
-            completed_piece_url: self.__unsafe_private_named.5,
-            created_at: self.__unsafe_private_named.6.unwrap(),
-            description: self.__unsafe_private_named.7,
-            goal_id: self.__unsafe_private_named.8.unwrap(),
-            name: self.__unsafe_private_named.9.unwrap(),
-            piece: self.__unsafe_private_named.10,
-            piece_blob: self.__unsafe_private_named.11,
-            piece_url: self.__unsafe_private_named.12,
-            target_count: self.__unsafe_private_named.13,
-            year: self.__unsafe_private_named.14.unwrap(),
+            accent_color: self._fields.0,
+            categories: self._fields.1,
+            completed_accent_color: self._fields.2,
+            completed_piece: self._fields.3,
+            completed_piece_blob: self._fields.4,
+            completed_piece_url: self._fields.5,
+            created_at: self._fields.6.unwrap(),
+            description: self._fields.7,
+            goal_id: self._fields.8.unwrap(),
+            name: self._fields.9.unwrap(),
+            piece: self._fields.10,
+            piece_blob: self._fields.11,
+            piece_url: self._fields.12,
+            target_count: self._fields.13,
+            year: self._fields.14.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -713,21 +716,21 @@ where
         >,
     ) -> Goal<'a> {
         Goal {
-            accent_color: self.__unsafe_private_named.0,
-            categories: self.__unsafe_private_named.1,
-            completed_accent_color: self.__unsafe_private_named.2,
-            completed_piece: self.__unsafe_private_named.3,
-            completed_piece_blob: self.__unsafe_private_named.4,
-            completed_piece_url: self.__unsafe_private_named.5,
-            created_at: self.__unsafe_private_named.6.unwrap(),
-            description: self.__unsafe_private_named.7,
-            goal_id: self.__unsafe_private_named.8.unwrap(),
-            name: self.__unsafe_private_named.9.unwrap(),
-            piece: self.__unsafe_private_named.10,
-            piece_blob: self.__unsafe_private_named.11,
-            piece_url: self.__unsafe_private_named.12,
-            target_count: self.__unsafe_private_named.13,
-            year: self.__unsafe_private_named.14.unwrap(),
+            accent_color: self._fields.0,
+            categories: self._fields.1,
+            completed_accent_color: self._fields.2,
+            completed_piece: self._fields.3,
+            completed_piece_blob: self._fields.4,
+            completed_piece_url: self._fields.5,
+            created_at: self._fields.6.unwrap(),
+            description: self._fields.7,
+            goal_id: self._fields.8.unwrap(),
+            name: self._fields.9.unwrap(),
+            piece: self._fields.10,
+            piece_blob: self._fields.11,
+            piece_url: self._fields.12,
+            target_count: self._fields.13,
+            year: self._fields.14.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/garden_goals/profile.rs b/crates/jacquard-api/src/garden_goals/profile.rs
index 3eef5c46..94f863c2 100644
--- a/crates/jacquard-api/src/garden_goals/profile.rs
+++ b/crates/jacquard-api/src/garden_goals/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -131,9 +134,9 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -147,9 +150,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,11 +167,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ProfileBuilder<'a, profile_state::SetJoinedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,7 +184,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            joined_at: self.__unsafe_private_named.0.unwrap(),
+            joined_at: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -194,7 +197,7 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            joined_at: self.__unsafe_private_named.0.unwrap(),
+            joined_at: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/garden_lexicon/conquering_wolfhound/example.rs b/crates/jacquard-api/src/garden_lexicon/conquering_wolfhound/example.rs
index 71571add..99d1c969 100644
--- a/crates/jacquard-api/src/garden_lexicon/conquering_wolfhound/example.rs
+++ b/crates/jacquard-api/src/garden_lexicon/conquering_wolfhound/example.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
diff --git a/crates/jacquard-api/src/garden_lexicon/documentation.rs b/crates/jacquard-api/src/garden_lexicon/documentation.rs
index aec193d6..171724d2 100644
--- a/crates/jacquard-api/src/garden_lexicon/documentation.rs
+++ b/crates/jacquard-api/src/garden_lexicon/documentation.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -516,9 +519,9 @@ pub mod localized_string_state {
 
 /// Builder for constructing an instance of this type
 pub struct LocalizedStringBuilder<'a, S: localized_string_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Language>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Language>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LocalizedString<'a> {
@@ -532,9 +535,9 @@ impl<'a> LocalizedStringBuilder<'a, localized_string_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LocalizedStringBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -549,11 +552,11 @@ where
         mut self,
         value: impl Into<Language>,
     ) -> LocalizedStringBuilder<'a, localized_string_state::SetLang<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LocalizedStringBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -568,11 +571,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LocalizedStringBuilder<'a, localized_string_state::SetValue<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LocalizedStringBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -586,8 +589,8 @@ where
     /// Build the final struct
     pub fn build(self) -> LocalizedString<'a> {
         LocalizedString {
-            lang: self.__unsafe_private_named.0.unwrap(),
-            value: self.__unsafe_private_named.1.unwrap(),
+            lang: self._fields.0.unwrap(),
+            value: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -600,8 +603,8 @@ where
         >,
     ) -> LocalizedString<'a> {
         LocalizedString {
-            lang: self.__unsafe_private_named.0.unwrap(),
-            value: self.__unsafe_private_named.1.unwrap(),
+            lang: self._fields.0.unwrap(),
+            value: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -617,50 +620,50 @@ pub mod documentation_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Lexicon;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Lexicon = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Lexicon = S::Lexicon;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `lexicon` field to Set
     pub struct SetLexicon<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLexicon<S> {}
     impl<S: State> State for SetLexicon<S> {
-        type CreatedAt = S::CreatedAt;
         type Lexicon = Set<members::lexicon>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Lexicon = S::Lexicon;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `lexicon` field
         pub struct lexicon(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DocumentationBuilder<'a, S: documentation_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Vec<documentation::DefinitionDoc<'a>>>,
         Option<Vec<documentation::LocalizedString<'a>>>,
         Option<Nsid<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Documentation<'a> {
@@ -674,9 +677,9 @@ impl<'a> DocumentationBuilder<'a, documentation_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DocumentationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -691,11 +694,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DocumentationBuilder<'a, documentation_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DocumentationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -706,7 +709,7 @@ impl<'a, S: documentation_state::State> DocumentationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<documentation::DefinitionDoc<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `definitions` field to an Option value (optional)
@@ -714,7 +717,7 @@ impl<'a, S: documentation_state::State> DocumentationBuilder<'a, S> {
         mut self,
         value: Option<Vec<documentation::DefinitionDoc<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -725,7 +728,7 @@ impl<'a, S: documentation_state::State> DocumentationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<documentation::LocalizedString<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
@@ -733,7 +736,7 @@ impl<'a, S: documentation_state::State> DocumentationBuilder<'a, S> {
         mut self,
         value: Option<Vec<documentation::LocalizedString<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -748,11 +751,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> DocumentationBuilder<'a, documentation_state::SetLexicon<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         DocumentationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -760,16 +763,16 @@ where
 impl<'a, S> DocumentationBuilder<'a, S>
 where
     S: documentation_state::State,
-    S::CreatedAt: documentation_state::IsSet,
     S::Lexicon: documentation_state::IsSet,
+    S::CreatedAt: documentation_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Documentation<'a> {
         Documentation {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            definitions: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            lexicon: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            definitions: self._fields.1,
+            description: self._fields.2,
+            lexicon: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -782,10 +785,10 @@ where
         >,
     ) -> Documentation<'a> {
         Documentation {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            definitions: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            lexicon: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            definitions: self._fields.1,
+            description: self._fields.2,
+            lexicon: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/garden_lexicon/example.rs b/crates/jacquard-api/src/garden_lexicon/example.rs
index ab149ef1..b964662a 100644
--- a/crates/jacquard-api/src/garden_lexicon/example.rs
+++ b/crates/jacquard-api/src/garden_lexicon/example.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -118,49 +121,49 @@ pub mod example_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Lexicon;
         type Value;
+        type Lexicon;
         type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Lexicon = Unset;
         type Value = Unset;
+        type Lexicon = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `lexicon` field to Set
-    pub struct SetLexicon<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLexicon<S> {}
-    impl<S: State> State for SetLexicon<S> {
-        type Lexicon = Set<members::lexicon>;
-        type Value = S::Value;
-        type CreatedAt = S::CreatedAt;
-    }
     ///State transition - sets the `value` field to Set
     pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetValue<S> {}
     impl<S: State> State for SetValue<S> {
-        type Lexicon = S::Lexicon;
         type Value = Set<members::value>;
+        type Lexicon = S::Lexicon;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `lexicon` field to Set
+    pub struct SetLexicon<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLexicon<S> {}
+    impl<S: State> State for SetLexicon<S> {
+        type Value = S::Value;
+        type Lexicon = Set<members::lexicon>;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Lexicon = S::Lexicon;
         type Value = S::Value;
+        type Lexicon = S::Lexicon;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `lexicon` field
-        pub struct lexicon(());
         ///Marker type for the `value` field
         pub struct value(());
+        ///Marker type for the `lexicon` field
+        pub struct lexicon(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
     }
@@ -168,14 +171,9 @@ pub mod example_state {
 
 /// Builder for constructing an instance of this type
 pub struct ExampleBuilder<'a, S: example_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<CowStr<'a>>,
-        Option<Nsid<'a>>,
-        Option<Data<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<Nsid<'a>>, Option<Data<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Example<'a> {
@@ -189,9 +187,9 @@ impl<'a> ExampleBuilder<'a, example_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExampleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -206,11 +204,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ExampleBuilder<'a, example_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ExampleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -218,12 +216,12 @@ where
 impl<'a, S: example_state::State> ExampleBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -238,11 +236,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> ExampleBuilder<'a, example_state::SetLexicon<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ExampleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -257,11 +255,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> ExampleBuilder<'a, example_state::SetValue<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ExampleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -269,17 +267,17 @@ where
 impl<'a, S> ExampleBuilder<'a, S>
 where
     S: example_state::State,
-    S::Lexicon: example_state::IsSet,
     S::Value: example_state::IsSet,
+    S::Lexicon: example_state::IsSet,
     S::CreatedAt: example_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Example<'a> {
         Example {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            lexicon: self.__unsafe_private_named.2.unwrap(),
-            value: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            lexicon: self._fields.2.unwrap(),
+            value: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -289,10 +287,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Example<'a> {
         Example {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            lexicon: self.__unsafe_private_named.2.unwrap(),
-            value: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            lexicon: self._fields.2.unwrap(),
+            value: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/garden_lexicon/exultant_zebra/app.rs b/crates/jacquard-api/src/garden_lexicon/exultant_zebra/app.rs
index 757b7466..0b6c2b0d 100644
--- a/crates/jacquard-api/src/garden_lexicon/exultant_zebra/app.rs
+++ b/crates/jacquard-api/src/garden_lexicon/exultant_zebra/app.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -152,13 +155,9 @@ pub mod app_state {
 
 /// Builder for constructing an instance of this type
 pub struct AppBuilder<'a, S: app_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<Vec<StrongRef<'a>>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Vec<StrongRef<'a>>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> App<'a> {
@@ -172,9 +171,9 @@ impl<'a> AppBuilder<'a, app_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AppBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,12 +181,12 @@ impl<'a> AppBuilder<'a, app_state::Empty> {
 impl<'a, S: app_state::State> AppBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -202,11 +201,11 @@ where
         mut self,
         value: impl Into<Vec<StrongRef<'a>>>,
     ) -> AppBuilder<'a, app_state::SetDistributions<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AppBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,11 +220,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AppBuilder<'a, app_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AppBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,9 +238,9 @@ where
     /// Build the final struct
     pub fn build(self) -> App<'a> {
         App {
-            description: self.__unsafe_private_named.0,
-            distributions: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            description: self._fields.0,
+            distributions: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -254,9 +253,9 @@ where
         >,
     ) -> App<'a> {
         App {
-            description: self.__unsafe_private_named.0,
-            distributions: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            description: self._fields.0,
+            distributions: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/garden_lexicon/exultant_zebra/distribution.rs b/crates/jacquard-api/src/garden_lexicon/exultant_zebra/distribution.rs
index 3e5e9b37..d317ad88 100644
--- a/crates/jacquard-api/src/garden_lexicon/exultant_zebra/distribution.rs
+++ b/crates/jacquard-api/src/garden_lexicon/exultant_zebra/distribution.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -202,13 +205,9 @@ pub mod artifact_state {
 
 /// Builder for constructing an instance of this type
 pub struct ArtifactBuilder<'a, S: artifact_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<BlobRef<'a>>,
-        Option<Vec<CowStr<'a>>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<BlobRef<'a>>, Option<Vec<CowStr<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Artifact<'a> {
@@ -222,9 +221,9 @@ impl<'a> ArtifactBuilder<'a, artifact_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ArtifactBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,12 +231,12 @@ impl<'a> ArtifactBuilder<'a, artifact_state::Empty> {
 impl<'a, S: artifact_state::State> ArtifactBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -252,11 +251,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ArtifactBuilder<'a, artifact_state::SetDownload<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ArtifactBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -264,12 +263,12 @@ where
 impl<'a, S: artifact_state::State> ArtifactBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -282,9 +281,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Artifact<'a> {
         Artifact {
-            description: self.__unsafe_private_named.0,
-            download: self.__unsafe_private_named.1.unwrap(),
-            tags: self.__unsafe_private_named.2,
+            description: self._fields.0,
+            download: self._fields.1.unwrap(),
+            tags: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -297,9 +296,9 @@ where
         >,
     ) -> Artifact<'a> {
         Artifact {
-            description: self.__unsafe_private_named.0,
-            download: self.__unsafe_private_named.1.unwrap(),
-            tags: self.__unsafe_private_named.2,
+            description: self._fields.0,
+            download: self._fields.1.unwrap(),
+            tags: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -474,13 +473,13 @@ pub mod distribution_state {
 
 /// Builder for constructing an instance of this type
 pub struct DistributionBuilder<'a, S: distribution_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<distribution::Artifact<'a>>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Distribution<'a> {
@@ -494,9 +493,9 @@ impl<'a> DistributionBuilder<'a, distribution_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DistributionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -511,11 +510,11 @@ where
         mut self,
         value: impl Into<Vec<distribution::Artifact<'a>>>,
     ) -> DistributionBuilder<'a, distribution_state::SetArtifacts<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DistributionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -523,12 +522,12 @@ where
 impl<'a, S: distribution_state::State> DistributionBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -543,11 +542,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DistributionBuilder<'a, distribution_state::SetVersion<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         DistributionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -561,9 +560,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Distribution<'a> {
         Distribution {
-            artifacts: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            version: self.__unsafe_private_named.2.unwrap(),
+            artifacts: self._fields.0.unwrap(),
+            description: self._fields.1,
+            version: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -576,9 +575,9 @@ where
         >,
     ) -> Distribution<'a> {
         Distribution {
-            artifacts: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            version: self.__unsafe_private_named.2.unwrap(),
+            artifacts: self._fields.0.unwrap(),
+            description: self._fields.1,
+            version: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/garden_lexicon/exultant_zebra/masl.rs b/crates/jacquard-api/src/garden_lexicon/exultant_zebra/masl.rs
index aee5d4a9..545ffbf6 100644
--- a/crates/jacquard-api/src/garden_lexicon/exultant_zebra/masl.rs
+++ b/crates/jacquard-api/src/garden_lexicon/exultant_zebra/masl.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -117,9 +120,9 @@ pub mod masl_state {
 
 /// Builder for constructing an instance of this type
 pub struct MaslBuilder<'a, S: masl_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Vec<masl::Resource<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Vec<masl::Resource<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Masl<'a> {
@@ -133,9 +136,9 @@ impl<'a> MaslBuilder<'a, masl_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MaslBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -143,12 +146,12 @@ impl<'a> MaslBuilder<'a, masl_state::Empty> {
 impl<'a, S: masl_state::State> MaslBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -163,11 +166,11 @@ where
         mut self,
         value: impl Into<Vec<masl::Resource<'a>>>,
     ) -> MaslBuilder<'a, masl_state::SetResources<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MaslBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,8 +183,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Masl<'a> {
         Masl {
-            name: self.__unsafe_private_named.0,
-            resources: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0,
+            resources: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -194,8 +197,8 @@ where
         >,
     ) -> Masl<'a> {
         Masl {
-            name: self.__unsafe_private_named.0,
-            resources: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0,
+            resources: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -322,13 +325,9 @@ pub mod resource_state {
 
 /// Builder for constructing an instance of this type
 pub struct ResourceBuilder<'a, S: resource_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-        Option<BlobRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<BlobRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Resource<'a> {
@@ -342,9 +341,9 @@ impl<'a> ResourceBuilder<'a, resource_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ResourceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -352,12 +351,12 @@ impl<'a> ResourceBuilder<'a, resource_state::Empty> {
 impl<'a, S: resource_state::State> ResourceBuilder<'a, S> {
     /// Set the `contentType` field (optional)
     pub fn content_type(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `contentType` field to an Option value (optional)
     pub fn maybe_content_type(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -365,12 +364,12 @@ impl<'a, S: resource_state::State> ResourceBuilder<'a, S> {
 impl<'a, S: resource_state::State> ResourceBuilder<'a, S> {
     /// Set the `path` field (optional)
     pub fn path(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `path` field to an Option value (optional)
     pub fn maybe_path(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -385,11 +384,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ResourceBuilder<'a, resource_state::SetSrc<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ResourceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -402,9 +401,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Resource<'a> {
         Resource {
-            content_type: self.__unsafe_private_named.0,
-            path: self.__unsafe_private_named.1,
-            src: self.__unsafe_private_named.2.unwrap(),
+            content_type: self._fields.0,
+            path: self._fields.1,
+            src: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -417,9 +416,9 @@ where
         >,
     ) -> Resource<'a> {
         Resource {
-            content_type: self.__unsafe_private_named.0,
-            path: self.__unsafe_private_named.1,
-            src: self.__unsafe_private_named.2.unwrap(),
+            content_type: self._fields.0,
+            path: self._fields.1,
+            src: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/garden_lexicon/exultant_zebra/tile.rs b/crates/jacquard-api/src/garden_lexicon/exultant_zebra/tile.rs
index d27ead45..1112a364 100644
--- a/crates/jacquard-api/src/garden_lexicon/exultant_zebra/tile.rs
+++ b/crates/jacquard-api/src/garden_lexicon/exultant_zebra/tile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -803,44 +806,44 @@ pub mod tile_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Content;
         type Name;
+        type Content;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Content = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `content` field to Set
-    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContent<S> {}
-    impl<S: State> State for SetContent<S> {
-        type Content = Set<members::content>;
-        type Name = S::Name;
+        type Content = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Content = S::Content;
         type Name = Set<members::name>;
+        type Content = S::Content;
+    }
+    ///State transition - sets the `content` field to Set
+    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContent<S> {}
+    impl<S: State> State for SetContent<S> {
+        type Name = S::Name;
+        type Content = Set<members::content>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `content` field
-        pub struct content(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `content` field
+        pub struct content(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TileBuilder<'a, S: tile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<TileAspectRatio<'a>>,
         Option<TileContent<'a>>,
         Option<CowStr<'a>>,
@@ -851,7 +854,7 @@ pub struct TileBuilder<'a, S: tile_state::State> {
         Option<CowStr<'a>>,
         Option<Vec<tile::Param<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Tile<'a> {
@@ -865,19 +868,9 @@ impl<'a> TileBuilder<'a, tile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -888,12 +881,12 @@ impl<'a, S: tile_state::State> TileBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TileAspectRatio<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
     pub fn maybe_aspect_ratio(mut self, value: Option<TileAspectRatio<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -908,11 +901,11 @@ where
         mut self,
         value: impl Into<TileContent<'a>>,
     ) -> TileBuilder<'a, tile_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -920,12 +913,12 @@ where
 impl<'a, S: tile_state::State> TileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -933,12 +926,12 @@ impl<'a, S: tile_state::State> TileBuilder<'a, S> {
 impl<'a, S: tile_state::State> TileBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -946,12 +939,12 @@ impl<'a, S: tile_state::State> TileBuilder<'a, S> {
 impl<'a, S: tile_state::State> TileBuilder<'a, S> {
     /// Set the `icon` field (optional)
     pub fn icon(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `icon` field to an Option value (optional)
     pub fn maybe_icon(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -962,12 +955,12 @@ impl<'a, S: tile_state::State> TileBuilder<'a, S> {
         mut self,
         value: impl Into<Option<tile::Interactions<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `interactions` field to an Option value (optional)
     pub fn maybe_interactions(mut self, value: Option<tile::Interactions<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -975,12 +968,12 @@ impl<'a, S: tile_state::State> TileBuilder<'a, S> {
 impl<'a, S: tile_state::State> TileBuilder<'a, S> {
     /// Set the `loadingImage` field (optional)
     pub fn loading_image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `loadingImage` field to an Option value (optional)
     pub fn maybe_loading_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -995,11 +988,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TileBuilder<'a, tile_state::SetName<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         TileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1007,12 +1000,12 @@ where
 impl<'a, S: tile_state::State> TileBuilder<'a, S> {
     /// Set the `params` field (optional)
     pub fn params(mut self, value: impl Into<Option<Vec<tile::Param<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `params` field to an Option value (optional)
     pub fn maybe_params(mut self, value: Option<Vec<tile::Param<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -1020,21 +1013,21 @@ impl<'a, S: tile_state::State> TileBuilder<'a, S> {
 impl<'a, S> TileBuilder<'a, S>
 where
     S: tile_state::State,
-    S::Content: tile_state::IsSet,
     S::Name: tile_state::IsSet,
+    S::Content: tile_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Tile<'a> {
         Tile {
-            aspect_ratio: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            facets: self.__unsafe_private_named.3,
-            icon: self.__unsafe_private_named.4,
-            interactions: self.__unsafe_private_named.5,
-            loading_image: self.__unsafe_private_named.6,
-            name: self.__unsafe_private_named.7.unwrap(),
-            params: self.__unsafe_private_named.8,
+            aspect_ratio: self._fields.0,
+            content: self._fields.1.unwrap(),
+            description: self._fields.2,
+            facets: self._fields.3,
+            icon: self._fields.4,
+            interactions: self._fields.5,
+            loading_image: self._fields.6,
+            name: self._fields.7.unwrap(),
+            params: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -1047,15 +1040,15 @@ where
         >,
     ) -> Tile<'a> {
         Tile {
-            aspect_ratio: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            facets: self.__unsafe_private_named.3,
-            icon: self.__unsafe_private_named.4,
-            interactions: self.__unsafe_private_named.5,
-            loading_image: self.__unsafe_private_named.6,
-            name: self.__unsafe_private_named.7.unwrap(),
-            params: self.__unsafe_private_named.8,
+            aspect_ratio: self._fields.0,
+            content: self._fields.1.unwrap(),
+            description: self._fields.2,
+            facets: self._fields.3,
+            icon: self._fields.4,
+            interactions: self._fields.5,
+            loading_image: self._fields.6,
+            name: self._fields.7.unwrap(),
+            params: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/garden_lexicon/exultant_zebra/tile_embed.rs b/crates/jacquard-api/src/garden_lexicon/exultant_zebra/tile_embed.rs
index 1c2859a4..1fc88a64 100644
--- a/crates/jacquard-api/src/garden_lexicon/exultant_zebra/tile_embed.rs
+++ b/crates/jacquard-api/src/garden_lexicon/exultant_zebra/tile_embed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -78,9 +81,9 @@ pub mod tile_embed_state {
 
 /// Builder for constructing an instance of this type
 pub struct TileEmbedBuilder<'a, S: tile_embed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TileEmbed<'a> {
@@ -94,9 +97,9 @@ impl<'a> TileEmbedBuilder<'a, tile_embed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TileEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -111,11 +114,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> TileEmbedBuilder<'a, tile_embed_state::SetTile<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TileEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -128,7 +131,7 @@ where
     /// Build the final struct
     pub fn build(self) -> TileEmbed<'a> {
         TileEmbed {
-            tile: self.__unsafe_private_named.0.unwrap(),
+            tile: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -141,7 +144,7 @@ where
         >,
     ) -> TileEmbed<'a> {
         TileEmbed {
-            tile: self.__unsafe_private_named.0.unwrap(),
+            tile: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/garden_lexicon/joyous_grackle/example.rs b/crates/jacquard-api/src/garden_lexicon/joyous_grackle/example.rs
index bcd80699..df5bf2d2 100644
--- a/crates/jacquard-api/src/garden_lexicon/joyous_grackle/example.rs
+++ b/crates/jacquard-api/src/garden_lexicon/joyous_grackle/example.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
diff --git a/crates/jacquard-api/src/garden_lexicon/lawyerlike_deangelo/example.rs b/crates/jacquard-api/src/garden_lexicon/lawyerlike_deangelo/example.rs
index 822110c5..5119bdc8 100644
--- a/crates/jacquard-api/src/garden_lexicon/lawyerlike_deangelo/example.rs
+++ b/crates/jacquard-api/src/garden_lexicon/lawyerlike_deangelo/example.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
diff --git a/crates/jacquard-api/src/garden_lexicon/ngerakines/helloworld/hello.rs b/crates/jacquard-api/src/garden_lexicon/ngerakines/helloworld/hello.rs
index e961a72f..07562384 100644
--- a/crates/jacquard-api/src/garden_lexicon/ngerakines/helloworld/hello.rs
+++ b/crates/jacquard-api/src/garden_lexicon/ngerakines/helloworld/hello.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -74,9 +77,9 @@ pub mod hello_state {
 
 /// Builder for constructing an instance of this type
 pub struct HelloBuilder<'a, S: hello_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Hello<'a> {
@@ -90,9 +93,9 @@ impl<'a> HelloBuilder<'a, hello_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HelloBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -100,12 +103,12 @@ impl<'a> HelloBuilder<'a, hello_state::Empty> {
 impl<'a, S: hello_state::State> HelloBuilder<'a, S> {
     /// Set the `subject` field (optional)
     pub fn subject(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `subject` field to an Option value (optional)
     pub fn maybe_subject(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -116,8 +119,6 @@ where
 {
     /// Build the final struct
     pub fn build(self) -> Hello<'a> {
-        Hello {
-            subject: self.__unsafe_private_named.0,
-        }
+        Hello { subject: self._fields.0 }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/garden_lexicon/ngerakines/semeion/sign.rs b/crates/jacquard-api/src/garden_lexicon/ngerakines/semeion/sign.rs
index 216187b5..36b17db3 100644
--- a/crates/jacquard-api/src/garden_lexicon/ngerakines/semeion/sign.rs
+++ b/crates/jacquard-api/src/garden_lexicon/ngerakines/semeion/sign.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::deps::bytes::Bytes;
 use jacquard_derive::IntoStatic;
diff --git a/crates/jacquard-api/src/garden_lexicon/service.rs b/crates/jacquard-api/src/garden_lexicon/service.rs
index 22f77c79..95597cba 100644
--- a/crates/jacquard-api/src/garden_lexicon/service.rs
+++ b/crates/jacquard-api/src/garden_lexicon/service.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -252,14 +255,14 @@ pub mod service_state {
 
 /// Builder for constructing an instance of this type
 pub struct ServiceBuilder<'a, S: service_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Vec<service::Method<'a>>>,
         Option<CowStr<'a>>,
         Option<Vec<service::UrlTemplate<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Service<'a> {
@@ -273,9 +276,9 @@ impl<'a> ServiceBuilder<'a, service_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ServiceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -283,12 +286,12 @@ impl<'a> ServiceBuilder<'a, service_state::Empty> {
 impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -299,12 +302,12 @@ impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<service::Method<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `methods` field to an Option value (optional)
     pub fn maybe_methods(mut self, value: Option<Vec<service::Method<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -319,11 +322,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ServiceBuilder<'a, service_state::SetServiceType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ServiceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -334,7 +337,7 @@ impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<service::UrlTemplate<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `urlTemplates` field to an Option value (optional)
@@ -342,7 +345,7 @@ impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
         mut self,
         value: Option<Vec<service::UrlTemplate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -355,10 +358,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Service<'a> {
         Service {
-            description: self.__unsafe_private_named.0,
-            methods: self.__unsafe_private_named.1,
-            service_type: self.__unsafe_private_named.2.unwrap(),
-            url_templates: self.__unsafe_private_named.3,
+            description: self._fields.0,
+            methods: self._fields.1,
+            service_type: self._fields.2.unwrap(),
+            url_templates: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -371,10 +374,10 @@ where
         >,
     ) -> Service<'a> {
         Service {
-            description: self.__unsafe_private_named.0,
-            methods: self.__unsafe_private_named.1,
-            service_type: self.__unsafe_private_named.2.unwrap(),
-            url_templates: self.__unsafe_private_named.3,
+            description: self._fields.0,
+            methods: self._fields.1,
+            service_type: self._fields.2.unwrap(),
+            url_templates: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -597,9 +600,9 @@ pub mod method_state {
 
 /// Builder for constructing an instance of this type
 pub struct MethodBuilder<'a, S: method_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<CowStr<'a>>>, Option<bool>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<CowStr<'a>>>, Option<bool>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Method<'a> {
@@ -613,9 +616,9 @@ impl<'a> MethodBuilder<'a, method_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MethodBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -623,12 +626,12 @@ impl<'a> MethodBuilder<'a, method_state::Empty> {
 impl<'a, S: method_state::State> MethodBuilder<'a, S> {
     /// Set the `authMethods` field (optional)
     pub fn auth_methods(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `authMethods` field to an Option value (optional)
     pub fn maybe_auth_methods(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -636,12 +639,12 @@ impl<'a, S: method_state::State> MethodBuilder<'a, S> {
 impl<'a, S: method_state::State> MethodBuilder<'a, S> {
     /// Set the `deprecated` field (optional)
     pub fn deprecated(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `deprecated` field to an Option value (optional)
     pub fn maybe_deprecated(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -656,11 +659,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> MethodBuilder<'a, method_state::SetLexicon<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         MethodBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -673,9 +676,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Method<'a> {
         Method {
-            auth_methods: self.__unsafe_private_named.0,
-            deprecated: self.__unsafe_private_named.1,
-            lexicon: self.__unsafe_private_named.2.unwrap(),
+            auth_methods: self._fields.0,
+            deprecated: self._fields.1,
+            lexicon: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -688,9 +691,9 @@ where
         >,
     ) -> Method<'a> {
         Method {
-            auth_methods: self.__unsafe_private_named.0,
-            deprecated: self.__unsafe_private_named.1,
-            lexicon: self.__unsafe_private_named.2.unwrap(),
+            auth_methods: self._fields.0,
+            deprecated: self._fields.1,
+            lexicon: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/garden_lexicon/stunning_leafcutter/example.rs b/crates/jacquard-api/src/garden_lexicon/stunning_leafcutter/example.rs
index a4304dc8..d492bda3 100644
--- a/crates/jacquard-api/src/garden_lexicon/stunning_leafcutter/example.rs
+++ b/crates/jacquard-api/src/garden_lexicon/stunning_leafcutter/example.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
diff --git a/crates/jacquard-api/src/garden_lexicon/unconquered_modesto/example.rs b/crates/jacquard-api/src/garden_lexicon/unconquered_modesto/example.rs
index c9ca2d3d..8236481e 100644
--- a/crates/jacquard-api/src/garden_lexicon/unconquered_modesto/example.rs
+++ b/crates/jacquard-api/src/garden_lexicon/unconquered_modesto/example.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -131,9 +134,9 @@ pub mod example_state {
 
 /// Builder for constructing an instance of this type
 pub struct ExampleBuilder<'a, S: example_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Example<'a> {
@@ -147,9 +150,9 @@ impl<'a> ExampleBuilder<'a, example_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExampleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,11 +167,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ExampleBuilder<'a, example_state::SetMessage2<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ExampleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,7 +184,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Example<'a> {
         Example {
-            message2: self.__unsafe_private_named.0.unwrap(),
+            message2: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -194,7 +197,7 @@ where
         >,
     ) -> Example<'a> {
         Example {
-            message2: self.__unsafe_private_named.0.unwrap(),
+            message2: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/haus_opn/mic/artist.rs b/crates/jacquard-api/src/haus_opn/mic/artist.rs
index 873be115..36116b57 100644
--- a/crates/jacquard-api/src/haus_opn/mic/artist.rs
+++ b/crates/jacquard-api/src/haus_opn/mic/artist.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -216,8 +219,8 @@ pub mod artist_state {
 
 /// Builder for constructing an instance of this type
 pub struct ArtistBuilder<'a, S: artist_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -225,7 +228,7 @@ pub struct ArtistBuilder<'a, S: artist_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Artist<'a> {
@@ -239,9 +242,9 @@ impl<'a> ArtistBuilder<'a, artist_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ArtistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,12 +252,12 @@ impl<'a> ArtistBuilder<'a, artist_state::Empty> {
 impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
     /// Set the `artistPic` field (optional)
     pub fn artist_pic(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `artistPic` field to an Option value (optional)
     pub fn maybe_artist_pic(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -262,12 +265,12 @@ impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
 impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
     /// Set the `bio` field (optional)
     pub fn bio(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `bio` field to an Option value (optional)
     pub fn maybe_bio(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -282,11 +285,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ArtistBuilder<'a, artist_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ArtistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -297,12 +300,12 @@ impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<UriValue<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `externalLinks` field to an Option value (optional)
     pub fn maybe_external_links(mut self, value: Option<Vec<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -310,12 +313,12 @@ impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
 impl<'a, S: artist_state::State> ArtistBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -330,11 +333,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ArtistBuilder<'a, artist_state::SetName<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ArtistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -348,12 +351,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Artist<'a> {
         Artist {
-            artist_pic: self.__unsafe_private_named.0,
-            bio: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            external_links: self.__unsafe_private_named.3,
-            genre: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
+            artist_pic: self._fields.0,
+            bio: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            external_links: self._fields.3,
+            genre: self._fields.4,
+            name: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -366,12 +369,12 @@ where
         >,
     ) -> Artist<'a> {
         Artist {
-            artist_pic: self.__unsafe_private_named.0,
-            bio: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            external_links: self.__unsafe_private_named.3,
-            genre: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
+            artist_pic: self._fields.0,
+            bio: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            external_links: self._fields.3,
+            genre: self._fields.4,
+            name: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/haus_opn/mic/show.rs b/crates/jacquard-api/src/haus_opn/mic/show.rs
index 9d3bac03..f58574b7 100644
--- a/crates/jacquard-api/src/haus_opn/mic/show.rs
+++ b/crates/jacquard-api/src/haus_opn/mic/show.rs
@@ -8,7 +8,11 @@
 pub mod episode;
 pub mod favorite;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -286,74 +290,74 @@ pub mod show_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Artist;
-        type Title;
         type Schedule;
+        type Artist;
         type CreatedAt;
+        type Title;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Artist = Unset;
-        type Title = Unset;
         type Schedule = Unset;
+        type Artist = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `artist` field to Set
-    pub struct SetArtist<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetArtist<S> {}
-    impl<S: State> State for SetArtist<S> {
-        type Artist = Set<members::artist>;
-        type Title = S::Title;
-        type Schedule = S::Schedule;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Artist = S::Artist;
-        type Title = Set<members::title>;
-        type Schedule = S::Schedule;
-        type CreatedAt = S::CreatedAt;
+        type Title = Unset;
     }
     ///State transition - sets the `schedule` field to Set
     pub struct SetSchedule<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSchedule<S> {}
     impl<S: State> State for SetSchedule<S> {
+        type Schedule = Set<members::schedule>;
         type Artist = S::Artist;
+        type CreatedAt = S::CreatedAt;
         type Title = S::Title;
-        type Schedule = Set<members::schedule>;
+    }
+    ///State transition - sets the `artist` field to Set
+    pub struct SetArtist<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetArtist<S> {}
+    impl<S: State> State for SetArtist<S> {
+        type Schedule = S::Schedule;
+        type Artist = Set<members::artist>;
         type CreatedAt = S::CreatedAt;
+        type Title = S::Title;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Schedule = S::Schedule;
         type Artist = S::Artist;
+        type CreatedAt = Set<members::created_at>;
         type Title = S::Title;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
         type Schedule = S::Schedule;
-        type CreatedAt = Set<members::created_at>;
+        type Artist = S::Artist;
+        type CreatedAt = S::CreatedAt;
+        type Title = Set<members::title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `artist` field
-        pub struct artist(());
-        ///Marker type for the `title` field
-        pub struct title(());
         ///Marker type for the `schedule` field
         pub struct schedule(());
+        ///Marker type for the `artist` field
+        pub struct artist(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `title` field
+        pub struct title(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ShowBuilder<'a, S: show_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<BlobRef<'a>>,
         Option<Datetime>,
@@ -361,7 +365,7 @@ pub struct ShowBuilder<'a, S: show_state::State> {
         Option<ShowSchedule<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Show<'a> {
@@ -375,9 +379,9 @@ impl<'a> ShowBuilder<'a, show_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ShowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -392,11 +396,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ShowBuilder<'a, show_state::SetArtist<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ShowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -404,12 +408,12 @@ where
 impl<'a, S: show_state::State> ShowBuilder<'a, S> {
     /// Set the `coverArt` field (optional)
     pub fn cover_art(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `coverArt` field to an Option value (optional)
     pub fn maybe_cover_art(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -424,11 +428,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ShowBuilder<'a, show_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ShowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -436,12 +440,12 @@ where
 impl<'a, S: show_state::State> ShowBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -456,11 +460,11 @@ where
         mut self,
         value: impl Into<ShowSchedule<'a>>,
     ) -> ShowBuilder<'a, show_state::SetSchedule<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ShowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -475,11 +479,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ShowBuilder<'a, show_state::SetTitle<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ShowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -487,20 +491,20 @@ where
 impl<'a, S> ShowBuilder<'a, S>
 where
     S: show_state::State,
-    S::Artist: show_state::IsSet,
-    S::Title: show_state::IsSet,
     S::Schedule: show_state::IsSet,
+    S::Artist: show_state::IsSet,
     S::CreatedAt: show_state::IsSet,
+    S::Title: show_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Show<'a> {
         Show {
-            artist: self.__unsafe_private_named.0.unwrap(),
-            cover_art: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            schedule: self.__unsafe_private_named.4.unwrap(),
-            title: self.__unsafe_private_named.5.unwrap(),
+            artist: self._fields.0.unwrap(),
+            cover_art: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            schedule: self._fields.4.unwrap(),
+            title: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -513,12 +517,12 @@ where
         >,
     ) -> Show<'a> {
         Show {
-            artist: self.__unsafe_private_named.0.unwrap(),
-            cover_art: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            schedule: self.__unsafe_private_named.4.unwrap(),
-            title: self.__unsafe_private_named.5.unwrap(),
+            artist: self._fields.0.unwrap(),
+            cover_art: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            schedule: self._fields.4.unwrap(),
+            title: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/haus_opn/mic/show/episode.rs b/crates/jacquard-api/src/haus_opn/mic/show/episode.rs
index dc776e1e..a682e9af 100644
--- a/crates/jacquard-api/src/haus_opn/mic/show/episode.rs
+++ b/crates/jacquard-api/src/haus_opn/mic/show/episode.rs
@@ -7,7 +7,11 @@
 
 pub mod favorite;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -334,8 +338,8 @@ pub mod episode_state {
 
 /// Builder for constructing an instance of this type
 pub struct EpisodeBuilder<'a, S: episode_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<BlobRef<'a>>,
         Option<Datetime>,
@@ -345,7 +349,7 @@ pub struct EpisodeBuilder<'a, S: episode_state::State> {
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Episode<'a> {
@@ -359,9 +363,9 @@ impl<'a> EpisodeBuilder<'a, episode_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -369,12 +373,12 @@ impl<'a> EpisodeBuilder<'a, episode_state::Empty> {
 impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
     /// Set the `airingDate` field (optional)
     pub fn airing_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `airingDate` field to an Option value (optional)
     pub fn maybe_airing_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -382,12 +386,12 @@ impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
 impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
     /// Set the `coverArt` field (optional)
     pub fn cover_art(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `coverArt` field to an Option value (optional)
     pub fn maybe_cover_art(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -402,11 +406,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EpisodeBuilder<'a, episode_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -414,12 +418,12 @@ where
 impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -434,11 +438,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> EpisodeBuilder<'a, episode_state::SetShowUri<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         EpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -446,12 +450,12 @@ where
 impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<EpisodeStatus<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<EpisodeStatus<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -466,11 +470,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EpisodeBuilder<'a, episode_state::SetTitle<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         EpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -478,12 +482,12 @@ where
 impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
     /// Set the `vodUrl` field (optional)
     pub fn vod_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `vodUrl` field to an Option value (optional)
     pub fn maybe_vod_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -498,14 +502,14 @@ where
     /// Build the final struct
     pub fn build(self) -> Episode<'a> {
         Episode {
-            airing_date: self.__unsafe_private_named.0,
-            cover_art: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            show_uri: self.__unsafe_private_named.4.unwrap(),
-            status: self.__unsafe_private_named.5,
-            title: self.__unsafe_private_named.6.unwrap(),
-            vod_url: self.__unsafe_private_named.7,
+            airing_date: self._fields.0,
+            cover_art: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            show_uri: self._fields.4.unwrap(),
+            status: self._fields.5,
+            title: self._fields.6.unwrap(),
+            vod_url: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -518,14 +522,14 @@ where
         >,
     ) -> Episode<'a> {
         Episode {
-            airing_date: self.__unsafe_private_named.0,
-            cover_art: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            show_uri: self.__unsafe_private_named.4.unwrap(),
-            status: self.__unsafe_private_named.5,
-            title: self.__unsafe_private_named.6.unwrap(),
-            vod_url: self.__unsafe_private_named.7,
+            airing_date: self._fields.0,
+            cover_art: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            show_uri: self._fields.4.unwrap(),
+            status: self._fields.5,
+            title: self._fields.6.unwrap(),
+            vod_url: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/haus_opn/mic/show/episode/favorite.rs b/crates/jacquard-api/src/haus_opn/mic/show/episode/favorite.rs
index 6f26b3a8..46d263e7 100644
--- a/crates/jacquard-api/src/haus_opn/mic/show/episode/favorite.rs
+++ b/crates/jacquard-api/src/haus_opn/mic/show/episode/favorite.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -145,9 +148,9 @@ pub mod favorite_state {
 
 /// Builder for constructing an instance of this type
 pub struct FavoriteBuilder<'a, S: favorite_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Favorite<'a> {
@@ -161,9 +164,9 @@ impl<'a> FavoriteBuilder<'a, favorite_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FavoriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FavoriteBuilder<'a, favorite_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FavoriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> FavoriteBuilder<'a, favorite_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FavoriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,8 +218,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Favorite<'a> {
         Favorite {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -229,8 +232,8 @@ where
         >,
     ) -> Favorite<'a> {
         Favorite {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/haus_opn/mic/show/favorite.rs b/crates/jacquard-api/src/haus_opn/mic/show/favorite.rs
index a6c64ae7..4d66d85d 100644
--- a/crates/jacquard-api/src/haus_opn/mic/show/favorite.rs
+++ b/crates/jacquard-api/src/haus_opn/mic/show/favorite.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -109,45 +112,45 @@ pub mod favorite_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type CreatedAt;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
+        type Subject = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FavoriteBuilder<'a, S: favorite_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Favorite<'a> {
@@ -161,9 +164,9 @@ impl<'a> FavoriteBuilder<'a, favorite_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FavoriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FavoriteBuilder<'a, favorite_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FavoriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> FavoriteBuilder<'a, favorite_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FavoriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,14 +212,14 @@ where
 impl<'a, S> FavoriteBuilder<'a, S>
 where
     S: favorite_state::State,
-    S::Subject: favorite_state::IsSet,
     S::CreatedAt: favorite_state::IsSet,
+    S::Subject: favorite_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Favorite<'a> {
         Favorite {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -229,8 +232,8 @@ where
         >,
     ) -> Favorite<'a> {
         Favorite {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_atcr/hold/abort_upload.rs b/crates/jacquard-api/src/io_atcr/hold/abort_upload.rs
index 5701e72d..87e03261 100644
--- a/crates/jacquard-api/src/io_atcr/hold/abort_upload.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/abort_upload.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/io_atcr/hold/captain.rs b/crates/jacquard-api/src/io_atcr/hold/captain.rs
index effaf258..4c4a1fcb 100644
--- a/crates/jacquard-api/src/io_atcr/hold/captain.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/captain.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -138,92 +141,92 @@ pub mod captain_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Public;
         type EnableBlueskyPosts;
+        type AllowAllCrew;
         type DeployedAt;
-        type Public;
         type Owner;
-        type AllowAllCrew;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Public = Unset;
         type EnableBlueskyPosts = Unset;
+        type AllowAllCrew = Unset;
         type DeployedAt = Unset;
-        type Public = Unset;
         type Owner = Unset;
-        type AllowAllCrew = Unset;
+    }
+    ///State transition - sets the `public` field to Set
+    pub struct SetPublic<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPublic<S> {}
+    impl<S: State> State for SetPublic<S> {
+        type Public = Set<members::public>;
+        type EnableBlueskyPosts = S::EnableBlueskyPosts;
+        type AllowAllCrew = S::AllowAllCrew;
+        type DeployedAt = S::DeployedAt;
+        type Owner = S::Owner;
     }
     ///State transition - sets the `enable_bluesky_posts` field to Set
     pub struct SetEnableBlueskyPosts<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEnableBlueskyPosts<S> {}
     impl<S: State> State for SetEnableBlueskyPosts<S> {
+        type Public = S::Public;
         type EnableBlueskyPosts = Set<members::enable_bluesky_posts>;
+        type AllowAllCrew = S::AllowAllCrew;
         type DeployedAt = S::DeployedAt;
+        type Owner = S::Owner;
+    }
+    ///State transition - sets the `allow_all_crew` field to Set
+    pub struct SetAllowAllCrew<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAllowAllCrew<S> {}
+    impl<S: State> State for SetAllowAllCrew<S> {
         type Public = S::Public;
+        type EnableBlueskyPosts = S::EnableBlueskyPosts;
+        type AllowAllCrew = Set<members::allow_all_crew>;
+        type DeployedAt = S::DeployedAt;
         type Owner = S::Owner;
-        type AllowAllCrew = S::AllowAllCrew;
     }
     ///State transition - sets the `deployed_at` field to Set
     pub struct SetDeployedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDeployedAt<S> {}
     impl<S: State> State for SetDeployedAt<S> {
-        type EnableBlueskyPosts = S::EnableBlueskyPosts;
-        type DeployedAt = Set<members::deployed_at>;
         type Public = S::Public;
-        type Owner = S::Owner;
-        type AllowAllCrew = S::AllowAllCrew;
-    }
-    ///State transition - sets the `public` field to Set
-    pub struct SetPublic<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPublic<S> {}
-    impl<S: State> State for SetPublic<S> {
         type EnableBlueskyPosts = S::EnableBlueskyPosts;
-        type DeployedAt = S::DeployedAt;
-        type Public = Set<members::public>;
-        type Owner = S::Owner;
         type AllowAllCrew = S::AllowAllCrew;
+        type DeployedAt = Set<members::deployed_at>;
+        type Owner = S::Owner;
     }
     ///State transition - sets the `owner` field to Set
     pub struct SetOwner<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetOwner<S> {}
     impl<S: State> State for SetOwner<S> {
-        type EnableBlueskyPosts = S::EnableBlueskyPosts;
-        type DeployedAt = S::DeployedAt;
         type Public = S::Public;
-        type Owner = Set<members::owner>;
-        type AllowAllCrew = S::AllowAllCrew;
-    }
-    ///State transition - sets the `allow_all_crew` field to Set
-    pub struct SetAllowAllCrew<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAllowAllCrew<S> {}
-    impl<S: State> State for SetAllowAllCrew<S> {
         type EnableBlueskyPosts = S::EnableBlueskyPosts;
+        type AllowAllCrew = S::AllowAllCrew;
         type DeployedAt = S::DeployedAt;
-        type Public = S::Public;
-        type Owner = S::Owner;
-        type AllowAllCrew = Set<members::allow_all_crew>;
+        type Owner = Set<members::owner>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `public` field
+        pub struct public(());
         ///Marker type for the `enable_bluesky_posts` field
         pub struct enable_bluesky_posts(());
+        ///Marker type for the `allow_all_crew` field
+        pub struct allow_all_crew(());
         ///Marker type for the `deployed_at` field
         pub struct deployed_at(());
-        ///Marker type for the `public` field
-        pub struct public(());
         ///Marker type for the `owner` field
         pub struct owner(());
-        ///Marker type for the `allow_all_crew` field
-        pub struct allow_all_crew(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CaptainBuilder<'a, S: captain_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<Datetime>,
         Option<bool>,
@@ -233,7 +236,7 @@ pub struct CaptainBuilder<'a, S: captain_state::State> {
         Option<Did<'a>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Captain<'a> {
@@ -247,9 +250,9 @@ impl<'a> CaptainBuilder<'a, captain_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CaptainBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -264,11 +267,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> CaptainBuilder<'a, captain_state::SetAllowAllCrew<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CaptainBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -283,11 +286,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CaptainBuilder<'a, captain_state::SetDeployedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CaptainBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -302,11 +305,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> CaptainBuilder<'a, captain_state::SetEnableBlueskyPosts<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CaptainBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -321,11 +324,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> CaptainBuilder<'a, captain_state::SetOwner<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CaptainBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -340,11 +343,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> CaptainBuilder<'a, captain_state::SetPublic<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         CaptainBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -352,12 +355,12 @@ where
 impl<'a, S: captain_state::State> CaptainBuilder<'a, S> {
     /// Set the `region` field (optional)
     pub fn region(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `region` field to an Option value (optional)
     pub fn maybe_region(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -365,12 +368,12 @@ impl<'a, S: captain_state::State> CaptainBuilder<'a, S> {
 impl<'a, S: captain_state::State> CaptainBuilder<'a, S> {
     /// Set the `successor` field (optional)
     pub fn successor(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `successor` field to an Option value (optional)
     pub fn maybe_successor(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -381,7 +384,7 @@ impl<'a, S: captain_state::State> CaptainBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<CowStr<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `supporterBadgeTiers` field to an Option value (optional)
@@ -389,7 +392,7 @@ impl<'a, S: captain_state::State> CaptainBuilder<'a, S> {
         mut self,
         value: Option<Vec<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -397,23 +400,23 @@ impl<'a, S: captain_state::State> CaptainBuilder<'a, S> {
 impl<'a, S> CaptainBuilder<'a, S>
 where
     S: captain_state::State,
+    S::Public: captain_state::IsSet,
     S::EnableBlueskyPosts: captain_state::IsSet,
+    S::AllowAllCrew: captain_state::IsSet,
     S::DeployedAt: captain_state::IsSet,
-    S::Public: captain_state::IsSet,
     S::Owner: captain_state::IsSet,
-    S::AllowAllCrew: captain_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Captain<'a> {
         Captain {
-            allow_all_crew: self.__unsafe_private_named.0.unwrap(),
-            deployed_at: self.__unsafe_private_named.1.unwrap(),
-            enable_bluesky_posts: self.__unsafe_private_named.2.unwrap(),
-            owner: self.__unsafe_private_named.3.unwrap(),
-            public: self.__unsafe_private_named.4.unwrap(),
-            region: self.__unsafe_private_named.5,
-            successor: self.__unsafe_private_named.6,
-            supporter_badge_tiers: self.__unsafe_private_named.7,
+            allow_all_crew: self._fields.0.unwrap(),
+            deployed_at: self._fields.1.unwrap(),
+            enable_bluesky_posts: self._fields.2.unwrap(),
+            owner: self._fields.3.unwrap(),
+            public: self._fields.4.unwrap(),
+            region: self._fields.5,
+            successor: self._fields.6,
+            supporter_badge_tiers: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -426,14 +429,14 @@ where
         >,
     ) -> Captain<'a> {
         Captain {
-            allow_all_crew: self.__unsafe_private_named.0.unwrap(),
-            deployed_at: self.__unsafe_private_named.1.unwrap(),
-            enable_bluesky_posts: self.__unsafe_private_named.2.unwrap(),
-            owner: self.__unsafe_private_named.3.unwrap(),
-            public: self.__unsafe_private_named.4.unwrap(),
-            region: self.__unsafe_private_named.5,
-            successor: self.__unsafe_private_named.6,
-            supporter_badge_tiers: self.__unsafe_private_named.7,
+            allow_all_crew: self._fields.0.unwrap(),
+            deployed_at: self._fields.1.unwrap(),
+            enable_bluesky_posts: self._fields.2.unwrap(),
+            owner: self._fields.3.unwrap(),
+            public: self._fields.4.unwrap(),
+            region: self._fields.5,
+            successor: self._fields.6,
+            supporter_badge_tiers: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_atcr/hold/complete_upload.rs b/crates/jacquard-api/src/io_atcr/hold/complete_upload.rs
index d0997fc2..1d538c63 100644
--- a/crates/jacquard-api/src/io_atcr/hold/complete_upload.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/complete_upload.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -199,62 +202,62 @@ pub mod complete_upload_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type UploadId;
-        type Digest;
         type Parts;
+        type Digest;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type UploadId = Unset;
-        type Digest = Unset;
         type Parts = Unset;
+        type Digest = Unset;
     }
     ///State transition - sets the `upload_id` field to Set
     pub struct SetUploadId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUploadId<S> {}
     impl<S: State> State for SetUploadId<S> {
         type UploadId = Set<members::upload_id>;
-        type Digest = S::Digest;
-        type Parts = S::Parts;
-    }
-    ///State transition - sets the `digest` field to Set
-    pub struct SetDigest<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDigest<S> {}
-    impl<S: State> State for SetDigest<S> {
-        type UploadId = S::UploadId;
-        type Digest = Set<members::digest>;
         type Parts = S::Parts;
+        type Digest = S::Digest;
     }
     ///State transition - sets the `parts` field to Set
     pub struct SetParts<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetParts<S> {}
     impl<S: State> State for SetParts<S> {
         type UploadId = S::UploadId;
-        type Digest = S::Digest;
         type Parts = Set<members::parts>;
+        type Digest = S::Digest;
+    }
+    ///State transition - sets the `digest` field to Set
+    pub struct SetDigest<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDigest<S> {}
+    impl<S: State> State for SetDigest<S> {
+        type UploadId = S::UploadId;
+        type Parts = S::Parts;
+        type Digest = Set<members::digest>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `upload_id` field
         pub struct upload_id(());
-        ///Marker type for the `digest` field
-        pub struct digest(());
         ///Marker type for the `parts` field
         pub struct parts(());
+        ///Marker type for the `digest` field
+        pub struct digest(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CompleteUploadBuilder<'a, S: complete_upload_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Vec<complete_upload::PartInfo<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CompleteUpload<'a> {
@@ -268,9 +271,9 @@ impl<'a> CompleteUploadBuilder<'a, complete_upload_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CompleteUploadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -285,11 +288,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CompleteUploadBuilder<'a, complete_upload_state::SetDigest<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CompleteUploadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -304,11 +307,11 @@ where
         mut self,
         value: impl Into<Vec<complete_upload::PartInfo<'a>>>,
     ) -> CompleteUploadBuilder<'a, complete_upload_state::SetParts<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CompleteUploadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -323,11 +326,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CompleteUploadBuilder<'a, complete_upload_state::SetUploadId<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CompleteUploadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -336,15 +339,15 @@ impl<'a, S> CompleteUploadBuilder<'a, S>
 where
     S: complete_upload_state::State,
     S::UploadId: complete_upload_state::IsSet,
-    S::Digest: complete_upload_state::IsSet,
     S::Parts: complete_upload_state::IsSet,
+    S::Digest: complete_upload_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CompleteUpload<'a> {
         CompleteUpload {
-            digest: self.__unsafe_private_named.0.unwrap(),
-            parts: self.__unsafe_private_named.1.unwrap(),
-            upload_id: self.__unsafe_private_named.2.unwrap(),
+            digest: self._fields.0.unwrap(),
+            parts: self._fields.1.unwrap(),
+            upload_id: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -357,9 +360,9 @@ where
         >,
     ) -> CompleteUpload<'a> {
         CompleteUpload {
-            digest: self.__unsafe_private_named.0.unwrap(),
-            parts: self.__unsafe_private_named.1.unwrap(),
-            upload_id: self.__unsafe_private_named.2.unwrap(),
+            digest: self._fields.0.unwrap(),
+            parts: self._fields.1.unwrap(),
+            upload_id: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -411,9 +414,9 @@ pub mod part_info_state {
 
 /// Builder for constructing an instance of this type
 pub struct PartInfoBuilder<'a, S: part_info_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PartInfo<'a> {
@@ -427,9 +430,9 @@ impl<'a> PartInfoBuilder<'a, part_info_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PartInfoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -444,11 +447,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PartInfoBuilder<'a, part_info_state::SetEtag<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PartInfoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -463,11 +466,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PartInfoBuilder<'a, part_info_state::SetPartNumber<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PartInfoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -481,8 +484,8 @@ where
     /// Build the final struct
     pub fn build(self) -> PartInfo<'a> {
         PartInfo {
-            etag: self.__unsafe_private_named.0.unwrap(),
-            part_number: self.__unsafe_private_named.1.unwrap(),
+            etag: self._fields.0.unwrap(),
+            part_number: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -495,8 +498,8 @@ where
         >,
     ) -> PartInfo<'a> {
         PartInfo {
-            etag: self.__unsafe_private_named.0.unwrap(),
-            part_number: self.__unsafe_private_named.1.unwrap(),
+            etag: self._fields.0.unwrap(),
+            part_number: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_atcr/hold/crew.rs b/crates/jacquard-api/src/io_atcr/hold/crew.rs
index 389d3554..09d60730 100644
--- a/crates/jacquard-api/src/io_atcr/hold/crew.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/crew.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -241,81 +244,81 @@ pub mod crew_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Member;
         type Permissions;
         type AddedAt;
         type Role;
+        type Member;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Member = Unset;
         type Permissions = Unset;
         type AddedAt = Unset;
         type Role = Unset;
-    }
-    ///State transition - sets the `member` field to Set
-    pub struct SetMember<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMember<S> {}
-    impl<S: State> State for SetMember<S> {
-        type Member = Set<members::member>;
-        type Permissions = S::Permissions;
-        type AddedAt = S::AddedAt;
-        type Role = S::Role;
+        type Member = Unset;
     }
     ///State transition - sets the `permissions` field to Set
     pub struct SetPermissions<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPermissions<S> {}
     impl<S: State> State for SetPermissions<S> {
-        type Member = S::Member;
         type Permissions = Set<members::permissions>;
         type AddedAt = S::AddedAt;
         type Role = S::Role;
+        type Member = S::Member;
     }
     ///State transition - sets the `added_at` field to Set
     pub struct SetAddedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAddedAt<S> {}
     impl<S: State> State for SetAddedAt<S> {
-        type Member = S::Member;
         type Permissions = S::Permissions;
         type AddedAt = Set<members::added_at>;
         type Role = S::Role;
+        type Member = S::Member;
     }
     ///State transition - sets the `role` field to Set
     pub struct SetRole<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRole<S> {}
     impl<S: State> State for SetRole<S> {
-        type Member = S::Member;
         type Permissions = S::Permissions;
         type AddedAt = S::AddedAt;
         type Role = Set<members::role>;
+        type Member = S::Member;
+    }
+    ///State transition - sets the `member` field to Set
+    pub struct SetMember<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMember<S> {}
+    impl<S: State> State for SetMember<S> {
+        type Permissions = S::Permissions;
+        type AddedAt = S::AddedAt;
+        type Role = S::Role;
+        type Member = Set<members::member>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `member` field
-        pub struct member(());
         ///Marker type for the `permissions` field
         pub struct permissions(());
         ///Marker type for the `added_at` field
         pub struct added_at(());
         ///Marker type for the `role` field
         pub struct role(());
+        ///Marker type for the `member` field
+        pub struct member(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CrewBuilder<'a, S: crew_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Did<'a>>,
         Option<Vec<CowStr<'a>>>,
         Option<CrewRole<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Crew<'a> {
@@ -329,9 +332,9 @@ impl<'a> CrewBuilder<'a, crew_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CrewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -346,11 +349,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CrewBuilder<'a, crew_state::SetAddedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CrewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -365,11 +368,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> CrewBuilder<'a, crew_state::SetMember<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CrewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -384,11 +387,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> CrewBuilder<'a, crew_state::SetPermissions<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CrewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -403,11 +406,11 @@ where
         mut self,
         value: impl Into<CrewRole<'a>>,
     ) -> CrewBuilder<'a, crew_state::SetRole<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CrewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -415,12 +418,12 @@ where
 impl<'a, S: crew_state::State> CrewBuilder<'a, S> {
     /// Set the `tier` field (optional)
     pub fn tier(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tier` field to an Option value (optional)
     pub fn maybe_tier(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -428,19 +431,19 @@ impl<'a, S: crew_state::State> CrewBuilder<'a, S> {
 impl<'a, S> CrewBuilder<'a, S>
 where
     S: crew_state::State,
-    S::Member: crew_state::IsSet,
     S::Permissions: crew_state::IsSet,
     S::AddedAt: crew_state::IsSet,
     S::Role: crew_state::IsSet,
+    S::Member: crew_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Crew<'a> {
         Crew {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            member: self.__unsafe_private_named.1.unwrap(),
-            permissions: self.__unsafe_private_named.2.unwrap(),
-            role: self.__unsafe_private_named.3.unwrap(),
-            tier: self.__unsafe_private_named.4,
+            added_at: self._fields.0.unwrap(),
+            member: self._fields.1.unwrap(),
+            permissions: self._fields.2.unwrap(),
+            role: self._fields.3.unwrap(),
+            tier: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -453,11 +456,11 @@ where
         >,
     ) -> Crew<'a> {
         Crew {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            member: self.__unsafe_private_named.1.unwrap(),
-            permissions: self.__unsafe_private_named.2.unwrap(),
-            role: self.__unsafe_private_named.3.unwrap(),
-            tier: self.__unsafe_private_named.4,
+            added_at: self._fields.0.unwrap(),
+            member: self._fields.1.unwrap(),
+            permissions: self._fields.2.unwrap(),
+            role: self._fields.3.unwrap(),
+            tier: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_atcr/hold/delete_user_data.rs b/crates/jacquard-api/src/io_atcr/hold/delete_user_data.rs
index df8d95bb..6ef8a839 100644
--- a/crates/jacquard-api/src/io_atcr/hold/delete_user_data.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/delete_user_data.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/io_atcr/hold/export_user_data.rs b/crates/jacquard-api/src/io_atcr/hold/export_user_data.rs
index cd1b82f8..83e220c1 100644
--- a/crates/jacquard-api/src/io_atcr/hold/export_user_data.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/export_user_data.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
diff --git a/crates/jacquard-api/src/io_atcr/hold/get_part_upload_url.rs b/crates/jacquard-api/src/io_atcr/hold/get_part_upload_url.rs
index 1a9ccee5..65621a35 100644
--- a/crates/jacquard-api/src/io_atcr/hold/get_part_upload_url.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/get_part_upload_url.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::UriValue;
@@ -126,45 +129,45 @@ pub mod get_part_upload_url_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type UploadId;
         type PartNumber;
+        type UploadId;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type UploadId = Unset;
         type PartNumber = Unset;
-    }
-    ///State transition - sets the `upload_id` field to Set
-    pub struct SetUploadId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUploadId<S> {}
-    impl<S: State> State for SetUploadId<S> {
-        type UploadId = Set<members::upload_id>;
-        type PartNumber = S::PartNumber;
+        type UploadId = Unset;
     }
     ///State transition - sets the `part_number` field to Set
     pub struct SetPartNumber<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPartNumber<S> {}
     impl<S: State> State for SetPartNumber<S> {
-        type UploadId = S::UploadId;
         type PartNumber = Set<members::part_number>;
+        type UploadId = S::UploadId;
+    }
+    ///State transition - sets the `upload_id` field to Set
+    pub struct SetUploadId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUploadId<S> {}
+    impl<S: State> State for SetUploadId<S> {
+        type PartNumber = S::PartNumber;
+        type UploadId = Set<members::upload_id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `upload_id` field
-        pub struct upload_id(());
         ///Marker type for the `part_number` field
         pub struct part_number(());
+        ///Marker type for the `upload_id` field
+        pub struct upload_id(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GetPartUploadUrlBuilder<'a, S: get_part_upload_url_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetPartUploadUrl<'a> {
@@ -178,9 +181,9 @@ impl<'a> GetPartUploadUrlBuilder<'a, get_part_upload_url_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetPartUploadUrlBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -195,11 +198,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> GetPartUploadUrlBuilder<'a, get_part_upload_url_state::SetPartNumber<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetPartUploadUrlBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -214,11 +217,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetPartUploadUrlBuilder<'a, get_part_upload_url_state::SetUploadId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetPartUploadUrlBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -226,14 +229,14 @@ where
 impl<'a, S> GetPartUploadUrlBuilder<'a, S>
 where
     S: get_part_upload_url_state::State,
-    S::UploadId: get_part_upload_url_state::IsSet,
     S::PartNumber: get_part_upload_url_state::IsSet,
+    S::UploadId: get_part_upload_url_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GetPartUploadUrl<'a> {
         GetPartUploadUrl {
-            part_number: self.__unsafe_private_named.0.unwrap(),
-            upload_id: self.__unsafe_private_named.1.unwrap(),
+            part_number: self._fields.0.unwrap(),
+            upload_id: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -243,8 +246,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> GetPartUploadUrl<'a> {
         GetPartUploadUrl {
-            part_number: self.__unsafe_private_named.0.unwrap(),
-            upload_id: self.__unsafe_private_named.1.unwrap(),
+            part_number: self._fields.0.unwrap(),
+            upload_id: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_atcr/hold/get_quota.rs b/crates/jacquard-api/src/io_atcr/hold/get_quota.rs
index c922af99..0f2e4fa9 100644
--- a/crates/jacquard-api/src/io_atcr/hold/get_quota.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/get_quota.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -134,9 +137,9 @@ pub mod get_quota_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetQuotaBuilder<'a, S: get_quota_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetQuota<'a> {
@@ -150,9 +153,9 @@ impl<'a> GetQuotaBuilder<'a, get_quota_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetQuotaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -167,11 +170,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetQuotaBuilder<'a, get_quota_state::SetUserDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetQuotaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -184,7 +187,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetQuota<'a> {
         GetQuota {
-            user_did: self.__unsafe_private_named.0.unwrap(),
+            user_did: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/io_atcr/hold/initiate_upload.rs b/crates/jacquard-api/src/io_atcr/hold/initiate_upload.rs
index c88d2e05..58a5e7f4 100644
--- a/crates/jacquard-api/src/io_atcr/hold/initiate_upload.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/initiate_upload.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/io_atcr/hold/layer.rs b/crates/jacquard-api/src/io_atcr/hold/layer.rs
index 014dc465..beb4622d 100644
--- a/crates/jacquard-api/src/io_atcr/hold/layer.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/layer.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -143,112 +146,112 @@ pub mod layer_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Manifest;
-        type MediaType;
+        type Digest;
         type Size;
         type UserDid;
-        type Digest;
         type CreatedAt;
+        type MediaType;
+        type Manifest;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Manifest = Unset;
-        type MediaType = Unset;
+        type Digest = Unset;
         type Size = Unset;
         type UserDid = Unset;
-        type Digest = Unset;
         type CreatedAt = Unset;
+        type MediaType = Unset;
+        type Manifest = Unset;
     }
-    ///State transition - sets the `manifest` field to Set
-    pub struct SetManifest<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetManifest<S> {}
-    impl<S: State> State for SetManifest<S> {
-        type Manifest = Set<members::manifest>;
-        type MediaType = S::MediaType;
+    ///State transition - sets the `digest` field to Set
+    pub struct SetDigest<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDigest<S> {}
+    impl<S: State> State for SetDigest<S> {
+        type Digest = Set<members::digest>;
         type Size = S::Size;
         type UserDid = S::UserDid;
-        type Digest = S::Digest;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `media_type` field to Set
-    pub struct SetMediaType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMediaType<S> {}
-    impl<S: State> State for SetMediaType<S> {
+        type MediaType = S::MediaType;
         type Manifest = S::Manifest;
-        type MediaType = Set<members::media_type>;
-        type Size = S::Size;
-        type UserDid = S::UserDid;
-        type Digest = S::Digest;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `size` field to Set
     pub struct SetSize<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSize<S> {}
     impl<S: State> State for SetSize<S> {
-        type Manifest = S::Manifest;
-        type MediaType = S::MediaType;
+        type Digest = S::Digest;
         type Size = Set<members::size>;
         type UserDid = S::UserDid;
-        type Digest = S::Digest;
         type CreatedAt = S::CreatedAt;
+        type MediaType = S::MediaType;
+        type Manifest = S::Manifest;
     }
     ///State transition - sets the `user_did` field to Set
     pub struct SetUserDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUserDid<S> {}
     impl<S: State> State for SetUserDid<S> {
-        type Manifest = S::Manifest;
-        type MediaType = S::MediaType;
+        type Digest = S::Digest;
         type Size = S::Size;
         type UserDid = Set<members::user_did>;
-        type Digest = S::Digest;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `digest` field to Set
-    pub struct SetDigest<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDigest<S> {}
-    impl<S: State> State for SetDigest<S> {
-        type Manifest = S::Manifest;
         type MediaType = S::MediaType;
-        type Size = S::Size;
-        type UserDid = S::UserDid;
-        type Digest = Set<members::digest>;
-        type CreatedAt = S::CreatedAt;
+        type Manifest = S::Manifest;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Manifest = S::Manifest;
+        type Digest = S::Digest;
+        type Size = S::Size;
+        type UserDid = S::UserDid;
+        type CreatedAt = Set<members::created_at>;
         type MediaType = S::MediaType;
+        type Manifest = S::Manifest;
+    }
+    ///State transition - sets the `media_type` field to Set
+    pub struct SetMediaType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMediaType<S> {}
+    impl<S: State> State for SetMediaType<S> {
+        type Digest = S::Digest;
         type Size = S::Size;
         type UserDid = S::UserDid;
+        type CreatedAt = S::CreatedAt;
+        type MediaType = Set<members::media_type>;
+        type Manifest = S::Manifest;
+    }
+    ///State transition - sets the `manifest` field to Set
+    pub struct SetManifest<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetManifest<S> {}
+    impl<S: State> State for SetManifest<S> {
         type Digest = S::Digest;
-        type CreatedAt = Set<members::created_at>;
+        type Size = S::Size;
+        type UserDid = S::UserDid;
+        type CreatedAt = S::CreatedAt;
+        type MediaType = S::MediaType;
+        type Manifest = Set<members::manifest>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `manifest` field
-        pub struct manifest(());
-        ///Marker type for the `media_type` field
-        pub struct media_type(());
+        ///Marker type for the `digest` field
+        pub struct digest(());
         ///Marker type for the `size` field
         pub struct size(());
         ///Marker type for the `user_did` field
         pub struct user_did(());
-        ///Marker type for the `digest` field
-        pub struct digest(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `media_type` field
+        pub struct media_type(());
+        ///Marker type for the `manifest` field
+        pub struct manifest(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LayerBuilder<'a, S: layer_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
@@ -256,7 +259,7 @@ pub struct LayerBuilder<'a, S: layer_state::State> {
         Option<i64>,
         Option<Did<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Layer<'a> {
@@ -270,9 +273,9 @@ impl<'a> LayerBuilder<'a, layer_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LayerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -287,11 +290,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LayerBuilder<'a, layer_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LayerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -306,11 +309,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LayerBuilder<'a, layer_state::SetDigest<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LayerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -325,11 +328,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> LayerBuilder<'a, layer_state::SetManifest<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LayerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -344,11 +347,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LayerBuilder<'a, layer_state::SetMediaType<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LayerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -363,11 +366,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> LayerBuilder<'a, layer_state::SetSize<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         LayerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -382,11 +385,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> LayerBuilder<'a, layer_state::SetUserDid<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         LayerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -394,22 +397,22 @@ where
 impl<'a, S> LayerBuilder<'a, S>
 where
     S: layer_state::State,
-    S::Manifest: layer_state::IsSet,
-    S::MediaType: layer_state::IsSet,
+    S::Digest: layer_state::IsSet,
     S::Size: layer_state::IsSet,
     S::UserDid: layer_state::IsSet,
-    S::Digest: layer_state::IsSet,
     S::CreatedAt: layer_state::IsSet,
+    S::MediaType: layer_state::IsSet,
+    S::Manifest: layer_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Layer<'a> {
         Layer {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            digest: self.__unsafe_private_named.1.unwrap(),
-            manifest: self.__unsafe_private_named.2.unwrap(),
-            media_type: self.__unsafe_private_named.3.unwrap(),
-            size: self.__unsafe_private_named.4.unwrap(),
-            user_did: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            digest: self._fields.1.unwrap(),
+            manifest: self._fields.2.unwrap(),
+            media_type: self._fields.3.unwrap(),
+            size: self._fields.4.unwrap(),
+            user_did: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -422,12 +425,12 @@ where
         >,
     ) -> Layer<'a> {
         Layer {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            digest: self.__unsafe_private_named.1.unwrap(),
-            manifest: self.__unsafe_private_named.2.unwrap(),
-            media_type: self.__unsafe_private_named.3.unwrap(),
-            size: self.__unsafe_private_named.4.unwrap(),
-            user_did: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            digest: self._fields.1.unwrap(),
+            manifest: self._fields.2.unwrap(),
+            media_type: self._fields.3.unwrap(),
+            size: self._fields.4.unwrap(),
+            user_did: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_atcr/hold/notify_manifest.rs b/crates/jacquard-api/src/io_atcr/hold/notify_manifest.rs
index 88685def..accd8124 100644
--- a/crates/jacquard-api/src/io_atcr/hold/notify_manifest.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/notify_manifest.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -830,8 +833,8 @@ pub mod notify_manifest_state {
 
 /// Builder for constructing an instance of this type
 pub struct NotifyManifestBuilder<'a, S: notify_manifest_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<notify_manifest::ManifestInfo<'a>>,
         Option<CowStr<'a>>,
         Option<NotifyManifestOperation<'a>>,
@@ -839,7 +842,7 @@ pub struct NotifyManifestBuilder<'a, S: notify_manifest_state::State> {
         Option<CowStr<'a>>,
         Option<Did<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> NotifyManifest<'a> {
@@ -853,9 +856,9 @@ impl<'a> NotifyManifestBuilder<'a, notify_manifest_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NotifyManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -870,11 +873,11 @@ where
         mut self,
         value: impl Into<notify_manifest::ManifestInfo<'a>>,
     ) -> NotifyManifestBuilder<'a, notify_manifest_state::SetManifest<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NotifyManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -889,11 +892,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> NotifyManifestBuilder<'a, notify_manifest_state::SetManifestDigest<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         NotifyManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -904,7 +907,7 @@ impl<'a, S: notify_manifest_state::State> NotifyManifestBuilder<'a, S> {
         mut self,
         value: impl Into<Option<NotifyManifestOperation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `operation` field to an Option value (optional)
@@ -912,7 +915,7 @@ impl<'a, S: notify_manifest_state::State> NotifyManifestBuilder<'a, S> {
         mut self,
         value: Option<NotifyManifestOperation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -927,11 +930,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> NotifyManifestBuilder<'a, notify_manifest_state::SetRepository<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         NotifyManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -939,12 +942,12 @@ where
 impl<'a, S: notify_manifest_state::State> NotifyManifestBuilder<'a, S> {
     /// Set the `tag` field (optional)
     pub fn tag(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tag` field to an Option value (optional)
     pub fn maybe_tag(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -959,11 +962,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> NotifyManifestBuilder<'a, notify_manifest_state::SetUserDid<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         NotifyManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -979,12 +982,12 @@ where
     /// Build the final struct
     pub fn build(self) -> NotifyManifest<'a> {
         NotifyManifest {
-            manifest: self.__unsafe_private_named.0.unwrap(),
-            manifest_digest: self.__unsafe_private_named.1.unwrap(),
-            operation: self.__unsafe_private_named.2,
-            repository: self.__unsafe_private_named.3.unwrap(),
-            tag: self.__unsafe_private_named.4,
-            user_did: self.__unsafe_private_named.5.unwrap(),
+            manifest: self._fields.0.unwrap(),
+            manifest_digest: self._fields.1.unwrap(),
+            operation: self._fields.2,
+            repository: self._fields.3.unwrap(),
+            tag: self._fields.4,
+            user_did: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -997,12 +1000,12 @@ where
         >,
     ) -> NotifyManifest<'a> {
         NotifyManifest {
-            manifest: self.__unsafe_private_named.0.unwrap(),
-            manifest_digest: self.__unsafe_private_named.1.unwrap(),
-            operation: self.__unsafe_private_named.2,
-            repository: self.__unsafe_private_named.3.unwrap(),
-            tag: self.__unsafe_private_named.4,
-            user_did: self.__unsafe_private_named.5.unwrap(),
+            manifest: self._fields.0.unwrap(),
+            manifest_digest: self._fields.1.unwrap(),
+            operation: self._fields.2,
+            repository: self._fields.3.unwrap(),
+            tag: self._fields.4,
+            user_did: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_atcr/hold/request_crew.rs b/crates/jacquard-api/src/io_atcr/hold/request_crew.rs
index 3cab65dc..db74309a 100644
--- a/crates/jacquard-api/src/io_atcr/hold/request_crew.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/request_crew.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{AtUri, Cid};
diff --git a/crates/jacquard-api/src/io_atcr/hold/scan.rs b/crates/jacquard-api/src/io_atcr/hold/scan.rs
index ee9f8f7b..f06fe8a1 100644
--- a/crates/jacquard-api/src/io_atcr/hold/scan.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/scan.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -265,211 +268,211 @@ pub mod scan_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type High;
-        type Manifest;
-        type ScannedAt;
-        type UserDid;
-        type Critical;
         type Low;
         type Medium;
-        type Total;
         type ScannerVersion;
+        type Critical;
+        type Manifest;
+        type UserDid;
+        type Total;
         type Repository;
+        type ScannedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type High = Unset;
-        type Manifest = Unset;
-        type ScannedAt = Unset;
-        type UserDid = Unset;
-        type Critical = Unset;
         type Low = Unset;
         type Medium = Unset;
-        type Total = Unset;
         type ScannerVersion = Unset;
+        type Critical = Unset;
+        type Manifest = Unset;
+        type UserDid = Unset;
+        type Total = Unset;
         type Repository = Unset;
+        type ScannedAt = Unset;
     }
     ///State transition - sets the `high` field to Set
     pub struct SetHigh<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHigh<S> {}
     impl<S: State> State for SetHigh<S> {
         type High = Set<members::high>;
-        type Manifest = S::Manifest;
-        type ScannedAt = S::ScannedAt;
-        type UserDid = S::UserDid;
-        type Critical = S::Critical;
         type Low = S::Low;
         type Medium = S::Medium;
-        type Total = S::Total;
         type ScannerVersion = S::ScannerVersion;
+        type Critical = S::Critical;
+        type Manifest = S::Manifest;
+        type UserDid = S::UserDid;
+        type Total = S::Total;
         type Repository = S::Repository;
+        type ScannedAt = S::ScannedAt;
     }
-    ///State transition - sets the `manifest` field to Set
-    pub struct SetManifest<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetManifest<S> {}
-    impl<S: State> State for SetManifest<S> {
+    ///State transition - sets the `low` field to Set
+    pub struct SetLow<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLow<S> {}
+    impl<S: State> State for SetLow<S> {
         type High = S::High;
-        type Manifest = Set<members::manifest>;
-        type ScannedAt = S::ScannedAt;
-        type UserDid = S::UserDid;
-        type Critical = S::Critical;
-        type Low = S::Low;
+        type Low = Set<members::low>;
         type Medium = S::Medium;
-        type Total = S::Total;
         type ScannerVersion = S::ScannerVersion;
+        type Critical = S::Critical;
+        type Manifest = S::Manifest;
+        type UserDid = S::UserDid;
+        type Total = S::Total;
         type Repository = S::Repository;
+        type ScannedAt = S::ScannedAt;
     }
-    ///State transition - sets the `scanned_at` field to Set
-    pub struct SetScannedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetScannedAt<S> {}
-    impl<S: State> State for SetScannedAt<S> {
+    ///State transition - sets the `medium` field to Set
+    pub struct SetMedium<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMedium<S> {}
+    impl<S: State> State for SetMedium<S> {
         type High = S::High;
+        type Low = S::Low;
+        type Medium = Set<members::medium>;
+        type ScannerVersion = S::ScannerVersion;
+        type Critical = S::Critical;
         type Manifest = S::Manifest;
-        type ScannedAt = Set<members::scanned_at>;
         type UserDid = S::UserDid;
-        type Critical = S::Critical;
-        type Low = S::Low;
-        type Medium = S::Medium;
         type Total = S::Total;
-        type ScannerVersion = S::ScannerVersion;
         type Repository = S::Repository;
+        type ScannedAt = S::ScannedAt;
     }
-    ///State transition - sets the `user_did` field to Set
-    pub struct SetUserDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUserDid<S> {}
-    impl<S: State> State for SetUserDid<S> {
+    ///State transition - sets the `scanner_version` field to Set
+    pub struct SetScannerVersion<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetScannerVersion<S> {}
+    impl<S: State> State for SetScannerVersion<S> {
         type High = S::High;
-        type Manifest = S::Manifest;
-        type ScannedAt = S::ScannedAt;
-        type UserDid = Set<members::user_did>;
-        type Critical = S::Critical;
         type Low = S::Low;
         type Medium = S::Medium;
+        type ScannerVersion = Set<members::scanner_version>;
+        type Critical = S::Critical;
+        type Manifest = S::Manifest;
+        type UserDid = S::UserDid;
         type Total = S::Total;
-        type ScannerVersion = S::ScannerVersion;
         type Repository = S::Repository;
+        type ScannedAt = S::ScannedAt;
     }
     ///State transition - sets the `critical` field to Set
     pub struct SetCritical<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCritical<S> {}
     impl<S: State> State for SetCritical<S> {
         type High = S::High;
-        type Manifest = S::Manifest;
-        type ScannedAt = S::ScannedAt;
-        type UserDid = S::UserDid;
-        type Critical = Set<members::critical>;
         type Low = S::Low;
         type Medium = S::Medium;
-        type Total = S::Total;
         type ScannerVersion = S::ScannerVersion;
+        type Critical = Set<members::critical>;
+        type Manifest = S::Manifest;
+        type UserDid = S::UserDid;
+        type Total = S::Total;
         type Repository = S::Repository;
+        type ScannedAt = S::ScannedAt;
     }
-    ///State transition - sets the `low` field to Set
-    pub struct SetLow<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLow<S> {}
-    impl<S: State> State for SetLow<S> {
+    ///State transition - sets the `manifest` field to Set
+    pub struct SetManifest<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetManifest<S> {}
+    impl<S: State> State for SetManifest<S> {
         type High = S::High;
-        type Manifest = S::Manifest;
-        type ScannedAt = S::ScannedAt;
-        type UserDid = S::UserDid;
-        type Critical = S::Critical;
-        type Low = Set<members::low>;
+        type Low = S::Low;
         type Medium = S::Medium;
-        type Total = S::Total;
         type ScannerVersion = S::ScannerVersion;
+        type Critical = S::Critical;
+        type Manifest = Set<members::manifest>;
+        type UserDid = S::UserDid;
+        type Total = S::Total;
         type Repository = S::Repository;
+        type ScannedAt = S::ScannedAt;
     }
-    ///State transition - sets the `medium` field to Set
-    pub struct SetMedium<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMedium<S> {}
-    impl<S: State> State for SetMedium<S> {
+    ///State transition - sets the `user_did` field to Set
+    pub struct SetUserDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUserDid<S> {}
+    impl<S: State> State for SetUserDid<S> {
         type High = S::High;
-        type Manifest = S::Manifest;
-        type ScannedAt = S::ScannedAt;
-        type UserDid = S::UserDid;
-        type Critical = S::Critical;
         type Low = S::Low;
-        type Medium = Set<members::medium>;
-        type Total = S::Total;
+        type Medium = S::Medium;
         type ScannerVersion = S::ScannerVersion;
+        type Critical = S::Critical;
+        type Manifest = S::Manifest;
+        type UserDid = Set<members::user_did>;
+        type Total = S::Total;
         type Repository = S::Repository;
+        type ScannedAt = S::ScannedAt;
     }
     ///State transition - sets the `total` field to Set
     pub struct SetTotal<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTotal<S> {}
     impl<S: State> State for SetTotal<S> {
         type High = S::High;
-        type Manifest = S::Manifest;
-        type ScannedAt = S::ScannedAt;
-        type UserDid = S::UserDid;
-        type Critical = S::Critical;
         type Low = S::Low;
         type Medium = S::Medium;
-        type Total = Set<members::total>;
         type ScannerVersion = S::ScannerVersion;
-        type Repository = S::Repository;
-    }
-    ///State transition - sets the `scanner_version` field to Set
-    pub struct SetScannerVersion<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetScannerVersion<S> {}
-    impl<S: State> State for SetScannerVersion<S> {
-        type High = S::High;
+        type Critical = S::Critical;
         type Manifest = S::Manifest;
-        type ScannedAt = S::ScannedAt;
         type UserDid = S::UserDid;
-        type Critical = S::Critical;
-        type Low = S::Low;
-        type Medium = S::Medium;
-        type Total = S::Total;
-        type ScannerVersion = Set<members::scanner_version>;
+        type Total = Set<members::total>;
         type Repository = S::Repository;
+        type ScannedAt = S::ScannedAt;
     }
     ///State transition - sets the `repository` field to Set
     pub struct SetRepository<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepository<S> {}
     impl<S: State> State for SetRepository<S> {
         type High = S::High;
+        type Low = S::Low;
+        type Medium = S::Medium;
+        type ScannerVersion = S::ScannerVersion;
+        type Critical = S::Critical;
         type Manifest = S::Manifest;
-        type ScannedAt = S::ScannedAt;
         type UserDid = S::UserDid;
-        type Critical = S::Critical;
+        type Total = S::Total;
+        type Repository = Set<members::repository>;
+        type ScannedAt = S::ScannedAt;
+    }
+    ///State transition - sets the `scanned_at` field to Set
+    pub struct SetScannedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetScannedAt<S> {}
+    impl<S: State> State for SetScannedAt<S> {
+        type High = S::High;
         type Low = S::Low;
         type Medium = S::Medium;
-        type Total = S::Total;
         type ScannerVersion = S::ScannerVersion;
-        type Repository = Set<members::repository>;
+        type Critical = S::Critical;
+        type Manifest = S::Manifest;
+        type UserDid = S::UserDid;
+        type Total = S::Total;
+        type Repository = S::Repository;
+        type ScannedAt = Set<members::scanned_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `high` field
         pub struct high(());
-        ///Marker type for the `manifest` field
-        pub struct manifest(());
-        ///Marker type for the `scanned_at` field
-        pub struct scanned_at(());
-        ///Marker type for the `user_did` field
-        pub struct user_did(());
-        ///Marker type for the `critical` field
-        pub struct critical(());
         ///Marker type for the `low` field
         pub struct low(());
         ///Marker type for the `medium` field
         pub struct medium(());
-        ///Marker type for the `total` field
-        pub struct total(());
         ///Marker type for the `scanner_version` field
         pub struct scanner_version(());
+        ///Marker type for the `critical` field
+        pub struct critical(());
+        ///Marker type for the `manifest` field
+        pub struct manifest(());
+        ///Marker type for the `user_did` field
+        pub struct user_did(());
+        ///Marker type for the `total` field
+        pub struct total(());
         ///Marker type for the `repository` field
         pub struct repository(());
+        ///Marker type for the `scanned_at` field
+        pub struct scanned_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ScanBuilder<'a, S: scan_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<i64>,
         Option<i64>,
@@ -483,7 +486,7 @@ pub struct ScanBuilder<'a, S: scan_state::State> {
         Option<Did<'a>>,
         Option<BlobRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Scan<'a> {
@@ -497,8 +500,8 @@ impl<'a> ScanBuilder<'a, scan_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ScanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -512,7 +515,7 @@ impl<'a> ScanBuilder<'a, scan_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -527,11 +530,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ScanBuilder<'a, scan_state::SetCritical<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ScanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -546,11 +549,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ScanBuilder<'a, scan_state::SetHigh<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ScanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -565,11 +568,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ScanBuilder<'a, scan_state::SetLow<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ScanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -584,11 +587,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ScanBuilder<'a, scan_state::SetManifest<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ScanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -603,11 +606,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ScanBuilder<'a, scan_state::SetMedium<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ScanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -622,11 +625,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ScanBuilder<'a, scan_state::SetRepository<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ScanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -634,12 +637,12 @@ where
 impl<'a, S: scan_state::State> ScanBuilder<'a, S> {
     /// Set the `sbomBlob` field (optional)
     pub fn sbom_blob(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `sbomBlob` field to an Option value (optional)
     pub fn maybe_sbom_blob(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -654,11 +657,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ScanBuilder<'a, scan_state::SetScannedAt<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ScanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -673,11 +676,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ScanBuilder<'a, scan_state::SetScannerVersion<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         ScanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -692,11 +695,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ScanBuilder<'a, scan_state::SetTotal<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ScanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -711,11 +714,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ScanBuilder<'a, scan_state::SetUserDid<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         ScanBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -723,12 +726,12 @@ where
 impl<'a, S: scan_state::State> ScanBuilder<'a, S> {
     /// Set the `vulnReportBlob` field (optional)
     pub fn vuln_report_blob(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `vulnReportBlob` field to an Option value (optional)
     pub fn maybe_vuln_report_blob(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -737,31 +740,31 @@ impl<'a, S> ScanBuilder<'a, S>
 where
     S: scan_state::State,
     S::High: scan_state::IsSet,
-    S::Manifest: scan_state::IsSet,
-    S::ScannedAt: scan_state::IsSet,
-    S::UserDid: scan_state::IsSet,
-    S::Critical: scan_state::IsSet,
     S::Low: scan_state::IsSet,
     S::Medium: scan_state::IsSet,
-    S::Total: scan_state::IsSet,
     S::ScannerVersion: scan_state::IsSet,
+    S::Critical: scan_state::IsSet,
+    S::Manifest: scan_state::IsSet,
+    S::UserDid: scan_state::IsSet,
+    S::Total: scan_state::IsSet,
     S::Repository: scan_state::IsSet,
+    S::ScannedAt: scan_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Scan<'a> {
         Scan {
-            critical: self.__unsafe_private_named.0.unwrap(),
-            high: self.__unsafe_private_named.1.unwrap(),
-            low: self.__unsafe_private_named.2.unwrap(),
-            manifest: self.__unsafe_private_named.3.unwrap(),
-            medium: self.__unsafe_private_named.4.unwrap(),
-            repository: self.__unsafe_private_named.5.unwrap(),
-            sbom_blob: self.__unsafe_private_named.6,
-            scanned_at: self.__unsafe_private_named.7.unwrap(),
-            scanner_version: self.__unsafe_private_named.8.unwrap(),
-            total: self.__unsafe_private_named.9.unwrap(),
-            user_did: self.__unsafe_private_named.10.unwrap(),
-            vuln_report_blob: self.__unsafe_private_named.11,
+            critical: self._fields.0.unwrap(),
+            high: self._fields.1.unwrap(),
+            low: self._fields.2.unwrap(),
+            manifest: self._fields.3.unwrap(),
+            medium: self._fields.4.unwrap(),
+            repository: self._fields.5.unwrap(),
+            sbom_blob: self._fields.6,
+            scanned_at: self._fields.7.unwrap(),
+            scanner_version: self._fields.8.unwrap(),
+            total: self._fields.9.unwrap(),
+            user_did: self._fields.10.unwrap(),
+            vuln_report_blob: self._fields.11,
             extra_data: Default::default(),
         }
     }
@@ -774,18 +777,18 @@ where
         >,
     ) -> Scan<'a> {
         Scan {
-            critical: self.__unsafe_private_named.0.unwrap(),
-            high: self.__unsafe_private_named.1.unwrap(),
-            low: self.__unsafe_private_named.2.unwrap(),
-            manifest: self.__unsafe_private_named.3.unwrap(),
-            medium: self.__unsafe_private_named.4.unwrap(),
-            repository: self.__unsafe_private_named.5.unwrap(),
-            sbom_blob: self.__unsafe_private_named.6,
-            scanned_at: self.__unsafe_private_named.7.unwrap(),
-            scanner_version: self.__unsafe_private_named.8.unwrap(),
-            total: self.__unsafe_private_named.9.unwrap(),
-            user_did: self.__unsafe_private_named.10.unwrap(),
-            vuln_report_blob: self.__unsafe_private_named.11,
+            critical: self._fields.0.unwrap(),
+            high: self._fields.1.unwrap(),
+            low: self._fields.2.unwrap(),
+            manifest: self._fields.3.unwrap(),
+            medium: self._fields.4.unwrap(),
+            repository: self._fields.5.unwrap(),
+            sbom_blob: self._fields.6,
+            scanned_at: self._fields.7.unwrap(),
+            scanner_version: self._fields.8.unwrap(),
+            total: self._fields.9.unwrap(),
+            user_did: self._fields.10.unwrap(),
+            vuln_report_blob: self._fields.11,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_atcr/hold/set_stats.rs b/crates/jacquard-api/src/io_atcr/hold/set_stats.rs
index bd2b09ad..829f98e2 100644
--- a/crates/jacquard-api/src/io_atcr/hold/set_stats.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/set_stats.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Datetime};
@@ -128,44 +131,44 @@ pub mod set_stats_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type OwnerDid;
         type Repository;
+        type OwnerDid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type OwnerDid = Unset;
         type Repository = Unset;
-    }
-    ///State transition - sets the `owner_did` field to Set
-    pub struct SetOwnerDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetOwnerDid<S> {}
-    impl<S: State> State for SetOwnerDid<S> {
-        type OwnerDid = Set<members::owner_did>;
-        type Repository = S::Repository;
+        type OwnerDid = Unset;
     }
     ///State transition - sets the `repository` field to Set
     pub struct SetRepository<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepository<S> {}
     impl<S: State> State for SetRepository<S> {
-        type OwnerDid = S::OwnerDid;
         type Repository = Set<members::repository>;
+        type OwnerDid = S::OwnerDid;
+    }
+    ///State transition - sets the `owner_did` field to Set
+    pub struct SetOwnerDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetOwnerDid<S> {}
+    impl<S: State> State for SetOwnerDid<S> {
+        type Repository = S::Repository;
+        type OwnerDid = Set<members::owner_did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `owner_did` field
-        pub struct owner_did(());
         ///Marker type for the `repository` field
         pub struct repository(());
+        ///Marker type for the `owner_did` field
+        pub struct owner_did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SetStatsBuilder<'a, S: set_stats_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<Did<'a>>,
@@ -173,7 +176,7 @@ pub struct SetStatsBuilder<'a, S: set_stats_state::State> {
         Option<i64>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SetStats<'a> {
@@ -187,9 +190,9 @@ impl<'a> SetStatsBuilder<'a, set_stats_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SetStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,12 +200,12 @@ impl<'a> SetStatsBuilder<'a, set_stats_state::Empty> {
 impl<'a, S: set_stats_state::State> SetStatsBuilder<'a, S> {
     /// Set the `lastPull` field (optional)
     pub fn last_pull(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `lastPull` field to an Option value (optional)
     pub fn maybe_last_pull(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -210,12 +213,12 @@ impl<'a, S: set_stats_state::State> SetStatsBuilder<'a, S> {
 impl<'a, S: set_stats_state::State> SetStatsBuilder<'a, S> {
     /// Set the `lastPush` field (optional)
     pub fn last_push(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `lastPush` field to an Option value (optional)
     pub fn maybe_last_push(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -230,11 +233,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> SetStatsBuilder<'a, set_stats_state::SetOwnerDid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SetStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -242,12 +245,12 @@ where
 impl<'a, S: set_stats_state::State> SetStatsBuilder<'a, S> {
     /// Set the `pullCount` field (optional)
     pub fn pull_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `pullCount` field to an Option value (optional)
     pub fn maybe_pull_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -255,12 +258,12 @@ impl<'a, S: set_stats_state::State> SetStatsBuilder<'a, S> {
 impl<'a, S: set_stats_state::State> SetStatsBuilder<'a, S> {
     /// Set the `pushCount` field (optional)
     pub fn push_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `pushCount` field to an Option value (optional)
     pub fn maybe_push_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -275,11 +278,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SetStatsBuilder<'a, set_stats_state::SetRepository<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         SetStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -287,18 +290,18 @@ where
 impl<'a, S> SetStatsBuilder<'a, S>
 where
     S: set_stats_state::State,
-    S::OwnerDid: set_stats_state::IsSet,
     S::Repository: set_stats_state::IsSet,
+    S::OwnerDid: set_stats_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SetStats<'a> {
         SetStats {
-            last_pull: self.__unsafe_private_named.0,
-            last_push: self.__unsafe_private_named.1,
-            owner_did: self.__unsafe_private_named.2.unwrap(),
-            pull_count: self.__unsafe_private_named.3,
-            push_count: self.__unsafe_private_named.4,
-            repository: self.__unsafe_private_named.5.unwrap(),
+            last_pull: self._fields.0,
+            last_push: self._fields.1,
+            owner_did: self._fields.2.unwrap(),
+            pull_count: self._fields.3,
+            push_count: self._fields.4,
+            repository: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -311,12 +314,12 @@ where
         >,
     ) -> SetStats<'a> {
         SetStats {
-            last_pull: self.__unsafe_private_named.0,
-            last_push: self.__unsafe_private_named.1,
-            owner_did: self.__unsafe_private_named.2.unwrap(),
-            pull_count: self.__unsafe_private_named.3,
-            push_count: self.__unsafe_private_named.4,
-            repository: self.__unsafe_private_named.5.unwrap(),
+            last_pull: self._fields.0,
+            last_push: self._fields.1,
+            owner_did: self._fields.2.unwrap(),
+            pull_count: self._fields.3,
+            push_count: self._fields.4,
+            repository: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_atcr/hold/stats.rs b/crates/jacquard-api/src/io_atcr/hold/stats.rs
index 6d9f24f6..1f92a370 100644
--- a/crates/jacquard-api/src/io_atcr/hold/stats.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/stats.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -154,83 +157,83 @@ pub mod stats_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type PushCount;
         type UpdatedAt;
         type Repository;
         type PullCount;
-        type PushCount;
         type OwnerDid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type PushCount = Unset;
         type UpdatedAt = Unset;
         type Repository = Unset;
         type PullCount = Unset;
-        type PushCount = Unset;
         type OwnerDid = Unset;
     }
+    ///State transition - sets the `push_count` field to Set
+    pub struct SetPushCount<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPushCount<S> {}
+    impl<S: State> State for SetPushCount<S> {
+        type PushCount = Set<members::push_count>;
+        type UpdatedAt = S::UpdatedAt;
+        type Repository = S::Repository;
+        type PullCount = S::PullCount;
+        type OwnerDid = S::OwnerDid;
+    }
     ///State transition - sets the `updated_at` field to Set
     pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
     impl<S: State> State for SetUpdatedAt<S> {
+        type PushCount = S::PushCount;
         type UpdatedAt = Set<members::updated_at>;
         type Repository = S::Repository;
         type PullCount = S::PullCount;
-        type PushCount = S::PushCount;
         type OwnerDid = S::OwnerDid;
     }
     ///State transition - sets the `repository` field to Set
     pub struct SetRepository<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepository<S> {}
     impl<S: State> State for SetRepository<S> {
+        type PushCount = S::PushCount;
         type UpdatedAt = S::UpdatedAt;
         type Repository = Set<members::repository>;
         type PullCount = S::PullCount;
-        type PushCount = S::PushCount;
         type OwnerDid = S::OwnerDid;
     }
     ///State transition - sets the `pull_count` field to Set
     pub struct SetPullCount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPullCount<S> {}
     impl<S: State> State for SetPullCount<S> {
-        type UpdatedAt = S::UpdatedAt;
-        type Repository = S::Repository;
-        type PullCount = Set<members::pull_count>;
         type PushCount = S::PushCount;
-        type OwnerDid = S::OwnerDid;
-    }
-    ///State transition - sets the `push_count` field to Set
-    pub struct SetPushCount<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPushCount<S> {}
-    impl<S: State> State for SetPushCount<S> {
         type UpdatedAt = S::UpdatedAt;
         type Repository = S::Repository;
-        type PullCount = S::PullCount;
-        type PushCount = Set<members::push_count>;
+        type PullCount = Set<members::pull_count>;
         type OwnerDid = S::OwnerDid;
     }
     ///State transition - sets the `owner_did` field to Set
     pub struct SetOwnerDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetOwnerDid<S> {}
     impl<S: State> State for SetOwnerDid<S> {
+        type PushCount = S::PushCount;
         type UpdatedAt = S::UpdatedAt;
         type Repository = S::Repository;
         type PullCount = S::PullCount;
-        type PushCount = S::PushCount;
         type OwnerDid = Set<members::owner_did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `push_count` field
+        pub struct push_count(());
         ///Marker type for the `updated_at` field
         pub struct updated_at(());
         ///Marker type for the `repository` field
         pub struct repository(());
         ///Marker type for the `pull_count` field
         pub struct pull_count(());
-        ///Marker type for the `push_count` field
-        pub struct push_count(());
         ///Marker type for the `owner_did` field
         pub struct owner_did(());
     }
@@ -238,8 +241,8 @@ pub mod stats_state {
 
 /// Builder for constructing an instance of this type
 pub struct StatsBuilder<'a, S: stats_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<Did<'a>>,
@@ -248,7 +251,7 @@ pub struct StatsBuilder<'a, S: stats_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Stats<'a> {
@@ -262,9 +265,9 @@ impl<'a> StatsBuilder<'a, stats_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -272,12 +275,12 @@ impl<'a> StatsBuilder<'a, stats_state::Empty> {
 impl<'a, S: stats_state::State> StatsBuilder<'a, S> {
     /// Set the `lastPull` field (optional)
     pub fn last_pull(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `lastPull` field to an Option value (optional)
     pub fn maybe_last_pull(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -285,12 +288,12 @@ impl<'a, S: stats_state::State> StatsBuilder<'a, S> {
 impl<'a, S: stats_state::State> StatsBuilder<'a, S> {
     /// Set the `lastPush` field (optional)
     pub fn last_push(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `lastPush` field to an Option value (optional)
     pub fn maybe_last_push(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -305,11 +308,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> StatsBuilder<'a, stats_state::SetOwnerDid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -324,11 +327,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> StatsBuilder<'a, stats_state::SetPullCount<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -343,11 +346,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> StatsBuilder<'a, stats_state::SetPushCount<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -362,11 +365,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> StatsBuilder<'a, stats_state::SetRepository<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -381,11 +384,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StatsBuilder<'a, stats_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -393,22 +396,22 @@ where
 impl<'a, S> StatsBuilder<'a, S>
 where
     S: stats_state::State,
+    S::PushCount: stats_state::IsSet,
     S::UpdatedAt: stats_state::IsSet,
     S::Repository: stats_state::IsSet,
     S::PullCount: stats_state::IsSet,
-    S::PushCount: stats_state::IsSet,
     S::OwnerDid: stats_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Stats<'a> {
         Stats {
-            last_pull: self.__unsafe_private_named.0,
-            last_push: self.__unsafe_private_named.1,
-            owner_did: self.__unsafe_private_named.2.unwrap(),
-            pull_count: self.__unsafe_private_named.3.unwrap(),
-            push_count: self.__unsafe_private_named.4.unwrap(),
-            repository: self.__unsafe_private_named.5.unwrap(),
-            updated_at: self.__unsafe_private_named.6.unwrap(),
+            last_pull: self._fields.0,
+            last_push: self._fields.1,
+            owner_did: self._fields.2.unwrap(),
+            pull_count: self._fields.3.unwrap(),
+            push_count: self._fields.4.unwrap(),
+            repository: self._fields.5.unwrap(),
+            updated_at: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -421,13 +424,13 @@ where
         >,
     ) -> Stats<'a> {
         Stats {
-            last_pull: self.__unsafe_private_named.0,
-            last_push: self.__unsafe_private_named.1,
-            owner_did: self.__unsafe_private_named.2.unwrap(),
-            pull_count: self.__unsafe_private_named.3.unwrap(),
-            push_count: self.__unsafe_private_named.4.unwrap(),
-            repository: self.__unsafe_private_named.5.unwrap(),
-            updated_at: self.__unsafe_private_named.6.unwrap(),
+            last_pull: self._fields.0,
+            last_push: self._fields.1,
+            owner_did: self._fields.2.unwrap(),
+            pull_count: self._fields.3.unwrap(),
+            push_count: self._fields.4.unwrap(),
+            repository: self._fields.5.unwrap(),
+            updated_at: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_atcr/hold/subscribe_scan_jobs.rs b/crates/jacquard-api/src/io_atcr/hold/subscribe_scan_jobs.rs
index e6d87af9..30fc5ddc 100644
--- a/crates/jacquard-api/src/io_atcr/hold/subscribe_scan_jobs.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/subscribe_scan_jobs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -418,8 +421,8 @@ pub mod subscribe_scan_jobs_state {
 
 /// Builder for constructing an instance of this type
 pub struct SubscribeScanJobsBuilder<S: subscribe_scan_jobs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
 }
 
 impl SubscribeScanJobs {
@@ -433,8 +436,8 @@ impl SubscribeScanJobsBuilder<subscribe_scan_jobs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubscribeScanJobsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -442,12 +445,12 @@ impl SubscribeScanJobsBuilder<subscribe_scan_jobs_state::Empty> {
 impl<S: subscribe_scan_jobs_state::State> SubscribeScanJobsBuilder<S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -459,7 +462,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SubscribeScanJobs {
         SubscribeScanJobs {
-            cursor: self.__unsafe_private_named.0,
+            cursor: self._fields.0,
         }
     }
 }
@@ -474,134 +477,134 @@ pub mod scan_job_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Repository;
-        type UserDid;
-        type HoldDid;
         type HoldEndpoint;
+        type UserDid;
+        type Seq;
+        type Repository;
         type Type;
         type Digest;
-        type Seq;
+        type HoldDid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Repository = Unset;
-        type UserDid = Unset;
-        type HoldDid = Unset;
         type HoldEndpoint = Unset;
+        type UserDid = Unset;
+        type Seq = Unset;
+        type Repository = Unset;
         type Type = Unset;
         type Digest = Unset;
-        type Seq = Unset;
+        type HoldDid = Unset;
     }
-    ///State transition - sets the `repository` field to Set
-    pub struct SetRepository<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepository<S> {}
-    impl<S: State> State for SetRepository<S> {
-        type Repository = Set<members::repository>;
+    ///State transition - sets the `hold_endpoint` field to Set
+    pub struct SetHoldEndpoint<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHoldEndpoint<S> {}
+    impl<S: State> State for SetHoldEndpoint<S> {
+        type HoldEndpoint = Set<members::hold_endpoint>;
         type UserDid = S::UserDid;
-        type HoldDid = S::HoldDid;
-        type HoldEndpoint = S::HoldEndpoint;
+        type Seq = S::Seq;
+        type Repository = S::Repository;
         type Type = S::Type;
         type Digest = S::Digest;
-        type Seq = S::Seq;
+        type HoldDid = S::HoldDid;
     }
     ///State transition - sets the `user_did` field to Set
     pub struct SetUserDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUserDid<S> {}
     impl<S: State> State for SetUserDid<S> {
-        type Repository = S::Repository;
-        type UserDid = Set<members::user_did>;
-        type HoldDid = S::HoldDid;
         type HoldEndpoint = S::HoldEndpoint;
+        type UserDid = Set<members::user_did>;
+        type Seq = S::Seq;
+        type Repository = S::Repository;
         type Type = S::Type;
         type Digest = S::Digest;
-        type Seq = S::Seq;
+        type HoldDid = S::HoldDid;
     }
-    ///State transition - sets the `hold_did` field to Set
-    pub struct SetHoldDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHoldDid<S> {}
-    impl<S: State> State for SetHoldDid<S> {
-        type Repository = S::Repository;
-        type UserDid = S::UserDid;
-        type HoldDid = Set<members::hold_did>;
+    ///State transition - sets the `seq` field to Set
+    pub struct SetSeq<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSeq<S> {}
+    impl<S: State> State for SetSeq<S> {
         type HoldEndpoint = S::HoldEndpoint;
+        type UserDid = S::UserDid;
+        type Seq = Set<members::seq>;
+        type Repository = S::Repository;
         type Type = S::Type;
         type Digest = S::Digest;
-        type Seq = S::Seq;
+        type HoldDid = S::HoldDid;
     }
-    ///State transition - sets the `hold_endpoint` field to Set
-    pub struct SetHoldEndpoint<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHoldEndpoint<S> {}
-    impl<S: State> State for SetHoldEndpoint<S> {
-        type Repository = S::Repository;
+    ///State transition - sets the `repository` field to Set
+    pub struct SetRepository<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepository<S> {}
+    impl<S: State> State for SetRepository<S> {
+        type HoldEndpoint = S::HoldEndpoint;
         type UserDid = S::UserDid;
-        type HoldDid = S::HoldDid;
-        type HoldEndpoint = Set<members::hold_endpoint>;
+        type Seq = S::Seq;
+        type Repository = Set<members::repository>;
         type Type = S::Type;
         type Digest = S::Digest;
-        type Seq = S::Seq;
+        type HoldDid = S::HoldDid;
     }
     ///State transition - sets the `type` field to Set
     pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetType<S> {}
     impl<S: State> State for SetType<S> {
-        type Repository = S::Repository;
-        type UserDid = S::UserDid;
-        type HoldDid = S::HoldDid;
         type HoldEndpoint = S::HoldEndpoint;
+        type UserDid = S::UserDid;
+        type Seq = S::Seq;
+        type Repository = S::Repository;
         type Type = Set<members::r#type>;
         type Digest = S::Digest;
-        type Seq = S::Seq;
+        type HoldDid = S::HoldDid;
     }
     ///State transition - sets the `digest` field to Set
     pub struct SetDigest<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDigest<S> {}
     impl<S: State> State for SetDigest<S> {
-        type Repository = S::Repository;
-        type UserDid = S::UserDid;
-        type HoldDid = S::HoldDid;
         type HoldEndpoint = S::HoldEndpoint;
-        type Type = S::Type;
-        type Digest = Set<members::digest>;
+        type UserDid = S::UserDid;
         type Seq = S::Seq;
-    }
-    ///State transition - sets the `seq` field to Set
-    pub struct SetSeq<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSeq<S> {}
-    impl<S: State> State for SetSeq<S> {
         type Repository = S::Repository;
-        type UserDid = S::UserDid;
+        type Type = S::Type;
+        type Digest = Set<members::digest>;
         type HoldDid = S::HoldDid;
+    }
+    ///State transition - sets the `hold_did` field to Set
+    pub struct SetHoldDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHoldDid<S> {}
+    impl<S: State> State for SetHoldDid<S> {
         type HoldEndpoint = S::HoldEndpoint;
+        type UserDid = S::UserDid;
+        type Seq = S::Seq;
+        type Repository = S::Repository;
         type Type = S::Type;
         type Digest = S::Digest;
-        type Seq = Set<members::seq>;
+        type HoldDid = Set<members::hold_did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `repository` field
-        pub struct repository(());
-        ///Marker type for the `user_did` field
-        pub struct user_did(());
-        ///Marker type for the `hold_did` field
-        pub struct hold_did(());
         ///Marker type for the `hold_endpoint` field
         pub struct hold_endpoint(());
+        ///Marker type for the `user_did` field
+        pub struct user_did(());
+        ///Marker type for the `seq` field
+        pub struct seq(());
+        ///Marker type for the `repository` field
+        pub struct repository(());
         ///Marker type for the `type` field
         pub struct r#type(());
         ///Marker type for the `digest` field
         pub struct digest(());
-        ///Marker type for the `seq` field
-        pub struct seq(());
+        ///Marker type for the `hold_did` field
+        pub struct hold_did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ScanJobBuilder<'a, S: scan_job_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Did<'a>>,
         Option<UriValue<'a>>,
@@ -612,7 +615,7 @@ pub struct ScanJobBuilder<'a, S: scan_job_state::State> {
         Option<CowStr<'a>>,
         Option<Did<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ScanJob<'a> {
@@ -626,19 +629,9 @@ impl<'a> ScanJobBuilder<'a, scan_job_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ScanJobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -653,11 +646,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ScanJobBuilder<'a, scan_job_state::SetDigest<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ScanJobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -672,11 +665,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ScanJobBuilder<'a, scan_job_state::SetHoldDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ScanJobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -691,11 +684,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ScanJobBuilder<'a, scan_job_state::SetHoldEndpoint<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ScanJobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -703,12 +696,12 @@ where
 impl<'a, S: scan_job_state::State> ScanJobBuilder<'a, S> {
     /// Set the `priority` field (optional)
     pub fn priority(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `priority` field to an Option value (optional)
     pub fn maybe_priority(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -723,11 +716,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ScanJobBuilder<'a, scan_job_state::SetRepository<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ScanJobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -742,11 +735,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ScanJobBuilder<'a, scan_job_state::SetSeq<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ScanJobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -754,12 +747,12 @@ where
 impl<'a, S: scan_job_state::State> ScanJobBuilder<'a, S> {
     /// Set the `tag` field (optional)
     pub fn tag(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `tag` field to an Option value (optional)
     pub fn maybe_tag(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -774,11 +767,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ScanJobBuilder<'a, scan_job_state::SetType<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ScanJobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -793,11 +786,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ScanJobBuilder<'a, scan_job_state::SetUserDid<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         ScanJobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -805,26 +798,26 @@ where
 impl<'a, S> ScanJobBuilder<'a, S>
 where
     S: scan_job_state::State,
-    S::Repository: scan_job_state::IsSet,
-    S::UserDid: scan_job_state::IsSet,
-    S::HoldDid: scan_job_state::IsSet,
     S::HoldEndpoint: scan_job_state::IsSet,
+    S::UserDid: scan_job_state::IsSet,
+    S::Seq: scan_job_state::IsSet,
+    S::Repository: scan_job_state::IsSet,
     S::Type: scan_job_state::IsSet,
     S::Digest: scan_job_state::IsSet,
-    S::Seq: scan_job_state::IsSet,
+    S::HoldDid: scan_job_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ScanJob<'a> {
         ScanJob {
-            digest: self.__unsafe_private_named.0.unwrap(),
-            hold_did: self.__unsafe_private_named.1.unwrap(),
-            hold_endpoint: self.__unsafe_private_named.2.unwrap(),
-            priority: self.__unsafe_private_named.3,
-            repository: self.__unsafe_private_named.4.unwrap(),
-            seq: self.__unsafe_private_named.5.unwrap(),
-            tag: self.__unsafe_private_named.6,
-            r#type: self.__unsafe_private_named.7.unwrap(),
-            user_did: self.__unsafe_private_named.8.unwrap(),
+            digest: self._fields.0.unwrap(),
+            hold_did: self._fields.1.unwrap(),
+            hold_endpoint: self._fields.2.unwrap(),
+            priority: self._fields.3,
+            repository: self._fields.4.unwrap(),
+            seq: self._fields.5.unwrap(),
+            tag: self._fields.6,
+            r#type: self._fields.7.unwrap(),
+            user_did: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -837,15 +830,15 @@ where
         >,
     ) -> ScanJob<'a> {
         ScanJob {
-            digest: self.__unsafe_private_named.0.unwrap(),
-            hold_did: self.__unsafe_private_named.1.unwrap(),
-            hold_endpoint: self.__unsafe_private_named.2.unwrap(),
-            priority: self.__unsafe_private_named.3,
-            repository: self.__unsafe_private_named.4.unwrap(),
-            seq: self.__unsafe_private_named.5.unwrap(),
-            tag: self.__unsafe_private_named.6,
-            r#type: self.__unsafe_private_named.7.unwrap(),
-            user_did: self.__unsafe_private_named.8.unwrap(),
+            digest: self._fields.0.unwrap(),
+            hold_did: self._fields.1.unwrap(),
+            hold_endpoint: self._fields.2.unwrap(),
+            priority: self._fields.3,
+            repository: self._fields.4.unwrap(),
+            seq: self._fields.5.unwrap(),
+            tag: self._fields.6,
+            r#type: self._fields.7.unwrap(),
+            user_did: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1149,49 +1142,49 @@ pub mod scan_result_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Digest;
         type Summary;
+        type Digest;
         type Type;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Digest = Unset;
         type Summary = Unset;
+        type Digest = Unset;
         type Type = Unset;
     }
-    ///State transition - sets the `digest` field to Set
-    pub struct SetDigest<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDigest<S> {}
-    impl<S: State> State for SetDigest<S> {
-        type Digest = Set<members::digest>;
-        type Summary = S::Summary;
-        type Type = S::Type;
-    }
     ///State transition - sets the `summary` field to Set
     pub struct SetSummary<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSummary<S> {}
     impl<S: State> State for SetSummary<S> {
-        type Digest = S::Digest;
         type Summary = Set<members::summary>;
+        type Digest = S::Digest;
+        type Type = S::Type;
+    }
+    ///State transition - sets the `digest` field to Set
+    pub struct SetDigest<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDigest<S> {}
+    impl<S: State> State for SetDigest<S> {
+        type Summary = S::Summary;
+        type Digest = Set<members::digest>;
         type Type = S::Type;
     }
     ///State transition - sets the `type` field to Set
     pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetType<S> {}
     impl<S: State> State for SetType<S> {
-        type Digest = S::Digest;
         type Summary = S::Summary;
+        type Digest = S::Digest;
         type Type = Set<members::r#type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `digest` field
-        pub struct digest(());
         ///Marker type for the `summary` field
         pub struct summary(());
+        ///Marker type for the `digest` field
+        pub struct digest(());
         ///Marker type for the `type` field
         pub struct r#type(());
     }
@@ -1199,8 +1192,8 @@ pub mod scan_result_state {
 
 /// Builder for constructing an instance of this type
 pub struct ScanResultBuilder<'a, S: scan_result_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Bytes>,
@@ -1209,7 +1202,7 @@ pub struct ScanResultBuilder<'a, S: scan_result_state::State> {
         Option<CowStr<'a>>,
         Option<Bytes>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ScanResult<'a> {
@@ -1223,9 +1216,9 @@ impl<'a> ScanResultBuilder<'a, scan_result_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ScanResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1240,11 +1233,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ScanResultBuilder<'a, scan_result_state::SetDigest<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ScanResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1252,12 +1245,12 @@ where
 impl<'a, S: scan_result_state::State> ScanResultBuilder<'a, S> {
     /// Set the `error` field (optional)
     pub fn error(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `error` field to an Option value (optional)
     pub fn maybe_error(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1265,12 +1258,12 @@ impl<'a, S: scan_result_state::State> ScanResultBuilder<'a, S> {
 impl<'a, S: scan_result_state::State> ScanResultBuilder<'a, S> {
     /// Set the `sbom` field (optional)
     pub fn sbom(mut self, value: impl Into<Option<Bytes>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `sbom` field to an Option value (optional)
     pub fn maybe_sbom(mut self, value: Option<Bytes>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1278,12 +1271,12 @@ impl<'a, S: scan_result_state::State> ScanResultBuilder<'a, S> {
 impl<'a, S: scan_result_state::State> ScanResultBuilder<'a, S> {
     /// Set the `scannerVersion` field (optional)
     pub fn scanner_version(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `scannerVersion` field to an Option value (optional)
     pub fn maybe_scanner_version(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1298,11 +1291,11 @@ where
         mut self,
         value: impl Into<subscribe_scan_jobs::VulnSummary<'a>>,
     ) -> ScanResultBuilder<'a, scan_result_state::SetSummary<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ScanResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1317,11 +1310,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ScanResultBuilder<'a, scan_result_state::SetType<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ScanResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1329,12 +1322,12 @@ where
 impl<'a, S: scan_result_state::State> ScanResultBuilder<'a, S> {
     /// Set the `vulnReport` field (optional)
     pub fn vuln_report(mut self, value: impl Into<Option<Bytes>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `vulnReport` field to an Option value (optional)
     pub fn maybe_vuln_report(mut self, value: Option<Bytes>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1342,20 +1335,20 @@ impl<'a, S: scan_result_state::State> ScanResultBuilder<'a, S> {
 impl<'a, S> ScanResultBuilder<'a, S>
 where
     S: scan_result_state::State,
-    S::Digest: scan_result_state::IsSet,
     S::Summary: scan_result_state::IsSet,
+    S::Digest: scan_result_state::IsSet,
     S::Type: scan_result_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ScanResult<'a> {
         ScanResult {
-            digest: self.__unsafe_private_named.0.unwrap(),
-            error: self.__unsafe_private_named.1,
-            sbom: self.__unsafe_private_named.2,
-            scanner_version: self.__unsafe_private_named.3,
-            summary: self.__unsafe_private_named.4.unwrap(),
-            r#type: self.__unsafe_private_named.5.unwrap(),
-            vuln_report: self.__unsafe_private_named.6,
+            digest: self._fields.0.unwrap(),
+            error: self._fields.1,
+            sbom: self._fields.2,
+            scanner_version: self._fields.3,
+            summary: self._fields.4.unwrap(),
+            r#type: self._fields.5.unwrap(),
+            vuln_report: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -1368,13 +1361,13 @@ where
         >,
     ) -> ScanResult<'a> {
         ScanResult {
-            digest: self.__unsafe_private_named.0.unwrap(),
-            error: self.__unsafe_private_named.1,
-            sbom: self.__unsafe_private_named.2,
-            scanner_version: self.__unsafe_private_named.3,
-            summary: self.__unsafe_private_named.4.unwrap(),
-            r#type: self.__unsafe_private_named.5.unwrap(),
-            vuln_report: self.__unsafe_private_named.6,
+            digest: self._fields.0.unwrap(),
+            error: self._fields.1,
+            sbom: self._fields.2,
+            scanner_version: self._fields.3,
+            summary: self._fields.4.unwrap(),
+            r#type: self._fields.5.unwrap(),
+            vuln_report: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
@@ -1390,99 +1383,93 @@ pub mod vuln_summary_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Critical;
-        type Medium;
         type High;
-        type Low;
+        type Medium;
         type Total;
+        type Critical;
+        type Low;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Critical = Unset;
-        type Medium = Unset;
         type High = Unset;
-        type Low = Unset;
+        type Medium = Unset;
         type Total = Unset;
+        type Critical = Unset;
+        type Low = Unset;
     }
-    ///State transition - sets the `critical` field to Set
-    pub struct SetCritical<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCritical<S> {}
-    impl<S: State> State for SetCritical<S> {
-        type Critical = Set<members::critical>;
+    ///State transition - sets the `high` field to Set
+    pub struct SetHigh<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHigh<S> {}
+    impl<S: State> State for SetHigh<S> {
+        type High = Set<members::high>;
         type Medium = S::Medium;
-        type High = S::High;
-        type Low = S::Low;
         type Total = S::Total;
+        type Critical = S::Critical;
+        type Low = S::Low;
     }
     ///State transition - sets the `medium` field to Set
     pub struct SetMedium<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMedium<S> {}
     impl<S: State> State for SetMedium<S> {
-        type Critical = S::Critical;
-        type Medium = Set<members::medium>;
         type High = S::High;
-        type Low = S::Low;
+        type Medium = Set<members::medium>;
         type Total = S::Total;
-    }
-    ///State transition - sets the `high` field to Set
-    pub struct SetHigh<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHigh<S> {}
-    impl<S: State> State for SetHigh<S> {
         type Critical = S::Critical;
+        type Low = S::Low;
+    }
+    ///State transition - sets the `total` field to Set
+    pub struct SetTotal<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTotal<S> {}
+    impl<S: State> State for SetTotal<S> {
+        type High = S::High;
         type Medium = S::Medium;
-        type High = Set<members::high>;
+        type Total = Set<members::total>;
+        type Critical = S::Critical;
         type Low = S::Low;
+    }
+    ///State transition - sets the `critical` field to Set
+    pub struct SetCritical<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCritical<S> {}
+    impl<S: State> State for SetCritical<S> {
+        type High = S::High;
+        type Medium = S::Medium;
         type Total = S::Total;
+        type Critical = Set<members::critical>;
+        type Low = S::Low;
     }
     ///State transition - sets the `low` field to Set
     pub struct SetLow<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLow<S> {}
     impl<S: State> State for SetLow<S> {
-        type Critical = S::Critical;
-        type Medium = S::Medium;
         type High = S::High;
-        type Low = Set<members::low>;
+        type Medium = S::Medium;
         type Total = S::Total;
-    }
-    ///State transition - sets the `total` field to Set
-    pub struct SetTotal<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTotal<S> {}
-    impl<S: State> State for SetTotal<S> {
         type Critical = S::Critical;
-        type Medium = S::Medium;
-        type High = S::High;
-        type Low = S::Low;
-        type Total = Set<members::total>;
+        type Low = Set<members::low>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `critical` field
-        pub struct critical(());
-        ///Marker type for the `medium` field
-        pub struct medium(());
         ///Marker type for the `high` field
         pub struct high(());
-        ///Marker type for the `low` field
-        pub struct low(());
+        ///Marker type for the `medium` field
+        pub struct medium(());
         ///Marker type for the `total` field
         pub struct total(());
+        ///Marker type for the `critical` field
+        pub struct critical(());
+        ///Marker type for the `low` field
+        pub struct low(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct VulnSummaryBuilder<'a, S: vuln_summary_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<i64>,
-        Option<i64>,
-        Option<i64>,
-        Option<i64>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<i64>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> VulnSummary<'a> {
@@ -1496,9 +1483,9 @@ impl<'a> VulnSummaryBuilder<'a, vuln_summary_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VulnSummaryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1513,11 +1500,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> VulnSummaryBuilder<'a, vuln_summary_state::SetCritical<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         VulnSummaryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1532,11 +1519,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> VulnSummaryBuilder<'a, vuln_summary_state::SetHigh<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VulnSummaryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1551,11 +1538,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> VulnSummaryBuilder<'a, vuln_summary_state::SetLow<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         VulnSummaryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1570,11 +1557,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> VulnSummaryBuilder<'a, vuln_summary_state::SetMedium<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         VulnSummaryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1589,11 +1576,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> VulnSummaryBuilder<'a, vuln_summary_state::SetTotal<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         VulnSummaryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1601,20 +1588,20 @@ where
 impl<'a, S> VulnSummaryBuilder<'a, S>
 where
     S: vuln_summary_state::State,
-    S::Critical: vuln_summary_state::IsSet,
-    S::Medium: vuln_summary_state::IsSet,
     S::High: vuln_summary_state::IsSet,
-    S::Low: vuln_summary_state::IsSet,
+    S::Medium: vuln_summary_state::IsSet,
     S::Total: vuln_summary_state::IsSet,
+    S::Critical: vuln_summary_state::IsSet,
+    S::Low: vuln_summary_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> VulnSummary<'a> {
         VulnSummary {
-            critical: self.__unsafe_private_named.0.unwrap(),
-            high: self.__unsafe_private_named.1.unwrap(),
-            low: self.__unsafe_private_named.2.unwrap(),
-            medium: self.__unsafe_private_named.3.unwrap(),
-            total: self.__unsafe_private_named.4.unwrap(),
+            critical: self._fields.0.unwrap(),
+            high: self._fields.1.unwrap(),
+            low: self._fields.2.unwrap(),
+            medium: self._fields.3.unwrap(),
+            total: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1627,11 +1614,11 @@ where
         >,
     ) -> VulnSummary<'a> {
         VulnSummary {
-            critical: self.__unsafe_private_named.0.unwrap(),
-            high: self.__unsafe_private_named.1.unwrap(),
-            low: self.__unsafe_private_named.2.unwrap(),
-            medium: self.__unsafe_private_named.3.unwrap(),
-            total: self.__unsafe_private_named.4.unwrap(),
+            critical: self._fields.0.unwrap(),
+            high: self._fields.1.unwrap(),
+            low: self._fields.2.unwrap(),
+            medium: self._fields.3.unwrap(),
+            total: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_atcr/hold/update_crew_tier.rs b/crates/jacquard-api/src/io_atcr/hold/update_crew_tier.rs
index 3ebc8c33..f4f341ec 100644
--- a/crates/jacquard-api/src/io_atcr/hold/update_crew_tier.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/update_crew_tier.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -154,9 +157,9 @@ pub mod update_crew_tier_state {
 
 /// Builder for constructing an instance of this type
 pub struct UpdateCrewTierBuilder<'a, S: update_crew_tier_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateCrewTier<'a> {
@@ -170,9 +173,9 @@ impl<'a> UpdateCrewTierBuilder<'a, update_crew_tier_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateCrewTierBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -187,11 +190,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> UpdateCrewTierBuilder<'a, update_crew_tier_state::SetTierRank<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UpdateCrewTierBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -206,11 +209,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> UpdateCrewTierBuilder<'a, update_crew_tier_state::SetUserDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UpdateCrewTierBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -224,8 +227,8 @@ where
     /// Build the final struct
     pub fn build(self) -> UpdateCrewTier<'a> {
         UpdateCrewTier {
-            tier_rank: self.__unsafe_private_named.0.unwrap(),
-            user_did: self.__unsafe_private_named.1.unwrap(),
+            tier_rank: self._fields.0.unwrap(),
+            user_did: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -238,8 +241,8 @@ where
         >,
     ) -> UpdateCrewTier<'a> {
         UpdateCrewTier {
-            tier_rank: self.__unsafe_private_named.0.unwrap(),
-            user_did: self.__unsafe_private_named.1.unwrap(),
+            tier_rank: self._fields.0.unwrap(),
+            user_did: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_atcr/hold/upload_part.rs b/crates/jacquard-api/src/io_atcr/hold/upload_part.rs
index efa05eea..3c18b2e1 100644
--- a/crates/jacquard-api/src/io_atcr/hold/upload_part.rs
+++ b/crates/jacquard-api/src/io_atcr/hold/upload_part.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
diff --git a/crates/jacquard-api/src/io_atcr/manifest.rs b/crates/jacquard-api/src/io_atcr/manifest.rs
index 8401fa96..917fbfc2 100644
--- a/crates/jacquard-api/src/io_atcr/manifest.rs
+++ b/crates/jacquard-api/src/io_atcr/manifest.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -523,65 +526,65 @@ pub mod blob_reference_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type MediaType;
         type Size;
         type Digest;
-        type MediaType;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type MediaType = Unset;
         type Size = Unset;
         type Digest = Unset;
-        type MediaType = Unset;
+    }
+    ///State transition - sets the `media_type` field to Set
+    pub struct SetMediaType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMediaType<S> {}
+    impl<S: State> State for SetMediaType<S> {
+        type MediaType = Set<members::media_type>;
+        type Size = S::Size;
+        type Digest = S::Digest;
     }
     ///State transition - sets the `size` field to Set
     pub struct SetSize<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSize<S> {}
     impl<S: State> State for SetSize<S> {
+        type MediaType = S::MediaType;
         type Size = Set<members::size>;
         type Digest = S::Digest;
-        type MediaType = S::MediaType;
     }
     ///State transition - sets the `digest` field to Set
     pub struct SetDigest<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDigest<S> {}
     impl<S: State> State for SetDigest<S> {
-        type Size = S::Size;
-        type Digest = Set<members::digest>;
         type MediaType = S::MediaType;
-    }
-    ///State transition - sets the `media_type` field to Set
-    pub struct SetMediaType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMediaType<S> {}
-    impl<S: State> State for SetMediaType<S> {
         type Size = S::Size;
-        type Digest = S::Digest;
-        type MediaType = Set<members::media_type>;
+        type Digest = Set<members::digest>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `media_type` field
+        pub struct media_type(());
         ///Marker type for the `size` field
         pub struct size(());
         ///Marker type for the `digest` field
         pub struct digest(());
-        ///Marker type for the `media_type` field
-        pub struct media_type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BlobReferenceBuilder<'a, S: blob_reference_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Data<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<Vec<UriValue<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BlobReference<'a> {
@@ -595,9 +598,9 @@ impl<'a> BlobReferenceBuilder<'a, blob_reference_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlobReferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -605,12 +608,12 @@ impl<'a> BlobReferenceBuilder<'a, blob_reference_state::Empty> {
 impl<'a, S: blob_reference_state::State> BlobReferenceBuilder<'a, S> {
     /// Set the `annotations` field (optional)
     pub fn annotations(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `annotations` field to an Option value (optional)
     pub fn maybe_annotations(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -625,11 +628,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BlobReferenceBuilder<'a, blob_reference_state::SetDigest<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BlobReferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -644,11 +647,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BlobReferenceBuilder<'a, blob_reference_state::SetMediaType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BlobReferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -663,11 +666,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> BlobReferenceBuilder<'a, blob_reference_state::SetSize<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BlobReferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -675,12 +678,12 @@ where
 impl<'a, S: blob_reference_state::State> BlobReferenceBuilder<'a, S> {
     /// Set the `urls` field (optional)
     pub fn urls(mut self, value: impl Into<Option<Vec<UriValue<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `urls` field to an Option value (optional)
     pub fn maybe_urls(mut self, value: Option<Vec<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -688,18 +691,18 @@ impl<'a, S: blob_reference_state::State> BlobReferenceBuilder<'a, S> {
 impl<'a, S> BlobReferenceBuilder<'a, S>
 where
     S: blob_reference_state::State,
+    S::MediaType: blob_reference_state::IsSet,
     S::Size: blob_reference_state::IsSet,
     S::Digest: blob_reference_state::IsSet,
-    S::MediaType: blob_reference_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> BlobReference<'a> {
         BlobReference {
-            annotations: self.__unsafe_private_named.0,
-            digest: self.__unsafe_private_named.1.unwrap(),
-            media_type: self.__unsafe_private_named.2.unwrap(),
-            size: self.__unsafe_private_named.3.unwrap(),
-            urls: self.__unsafe_private_named.4,
+            annotations: self._fields.0,
+            digest: self._fields.1.unwrap(),
+            media_type: self._fields.2.unwrap(),
+            size: self._fields.3.unwrap(),
+            urls: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -709,11 +712,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> BlobReference<'a> {
         BlobReference {
-            annotations: self.__unsafe_private_named.0,
-            digest: self.__unsafe_private_named.1.unwrap(),
-            media_type: self.__unsafe_private_named.2.unwrap(),
-            size: self.__unsafe_private_named.3.unwrap(),
-            urls: self.__unsafe_private_named.4,
+            annotations: self._fields.0,
+            digest: self._fields.1.unwrap(),
+            media_type: self._fields.2.unwrap(),
+            size: self._fields.3.unwrap(),
+            urls: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
@@ -1111,83 +1114,83 @@ pub mod manifest_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type SchemaVersion;
         type Digest;
+        type SchemaVersion;
         type MediaType;
+        type CreatedAt;
         type Repository;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type SchemaVersion = Unset;
         type Digest = Unset;
+        type SchemaVersion = Unset;
         type MediaType = Unset;
+        type CreatedAt = Unset;
         type Repository = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
+    ///State transition - sets the `digest` field to Set
+    pub struct SetDigest<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDigest<S> {}
+    impl<S: State> State for SetDigest<S> {
+        type Digest = Set<members::digest>;
         type SchemaVersion = S::SchemaVersion;
-        type Digest = S::Digest;
         type MediaType = S::MediaType;
+        type CreatedAt = S::CreatedAt;
         type Repository = S::Repository;
     }
     ///State transition - sets the `schema_version` field to Set
     pub struct SetSchemaVersion<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSchemaVersion<S> {}
     impl<S: State> State for SetSchemaVersion<S> {
-        type CreatedAt = S::CreatedAt;
-        type SchemaVersion = Set<members::schema_version>;
         type Digest = S::Digest;
+        type SchemaVersion = Set<members::schema_version>;
         type MediaType = S::MediaType;
-        type Repository = S::Repository;
-    }
-    ///State transition - sets the `digest` field to Set
-    pub struct SetDigest<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDigest<S> {}
-    impl<S: State> State for SetDigest<S> {
         type CreatedAt = S::CreatedAt;
-        type SchemaVersion = S::SchemaVersion;
-        type Digest = Set<members::digest>;
-        type MediaType = S::MediaType;
         type Repository = S::Repository;
     }
     ///State transition - sets the `media_type` field to Set
     pub struct SetMediaType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMediaType<S> {}
     impl<S: State> State for SetMediaType<S> {
-        type CreatedAt = S::CreatedAt;
-        type SchemaVersion = S::SchemaVersion;
         type Digest = S::Digest;
+        type SchemaVersion = S::SchemaVersion;
         type MediaType = Set<members::media_type>;
+        type CreatedAt = S::CreatedAt;
+        type Repository = S::Repository;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Digest = S::Digest;
+        type SchemaVersion = S::SchemaVersion;
+        type MediaType = S::MediaType;
+        type CreatedAt = Set<members::created_at>;
         type Repository = S::Repository;
     }
     ///State transition - sets the `repository` field to Set
     pub struct SetRepository<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepository<S> {}
     impl<S: State> State for SetRepository<S> {
-        type CreatedAt = S::CreatedAt;
-        type SchemaVersion = S::SchemaVersion;
         type Digest = S::Digest;
+        type SchemaVersion = S::SchemaVersion;
         type MediaType = S::MediaType;
+        type CreatedAt = S::CreatedAt;
         type Repository = Set<members::repository>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `schema_version` field
-        pub struct schema_version(());
         ///Marker type for the `digest` field
         pub struct digest(());
+        ///Marker type for the `schema_version` field
+        pub struct schema_version(());
         ///Marker type for the `media_type` field
         pub struct media_type(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `repository` field
         pub struct repository(());
     }
@@ -1195,8 +1198,8 @@ pub mod manifest_state {
 
 /// Builder for constructing an instance of this type
 pub struct ManifestBuilder<'a, S: manifest_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Data<'a>>,
         Option<manifest::BlobReference<'a>>,
         Option<Datetime>,
@@ -1211,7 +1214,7 @@ pub struct ManifestBuilder<'a, S: manifest_state::State> {
         Option<i64>,
         Option<manifest::BlobReference<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Manifest<'a> {
@@ -1225,8 +1228,8 @@ impl<'a> ManifestBuilder<'a, manifest_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -1241,7 +1244,7 @@ impl<'a> ManifestBuilder<'a, manifest_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1249,12 +1252,12 @@ impl<'a> ManifestBuilder<'a, manifest_state::Empty> {
 impl<'a, S: manifest_state::State> ManifestBuilder<'a, S> {
     /// Set the `annotations` field (optional)
     pub fn annotations(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `annotations` field to an Option value (optional)
     pub fn maybe_annotations(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1265,12 +1268,12 @@ impl<'a, S: manifest_state::State> ManifestBuilder<'a, S> {
         mut self,
         value: impl Into<Option<manifest::BlobReference<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `config` field to an Option value (optional)
     pub fn maybe_config(mut self, value: Option<manifest::BlobReference<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1285,11 +1288,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ManifestBuilder<'a, manifest_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1304,11 +1307,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ManifestBuilder<'a, manifest_state::SetDigest<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1316,12 +1319,12 @@ where
 impl<'a, S: manifest_state::State> ManifestBuilder<'a, S> {
     /// Set the `holdDid` field (optional)
     pub fn hold_did(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `holdDid` field to an Option value (optional)
     pub fn maybe_hold_did(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1329,12 +1332,12 @@ impl<'a, S: manifest_state::State> ManifestBuilder<'a, S> {
 impl<'a, S: manifest_state::State> ManifestBuilder<'a, S> {
     /// Set the `holdEndpoint` field (optional)
     pub fn hold_endpoint(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `holdEndpoint` field to an Option value (optional)
     pub fn maybe_hold_endpoint(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1345,7 +1348,7 @@ impl<'a, S: manifest_state::State> ManifestBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<manifest::BlobReference<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `layers` field to an Option value (optional)
@@ -1353,7 +1356,7 @@ impl<'a, S: manifest_state::State> ManifestBuilder<'a, S> {
         mut self,
         value: Option<Vec<manifest::BlobReference<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1361,12 +1364,12 @@ impl<'a, S: manifest_state::State> ManifestBuilder<'a, S> {
 impl<'a, S: manifest_state::State> ManifestBuilder<'a, S> {
     /// Set the `manifestBlob` field (optional)
     pub fn manifest_blob(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `manifestBlob` field to an Option value (optional)
     pub fn maybe_manifest_blob(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -1377,7 +1380,7 @@ impl<'a, S: manifest_state::State> ManifestBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<manifest::ManifestReference<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `manifests` field to an Option value (optional)
@@ -1385,7 +1388,7 @@ impl<'a, S: manifest_state::State> ManifestBuilder<'a, S> {
         mut self,
         value: Option<Vec<manifest::ManifestReference<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -1400,11 +1403,11 @@ where
         mut self,
         value: impl Into<ManifestMediaType<'a>>,
     ) -> ManifestBuilder<'a, manifest_state::SetMediaType<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1419,11 +1422,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ManifestBuilder<'a, manifest_state::SetRepository<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         ManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1438,11 +1441,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ManifestBuilder<'a, manifest_state::SetSchemaVersion<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         ManifestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1453,12 +1456,12 @@ impl<'a, S: manifest_state::State> ManifestBuilder<'a, S> {
         mut self,
         value: impl Into<Option<manifest::BlobReference<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `subject` field to an Option value (optional)
     pub fn maybe_subject(mut self, value: Option<manifest::BlobReference<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -1466,28 +1469,28 @@ impl<'a, S: manifest_state::State> ManifestBuilder<'a, S> {
 impl<'a, S> ManifestBuilder<'a, S>
 where
     S: manifest_state::State,
-    S::CreatedAt: manifest_state::IsSet,
-    S::SchemaVersion: manifest_state::IsSet,
     S::Digest: manifest_state::IsSet,
+    S::SchemaVersion: manifest_state::IsSet,
     S::MediaType: manifest_state::IsSet,
+    S::CreatedAt: manifest_state::IsSet,
     S::Repository: manifest_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Manifest<'a> {
         Manifest {
-            annotations: self.__unsafe_private_named.0,
-            config: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            digest: self.__unsafe_private_named.3.unwrap(),
-            hold_did: self.__unsafe_private_named.4,
-            hold_endpoint: self.__unsafe_private_named.5,
-            layers: self.__unsafe_private_named.6,
-            manifest_blob: self.__unsafe_private_named.7,
-            manifests: self.__unsafe_private_named.8,
-            media_type: self.__unsafe_private_named.9.unwrap(),
-            repository: self.__unsafe_private_named.10.unwrap(),
-            schema_version: self.__unsafe_private_named.11.unwrap(),
-            subject: self.__unsafe_private_named.12,
+            annotations: self._fields.0,
+            config: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            digest: self._fields.3.unwrap(),
+            hold_did: self._fields.4,
+            hold_endpoint: self._fields.5,
+            layers: self._fields.6,
+            manifest_blob: self._fields.7,
+            manifests: self._fields.8,
+            media_type: self._fields.9.unwrap(),
+            repository: self._fields.10.unwrap(),
+            schema_version: self._fields.11.unwrap(),
+            subject: self._fields.12,
             extra_data: Default::default(),
         }
     }
@@ -1497,19 +1500,19 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Manifest<'a> {
         Manifest {
-            annotations: self.__unsafe_private_named.0,
-            config: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            digest: self.__unsafe_private_named.3.unwrap(),
-            hold_did: self.__unsafe_private_named.4,
-            hold_endpoint: self.__unsafe_private_named.5,
-            layers: self.__unsafe_private_named.6,
-            manifest_blob: self.__unsafe_private_named.7,
-            manifests: self.__unsafe_private_named.8,
-            media_type: self.__unsafe_private_named.9.unwrap(),
-            repository: self.__unsafe_private_named.10.unwrap(),
-            schema_version: self.__unsafe_private_named.11.unwrap(),
-            subject: self.__unsafe_private_named.12,
+            annotations: self._fields.0,
+            config: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            digest: self._fields.3.unwrap(),
+            hold_did: self._fields.4,
+            hold_endpoint: self._fields.5,
+            layers: self._fields.6,
+            manifest_blob: self._fields.7,
+            manifests: self._fields.8,
+            media_type: self._fields.9.unwrap(),
+            repository: self._fields.10.unwrap(),
+            schema_version: self._fields.11.unwrap(),
+            subject: self._fields.12,
             extra_data: Some(extra_data),
         }
     }
@@ -1525,65 +1528,65 @@ pub mod manifest_reference_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type MediaType;
-        type Size;
         type Digest;
+        type Size;
+        type MediaType;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type MediaType = Unset;
-        type Size = Unset;
         type Digest = Unset;
+        type Size = Unset;
+        type MediaType = Unset;
     }
-    ///State transition - sets the `media_type` field to Set
-    pub struct SetMediaType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMediaType<S> {}
-    impl<S: State> State for SetMediaType<S> {
-        type MediaType = Set<members::media_type>;
+    ///State transition - sets the `digest` field to Set
+    pub struct SetDigest<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDigest<S> {}
+    impl<S: State> State for SetDigest<S> {
+        type Digest = Set<members::digest>;
         type Size = S::Size;
-        type Digest = S::Digest;
+        type MediaType = S::MediaType;
     }
     ///State transition - sets the `size` field to Set
     pub struct SetSize<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSize<S> {}
     impl<S: State> State for SetSize<S> {
-        type MediaType = S::MediaType;
-        type Size = Set<members::size>;
         type Digest = S::Digest;
-    }
-    ///State transition - sets the `digest` field to Set
-    pub struct SetDigest<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDigest<S> {}
-    impl<S: State> State for SetDigest<S> {
+        type Size = Set<members::size>;
         type MediaType = S::MediaType;
+    }
+    ///State transition - sets the `media_type` field to Set
+    pub struct SetMediaType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMediaType<S> {}
+    impl<S: State> State for SetMediaType<S> {
+        type Digest = S::Digest;
         type Size = S::Size;
-        type Digest = Set<members::digest>;
+        type MediaType = Set<members::media_type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `media_type` field
-        pub struct media_type(());
-        ///Marker type for the `size` field
-        pub struct size(());
         ///Marker type for the `digest` field
         pub struct digest(());
+        ///Marker type for the `size` field
+        pub struct size(());
+        ///Marker type for the `media_type` field
+        pub struct media_type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ManifestReferenceBuilder<'a, S: manifest_reference_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Data<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<manifest::Platform<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ManifestReference<'a> {
@@ -1597,9 +1600,9 @@ impl<'a> ManifestReferenceBuilder<'a, manifest_reference_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ManifestReferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1607,12 +1610,12 @@ impl<'a> ManifestReferenceBuilder<'a, manifest_reference_state::Empty> {
 impl<'a, S: manifest_reference_state::State> ManifestReferenceBuilder<'a, S> {
     /// Set the `annotations` field (optional)
     pub fn annotations(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `annotations` field to an Option value (optional)
     pub fn maybe_annotations(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1627,11 +1630,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ManifestReferenceBuilder<'a, manifest_reference_state::SetDigest<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ManifestReferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1646,11 +1649,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ManifestReferenceBuilder<'a, manifest_reference_state::SetMediaType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ManifestReferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1658,12 +1661,12 @@ where
 impl<'a, S: manifest_reference_state::State> ManifestReferenceBuilder<'a, S> {
     /// Set the `platform` field (optional)
     pub fn platform(mut self, value: impl Into<Option<manifest::Platform<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `platform` field to an Option value (optional)
     pub fn maybe_platform(mut self, value: Option<manifest::Platform<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1678,11 +1681,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ManifestReferenceBuilder<'a, manifest_reference_state::SetSize<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ManifestReferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1690,18 +1693,18 @@ where
 impl<'a, S> ManifestReferenceBuilder<'a, S>
 where
     S: manifest_reference_state::State,
-    S::MediaType: manifest_reference_state::IsSet,
-    S::Size: manifest_reference_state::IsSet,
     S::Digest: manifest_reference_state::IsSet,
+    S::Size: manifest_reference_state::IsSet,
+    S::MediaType: manifest_reference_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ManifestReference<'a> {
         ManifestReference {
-            annotations: self.__unsafe_private_named.0,
-            digest: self.__unsafe_private_named.1.unwrap(),
-            media_type: self.__unsafe_private_named.2.unwrap(),
-            platform: self.__unsafe_private_named.3,
-            size: self.__unsafe_private_named.4.unwrap(),
+            annotations: self._fields.0,
+            digest: self._fields.1.unwrap(),
+            media_type: self._fields.2.unwrap(),
+            platform: self._fields.3,
+            size: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1711,11 +1714,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ManifestReference<'a> {
         ManifestReference {
-            annotations: self.__unsafe_private_named.0,
-            digest: self.__unsafe_private_named.1.unwrap(),
-            media_type: self.__unsafe_private_named.2.unwrap(),
-            platform: self.__unsafe_private_named.3,
-            size: self.__unsafe_private_named.4.unwrap(),
+            annotations: self._fields.0,
+            digest: self._fields.1.unwrap(),
+            media_type: self._fields.2.unwrap(),
+            platform: self._fields.3,
+            size: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_atcr/repo/page.rs b/crates/jacquard-api/src/io_atcr/repo/page.rs
index b312ce58..66d51a1b 100644
--- a/crates/jacquard-api/src/io_atcr/repo/page.rs
+++ b/crates/jacquard-api/src/io_atcr/repo/page.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -184,64 +187,64 @@ pub mod page_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type CreatedAt;
-        type Repository;
         type UpdatedAt;
+        type Repository;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type CreatedAt = Unset;
-        type Repository = Unset;
         type UpdatedAt = Unset;
+        type Repository = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type CreatedAt = Set<members::created_at>;
-        type Repository = S::Repository;
-        type UpdatedAt = S::UpdatedAt;
-    }
-    ///State transition - sets the `repository` field to Set
-    pub struct SetRepository<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepository<S> {}
-    impl<S: State> State for SetRepository<S> {
-        type CreatedAt = S::CreatedAt;
-        type Repository = Set<members::repository>;
         type UpdatedAt = S::UpdatedAt;
+        type Repository = S::Repository;
     }
     ///State transition - sets the `updated_at` field to Set
     pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
     impl<S: State> State for SetUpdatedAt<S> {
         type CreatedAt = S::CreatedAt;
-        type Repository = S::Repository;
         type UpdatedAt = Set<members::updated_at>;
+        type Repository = S::Repository;
+    }
+    ///State transition - sets the `repository` field to Set
+    pub struct SetRepository<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepository<S> {}
+    impl<S: State> State for SetRepository<S> {
+        type CreatedAt = S::CreatedAt;
+        type UpdatedAt = S::UpdatedAt;
+        type Repository = Set<members::repository>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `repository` field
-        pub struct repository(());
         ///Marker type for the `updated_at` field
         pub struct updated_at(());
+        ///Marker type for the `repository` field
+        pub struct repository(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PageBuilder<'a, S: page_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Page<'a> {
@@ -255,9 +258,9 @@ impl<'a> PageBuilder<'a, page_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -265,12 +268,12 @@ impl<'a> PageBuilder<'a, page_state::Empty> {
 impl<'a, S: page_state::State> PageBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -285,11 +288,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PageBuilder<'a, page_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -297,12 +300,12 @@ where
 impl<'a, S: page_state::State> PageBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -317,11 +320,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PageBuilder<'a, page_state::SetRepository<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -336,11 +339,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PageBuilder<'a, page_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -349,17 +352,17 @@ impl<'a, S> PageBuilder<'a, S>
 where
     S: page_state::State,
     S::CreatedAt: page_state::IsSet,
-    S::Repository: page_state::IsSet,
     S::UpdatedAt: page_state::IsSet,
+    S::Repository: page_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Page<'a> {
         Page {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            repository: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4.unwrap(),
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            repository: self._fields.3.unwrap(),
+            updated_at: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -372,11 +375,11 @@ where
         >,
     ) -> Page<'a> {
         Page {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            repository: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4.unwrap(),
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            repository: self._fields.3.unwrap(),
+            updated_at: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_atcr/sailor/profile.rs b/crates/jacquard-api/src/io_atcr/sailor/profile.rs
index ccee2618..2a362536 100644
--- a/crates/jacquard-api/src/io_atcr/sailor/profile.rs
+++ b/crates/jacquard-api/src/io_atcr/sailor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -138,9 +141,9 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<UriValue<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<UriValue<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -154,9 +157,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -171,11 +174,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ProfileBuilder<'a, profile_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,12 +186,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `defaultHold` field (optional)
     pub fn default_hold(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `defaultHold` field to an Option value (optional)
     pub fn maybe_default_hold(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -196,12 +199,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -214,9 +217,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            default_hold: self.__unsafe_private_named.1,
-            updated_at: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            default_hold: self._fields.1,
+            updated_at: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -229,9 +232,9 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            default_hold: self.__unsafe_private_named.1,
-            updated_at: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            default_hold: self._fields.1,
+            updated_at: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_atcr/sailor/star.rs b/crates/jacquard-api/src/io_atcr/sailor/star.rs
index 9971d190..1362510c 100644
--- a/crates/jacquard-api/src/io_atcr/sailor/star.rs
+++ b/crates/jacquard-api/src/io_atcr/sailor/star.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -110,45 +113,45 @@ pub mod star_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type CreatedAt;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
+        type Subject = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct StarBuilder<'a, S: star_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Star<'a> {
@@ -162,9 +165,9 @@ impl<'a> StarBuilder<'a, star_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StarBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StarBuilder<'a, star_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StarBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> StarBuilder<'a, star_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StarBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,14 +213,14 @@ where
 impl<'a, S> StarBuilder<'a, S>
 where
     S: star_state::State,
-    S::Subject: star_state::IsSet,
     S::CreatedAt: star_state::IsSet,
+    S::Subject: star_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Star<'a> {
         Star {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Star<'a> {
         Star {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_atcr/sailor/webhook.rs b/crates/jacquard-api/src/io_atcr/sailor/webhook.rs
index 059135f7..680734b0 100644
--- a/crates/jacquard-api/src/io_atcr/sailor/webhook.rs
+++ b/crates/jacquard-api/src/io_atcr/sailor/webhook.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -139,81 +142,81 @@ pub mod webhook_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Triggers;
-        type CreatedAt;
-        type PrivateCid;
         type HoldDid;
+        type PrivateCid;
+        type CreatedAt;
+        type Triggers;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Triggers = Unset;
-        type CreatedAt = Unset;
-        type PrivateCid = Unset;
         type HoldDid = Unset;
+        type PrivateCid = Unset;
+        type CreatedAt = Unset;
+        type Triggers = Unset;
     }
-    ///State transition - sets the `triggers` field to Set
-    pub struct SetTriggers<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTriggers<S> {}
-    impl<S: State> State for SetTriggers<S> {
-        type Triggers = Set<members::triggers>;
-        type CreatedAt = S::CreatedAt;
+    ///State transition - sets the `hold_did` field to Set
+    pub struct SetHoldDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHoldDid<S> {}
+    impl<S: State> State for SetHoldDid<S> {
+        type HoldDid = Set<members::hold_did>;
         type PrivateCid = S::PrivateCid;
-        type HoldDid = S::HoldDid;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = S::CreatedAt;
         type Triggers = S::Triggers;
-        type CreatedAt = Set<members::created_at>;
-        type PrivateCid = S::PrivateCid;
-        type HoldDid = S::HoldDid;
     }
     ///State transition - sets the `private_cid` field to Set
     pub struct SetPrivateCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPrivateCid<S> {}
     impl<S: State> State for SetPrivateCid<S> {
-        type Triggers = S::Triggers;
-        type CreatedAt = S::CreatedAt;
-        type PrivateCid = Set<members::private_cid>;
         type HoldDid = S::HoldDid;
+        type PrivateCid = Set<members::private_cid>;
+        type CreatedAt = S::CreatedAt;
+        type Triggers = S::Triggers;
     }
-    ///State transition - sets the `hold_did` field to Set
-    pub struct SetHoldDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHoldDid<S> {}
-    impl<S: State> State for SetHoldDid<S> {
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type HoldDid = S::HoldDid;
+        type PrivateCid = S::PrivateCid;
+        type CreatedAt = Set<members::created_at>;
         type Triggers = S::Triggers;
-        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `triggers` field to Set
+    pub struct SetTriggers<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTriggers<S> {}
+    impl<S: State> State for SetTriggers<S> {
+        type HoldDid = S::HoldDid;
         type PrivateCid = S::PrivateCid;
-        type HoldDid = Set<members::hold_did>;
+        type CreatedAt = S::CreatedAt;
+        type Triggers = Set<members::triggers>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `triggers` field
-        pub struct triggers(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `private_cid` field
-        pub struct private_cid(());
         ///Marker type for the `hold_did` field
         pub struct hold_did(());
+        ///Marker type for the `private_cid` field
+        pub struct private_cid(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `triggers` field
+        pub struct triggers(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct WebhookBuilder<'a, S: webhook_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Webhook<'a> {
@@ -227,9 +230,9 @@ impl<'a> WebhookBuilder<'a, webhook_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WebhookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,11 +247,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> WebhookBuilder<'a, webhook_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         WebhookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -263,11 +266,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> WebhookBuilder<'a, webhook_state::SetHoldDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         WebhookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -282,11 +285,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WebhookBuilder<'a, webhook_state::SetPrivateCid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         WebhookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -301,11 +304,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> WebhookBuilder<'a, webhook_state::SetTriggers<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         WebhookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -313,12 +316,12 @@ where
 impl<'a, S: webhook_state::State> WebhookBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -326,19 +329,19 @@ impl<'a, S: webhook_state::State> WebhookBuilder<'a, S> {
 impl<'a, S> WebhookBuilder<'a, S>
 where
     S: webhook_state::State,
-    S::Triggers: webhook_state::IsSet,
-    S::CreatedAt: webhook_state::IsSet,
-    S::PrivateCid: webhook_state::IsSet,
     S::HoldDid: webhook_state::IsSet,
+    S::PrivateCid: webhook_state::IsSet,
+    S::CreatedAt: webhook_state::IsSet,
+    S::Triggers: webhook_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Webhook<'a> {
         Webhook {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            hold_did: self.__unsafe_private_named.1.unwrap(),
-            private_cid: self.__unsafe_private_named.2.unwrap(),
-            triggers: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            hold_did: self._fields.1.unwrap(),
+            private_cid: self._fields.2.unwrap(),
+            triggers: self._fields.3.unwrap(),
+            updated_at: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -351,11 +354,11 @@ where
         >,
     ) -> Webhook<'a> {
         Webhook {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            hold_did: self.__unsafe_private_named.1.unwrap(),
-            private_cid: self.__unsafe_private_named.2.unwrap(),
-            triggers: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            hold_did: self._fields.1.unwrap(),
+            private_cid: self._fields.2.unwrap(),
+            triggers: self._fields.3.unwrap(),
+            updated_at: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_atcr/tag.rs b/crates/jacquard-api/src/io_atcr/tag.rs
index d9d49058..3f0aaeaf 100644
--- a/crates/jacquard-api/src/io_atcr/tag.rs
+++ b/crates/jacquard-api/src/io_atcr/tag.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -154,51 +157,51 @@ pub mod tag_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Repository;
         type Tag;
+        type Repository;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Repository = Unset;
         type Tag = Unset;
-    }
-    ///State transition - sets the `repository` field to Set
-    pub struct SetRepository<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepository<S> {}
-    impl<S: State> State for SetRepository<S> {
-        type Repository = Set<members::repository>;
-        type Tag = S::Tag;
+        type Repository = Unset;
     }
     ///State transition - sets the `tag` field to Set
     pub struct SetTag<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTag<S> {}
     impl<S: State> State for SetTag<S> {
-        type Repository = S::Repository;
         type Tag = Set<members::tag>;
+        type Repository = S::Repository;
+    }
+    ///State transition - sets the `repository` field to Set
+    pub struct SetRepository<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepository<S> {}
+    impl<S: State> State for SetRepository<S> {
+        type Tag = S::Tag;
+        type Repository = Set<members::repository>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `repository` field
-        pub struct repository(());
         ///Marker type for the `tag` field
         pub struct tag(());
+        ///Marker type for the `repository` field
+        pub struct repository(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TagBuilder<'a, S: tag_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Tag<'a> {
@@ -212,9 +215,9 @@ impl<'a> TagBuilder<'a, tag_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -222,12 +225,12 @@ impl<'a> TagBuilder<'a, tag_state::Empty> {
 impl<'a, S: tag_state::State> TagBuilder<'a, S> {
     /// Set the `manifest` field (optional)
     pub fn manifest(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `manifest` field to an Option value (optional)
     pub fn maybe_manifest(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -235,12 +238,12 @@ impl<'a, S: tag_state::State> TagBuilder<'a, S> {
 impl<'a, S: tag_state::State> TagBuilder<'a, S> {
     /// Set the `manifestDigest` field (optional)
     pub fn manifest_digest(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `manifestDigest` field to an Option value (optional)
     pub fn maybe_manifest_digest(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -255,11 +258,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TagBuilder<'a, tag_state::SetRepository<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -274,11 +277,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TagBuilder<'a, tag_state::SetTag<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -286,12 +289,12 @@ where
 impl<'a, S: tag_state::State> TagBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -299,17 +302,17 @@ impl<'a, S: tag_state::State> TagBuilder<'a, S> {
 impl<'a, S> TagBuilder<'a, S>
 where
     S: tag_state::State,
-    S::Repository: tag_state::IsSet,
     S::Tag: tag_state::IsSet,
+    S::Repository: tag_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Tag<'a> {
         Tag {
-            manifest: self.__unsafe_private_named.0,
-            manifest_digest: self.__unsafe_private_named.1,
-            repository: self.__unsafe_private_named.2.unwrap(),
-            tag: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4,
+            manifest: self._fields.0,
+            manifest_digest: self._fields.1,
+            repository: self._fields.2.unwrap(),
+            tag: self._fields.3.unwrap(),
+            updated_at: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -322,11 +325,11 @@ where
         >,
     ) -> Tag<'a> {
         Tag {
-            manifest: self.__unsafe_private_named.0,
-            manifest_digest: self.__unsafe_private_named.1,
-            repository: self.__unsafe_private_named.2.unwrap(),
-            tag: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4,
+            manifest: self._fields.0,
+            manifest_digest: self._fields.1,
+            repository: self._fields.2.unwrap(),
+            tag: self._fields.3.unwrap(),
+            updated_at: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_kich/accomplishment.rs b/crates/jacquard-api/src/io_kich/accomplishment.rs
index 05cc3608..52a70380 100644
--- a/crates/jacquard-api/src/io_kich/accomplishment.rs
+++ b/crates/jacquard-api/src/io_kich/accomplishment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -113,45 +116,45 @@ pub mod accomplishment_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Type;
         type CreatedAt;
+        type Type;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Type = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `type` field to Set
-    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetType<S> {}
-    impl<S: State> State for SetType<S> {
-        type Type = Set<members::r#type>;
-        type CreatedAt = S::CreatedAt;
+        type Type = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Type = S::Type;
         type CreatedAt = Set<members::created_at>;
+        type Type = S::Type;
+    }
+    ///State transition - sets the `type` field to Set
+    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetType<S> {}
+    impl<S: State> State for SetType<S> {
+        type CreatedAt = S::CreatedAt;
+        type Type = Set<members::r#type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `type` field
-        pub struct r#type(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `type` field
+        pub struct r#type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AccomplishmentBuilder<'a, S: accomplishment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Data<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Data<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Accomplishment<'a> {
@@ -165,9 +168,9 @@ impl<'a> AccomplishmentBuilder<'a, accomplishment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AccomplishmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,11 +185,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AccomplishmentBuilder<'a, accomplishment_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AccomplishmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -194,12 +197,12 @@ where
 impl<'a, S: accomplishment_state::State> AccomplishmentBuilder<'a, S> {
     /// Set the `metadata` field (optional)
     pub fn metadata(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `metadata` field to an Option value (optional)
     pub fn maybe_metadata(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -214,11 +217,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AccomplishmentBuilder<'a, accomplishment_state::SetType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AccomplishmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -226,15 +229,15 @@ where
 impl<'a, S> AccomplishmentBuilder<'a, S>
 where
     S: accomplishment_state::State,
-    S::Type: accomplishment_state::IsSet,
     S::CreatedAt: accomplishment_state::IsSet,
+    S::Type: accomplishment_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Accomplishment<'a> {
         Accomplishment {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            metadata: self.__unsafe_private_named.1,
-            r#type: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            metadata: self._fields.1,
+            r#type: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -244,9 +247,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Accomplishment<'a> {
         Accomplishment {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            metadata: self.__unsafe_private_named.1,
-            r#type: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            metadata: self._fields.1,
+            r#type: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_kich/cookinglog.rs b/crates/jacquard-api/src/io_kich/cookinglog.rs
index 93d0e4ed..e9cac3e7 100644
--- a/crates/jacquard-api/src/io_kich/cookinglog.rs
+++ b/crates/jacquard-api/src/io_kich/cookinglog.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -165,14 +168,14 @@ pub mod cookinglog_state {
 
 /// Builder for constructing an instance of this type
 pub struct CookinglogBuilder<'a, S: cookinglog_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Data<'a>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Cookinglog<'a> {
@@ -186,9 +189,9 @@ impl<'a> CookinglogBuilder<'a, cookinglog_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CookinglogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,11 +206,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CookinglogBuilder<'a, cookinglog_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CookinglogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,12 +218,12 @@ where
 impl<'a, S: cookinglog_state::State> CookinglogBuilder<'a, S> {
     /// Set the `notes` field (optional)
     pub fn notes(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `notes` field to an Option value (optional)
     pub fn maybe_notes(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -228,12 +231,12 @@ impl<'a, S: cookinglog_state::State> CookinglogBuilder<'a, S> {
 impl<'a, S: cookinglog_state::State> CookinglogBuilder<'a, S> {
     /// Set the `scaledServings` field (optional)
     pub fn scaled_servings(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `scaledServings` field to an Option value (optional)
     pub fn maybe_scaled_servings(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -248,11 +251,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> CookinglogBuilder<'a, cookinglog_state::SetSubject<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CookinglogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -266,10 +269,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Cookinglog<'a> {
         Cookinglog {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            notes: self.__unsafe_private_named.1,
-            scaled_servings: self.__unsafe_private_named.2,
-            subject: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            notes: self._fields.1,
+            scaled_servings: self._fields.2,
+            subject: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -279,10 +282,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Cookinglog<'a> {
         Cookinglog {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            notes: self.__unsafe_private_named.1,
-            scaled_servings: self.__unsafe_private_named.2,
-            subject: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            notes: self._fields.1,
+            scaled_servings: self._fields.2,
+            subject: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_kich/graph/follow.rs b/crates/jacquard-api/src/io_kich/graph/follow.rs
index c5d2131a..a66a5477 100644
--- a/crates/jacquard-api/src/io_kich/graph/follow.rs
+++ b/crates/jacquard-api/src/io_kich/graph/follow.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -145,9 +148,9 @@ pub mod follow_state {
 
 /// Builder for constructing an instance of this type
 pub struct FollowBuilder<'a, S: follow_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Follow<'a> {
@@ -161,9 +164,9 @@ impl<'a> FollowBuilder<'a, follow_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FollowBuilder<'a, follow_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> FollowBuilder<'a, follow_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,8 +218,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -229,8 +232,8 @@ where
         >,
     ) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_kich/profile.rs b/crates/jacquard-api/src/io_kich/profile.rs
index cb4708f3..785ae8f0 100644
--- a/crates/jacquard-api/src/io_kich/profile.rs
+++ b/crates/jacquard-api/src/io_kich/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -144,9 +147,9 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -160,9 +163,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -177,11 +180,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ProfileBuilder<'a, profile_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -189,12 +192,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -207,8 +210,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -221,8 +224,8 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_kich/recipe/collection.rs b/crates/jacquard-api/src/io_kich/recipe/collection.rs
index 7a341da5..791ba2e7 100644
--- a/crates/jacquard-api/src/io_kich/recipe/collection.rs
+++ b/crates/jacquard-api/src/io_kich/recipe/collection.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -179,51 +182,51 @@ pub mod collection_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Name;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Name = S::Name;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type CreatedAt = S::CreatedAt;
         type Name = Set<members::name>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Name = S::Name;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CollectionBuilder<'a, S: collection_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Collection<'a> {
@@ -237,9 +240,9 @@ impl<'a> CollectionBuilder<'a, collection_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -254,11 +257,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionBuilder<'a, collection_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -266,12 +269,12 @@ where
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -279,12 +282,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -299,11 +302,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CollectionBuilder<'a, collection_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -311,12 +314,12 @@ where
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -324,17 +327,17 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S> CollectionBuilder<'a, S>
 where
     S: collection_state::State,
-    S::CreatedAt: collection_state::IsSet,
     S::Name: collection_state::IsSet,
+    S::CreatedAt: collection_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Collection<'a> {
         Collection {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            image: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            image: self._fields.2,
+            name: self._fields.3.unwrap(),
+            updated_at: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -347,11 +350,11 @@ where
         >,
     ) -> Collection<'a> {
         Collection {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            image: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            image: self._fields.2,
+            name: self._fields.3.unwrap(),
+            updated_at: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_kich/recipe/collectionfollow.rs b/crates/jacquard-api/src/io_kich/recipe/collectionfollow.rs
index 373a7d1d..ba28a19f 100644
--- a/crates/jacquard-api/src/io_kich/recipe/collectionfollow.rs
+++ b/crates/jacquard-api/src/io_kich/recipe/collectionfollow.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -110,45 +113,45 @@ pub mod collectionfollow_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subject;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subject = S::Subject;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CollectionfollowBuilder<'a, S: collectionfollow_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Collectionfollow<'a> {
@@ -162,9 +165,9 @@ impl<'a> CollectionfollowBuilder<'a, collectionfollow_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionfollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionfollowBuilder<'a, collectionfollow_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionfollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> CollectionfollowBuilder<'a, collectionfollow_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CollectionfollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,14 +213,14 @@ where
 impl<'a, S> CollectionfollowBuilder<'a, S>
 where
     S: collectionfollow_state::State,
-    S::CreatedAt: collectionfollow_state::IsSet,
     S::Subject: collectionfollow_state::IsSet,
+    S::CreatedAt: collectionfollow_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Collectionfollow<'a> {
         Collectionfollow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Collectionfollow<'a> {
         Collectionfollow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_kich/recipe/collectionitem.rs b/crates/jacquard-api/src/io_kich/recipe/collectionitem.rs
index bdee87e1..e833810a 100644
--- a/crates/jacquard-api/src/io_kich/recipe/collectionitem.rs
+++ b/crates/jacquard-api/src/io_kich/recipe/collectionitem.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -120,65 +123,65 @@ pub mod collectionitem_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Collection;
         type CreatedAt;
         type Subject;
-        type Collection;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Collection = Unset;
         type CreatedAt = Unset;
         type Subject = Unset;
-        type Collection = Unset;
+    }
+    ///State transition - sets the `collection` field to Set
+    pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCollection<S> {}
+    impl<S: State> State for SetCollection<S> {
+        type Collection = Set<members::collection>;
+        type CreatedAt = S::CreatedAt;
+        type Subject = S::Subject;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Collection = S::Collection;
         type CreatedAt = Set<members::created_at>;
         type Subject = S::Subject;
-        type Collection = S::Collection;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
-        type Subject = Set<members::subject>;
         type Collection = S::Collection;
-    }
-    ///State transition - sets the `collection` field to Set
-    pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCollection<S> {}
-    impl<S: State> State for SetCollection<S> {
         type CreatedAt = S::CreatedAt;
-        type Subject = S::Subject;
-        type Collection = Set<members::collection>;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `collection` field
+        pub struct collection(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
-        ///Marker type for the `collection` field
-        pub struct collection(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CollectionitemBuilder<'a, S: collectionitem_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Collectionitem<'a> {
@@ -192,9 +195,9 @@ impl<'a> CollectionitemBuilder<'a, collectionitem_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionitemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,11 +212,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CollectionitemBuilder<'a, collectionitem_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionitemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -228,11 +231,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionitemBuilder<'a, collectionitem_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CollectionitemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -240,12 +243,12 @@ where
 impl<'a, S: collectionitem_state::State> CollectionitemBuilder<'a, S> {
     /// Set the `group` field (optional)
     pub fn group(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `group` field to an Option value (optional)
     pub fn maybe_group(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -253,12 +256,12 @@ impl<'a, S: collectionitem_state::State> CollectionitemBuilder<'a, S> {
 impl<'a, S: collectionitem_state::State> CollectionitemBuilder<'a, S> {
     /// Set the `position` field (optional)
     pub fn position(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `position` field to an Option value (optional)
     pub fn maybe_position(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -273,11 +276,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> CollectionitemBuilder<'a, collectionitem_state::SetSubject<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         CollectionitemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -285,18 +288,18 @@ where
 impl<'a, S> CollectionitemBuilder<'a, S>
 where
     S: collectionitem_state::State,
+    S::Collection: collectionitem_state::IsSet,
     S::CreatedAt: collectionitem_state::IsSet,
     S::Subject: collectionitem_state::IsSet,
-    S::Collection: collectionitem_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Collectionitem<'a> {
         Collectionitem {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            group: self.__unsafe_private_named.2,
-            position: self.__unsafe_private_named.3,
-            subject: self.__unsafe_private_named.4.unwrap(),
+            collection: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            group: self._fields.2,
+            position: self._fields.3,
+            subject: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -309,11 +312,11 @@ where
         >,
     ) -> Collectionitem<'a> {
         Collectionitem {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            group: self.__unsafe_private_named.2,
-            position: self.__unsafe_private_named.3,
-            subject: self.__unsafe_private_named.4.unwrap(),
+            collection: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            group: self._fields.2,
+            position: self._fields.3,
+            subject: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_kich/recipe/like.rs b/crates/jacquard-api/src/io_kich/recipe/like.rs
index bb748e4c..d674356a 100644
--- a/crates/jacquard-api/src/io_kich/recipe/like.rs
+++ b/crates/jacquard-api/src/io_kich/recipe/like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -111,49 +114,45 @@ pub mod like_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subject;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subject = S::Subject;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<StrongRef<'a>>,
-        Option<StrongRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -167,9 +166,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -184,11 +183,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,11 +202,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,12 +214,12 @@ where
 impl<'a, S: like_state::State> LikeBuilder<'a, S> {
     /// Set the `via` field (optional)
     pub fn via(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `via` field to an Option value (optional)
     pub fn maybe_via(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -228,15 +227,15 @@ impl<'a, S: like_state::State> LikeBuilder<'a, S> {
 impl<'a, S> LikeBuilder<'a, S>
 where
     S: like_state::State,
-    S::CreatedAt: like_state::IsSet,
     S::Subject: like_state::IsSet,
+    S::CreatedAt: like_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            via: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            via: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -249,9 +248,9 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            via: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            via: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_kich/recipe/recipe.rs b/crates/jacquard-api/src/io_kich/recipe/recipe.rs
index 678fd808..fb794588 100644
--- a/crates/jacquard-api/src/io_kich/recipe/recipe.rs
+++ b/crates/jacquard-api/src/io_kich/recipe/recipe.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -731,8 +734,8 @@ pub mod recipe_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecipeBuilder<'a, S: recipe_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<Datetime>,
         Option<StrongRef<'a>>,
@@ -752,7 +755,7 @@ pub struct RecipeBuilder<'a, S: recipe_state::State> {
         Option<UriValue<'a>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Recipe<'a> {
@@ -766,8 +769,8 @@ impl<'a> RecipeBuilder<'a, recipe_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -787,7 +790,7 @@ impl<'a> RecipeBuilder<'a, recipe_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -795,12 +798,12 @@ impl<'a> RecipeBuilder<'a, recipe_state::Empty> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `cookTimeMinutes` field (optional)
     pub fn cook_time_minutes(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cookTimeMinutes` field to an Option value (optional)
     pub fn maybe_cook_time_minutes(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -815,11 +818,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RecipeBuilder<'a, recipe_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -827,12 +830,12 @@ where
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `createdBy` field (optional)
     pub fn created_by(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdBy` field to an Option value (optional)
     pub fn maybe_created_by(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -840,12 +843,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -853,12 +856,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `embedding` field (optional)
     pub fn embedding(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `embedding` field to an Option value (optional)
     pub fn maybe_embedding(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -866,12 +869,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `imageUrl` field (optional)
     pub fn image_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `imageUrl` field to an Option value (optional)
     pub fn maybe_image_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -879,12 +882,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `images` field (optional)
     pub fn images(mut self, value: impl Into<Option<Vec<BlobRef<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `images` field to an Option value (optional)
     pub fn maybe_images(mut self, value: Option<Vec<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -895,7 +898,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<recipe::Ingredient<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `ingredients` field to an Option value (optional)
@@ -903,7 +906,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<Vec<recipe::Ingredient<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -914,7 +917,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<recipe::InstructionStep<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `instructions` field to an Option value (optional)
@@ -922,7 +925,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<Vec<recipe::InstructionStep<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -930,12 +933,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `isPrivate` field (optional)
     pub fn is_private(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `isPrivate` field to an Option value (optional)
     pub fn maybe_is_private(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -950,11 +953,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RecipeBuilder<'a, recipe_state::SetName<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         RecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -962,12 +965,12 @@ where
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `prepTimeMinutes` field (optional)
     pub fn prep_time_minutes(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `prepTimeMinutes` field to an Option value (optional)
     pub fn maybe_prep_time_minutes(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -982,11 +985,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RecipeBuilder<'a, recipe_state::SetServings<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         RecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -994,12 +997,12 @@ where
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `source` field (optional)
     pub fn source(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `source` field to an Option value (optional)
     pub fn maybe_source(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -1007,12 +1010,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<recipe::Tag<'a>>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<recipe::Tag<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -1020,12 +1023,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -1033,12 +1036,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -1046,12 +1049,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `variationOf` field (optional)
     pub fn variation_of(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `variationOf` field to an Option value (optional)
     pub fn maybe_variation_of(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -1066,24 +1069,24 @@ where
     /// Build the final struct
     pub fn build(self) -> Recipe<'a> {
         Recipe {
-            cook_time_minutes: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            created_by: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            embedding: self.__unsafe_private_named.4,
-            image_url: self.__unsafe_private_named.5,
-            images: self.__unsafe_private_named.6,
-            ingredients: self.__unsafe_private_named.7,
-            instructions: self.__unsafe_private_named.8,
-            is_private: self.__unsafe_private_named.9.or_else(|| Some(false)),
-            name: self.__unsafe_private_named.10.unwrap(),
-            prep_time_minutes: self.__unsafe_private_named.11,
-            servings: self.__unsafe_private_named.12.unwrap(),
-            source: self.__unsafe_private_named.13,
-            tags: self.__unsafe_private_named.14,
-            updated_at: self.__unsafe_private_named.15,
-            url: self.__unsafe_private_named.16,
-            variation_of: self.__unsafe_private_named.17,
+            cook_time_minutes: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            created_by: self._fields.2,
+            description: self._fields.3,
+            embedding: self._fields.4,
+            image_url: self._fields.5,
+            images: self._fields.6,
+            ingredients: self._fields.7,
+            instructions: self._fields.8,
+            is_private: self._fields.9.or_else(|| Some(false)),
+            name: self._fields.10.unwrap(),
+            prep_time_minutes: self._fields.11,
+            servings: self._fields.12.unwrap(),
+            source: self._fields.13,
+            tags: self._fields.14,
+            updated_at: self._fields.15,
+            url: self._fields.16,
+            variation_of: self._fields.17,
             extra_data: Default::default(),
         }
     }
@@ -1096,24 +1099,24 @@ where
         >,
     ) -> Recipe<'a> {
         Recipe {
-            cook_time_minutes: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            created_by: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            embedding: self.__unsafe_private_named.4,
-            image_url: self.__unsafe_private_named.5,
-            images: self.__unsafe_private_named.6,
-            ingredients: self.__unsafe_private_named.7,
-            instructions: self.__unsafe_private_named.8,
-            is_private: self.__unsafe_private_named.9.or_else(|| Some(false)),
-            name: self.__unsafe_private_named.10.unwrap(),
-            prep_time_minutes: self.__unsafe_private_named.11,
-            servings: self.__unsafe_private_named.12.unwrap(),
-            source: self.__unsafe_private_named.13,
-            tags: self.__unsafe_private_named.14,
-            updated_at: self.__unsafe_private_named.15,
-            url: self.__unsafe_private_named.16,
-            variation_of: self.__unsafe_private_named.17,
+            cook_time_minutes: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            created_by: self._fields.2,
+            description: self._fields.3,
+            embedding: self._fields.4,
+            image_url: self._fields.5,
+            images: self._fields.6,
+            ingredients: self._fields.7,
+            instructions: self._fields.8,
+            is_private: self._fields.9.or_else(|| Some(false)),
+            name: self._fields.10.unwrap(),
+            prep_time_minutes: self._fields.11,
+            servings: self._fields.12.unwrap(),
+            source: self._fields.13,
+            tags: self._fields.14,
+            updated_at: self._fields.15,
+            url: self._fields.16,
+            variation_of: self._fields.17,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_kich/recipe/review.rs b/crates/jacquard-api/src/io_kich/recipe/review.rs
index 1a165aad..ad054ebe 100644
--- a/crates/jacquard-api/src/io_kich/recipe/review.rs
+++ b/crates/jacquard-api/src/io_kich/recipe/review.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -150,65 +153,65 @@ pub mod review_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
-        type CreatedAt;
         type Rating;
+        type CreatedAt;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
-        type CreatedAt = Unset;
         type Rating = Unset;
+        type CreatedAt = Unset;
+        type Subject = Unset;
     }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
+    ///State transition - sets the `rating` field to Set
+    pub struct SetRating<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRating<S> {}
+    impl<S: State> State for SetRating<S> {
+        type Rating = Set<members::rating>;
         type CreatedAt = S::CreatedAt;
-        type Rating = S::Rating;
+        type Subject = S::Subject;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
-        type CreatedAt = Set<members::created_at>;
         type Rating = S::Rating;
-    }
-    ///State transition - sets the `rating` field to Set
-    pub struct SetRating<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRating<S> {}
-    impl<S: State> State for SetRating<S> {
+        type CreatedAt = Set<members::created_at>;
         type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type Rating = S::Rating;
         type CreatedAt = S::CreatedAt;
-        type Rating = Set<members::rating>;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `rating` field
         pub struct rating(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReviewBuilder<'a, S: review_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<i64>,
         Option<StrongRef<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Review<'a> {
@@ -222,9 +225,9 @@ impl<'a> ReviewBuilder<'a, review_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,12 +235,12 @@ impl<'a> ReviewBuilder<'a, review_state::Empty> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -252,11 +255,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReviewBuilder<'a, review_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -271,11 +274,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ReviewBuilder<'a, review_state::SetRating<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -290,11 +293,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ReviewBuilder<'a, review_state::SetSubject<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -302,12 +305,12 @@ where
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -315,18 +318,18 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S> ReviewBuilder<'a, S>
 where
     S: review_state::State,
-    S::Subject: review_state::IsSet,
-    S::CreatedAt: review_state::IsSet,
     S::Rating: review_state::IsSet,
+    S::CreatedAt: review_state::IsSet,
+    S::Subject: review_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Review<'a> {
         Review {
-            comment: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            rating: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4,
+            comment: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            rating: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
+            updated_at: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -339,11 +342,11 @@ where
         >,
     ) -> Review<'a> {
         Review {
-            comment: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            rating: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4,
+            comment: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            rating: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
+            updated_at: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_kich/recipe/save.rs b/crates/jacquard-api/src/io_kich/recipe/save.rs
index 6b1f7ea9..c053f422 100644
--- a/crates/jacquard-api/src/io_kich/recipe/save.rs
+++ b/crates/jacquard-api/src/io_kich/recipe/save.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -112,49 +115,45 @@ pub mod save_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type CreatedAt;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
+        type Subject = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SaveBuilder<'a, S: save_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<StrongRef<'a>>,
-        Option<StrongRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Save<'a> {
@@ -168,9 +167,9 @@ impl<'a> SaveBuilder<'a, save_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SaveBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -185,11 +184,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SaveBuilder<'a, save_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SaveBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,11 +203,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> SaveBuilder<'a, save_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SaveBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,12 +215,12 @@ where
 impl<'a, S: save_state::State> SaveBuilder<'a, S> {
     /// Set the `via` field (optional)
     pub fn via(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `via` field to an Option value (optional)
     pub fn maybe_via(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -229,15 +228,15 @@ impl<'a, S: save_state::State> SaveBuilder<'a, S> {
 impl<'a, S> SaveBuilder<'a, S>
 where
     S: save_state::State,
-    S::Subject: save_state::IsSet,
     S::CreatedAt: save_state::IsSet,
+    S::Subject: save_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Save<'a> {
         Save {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            via: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            via: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -250,9 +249,9 @@ where
         >,
     ) -> Save<'a> {
         Save {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            via: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            via: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_livewire/p3k/podping00.rs b/crates/jacquard-api/src/io_livewire/p3k/podping00.rs
index aaa25dc7..4f99ed19 100644
--- a/crates/jacquard-api/src/io_livewire/p3k/podping00.rs
+++ b/crates/jacquard-api/src/io_livewire/p3k/podping00.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,9 +149,9 @@ pub mod podping00_state {
 
 /// Builder for constructing an instance of this type
 pub struct Podping00Builder<'a, S: podping00_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Podping00<'a> {
@@ -162,9 +165,9 @@ impl<'a> Podping00Builder<'a, podping00_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         Podping00Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> Podping00Builder<'a, podping00_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         Podping00Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> Podping00Builder<'a, podping00_state::SetUrl<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         Podping00Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,8 +219,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Podping00<'a> {
         Podping00 {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            url: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            url: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Podping00<'a> {
         Podping00 {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            url: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            url: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_sound/sequence.rs b/crates/jacquard-api/src/io_sound/sequence.rs
index 0964c5bb..b5ab525f 100644
--- a/crates/jacquard-api/src/io_sound/sequence.rs
+++ b/crates/jacquard-api/src/io_sound/sequence.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -213,8 +216,8 @@ pub mod sequence_state {
 
 /// Builder for constructing an instance of this type
 pub struct SequenceBuilder<'a, S: sequence_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<StrongRef<'a>>,
         Option<Vec<Credit<'a>>>,
         Option<Bytes>,
@@ -227,7 +230,7 @@ pub struct SequenceBuilder<'a, S: sequence_state::State> {
         Option<UriValue<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Sequence<'a> {
@@ -241,21 +244,9 @@ impl<'a> SequenceBuilder<'a, sequence_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SequenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -263,12 +254,12 @@ impl<'a> SequenceBuilder<'a, sequence_state::Empty> {
 impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
     /// Set the `bskyPostRef` field (optional)
     pub fn bsky_post_ref(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `bskyPostRef` field to an Option value (optional)
     pub fn maybe_bsky_post_ref(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -276,12 +267,12 @@ impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
 impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
     /// Set the `credits` field (optional)
     pub fn credits(mut self, value: impl Into<Option<Vec<Credit<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `credits` field to an Option value (optional)
     pub fn maybe_credits(mut self, value: Option<Vec<Credit<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -296,11 +287,11 @@ where
         mut self,
         value: impl Into<Bytes>,
     ) -> SequenceBuilder<'a, sequence_state::SetEvents<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SequenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -308,12 +299,12 @@ where
 impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
     /// Set the `id` field (optional)
     pub fn id(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `id` field to an Option value (optional)
     pub fn maybe_id(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -321,12 +312,12 @@ impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
 impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -334,12 +325,12 @@ impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
 impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
     /// Set the `publishedAt` field (optional)
     pub fn published_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `publishedAt` field to an Option value (optional)
     pub fn maybe_published_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -350,7 +341,7 @@ impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<sequence::Sequence<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `sequences` field to an Option value (optional)
@@ -358,7 +349,7 @@ impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
         mut self,
         value: Option<Vec<sequence::Sequence<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -366,12 +357,12 @@ impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
 impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -379,12 +370,12 @@ impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
 impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -392,12 +383,12 @@ impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
 impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -405,12 +396,12 @@ impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
 impl<'a, S: sequence_state::State> SequenceBuilder<'a, S> {
     /// Set the `version` field (optional)
     pub fn version(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `version` field to an Option value (optional)
     pub fn maybe_version(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -423,17 +414,17 @@ where
     /// Build the final struct
     pub fn build(self) -> Sequence<'a> {
         Sequence {
-            bsky_post_ref: self.__unsafe_private_named.0,
-            credits: self.__unsafe_private_named.1,
-            events: self.__unsafe_private_named.2.unwrap(),
-            id: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4,
-            published_at: self.__unsafe_private_named.5,
-            sequences: self.__unsafe_private_named.6,
-            tags: self.__unsafe_private_named.7,
-            updated_at: self.__unsafe_private_named.8,
-            url: self.__unsafe_private_named.9,
-            version: self.__unsafe_private_named.10,
+            bsky_post_ref: self._fields.0,
+            credits: self._fields.1,
+            events: self._fields.2.unwrap(),
+            id: self._fields.3,
+            name: self._fields.4,
+            published_at: self._fields.5,
+            sequences: self._fields.6,
+            tags: self._fields.7,
+            updated_at: self._fields.8,
+            url: self._fields.9,
+            version: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -446,17 +437,17 @@ where
         >,
     ) -> Sequence<'a> {
         Sequence {
-            bsky_post_ref: self.__unsafe_private_named.0,
-            credits: self.__unsafe_private_named.1,
-            events: self.__unsafe_private_named.2.unwrap(),
-            id: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4,
-            published_at: self.__unsafe_private_named.5,
-            sequences: self.__unsafe_private_named.6,
-            tags: self.__unsafe_private_named.7,
-            updated_at: self.__unsafe_private_named.8,
-            url: self.__unsafe_private_named.9,
-            version: self.__unsafe_private_named.10,
+            bsky_post_ref: self._fields.0,
+            credits: self._fields.1,
+            events: self._fields.2.unwrap(),
+            id: self._fields.3,
+            name: self._fields.4,
+            published_at: self._fields.5,
+            sequences: self._fields.6,
+            tags: self._fields.7,
+            updated_at: self._fields.8,
+            url: self._fields.9,
+            version: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_whiteley/ATlas/pin.rs b/crates/jacquard-api/src/io_whiteley/ATlas/pin.rs
index 84176362..23ddc2d9 100644
--- a/crates/jacquard-api/src/io_whiteley/ATlas/pin.rs
+++ b/crates/jacquard-api/src/io_whiteley/ATlas/pin.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -160,92 +163,92 @@ pub mod pin_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Longitude;
         type Latitude;
-        type Did;
-        type PlacedAt;
         type Description;
+        type PlacedAt;
+        type Longitude;
+        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Longitude = Unset;
         type Latitude = Unset;
-        type Did = Unset;
-        type PlacedAt = Unset;
         type Description = Unset;
-    }
-    ///State transition - sets the `longitude` field to Set
-    pub struct SetLongitude<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLongitude<S> {}
-    impl<S: State> State for SetLongitude<S> {
-        type Longitude = Set<members::longitude>;
-        type Latitude = S::Latitude;
-        type Did = S::Did;
-        type PlacedAt = S::PlacedAt;
-        type Description = S::Description;
+        type PlacedAt = Unset;
+        type Longitude = Unset;
+        type Did = Unset;
     }
     ///State transition - sets the `latitude` field to Set
     pub struct SetLatitude<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLatitude<S> {}
     impl<S: State> State for SetLatitude<S> {
-        type Longitude = S::Longitude;
         type Latitude = Set<members::latitude>;
-        type Did = S::Did;
-        type PlacedAt = S::PlacedAt;
         type Description = S::Description;
-    }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
+        type PlacedAt = S::PlacedAt;
         type Longitude = S::Longitude;
+        type Did = S::Did;
+    }
+    ///State transition - sets the `description` field to Set
+    pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDescription<S> {}
+    impl<S: State> State for SetDescription<S> {
         type Latitude = S::Latitude;
-        type Did = Set<members::did>;
+        type Description = Set<members::description>;
         type PlacedAt = S::PlacedAt;
-        type Description = S::Description;
+        type Longitude = S::Longitude;
+        type Did = S::Did;
     }
     ///State transition - sets the `placed_at` field to Set
     pub struct SetPlacedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPlacedAt<S> {}
     impl<S: State> State for SetPlacedAt<S> {
-        type Longitude = S::Longitude;
         type Latitude = S::Latitude;
-        type Did = S::Did;
-        type PlacedAt = Set<members::placed_at>;
         type Description = S::Description;
-    }
-    ///State transition - sets the `description` field to Set
-    pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDescription<S> {}
-    impl<S: State> State for SetDescription<S> {
+        type PlacedAt = Set<members::placed_at>;
         type Longitude = S::Longitude;
+        type Did = S::Did;
+    }
+    ///State transition - sets the `longitude` field to Set
+    pub struct SetLongitude<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLongitude<S> {}
+    impl<S: State> State for SetLongitude<S> {
         type Latitude = S::Latitude;
+        type Description = S::Description;
+        type PlacedAt = S::PlacedAt;
+        type Longitude = Set<members::longitude>;
         type Did = S::Did;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Latitude = S::Latitude;
+        type Description = S::Description;
         type PlacedAt = S::PlacedAt;
-        type Description = Set<members::description>;
+        type Longitude = S::Longitude;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `longitude` field
-        pub struct longitude(());
         ///Marker type for the `latitude` field
         pub struct latitude(());
-        ///Marker type for the `did` field
-        pub struct did(());
-        ///Marker type for the `placed_at` field
-        pub struct placed_at(());
         ///Marker type for the `description` field
         pub struct description(());
+        ///Marker type for the `placed_at` field
+        pub struct placed_at(());
+        ///Marker type for the `longitude` field
+        pub struct longitude(());
+        ///Marker type for the `did` field
+        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PinBuilder<'a, S: pin_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
@@ -253,7 +256,7 @@ pub struct PinBuilder<'a, S: pin_state::State> {
         Option<Datetime>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Pin<'a> {
@@ -267,9 +270,9 @@ impl<'a> PinBuilder<'a, pin_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -284,11 +287,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PinBuilder<'a, pin_state::SetDescription<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -303,11 +306,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> PinBuilder<'a, pin_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -322,11 +325,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PinBuilder<'a, pin_state::SetLatitude<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -341,11 +344,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PinBuilder<'a, pin_state::SetLongitude<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -360,11 +363,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PinBuilder<'a, pin_state::SetPlacedAt<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -372,12 +375,12 @@ where
 impl<'a, S: pin_state::State> PinBuilder<'a, S> {
     /// Set the `website` field (optional)
     pub fn website(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `website` field to an Option value (optional)
     pub fn maybe_website(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -385,21 +388,21 @@ impl<'a, S: pin_state::State> PinBuilder<'a, S> {
 impl<'a, S> PinBuilder<'a, S>
 where
     S: pin_state::State,
-    S::Longitude: pin_state::IsSet,
     S::Latitude: pin_state::IsSet,
-    S::Did: pin_state::IsSet,
-    S::PlacedAt: pin_state::IsSet,
     S::Description: pin_state::IsSet,
+    S::PlacedAt: pin_state::IsSet,
+    S::Longitude: pin_state::IsSet,
+    S::Did: pin_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Pin<'a> {
         Pin {
-            description: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            latitude: self.__unsafe_private_named.2.unwrap(),
-            longitude: self.__unsafe_private_named.3.unwrap(),
-            placed_at: self.__unsafe_private_named.4.unwrap(),
-            website: self.__unsafe_private_named.5,
+            description: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            latitude: self._fields.2.unwrap(),
+            longitude: self._fields.3.unwrap(),
+            placed_at: self._fields.4.unwrap(),
+            website: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -412,12 +415,12 @@ where
         >,
     ) -> Pin<'a> {
         Pin {
-            description: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            latitude: self.__unsafe_private_named.2.unwrap(),
-            longitude: self.__unsafe_private_named.3.unwrap(),
-            placed_at: self.__unsafe_private_named.4.unwrap(),
-            website: self.__unsafe_private_named.5,
+            description: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            latitude: self._fields.2.unwrap(),
+            longitude: self._fields.3.unwrap(),
+            placed_at: self._fields.4.unwrap(),
+            website: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_whiteley/luke/ATlas/pin.rs b/crates/jacquard-api/src/io_whiteley/luke/ATlas/pin.rs
index f4e2a934..7927a9ec 100644
--- a/crates/jacquard-api/src/io_whiteley/luke/ATlas/pin.rs
+++ b/crates/jacquard-api/src/io_whiteley/luke/ATlas/pin.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -162,9 +165,9 @@ pub mod pin_state {
     pub trait State: sealed::Sealed {
         type Did;
         type Longitude;
-        type Latitude;
         type PlacedAt;
         type Description;
+        type Latitude;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
@@ -172,9 +175,9 @@ pub mod pin_state {
     impl State for Empty {
         type Did = Unset;
         type Longitude = Unset;
-        type Latitude = Unset;
         type PlacedAt = Unset;
         type Description = Unset;
+        type Latitude = Unset;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
@@ -182,9 +185,9 @@ pub mod pin_state {
     impl<S: State> State for SetDid<S> {
         type Did = Set<members::did>;
         type Longitude = S::Longitude;
-        type Latitude = S::Latitude;
         type PlacedAt = S::PlacedAt;
         type Description = S::Description;
+        type Latitude = S::Latitude;
     }
     ///State transition - sets the `longitude` field to Set
     pub struct SetLongitude<S: State = Empty>(PhantomData<fn() -> S>);
@@ -192,19 +195,9 @@ pub mod pin_state {
     impl<S: State> State for SetLongitude<S> {
         type Did = S::Did;
         type Longitude = Set<members::longitude>;
-        type Latitude = S::Latitude;
-        type PlacedAt = S::PlacedAt;
-        type Description = S::Description;
-    }
-    ///State transition - sets the `latitude` field to Set
-    pub struct SetLatitude<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLatitude<S> {}
-    impl<S: State> State for SetLatitude<S> {
-        type Did = S::Did;
-        type Longitude = S::Longitude;
-        type Latitude = Set<members::latitude>;
         type PlacedAt = S::PlacedAt;
         type Description = S::Description;
+        type Latitude = S::Latitude;
     }
     ///State transition - sets the `placed_at` field to Set
     pub struct SetPlacedAt<S: State = Empty>(PhantomData<fn() -> S>);
@@ -212,9 +205,9 @@ pub mod pin_state {
     impl<S: State> State for SetPlacedAt<S> {
         type Did = S::Did;
         type Longitude = S::Longitude;
-        type Latitude = S::Latitude;
         type PlacedAt = Set<members::placed_at>;
         type Description = S::Description;
+        type Latitude = S::Latitude;
     }
     ///State transition - sets the `description` field to Set
     pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
@@ -222,9 +215,19 @@ pub mod pin_state {
     impl<S: State> State for SetDescription<S> {
         type Did = S::Did;
         type Longitude = S::Longitude;
-        type Latitude = S::Latitude;
         type PlacedAt = S::PlacedAt;
         type Description = Set<members::description>;
+        type Latitude = S::Latitude;
+    }
+    ///State transition - sets the `latitude` field to Set
+    pub struct SetLatitude<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLatitude<S> {}
+    impl<S: State> State for SetLatitude<S> {
+        type Did = S::Did;
+        type Longitude = S::Longitude;
+        type PlacedAt = S::PlacedAt;
+        type Description = S::Description;
+        type Latitude = Set<members::latitude>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
@@ -233,19 +236,19 @@ pub mod pin_state {
         pub struct did(());
         ///Marker type for the `longitude` field
         pub struct longitude(());
-        ///Marker type for the `latitude` field
-        pub struct latitude(());
         ///Marker type for the `placed_at` field
         pub struct placed_at(());
         ///Marker type for the `description` field
         pub struct description(());
+        ///Marker type for the `latitude` field
+        pub struct latitude(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PinBuilder<'a, S: pin_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
@@ -253,7 +256,7 @@ pub struct PinBuilder<'a, S: pin_state::State> {
         Option<Datetime>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Pin<'a> {
@@ -267,9 +270,9 @@ impl<'a> PinBuilder<'a, pin_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -284,11 +287,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PinBuilder<'a, pin_state::SetDescription<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -303,11 +306,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> PinBuilder<'a, pin_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -322,11 +325,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PinBuilder<'a, pin_state::SetLatitude<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -341,11 +344,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PinBuilder<'a, pin_state::SetLongitude<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -360,11 +363,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PinBuilder<'a, pin_state::SetPlacedAt<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PinBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -372,12 +375,12 @@ where
 impl<'a, S: pin_state::State> PinBuilder<'a, S> {
     /// Set the `website` field (optional)
     pub fn website(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `website` field to an Option value (optional)
     pub fn maybe_website(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -387,19 +390,19 @@ where
     S: pin_state::State,
     S::Did: pin_state::IsSet,
     S::Longitude: pin_state::IsSet,
-    S::Latitude: pin_state::IsSet,
     S::PlacedAt: pin_state::IsSet,
     S::Description: pin_state::IsSet,
+    S::Latitude: pin_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Pin<'a> {
         Pin {
-            description: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            latitude: self.__unsafe_private_named.2.unwrap(),
-            longitude: self.__unsafe_private_named.3.unwrap(),
-            placed_at: self.__unsafe_private_named.4.unwrap(),
-            website: self.__unsafe_private_named.5,
+            description: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            latitude: self._fields.2.unwrap(),
+            longitude: self._fields.3.unwrap(),
+            placed_at: self._fields.4.unwrap(),
+            website: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -412,12 +415,12 @@ where
         >,
     ) -> Pin<'a> {
         Pin {
-            description: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            latitude: self.__unsafe_private_named.2.unwrap(),
-            longitude: self.__unsafe_private_named.3.unwrap(),
-            placed_at: self.__unsafe_private_named.4.unwrap(),
-            website: self.__unsafe_private_named.5,
+            description: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            latitude: self._fields.2.unwrap(),
+            longitude: self._fields.3.unwrap(),
+            placed_at: self._fields.4.unwrap(),
+            website: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_whiteside/linked_account.rs b/crates/jacquard-api/src/io_whiteside/linked_account.rs
index 04c7902e..9f188b6a 100644
--- a/crates/jacquard-api/src/io_whiteside/linked_account.rs
+++ b/crates/jacquard-api/src/io_whiteside/linked_account.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -118,63 +121,58 @@ pub mod linked_account_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Link;
-        type Name;
         type Icon;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Link = Unset;
-        type Name = Unset;
         type Icon = Unset;
+        type Name = Unset;
     }
     ///State transition - sets the `link` field to Set
     pub struct SetLink<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLink<S> {}
     impl<S: State> State for SetLink<S> {
         type Link = Set<members::link>;
-        type Name = S::Name;
-        type Icon = S::Icon;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Link = S::Link;
-        type Name = Set<members::name>;
         type Icon = S::Icon;
+        type Name = S::Name;
     }
     ///State transition - sets the `icon` field to Set
     pub struct SetIcon<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIcon<S> {}
     impl<S: State> State for SetIcon<S> {
         type Link = S::Link;
-        type Name = S::Name;
         type Icon = Set<members::icon>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Link = S::Link;
+        type Icon = S::Icon;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `link` field
         pub struct link(());
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `icon` field
         pub struct icon(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LinkedAccountBuilder<'a, S: linked_account_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<UriValue<'a>>,
-        Option<CowStr<'a>>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<UriValue<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LinkedAccount<'a> {
@@ -188,9 +186,9 @@ impl<'a> LinkedAccountBuilder<'a, linked_account_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinkedAccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -205,11 +203,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LinkedAccountBuilder<'a, linked_account_state::SetIcon<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LinkedAccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -224,11 +222,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LinkedAccountBuilder<'a, linked_account_state::SetLink<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LinkedAccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -243,11 +241,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LinkedAccountBuilder<'a, linked_account_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LinkedAccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -255,12 +253,12 @@ where
 impl<'a, S: linked_account_state::State> LinkedAccountBuilder<'a, S> {
     /// Set the `order` field (optional)
     pub fn order(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `order` field to an Option value (optional)
     pub fn maybe_order(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -269,16 +267,16 @@ impl<'a, S> LinkedAccountBuilder<'a, S>
 where
     S: linked_account_state::State,
     S::Link: linked_account_state::IsSet,
-    S::Name: linked_account_state::IsSet,
     S::Icon: linked_account_state::IsSet,
+    S::Name: linked_account_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LinkedAccount<'a> {
         LinkedAccount {
-            icon: self.__unsafe_private_named.0.unwrap(),
-            link: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            order: self.__unsafe_private_named.3,
+            icon: self._fields.0.unwrap(),
+            link: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            order: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -291,10 +289,10 @@ where
         >,
     ) -> LinkedAccount<'a> {
         LinkedAccount {
-            icon: self.__unsafe_private_named.0.unwrap(),
-            link: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            order: self.__unsafe_private_named.3,
+            icon: self._fields.0.unwrap(),
+            link: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            order: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/io_whiteside/profile.rs b/crates/jacquard-api/src/io_whiteside/profile.rs
index 7e4abd56..e72833ec 100644
--- a/crates/jacquard-api/src/io_whiteside/profile.rs
+++ b/crates/jacquard-api/src/io_whiteside/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -135,59 +138,59 @@ pub mod profile_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Heading;
-        type Content;
         type UpdatedAt;
+        type Content;
+        type Heading;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Heading = Unset;
-        type Content = Unset;
         type UpdatedAt = Unset;
+        type Content = Unset;
+        type Heading = Unset;
     }
-    ///State transition - sets the `heading` field to Set
-    pub struct SetHeading<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHeading<S> {}
-    impl<S: State> State for SetHeading<S> {
-        type Heading = Set<members::heading>;
+    ///State transition - sets the `updated_at` field to Set
+    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
+    impl<S: State> State for SetUpdatedAt<S> {
+        type UpdatedAt = Set<members::updated_at>;
         type Content = S::Content;
-        type UpdatedAt = S::UpdatedAt;
+        type Heading = S::Heading;
     }
     ///State transition - sets the `content` field to Set
     pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContent<S> {}
     impl<S: State> State for SetContent<S> {
-        type Heading = S::Heading;
-        type Content = Set<members::content>;
         type UpdatedAt = S::UpdatedAt;
-    }
-    ///State transition - sets the `updated_at` field to Set
-    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
-    impl<S: State> State for SetUpdatedAt<S> {
+        type Content = Set<members::content>;
         type Heading = S::Heading;
+    }
+    ///State transition - sets the `heading` field to Set
+    pub struct SetHeading<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHeading<S> {}
+    impl<S: State> State for SetHeading<S> {
+        type UpdatedAt = S::UpdatedAt;
         type Content = S::Content;
-        type UpdatedAt = Set<members::updated_at>;
+        type Heading = Set<members::heading>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `heading` field
-        pub struct heading(());
-        ///Marker type for the `content` field
-        pub struct content(());
         ///Marker type for the `updated_at` field
         pub struct updated_at(());
+        ///Marker type for the `content` field
+        pub struct content(());
+        ///Marker type for the `heading` field
+        pub struct heading(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -201,9 +204,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -218,11 +221,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProfileBuilder<'a, profile_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -237,11 +240,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProfileBuilder<'a, profile_state::SetHeading<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -256,11 +259,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ProfileBuilder<'a, profile_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -268,16 +271,16 @@ where
 impl<'a, S> ProfileBuilder<'a, S>
 where
     S: profile_state::State,
-    S::Heading: profile_state::IsSet,
-    S::Content: profile_state::IsSet,
     S::UpdatedAt: profile_state::IsSet,
+    S::Content: profile_state::IsSet,
+    S::Heading: profile_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            content: self.__unsafe_private_named.0.unwrap(),
-            heading: self.__unsafe_private_named.1.unwrap(),
-            updated_at: self.__unsafe_private_named.2.unwrap(),
+            content: self._fields.0.unwrap(),
+            heading: self._fields.1.unwrap(),
+            updated_at: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -290,9 +293,9 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            content: self.__unsafe_private_named.0.unwrap(),
-            heading: self.__unsafe_private_named.1.unwrap(),
-            updated_at: self.__unsafe_private_named.2.unwrap(),
+            content: self._fields.0.unwrap(),
+            heading: self._fields.1.unwrap(),
+            updated_at: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/link_bridgebeats/lookup.rs b/crates/jacquard-api/src/link_bridgebeats/lookup.rs
index d7a1d19c..4b06b9c1 100644
--- a/crates/jacquard-api/src/link_bridgebeats/lookup.rs
+++ b/crates/jacquard-api/src/link_bridgebeats/lookup.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -247,45 +250,45 @@ pub mod lookup_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type LookedUpAt;
         type Results;
+        type LookedUpAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type LookedUpAt = Unset;
         type Results = Unset;
-    }
-    ///State transition - sets the `looked_up_at` field to Set
-    pub struct SetLookedUpAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLookedUpAt<S> {}
-    impl<S: State> State for SetLookedUpAt<S> {
-        type LookedUpAt = Set<members::looked_up_at>;
-        type Results = S::Results;
+        type LookedUpAt = Unset;
     }
     ///State transition - sets the `results` field to Set
     pub struct SetResults<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetResults<S> {}
     impl<S: State> State for SetResults<S> {
-        type LookedUpAt = S::LookedUpAt;
         type Results = Set<members::results>;
+        type LookedUpAt = S::LookedUpAt;
+    }
+    ///State transition - sets the `looked_up_at` field to Set
+    pub struct SetLookedUpAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLookedUpAt<S> {}
+    impl<S: State> State for SetLookedUpAt<S> {
+        type Results = S::Results;
+        type LookedUpAt = Set<members::looked_up_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `looked_up_at` field
-        pub struct looked_up_at(());
         ///Marker type for the `results` field
         pub struct results(());
+        ///Marker type for the `looked_up_at` field
+        pub struct looked_up_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LookupBuilder<'a, S: lookup_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Vec<lookup::ProviderResult<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Vec<lookup::ProviderResult<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Lookup<'a> {
@@ -299,9 +302,9 @@ impl<'a> LookupBuilder<'a, lookup_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LookupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -316,11 +319,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LookupBuilder<'a, lookup_state::SetLookedUpAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LookupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -335,11 +338,11 @@ where
         mut self,
         value: impl Into<Vec<lookup::ProviderResult<'a>>>,
     ) -> LookupBuilder<'a, lookup_state::SetResults<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LookupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -347,14 +350,14 @@ where
 impl<'a, S> LookupBuilder<'a, S>
 where
     S: lookup_state::State,
-    S::LookedUpAt: lookup_state::IsSet,
     S::Results: lookup_state::IsSet,
+    S::LookedUpAt: lookup_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Lookup<'a> {
         Lookup {
-            looked_up_at: self.__unsafe_private_named.0.unwrap(),
-            results: self.__unsafe_private_named.1.unwrap(),
+            looked_up_at: self._fields.0.unwrap(),
+            results: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -367,8 +370,8 @@ where
         >,
     ) -> Lookup<'a> {
         Lookup {
-            looked_up_at: self.__unsafe_private_named.0.unwrap(),
-            results: self.__unsafe_private_named.1.unwrap(),
+            looked_up_at: self._fields.0.unwrap(),
+            results: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -570,92 +573,92 @@ pub mod provider_result_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Provider;
         type Artist;
-        type Url;
         type MarketRegion;
+        type Url;
         type Title;
+        type Provider;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Provider = Unset;
         type Artist = Unset;
-        type Url = Unset;
         type MarketRegion = Unset;
+        type Url = Unset;
         type Title = Unset;
-    }
-    ///State transition - sets the `provider` field to Set
-    pub struct SetProvider<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetProvider<S> {}
-    impl<S: State> State for SetProvider<S> {
-        type Provider = Set<members::provider>;
-        type Artist = S::Artist;
-        type Url = S::Url;
-        type MarketRegion = S::MarketRegion;
-        type Title = S::Title;
+        type Provider = Unset;
     }
     ///State transition - sets the `artist` field to Set
     pub struct SetArtist<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetArtist<S> {}
     impl<S: State> State for SetArtist<S> {
-        type Provider = S::Provider;
         type Artist = Set<members::artist>;
-        type Url = S::Url;
         type MarketRegion = S::MarketRegion;
+        type Url = S::Url;
         type Title = S::Title;
-    }
-    ///State transition - sets the `url` field to Set
-    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUrl<S> {}
-    impl<S: State> State for SetUrl<S> {
         type Provider = S::Provider;
-        type Artist = S::Artist;
-        type Url = Set<members::url>;
-        type MarketRegion = S::MarketRegion;
-        type Title = S::Title;
     }
     ///State transition - sets the `market_region` field to Set
     pub struct SetMarketRegion<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMarketRegion<S> {}
     impl<S: State> State for SetMarketRegion<S> {
-        type Provider = S::Provider;
         type Artist = S::Artist;
-        type Url = S::Url;
         type MarketRegion = Set<members::market_region>;
+        type Url = S::Url;
         type Title = S::Title;
+        type Provider = S::Provider;
+    }
+    ///State transition - sets the `url` field to Set
+    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUrl<S> {}
+    impl<S: State> State for SetUrl<S> {
+        type Artist = S::Artist;
+        type MarketRegion = S::MarketRegion;
+        type Url = Set<members::url>;
+        type Title = S::Title;
+        type Provider = S::Provider;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Provider = S::Provider;
         type Artist = S::Artist;
-        type Url = S::Url;
         type MarketRegion = S::MarketRegion;
+        type Url = S::Url;
         type Title = Set<members::title>;
+        type Provider = S::Provider;
+    }
+    ///State transition - sets the `provider` field to Set
+    pub struct SetProvider<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetProvider<S> {}
+    impl<S: State> State for SetProvider<S> {
+        type Artist = S::Artist;
+        type MarketRegion = S::MarketRegion;
+        type Url = S::Url;
+        type Title = S::Title;
+        type Provider = Set<members::provider>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `provider` field
-        pub struct provider(());
         ///Marker type for the `artist` field
         pub struct artist(());
-        ///Marker type for the `url` field
-        pub struct url(());
         ///Marker type for the `market_region` field
         pub struct market_region(());
+        ///Marker type for the `url` field
+        pub struct url(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `provider` field
+        pub struct provider(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ProviderResultBuilder<'a, S: provider_result_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -665,7 +668,7 @@ pub struct ProviderResultBuilder<'a, S: provider_result_state::State> {
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProviderResult<'a> {
@@ -679,9 +682,9 @@ impl<'a> ProviderResultBuilder<'a, provider_result_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProviderResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -689,12 +692,12 @@ impl<'a> ProviderResultBuilder<'a, provider_result_state::Empty> {
 impl<'a, S: provider_result_state::State> ProviderResultBuilder<'a, S> {
     /// Set the `artUrl` field (optional)
     pub fn art_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `artUrl` field to an Option value (optional)
     pub fn maybe_art_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -709,11 +712,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProviderResultBuilder<'a, provider_result_state::SetArtist<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ProviderResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -721,12 +724,12 @@ where
 impl<'a, S: provider_result_state::State> ProviderResultBuilder<'a, S> {
     /// Set the `externalId` field (optional)
     pub fn external_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `externalId` field to an Option value (optional)
     pub fn maybe_external_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -734,12 +737,12 @@ impl<'a, S: provider_result_state::State> ProviderResultBuilder<'a, S> {
 impl<'a, S: provider_result_state::State> ProviderResultBuilder<'a, S> {
     /// Set the `isAlbum` field (optional)
     pub fn is_album(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `isAlbum` field to an Option value (optional)
     pub fn maybe_is_album(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -754,11 +757,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProviderResultBuilder<'a, provider_result_state::SetMarketRegion<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ProviderResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -773,11 +776,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProviderResultBuilder<'a, provider_result_state::SetProvider<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ProviderResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -792,11 +795,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProviderResultBuilder<'a, provider_result_state::SetTitle<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ProviderResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -811,11 +814,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ProviderResultBuilder<'a, provider_result_state::SetUrl<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ProviderResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -823,23 +826,23 @@ where
 impl<'a, S> ProviderResultBuilder<'a, S>
 where
     S: provider_result_state::State,
-    S::Provider: provider_result_state::IsSet,
     S::Artist: provider_result_state::IsSet,
-    S::Url: provider_result_state::IsSet,
     S::MarketRegion: provider_result_state::IsSet,
+    S::Url: provider_result_state::IsSet,
     S::Title: provider_result_state::IsSet,
+    S::Provider: provider_result_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ProviderResult<'a> {
         ProviderResult {
-            art_url: self.__unsafe_private_named.0,
-            artist: self.__unsafe_private_named.1.unwrap(),
-            external_id: self.__unsafe_private_named.2,
-            is_album: self.__unsafe_private_named.3,
-            market_region: self.__unsafe_private_named.4.unwrap(),
-            provider: self.__unsafe_private_named.5.unwrap(),
-            title: self.__unsafe_private_named.6.unwrap(),
-            url: self.__unsafe_private_named.7.unwrap(),
+            art_url: self._fields.0,
+            artist: self._fields.1.unwrap(),
+            external_id: self._fields.2,
+            is_album: self._fields.3,
+            market_region: self._fields.4.unwrap(),
+            provider: self._fields.5.unwrap(),
+            title: self._fields.6.unwrap(),
+            url: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -852,14 +855,14 @@ where
         >,
     ) -> ProviderResult<'a> {
         ProviderResult {
-            art_url: self.__unsafe_private_named.0,
-            artist: self.__unsafe_private_named.1.unwrap(),
-            external_id: self.__unsafe_private_named.2,
-            is_album: self.__unsafe_private_named.3,
-            market_region: self.__unsafe_private_named.4.unwrap(),
-            provider: self.__unsafe_private_named.5.unwrap(),
-            title: self.__unsafe_private_named.6.unwrap(),
-            url: self.__unsafe_private_named.7.unwrap(),
+            art_url: self._fields.0,
+            artist: self._fields.1.unwrap(),
+            external_id: self._fields.2,
+            is_album: self._fields.3,
+            market_region: self._fields.4.unwrap(),
+            provider: self._fields.5.unwrap(),
+            title: self._fields.6.unwrap(),
+            url: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/lol_gayfamicom/hi.rs b/crates/jacquard-api/src/lol_gayfamicom/hi.rs
index e8695ff6..38e04b29 100644
--- a/crates/jacquard-api/src/lol_gayfamicom/hi.rs
+++ b/crates/jacquard-api/src/lol_gayfamicom/hi.rs
@@ -7,7 +7,11 @@
 
 pub mod hello;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -122,9 +126,9 @@ pub mod hi_state {
 
 /// Builder for constructing an instance of this type
 pub struct HiBuilder<'a, S: hi_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Hi<'a> {
@@ -138,9 +142,9 @@ impl<'a> HiBuilder<'a, hi_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HiBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,12 +152,12 @@ impl<'a> HiBuilder<'a, hi_state::Empty> {
 impl<'a, S: hi_state::State> HiBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -161,12 +165,12 @@ impl<'a, S: hi_state::State> HiBuilder<'a, S> {
 impl<'a, S: hi_state::State> HiBuilder<'a, S> {
     /// Set the `hello` field (optional)
     pub fn hello(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `hello` field to an Option value (optional)
     pub fn maybe_hello(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -178,8 +182,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Hi<'a> {
         Hi {
-            created_at: self.__unsafe_private_named.0,
-            hello: self.__unsafe_private_named.1,
+            created_at: self._fields.0,
+            hello: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -192,8 +196,8 @@ where
         >,
     ) -> Hi<'a> {
         Hi {
-            created_at: self.__unsafe_private_named.0,
-            hello: self.__unsafe_private_named.1,
+            created_at: self._fields.0,
+            hello: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/lol_gayfamicom/hi/hello.rs b/crates/jacquard-api/src/lol_gayfamicom/hi/hello.rs
index 3aa91b13..45ab23f3 100644
--- a/crates/jacquard-api/src/lol_gayfamicom/hi/hello.rs
+++ b/crates/jacquard-api/src/lol_gayfamicom/hi/hello.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -122,9 +125,9 @@ pub mod hello_state {
 
 /// Builder for constructing an instance of this type
 pub struct HelloBuilder<'a, S: hello_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Hello<'a> {
@@ -138,9 +141,9 @@ impl<'a> HelloBuilder<'a, hello_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HelloBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,12 +151,12 @@ impl<'a> HelloBuilder<'a, hello_state::Empty> {
 impl<'a, S: hello_state::State> HelloBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -161,12 +164,12 @@ impl<'a, S: hello_state::State> HelloBuilder<'a, S> {
 impl<'a, S: hello_state::State> HelloBuilder<'a, S> {
     /// Set the `hello` field (optional)
     pub fn hello(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `hello` field to an Option value (optional)
     pub fn maybe_hello(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -178,8 +181,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Hello<'a> {
         Hello {
-            created_at: self.__unsafe_private_named.0,
-            hello: self.__unsafe_private_named.1,
+            created_at: self._fields.0,
+            hello: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -192,8 +195,8 @@ where
         >,
     ) -> Hello<'a> {
         Hello {
-            created_at: self.__unsafe_private_named.0,
-            hello: self.__unsafe_private_named.1,
+            created_at: self._fields.0,
+            hello: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/lol_jbc/feed/bite.rs b/crates/jacquard-api/src/lol_jbc/feed/bite.rs
index ee42dce5..f22922b6 100644
--- a/crates/jacquard-api/src/lol_jbc/feed/bite.rs
+++ b/crates/jacquard-api/src/lol_jbc/feed/bite.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -121,9 +124,9 @@ pub mod bite_state {
 
 /// Builder for constructing an instance of this type
 pub struct BiteBuilder<'a, S: bite_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Bite<'a> {
@@ -137,9 +140,9 @@ impl<'a> BiteBuilder<'a, bite_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BiteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -147,12 +150,12 @@ impl<'a> BiteBuilder<'a, bite_state::Empty> {
 impl<'a, S: bite_state::State> BiteBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -160,12 +163,12 @@ impl<'a, S: bite_state::State> BiteBuilder<'a, S> {
 impl<'a, S: bite_state::State> BiteBuilder<'a, S> {
     /// Set the `subject` field (optional)
     pub fn subject(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `subject` field to an Option value (optional)
     pub fn maybe_subject(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -177,8 +180,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Bite<'a> {
         Bite {
-            created_at: self.__unsafe_private_named.0,
-            subject: self.__unsafe_private_named.1,
+            created_at: self._fields.0,
+            subject: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -191,8 +194,8 @@ where
         >,
     ) -> Bite<'a> {
         Bite {
-            created_at: self.__unsafe_private_named.0,
-            subject: self.__unsafe_private_named.1,
+            created_at: self._fields.0,
+            subject: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/me_linkna/lastfm.rs b/crates/jacquard-api/src/me_linkna/lastfm.rs
index 426de5f1..984e3fec 100644
--- a/crates/jacquard-api/src/me_linkna/lastfm.rs
+++ b/crates/jacquard-api/src/me_linkna/lastfm.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -140,58 +143,58 @@ pub mod lastfm_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type ArtistNames;
         type TrackName;
         type CreatedAt;
-        type ArtistNames;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type ArtistNames = Unset;
         type TrackName = Unset;
         type CreatedAt = Unset;
-        type ArtistNames = Unset;
+    }
+    ///State transition - sets the `artist_names` field to Set
+    pub struct SetArtistNames<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetArtistNames<S> {}
+    impl<S: State> State for SetArtistNames<S> {
+        type ArtistNames = Set<members::artist_names>;
+        type TrackName = S::TrackName;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `track_name` field to Set
     pub struct SetTrackName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTrackName<S> {}
     impl<S: State> State for SetTrackName<S> {
+        type ArtistNames = S::ArtistNames;
         type TrackName = Set<members::track_name>;
         type CreatedAt = S::CreatedAt;
-        type ArtistNames = S::ArtistNames;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type TrackName = S::TrackName;
-        type CreatedAt = Set<members::created_at>;
         type ArtistNames = S::ArtistNames;
-    }
-    ///State transition - sets the `artist_names` field to Set
-    pub struct SetArtistNames<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetArtistNames<S> {}
-    impl<S: State> State for SetArtistNames<S> {
         type TrackName = S::TrackName;
-        type CreatedAt = S::CreatedAt;
-        type ArtistNames = Set<members::artist_names>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `artist_names` field
+        pub struct artist_names(());
         ///Marker type for the `track_name` field
         pub struct track_name(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `artist_names` field
-        pub struct artist_names(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LastfmBuilder<'a, S: lastfm_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
@@ -203,7 +206,7 @@ pub struct LastfmBuilder<'a, S: lastfm_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Lastfm<'a> {
@@ -217,20 +220,9 @@ impl<'a> LastfmBuilder<'a, lastfm_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LastfmBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -238,12 +230,12 @@ impl<'a> LastfmBuilder<'a, lastfm_state::Empty> {
 impl<'a, S: lastfm_state::State> LastfmBuilder<'a, S> {
     /// Set the `artistMbId` field (optional)
     pub fn artist_mb_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `artistMbId` field to an Option value (optional)
     pub fn maybe_artist_mb_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -258,11 +250,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> LastfmBuilder<'a, lastfm_state::SetArtistNames<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LastfmBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -270,12 +262,12 @@ where
 impl<'a, S: lastfm_state::State> LastfmBuilder<'a, S> {
     /// Set the `coverArtUrl` field (optional)
     pub fn cover_art_url(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `coverArtUrl` field to an Option value (optional)
     pub fn maybe_cover_art_url(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -290,11 +282,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LastfmBuilder<'a, lastfm_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LastfmBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -302,12 +294,12 @@ where
 impl<'a, S: lastfm_state::State> LastfmBuilder<'a, S> {
     /// Set the `originUrl` field (optional)
     pub fn origin_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `originUrl` field to an Option value (optional)
     pub fn maybe_origin_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -315,12 +307,12 @@ impl<'a, S: lastfm_state::State> LastfmBuilder<'a, S> {
 impl<'a, S: lastfm_state::State> LastfmBuilder<'a, S> {
     /// Set the `playedTime` field (optional)
     pub fn played_time(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `playedTime` field to an Option value (optional)
     pub fn maybe_played_time(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -328,12 +320,12 @@ impl<'a, S: lastfm_state::State> LastfmBuilder<'a, S> {
 impl<'a, S: lastfm_state::State> LastfmBuilder<'a, S> {
     /// Set the `releaseMbId` field (optional)
     pub fn release_mb_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `releaseMbId` field to an Option value (optional)
     pub fn maybe_release_mb_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -341,12 +333,12 @@ impl<'a, S: lastfm_state::State> LastfmBuilder<'a, S> {
 impl<'a, S: lastfm_state::State> LastfmBuilder<'a, S> {
     /// Set the `releaseName` field (optional)
     pub fn release_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `releaseName` field to an Option value (optional)
     pub fn maybe_release_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -354,12 +346,12 @@ impl<'a, S: lastfm_state::State> LastfmBuilder<'a, S> {
 impl<'a, S: lastfm_state::State> LastfmBuilder<'a, S> {
     /// Set the `trackMbId` field (optional)
     pub fn track_mb_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `trackMbId` field to an Option value (optional)
     pub fn maybe_track_mb_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -374,11 +366,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LastfmBuilder<'a, lastfm_state::SetTrackName<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         LastfmBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -386,23 +378,23 @@ where
 impl<'a, S> LastfmBuilder<'a, S>
 where
     S: lastfm_state::State,
+    S::ArtistNames: lastfm_state::IsSet,
     S::TrackName: lastfm_state::IsSet,
     S::CreatedAt: lastfm_state::IsSet,
-    S::ArtistNames: lastfm_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Lastfm<'a> {
         Lastfm {
-            artist_mb_id: self.__unsafe_private_named.0,
-            artist_names: self.__unsafe_private_named.1.unwrap(),
-            cover_art_url: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            origin_url: self.__unsafe_private_named.4,
-            played_time: self.__unsafe_private_named.5,
-            release_mb_id: self.__unsafe_private_named.6,
-            release_name: self.__unsafe_private_named.7,
-            track_mb_id: self.__unsafe_private_named.8,
-            track_name: self.__unsafe_private_named.9.unwrap(),
+            artist_mb_id: self._fields.0,
+            artist_names: self._fields.1.unwrap(),
+            cover_art_url: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            origin_url: self._fields.4,
+            played_time: self._fields.5,
+            release_mb_id: self._fields.6,
+            release_name: self._fields.7,
+            track_mb_id: self._fields.8,
+            track_name: self._fields.9.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -415,16 +407,16 @@ where
         >,
     ) -> Lastfm<'a> {
         Lastfm {
-            artist_mb_id: self.__unsafe_private_named.0,
-            artist_names: self.__unsafe_private_named.1.unwrap(),
-            cover_art_url: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            origin_url: self.__unsafe_private_named.4,
-            played_time: self.__unsafe_private_named.5,
-            release_mb_id: self.__unsafe_private_named.6,
-            release_name: self.__unsafe_private_named.7,
-            track_mb_id: self.__unsafe_private_named.8,
-            track_name: self.__unsafe_private_named.9.unwrap(),
+            artist_mb_id: self._fields.0,
+            artist_names: self._fields.1.unwrap(),
+            cover_art_url: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            origin_url: self._fields.4,
+            played_time: self._fields.5,
+            release_mb_id: self._fields.6,
+            release_name: self._fields.7,
+            track_mb_id: self._fields.8,
+            track_name: self._fields.9.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/me_linkna/linkinbio.rs b/crates/jacquard-api/src/me_linkna/linkinbio.rs
index f91bc538..a6cdc703 100644
--- a/crates/jacquard-api/src/me_linkna/linkinbio.rs
+++ b/crates/jacquard-api/src/me_linkna/linkinbio.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -2999,59 +3002,59 @@ pub mod github_contribution_day_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Count;
-        type Date;
         type Level;
+        type Date;
+        type Count;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Count = Unset;
-        type Date = Unset;
         type Level = Unset;
+        type Date = Unset;
+        type Count = Unset;
     }
-    ///State transition - sets the `count` field to Set
-    pub struct SetCount<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCount<S> {}
-    impl<S: State> State for SetCount<S> {
-        type Count = Set<members::count>;
+    ///State transition - sets the `level` field to Set
+    pub struct SetLevel<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLevel<S> {}
+    impl<S: State> State for SetLevel<S> {
+        type Level = Set<members::level>;
         type Date = S::Date;
-        type Level = S::Level;
+        type Count = S::Count;
     }
     ///State transition - sets the `date` field to Set
     pub struct SetDate<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDate<S> {}
     impl<S: State> State for SetDate<S> {
-        type Count = S::Count;
-        type Date = Set<members::date>;
         type Level = S::Level;
-    }
-    ///State transition - sets the `level` field to Set
-    pub struct SetLevel<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLevel<S> {}
-    impl<S: State> State for SetLevel<S> {
+        type Date = Set<members::date>;
         type Count = S::Count;
+    }
+    ///State transition - sets the `count` field to Set
+    pub struct SetCount<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCount<S> {}
+    impl<S: State> State for SetCount<S> {
+        type Level = S::Level;
         type Date = S::Date;
-        type Level = Set<members::level>;
+        type Count = Set<members::count>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `count` field
-        pub struct count(());
-        ///Marker type for the `date` field
-        pub struct date(());
         ///Marker type for the `level` field
         pub struct level(());
+        ///Marker type for the `date` field
+        pub struct date(());
+        ///Marker type for the `count` field
+        pub struct count(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GithubContributionDayBuilder<'a, S: github_contribution_day_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GithubContributionDay<'a> {
@@ -3068,9 +3071,9 @@ impl<'a> GithubContributionDayBuilder<'a, github_contribution_day_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GithubContributionDayBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3085,11 +3088,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> GithubContributionDayBuilder<'a, github_contribution_day_state::SetCount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GithubContributionDayBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3104,11 +3107,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GithubContributionDayBuilder<'a, github_contribution_day_state::SetDate<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GithubContributionDayBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3123,11 +3126,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> GithubContributionDayBuilder<'a, github_contribution_day_state::SetLevel<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GithubContributionDayBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3135,16 +3138,16 @@ where
 impl<'a, S> GithubContributionDayBuilder<'a, S>
 where
     S: github_contribution_day_state::State,
-    S::Count: github_contribution_day_state::IsSet,
-    S::Date: github_contribution_day_state::IsSet,
     S::Level: github_contribution_day_state::IsSet,
+    S::Date: github_contribution_day_state::IsSet,
+    S::Count: github_contribution_day_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GithubContributionDay<'a> {
         GithubContributionDay {
-            count: self.__unsafe_private_named.0.unwrap(),
-            date: self.__unsafe_private_named.1.unwrap(),
-            level: self.__unsafe_private_named.2.unwrap(),
+            count: self._fields.0.unwrap(),
+            date: self._fields.1.unwrap(),
+            level: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3157,9 +3160,9 @@ where
         >,
     ) -> GithubContributionDay<'a> {
         GithubContributionDay {
-            count: self.__unsafe_private_named.0.unwrap(),
-            date: self.__unsafe_private_named.1.unwrap(),
-            level: self.__unsafe_private_named.2.unwrap(),
+            count: self._fields.0.unwrap(),
+            date: self._fields.1.unwrap(),
+            level: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -3199,15 +3202,15 @@ pub mod linkinbio_state {
 
 /// Builder for constructing an instance of this type
 pub struct LinkinbioBuilder<'a, S: linkinbio_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<LinkinbioCardsItem<'a>>>,
         Option<linkinbio::ConnectedServices<'a>>,
         Option<Vec<linkinbio::SocialIcon<'a>>>,
         Option<CowStr<'a>>,
         Option<linkinbio::ThemeConfig<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Linkinbio<'a> {
@@ -3221,9 +3224,9 @@ impl<'a> LinkinbioBuilder<'a, linkinbio_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinkinbioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3238,11 +3241,11 @@ where
         mut self,
         value: impl Into<Vec<LinkinbioCardsItem<'a>>>,
     ) -> LinkinbioBuilder<'a, linkinbio_state::SetCards<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LinkinbioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3253,7 +3256,7 @@ impl<'a, S: linkinbio_state::State> LinkinbioBuilder<'a, S> {
         mut self,
         value: impl Into<Option<linkinbio::ConnectedServices<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `connectedServices` field to an Option value (optional)
@@ -3261,7 +3264,7 @@ impl<'a, S: linkinbio_state::State> LinkinbioBuilder<'a, S> {
         mut self,
         value: Option<linkinbio::ConnectedServices<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3272,7 +3275,7 @@ impl<'a, S: linkinbio_state::State> LinkinbioBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<linkinbio::SocialIcon<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `socialIcons` field to an Option value (optional)
@@ -3280,7 +3283,7 @@ impl<'a, S: linkinbio_state::State> LinkinbioBuilder<'a, S> {
         mut self,
         value: Option<Vec<linkinbio::SocialIcon<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -3288,12 +3291,12 @@ impl<'a, S: linkinbio_state::State> LinkinbioBuilder<'a, S> {
 impl<'a, S: linkinbio_state::State> LinkinbioBuilder<'a, S> {
     /// Set the `theme` field (optional)
     pub fn theme(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `theme` field to an Option value (optional)
     pub fn maybe_theme(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -3304,7 +3307,7 @@ impl<'a, S: linkinbio_state::State> LinkinbioBuilder<'a, S> {
         mut self,
         value: impl Into<Option<linkinbio::ThemeConfig<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `themeConfig` field to an Option value (optional)
@@ -3312,7 +3315,7 @@ impl<'a, S: linkinbio_state::State> LinkinbioBuilder<'a, S> {
         mut self,
         value: Option<linkinbio::ThemeConfig<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -3325,11 +3328,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Linkinbio<'a> {
         Linkinbio {
-            cards: self.__unsafe_private_named.0.unwrap(),
-            connected_services: self.__unsafe_private_named.1,
-            social_icons: self.__unsafe_private_named.2,
-            theme: self.__unsafe_private_named.3,
-            theme_config: self.__unsafe_private_named.4,
+            cards: self._fields.0.unwrap(),
+            connected_services: self._fields.1,
+            social_icons: self._fields.2,
+            theme: self._fields.3,
+            theme_config: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -3342,11 +3345,11 @@ where
         >,
     ) -> Linkinbio<'a> {
         Linkinbio {
-            cards: self.__unsafe_private_named.0.unwrap(),
-            connected_services: self.__unsafe_private_named.1,
-            social_icons: self.__unsafe_private_named.2,
-            theme: self.__unsafe_private_named.3,
-            theme_config: self.__unsafe_private_named.4,
+            cards: self._fields.0.unwrap(),
+            connected_services: self._fields.1,
+            social_icons: self._fields.2,
+            theme: self._fields.3,
+            theme_config: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
@@ -3412,13 +3415,9 @@ pub mod social_icon_state {
 
 /// Builder for constructing an instance of this type
 pub struct SocialIconBuilder<'a, S: social_icon_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-        Option<UriValue<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SocialIcon<'a> {
@@ -3432,9 +3431,9 @@ impl<'a> SocialIconBuilder<'a, social_icon_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SocialIconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3449,11 +3448,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SocialIconBuilder<'a, social_icon_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SocialIconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3468,11 +3467,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SocialIconBuilder<'a, social_icon_state::SetPlatform<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SocialIconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3487,11 +3486,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> SocialIconBuilder<'a, social_icon_state::SetUrl<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SocialIconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3506,9 +3505,9 @@ where
     /// Build the final struct
     pub fn build(self) -> SocialIcon<'a> {
         SocialIcon {
-            id: self.__unsafe_private_named.0.unwrap(),
-            platform: self.__unsafe_private_named.1.unwrap(),
-            url: self.__unsafe_private_named.2.unwrap(),
+            id: self._fields.0.unwrap(),
+            platform: self._fields.1.unwrap(),
+            url: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3521,9 +3520,9 @@ where
         >,
     ) -> SocialIcon<'a> {
         SocialIcon {
-            id: self.__unsafe_private_named.0.unwrap(),
-            platform: self.__unsafe_private_named.1.unwrap(),
-            url: self.__unsafe_private_named.2.unwrap(),
+            id: self._fields.0.unwrap(),
+            platform: self._fields.1.unwrap(),
+            url: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -3539,74 +3538,74 @@ pub mod widget_github_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type GithubUsername;
-        type Contributions;
         type Id;
+        type GithubUsername;
         type Type;
+        type Contributions;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type GithubUsername = Unset;
-        type Contributions = Unset;
         type Id = Unset;
+        type GithubUsername = Unset;
         type Type = Unset;
-    }
-    ///State transition - sets the `github_username` field to Set
-    pub struct SetGithubUsername<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetGithubUsername<S> {}
-    impl<S: State> State for SetGithubUsername<S> {
-        type GithubUsername = Set<members::github_username>;
-        type Contributions = S::Contributions;
-        type Id = S::Id;
-        type Type = S::Type;
-    }
-    ///State transition - sets the `contributions` field to Set
-    pub struct SetContributions<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContributions<S> {}
-    impl<S: State> State for SetContributions<S> {
-        type GithubUsername = S::GithubUsername;
-        type Contributions = Set<members::contributions>;
-        type Id = S::Id;
-        type Type = S::Type;
+        type Contributions = Unset;
     }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetId<S> {}
     impl<S: State> State for SetId<S> {
+        type Id = Set<members::id>;
         type GithubUsername = S::GithubUsername;
+        type Type = S::Type;
         type Contributions = S::Contributions;
-        type Id = Set<members::id>;
+    }
+    ///State transition - sets the `github_username` field to Set
+    pub struct SetGithubUsername<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetGithubUsername<S> {}
+    impl<S: State> State for SetGithubUsername<S> {
+        type Id = S::Id;
+        type GithubUsername = Set<members::github_username>;
         type Type = S::Type;
+        type Contributions = S::Contributions;
     }
     ///State transition - sets the `type` field to Set
     pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetType<S> {}
     impl<S: State> State for SetType<S> {
+        type Id = S::Id;
         type GithubUsername = S::GithubUsername;
+        type Type = Set<members::r#type>;
         type Contributions = S::Contributions;
+    }
+    ///State transition - sets the `contributions` field to Set
+    pub struct SetContributions<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContributions<S> {}
+    impl<S: State> State for SetContributions<S> {
         type Id = S::Id;
-        type Type = Set<members::r#type>;
+        type GithubUsername = S::GithubUsername;
+        type Type = S::Type;
+        type Contributions = Set<members::contributions>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `github_username` field
-        pub struct github_username(());
-        ///Marker type for the `contributions` field
-        pub struct contributions(());
         ///Marker type for the `id` field
         pub struct id(());
+        ///Marker type for the `github_username` field
+        pub struct github_username(());
         ///Marker type for the `type` field
         pub struct r#type(());
+        ///Marker type for the `contributions` field
+        pub struct contributions(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct WidgetGithubBuilder<'a, S: widget_github_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<linkinbio::GithubContributionDay<'a>>>,
         Option<bool>,
         Option<CowStr<'a>>,
@@ -3616,7 +3615,7 @@ pub struct WidgetGithubBuilder<'a, S: widget_github_state::State> {
         Option<i64>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> WidgetGithub<'a> {
@@ -3630,9 +3629,9 @@ impl<'a> WidgetGithubBuilder<'a, widget_github_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WidgetGithubBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3647,11 +3646,11 @@ where
         mut self,
         value: impl Into<Vec<linkinbio::GithubContributionDay<'a>>>,
     ) -> WidgetGithubBuilder<'a, widget_github_state::SetContributions<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         WidgetGithubBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3659,12 +3658,12 @@ where
 impl<'a, S: widget_github_state::State> WidgetGithubBuilder<'a, S> {
     /// Set the `enabled` field (optional)
     pub fn enabled(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `enabled` field to an Option value (optional)
     pub fn maybe_enabled(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3679,11 +3678,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WidgetGithubBuilder<'a, widget_github_state::SetGithubUsername<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         WidgetGithubBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3698,11 +3697,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WidgetGithubBuilder<'a, widget_github_state::SetId<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         WidgetGithubBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3710,12 +3709,12 @@ where
 impl<'a, S: widget_github_state::State> WidgetGithubBuilder<'a, S> {
     /// Set the `lastSyncedAt` field (optional)
     pub fn last_synced_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `lastSyncedAt` field to an Option value (optional)
     pub fn maybe_last_synced_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -3723,12 +3722,12 @@ impl<'a, S: widget_github_state::State> WidgetGithubBuilder<'a, S> {
 impl<'a, S: widget_github_state::State> WidgetGithubBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<WidgetGithubSize<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<WidgetGithubSize<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -3736,12 +3735,12 @@ impl<'a, S: widget_github_state::State> WidgetGithubBuilder<'a, S> {
 impl<'a, S: widget_github_state::State> WidgetGithubBuilder<'a, S> {
     /// Set the `totalContributions` field (optional)
     pub fn total_contributions(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `totalContributions` field to an Option value (optional)
     pub fn maybe_total_contributions(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -3756,11 +3755,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WidgetGithubBuilder<'a, widget_github_state::SetType<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         WidgetGithubBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3768,22 +3767,22 @@ where
 impl<'a, S> WidgetGithubBuilder<'a, S>
 where
     S: widget_github_state::State,
-    S::GithubUsername: widget_github_state::IsSet,
-    S::Contributions: widget_github_state::IsSet,
     S::Id: widget_github_state::IsSet,
+    S::GithubUsername: widget_github_state::IsSet,
     S::Type: widget_github_state::IsSet,
+    S::Contributions: widget_github_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> WidgetGithub<'a> {
         WidgetGithub {
-            contributions: self.__unsafe_private_named.0.unwrap(),
-            enabled: self.__unsafe_private_named.1,
-            github_username: self.__unsafe_private_named.2.unwrap(),
-            id: self.__unsafe_private_named.3.unwrap(),
-            last_synced_at: self.__unsafe_private_named.4,
-            size: self.__unsafe_private_named.5,
-            total_contributions: self.__unsafe_private_named.6,
-            r#type: self.__unsafe_private_named.7.unwrap(),
+            contributions: self._fields.0.unwrap(),
+            enabled: self._fields.1,
+            github_username: self._fields.2.unwrap(),
+            id: self._fields.3.unwrap(),
+            last_synced_at: self._fields.4,
+            size: self._fields.5,
+            total_contributions: self._fields.6,
+            r#type: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3796,14 +3795,14 @@ where
         >,
     ) -> WidgetGithub<'a> {
         WidgetGithub {
-            contributions: self.__unsafe_private_named.0.unwrap(),
-            enabled: self.__unsafe_private_named.1,
-            github_username: self.__unsafe_private_named.2.unwrap(),
-            id: self.__unsafe_private_named.3.unwrap(),
-            last_synced_at: self.__unsafe_private_named.4,
-            size: self.__unsafe_private_named.5,
-            total_contributions: self.__unsafe_private_named.6,
-            r#type: self.__unsafe_private_named.7.unwrap(),
+            contributions: self._fields.0.unwrap(),
+            enabled: self._fields.1,
+            github_username: self._fields.2.unwrap(),
+            id: self._fields.3.unwrap(),
+            last_synced_at: self._fields.4,
+            size: self._fields.5,
+            total_contributions: self._fields.6,
+            r#type: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -3819,92 +3818,92 @@ pub mod widget_goodreads_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Id;
-        type Books;
-        type Type;
         type GoodreadsUserId;
+        type Id;
         type Shelf;
+        type Type;
+        type Books;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Id = Unset;
-        type Books = Unset;
-        type Type = Unset;
         type GoodreadsUserId = Unset;
+        type Id = Unset;
         type Shelf = Unset;
+        type Type = Unset;
+        type Books = Unset;
+    }
+    ///State transition - sets the `goodreads_user_id` field to Set
+    pub struct SetGoodreadsUserId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetGoodreadsUserId<S> {}
+    impl<S: State> State for SetGoodreadsUserId<S> {
+        type GoodreadsUserId = Set<members::goodreads_user_id>;
+        type Id = S::Id;
+        type Shelf = S::Shelf;
+        type Type = S::Type;
+        type Books = S::Books;
     }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetId<S> {}
     impl<S: State> State for SetId<S> {
-        type Id = Set<members::id>;
-        type Books = S::Books;
-        type Type = S::Type;
         type GoodreadsUserId = S::GoodreadsUserId;
+        type Id = Set<members::id>;
         type Shelf = S::Shelf;
+        type Type = S::Type;
+        type Books = S::Books;
     }
-    ///State transition - sets the `books` field to Set
-    pub struct SetBooks<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBooks<S> {}
-    impl<S: State> State for SetBooks<S> {
+    ///State transition - sets the `shelf` field to Set
+    pub struct SetShelf<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetShelf<S> {}
+    impl<S: State> State for SetShelf<S> {
+        type GoodreadsUserId = S::GoodreadsUserId;
         type Id = S::Id;
-        type Books = Set<members::books>;
+        type Shelf = Set<members::shelf>;
         type Type = S::Type;
-        type GoodreadsUserId = S::GoodreadsUserId;
-        type Shelf = S::Shelf;
+        type Books = S::Books;
     }
     ///State transition - sets the `type` field to Set
     pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetType<S> {}
     impl<S: State> State for SetType<S> {
-        type Id = S::Id;
-        type Books = S::Books;
-        type Type = Set<members::r#type>;
         type GoodreadsUserId = S::GoodreadsUserId;
-        type Shelf = S::Shelf;
-    }
-    ///State transition - sets the `goodreads_user_id` field to Set
-    pub struct SetGoodreadsUserId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetGoodreadsUserId<S> {}
-    impl<S: State> State for SetGoodreadsUserId<S> {
         type Id = S::Id;
-        type Books = S::Books;
-        type Type = S::Type;
-        type GoodreadsUserId = Set<members::goodreads_user_id>;
         type Shelf = S::Shelf;
+        type Type = Set<members::r#type>;
+        type Books = S::Books;
     }
-    ///State transition - sets the `shelf` field to Set
-    pub struct SetShelf<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetShelf<S> {}
-    impl<S: State> State for SetShelf<S> {
+    ///State transition - sets the `books` field to Set
+    pub struct SetBooks<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBooks<S> {}
+    impl<S: State> State for SetBooks<S> {
+        type GoodreadsUserId = S::GoodreadsUserId;
         type Id = S::Id;
-        type Books = S::Books;
+        type Shelf = S::Shelf;
         type Type = S::Type;
-        type GoodreadsUserId = S::GoodreadsUserId;
-        type Shelf = Set<members::shelf>;
+        type Books = Set<members::books>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `id` field
-        pub struct id(());
-        ///Marker type for the `books` field
-        pub struct books(());
-        ///Marker type for the `type` field
-        pub struct r#type(());
         ///Marker type for the `goodreads_user_id` field
         pub struct goodreads_user_id(());
+        ///Marker type for the `id` field
+        pub struct id(());
         ///Marker type for the `shelf` field
         pub struct shelf(());
+        ///Marker type for the `type` field
+        pub struct r#type(());
+        ///Marker type for the `books` field
+        pub struct books(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct WidgetGoodreadsBuilder<'a, S: widget_goodreads_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<linkinbio::GoodreadsBook<'a>>>,
         Option<bool>,
         Option<CowStr<'a>>,
@@ -3915,7 +3914,7 @@ pub struct WidgetGoodreadsBuilder<'a, S: widget_goodreads_state::State> {
         Option<WidgetGoodreadsSize<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> WidgetGoodreads<'a> {
@@ -3929,19 +3928,9 @@ impl<'a> WidgetGoodreadsBuilder<'a, widget_goodreads_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WidgetGoodreadsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3956,11 +3945,11 @@ where
         mut self,
         value: impl Into<Vec<linkinbio::GoodreadsBook<'a>>>,
     ) -> WidgetGoodreadsBuilder<'a, widget_goodreads_state::SetBooks<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         WidgetGoodreadsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3968,12 +3957,12 @@ where
 impl<'a, S: widget_goodreads_state::State> WidgetGoodreadsBuilder<'a, S> {
     /// Set the `enabled` field (optional)
     pub fn enabled(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `enabled` field to an Option value (optional)
     pub fn maybe_enabled(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3988,11 +3977,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WidgetGoodreadsBuilder<'a, widget_goodreads_state::SetGoodreadsUserId<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         WidgetGoodreadsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4007,11 +3996,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WidgetGoodreadsBuilder<'a, widget_goodreads_state::SetId<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         WidgetGoodreadsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4019,12 +4008,12 @@ where
 impl<'a, S: widget_goodreads_state::State> WidgetGoodreadsBuilder<'a, S> {
     /// Set the `lastSyncedAt` field (optional)
     pub fn last_synced_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `lastSyncedAt` field to an Option value (optional)
     pub fn maybe_last_synced_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -4035,7 +4024,7 @@ impl<'a, S: widget_goodreads_state::State> WidgetGoodreadsBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<linkinbio::GoodreadsBook<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `readBooks` field to an Option value (optional)
@@ -4043,7 +4032,7 @@ impl<'a, S: widget_goodreads_state::State> WidgetGoodreadsBuilder<'a, S> {
         mut self,
         value: Option<Vec<linkinbio::GoodreadsBook<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -4058,11 +4047,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WidgetGoodreadsBuilder<'a, widget_goodreads_state::SetShelf<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         WidgetGoodreadsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4070,12 +4059,12 @@ where
 impl<'a, S: widget_goodreads_state::State> WidgetGoodreadsBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<WidgetGoodreadsSize<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<WidgetGoodreadsSize<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -4090,11 +4079,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WidgetGoodreadsBuilder<'a, widget_goodreads_state::SetType<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         WidgetGoodreadsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4102,24 +4091,24 @@ where
 impl<'a, S> WidgetGoodreadsBuilder<'a, S>
 where
     S: widget_goodreads_state::State,
-    S::Id: widget_goodreads_state::IsSet,
-    S::Books: widget_goodreads_state::IsSet,
-    S::Type: widget_goodreads_state::IsSet,
     S::GoodreadsUserId: widget_goodreads_state::IsSet,
+    S::Id: widget_goodreads_state::IsSet,
     S::Shelf: widget_goodreads_state::IsSet,
+    S::Type: widget_goodreads_state::IsSet,
+    S::Books: widget_goodreads_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> WidgetGoodreads<'a> {
         WidgetGoodreads {
-            books: self.__unsafe_private_named.0.unwrap(),
-            enabled: self.__unsafe_private_named.1,
-            goodreads_user_id: self.__unsafe_private_named.2.unwrap(),
-            id: self.__unsafe_private_named.3.unwrap(),
-            last_synced_at: self.__unsafe_private_named.4,
-            read_books: self.__unsafe_private_named.5,
-            shelf: self.__unsafe_private_named.6.unwrap(),
-            size: self.__unsafe_private_named.7,
-            r#type: self.__unsafe_private_named.8.unwrap(),
+            books: self._fields.0.unwrap(),
+            enabled: self._fields.1,
+            goodreads_user_id: self._fields.2.unwrap(),
+            id: self._fields.3.unwrap(),
+            last_synced_at: self._fields.4,
+            read_books: self._fields.5,
+            shelf: self._fields.6.unwrap(),
+            size: self._fields.7,
+            r#type: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -4132,15 +4121,15 @@ where
         >,
     ) -> WidgetGoodreads<'a> {
         WidgetGoodreads {
-            books: self.__unsafe_private_named.0.unwrap(),
-            enabled: self.__unsafe_private_named.1,
-            goodreads_user_id: self.__unsafe_private_named.2.unwrap(),
-            id: self.__unsafe_private_named.3.unwrap(),
-            last_synced_at: self.__unsafe_private_named.4,
-            read_books: self.__unsafe_private_named.5,
-            shelf: self.__unsafe_private_named.6.unwrap(),
-            size: self.__unsafe_private_named.7,
-            r#type: self.__unsafe_private_named.8.unwrap(),
+            books: self._fields.0.unwrap(),
+            enabled: self._fields.1,
+            goodreads_user_id: self._fields.2.unwrap(),
+            id: self._fields.3.unwrap(),
+            last_synced_at: self._fields.4,
+            read_books: self._fields.5,
+            shelf: self._fields.6.unwrap(),
+            size: self._fields.7,
+            r#type: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -4157,57 +4146,57 @@ pub mod widget_tealfm_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Id;
-        type Type;
         type Plays;
+        type Type;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Id = Unset;
-        type Type = Unset;
         type Plays = Unset;
+        type Type = Unset;
     }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetId<S> {}
     impl<S: State> State for SetId<S> {
         type Id = Set<members::id>;
-        type Type = S::Type;
-        type Plays = S::Plays;
-    }
-    ///State transition - sets the `type` field to Set
-    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetType<S> {}
-    impl<S: State> State for SetType<S> {
-        type Id = S::Id;
-        type Type = Set<members::r#type>;
         type Plays = S::Plays;
+        type Type = S::Type;
     }
     ///State transition - sets the `plays` field to Set
     pub struct SetPlays<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPlays<S> {}
     impl<S: State> State for SetPlays<S> {
         type Id = S::Id;
-        type Type = S::Type;
         type Plays = Set<members::plays>;
+        type Type = S::Type;
+    }
+    ///State transition - sets the `type` field to Set
+    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetType<S> {}
+    impl<S: State> State for SetType<S> {
+        type Id = S::Id;
+        type Plays = S::Plays;
+        type Type = Set<members::r#type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `id` field
         pub struct id(());
-        ///Marker type for the `type` field
-        pub struct r#type(());
         ///Marker type for the `plays` field
         pub struct plays(());
+        ///Marker type for the `type` field
+        pub struct r#type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct WidgetTealfmBuilder<'a, S: widget_tealfm_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<bool>,
         Option<CowStr<'a>>,
@@ -4216,7 +4205,7 @@ pub struct WidgetTealfmBuilder<'a, S: widget_tealfm_state::State> {
         Option<WidgetTealfmSize<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> WidgetTealfm<'a> {
@@ -4230,9 +4219,9 @@ impl<'a> WidgetTealfmBuilder<'a, widget_tealfm_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WidgetTealfmBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4240,12 +4229,12 @@ impl<'a> WidgetTealfmBuilder<'a, widget_tealfm_state::Empty> {
 impl<'a, S: widget_tealfm_state::State> WidgetTealfmBuilder<'a, S> {
     /// Set the `coverArtNotice` field (optional)
     pub fn cover_art_notice(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `coverArtNotice` field to an Option value (optional)
     pub fn maybe_cover_art_notice(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -4253,12 +4242,12 @@ impl<'a, S: widget_tealfm_state::State> WidgetTealfmBuilder<'a, S> {
 impl<'a, S: widget_tealfm_state::State> WidgetTealfmBuilder<'a, S> {
     /// Set the `enabled` field (optional)
     pub fn enabled(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `enabled` field to an Option value (optional)
     pub fn maybe_enabled(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -4273,11 +4262,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WidgetTealfmBuilder<'a, widget_tealfm_state::SetId<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         WidgetTealfmBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4285,12 +4274,12 @@ where
 impl<'a, S: widget_tealfm_state::State> WidgetTealfmBuilder<'a, S> {
     /// Set the `lastSyncedAt` field (optional)
     pub fn last_synced_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `lastSyncedAt` field to an Option value (optional)
     pub fn maybe_last_synced_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -4305,11 +4294,11 @@ where
         mut self,
         value: impl Into<Vec<linkinbio::TealfmPlay<'a>>>,
     ) -> WidgetTealfmBuilder<'a, widget_tealfm_state::SetPlays<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         WidgetTealfmBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4317,12 +4306,12 @@ where
 impl<'a, S: widget_tealfm_state::State> WidgetTealfmBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<WidgetTealfmSize<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<WidgetTealfmSize<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -4337,11 +4326,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WidgetTealfmBuilder<'a, widget_tealfm_state::SetType<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         WidgetTealfmBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4350,19 +4339,19 @@ impl<'a, S> WidgetTealfmBuilder<'a, S>
 where
     S: widget_tealfm_state::State,
     S::Id: widget_tealfm_state::IsSet,
-    S::Type: widget_tealfm_state::IsSet,
     S::Plays: widget_tealfm_state::IsSet,
+    S::Type: widget_tealfm_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> WidgetTealfm<'a> {
         WidgetTealfm {
-            cover_art_notice: self.__unsafe_private_named.0,
-            enabled: self.__unsafe_private_named.1,
-            id: self.__unsafe_private_named.2.unwrap(),
-            last_synced_at: self.__unsafe_private_named.3,
-            plays: self.__unsafe_private_named.4.unwrap(),
-            size: self.__unsafe_private_named.5,
-            r#type: self.__unsafe_private_named.6.unwrap(),
+            cover_art_notice: self._fields.0,
+            enabled: self._fields.1,
+            id: self._fields.2.unwrap(),
+            last_synced_at: self._fields.3,
+            plays: self._fields.4.unwrap(),
+            size: self._fields.5,
+            r#type: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -4375,13 +4364,13 @@ where
         >,
     ) -> WidgetTealfm<'a> {
         WidgetTealfm {
-            cover_art_notice: self.__unsafe_private_named.0,
-            enabled: self.__unsafe_private_named.1,
-            id: self.__unsafe_private_named.2.unwrap(),
-            last_synced_at: self.__unsafe_private_named.3,
-            plays: self.__unsafe_private_named.4.unwrap(),
-            size: self.__unsafe_private_named.5,
-            r#type: self.__unsafe_private_named.6.unwrap(),
+            cover_art_notice: self._fields.0,
+            enabled: self._fields.1,
+            id: self._fields.2.unwrap(),
+            last_synced_at: self._fields.3,
+            plays: self._fields.4.unwrap(),
+            size: self._fields.5,
+            r#type: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/me_linkna/profile.rs b/crates/jacquard-api/src/me_linkna/profile.rs
index ed367048..68f8c521 100644
--- a/crates/jacquard-api/src/me_linkna/profile.rs
+++ b/crates/jacquard-api/src/me_linkna/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -183,9 +186,9 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>, Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>, Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -199,9 +202,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,12 +212,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -222,12 +225,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -235,12 +238,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -252,9 +255,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            description: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -267,9 +270,9 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            description: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/media_ionosphere.rs b/crates/jacquard-api/src/media_ionosphere.rs
index 3bb152f7..a10e4209 100644
--- a/crates/jacquard-api/src/media_ionosphere.rs
+++ b/crates/jacquard-api/src/media_ionosphere.rs
@@ -10,7 +10,11 @@ pub mod log;
 pub mod programme;
 pub mod service;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -454,15 +458,15 @@ pub mod broadcast_state {
 
 /// Builder for constructing an instance of this type
 pub struct BroadcastBuilder<'a, S: broadcast_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<media_ionosphere::Bearer<'a>>,
         Option<i64>,
         Option<Datetime>,
         Option<i64>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Broadcast<'a> {
@@ -476,9 +480,9 @@ impl<'a> BroadcastBuilder<'a, broadcast_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BroadcastBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -493,11 +497,11 @@ where
         mut self,
         value: impl Into<media_ionosphere::Bearer<'a>>,
     ) -> BroadcastBuilder<'a, broadcast_state::SetBearer<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BroadcastBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -505,12 +509,12 @@ where
 impl<'a, S: broadcast_state::State> BroadcastBuilder<'a, S> {
     /// Set the `cost` field (optional)
     pub fn cost(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cost` field to an Option value (optional)
     pub fn maybe_cost(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -518,12 +522,12 @@ impl<'a, S: broadcast_state::State> BroadcastBuilder<'a, S> {
 impl<'a, S: broadcast_state::State> BroadcastBuilder<'a, S> {
     /// Set the `from` field (optional)
     pub fn from(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `from` field to an Option value (optional)
     pub fn maybe_from(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -531,12 +535,12 @@ impl<'a, S: broadcast_state::State> BroadcastBuilder<'a, S> {
 impl<'a, S: broadcast_state::State> BroadcastBuilder<'a, S> {
     /// Set the `offset` field (optional)
     pub fn offset(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `offset` field to an Option value (optional)
     pub fn maybe_offset(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -544,12 +548,12 @@ impl<'a, S: broadcast_state::State> BroadcastBuilder<'a, S> {
 impl<'a, S: broadcast_state::State> BroadcastBuilder<'a, S> {
     /// Set the `until` field (optional)
     pub fn until(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `until` field to an Option value (optional)
     pub fn maybe_until(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -562,11 +566,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Broadcast<'a> {
         Broadcast {
-            bearer: self.__unsafe_private_named.0.unwrap(),
-            cost: self.__unsafe_private_named.1.or_else(|| Some(0i64)),
-            from: self.__unsafe_private_named.2,
-            offset: self.__unsafe_private_named.3.or_else(|| Some(0i64)),
-            until: self.__unsafe_private_named.4,
+            bearer: self._fields.0.unwrap(),
+            cost: self._fields.1.or_else(|| Some(0i64)),
+            from: self._fields.2,
+            offset: self._fields.3.or_else(|| Some(0i64)),
+            until: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -579,11 +583,11 @@ where
         >,
     ) -> Broadcast<'a> {
         Broadcast {
-            bearer: self.__unsafe_private_named.0.unwrap(),
-            cost: self.__unsafe_private_named.1.or_else(|| Some(0i64)),
-            from: self.__unsafe_private_named.2,
-            offset: self.__unsafe_private_named.3.or_else(|| Some(0i64)),
-            until: self.__unsafe_private_named.4,
+            bearer: self._fields.0.unwrap(),
+            cost: self._fields.1.or_else(|| Some(0i64)),
+            from: self._fields.2,
+            offset: self._fields.3.or_else(|| Some(0i64)),
+            until: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
@@ -954,12 +958,9 @@ pub mod credit_state {
 
 /// Builder for constructing an instance of this type
 pub struct CreditBuilder<'a, S: credit_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<media_ionosphere::Entity<'a>>,
-        Option<CreditRole<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<media_ionosphere::Entity<'a>>, Option<CreditRole<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Credit<'a> {
@@ -973,9 +974,9 @@ impl<'a> CreditBuilder<'a, credit_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreditBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -990,11 +991,11 @@ where
         mut self,
         value: impl Into<media_ionosphere::Entity<'a>>,
     ) -> CreditBuilder<'a, credit_state::SetEntity<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CreditBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1009,11 +1010,11 @@ where
         mut self,
         value: impl Into<CreditRole<'a>>,
     ) -> CreditBuilder<'a, credit_state::SetRole<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CreditBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1027,8 +1028,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Credit<'a> {
         Credit {
-            entity: self.__unsafe_private_named.0.unwrap(),
-            role: self.__unsafe_private_named.1.unwrap(),
+            entity: self._fields.0.unwrap(),
+            role: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1041,8 +1042,8 @@ where
         >,
     ) -> Credit<'a> {
         Credit {
-            entity: self.__unsafe_private_named.0.unwrap(),
-            role: self.__unsafe_private_named.1.unwrap(),
+            entity: self._fields.0.unwrap(),
+            role: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1082,9 +1083,9 @@ pub mod membership_state {
 
 /// Builder for constructing an instance of this type
 pub struct MembershipBuilder<'a, S: membership_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Membership<'a> {
@@ -1098,9 +1099,9 @@ impl<'a> MembershipBuilder<'a, membership_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MembershipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1115,11 +1116,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> MembershipBuilder<'a, membership_state::SetGroup<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MembershipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1127,12 +1128,12 @@ where
 impl<'a, S: membership_state::State> MembershipBuilder<'a, S> {
     /// Set the `index` field (optional)
     pub fn index(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `index` field to an Option value (optional)
     pub fn maybe_index(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1145,8 +1146,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Membership<'a> {
         Membership {
-            group: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1,
+            group: self._fields.0.unwrap(),
+            index: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -1159,8 +1160,8 @@ where
         >,
     ) -> Membership<'a> {
         Membership {
-            group: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1,
+            group: self._fields.0.unwrap(),
+            index: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
@@ -1204,14 +1205,14 @@ pub mod recording_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordingBuilder<'a, S: recording_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<media_ionosphere::Bearer<'a>>,
         Option<i64>,
         Option<Datetime>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Recording<'a> {
@@ -1225,9 +1226,9 @@ impl<'a> RecordingBuilder<'a, recording_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1242,11 +1243,11 @@ where
         mut self,
         value: impl Into<media_ionosphere::Bearer<'a>>,
     ) -> RecordingBuilder<'a, recording_state::SetBearer<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1254,12 +1255,12 @@ where
 impl<'a, S: recording_state::State> RecordingBuilder<'a, S> {
     /// Set the `cost` field (optional)
     pub fn cost(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cost` field to an Option value (optional)
     pub fn maybe_cost(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1267,12 +1268,12 @@ impl<'a, S: recording_state::State> RecordingBuilder<'a, S> {
 impl<'a, S: recording_state::State> RecordingBuilder<'a, S> {
     /// Set the `from` field (optional)
     pub fn from(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `from` field to an Option value (optional)
     pub fn maybe_from(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1280,12 +1281,12 @@ impl<'a, S: recording_state::State> RecordingBuilder<'a, S> {
 impl<'a, S: recording_state::State> RecordingBuilder<'a, S> {
     /// Set the `until` field (optional)
     pub fn until(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `until` field to an Option value (optional)
     pub fn maybe_until(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1298,10 +1299,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Recording<'a> {
         Recording {
-            bearer: self.__unsafe_private_named.0.unwrap(),
-            cost: self.__unsafe_private_named.1.or_else(|| Some(0i64)),
-            from: self.__unsafe_private_named.2,
-            until: self.__unsafe_private_named.3,
+            bearer: self._fields.0.unwrap(),
+            cost: self._fields.1.or_else(|| Some(0i64)),
+            from: self._fields.2,
+            until: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -1314,10 +1315,10 @@ where
         >,
     ) -> Recording<'a> {
         Recording {
-            bearer: self.__unsafe_private_named.0.unwrap(),
-            cost: self.__unsafe_private_named.1.or_else(|| Some(0i64)),
-            from: self.__unsafe_private_named.2,
-            until: self.__unsafe_private_named.3,
+            bearer: self._fields.0.unwrap(),
+            cost: self._fields.1.or_else(|| Some(0i64)),
+            from: self._fields.2,
+            until: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -1369,13 +1370,9 @@ pub mod track_state {
 
 /// Builder for constructing an instance of this type
 pub struct TrackBuilder<'a, S: track_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<Vec<CowStr<'a>>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Vec<CowStr<'a>>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Track<'a> {
@@ -1389,9 +1386,9 @@ impl<'a> TrackBuilder<'a, track_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TrackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1399,12 +1396,12 @@ impl<'a> TrackBuilder<'a, track_state::Empty> {
 impl<'a, S: track_state::State> TrackBuilder<'a, S> {
     /// Set the `album` field (optional)
     pub fn album(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `album` field to an Option value (optional)
     pub fn maybe_album(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1419,11 +1416,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> TrackBuilder<'a, track_state::SetArtists<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TrackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1438,11 +1435,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TrackBuilder<'a, track_state::SetTitle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TrackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1456,9 +1453,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Track<'a> {
         Track {
-            album: self.__unsafe_private_named.0,
-            artists: self.__unsafe_private_named.1.unwrap(),
-            title: self.__unsafe_private_named.2.unwrap(),
+            album: self._fields.0,
+            artists: self._fields.1.unwrap(),
+            title: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1471,9 +1468,9 @@ where
         >,
     ) -> Track<'a> {
         Track {
-            album: self.__unsafe_private_named.0,
-            artists: self.__unsafe_private_named.1.unwrap(),
-            title: self.__unsafe_private_named.2.unwrap(),
+            album: self._fields.0,
+            artists: self._fields.1.unwrap(),
+            title: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/media_ionosphere/group.rs b/crates/jacquard-api/src/media_ionosphere/group.rs
index 4105d2b3..b3b5cbc3 100644
--- a/crates/jacquard-api/src/media_ionosphere/group.rs
+++ b/crates/jacquard-api/src/media_ionosphere/group.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -320,58 +323,58 @@ pub mod group_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Language;
         type Ionosphere;
         type Name;
+        type Language;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Language = Unset;
         type Ionosphere = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `language` field to Set
-    pub struct SetLanguage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLanguage<S> {}
-    impl<S: State> State for SetLanguage<S> {
-        type Language = Set<members::language>;
-        type Ionosphere = S::Ionosphere;
-        type Name = S::Name;
+        type Language = Unset;
     }
     ///State transition - sets the `ionosphere` field to Set
     pub struct SetIonosphere<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIonosphere<S> {}
     impl<S: State> State for SetIonosphere<S> {
-        type Language = S::Language;
         type Ionosphere = Set<members::ionosphere>;
         type Name = S::Name;
+        type Language = S::Language;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Language = S::Language;
         type Ionosphere = S::Ionosphere;
         type Name = Set<members::name>;
+        type Language = S::Language;
+    }
+    ///State transition - sets the `language` field to Set
+    pub struct SetLanguage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLanguage<S> {}
+    impl<S: State> State for SetLanguage<S> {
+        type Ionosphere = S::Ionosphere;
+        type Name = S::Name;
+        type Language = Set<members::language>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `language` field
-        pub struct language(());
         ///Marker type for the `ionosphere` field
         pub struct ionosphere(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `language` field
+        pub struct language(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GroupBuilder<'a, S: group_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Vec<Genre<'a>>>,
         Option<BlobRef<'a>>,
@@ -382,7 +385,7 @@ pub struct GroupBuilder<'a, S: group_state::State> {
         Option<Vec<Membership<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Group<'a> {
@@ -396,19 +399,9 @@ impl<'a> GroupBuilder<'a, group_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -416,12 +409,12 @@ impl<'a> GroupBuilder<'a, group_state::Empty> {
 impl<'a, S: group_state::State> GroupBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -429,12 +422,12 @@ impl<'a, S: group_state::State> GroupBuilder<'a, S> {
 impl<'a, S: group_state::State> GroupBuilder<'a, S> {
     /// Set the `genres` field (optional)
     pub fn genres(mut self, value: impl Into<Option<Vec<Genre<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `genres` field to an Option value (optional)
     pub fn maybe_genres(mut self, value: Option<Vec<Genre<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -442,12 +435,12 @@ impl<'a, S: group_state::State> GroupBuilder<'a, S> {
 impl<'a, S: group_state::State> GroupBuilder<'a, S> {
     /// Set the `icon` field (optional)
     pub fn icon(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `icon` field to an Option value (optional)
     pub fn maybe_icon(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -462,11 +455,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GroupBuilder<'a, group_state::SetIonosphere<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         GroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -474,12 +467,12 @@ where
 impl<'a, S: group_state::State> GroupBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -487,12 +480,12 @@ impl<'a, S: group_state::State> GroupBuilder<'a, S> {
 impl<'a, S: group_state::State> GroupBuilder<'a, S> {
     /// Set the `kind` field (optional)
     pub fn kind(mut self, value: impl Into<Option<GroupKind<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `kind` field to an Option value (optional)
     pub fn maybe_kind(mut self, value: Option<GroupKind<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -507,11 +500,11 @@ where
         mut self,
         value: impl Into<Language>,
     ) -> GroupBuilder<'a, group_state::SetLanguage<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         GroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -519,12 +512,12 @@ where
 impl<'a, S: group_state::State> GroupBuilder<'a, S> {
     /// Set the `memberOf` field (optional)
     pub fn member_of(mut self, value: impl Into<Option<Vec<Membership<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `memberOf` field to an Option value (optional)
     pub fn maybe_member_of(mut self, value: Option<Vec<Membership<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -539,11 +532,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GroupBuilder<'a, group_state::SetName<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         GroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -551,22 +544,22 @@ where
 impl<'a, S> GroupBuilder<'a, S>
 where
     S: group_state::State,
-    S::Language: group_state::IsSet,
     S::Ionosphere: group_state::IsSet,
     S::Name: group_state::IsSet,
+    S::Language: group_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Group<'a> {
         Group {
-            description: self.__unsafe_private_named.0,
-            genres: self.__unsafe_private_named.1,
-            icon: self.__unsafe_private_named.2,
-            ionosphere: self.__unsafe_private_named.3.unwrap(),
-            keywords: self.__unsafe_private_named.4,
-            kind: self.__unsafe_private_named.5,
-            language: self.__unsafe_private_named.6.unwrap(),
-            member_of: self.__unsafe_private_named.7,
-            name: self.__unsafe_private_named.8.unwrap(),
+            description: self._fields.0,
+            genres: self._fields.1,
+            icon: self._fields.2,
+            ionosphere: self._fields.3.unwrap(),
+            keywords: self._fields.4,
+            kind: self._fields.5,
+            language: self._fields.6.unwrap(),
+            member_of: self._fields.7,
+            name: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -579,15 +572,15 @@ where
         >,
     ) -> Group<'a> {
         Group {
-            description: self.__unsafe_private_named.0,
-            genres: self.__unsafe_private_named.1,
-            icon: self.__unsafe_private_named.2,
-            ionosphere: self.__unsafe_private_named.3.unwrap(),
-            keywords: self.__unsafe_private_named.4,
-            kind: self.__unsafe_private_named.5,
-            language: self.__unsafe_private_named.6.unwrap(),
-            member_of: self.__unsafe_private_named.7,
-            name: self.__unsafe_private_named.8.unwrap(),
+            description: self._fields.0,
+            genres: self._fields.1,
+            icon: self._fields.2,
+            ionosphere: self._fields.3.unwrap(),
+            keywords: self._fields.4,
+            kind: self._fields.5,
+            language: self._fields.6.unwrap(),
+            member_of: self._fields.7,
+            name: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/media_ionosphere/log.rs b/crates/jacquard-api/src/media_ionosphere/log.rs
index 67e12b20..63db96e5 100644
--- a/crates/jacquard-api/src/media_ionosphere/log.rs
+++ b/crates/jacquard-api/src/media_ionosphere/log.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -127,49 +130,49 @@ pub mod log_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Item;
+        type CreatedAt;
         type Ionosphere;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Item = Unset;
+        type CreatedAt = Unset;
         type Ionosphere = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Item = S::Item;
-        type Ionosphere = S::Ionosphere;
-    }
     ///State transition - sets the `item` field to Set
     pub struct SetItem<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetItem<S> {}
     impl<S: State> State for SetItem<S> {
-        type CreatedAt = S::CreatedAt;
         type Item = Set<members::item>;
+        type CreatedAt = S::CreatedAt;
+        type Ionosphere = S::Ionosphere;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Item = S::Item;
+        type CreatedAt = Set<members::created_at>;
         type Ionosphere = S::Ionosphere;
     }
     ///State transition - sets the `ionosphere` field to Set
     pub struct SetIonosphere<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIonosphere<S> {}
     impl<S: State> State for SetIonosphere<S> {
-        type CreatedAt = S::CreatedAt;
         type Item = S::Item;
+        type CreatedAt = S::CreatedAt;
         type Ionosphere = Set<members::ionosphere>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `item` field
         pub struct item(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `ionosphere` field
         pub struct ionosphere(());
     }
@@ -177,14 +180,14 @@ pub mod log_state {
 
 /// Builder for constructing an instance of this type
 pub struct LogBuilder<'a, S: log_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Track<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Log<'a> {
@@ -198,9 +201,9 @@ impl<'a> LogBuilder<'a, log_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LogBuilder<'a, log_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogBuilder<'a, log_state::SetIonosphere<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,11 +256,11 @@ where
         mut self,
         value: impl Into<Track<'a>>,
     ) -> LogBuilder<'a, log_state::SetItem<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -265,12 +268,12 @@ where
 impl<'a, S: log_state::State> LogBuilder<'a, S> {
     /// Set the `programme` field (optional)
     pub fn programme(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `programme` field to an Option value (optional)
     pub fn maybe_programme(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -278,17 +281,17 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
 impl<'a, S> LogBuilder<'a, S>
 where
     S: log_state::State,
-    S::CreatedAt: log_state::IsSet,
     S::Item: log_state::IsSet,
+    S::CreatedAt: log_state::IsSet,
     S::Ionosphere: log_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Log<'a> {
         Log {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            ionosphere: self.__unsafe_private_named.1.unwrap(),
-            item: self.__unsafe_private_named.2.unwrap(),
-            programme: self.__unsafe_private_named.3,
+            created_at: self._fields.0.unwrap(),
+            ionosphere: self._fields.1.unwrap(),
+            item: self._fields.2.unwrap(),
+            programme: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -301,10 +304,10 @@ where
         >,
     ) -> Log<'a> {
         Log {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            ionosphere: self.__unsafe_private_named.1.unwrap(),
-            item: self.__unsafe_private_named.2.unwrap(),
-            programme: self.__unsafe_private_named.3,
+            created_at: self._fields.0.unwrap(),
+            ionosphere: self._fields.1.unwrap(),
+            item: self._fields.2.unwrap(),
+            programme: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/media_ionosphere/programme.rs b/crates/jacquard-api/src/media_ionosphere/programme.rs
index bc51852e..c9a8a346 100644
--- a/crates/jacquard-api/src/media_ionosphere/programme.rs
+++ b/crates/jacquard-api/src/media_ionosphere/programme.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -263,8 +266,8 @@ pub mod programme_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProgrammeBuilder<'a, S: programme_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<Credit<'a>>>,
         Option<Vec<ProgrammeDeliveryItem<'a>>>,
         Option<CowStr<'a>>,
@@ -277,7 +280,7 @@ pub struct ProgrammeBuilder<'a, S: programme_state::State> {
         Option<CowStr<'a>>,
         Option<Language>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Programme<'a> {
@@ -291,21 +294,9 @@ impl<'a> ProgrammeBuilder<'a, programme_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProgrammeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -313,12 +304,12 @@ impl<'a> ProgrammeBuilder<'a, programme_state::Empty> {
 impl<'a, S: programme_state::State> ProgrammeBuilder<'a, S> {
     /// Set the `credits` field (optional)
     pub fn credits(mut self, value: impl Into<Option<Vec<Credit<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `credits` field to an Option value (optional)
     pub fn maybe_credits(mut self, value: Option<Vec<Credit<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -329,7 +320,7 @@ impl<'a, S: programme_state::State> ProgrammeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<ProgrammeDeliveryItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `delivery` field to an Option value (optional)
@@ -337,7 +328,7 @@ impl<'a, S: programme_state::State> ProgrammeBuilder<'a, S> {
         mut self,
         value: Option<Vec<ProgrammeDeliveryItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -345,12 +336,12 @@ impl<'a, S: programme_state::State> ProgrammeBuilder<'a, S> {
 impl<'a, S: programme_state::State> ProgrammeBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -358,12 +349,12 @@ impl<'a, S: programme_state::State> ProgrammeBuilder<'a, S> {
 impl<'a, S: programme_state::State> ProgrammeBuilder<'a, S> {
     /// Set the `genres` field (optional)
     pub fn genres(mut self, value: impl Into<Option<Vec<Genre<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `genres` field to an Option value (optional)
     pub fn maybe_genres(mut self, value: Option<Vec<Genre<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -371,12 +362,12 @@ impl<'a, S: programme_state::State> ProgrammeBuilder<'a, S> {
 impl<'a, S: programme_state::State> ProgrammeBuilder<'a, S> {
     /// Set the `icon` field (optional)
     pub fn icon(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `icon` field to an Option value (optional)
     pub fn maybe_icon(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -391,11 +382,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProgrammeBuilder<'a, programme_state::SetIonosphere<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ProgrammeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -403,12 +394,12 @@ where
 impl<'a, S: programme_state::State> ProgrammeBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -423,11 +414,11 @@ where
         mut self,
         value: impl Into<Language>,
     ) -> ProgrammeBuilder<'a, programme_state::SetLanguage<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ProgrammeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -435,12 +426,12 @@ where
 impl<'a, S: programme_state::State> ProgrammeBuilder<'a, S> {
     /// Set the `memberOf` field (optional)
     pub fn member_of(mut self, value: impl Into<Option<Vec<Membership<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `memberOf` field to an Option value (optional)
     pub fn maybe_member_of(mut self, value: Option<Vec<Membership<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -455,11 +446,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProgrammeBuilder<'a, programme_state::SetName<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ProgrammeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -467,12 +458,12 @@ where
 impl<'a, S: programme_state::State> ProgrammeBuilder<'a, S> {
     /// Set the `presentationLanguage` field (optional)
     pub fn presentation_language(mut self, value: impl Into<Option<Language>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `presentationLanguage` field to an Option value (optional)
     pub fn maybe_presentation_language(mut self, value: Option<Language>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -487,17 +478,17 @@ where
     /// Build the final struct
     pub fn build(self) -> Programme<'a> {
         Programme {
-            credits: self.__unsafe_private_named.0,
-            delivery: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            genres: self.__unsafe_private_named.3,
-            icon: self.__unsafe_private_named.4,
-            ionosphere: self.__unsafe_private_named.5.unwrap(),
-            keywords: self.__unsafe_private_named.6,
-            language: self.__unsafe_private_named.7.unwrap(),
-            member_of: self.__unsafe_private_named.8,
-            name: self.__unsafe_private_named.9.unwrap(),
-            presentation_language: self.__unsafe_private_named.10,
+            credits: self._fields.0,
+            delivery: self._fields.1,
+            description: self._fields.2,
+            genres: self._fields.3,
+            icon: self._fields.4,
+            ionosphere: self._fields.5.unwrap(),
+            keywords: self._fields.6,
+            language: self._fields.7.unwrap(),
+            member_of: self._fields.8,
+            name: self._fields.9.unwrap(),
+            presentation_language: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -510,17 +501,17 @@ where
         >,
     ) -> Programme<'a> {
         Programme {
-            credits: self.__unsafe_private_named.0,
-            delivery: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            genres: self.__unsafe_private_named.3,
-            icon: self.__unsafe_private_named.4,
-            ionosphere: self.__unsafe_private_named.5.unwrap(),
-            keywords: self.__unsafe_private_named.6,
-            language: self.__unsafe_private_named.7.unwrap(),
-            member_of: self.__unsafe_private_named.8,
-            name: self.__unsafe_private_named.9.unwrap(),
-            presentation_language: self.__unsafe_private_named.10,
+            credits: self._fields.0,
+            delivery: self._fields.1,
+            description: self._fields.2,
+            genres: self._fields.3,
+            icon: self._fields.4,
+            ionosphere: self._fields.5.unwrap(),
+            keywords: self._fields.6,
+            language: self._fields.7.unwrap(),
+            member_of: self._fields.8,
+            name: self._fields.9.unwrap(),
+            presentation_language: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/media_ionosphere/service.rs b/crates/jacquard-api/src/media_ionosphere/service.rs
index c92d3470..fa26788f 100644
--- a/crates/jacquard-api/src/media_ionosphere/service.rs
+++ b/crates/jacquard-api/src/media_ionosphere/service.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -197,49 +200,49 @@ pub mod service_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type Language;
+        type Name;
         type Ionosphere;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type Language = Unset;
+        type Name = Unset;
         type Ionosphere = Unset;
     }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Language = S::Language;
-        type Ionosphere = S::Ionosphere;
-    }
     ///State transition - sets the `language` field to Set
     pub struct SetLanguage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLanguage<S> {}
     impl<S: State> State for SetLanguage<S> {
-        type Name = S::Name;
         type Language = Set<members::language>;
+        type Name = S::Name;
+        type Ionosphere = S::Ionosphere;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Language = S::Language;
+        type Name = Set<members::name>;
         type Ionosphere = S::Ionosphere;
     }
     ///State transition - sets the `ionosphere` field to Set
     pub struct SetIonosphere<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIonosphere<S> {}
     impl<S: State> State for SetIonosphere<S> {
-        type Name = S::Name;
         type Language = S::Language;
+        type Name = S::Name;
         type Ionosphere = Set<members::ionosphere>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `language` field
         pub struct language(());
+        ///Marker type for the `name` field
+        pub struct name(());
         ///Marker type for the `ionosphere` field
         pub struct ionosphere(());
     }
@@ -247,8 +250,8 @@ pub mod service_state {
 
 /// Builder for constructing an instance of this type
 pub struct ServiceBuilder<'a, S: service_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<Broadcast<'a>>>,
         Option<CowStr<'a>>,
         Option<Vec<Genre<'a>>>,
@@ -260,7 +263,7 @@ pub struct ServiceBuilder<'a, S: service_state::State> {
         Option<CowStr<'a>>,
         Option<Language>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Service<'a> {
@@ -274,20 +277,9 @@ impl<'a> ServiceBuilder<'a, service_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ServiceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -295,12 +287,12 @@ impl<'a> ServiceBuilder<'a, service_state::Empty> {
 impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
     /// Set the `broadcast` field (optional)
     pub fn broadcast(mut self, value: impl Into<Option<Vec<Broadcast<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `broadcast` field to an Option value (optional)
     pub fn maybe_broadcast(mut self, value: Option<Vec<Broadcast<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -308,12 +300,12 @@ impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
 impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -321,12 +313,12 @@ impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
 impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
     /// Set the `genres` field (optional)
     pub fn genres(mut self, value: impl Into<Option<Vec<Genre<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `genres` field to an Option value (optional)
     pub fn maybe_genres(mut self, value: Option<Vec<Genre<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -334,12 +326,12 @@ impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
 impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
     /// Set the `geolocation` field (optional)
     pub fn geolocation(mut self, value: impl Into<Option<Geocoordinates<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `geolocation` field to an Option value (optional)
     pub fn maybe_geolocation(mut self, value: Option<Geocoordinates<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -347,12 +339,12 @@ impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
 impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
     /// Set the `icon` field (optional)
     pub fn icon(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `icon` field to an Option value (optional)
     pub fn maybe_icon(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -367,11 +359,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ServiceBuilder<'a, service_state::SetIonosphere<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ServiceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -379,12 +371,12 @@ where
 impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -399,11 +391,11 @@ where
         mut self,
         value: impl Into<Language>,
     ) -> ServiceBuilder<'a, service_state::SetLanguage<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ServiceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -418,11 +410,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ServiceBuilder<'a, service_state::SetName<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         ServiceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -430,12 +422,12 @@ where
 impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
     /// Set the `presentationLanguage` field (optional)
     pub fn presentation_language(mut self, value: impl Into<Option<Language>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `presentationLanguage` field to an Option value (optional)
     pub fn maybe_presentation_language(mut self, value: Option<Language>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -443,23 +435,23 @@ impl<'a, S: service_state::State> ServiceBuilder<'a, S> {
 impl<'a, S> ServiceBuilder<'a, S>
 where
     S: service_state::State,
-    S::Name: service_state::IsSet,
     S::Language: service_state::IsSet,
+    S::Name: service_state::IsSet,
     S::Ionosphere: service_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Service<'a> {
         Service {
-            broadcast: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            genres: self.__unsafe_private_named.2,
-            geolocation: self.__unsafe_private_named.3,
-            icon: self.__unsafe_private_named.4,
-            ionosphere: self.__unsafe_private_named.5.unwrap(),
-            keywords: self.__unsafe_private_named.6,
-            language: self.__unsafe_private_named.7.unwrap(),
-            name: self.__unsafe_private_named.8.unwrap(),
-            presentation_language: self.__unsafe_private_named.9,
+            broadcast: self._fields.0,
+            description: self._fields.1,
+            genres: self._fields.2,
+            geolocation: self._fields.3,
+            icon: self._fields.4,
+            ionosphere: self._fields.5.unwrap(),
+            keywords: self._fields.6,
+            language: self._fields.7.unwrap(),
+            name: self._fields.8.unwrap(),
+            presentation_language: self._fields.9,
             extra_data: Default::default(),
         }
     }
@@ -472,16 +464,16 @@ where
         >,
     ) -> Service<'a> {
         Service {
-            broadcast: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            genres: self.__unsafe_private_named.2,
-            geolocation: self.__unsafe_private_named.3,
-            icon: self.__unsafe_private_named.4,
-            ionosphere: self.__unsafe_private_named.5.unwrap(),
-            keywords: self.__unsafe_private_named.6,
-            language: self.__unsafe_private_named.7.unwrap(),
-            name: self.__unsafe_private_named.8.unwrap(),
-            presentation_language: self.__unsafe_private_named.9,
+            broadcast: self._fields.0,
+            description: self._fields.1,
+            genres: self._fields.2,
+            geolocation: self._fields.3,
+            icon: self._fields.4,
+            ionosphere: self._fields.5.unwrap(),
+            keywords: self._fields.6,
+            language: self._fields.7.unwrap(),
+            name: self._fields.8.unwrap(),
+            presentation_language: self._fields.9,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/moe_karashiiro/kpaste/paste.rs b/crates/jacquard-api/src/moe_karashiiro/kpaste/paste.rs
index f2bc452d..ab1cde62 100644
--- a/crates/jacquard-api/src/moe_karashiiro/kpaste/paste.rs
+++ b/crates/jacquard-api/src/moe_karashiiro/kpaste/paste.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -186,51 +189,51 @@ pub mod paste_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Content;
         type CreatedAt;
+        type Content;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Content = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `content` field to Set
-    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContent<S> {}
-    impl<S: State> State for SetContent<S> {
-        type Content = Set<members::content>;
-        type CreatedAt = S::CreatedAt;
+        type Content = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Content = S::Content;
         type CreatedAt = Set<members::created_at>;
+        type Content = S::Content;
+    }
+    ///State transition - sets the `content` field to Set
+    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContent<S> {}
+    impl<S: State> State for SetContent<S> {
+        type CreatedAt = S::CreatedAt;
+        type Content = Set<members::content>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `content` field
-        pub struct content(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `content` field
+        pub struct content(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PasteBuilder<'a, S: paste_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Paste<'a> {
@@ -244,9 +247,9 @@ impl<'a> PasteBuilder<'a, paste_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PasteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -261,11 +264,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> PasteBuilder<'a, paste_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PasteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -280,11 +283,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PasteBuilder<'a, paste_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PasteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -292,12 +295,12 @@ where
 impl<'a, S: paste_state::State> PasteBuilder<'a, S> {
     /// Set the `language` field (optional)
     pub fn language(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `language` field to an Option value (optional)
     pub fn maybe_language(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -305,12 +308,12 @@ impl<'a, S: paste_state::State> PasteBuilder<'a, S> {
 impl<'a, S: paste_state::State> PasteBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -318,12 +321,12 @@ impl<'a, S: paste_state::State> PasteBuilder<'a, S> {
 impl<'a, S: paste_state::State> PasteBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -331,20 +334,17 @@ impl<'a, S: paste_state::State> PasteBuilder<'a, S> {
 impl<'a, S> PasteBuilder<'a, S>
 where
     S: paste_state::State,
-    S::Content: paste_state::IsSet,
     S::CreatedAt: paste_state::IsSet,
+    S::Content: paste_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Paste<'a> {
         Paste {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            language: self
-                .__unsafe_private_named
-                .2
-                .or_else(|| Some(CowStr::from("text"))),
-            title: self.__unsafe_private_named.3,
-            updated_at: self.__unsafe_private_named.4,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            language: self._fields.2.or_else(|| Some(CowStr::from("text"))),
+            title: self._fields.3,
+            updated_at: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -357,14 +357,11 @@ where
         >,
     ) -> Paste<'a> {
         Paste {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            language: self
-                .__unsafe_private_named
-                .2
-                .or_else(|| Some(CowStr::from("text"))),
-            title: self.__unsafe_private_named.3,
-            updated_at: self.__unsafe_private_named.4,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            language: self._fields.2.or_else(|| Some(CowStr::from("text"))),
+            title: self._fields.3,
+            updated_at: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/mov_danabra/avi_handle.rs b/crates/jacquard-api/src/mov_danabra/avi_handle.rs
index 92fe3661..e365c2dd 100644
--- a/crates/jacquard-api/src/mov_danabra/avi_handle.rs
+++ b/crates/jacquard-api/src/mov_danabra/avi_handle.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -92,9 +95,9 @@ pub mod avi_handle_state {
 
 /// Builder for constructing an instance of this type
 pub struct AviHandleBuilder<'a, S: avi_handle_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AviHandle<'a> {
@@ -108,9 +111,9 @@ impl<'a> AviHandleBuilder<'a, avi_handle_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AviHandleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -125,11 +128,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> AviHandleBuilder<'a, avi_handle_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AviHandleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,7 +145,7 @@ where
     /// Build the final struct
     pub fn build(self) -> AviHandle<'a> {
         AviHandle {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -155,7 +158,7 @@ where
         >,
     ) -> AviHandle<'a> {
         AviHandle {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/mov_danabra/greeting.rs b/crates/jacquard-api/src/mov_danabra/greeting.rs
index 4e84f589..a258a24f 100644
--- a/crates/jacquard-api/src/mov_danabra/greeting.rs
+++ b/crates/jacquard-api/src/mov_danabra/greeting.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/mov_danabra/post.rs b/crates/jacquard-api/src/mov_danabra/post.rs
index a830d7ac..1d37a9d9 100644
--- a/crates/jacquard-api/src/mov_danabra/post.rs
+++ b/crates/jacquard-api/src/mov_danabra/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -185,9 +188,9 @@ pub mod post_state {
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<PostFoo<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<PostFoo<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -201,9 +204,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -211,12 +214,12 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `foo` field (optional)
     pub fn foo(mut self, value: impl Into<Option<PostFoo<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `foo` field to an Option value (optional)
     pub fn maybe_foo(mut self, value: Option<PostFoo<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -231,11 +234,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PostBuilder<'a, post_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -248,8 +251,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            foo: self.__unsafe_private_named.0,
-            uri: self.__unsafe_private_named.1.unwrap(),
+            foo: self._fields.0,
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -262,8 +265,8 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            foo: self.__unsafe_private_named.0,
-            uri: self.__unsafe_private_named.1.unwrap(),
+            foo: self._fields.0,
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/mov_danabra/post_embed.rs b/crates/jacquard-api/src/mov_danabra/post_embed.rs
index 69281632..9167f793 100644
--- a/crates/jacquard-api/src/mov_danabra/post_embed.rs
+++ b/crates/jacquard-api/src/mov_danabra/post_embed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -96,9 +99,9 @@ pub mod post_embed_state {
 
 /// Builder for constructing an instance of this type
 pub struct PostEmbedBuilder<'a, S: post_embed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PostEmbed<'a> {
@@ -112,9 +115,9 @@ impl<'a> PostEmbedBuilder<'a, post_embed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -122,12 +125,12 @@ impl<'a> PostEmbedBuilder<'a, post_embed_state::Empty> {
 impl<'a, S: post_embed_state::State> PostEmbedBuilder<'a, S> {
     /// Set the `foo` field (optional)
     pub fn foo(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `foo` field to an Option value (optional)
     pub fn maybe_foo(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -142,11 +145,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PostEmbedBuilder<'a, post_embed_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -159,8 +162,8 @@ where
     /// Build the final struct
     pub fn build(self) -> PostEmbed<'a> {
         PostEmbed {
-            foo: self.__unsafe_private_named.0,
-            uri: self.__unsafe_private_named.1.unwrap(),
+            foo: self._fields.0,
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -173,8 +176,8 @@ where
         >,
     ) -> PostEmbed<'a> {
         PostEmbed {
-            foo: self.__unsafe_private_named.0,
-            uri: self.__unsafe_private_named.1.unwrap(),
+            foo: self._fields.0,
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/mov_danabra/profile_header.rs b/crates/jacquard-api/src/mov_danabra/profile_header.rs
index fa955358..d98391aa 100644
--- a/crates/jacquard-api/src/mov_danabra/profile_header.rs
+++ b/crates/jacquard-api/src/mov_danabra/profile_header.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -92,9 +95,9 @@ pub mod profile_header_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileHeaderBuilder<'a, S: profile_header_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileHeader<'a> {
@@ -108,9 +111,9 @@ impl<'a> ProfileHeaderBuilder<'a, profile_header_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileHeaderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -125,11 +128,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ProfileHeaderBuilder<'a, profile_header_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ProfileHeaderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,7 +145,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ProfileHeader<'a> {
         ProfileHeader {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -155,7 +158,7 @@ where
         >,
     ) -> ProfileHeader<'a> {
         ProfileHeader {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/mov_danabra/profile_tab.rs b/crates/jacquard-api/src/mov_danabra/profile_tab.rs
index 02d841aa..80824459 100644
--- a/crates/jacquard-api/src/mov_danabra/profile_tab.rs
+++ b/crates/jacquard-api/src/mov_danabra/profile_tab.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -193,9 +196,9 @@ pub mod profile_tab_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileTabBuilder<'a, S: profile_tab_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<ProfileTabTab<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<ProfileTabTab<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileTab<'a> {
@@ -209,9 +212,9 @@ impl<'a> ProfileTabBuilder<'a, profile_tab_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileTabBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -219,12 +222,12 @@ impl<'a> ProfileTabBuilder<'a, profile_tab_state::Empty> {
 impl<'a, S: profile_tab_state::State> ProfileTabBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -232,12 +235,12 @@ impl<'a, S: profile_tab_state::State> ProfileTabBuilder<'a, S> {
 impl<'a, S: profile_tab_state::State> ProfileTabBuilder<'a, S> {
     /// Set the `tab` field (optional)
     pub fn tab(mut self, value: impl Into<Option<ProfileTabTab<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `tab` field to an Option value (optional)
     pub fn maybe_tab(mut self, value: Option<ProfileTabTab<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -252,11 +255,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ProfileTabBuilder<'a, profile_tab_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ProfileTabBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -269,9 +272,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ProfileTab<'a> {
         ProfileTab {
-            limit: self.__unsafe_private_named.0.or_else(|| Some(10i64)),
-            tab: self.__unsafe_private_named.1,
-            uri: self.__unsafe_private_named.2.unwrap(),
+            limit: self._fields.0.or_else(|| Some(10i64)),
+            tab: self._fields.1,
+            uri: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -281,9 +284,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ProfileTab<'a> {
         ProfileTab {
-            limit: self.__unsafe_private_named.0.or_else(|| Some(10i64)),
-            tab: self.__unsafe_private_named.1,
-            uri: self.__unsafe_private_named.2.unwrap(),
+            limit: self._fields.0.or_else(|| Some(10i64)),
+            tab: self._fields.1,
+            uri: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/my_skylights/list_item.rs b/crates/jacquard-api/src/my_skylights/list_item.rs
index 97c3009c..e5853a79 100644
--- a/crates/jacquard-api/src/my_skylights/list_item.rs
+++ b/crates/jacquard-api/src/my_skylights/list_item.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -279,65 +282,65 @@ pub mod list_item_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Position;
-        type AddedAt;
         type List;
+        type AddedAt;
+        type Position;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Position = Unset;
-        type AddedAt = Unset;
         type List = Unset;
+        type AddedAt = Unset;
+        type Position = Unset;
     }
-    ///State transition - sets the `position` field to Set
-    pub struct SetPosition<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPosition<S> {}
-    impl<S: State> State for SetPosition<S> {
-        type Position = Set<members::position>;
+    ///State transition - sets the `list` field to Set
+    pub struct SetList<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetList<S> {}
+    impl<S: State> State for SetList<S> {
+        type List = Set<members::list>;
         type AddedAt = S::AddedAt;
-        type List = S::List;
+        type Position = S::Position;
     }
     ///State transition - sets the `added_at` field to Set
     pub struct SetAddedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAddedAt<S> {}
     impl<S: State> State for SetAddedAt<S> {
-        type Position = S::Position;
-        type AddedAt = Set<members::added_at>;
         type List = S::List;
-    }
-    ///State transition - sets the `list` field to Set
-    pub struct SetList<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetList<S> {}
-    impl<S: State> State for SetList<S> {
+        type AddedAt = Set<members::added_at>;
         type Position = S::Position;
+    }
+    ///State transition - sets the `position` field to Set
+    pub struct SetPosition<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPosition<S> {}
+    impl<S: State> State for SetPosition<S> {
+        type List = S::List;
         type AddedAt = S::AddedAt;
-        type List = Set<members::list>;
+        type Position = Set<members::position>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `position` field
-        pub struct position(());
-        ///Marker type for the `added_at` field
-        pub struct added_at(());
         ///Marker type for the `list` field
         pub struct list(());
+        ///Marker type for the `added_at` field
+        pub struct added_at(());
+        ///Marker type for the `position` field
+        pub struct position(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ListItemBuilder<'a, S: list_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Item<'a>>,
         Option<ListItemList<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListItem<'a> {
@@ -351,9 +354,9 @@ impl<'a> ListItemBuilder<'a, list_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -368,11 +371,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListItemBuilder<'a, list_item_state::SetAddedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -380,12 +383,12 @@ where
 impl<'a, S: list_item_state::State> ListItemBuilder<'a, S> {
     /// Set the `item` field (optional)
     pub fn item(mut self, value: impl Into<Option<Item<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `item` field to an Option value (optional)
     pub fn maybe_item(mut self, value: Option<Item<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -400,11 +403,11 @@ where
         mut self,
         value: impl Into<ListItemList<'a>>,
     ) -> ListItemBuilder<'a, list_item_state::SetList<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -412,12 +415,12 @@ where
 impl<'a, S: list_item_state::State> ListItemBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -432,11 +435,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ListItemBuilder<'a, list_item_state::SetPosition<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -444,18 +447,18 @@ where
 impl<'a, S> ListItemBuilder<'a, S>
 where
     S: list_item_state::State,
-    S::Position: list_item_state::IsSet,
-    S::AddedAt: list_item_state::IsSet,
     S::List: list_item_state::IsSet,
+    S::AddedAt: list_item_state::IsSet,
+    S::Position: list_item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ListItem<'a> {
         ListItem {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            item: self.__unsafe_private_named.1,
-            list: self.__unsafe_private_named.2.unwrap(),
-            note: self.__unsafe_private_named.3,
-            position: self.__unsafe_private_named.4.unwrap(),
+            added_at: self._fields.0.unwrap(),
+            item: self._fields.1,
+            list: self._fields.2.unwrap(),
+            note: self._fields.3,
+            position: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -468,11 +471,11 @@ where
         >,
     ) -> ListItem<'a> {
         ListItem {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            item: self.__unsafe_private_named.1,
-            list: self.__unsafe_private_named.2.unwrap(),
-            note: self.__unsafe_private_named.3,
-            position: self.__unsafe_private_named.4.unwrap(),
+            added_at: self._fields.0.unwrap(),
+            item: self._fields.1,
+            list: self._fields.2.unwrap(),
+            note: self._fields.3,
+            position: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/my_skylights/rel.rs b/crates/jacquard-api/src/my_skylights/rel.rs
index 1ca539fa..17acc9d1 100644
--- a/crates/jacquard-api/src/my_skylights/rel.rs
+++ b/crates/jacquard-api/src/my_skylights/rel.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -210,14 +213,14 @@ pub mod rel_state {
 
 /// Builder for constructing an instance of this type
 pub struct RelBuilder<'a, S: rel_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<Datetime>>,
         Option<Item<'a>>,
         Option<rel::Note<'a>>,
         Option<rel::Rating<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Rel<'a> {
@@ -231,9 +234,9 @@ impl<'a> RelBuilder<'a, rel_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -241,12 +244,12 @@ impl<'a> RelBuilder<'a, rel_state::Empty> {
 impl<'a, S: rel_state::State> RelBuilder<'a, S> {
     /// Set the `finishedAt` field (optional)
     pub fn finished_at(mut self, value: impl Into<Option<Vec<Datetime>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `finishedAt` field to an Option value (optional)
     pub fn maybe_finished_at(mut self, value: Option<Vec<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -261,11 +264,11 @@ where
         mut self,
         value: impl Into<Item<'a>>,
     ) -> RelBuilder<'a, rel_state::SetItem<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -273,12 +276,12 @@ where
 impl<'a, S: rel_state::State> RelBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<rel::Note<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<rel::Note<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -286,12 +289,12 @@ impl<'a, S: rel_state::State> RelBuilder<'a, S> {
 impl<'a, S: rel_state::State> RelBuilder<'a, S> {
     /// Set the `rating` field (optional)
     pub fn rating(mut self, value: impl Into<Option<rel::Rating<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `rating` field to an Option value (optional)
     pub fn maybe_rating(mut self, value: Option<rel::Rating<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -304,10 +307,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Rel<'a> {
         Rel {
-            finished_at: self.__unsafe_private_named.0,
-            item: self.__unsafe_private_named.1.unwrap(),
-            note: self.__unsafe_private_named.2,
-            rating: self.__unsafe_private_named.3,
+            finished_at: self._fields.0,
+            item: self._fields.1.unwrap(),
+            note: self._fields.2,
+            rating: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -320,10 +323,10 @@ where
         >,
     ) -> Rel<'a> {
         Rel {
-            finished_at: self.__unsafe_private_named.0,
-            item: self.__unsafe_private_named.1.unwrap(),
-            note: self.__unsafe_private_named.2,
-            rating: self.__unsafe_private_named.3,
+            finished_at: self._fields.0,
+            item: self._fields.1.unwrap(),
+            note: self._fields.2,
+            rating: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -471,58 +474,58 @@ pub mod note_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type UpdatedAt;
-        type Value;
         type CreatedAt;
+        type Value;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type UpdatedAt = Unset;
-        type Value = Unset;
         type CreatedAt = Unset;
+        type Value = Unset;
     }
     ///State transition - sets the `updated_at` field to Set
     pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
     impl<S: State> State for SetUpdatedAt<S> {
         type UpdatedAt = Set<members::updated_at>;
-        type Value = S::Value;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `value` field to Set
-    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetValue<S> {}
-    impl<S: State> State for SetValue<S> {
-        type UpdatedAt = S::UpdatedAt;
-        type Value = Set<members::value>;
         type CreatedAt = S::CreatedAt;
+        type Value = S::Value;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type UpdatedAt = S::UpdatedAt;
-        type Value = S::Value;
         type CreatedAt = Set<members::created_at>;
+        type Value = S::Value;
+    }
+    ///State transition - sets the `value` field to Set
+    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetValue<S> {}
+    impl<S: State> State for SetValue<S> {
+        type UpdatedAt = S::UpdatedAt;
+        type CreatedAt = S::CreatedAt;
+        type Value = Set<members::value>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `updated_at` field
         pub struct updated_at(());
-        ///Marker type for the `value` field
-        pub struct value(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `value` field
+        pub struct value(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct NoteBuilder<'a, S: note_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Note<'a> {
@@ -536,9 +539,9 @@ impl<'a> NoteBuilder<'a, note_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -553,11 +556,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> NoteBuilder<'a, note_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -572,11 +575,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> NoteBuilder<'a, note_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -591,11 +594,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> NoteBuilder<'a, note_state::SetValue<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -604,15 +607,15 @@ impl<'a, S> NoteBuilder<'a, S>
 where
     S: note_state::State,
     S::UpdatedAt: note_state::IsSet,
-    S::Value: note_state::IsSet,
     S::CreatedAt: note_state::IsSet,
+    S::Value: note_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Note<'a> {
         Note {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            updated_at: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            updated_at: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -625,9 +628,9 @@ where
         >,
     ) -> Note<'a> {
         Note {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            updated_at: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            updated_at: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -679,9 +682,9 @@ pub mod rating_state {
 
 /// Builder for constructing an instance of this type
 pub struct RatingBuilder<'a, S: rating_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Rating<'a> {
@@ -695,9 +698,9 @@ impl<'a> RatingBuilder<'a, rating_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RatingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -712,11 +715,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RatingBuilder<'a, rating_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RatingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -731,11 +734,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RatingBuilder<'a, rating_state::SetValue<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RatingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -749,8 +752,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Rating<'a> {
         Rating {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            value: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            value: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -763,8 +766,8 @@ where
         >,
     ) -> Rating<'a> {
         Rating {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            value: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            value: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_aftertheinter/coolthingtwo.rs b/crates/jacquard-api/src/net_aftertheinter/coolthingtwo.rs
index 28640425..10f77e65 100644
--- a/crates/jacquard-api/src/net_aftertheinter/coolthingtwo.rs
+++ b/crates/jacquard-api/src/net_aftertheinter/coolthingtwo.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -142,45 +145,45 @@ pub mod coolthingtwo_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Status;
         type CreatedAt;
+        type Status;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Status = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `status` field to Set
-    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStatus<S> {}
-    impl<S: State> State for SetStatus<S> {
-        type Status = Set<members::status>;
-        type CreatedAt = S::CreatedAt;
+        type Status = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Status = S::Status;
         type CreatedAt = Set<members::created_at>;
+        type Status = S::Status;
+    }
+    ///State transition - sets the `status` field to Set
+    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStatus<S> {}
+    impl<S: State> State for SetStatus<S> {
+        type CreatedAt = S::CreatedAt;
+        type Status = Set<members::status>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `status` field
-        pub struct status(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `status` field
+        pub struct status(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CoolthingtwoBuilder<'a, S: coolthingtwo_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Coolthingtwo<'a> {
@@ -194,9 +197,9 @@ impl<'a> CoolthingtwoBuilder<'a, coolthingtwo_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CoolthingtwoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -211,11 +214,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CoolthingtwoBuilder<'a, coolthingtwo_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CoolthingtwoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -230,11 +233,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CoolthingtwoBuilder<'a, coolthingtwo_state::SetStatus<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CoolthingtwoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -242,14 +245,14 @@ where
 impl<'a, S> CoolthingtwoBuilder<'a, S>
 where
     S: coolthingtwo_state::State,
-    S::Status: coolthingtwo_state::IsSet,
     S::CreatedAt: coolthingtwo_state::IsSet,
+    S::Status: coolthingtwo_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Coolthingtwo<'a> {
         Coolthingtwo {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            status: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            status: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -262,8 +265,8 @@ where
         >,
     ) -> Coolthingtwo<'a> {
         Coolthingtwo {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            status: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            status: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_alternativeproto/review.rs b/crates/jacquard-api/src/net_alternativeproto/review.rs
index 51e3bc64..a07a557e 100644
--- a/crates/jacquard-api/src/net_alternativeproto/review.rs
+++ b/crates/jacquard-api/src/net_alternativeproto/review.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -159,8 +162,8 @@ pub mod review_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Rating;
         type ProjectId;
+        type Rating;
         type Text;
         type CreatedAt;
     }
@@ -168,26 +171,26 @@ pub mod review_state {
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Rating = Unset;
         type ProjectId = Unset;
+        type Rating = Unset;
         type Text = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `rating` field to Set
-    pub struct SetRating<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRating<S> {}
-    impl<S: State> State for SetRating<S> {
-        type Rating = Set<members::rating>;
-        type ProjectId = S::ProjectId;
-        type Text = S::Text;
-        type CreatedAt = S::CreatedAt;
-    }
     ///State transition - sets the `project_id` field to Set
     pub struct SetProjectId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetProjectId<S> {}
     impl<S: State> State for SetProjectId<S> {
-        type Rating = S::Rating;
         type ProjectId = Set<members::project_id>;
+        type Rating = S::Rating;
+        type Text = S::Text;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `rating` field to Set
+    pub struct SetRating<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRating<S> {}
+    impl<S: State> State for SetRating<S> {
+        type ProjectId = S::ProjectId;
+        type Rating = Set<members::rating>;
         type Text = S::Text;
         type CreatedAt = S::CreatedAt;
     }
@@ -195,8 +198,8 @@ pub mod review_state {
     pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetText<S> {}
     impl<S: State> State for SetText<S> {
-        type Rating = S::Rating;
         type ProjectId = S::ProjectId;
+        type Rating = S::Rating;
         type Text = Set<members::text>;
         type CreatedAt = S::CreatedAt;
     }
@@ -204,18 +207,18 @@ pub mod review_state {
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Rating = S::Rating;
         type ProjectId = S::ProjectId;
+        type Rating = S::Rating;
         type Text = S::Text;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `rating` field
-        pub struct rating(());
         ///Marker type for the `project_id` field
         pub struct project_id(());
+        ///Marker type for the `rating` field
+        pub struct rating(());
         ///Marker type for the `text` field
         pub struct text(());
         ///Marker type for the `created_at` field
@@ -225,14 +228,9 @@ pub mod review_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReviewBuilder<'a, S: review_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<CowStr<'a>>,
-        Option<i64>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Review<'a> {
@@ -246,9 +244,9 @@ impl<'a> ReviewBuilder<'a, review_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -263,11 +261,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReviewBuilder<'a, review_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -282,11 +280,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReviewBuilder<'a, review_state::SetProjectId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -301,11 +299,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ReviewBuilder<'a, review_state::SetRating<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -320,11 +318,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReviewBuilder<'a, review_state::SetText<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -332,18 +330,18 @@ where
 impl<'a, S> ReviewBuilder<'a, S>
 where
     S: review_state::State,
-    S::Rating: review_state::IsSet,
     S::ProjectId: review_state::IsSet,
+    S::Rating: review_state::IsSet,
     S::Text: review_state::IsSet,
     S::CreatedAt: review_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Review<'a> {
         Review {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            project_id: self.__unsafe_private_named.1.unwrap(),
-            rating: self.__unsafe_private_named.2.unwrap(),
-            text: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            project_id: self._fields.1.unwrap(),
+            rating: self._fields.2.unwrap(),
+            text: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -356,10 +354,10 @@ where
         >,
     ) -> Review<'a> {
         Review {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            project_id: self.__unsafe_private_named.1.unwrap(),
-            rating: self.__unsafe_private_named.2.unwrap(),
-            text: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            project_id: self._fields.1.unwrap(),
+            rating: self._fields.2.unwrap(),
+            text: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_alternativeproto/submission.rs b/crates/jacquard-api/src/net_alternativeproto/submission.rs
index 93bae03e..f06aef19 100644
--- a/crates/jacquard-api/src/net_alternativeproto/submission.rs
+++ b/crates/jacquard-api/src/net_alternativeproto/submission.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -306,83 +309,83 @@ pub mod submission_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type AuthType;
+        type Url;
         type Description;
+        type AuthType;
         type CreatedAt;
-        type Url;
         type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type AuthType = Unset;
+        type Url = Unset;
         type Description = Unset;
+        type AuthType = Unset;
         type CreatedAt = Unset;
-        type Url = Unset;
         type Name = Unset;
     }
-    ///State transition - sets the `auth_type` field to Set
-    pub struct SetAuthType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAuthType<S> {}
-    impl<S: State> State for SetAuthType<S> {
-        type AuthType = Set<members::auth_type>;
+    ///State transition - sets the `url` field to Set
+    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUrl<S> {}
+    impl<S: State> State for SetUrl<S> {
+        type Url = Set<members::url>;
         type Description = S::Description;
+        type AuthType = S::AuthType;
         type CreatedAt = S::CreatedAt;
-        type Url = S::Url;
         type Name = S::Name;
     }
     ///State transition - sets the `description` field to Set
     pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDescription<S> {}
     impl<S: State> State for SetDescription<S> {
-        type AuthType = S::AuthType;
+        type Url = S::Url;
         type Description = Set<members::description>;
+        type AuthType = S::AuthType;
         type CreatedAt = S::CreatedAt;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `auth_type` field to Set
+    pub struct SetAuthType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAuthType<S> {}
+    impl<S: State> State for SetAuthType<S> {
         type Url = S::Url;
+        type Description = S::Description;
+        type AuthType = Set<members::auth_type>;
+        type CreatedAt = S::CreatedAt;
         type Name = S::Name;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type AuthType = S::AuthType;
-        type Description = S::Description;
-        type CreatedAt = Set<members::created_at>;
         type Url = S::Url;
-        type Name = S::Name;
-    }
-    ///State transition - sets the `url` field to Set
-    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUrl<S> {}
-    impl<S: State> State for SetUrl<S> {
-        type AuthType = S::AuthType;
         type Description = S::Description;
-        type CreatedAt = S::CreatedAt;
-        type Url = Set<members::url>;
+        type AuthType = S::AuthType;
+        type CreatedAt = Set<members::created_at>;
         type Name = S::Name;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type AuthType = S::AuthType;
+        type Url = S::Url;
         type Description = S::Description;
+        type AuthType = S::AuthType;
         type CreatedAt = S::CreatedAt;
-        type Url = S::Url;
         type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `auth_type` field
-        pub struct auth_type(());
+        ///Marker type for the `url` field
+        pub struct url(());
         ///Marker type for the `description` field
         pub struct description(());
+        ///Marker type for the `auth_type` field
+        pub struct auth_type(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `url` field
-        pub struct url(());
         ///Marker type for the `name` field
         pub struct name(());
     }
@@ -390,8 +393,8 @@ pub mod submission_state {
 
 /// Builder for constructing an instance of this type
 pub struct SubmissionBuilder<'a, S: submission_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<CowStr<'a>>>,
         Option<SubmissionAuthType<'a>>,
         Option<Datetime>,
@@ -403,7 +406,7 @@ pub struct SubmissionBuilder<'a, S: submission_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Submission<'a> {
@@ -417,20 +420,9 @@ impl<'a> SubmissionBuilder<'a, submission_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubmissionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -438,12 +430,12 @@ impl<'a> SubmissionBuilder<'a, submission_state::Empty> {
 impl<'a, S: submission_state::State> SubmissionBuilder<'a, S> {
     /// Set the `alternativeTo` field (optional)
     pub fn alternative_to(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alternativeTo` field to an Option value (optional)
     pub fn maybe_alternative_to(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -458,11 +450,11 @@ where
         mut self,
         value: impl Into<SubmissionAuthType<'a>>,
     ) -> SubmissionBuilder<'a, submission_state::SetAuthType<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SubmissionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -477,11 +469,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SubmissionBuilder<'a, submission_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SubmissionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -496,11 +488,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SubmissionBuilder<'a, submission_state::SetDescription<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SubmissionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -508,12 +500,12 @@ where
 impl<'a, S: submission_state::State> SubmissionBuilder<'a, S> {
     /// Set the `icon` field (optional)
     pub fn icon(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `icon` field to an Option value (optional)
     pub fn maybe_icon(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -521,12 +513,12 @@ impl<'a, S: submission_state::State> SubmissionBuilder<'a, S> {
 impl<'a, S: submission_state::State> SubmissionBuilder<'a, S> {
     /// Set the `isOpenSource` field (optional)
     pub fn is_open_source(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `isOpenSource` field to an Option value (optional)
     pub fn maybe_is_open_source(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -541,11 +533,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SubmissionBuilder<'a, submission_state::SetName<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         SubmissionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -553,12 +545,12 @@ where
 impl<'a, S: submission_state::State> SubmissionBuilder<'a, S> {
     /// Set the `repositoryUrl` field (optional)
     pub fn repository_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `repositoryUrl` field to an Option value (optional)
     pub fn maybe_repository_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -566,12 +558,12 @@ impl<'a, S: submission_state::State> SubmissionBuilder<'a, S> {
 impl<'a, S: submission_state::State> SubmissionBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -586,11 +578,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> SubmissionBuilder<'a, submission_state::SetUrl<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         SubmissionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -598,25 +590,25 @@ where
 impl<'a, S> SubmissionBuilder<'a, S>
 where
     S: submission_state::State,
-    S::AuthType: submission_state::IsSet,
+    S::Url: submission_state::IsSet,
     S::Description: submission_state::IsSet,
+    S::AuthType: submission_state::IsSet,
     S::CreatedAt: submission_state::IsSet,
-    S::Url: submission_state::IsSet,
     S::Name: submission_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Submission<'a> {
         Submission {
-            alternative_to: self.__unsafe_private_named.0,
-            auth_type: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3.unwrap(),
-            icon: self.__unsafe_private_named.4,
-            is_open_source: self.__unsafe_private_named.5,
-            name: self.__unsafe_private_named.6.unwrap(),
-            repository_url: self.__unsafe_private_named.7,
-            tags: self.__unsafe_private_named.8,
-            url: self.__unsafe_private_named.9.unwrap(),
+            alternative_to: self._fields.0,
+            auth_type: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3.unwrap(),
+            icon: self._fields.4,
+            is_open_source: self._fields.5,
+            name: self._fields.6.unwrap(),
+            repository_url: self._fields.7,
+            tags: self._fields.8,
+            url: self._fields.9.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -629,16 +621,16 @@ where
         >,
     ) -> Submission<'a> {
         Submission {
-            alternative_to: self.__unsafe_private_named.0,
-            auth_type: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3.unwrap(),
-            icon: self.__unsafe_private_named.4,
-            is_open_source: self.__unsafe_private_named.5,
-            name: self.__unsafe_private_named.6.unwrap(),
-            repository_url: self.__unsafe_private_named.7,
-            tags: self.__unsafe_private_named.8,
-            url: self.__unsafe_private_named.9.unwrap(),
+            alternative_to: self._fields.0,
+            auth_type: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3.unwrap(),
+            icon: self._fields.4,
+            is_open_source: self._fields.5,
+            name: self._fields.6.unwrap(),
+            repository_url: self._fields.7,
+            tags: self._fields.8,
+            url: self._fields.9.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_alternativeproto/vote.rs b/crates/jacquard-api/src/net_alternativeproto/vote.rs
index d4e6388b..038f7eb2 100644
--- a/crates/jacquard-api/src/net_alternativeproto/vote.rs
+++ b/crates/jacquard-api/src/net_alternativeproto/vote.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -204,63 +207,59 @@ pub mod vote_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Direction;
         type Subject;
         type CreatedAt;
-        type Direction;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Direction = Unset;
         type Subject = Unset;
         type CreatedAt = Unset;
-        type Direction = Unset;
+    }
+    ///State transition - sets the `direction` field to Set
+    pub struct SetDirection<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDirection<S> {}
+    impl<S: State> State for SetDirection<S> {
+        type Direction = Set<members::direction>;
+        type Subject = S::Subject;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
+        type Direction = S::Direction;
         type Subject = Set<members::subject>;
         type CreatedAt = S::CreatedAt;
-        type Direction = S::Direction;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
-        type CreatedAt = Set<members::created_at>;
         type Direction = S::Direction;
-    }
-    ///State transition - sets the `direction` field to Set
-    pub struct SetDirection<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDirection<S> {}
-    impl<S: State> State for SetDirection<S> {
         type Subject = S::Subject;
-        type CreatedAt = S::CreatedAt;
-        type Direction = Set<members::direction>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `direction` field
+        pub struct direction(());
         ///Marker type for the `subject` field
         pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `direction` field
-        pub struct direction(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct VoteBuilder<'a, S: vote_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<VoteDirection<'a>>,
-        Option<StrongRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<VoteDirection<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Vote<'a> {
@@ -274,9 +273,9 @@ impl<'a> VoteBuilder<'a, vote_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -291,11 +290,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> VoteBuilder<'a, vote_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -310,11 +309,11 @@ where
         mut self,
         value: impl Into<VoteDirection<'a>>,
     ) -> VoteBuilder<'a, vote_state::SetDirection<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -329,11 +328,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> VoteBuilder<'a, vote_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -341,16 +340,16 @@ where
 impl<'a, S> VoteBuilder<'a, S>
 where
     S: vote_state::State,
+    S::Direction: vote_state::IsSet,
     S::Subject: vote_state::IsSet,
     S::CreatedAt: vote_state::IsSet,
-    S::Direction: vote_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Vote<'a> {
         Vote {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            direction: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            direction: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -363,9 +362,9 @@ where
         >,
     ) -> Vote<'a> {
         Vote {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            direction: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            direction: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_altq/aqfile.rs b/crates/jacquard-api/src/net_altq/aqfile.rs
index 32a3d3c5..3b5978f1 100644
--- a/crates/jacquard-api/src/net_altq/aqfile.rs
+++ b/crates/jacquard-api/src/net_altq/aqfile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -567,50 +570,45 @@ pub mod file_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type Size;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type Size = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Size = S::Size;
+        type Name = Unset;
     }
     ///State transition - sets the `size` field to Set
     pub struct SetSize<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSize<S> {}
     impl<S: State> State for SetSize<S> {
-        type Name = S::Name;
         type Size = Set<members::size>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Size = S::Size;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `size` field
         pub struct size(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FileBuilder<'a, S: file_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<Datetime>,
-        Option<CowStr<'a>>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Datetime>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> File<'a> {
@@ -624,9 +622,9 @@ impl<'a> FileBuilder<'a, file_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -634,12 +632,12 @@ impl<'a> FileBuilder<'a, file_state::Empty> {
 impl<'a, S: file_state::State> FileBuilder<'a, S> {
     /// Set the `mimeType` field (optional)
     pub fn mime_type(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `mimeType` field to an Option value (optional)
     pub fn maybe_mime_type(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -647,12 +645,12 @@ impl<'a, S: file_state::State> FileBuilder<'a, S> {
 impl<'a, S: file_state::State> FileBuilder<'a, S> {
     /// Set the `modifiedAt` field (optional)
     pub fn modified_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `modifiedAt` field to an Option value (optional)
     pub fn maybe_modified_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -667,11 +665,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> FileBuilder<'a, file_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         FileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -686,11 +684,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> FileBuilder<'a, file_state::SetSize<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         FileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -698,16 +696,16 @@ where
 impl<'a, S> FileBuilder<'a, S>
 where
     S: file_state::State,
-    S::Name: file_state::IsSet,
     S::Size: file_state::IsSet,
+    S::Name: file_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> File<'a> {
         File {
-            mime_type: self.__unsafe_private_named.0,
-            modified_at: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
-            size: self.__unsafe_private_named.3.unwrap(),
+            mime_type: self._fields.0,
+            modified_at: self._fields.1,
+            name: self._fields.2.unwrap(),
+            size: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -720,10 +718,10 @@ where
         >,
     ) -> File<'a> {
         File {
-            mime_type: self.__unsafe_private_named.0,
-            modified_at: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
-            size: self.__unsafe_private_named.3.unwrap(),
+            mime_type: self._fields.0,
+            modified_at: self._fields.1,
+            name: self._fields.2.unwrap(),
+            size: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -789,15 +787,15 @@ pub mod aqfile_state {
 
 /// Builder for constructing an instance of this type
 pub struct AqfileBuilder<'a, S: aqfile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<BlobRef<'a>>,
         Option<aqfile::Checksum<'a>>,
         Option<Datetime>,
         Option<aqfile::File<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Aqfile<'a> {
@@ -811,9 +809,9 @@ impl<'a> AqfileBuilder<'a, aqfile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AqfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -821,12 +819,12 @@ impl<'a> AqfileBuilder<'a, aqfile_state::Empty> {
 impl<'a, S: aqfile_state::State> AqfileBuilder<'a, S> {
     /// Set the `attribution` field (optional)
     pub fn attribution(mut self, value: impl Into<Option<AtIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `attribution` field to an Option value (optional)
     pub fn maybe_attribution(mut self, value: Option<AtIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -841,11 +839,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> AqfileBuilder<'a, aqfile_state::SetBlob<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AqfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -853,12 +851,12 @@ where
 impl<'a, S: aqfile_state::State> AqfileBuilder<'a, S> {
     /// Set the `checksum` field (optional)
     pub fn checksum(mut self, value: impl Into<Option<aqfile::Checksum<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `checksum` field to an Option value (optional)
     pub fn maybe_checksum(mut self, value: Option<aqfile::Checksum<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -873,11 +871,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AqfileBuilder<'a, aqfile_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         AqfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -892,11 +890,11 @@ where
         mut self,
         value: impl Into<aqfile::File<'a>>,
     ) -> AqfileBuilder<'a, aqfile_state::SetFile<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         AqfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -911,11 +909,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Aqfile<'a> {
         Aqfile {
-            attribution: self.__unsafe_private_named.0,
-            blob: self.__unsafe_private_named.1.unwrap(),
-            checksum: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            file: self.__unsafe_private_named.4.unwrap(),
+            attribution: self._fields.0,
+            blob: self._fields.1.unwrap(),
+            checksum: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            file: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -928,11 +926,11 @@ where
         >,
     ) -> Aqfile<'a> {
         Aqfile {
-            attribution: self.__unsafe_private_named.0,
-            blob: self.__unsafe_private_named.1.unwrap(),
-            checksum: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            file: self.__unsafe_private_named.4.unwrap(),
+            attribution: self._fields.0,
+            blob: self._fields.1.unwrap(),
+            checksum: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            file: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_anisota/beta/game/collection.rs b/crates/jacquard-api/src/net_anisota/beta/game/collection.rs
index 4b1541a2..43c9c86b 100644
--- a/crates/jacquard-api/src/net_anisota/beta/game/collection.rs
+++ b/crates/jacquard-api/src/net_anisota/beta/game/collection.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -305,8 +308,8 @@ pub mod collection_state {
     pub trait State: sealed::Sealed {
         type Quantity;
         type SpecimenId;
-        type AcquiredAt;
         type CreatedAt;
+        type AcquiredAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
@@ -314,8 +317,8 @@ pub mod collection_state {
     impl State for Empty {
         type Quantity = Unset;
         type SpecimenId = Unset;
-        type AcquiredAt = Unset;
         type CreatedAt = Unset;
+        type AcquiredAt = Unset;
     }
     ///State transition - sets the `quantity` field to Set
     pub struct SetQuantity<S: State = Empty>(PhantomData<fn() -> S>);
@@ -323,8 +326,8 @@ pub mod collection_state {
     impl<S: State> State for SetQuantity<S> {
         type Quantity = Set<members::quantity>;
         type SpecimenId = S::SpecimenId;
-        type AcquiredAt = S::AcquiredAt;
         type CreatedAt = S::CreatedAt;
+        type AcquiredAt = S::AcquiredAt;
     }
     ///State transition - sets the `specimen_id` field to Set
     pub struct SetSpecimenId<S: State = Empty>(PhantomData<fn() -> S>);
@@ -332,17 +335,8 @@ pub mod collection_state {
     impl<S: State> State for SetSpecimenId<S> {
         type Quantity = S::Quantity;
         type SpecimenId = Set<members::specimen_id>;
-        type AcquiredAt = S::AcquiredAt;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `acquired_at` field to Set
-    pub struct SetAcquiredAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAcquiredAt<S> {}
-    impl<S: State> State for SetAcquiredAt<S> {
-        type Quantity = S::Quantity;
-        type SpecimenId = S::SpecimenId;
-        type AcquiredAt = Set<members::acquired_at>;
         type CreatedAt = S::CreatedAt;
+        type AcquiredAt = S::AcquiredAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
@@ -350,8 +344,17 @@ pub mod collection_state {
     impl<S: State> State for SetCreatedAt<S> {
         type Quantity = S::Quantity;
         type SpecimenId = S::SpecimenId;
-        type AcquiredAt = S::AcquiredAt;
         type CreatedAt = Set<members::created_at>;
+        type AcquiredAt = S::AcquiredAt;
+    }
+    ///State transition - sets the `acquired_at` field to Set
+    pub struct SetAcquiredAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAcquiredAt<S> {}
+    impl<S: State> State for SetAcquiredAt<S> {
+        type Quantity = S::Quantity;
+        type SpecimenId = S::SpecimenId;
+        type CreatedAt = S::CreatedAt;
+        type AcquiredAt = Set<members::acquired_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
@@ -360,17 +363,17 @@ pub mod collection_state {
         pub struct quantity(());
         ///Marker type for the `specimen_id` field
         pub struct specimen_id(());
-        ///Marker type for the `acquired_at` field
-        pub struct acquired_at(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `acquired_at` field
+        pub struct acquired_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CollectionBuilder<'a, S: collection_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -389,7 +392,7 @@ pub struct CollectionBuilder<'a, S: collection_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Collection<'a> {
@@ -403,8 +406,8 @@ impl<'a> CollectionBuilder<'a, collection_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -423,7 +426,7 @@ impl<'a> CollectionBuilder<'a, collection_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -438,11 +441,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionBuilder<'a, collection_state::SetAcquiredAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -450,12 +453,12 @@ where
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `commonName` field (optional)
     pub fn common_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `commonName` field to an Option value (optional)
     pub fn maybe_common_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -470,11 +473,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionBuilder<'a, collection_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -482,12 +485,12 @@ where
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `family` field (optional)
     pub fn family(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `family` field to an Option value (optional)
     pub fn maybe_family(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -495,12 +498,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `genus` field (optional)
     pub fn genus(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `genus` field to an Option value (optional)
     pub fn maybe_genus(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -508,12 +511,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `lastModified` field (optional)
     pub fn last_modified(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `lastModified` field to an Option value (optional)
     pub fn maybe_last_modified(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -521,12 +524,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `lastSeen` field (optional)
     pub fn last_seen(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `lastSeen` field to an Option value (optional)
     pub fn maybe_last_seen(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -534,12 +537,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `logRecordUri` field (optional)
     pub fn log_record_uri(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `logRecordUri` field to an Option value (optional)
     pub fn maybe_log_record_uri(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -554,11 +557,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CollectionBuilder<'a, collection_state::SetQuantity<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -566,12 +569,12 @@ where
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `rarity` field (optional)
     pub fn rarity(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `rarity` field to an Option value (optional)
     pub fn maybe_rarity(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -579,12 +582,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `scientificName` field (optional)
     pub fn scientific_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `scientificName` field to an Option value (optional)
     pub fn maybe_scientific_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -592,12 +595,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `source` field (optional)
     pub fn source(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `source` field to an Option value (optional)
     pub fn maybe_source(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -608,7 +611,7 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
         mut self,
         value: impl Into<Option<collection::SourceDetails<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `sourceDetails` field to an Option value (optional)
@@ -616,7 +619,7 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
         mut self,
         value: Option<collection::SourceDetails<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -624,12 +627,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `species` field (optional)
     pub fn species(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `species` field to an Option value (optional)
     pub fn maybe_species(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -640,7 +643,7 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
         mut self,
         value: impl Into<Option<collection::SpecimenData<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `specimenData` field to an Option value (optional)
@@ -648,7 +651,7 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
         mut self,
         value: Option<collection::SpecimenData<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -663,11 +666,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CollectionBuilder<'a, collection_state::SetSpecimenId<S>> {
-        self.__unsafe_private_named.15 = Option::Some(value.into());
+        self._fields.15 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -675,12 +678,12 @@ where
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -690,29 +693,29 @@ where
     S: collection_state::State,
     S::Quantity: collection_state::IsSet,
     S::SpecimenId: collection_state::IsSet,
-    S::AcquiredAt: collection_state::IsSet,
     S::CreatedAt: collection_state::IsSet,
+    S::AcquiredAt: collection_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Collection<'a> {
         Collection {
-            acquired_at: self.__unsafe_private_named.0.unwrap(),
-            common_name: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            family: self.__unsafe_private_named.3,
-            genus: self.__unsafe_private_named.4,
-            last_modified: self.__unsafe_private_named.5,
-            last_seen: self.__unsafe_private_named.6,
-            log_record_uri: self.__unsafe_private_named.7,
-            quantity: self.__unsafe_private_named.8.unwrap(),
-            rarity: self.__unsafe_private_named.9,
-            scientific_name: self.__unsafe_private_named.10,
-            source: self.__unsafe_private_named.11,
-            source_details: self.__unsafe_private_named.12,
-            species: self.__unsafe_private_named.13,
-            specimen_data: self.__unsafe_private_named.14,
-            specimen_id: self.__unsafe_private_named.15.unwrap(),
-            status: self.__unsafe_private_named.16,
+            acquired_at: self._fields.0.unwrap(),
+            common_name: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            family: self._fields.3,
+            genus: self._fields.4,
+            last_modified: self._fields.5,
+            last_seen: self._fields.6,
+            log_record_uri: self._fields.7,
+            quantity: self._fields.8.unwrap(),
+            rarity: self._fields.9,
+            scientific_name: self._fields.10,
+            source: self._fields.11,
+            source_details: self._fields.12,
+            species: self._fields.13,
+            specimen_data: self._fields.14,
+            specimen_id: self._fields.15.unwrap(),
+            status: self._fields.16,
             extra_data: Default::default(),
         }
     }
@@ -725,23 +728,23 @@ where
         >,
     ) -> Collection<'a> {
         Collection {
-            acquired_at: self.__unsafe_private_named.0.unwrap(),
-            common_name: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            family: self.__unsafe_private_named.3,
-            genus: self.__unsafe_private_named.4,
-            last_modified: self.__unsafe_private_named.5,
-            last_seen: self.__unsafe_private_named.6,
-            log_record_uri: self.__unsafe_private_named.7,
-            quantity: self.__unsafe_private_named.8.unwrap(),
-            rarity: self.__unsafe_private_named.9,
-            scientific_name: self.__unsafe_private_named.10,
-            source: self.__unsafe_private_named.11,
-            source_details: self.__unsafe_private_named.12,
-            species: self.__unsafe_private_named.13,
-            specimen_data: self.__unsafe_private_named.14,
-            specimen_id: self.__unsafe_private_named.15.unwrap(),
-            status: self.__unsafe_private_named.16,
+            acquired_at: self._fields.0.unwrap(),
+            common_name: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            family: self._fields.3,
+            genus: self._fields.4,
+            last_modified: self._fields.5,
+            last_seen: self._fields.6,
+            log_record_uri: self._fields.7,
+            quantity: self._fields.8.unwrap(),
+            rarity: self._fields.9,
+            scientific_name: self._fields.10,
+            source: self._fields.11,
+            source_details: self._fields.12,
+            species: self._fields.13,
+            specimen_data: self._fields.14,
+            specimen_id: self._fields.15.unwrap(),
+            status: self._fields.16,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs b/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs
index 5f2a2626..8abfcdef 100644
--- a/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs
+++ b/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -248,74 +251,74 @@ pub mod inventory_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ItemId;
-        type Quantity;
         type AcquiredAt;
         type CreatedAt;
+        type ItemId;
+        type Quantity;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ItemId = Unset;
-        type Quantity = Unset;
         type AcquiredAt = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `item_id` field to Set
-    pub struct SetItemId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetItemId<S> {}
-    impl<S: State> State for SetItemId<S> {
-        type ItemId = Set<members::item_id>;
-        type Quantity = S::Quantity;
-        type AcquiredAt = S::AcquiredAt;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `quantity` field to Set
-    pub struct SetQuantity<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetQuantity<S> {}
-    impl<S: State> State for SetQuantity<S> {
-        type ItemId = S::ItemId;
-        type Quantity = Set<members::quantity>;
-        type AcquiredAt = S::AcquiredAt;
-        type CreatedAt = S::CreatedAt;
+        type ItemId = Unset;
+        type Quantity = Unset;
     }
     ///State transition - sets the `acquired_at` field to Set
     pub struct SetAcquiredAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAcquiredAt<S> {}
     impl<S: State> State for SetAcquiredAt<S> {
-        type ItemId = S::ItemId;
-        type Quantity = S::Quantity;
         type AcquiredAt = Set<members::acquired_at>;
         type CreatedAt = S::CreatedAt;
+        type ItemId = S::ItemId;
+        type Quantity = S::Quantity;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type AcquiredAt = S::AcquiredAt;
+        type CreatedAt = Set<members::created_at>;
         type ItemId = S::ItemId;
         type Quantity = S::Quantity;
+    }
+    ///State transition - sets the `item_id` field to Set
+    pub struct SetItemId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetItemId<S> {}
+    impl<S: State> State for SetItemId<S> {
         type AcquiredAt = S::AcquiredAt;
-        type CreatedAt = Set<members::created_at>;
+        type CreatedAt = S::CreatedAt;
+        type ItemId = Set<members::item_id>;
+        type Quantity = S::Quantity;
+    }
+    ///State transition - sets the `quantity` field to Set
+    pub struct SetQuantity<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetQuantity<S> {}
+    impl<S: State> State for SetQuantity<S> {
+        type AcquiredAt = S::AcquiredAt;
+        type CreatedAt = S::CreatedAt;
+        type ItemId = S::ItemId;
+        type Quantity = Set<members::quantity>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `item_id` field
-        pub struct item_id(());
-        ///Marker type for the `quantity` field
-        pub struct quantity(());
         ///Marker type for the `acquired_at` field
         pub struct acquired_at(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `item_id` field
+        pub struct item_id(());
+        ///Marker type for the `quantity` field
+        pub struct quantity(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct InventoryBuilder<'a, S: inventory_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -332,7 +335,7 @@ pub struct InventoryBuilder<'a, S: inventory_state::State> {
         Option<inventory::SourceDetails<'a>>,
         Option<bool>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Inventory<'a> {
@@ -346,8 +349,8 @@ impl<'a> InventoryBuilder<'a, inventory_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         InventoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -364,7 +367,7 @@ impl<'a> InventoryBuilder<'a, inventory_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -379,11 +382,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> InventoryBuilder<'a, inventory_state::SetAcquiredAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         InventoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -398,11 +401,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> InventoryBuilder<'a, inventory_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         InventoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -417,11 +420,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> InventoryBuilder<'a, inventory_state::SetItemId<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         InventoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -429,12 +432,12 @@ where
 impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
     /// Set the `itemName` field (optional)
     pub fn item_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `itemName` field to an Option value (optional)
     pub fn maybe_item_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -442,12 +445,12 @@ impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
 impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
     /// Set the `itemType` field (optional)
     pub fn item_type(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `itemType` field to an Option value (optional)
     pub fn maybe_item_type(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -455,12 +458,12 @@ impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
 impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
     /// Set the `itemValue` field (optional)
     pub fn item_value(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `itemValue` field to an Option value (optional)
     pub fn maybe_item_value(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -468,12 +471,12 @@ impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
 impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
     /// Set the `lastModified` field (optional)
     pub fn last_modified(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `lastModified` field to an Option value (optional)
     pub fn maybe_last_modified(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -481,12 +484,12 @@ impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
 impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
     /// Set the `logRecordUri` field (optional)
     pub fn log_record_uri(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `logRecordUri` field to an Option value (optional)
     pub fn maybe_log_record_uri(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -494,12 +497,12 @@ impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
 impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
     /// Set the `maxStack` field (optional)
     pub fn max_stack(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `maxStack` field to an Option value (optional)
     pub fn maybe_max_stack(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -507,12 +510,12 @@ impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
 impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
     /// Set the `metadata` field (optional)
     pub fn metadata(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `metadata` field to an Option value (optional)
     pub fn maybe_metadata(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -527,11 +530,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> InventoryBuilder<'a, inventory_state::SetQuantity<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         InventoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -539,12 +542,12 @@ where
 impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
     /// Set the `rarity` field (optional)
     pub fn rarity(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `rarity` field to an Option value (optional)
     pub fn maybe_rarity(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -552,12 +555,12 @@ impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
 impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
     /// Set the `source` field (optional)
     pub fn source(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `source` field to an Option value (optional)
     pub fn maybe_source(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -568,7 +571,7 @@ impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
         mut self,
         value: impl Into<Option<inventory::SourceDetails<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `sourceDetails` field to an Option value (optional)
@@ -576,7 +579,7 @@ impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
         mut self,
         value: Option<inventory::SourceDetails<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -584,12 +587,12 @@ impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
 impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
     /// Set the `stackable` field (optional)
     pub fn stackable(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `stackable` field to an Option value (optional)
     pub fn maybe_stackable(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -597,29 +600,29 @@ impl<'a, S: inventory_state::State> InventoryBuilder<'a, S> {
 impl<'a, S> InventoryBuilder<'a, S>
 where
     S: inventory_state::State,
-    S::ItemId: inventory_state::IsSet,
-    S::Quantity: inventory_state::IsSet,
     S::AcquiredAt: inventory_state::IsSet,
     S::CreatedAt: inventory_state::IsSet,
+    S::ItemId: inventory_state::IsSet,
+    S::Quantity: inventory_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Inventory<'a> {
         Inventory {
-            acquired_at: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            item_id: self.__unsafe_private_named.2.unwrap(),
-            item_name: self.__unsafe_private_named.3,
-            item_type: self.__unsafe_private_named.4,
-            item_value: self.__unsafe_private_named.5,
-            last_modified: self.__unsafe_private_named.6,
-            log_record_uri: self.__unsafe_private_named.7,
-            max_stack: self.__unsafe_private_named.8,
-            metadata: self.__unsafe_private_named.9,
-            quantity: self.__unsafe_private_named.10.unwrap(),
-            rarity: self.__unsafe_private_named.11,
-            source: self.__unsafe_private_named.12,
-            source_details: self.__unsafe_private_named.13,
-            stackable: self.__unsafe_private_named.14,
+            acquired_at: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            item_id: self._fields.2.unwrap(),
+            item_name: self._fields.3,
+            item_type: self._fields.4,
+            item_value: self._fields.5,
+            last_modified: self._fields.6,
+            log_record_uri: self._fields.7,
+            max_stack: self._fields.8,
+            metadata: self._fields.9,
+            quantity: self._fields.10.unwrap(),
+            rarity: self._fields.11,
+            source: self._fields.12,
+            source_details: self._fields.13,
+            stackable: self._fields.14,
             extra_data: Default::default(),
         }
     }
@@ -629,21 +632,21 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Inventory<'a> {
         Inventory {
-            acquired_at: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            item_id: self.__unsafe_private_named.2.unwrap(),
-            item_name: self.__unsafe_private_named.3,
-            item_type: self.__unsafe_private_named.4,
-            item_value: self.__unsafe_private_named.5,
-            last_modified: self.__unsafe_private_named.6,
-            log_record_uri: self.__unsafe_private_named.7,
-            max_stack: self.__unsafe_private_named.8,
-            metadata: self.__unsafe_private_named.9,
-            quantity: self.__unsafe_private_named.10.unwrap(),
-            rarity: self.__unsafe_private_named.11,
-            source: self.__unsafe_private_named.12,
-            source_details: self.__unsafe_private_named.13,
-            stackable: self.__unsafe_private_named.14,
+            acquired_at: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            item_id: self._fields.2.unwrap(),
+            item_name: self._fields.3,
+            item_type: self._fields.4,
+            item_value: self._fields.5,
+            last_modified: self._fields.6,
+            log_record_uri: self._fields.7,
+            max_stack: self._fields.8,
+            metadata: self._fields.9,
+            quantity: self._fields.10.unwrap(),
+            rarity: self._fields.11,
+            source: self._fields.12,
+            source_details: self._fields.13,
+            stackable: self._fields.14,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_anisota/beta/game/log.rs b/crates/jacquard-api/src/net_anisota/beta/game/log.rs
index 8a7a275e..98520b18 100644
--- a/crates/jacquard-api/src/net_anisota/beta/game/log.rs
+++ b/crates/jacquard-api/src/net_anisota/beta/game/log.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -1098,49 +1101,49 @@ pub mod log_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Timestamp;
         type EventType;
+        type Timestamp;
         type SessionId;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Timestamp = Unset;
         type EventType = Unset;
+        type Timestamp = Unset;
         type SessionId = Unset;
     }
-    ///State transition - sets the `timestamp` field to Set
-    pub struct SetTimestamp<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTimestamp<S> {}
-    impl<S: State> State for SetTimestamp<S> {
-        type Timestamp = Set<members::timestamp>;
-        type EventType = S::EventType;
-        type SessionId = S::SessionId;
-    }
     ///State transition - sets the `event_type` field to Set
     pub struct SetEventType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEventType<S> {}
     impl<S: State> State for SetEventType<S> {
-        type Timestamp = S::Timestamp;
         type EventType = Set<members::event_type>;
+        type Timestamp = S::Timestamp;
+        type SessionId = S::SessionId;
+    }
+    ///State transition - sets the `timestamp` field to Set
+    pub struct SetTimestamp<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTimestamp<S> {}
+    impl<S: State> State for SetTimestamp<S> {
+        type EventType = S::EventType;
+        type Timestamp = Set<members::timestamp>;
         type SessionId = S::SessionId;
     }
     ///State transition - sets the `session_id` field to Set
     pub struct SetSessionId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSessionId<S> {}
     impl<S: State> State for SetSessionId<S> {
-        type Timestamp = S::Timestamp;
         type EventType = S::EventType;
+        type Timestamp = S::Timestamp;
         type SessionId = Set<members::session_id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `timestamp` field
-        pub struct timestamp(());
         ///Marker type for the `event_type` field
         pub struct event_type(());
+        ///Marker type for the `timestamp` field
+        pub struct timestamp(());
         ///Marker type for the `session_id` field
         pub struct session_id(());
     }
@@ -1148,8 +1151,8 @@ pub mod log_state {
 
 /// Builder for constructing an instance of this type
 pub struct LogBuilder<'a, S: log_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<log::CollectionData<'a>>,
         Option<Datetime>,
         Option<log::DailyRewardsData<'a>>,
@@ -1165,7 +1168,7 @@ pub struct LogBuilder<'a, S: log_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Log<'a> {
@@ -1179,8 +1182,8 @@ impl<'a> LogBuilder<'a, log_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -1196,7 +1199,7 @@ impl<'a> LogBuilder<'a, log_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1207,7 +1210,7 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
         mut self,
         value: impl Into<Option<log::CollectionData<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `collectionData` field to an Option value (optional)
@@ -1215,7 +1218,7 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
         mut self,
         value: Option<log::CollectionData<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1223,12 +1226,12 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
 impl<'a, S: log_state::State> LogBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1239,7 +1242,7 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
         mut self,
         value: impl Into<Option<log::DailyRewardsData<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `dailyRewardsData` field to an Option value (optional)
@@ -1247,7 +1250,7 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
         mut self,
         value: Option<log::DailyRewardsData<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1262,11 +1265,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogBuilder<'a, log_state::SetEventType<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1277,12 +1280,12 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
         mut self,
         value: impl Into<Option<log::FeedContext<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `feedContext` field to an Option value (optional)
     pub fn maybe_feed_context(mut self, value: Option<log::FeedContext<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1293,12 +1296,12 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
         mut self,
         value: impl Into<Option<log::GameCardData<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `gameCardData` field to an Option value (optional)
     pub fn maybe_game_card_data(mut self, value: Option<log::GameCardData<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1306,12 +1309,12 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
 impl<'a, S: log_state::State> LogBuilder<'a, S> {
     /// Set the `gameCardId` field (optional)
     pub fn game_card_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `gameCardId` field to an Option value (optional)
     pub fn maybe_game_card_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1322,7 +1325,7 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
         mut self,
         value: impl Into<Option<log::ItemUsageData<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `itemUsageData` field to an Option value (optional)
@@ -1330,7 +1333,7 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
         mut self,
         value: Option<log::ItemUsageData<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -1338,12 +1341,12 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
 impl<'a, S: log_state::State> LogBuilder<'a, S> {
     /// Set the `metadata` field (optional)
     pub fn metadata(mut self, value: impl Into<Option<log::Metadata<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `metadata` field to an Option value (optional)
     pub fn maybe_metadata(mut self, value: Option<log::Metadata<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -1351,12 +1354,12 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
 impl<'a, S: log_state::State> LogBuilder<'a, S> {
     /// Set the `parentLogUri` field (optional)
     pub fn parent_log_uri(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `parentLogUri` field to an Option value (optional)
     pub fn maybe_parent_log_uri(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -1364,12 +1367,12 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
 impl<'a, S: log_state::State> LogBuilder<'a, S> {
     /// Set the `rootLogUri` field (optional)
     pub fn root_log_uri(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `rootLogUri` field to an Option value (optional)
     pub fn maybe_root_log_uri(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -1384,11 +1387,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogBuilder<'a, log_state::SetSessionId<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         LogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1396,12 +1399,12 @@ where
 impl<'a, S: log_state::State> LogBuilder<'a, S> {
     /// Set the `sessionUri` field (optional)
     pub fn session_uri(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `sessionUri` field to an Option value (optional)
     pub fn maybe_session_uri(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -1416,11 +1419,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LogBuilder<'a, log_state::SetTimestamp<S>> {
-        self.__unsafe_private_named.13 = Option::Some(value.into());
+        self._fields.13 = Option::Some(value.into());
         LogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1428,27 +1431,27 @@ where
 impl<'a, S> LogBuilder<'a, S>
 where
     S: log_state::State,
-    S::Timestamp: log_state::IsSet,
     S::EventType: log_state::IsSet,
+    S::Timestamp: log_state::IsSet,
     S::SessionId: log_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Log<'a> {
         Log {
-            collection_data: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            daily_rewards_data: self.__unsafe_private_named.2,
-            event_type: self.__unsafe_private_named.3.unwrap(),
-            feed_context: self.__unsafe_private_named.4,
-            game_card_data: self.__unsafe_private_named.5,
-            game_card_id: self.__unsafe_private_named.6,
-            item_usage_data: self.__unsafe_private_named.7,
-            metadata: self.__unsafe_private_named.8,
-            parent_log_uri: self.__unsafe_private_named.9,
-            root_log_uri: self.__unsafe_private_named.10,
-            session_id: self.__unsafe_private_named.11.unwrap(),
-            session_uri: self.__unsafe_private_named.12,
-            timestamp: self.__unsafe_private_named.13.unwrap(),
+            collection_data: self._fields.0,
+            created_at: self._fields.1,
+            daily_rewards_data: self._fields.2,
+            event_type: self._fields.3.unwrap(),
+            feed_context: self._fields.4,
+            game_card_data: self._fields.5,
+            game_card_id: self._fields.6,
+            item_usage_data: self._fields.7,
+            metadata: self._fields.8,
+            parent_log_uri: self._fields.9,
+            root_log_uri: self._fields.10,
+            session_id: self._fields.11.unwrap(),
+            session_uri: self._fields.12,
+            timestamp: self._fields.13.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1458,20 +1461,20 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Log<'a> {
         Log {
-            collection_data: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            daily_rewards_data: self.__unsafe_private_named.2,
-            event_type: self.__unsafe_private_named.3.unwrap(),
-            feed_context: self.__unsafe_private_named.4,
-            game_card_data: self.__unsafe_private_named.5,
-            game_card_id: self.__unsafe_private_named.6,
-            item_usage_data: self.__unsafe_private_named.7,
-            metadata: self.__unsafe_private_named.8,
-            parent_log_uri: self.__unsafe_private_named.9,
-            root_log_uri: self.__unsafe_private_named.10,
-            session_id: self.__unsafe_private_named.11.unwrap(),
-            session_uri: self.__unsafe_private_named.12,
-            timestamp: self.__unsafe_private_named.13.unwrap(),
+            collection_data: self._fields.0,
+            created_at: self._fields.1,
+            daily_rewards_data: self._fields.2,
+            event_type: self._fields.3.unwrap(),
+            feed_context: self._fields.4,
+            game_card_data: self._fields.5,
+            game_card_id: self._fields.6,
+            item_usage_data: self._fields.7,
+            metadata: self._fields.8,
+            parent_log_uri: self._fields.9,
+            root_log_uri: self._fields.10,
+            session_id: self._fields.11.unwrap(),
+            session_uri: self._fields.12,
+            timestamp: self._fields.13.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_anisota/beta/game/pack.rs b/crates/jacquard-api/src/net_anisota/beta/game/pack.rs
index 2965964b..3d4d90a5 100644
--- a/crates/jacquard-api/src/net_anisota/beta/game/pack.rs
+++ b/crates/jacquard-api/src/net_anisota/beta/game/pack.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -230,65 +233,65 @@ pub mod pack_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type LastOpenTime;
         type Streak;
         type CreatedAt;
+        type LastOpenTime;
         type TotalOpens;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type LastOpenTime = Unset;
         type Streak = Unset;
         type CreatedAt = Unset;
+        type LastOpenTime = Unset;
         type TotalOpens = Unset;
     }
-    ///State transition - sets the `last_open_time` field to Set
-    pub struct SetLastOpenTime<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLastOpenTime<S> {}
-    impl<S: State> State for SetLastOpenTime<S> {
-        type LastOpenTime = Set<members::last_open_time>;
-        type Streak = S::Streak;
-        type CreatedAt = S::CreatedAt;
-        type TotalOpens = S::TotalOpens;
-    }
     ///State transition - sets the `streak` field to Set
     pub struct SetStreak<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStreak<S> {}
     impl<S: State> State for SetStreak<S> {
-        type LastOpenTime = S::LastOpenTime;
         type Streak = Set<members::streak>;
         type CreatedAt = S::CreatedAt;
+        type LastOpenTime = S::LastOpenTime;
         type TotalOpens = S::TotalOpens;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type LastOpenTime = S::LastOpenTime;
         type Streak = S::Streak;
         type CreatedAt = Set<members::created_at>;
+        type LastOpenTime = S::LastOpenTime;
+        type TotalOpens = S::TotalOpens;
+    }
+    ///State transition - sets the `last_open_time` field to Set
+    pub struct SetLastOpenTime<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLastOpenTime<S> {}
+    impl<S: State> State for SetLastOpenTime<S> {
+        type Streak = S::Streak;
+        type CreatedAt = S::CreatedAt;
+        type LastOpenTime = Set<members::last_open_time>;
         type TotalOpens = S::TotalOpens;
     }
     ///State transition - sets the `total_opens` field to Set
     pub struct SetTotalOpens<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTotalOpens<S> {}
     impl<S: State> State for SetTotalOpens<S> {
-        type LastOpenTime = S::LastOpenTime;
         type Streak = S::Streak;
         type CreatedAt = S::CreatedAt;
+        type LastOpenTime = S::LastOpenTime;
         type TotalOpens = Set<members::total_opens>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `last_open_time` field
-        pub struct last_open_time(());
         ///Marker type for the `streak` field
         pub struct streak(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `last_open_time` field
+        pub struct last_open_time(());
         ///Marker type for the `total_opens` field
         pub struct total_opens(());
     }
@@ -296,8 +299,8 @@ pub mod pack_state {
 
 /// Builder for constructing an instance of this type
 pub struct PackBuilder<'a, S: pack_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<Datetime>,
@@ -306,7 +309,7 @@ pub struct PackBuilder<'a, S: pack_state::State> {
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Pack<'a> {
@@ -320,9 +323,9 @@ impl<'a> PackBuilder<'a, pack_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -337,11 +340,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PackBuilder<'a, pack_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -349,12 +352,12 @@ where
 impl<'a, S: pack_state::State> PackBuilder<'a, S> {
     /// Set the `lastModified` field (optional)
     pub fn last_modified(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `lastModified` field to an Option value (optional)
     pub fn maybe_last_modified(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -369,11 +372,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PackBuilder<'a, pack_state::SetLastOpenTime<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -381,12 +384,12 @@ where
 impl<'a, S: pack_state::State> PackBuilder<'a, S> {
     /// Set the `longestStreak` field (optional)
     pub fn longest_streak(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `longestStreak` field to an Option value (optional)
     pub fn maybe_longest_streak(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -397,7 +400,7 @@ impl<'a, S: pack_state::State> PackBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<pack::PackHistoryEntry<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `packHistory` field to an Option value (optional)
@@ -405,7 +408,7 @@ impl<'a, S: pack_state::State> PackBuilder<'a, S> {
         mut self,
         value: Option<Vec<pack::PackHistoryEntry<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -420,11 +423,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PackBuilder<'a, pack_state::SetStreak<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         PackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -439,11 +442,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PackBuilder<'a, pack_state::SetTotalOpens<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         PackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -451,21 +454,21 @@ where
 impl<'a, S> PackBuilder<'a, S>
 where
     S: pack_state::State,
-    S::LastOpenTime: pack_state::IsSet,
     S::Streak: pack_state::IsSet,
     S::CreatedAt: pack_state::IsSet,
+    S::LastOpenTime: pack_state::IsSet,
     S::TotalOpens: pack_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Pack<'a> {
         Pack {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            last_modified: self.__unsafe_private_named.1,
-            last_open_time: self.__unsafe_private_named.2.unwrap(),
-            longest_streak: self.__unsafe_private_named.3,
-            pack_history: self.__unsafe_private_named.4,
-            streak: self.__unsafe_private_named.5.unwrap(),
-            total_opens: self.__unsafe_private_named.6.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            last_modified: self._fields.1,
+            last_open_time: self._fields.2.unwrap(),
+            longest_streak: self._fields.3,
+            pack_history: self._fields.4,
+            streak: self._fields.5.unwrap(),
+            total_opens: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -478,13 +481,13 @@ where
         >,
     ) -> Pack<'a> {
         Pack {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            last_modified: self.__unsafe_private_named.1,
-            last_open_time: self.__unsafe_private_named.2.unwrap(),
-            longest_streak: self.__unsafe_private_named.3,
-            pack_history: self.__unsafe_private_named.4,
-            streak: self.__unsafe_private_named.5.unwrap(),
-            total_opens: self.__unsafe_private_named.6.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            last_modified: self._fields.1,
+            last_open_time: self._fields.2.unwrap(),
+            longest_streak: self._fields.3,
+            pack_history: self._fields.4,
+            streak: self._fields.5.unwrap(),
+            total_opens: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_anisota/beta/game/progress.rs b/crates/jacquard-api/src/net_anisota/beta/game/progress.rs
index 24f5e2a5..e2400d49 100644
--- a/crates/jacquard-api/src/net_anisota/beta/game/progress.rs
+++ b/crates/jacquard-api/src/net_anisota/beta/game/progress.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -342,8 +345,8 @@ pub mod progress_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type XpToNextLevel;
         type TotalXp;
+        type XpToNextLevel;
         type Level;
         type CreatedAt;
         type ProgressPercentage;
@@ -352,28 +355,28 @@ pub mod progress_state {
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type XpToNextLevel = Unset;
         type TotalXp = Unset;
+        type XpToNextLevel = Unset;
         type Level = Unset;
         type CreatedAt = Unset;
         type ProgressPercentage = Unset;
     }
-    ///State transition - sets the `xp_to_next_level` field to Set
-    pub struct SetXpToNextLevel<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetXpToNextLevel<S> {}
-    impl<S: State> State for SetXpToNextLevel<S> {
-        type XpToNextLevel = Set<members::xp_to_next_level>;
-        type TotalXp = S::TotalXp;
-        type Level = S::Level;
-        type CreatedAt = S::CreatedAt;
-        type ProgressPercentage = S::ProgressPercentage;
-    }
     ///State transition - sets the `total_xp` field to Set
     pub struct SetTotalXp<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTotalXp<S> {}
     impl<S: State> State for SetTotalXp<S> {
-        type XpToNextLevel = S::XpToNextLevel;
         type TotalXp = Set<members::total_xp>;
+        type XpToNextLevel = S::XpToNextLevel;
+        type Level = S::Level;
+        type CreatedAt = S::CreatedAt;
+        type ProgressPercentage = S::ProgressPercentage;
+    }
+    ///State transition - sets the `xp_to_next_level` field to Set
+    pub struct SetXpToNextLevel<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetXpToNextLevel<S> {}
+    impl<S: State> State for SetXpToNextLevel<S> {
+        type TotalXp = S::TotalXp;
+        type XpToNextLevel = Set<members::xp_to_next_level>;
         type Level = S::Level;
         type CreatedAt = S::CreatedAt;
         type ProgressPercentage = S::ProgressPercentage;
@@ -382,8 +385,8 @@ pub mod progress_state {
     pub struct SetLevel<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLevel<S> {}
     impl<S: State> State for SetLevel<S> {
-        type XpToNextLevel = S::XpToNextLevel;
         type TotalXp = S::TotalXp;
+        type XpToNextLevel = S::XpToNextLevel;
         type Level = Set<members::level>;
         type CreatedAt = S::CreatedAt;
         type ProgressPercentage = S::ProgressPercentage;
@@ -392,8 +395,8 @@ pub mod progress_state {
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type XpToNextLevel = S::XpToNextLevel;
         type TotalXp = S::TotalXp;
+        type XpToNextLevel = S::XpToNextLevel;
         type Level = S::Level;
         type CreatedAt = Set<members::created_at>;
         type ProgressPercentage = S::ProgressPercentage;
@@ -402,8 +405,8 @@ pub mod progress_state {
     pub struct SetProgressPercentage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetProgressPercentage<S> {}
     impl<S: State> State for SetProgressPercentage<S> {
-        type XpToNextLevel = S::XpToNextLevel;
         type TotalXp = S::TotalXp;
+        type XpToNextLevel = S::XpToNextLevel;
         type Level = S::Level;
         type CreatedAt = S::CreatedAt;
         type ProgressPercentage = Set<members::progress_percentage>;
@@ -411,10 +414,10 @@ pub mod progress_state {
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `xp_to_next_level` field
-        pub struct xp_to_next_level(());
         ///Marker type for the `total_xp` field
         pub struct total_xp(());
+        ///Marker type for the `xp_to_next_level` field
+        pub struct xp_to_next_level(());
         ///Marker type for the `level` field
         pub struct level(());
         ///Marker type for the `created_at` field
@@ -426,8 +429,8 @@ pub mod progress_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProgressBuilder<'a, S: progress_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -444,7 +447,7 @@ pub struct ProgressBuilder<'a, S: progress_state::State> {
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Progress<'a> {
@@ -458,8 +461,8 @@ impl<'a> ProgressBuilder<'a, progress_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProgressBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -476,7 +479,7 @@ impl<'a> ProgressBuilder<'a, progress_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -484,12 +487,12 @@ impl<'a> ProgressBuilder<'a, progress_state::Empty> {
 impl<'a, S: progress_state::State> ProgressBuilder<'a, S> {
     /// Set the `cardUri` field (optional)
     pub fn card_uri(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cardUri` field to an Option value (optional)
     pub fn maybe_card_uri(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -504,11 +507,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ProgressBuilder<'a, progress_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ProgressBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -516,12 +519,12 @@ where
 impl<'a, S: progress_state::State> ProgressBuilder<'a, S> {
     /// Set the `currentStamina` field (optional)
     pub fn current_stamina(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `currentStamina` field to an Option value (optional)
     pub fn maybe_current_stamina(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -536,11 +539,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ProgressBuilder<'a, progress_state::SetLevel<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ProgressBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -548,12 +551,12 @@ where
 impl<'a, S: progress_state::State> ProgressBuilder<'a, S> {
     /// Set the `metadata` field (optional)
     pub fn metadata(mut self, value: impl Into<Option<progress::Metadata<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `metadata` field to an Option value (optional)
     pub fn maybe_metadata(mut self, value: Option<progress::Metadata<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -561,12 +564,12 @@ impl<'a, S: progress_state::State> ProgressBuilder<'a, S> {
 impl<'a, S: progress_state::State> ProgressBuilder<'a, S> {
     /// Set the `previousLevel` field (optional)
     pub fn previous_level(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `previousLevel` field to an Option value (optional)
     pub fn maybe_previous_level(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -581,11 +584,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProgressBuilder<'a, progress_state::SetProgressPercentage<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ProgressBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -596,12 +599,12 @@ impl<'a, S: progress_state::State> ProgressBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<CowStr<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `relatedLogUris` field to an Option value (optional)
     pub fn maybe_related_log_uris(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -609,12 +612,12 @@ impl<'a, S: progress_state::State> ProgressBuilder<'a, S> {
 impl<'a, S: progress_state::State> ProgressBuilder<'a, S> {
     /// Set the `sessionId` field (optional)
     pub fn session_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `sessionId` field to an Option value (optional)
     pub fn maybe_session_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -622,12 +625,12 @@ impl<'a, S: progress_state::State> ProgressBuilder<'a, S> {
 impl<'a, S: progress_state::State> ProgressBuilder<'a, S> {
     /// Set the `sessionUri` field (optional)
     pub fn session_uri(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `sessionUri` field to an Option value (optional)
     pub fn maybe_session_uri(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -635,12 +638,12 @@ impl<'a, S: progress_state::State> ProgressBuilder<'a, S> {
 impl<'a, S: progress_state::State> ProgressBuilder<'a, S> {
     /// Set the `stats` field (optional)
     pub fn stats(mut self, value: impl Into<Option<progress::Stats<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `stats` field to an Option value (optional)
     pub fn maybe_stats(mut self, value: Option<progress::Stats<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -655,11 +658,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ProgressBuilder<'a, progress_state::SetTotalXp<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         ProgressBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -667,12 +670,12 @@ where
 impl<'a, S: progress_state::State> ProgressBuilder<'a, S> {
     /// Set the `triggerSource` field (optional)
     pub fn trigger_source(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `triggerSource` field to an Option value (optional)
     pub fn maybe_trigger_source(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -680,12 +683,12 @@ impl<'a, S: progress_state::State> ProgressBuilder<'a, S> {
 impl<'a, S: progress_state::State> ProgressBuilder<'a, S> {
     /// Set the `xpGainedSinceLastSave` field (optional)
     pub fn xp_gained_since_last_save(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `xpGainedSinceLastSave` field to an Option value (optional)
     pub fn maybe_xp_gained_since_last_save(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -700,11 +703,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ProgressBuilder<'a, progress_state::SetXpToNextLevel<S>> {
-        self.__unsafe_private_named.14 = Option::Some(value.into());
+        self._fields.14 = Option::Some(value.into());
         ProgressBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -712,8 +715,8 @@ where
 impl<'a, S> ProgressBuilder<'a, S>
 where
     S: progress_state::State,
-    S::XpToNextLevel: progress_state::IsSet,
     S::TotalXp: progress_state::IsSet,
+    S::XpToNextLevel: progress_state::IsSet,
     S::Level: progress_state::IsSet,
     S::CreatedAt: progress_state::IsSet,
     S::ProgressPercentage: progress_state::IsSet,
@@ -721,21 +724,21 @@ where
     /// Build the final struct
     pub fn build(self) -> Progress<'a> {
         Progress {
-            card_uri: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            current_stamina: self.__unsafe_private_named.2,
-            level: self.__unsafe_private_named.3.unwrap(),
-            metadata: self.__unsafe_private_named.4,
-            previous_level: self.__unsafe_private_named.5,
-            progress_percentage: self.__unsafe_private_named.6.unwrap(),
-            related_log_uris: self.__unsafe_private_named.7,
-            session_id: self.__unsafe_private_named.8,
-            session_uri: self.__unsafe_private_named.9,
-            stats: self.__unsafe_private_named.10,
-            total_xp: self.__unsafe_private_named.11.unwrap(),
-            trigger_source: self.__unsafe_private_named.12,
-            xp_gained_since_last_save: self.__unsafe_private_named.13,
-            xp_to_next_level: self.__unsafe_private_named.14.unwrap(),
+            card_uri: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            current_stamina: self._fields.2,
+            level: self._fields.3.unwrap(),
+            metadata: self._fields.4,
+            previous_level: self._fields.5,
+            progress_percentage: self._fields.6.unwrap(),
+            related_log_uris: self._fields.7,
+            session_id: self._fields.8,
+            session_uri: self._fields.9,
+            stats: self._fields.10,
+            total_xp: self._fields.11.unwrap(),
+            trigger_source: self._fields.12,
+            xp_gained_since_last_save: self._fields.13,
+            xp_to_next_level: self._fields.14.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -748,21 +751,21 @@ where
         >,
     ) -> Progress<'a> {
         Progress {
-            card_uri: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            current_stamina: self.__unsafe_private_named.2,
-            level: self.__unsafe_private_named.3.unwrap(),
-            metadata: self.__unsafe_private_named.4,
-            previous_level: self.__unsafe_private_named.5,
-            progress_percentage: self.__unsafe_private_named.6.unwrap(),
-            related_log_uris: self.__unsafe_private_named.7,
-            session_id: self.__unsafe_private_named.8,
-            session_uri: self.__unsafe_private_named.9,
-            stats: self.__unsafe_private_named.10,
-            total_xp: self.__unsafe_private_named.11.unwrap(),
-            trigger_source: self.__unsafe_private_named.12,
-            xp_gained_since_last_save: self.__unsafe_private_named.13,
-            xp_to_next_level: self.__unsafe_private_named.14.unwrap(),
+            card_uri: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            current_stamina: self._fields.2,
+            level: self._fields.3.unwrap(),
+            metadata: self._fields.4,
+            previous_level: self._fields.5,
+            progress_percentage: self._fields.6.unwrap(),
+            related_log_uris: self._fields.7,
+            session_id: self._fields.8,
+            session_uri: self._fields.9,
+            stats: self._fields.10,
+            total_xp: self._fields.11.unwrap(),
+            trigger_source: self._fields.12,
+            xp_gained_since_last_save: self._fields.13,
+            xp_to_next_level: self._fields.14.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_anisota/beta/game/session.rs b/crates/jacquard-api/src/net_anisota/beta/game/session.rs
index a7924dfa..099c4b34 100644
--- a/crates/jacquard-api/src/net_anisota/beta/game/session.rs
+++ b/crates/jacquard-api/src/net_anisota/beta/game/session.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -903,74 +906,74 @@ pub mod session_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Platform;
         type StartedAt;
         type Status;
         type ClientVersion;
-        type Platform;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Platform = Unset;
         type StartedAt = Unset;
         type Status = Unset;
         type ClientVersion = Unset;
-        type Platform = Unset;
+    }
+    ///State transition - sets the `platform` field to Set
+    pub struct SetPlatform<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPlatform<S> {}
+    impl<S: State> State for SetPlatform<S> {
+        type Platform = Set<members::platform>;
+        type StartedAt = S::StartedAt;
+        type Status = S::Status;
+        type ClientVersion = S::ClientVersion;
     }
     ///State transition - sets the `started_at` field to Set
     pub struct SetStartedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStartedAt<S> {}
     impl<S: State> State for SetStartedAt<S> {
+        type Platform = S::Platform;
         type StartedAt = Set<members::started_at>;
         type Status = S::Status;
         type ClientVersion = S::ClientVersion;
-        type Platform = S::Platform;
     }
     ///State transition - sets the `status` field to Set
     pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStatus<S> {}
     impl<S: State> State for SetStatus<S> {
+        type Platform = S::Platform;
         type StartedAt = S::StartedAt;
         type Status = Set<members::status>;
         type ClientVersion = S::ClientVersion;
-        type Platform = S::Platform;
     }
     ///State transition - sets the `client_version` field to Set
     pub struct SetClientVersion<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetClientVersion<S> {}
     impl<S: State> State for SetClientVersion<S> {
-        type StartedAt = S::StartedAt;
-        type Status = S::Status;
-        type ClientVersion = Set<members::client_version>;
         type Platform = S::Platform;
-    }
-    ///State transition - sets the `platform` field to Set
-    pub struct SetPlatform<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPlatform<S> {}
-    impl<S: State> State for SetPlatform<S> {
         type StartedAt = S::StartedAt;
         type Status = S::Status;
-        type ClientVersion = S::ClientVersion;
-        type Platform = Set<members::platform>;
+        type ClientVersion = Set<members::client_version>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `platform` field
+        pub struct platform(());
         ///Marker type for the `started_at` field
         pub struct started_at(());
         ///Marker type for the `status` field
         pub struct status(());
         ///Marker type for the `client_version` field
         pub struct client_version(());
-        ///Marker type for the `platform` field
-        pub struct platform(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SessionBuilder<'a, S: session_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<session::ActivitySummary<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -989,7 +992,7 @@ pub struct SessionBuilder<'a, S: session_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Session<'a> {
@@ -1003,8 +1006,8 @@ impl<'a> SessionBuilder<'a, session_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SessionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -1023,7 +1026,7 @@ impl<'a> SessionBuilder<'a, session_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1034,7 +1037,7 @@ impl<'a, S: session_state::State> SessionBuilder<'a, S> {
         mut self,
         value: impl Into<Option<session::ActivitySummary<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `activitySummary` field to an Option value (optional)
@@ -1042,7 +1045,7 @@ impl<'a, S: session_state::State> SessionBuilder<'a, S> {
         mut self,
         value: Option<session::ActivitySummary<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1057,11 +1060,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SessionBuilder<'a, session_state::SetClientVersion<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SessionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1069,12 +1072,12 @@ where
 impl<'a, S: session_state::State> SessionBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1082,12 +1085,12 @@ impl<'a, S: session_state::State> SessionBuilder<'a, S> {
 impl<'a, S: session_state::State> SessionBuilder<'a, S> {
     /// Set the `duration` field (optional)
     pub fn duration(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `duration` field to an Option value (optional)
     pub fn maybe_duration(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1095,12 +1098,12 @@ impl<'a, S: session_state::State> SessionBuilder<'a, S> {
 impl<'a, S: session_state::State> SessionBuilder<'a, S> {
     /// Set the `endReason` field (optional)
     pub fn end_reason(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `endReason` field to an Option value (optional)
     pub fn maybe_end_reason(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1108,12 +1111,12 @@ impl<'a, S: session_state::State> SessionBuilder<'a, S> {
 impl<'a, S: session_state::State> SessionBuilder<'a, S> {
     /// Set the `endedAt` field (optional)
     pub fn ended_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `endedAt` field to an Option value (optional)
     pub fn maybe_ended_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1121,12 +1124,12 @@ impl<'a, S: session_state::State> SessionBuilder<'a, S> {
 impl<'a, S: session_state::State> SessionBuilder<'a, S> {
     /// Set the `lastActivityAt` field (optional)
     pub fn last_activity_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `lastActivityAt` field to an Option value (optional)
     pub fn maybe_last_activity_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1134,12 +1137,12 @@ impl<'a, S: session_state::State> SessionBuilder<'a, S> {
 impl<'a, S: session_state::State> SessionBuilder<'a, S> {
     /// Set the `metadata` field (optional)
     pub fn metadata(mut self, value: impl Into<Option<session::Metadata<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `metadata` field to an Option value (optional)
     pub fn maybe_metadata(mut self, value: Option<session::Metadata<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -1147,12 +1150,12 @@ impl<'a, S: session_state::State> SessionBuilder<'a, S> {
 impl<'a, S: session_state::State> SessionBuilder<'a, S> {
     /// Set the `parentSessionUri` field (optional)
     pub fn parent_session_uri(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `parentSessionUri` field to an Option value (optional)
     pub fn maybe_parent_session_uri(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -1167,11 +1170,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SessionBuilder<'a, session_state::SetPlatform<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         SessionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1182,12 +1185,12 @@ impl<'a, S: session_state::State> SessionBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<CowStr<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `relatedLogUris` field to an Option value (optional)
     pub fn maybe_related_log_uris(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -1198,7 +1201,7 @@ impl<'a, S: session_state::State> SessionBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<CowStr<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `relatedProgressUris` field to an Option value (optional)
@@ -1206,7 +1209,7 @@ impl<'a, S: session_state::State> SessionBuilder<'a, S> {
         mut self,
         value: Option<Vec<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -1217,12 +1220,12 @@ impl<'a, S: session_state::State> SessionBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<CowStr<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `relatedSessionUris` field to an Option value (optional)
     pub fn maybe_related_session_uris(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -1233,7 +1236,7 @@ impl<'a, S: session_state::State> SessionBuilder<'a, S> {
         mut self,
         value: impl Into<Option<session::SessionContext<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `sessionContext` field to an Option value (optional)
@@ -1241,7 +1244,7 @@ impl<'a, S: session_state::State> SessionBuilder<'a, S> {
         mut self,
         value: Option<session::SessionContext<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -1256,11 +1259,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SessionBuilder<'a, session_state::SetStartedAt<S>> {
-        self.__unsafe_private_named.14 = Option::Some(value.into());
+        self._fields.14 = Option::Some(value.into());
         SessionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1275,11 +1278,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SessionBuilder<'a, session_state::SetStatus<S>> {
-        self.__unsafe_private_named.15 = Option::Some(value.into());
+        self._fields.15 = Option::Some(value.into());
         SessionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1287,12 +1290,12 @@ where
 impl<'a, S: session_state::State> SessionBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -1300,31 +1303,31 @@ impl<'a, S: session_state::State> SessionBuilder<'a, S> {
 impl<'a, S> SessionBuilder<'a, S>
 where
     S: session_state::State,
+    S::Platform: session_state::IsSet,
     S::StartedAt: session_state::IsSet,
     S::Status: session_state::IsSet,
     S::ClientVersion: session_state::IsSet,
-    S::Platform: session_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Session<'a> {
         Session {
-            activity_summary: self.__unsafe_private_named.0,
-            client_version: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2,
-            duration: self.__unsafe_private_named.3,
-            end_reason: self.__unsafe_private_named.4,
-            ended_at: self.__unsafe_private_named.5,
-            last_activity_at: self.__unsafe_private_named.6,
-            metadata: self.__unsafe_private_named.7,
-            parent_session_uri: self.__unsafe_private_named.8,
-            platform: self.__unsafe_private_named.9.unwrap(),
-            related_log_uris: self.__unsafe_private_named.10,
-            related_progress_uris: self.__unsafe_private_named.11,
-            related_session_uris: self.__unsafe_private_named.12,
-            session_context: self.__unsafe_private_named.13,
-            started_at: self.__unsafe_private_named.14.unwrap(),
-            status: self.__unsafe_private_named.15.unwrap(),
-            updated_at: self.__unsafe_private_named.16,
+            activity_summary: self._fields.0,
+            client_version: self._fields.1.unwrap(),
+            created_at: self._fields.2,
+            duration: self._fields.3,
+            end_reason: self._fields.4,
+            ended_at: self._fields.5,
+            last_activity_at: self._fields.6,
+            metadata: self._fields.7,
+            parent_session_uri: self._fields.8,
+            platform: self._fields.9.unwrap(),
+            related_log_uris: self._fields.10,
+            related_progress_uris: self._fields.11,
+            related_session_uris: self._fields.12,
+            session_context: self._fields.13,
+            started_at: self._fields.14.unwrap(),
+            status: self._fields.15.unwrap(),
+            updated_at: self._fields.16,
             extra_data: Default::default(),
         }
     }
@@ -1337,23 +1340,23 @@ where
         >,
     ) -> Session<'a> {
         Session {
-            activity_summary: self.__unsafe_private_named.0,
-            client_version: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2,
-            duration: self.__unsafe_private_named.3,
-            end_reason: self.__unsafe_private_named.4,
-            ended_at: self.__unsafe_private_named.5,
-            last_activity_at: self.__unsafe_private_named.6,
-            metadata: self.__unsafe_private_named.7,
-            parent_session_uri: self.__unsafe_private_named.8,
-            platform: self.__unsafe_private_named.9.unwrap(),
-            related_log_uris: self.__unsafe_private_named.10,
-            related_progress_uris: self.__unsafe_private_named.11,
-            related_session_uris: self.__unsafe_private_named.12,
-            session_context: self.__unsafe_private_named.13,
-            started_at: self.__unsafe_private_named.14.unwrap(),
-            status: self.__unsafe_private_named.15.unwrap(),
-            updated_at: self.__unsafe_private_named.16,
+            activity_summary: self._fields.0,
+            client_version: self._fields.1.unwrap(),
+            created_at: self._fields.2,
+            duration: self._fields.3,
+            end_reason: self._fields.4,
+            ended_at: self._fields.5,
+            last_activity_at: self._fields.6,
+            metadata: self._fields.7,
+            parent_session_uri: self._fields.8,
+            platform: self._fields.9.unwrap(),
+            related_log_uris: self._fields.10,
+            related_progress_uris: self._fields.11,
+            related_session_uris: self._fields.12,
+            session_context: self._fields.13,
+            started_at: self._fields.14.unwrap(),
+            status: self._fields.15.unwrap(),
+            updated_at: self._fields.16,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_anisota/feed/draft.rs b/crates/jacquard-api/src/net_anisota/feed/draft.rs
index d6b24bbd..96145f9e 100644
--- a/crates/jacquard-api/src/net_anisota/feed/draft.rs
+++ b/crates/jacquard-api/src/net_anisota/feed/draft.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -267,8 +270,8 @@ pub mod draft_state {
 
 /// Builder for constructing an instance of this type
 pub struct DraftBuilder<'a, S: draft_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<DraftEmbed<'a>>,
         Option<Vec<Facet<'a>>>,
@@ -279,7 +282,7 @@ pub struct DraftBuilder<'a, S: draft_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Draft<'a> {
@@ -293,19 +296,9 @@ impl<'a> DraftBuilder<'a, draft_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DraftBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -320,11 +313,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DraftBuilder<'a, draft_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DraftBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -332,12 +325,12 @@ where
 impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
     /// Set the `embed` field (optional)
     pub fn embed(mut self, value: impl Into<Option<DraftEmbed<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `embed` field to an Option value (optional)
     pub fn maybe_embed(mut self, value: Option<DraftEmbed<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -345,12 +338,12 @@ impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
 impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -358,12 +351,12 @@ impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
 impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -371,12 +364,12 @@ impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
 impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
     /// Set the `langs` field (optional)
     pub fn langs(mut self, value: impl Into<Option<Vec<Language>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `langs` field to an Option value (optional)
     pub fn maybe_langs(mut self, value: Option<Vec<Language>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -384,12 +377,12 @@ impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
 impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
     /// Set the `reply` field (optional)
     pub fn reply(mut self, value: impl Into<Option<draft::ReplyRef<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `reply` field to an Option value (optional)
     pub fn maybe_reply(mut self, value: Option<draft::ReplyRef<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -397,12 +390,12 @@ impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
 impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -417,11 +410,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DraftBuilder<'a, draft_state::SetText<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         DraftBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -429,12 +422,12 @@ where
 impl<'a, S: draft_state::State> DraftBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -448,15 +441,15 @@ where
     /// Build the final struct
     pub fn build(self) -> Draft<'a> {
         Draft {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            embed: self.__unsafe_private_named.1,
-            facets: self.__unsafe_private_named.2,
-            labels: self.__unsafe_private_named.3,
-            langs: self.__unsafe_private_named.4,
-            reply: self.__unsafe_private_named.5,
-            tags: self.__unsafe_private_named.6,
-            text: self.__unsafe_private_named.7.unwrap(),
-            updated_at: self.__unsafe_private_named.8,
+            created_at: self._fields.0.unwrap(),
+            embed: self._fields.1,
+            facets: self._fields.2,
+            labels: self._fields.3,
+            langs: self._fields.4,
+            reply: self._fields.5,
+            tags: self._fields.6,
+            text: self._fields.7.unwrap(),
+            updated_at: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -469,15 +462,15 @@ where
         >,
     ) -> Draft<'a> {
         Draft {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            embed: self.__unsafe_private_named.1,
-            facets: self.__unsafe_private_named.2,
-            labels: self.__unsafe_private_named.3,
-            langs: self.__unsafe_private_named.4,
-            reply: self.__unsafe_private_named.5,
-            tags: self.__unsafe_private_named.6,
-            text: self.__unsafe_private_named.7.unwrap(),
-            updated_at: self.__unsafe_private_named.8,
+            created_at: self._fields.0.unwrap(),
+            embed: self._fields.1,
+            facets: self._fields.2,
+            labels: self._fields.3,
+            langs: self._fields.4,
+            reply: self._fields.5,
+            tags: self._fields.6,
+            text: self._fields.7.unwrap(),
+            updated_at: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
@@ -718,9 +711,9 @@ pub mod reply_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReplyRefBuilder<'a, S: reply_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReplyRef<'a> {
@@ -734,9 +727,9 @@ impl<'a> ReplyRefBuilder<'a, reply_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -751,11 +744,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ReplyRefBuilder<'a, reply_ref_state::SetParent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -770,11 +763,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ReplyRefBuilder<'a, reply_ref_state::SetRoot<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -788,8 +781,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ReplyRef<'a> {
         ReplyRef {
-            parent: self.__unsafe_private_named.0.unwrap(),
-            root: self.__unsafe_private_named.1.unwrap(),
+            parent: self._fields.0.unwrap(),
+            root: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -802,8 +795,8 @@ where
         >,
     ) -> ReplyRef<'a> {
         ReplyRef {
-            parent: self.__unsafe_private_named.0.unwrap(),
-            root: self.__unsafe_private_named.1.unwrap(),
+            parent: self._fields.0.unwrap(),
+            root: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_anisota/feed/like.rs b/crates/jacquard-api/src/net_anisota/feed/like.rs
index 79ac8f3a..152a4d31 100644
--- a/crates/jacquard-api/src/net_anisota/feed/like.rs
+++ b/crates/jacquard-api/src/net_anisota/feed/like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -147,9 +150,9 @@ pub mod like_state {
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -163,9 +166,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,11 +183,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -199,11 +202,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -217,8 +220,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -231,8 +234,8 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_anisota/feed/list.rs b/crates/jacquard-api/src/net_anisota/feed/list.rs
index 232f26e1..4c64e1e4 100644
--- a/crates/jacquard-api/src/net_anisota/feed/list.rs
+++ b/crates/jacquard-api/src/net_anisota/feed/list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -230,15 +233,15 @@ pub mod list_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListBuilder<'a, S: list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> List<'a> {
@@ -252,9 +255,9 @@ impl<'a> ListBuilder<'a, list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -262,12 +265,12 @@ impl<'a> ListBuilder<'a, list_state::Empty> {
 impl<'a, S: list_state::State> ListBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -282,11 +285,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListBuilder<'a, list_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -294,12 +297,12 @@ where
 impl<'a, S: list_state::State> ListBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -314,11 +317,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ListBuilder<'a, list_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -326,12 +329,12 @@ where
 impl<'a, S: list_state::State> ListBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -345,11 +348,11 @@ where
     /// Build the final struct
     pub fn build(self) -> List<'a> {
         List {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            tags: self.__unsafe_private_named.4,
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            name: self._fields.3.unwrap(),
+            tags: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -362,11 +365,11 @@ where
         >,
     ) -> List<'a> {
         List {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            tags: self.__unsafe_private_named.4,
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            name: self._fields.3.unwrap(),
+            tags: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_anisota/feed/list_item.rs b/crates/jacquard-api/src/net_anisota/feed/list_item.rs
index e3d58884..ad1ab54a 100644
--- a/crates/jacquard-api/src/net_anisota/feed/list_item.rs
+++ b/crates/jacquard-api/src/net_anisota/feed/list_item.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -113,49 +116,49 @@ pub mod list_item_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type List;
+        type Subject;
         type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type List = Unset;
+        type Subject = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type List = S::List;
-        type CreatedAt = S::CreatedAt;
-    }
     ///State transition - sets the `list` field to Set
     pub struct SetList<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetList<S> {}
     impl<S: State> State for SetList<S> {
-        type Subject = S::Subject;
         type List = Set<members::list>;
+        type Subject = S::Subject;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type List = S::List;
+        type Subject = Set<members::subject>;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type List = S::List;
+        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `list` field
         pub struct list(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
     }
@@ -163,9 +166,9 @@ pub mod list_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListItemBuilder<'a, S: list_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListItem<'a> {
@@ -179,9 +182,9 @@ impl<'a> ListItemBuilder<'a, list_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListItemBuilder<'a, list_item_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListItemBuilder<'a, list_item_state::SetList<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListItemBuilder<'a, list_item_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,16 +249,16 @@ where
 impl<'a, S> ListItemBuilder<'a, S>
 where
     S: list_item_state::State,
-    S::Subject: list_item_state::IsSet,
     S::List: list_item_state::IsSet,
+    S::Subject: list_item_state::IsSet,
     S::CreatedAt: list_item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ListItem<'a> {
         ListItem {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            list: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            list: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -268,9 +271,9 @@ where
         >,
     ) -> ListItem<'a> {
         ListItem {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            list: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            list: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_anisota/feed/post.rs b/crates/jacquard-api/src/net_anisota/feed/post.rs
index 506b8883..57346fe9 100644
--- a/crates/jacquard-api/src/net_anisota/feed/post.rs
+++ b/crates/jacquard-api/src/net_anisota/feed/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -228,44 +231,44 @@ pub mod post_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Text;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Text = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Text = S::Text;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `text` field to Set
     pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetText<S> {}
     impl<S: State> State for SetText<S> {
-        type CreatedAt = S::CreatedAt;
         type Text = Set<members::text>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Text = S::Text;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `text` field
         pub struct text(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<PostEmbed<'a>>,
         Option<Vec<Facet<'a>>>,
@@ -275,7 +278,7 @@ pub struct PostBuilder<'a, S: post_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -289,9 +292,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -306,11 +309,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -318,12 +321,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `embed` field (optional)
     pub fn embed(mut self, value: impl Into<Option<PostEmbed<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `embed` field to an Option value (optional)
     pub fn maybe_embed(mut self, value: Option<PostEmbed<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -331,12 +334,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -344,12 +347,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -357,12 +360,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `langs` field (optional)
     pub fn langs(mut self, value: impl Into<Option<Vec<Language>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `langs` field to an Option value (optional)
     pub fn maybe_langs(mut self, value: Option<Vec<Language>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -370,12 +373,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `reply` field (optional)
     pub fn reply(mut self, value: impl Into<Option<post::ReplyRef<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `reply` field to an Option value (optional)
     pub fn maybe_reply(mut self, value: Option<post::ReplyRef<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -383,12 +386,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -403,11 +406,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetText<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -415,20 +418,20 @@ where
 impl<'a, S> PostBuilder<'a, S>
 where
     S: post_state::State,
-    S::CreatedAt: post_state::IsSet,
     S::Text: post_state::IsSet,
+    S::CreatedAt: post_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            embed: self.__unsafe_private_named.1,
-            facets: self.__unsafe_private_named.2,
-            labels: self.__unsafe_private_named.3,
-            langs: self.__unsafe_private_named.4,
-            reply: self.__unsafe_private_named.5,
-            tags: self.__unsafe_private_named.6,
-            text: self.__unsafe_private_named.7.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            embed: self._fields.1,
+            facets: self._fields.2,
+            labels: self._fields.3,
+            langs: self._fields.4,
+            reply: self._fields.5,
+            tags: self._fields.6,
+            text: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -441,14 +444,14 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            embed: self.__unsafe_private_named.1,
-            facets: self.__unsafe_private_named.2,
-            labels: self.__unsafe_private_named.3,
-            langs: self.__unsafe_private_named.4,
-            reply: self.__unsafe_private_named.5,
-            tags: self.__unsafe_private_named.6,
-            text: self.__unsafe_private_named.7.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            embed: self._fields.1,
+            facets: self._fields.2,
+            labels: self._fields.3,
+            langs: self._fields.4,
+            reply: self._fields.5,
+            tags: self._fields.6,
+            text: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -677,9 +680,9 @@ pub mod reply_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReplyRefBuilder<'a, S: reply_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReplyRef<'a> {
@@ -693,9 +696,9 @@ impl<'a> ReplyRefBuilder<'a, reply_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -710,11 +713,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ReplyRefBuilder<'a, reply_ref_state::SetParent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -729,11 +732,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ReplyRefBuilder<'a, reply_ref_state::SetRoot<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -747,8 +750,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ReplyRef<'a> {
         ReplyRef {
-            parent: self.__unsafe_private_named.0.unwrap(),
-            root: self.__unsafe_private_named.1.unwrap(),
+            parent: self._fields.0.unwrap(),
+            root: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -761,8 +764,8 @@ where
         >,
     ) -> ReplyRef<'a> {
         ReplyRef {
-            parent: self.__unsafe_private_named.0.unwrap(),
-            root: self.__unsafe_private_named.1.unwrap(),
+            parent: self._fields.0.unwrap(),
+            root: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_anisota/feed/repost.rs b/crates/jacquard-api/src/net_anisota/feed/repost.rs
index 1cf43adb..75ab9bab 100644
--- a/crates/jacquard-api/src/net_anisota/feed/repost.rs
+++ b/crates/jacquard-api/src/net_anisota/feed/repost.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -147,9 +150,9 @@ pub mod repost_state {
 
 /// Builder for constructing an instance of this type
 pub struct RepostBuilder<'a, S: repost_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Repost<'a> {
@@ -163,9 +166,9 @@ impl<'a> RepostBuilder<'a, repost_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RepostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,11 +183,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RepostBuilder<'a, repost_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RepostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -199,11 +202,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> RepostBuilder<'a, repost_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RepostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -217,8 +220,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Repost<'a> {
         Repost {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -231,8 +234,8 @@ where
         >,
     ) -> Repost<'a> {
         Repost {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_anisota/graph/list_mute.rs b/crates/jacquard-api/src/net_anisota/graph/list_mute.rs
index 3e26f5ee..326b69e3 100644
--- a/crates/jacquard-api/src/net_anisota/graph/list_mute.rs
+++ b/crates/jacquard-api/src/net_anisota/graph/list_mute.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -362,44 +365,44 @@ pub mod list_mute_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type CreatedAt;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
+        type Subject = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ListMuteBuilder<'a, S: list_mute_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<list_mute::ContentTypes<'a>>,
         Option<Datetime>,
         Option<Datetime>,
@@ -407,7 +410,7 @@ pub struct ListMuteBuilder<'a, S: list_mute_state::State> {
         Option<AtUri<'a>>,
         Option<Vec<AtUri<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListMute<'a> {
@@ -421,9 +424,9 @@ impl<'a> ListMuteBuilder<'a, list_mute_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListMuteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -434,7 +437,7 @@ impl<'a, S: list_mute_state::State> ListMuteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<list_mute::ContentTypes<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `contentTypes` field to an Option value (optional)
@@ -442,7 +445,7 @@ impl<'a, S: list_mute_state::State> ListMuteBuilder<'a, S> {
         mut self,
         value: Option<list_mute::ContentTypes<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -457,11 +460,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListMuteBuilder<'a, list_mute_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListMuteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -469,12 +472,12 @@ where
 impl<'a, S: list_mute_state::State> ListMuteBuilder<'a, S> {
     /// Set the `expiresAt` field (optional)
     pub fn expires_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `expiresAt` field to an Option value (optional)
     pub fn maybe_expires_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -482,12 +485,12 @@ impl<'a, S: list_mute_state::State> ListMuteBuilder<'a, S> {
 impl<'a, S: list_mute_state::State> ListMuteBuilder<'a, S> {
     /// Set the `reason` field (optional)
     pub fn reason(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `reason` field to an Option value (optional)
     pub fn maybe_reason(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -502,11 +505,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListMuteBuilder<'a, list_mute_state::SetSubject<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ListMuteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -514,12 +517,12 @@ where
 impl<'a, S: list_mute_state::State> ListMuteBuilder<'a, S> {
     /// Set the `targetFeeds` field (optional)
     pub fn target_feeds(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `targetFeeds` field to an Option value (optional)
     pub fn maybe_target_feeds(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -527,18 +530,18 @@ impl<'a, S: list_mute_state::State> ListMuteBuilder<'a, S> {
 impl<'a, S> ListMuteBuilder<'a, S>
 where
     S: list_mute_state::State,
-    S::Subject: list_mute_state::IsSet,
     S::CreatedAt: list_mute_state::IsSet,
+    S::Subject: list_mute_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ListMute<'a> {
         ListMute {
-            content_types: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            expires_at: self.__unsafe_private_named.2,
-            reason: self.__unsafe_private_named.3,
-            subject: self.__unsafe_private_named.4.unwrap(),
-            target_feeds: self.__unsafe_private_named.5,
+            content_types: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            expires_at: self._fields.2,
+            reason: self._fields.3,
+            subject: self._fields.4.unwrap(),
+            target_feeds: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -551,12 +554,12 @@ where
         >,
     ) -> ListMute<'a> {
         ListMute {
-            content_types: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            expires_at: self.__unsafe_private_named.2,
-            reason: self.__unsafe_private_named.3,
-            subject: self.__unsafe_private_named.4.unwrap(),
-            target_feeds: self.__unsafe_private_named.5,
+            content_types: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            expires_at: self._fields.2,
+            reason: self._fields.3,
+            subject: self._fields.4.unwrap(),
+            target_feeds: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_anisota/graph/mute.rs b/crates/jacquard-api/src/net_anisota/graph/mute.rs
index 1fbbf6fb..2a2e7098 100644
--- a/crates/jacquard-api/src/net_anisota/graph/mute.rs
+++ b/crates/jacquard-api/src/net_anisota/graph/mute.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -362,44 +365,44 @@ pub mod mute_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type CreatedAt;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
+        type Subject = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MuteBuilder<'a, S: mute_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<mute::ContentTypes<'a>>,
         Option<Datetime>,
         Option<Datetime>,
@@ -407,7 +410,7 @@ pub struct MuteBuilder<'a, S: mute_state::State> {
         Option<Did<'a>>,
         Option<Vec<AtUri<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Mute<'a> {
@@ -421,9 +424,9 @@ impl<'a> MuteBuilder<'a, mute_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MuteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -434,12 +437,12 @@ impl<'a, S: mute_state::State> MuteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<mute::ContentTypes<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `contentTypes` field to an Option value (optional)
     pub fn maybe_content_types(mut self, value: Option<mute::ContentTypes<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -454,11 +457,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MuteBuilder<'a, mute_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MuteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -466,12 +469,12 @@ where
 impl<'a, S: mute_state::State> MuteBuilder<'a, S> {
     /// Set the `expiresAt` field (optional)
     pub fn expires_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `expiresAt` field to an Option value (optional)
     pub fn maybe_expires_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -479,12 +482,12 @@ impl<'a, S: mute_state::State> MuteBuilder<'a, S> {
 impl<'a, S: mute_state::State> MuteBuilder<'a, S> {
     /// Set the `reason` field (optional)
     pub fn reason(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `reason` field to an Option value (optional)
     pub fn maybe_reason(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -499,11 +502,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MuteBuilder<'a, mute_state::SetSubject<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         MuteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -511,12 +514,12 @@ where
 impl<'a, S: mute_state::State> MuteBuilder<'a, S> {
     /// Set the `targetFeeds` field (optional)
     pub fn target_feeds(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `targetFeeds` field to an Option value (optional)
     pub fn maybe_target_feeds(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -524,18 +527,18 @@ impl<'a, S: mute_state::State> MuteBuilder<'a, S> {
 impl<'a, S> MuteBuilder<'a, S>
 where
     S: mute_state::State,
-    S::Subject: mute_state::IsSet,
     S::CreatedAt: mute_state::IsSet,
+    S::Subject: mute_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Mute<'a> {
         Mute {
-            content_types: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            expires_at: self.__unsafe_private_named.2,
-            reason: self.__unsafe_private_named.3,
-            subject: self.__unsafe_private_named.4.unwrap(),
-            target_feeds: self.__unsafe_private_named.5,
+            content_types: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            expires_at: self._fields.2,
+            reason: self._fields.3,
+            subject: self._fields.4.unwrap(),
+            target_feeds: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -548,12 +551,12 @@ where
         >,
     ) -> Mute<'a> {
         Mute {
-            content_types: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            expires_at: self.__unsafe_private_named.2,
-            reason: self.__unsafe_private_named.3,
-            subject: self.__unsafe_private_named.4.unwrap(),
-            target_feeds: self.__unsafe_private_named.5,
+            content_types: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            expires_at: self._fields.2,
+            reason: self._fields.3,
+            subject: self._fields.4.unwrap(),
+            target_feeds: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_anisota/harvest/minigame.rs b/crates/jacquard-api/src/net_anisota/harvest/minigame.rs
index bcddc39c..2541d9a5 100644
--- a/crates/jacquard-api/src/net_anisota/harvest/minigame.rs
+++ b/crates/jacquard-api/src/net_anisota/harvest/minigame.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -357,92 +360,92 @@ pub mod minigame_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type GameContext;
+        type RoundDuration;
         type PlayedAt;
         type FinalScore;
         type ShapesCollected;
-        type RoundDuration;
+        type GameContext;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type GameContext = Unset;
+        type RoundDuration = Unset;
         type PlayedAt = Unset;
         type FinalScore = Unset;
         type ShapesCollected = Unset;
-        type RoundDuration = Unset;
+        type GameContext = Unset;
     }
-    ///State transition - sets the `game_context` field to Set
-    pub struct SetGameContext<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetGameContext<S> {}
-    impl<S: State> State for SetGameContext<S> {
-        type GameContext = Set<members::game_context>;
+    ///State transition - sets the `round_duration` field to Set
+    pub struct SetRoundDuration<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRoundDuration<S> {}
+    impl<S: State> State for SetRoundDuration<S> {
+        type RoundDuration = Set<members::round_duration>;
         type PlayedAt = S::PlayedAt;
         type FinalScore = S::FinalScore;
         type ShapesCollected = S::ShapesCollected;
-        type RoundDuration = S::RoundDuration;
+        type GameContext = S::GameContext;
     }
     ///State transition - sets the `played_at` field to Set
     pub struct SetPlayedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPlayedAt<S> {}
     impl<S: State> State for SetPlayedAt<S> {
-        type GameContext = S::GameContext;
+        type RoundDuration = S::RoundDuration;
         type PlayedAt = Set<members::played_at>;
         type FinalScore = S::FinalScore;
         type ShapesCollected = S::ShapesCollected;
-        type RoundDuration = S::RoundDuration;
+        type GameContext = S::GameContext;
     }
     ///State transition - sets the `final_score` field to Set
     pub struct SetFinalScore<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetFinalScore<S> {}
     impl<S: State> State for SetFinalScore<S> {
-        type GameContext = S::GameContext;
+        type RoundDuration = S::RoundDuration;
         type PlayedAt = S::PlayedAt;
         type FinalScore = Set<members::final_score>;
         type ShapesCollected = S::ShapesCollected;
-        type RoundDuration = S::RoundDuration;
+        type GameContext = S::GameContext;
     }
     ///State transition - sets the `shapes_collected` field to Set
     pub struct SetShapesCollected<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetShapesCollected<S> {}
     impl<S: State> State for SetShapesCollected<S> {
-        type GameContext = S::GameContext;
+        type RoundDuration = S::RoundDuration;
         type PlayedAt = S::PlayedAt;
         type FinalScore = S::FinalScore;
         type ShapesCollected = Set<members::shapes_collected>;
-        type RoundDuration = S::RoundDuration;
-    }
-    ///State transition - sets the `round_duration` field to Set
-    pub struct SetRoundDuration<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRoundDuration<S> {}
-    impl<S: State> State for SetRoundDuration<S> {
         type GameContext = S::GameContext;
+    }
+    ///State transition - sets the `game_context` field to Set
+    pub struct SetGameContext<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetGameContext<S> {}
+    impl<S: State> State for SetGameContext<S> {
+        type RoundDuration = S::RoundDuration;
         type PlayedAt = S::PlayedAt;
         type FinalScore = S::FinalScore;
         type ShapesCollected = S::ShapesCollected;
-        type RoundDuration = Set<members::round_duration>;
+        type GameContext = Set<members::game_context>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `game_context` field
-        pub struct game_context(());
+        ///Marker type for the `round_duration` field
+        pub struct round_duration(());
         ///Marker type for the `played_at` field
         pub struct played_at(());
         ///Marker type for the `final_score` field
         pub struct final_score(());
         ///Marker type for the `shapes_collected` field
         pub struct shapes_collected(());
-        ///Marker type for the `round_duration` field
-        pub struct round_duration(());
+        ///Marker type for the `game_context` field
+        pub struct game_context(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MinigameBuilder<'a, S: minigame_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<i64>,
@@ -461,7 +464,7 @@ pub struct MinigameBuilder<'a, S: minigame_state::State> {
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Minigame<'a> {
@@ -475,8 +478,8 @@ impl<'a> MinigameBuilder<'a, minigame_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MinigameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -495,7 +498,7 @@ impl<'a> MinigameBuilder<'a, minigame_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -503,12 +506,12 @@ impl<'a> MinigameBuilder<'a, minigame_state::Empty> {
 impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
     /// Set the `clientVersion` field (optional)
     pub fn client_version(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `clientVersion` field to an Option value (optional)
     pub fn maybe_client_version(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -516,12 +519,12 @@ impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
 impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -529,12 +532,12 @@ impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
 impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
     /// Set the `earlyHarvests` field (optional)
     pub fn early_harvests(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `earlyHarvests` field to an Option value (optional)
     pub fn maybe_early_harvests(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -542,12 +545,12 @@ impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
 impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
     /// Set the `efficiencyBonus` field (optional)
     pub fn efficiency_bonus(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `efficiencyBonus` field to an Option value (optional)
     pub fn maybe_efficiency_bonus(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -562,11 +565,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> MinigameBuilder<'a, minigame_state::SetFinalScore<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         MinigameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -581,11 +584,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MinigameBuilder<'a, minigame_state::SetGameContext<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         MinigameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -593,12 +596,12 @@ where
 impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
     /// Set the `lateHarvests` field (optional)
     pub fn late_harvests(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `lateHarvests` field to an Option value (optional)
     pub fn maybe_late_harvests(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -606,12 +609,12 @@ impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
 impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
     /// Set the `peakHarvestRate` field (optional)
     pub fn peak_harvest_rate(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `peakHarvestRate` field to an Option value (optional)
     pub fn maybe_peak_harvest_rate(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -619,12 +622,12 @@ impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
 impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
     /// Set the `peakRateBonus` field (optional)
     pub fn peak_rate_bonus(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `peakRateBonus` field to an Option value (optional)
     pub fn maybe_peak_rate_bonus(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -632,12 +635,12 @@ impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
 impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
     /// Set the `perfectHarvests` field (optional)
     pub fn perfect_harvests(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `perfectHarvests` field to an Option value (optional)
     pub fn maybe_perfect_harvests(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -652,11 +655,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MinigameBuilder<'a, minigame_state::SetPlayedAt<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         MinigameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -664,12 +667,12 @@ where
 impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
     /// Set the `pointsPerSecond` field (optional)
     pub fn points_per_second(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `pointsPerSecond` field to an Option value (optional)
     pub fn maybe_points_per_second(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -680,7 +683,7 @@ impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
         mut self,
         value: impl Into<Option<minigame::RarityBreakdown<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `rarityBreakdown` field to an Option value (optional)
@@ -688,7 +691,7 @@ impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
         mut self,
         value: Option<minigame::RarityBreakdown<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -703,11 +706,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> MinigameBuilder<'a, minigame_state::SetRoundDuration<S>> {
-        self.__unsafe_private_named.13 = Option::Some(value.into());
+        self._fields.13 = Option::Some(value.into());
         MinigameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -722,11 +725,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> MinigameBuilder<'a, minigame_state::SetShapesCollected<S>> {
-        self.__unsafe_private_named.14 = Option::Some(value.into());
+        self._fields.14 = Option::Some(value.into());
         MinigameBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -734,12 +737,12 @@ where
 impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
     /// Set the `shapesMissed` field (optional)
     pub fn shapes_missed(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `shapesMissed` field to an Option value (optional)
     pub fn maybe_shapes_missed(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -747,12 +750,12 @@ impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
 impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
     /// Set the `totalShapesSpawned` field (optional)
     pub fn total_shapes_spawned(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `totalShapesSpawned` field to an Option value (optional)
     pub fn maybe_total_shapes_spawned(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -760,32 +763,32 @@ impl<'a, S: minigame_state::State> MinigameBuilder<'a, S> {
 impl<'a, S> MinigameBuilder<'a, S>
 where
     S: minigame_state::State,
-    S::GameContext: minigame_state::IsSet,
+    S::RoundDuration: minigame_state::IsSet,
     S::PlayedAt: minigame_state::IsSet,
     S::FinalScore: minigame_state::IsSet,
     S::ShapesCollected: minigame_state::IsSet,
-    S::RoundDuration: minigame_state::IsSet,
+    S::GameContext: minigame_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Minigame<'a> {
         Minigame {
-            client_version: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            early_harvests: self.__unsafe_private_named.2,
-            efficiency_bonus: self.__unsafe_private_named.3,
-            final_score: self.__unsafe_private_named.4.unwrap(),
-            game_context: self.__unsafe_private_named.5.unwrap(),
-            late_harvests: self.__unsafe_private_named.6,
-            peak_harvest_rate: self.__unsafe_private_named.7,
-            peak_rate_bonus: self.__unsafe_private_named.8,
-            perfect_harvests: self.__unsafe_private_named.9,
-            played_at: self.__unsafe_private_named.10.unwrap(),
-            points_per_second: self.__unsafe_private_named.11,
-            rarity_breakdown: self.__unsafe_private_named.12,
-            round_duration: self.__unsafe_private_named.13.unwrap(),
-            shapes_collected: self.__unsafe_private_named.14.unwrap(),
-            shapes_missed: self.__unsafe_private_named.15,
-            total_shapes_spawned: self.__unsafe_private_named.16,
+            client_version: self._fields.0,
+            created_at: self._fields.1,
+            early_harvests: self._fields.2,
+            efficiency_bonus: self._fields.3,
+            final_score: self._fields.4.unwrap(),
+            game_context: self._fields.5.unwrap(),
+            late_harvests: self._fields.6,
+            peak_harvest_rate: self._fields.7,
+            peak_rate_bonus: self._fields.8,
+            perfect_harvests: self._fields.9,
+            played_at: self._fields.10.unwrap(),
+            points_per_second: self._fields.11,
+            rarity_breakdown: self._fields.12,
+            round_duration: self._fields.13.unwrap(),
+            shapes_collected: self._fields.14.unwrap(),
+            shapes_missed: self._fields.15,
+            total_shapes_spawned: self._fields.16,
             extra_data: Default::default(),
         }
     }
@@ -798,23 +801,23 @@ where
         >,
     ) -> Minigame<'a> {
         Minigame {
-            client_version: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            early_harvests: self.__unsafe_private_named.2,
-            efficiency_bonus: self.__unsafe_private_named.3,
-            final_score: self.__unsafe_private_named.4.unwrap(),
-            game_context: self.__unsafe_private_named.5.unwrap(),
-            late_harvests: self.__unsafe_private_named.6,
-            peak_harvest_rate: self.__unsafe_private_named.7,
-            peak_rate_bonus: self.__unsafe_private_named.8,
-            perfect_harvests: self.__unsafe_private_named.9,
-            played_at: self.__unsafe_private_named.10.unwrap(),
-            points_per_second: self.__unsafe_private_named.11,
-            rarity_breakdown: self.__unsafe_private_named.12,
-            round_duration: self.__unsafe_private_named.13.unwrap(),
-            shapes_collected: self.__unsafe_private_named.14.unwrap(),
-            shapes_missed: self.__unsafe_private_named.15,
-            total_shapes_spawned: self.__unsafe_private_named.16,
+            client_version: self._fields.0,
+            created_at: self._fields.1,
+            early_harvests: self._fields.2,
+            efficiency_bonus: self._fields.3,
+            final_score: self._fields.4.unwrap(),
+            game_context: self._fields.5.unwrap(),
+            late_harvests: self._fields.6,
+            peak_harvest_rate: self._fields.7,
+            peak_rate_bonus: self._fields.8,
+            perfect_harvests: self._fields.9,
+            played_at: self._fields.10.unwrap(),
+            points_per_second: self._fields.11,
+            rarity_breakdown: self._fields.12,
+            round_duration: self._fields.13.unwrap(),
+            shapes_collected: self._fields.14.unwrap(),
+            shapes_missed: self._fields.15,
+            total_shapes_spawned: self._fields.16,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_anisota/settings.rs b/crates/jacquard-api/src/net_anisota/settings.rs
index 01ad8357..1f7b71fd 100644
--- a/crates/jacquard-api/src/net_anisota/settings.rs
+++ b/crates/jacquard-api/src/net_anisota/settings.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -3159,58 +3162,58 @@ pub mod settings_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type CreatedAt;
         type UpdatedAt;
         type Version;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type CreatedAt = Unset;
         type UpdatedAt = Unset;
         type Version = Unset;
-        type CreatedAt = Unset;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type UpdatedAt = S::UpdatedAt;
+        type Version = S::Version;
     }
     ///State transition - sets the `updated_at` field to Set
     pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
     impl<S: State> State for SetUpdatedAt<S> {
+        type CreatedAt = S::CreatedAt;
         type UpdatedAt = Set<members::updated_at>;
         type Version = S::Version;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `version` field to Set
     pub struct SetVersion<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetVersion<S> {}
     impl<S: State> State for SetVersion<S> {
-        type UpdatedAt = S::UpdatedAt;
-        type Version = Set<members::version>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type UpdatedAt = S::UpdatedAt;
-        type Version = S::Version;
-        type CreatedAt = Set<members::created_at>;
+        type Version = Set<members::version>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `updated_at` field
         pub struct updated_at(());
         ///Marker type for the `version` field
         pub struct version(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SettingsBuilder<'a, S: settings_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<settings::BehaviorSettings<'a>>,
         Option<Vec<CowStr<'a>>>,
         Option<settings::ControlSettings<'a>>,
@@ -3220,7 +3223,7 @@ pub struct SettingsBuilder<'a, S: settings_state::State> {
         Option<Datetime>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Settings<'a> {
@@ -3234,9 +3237,9 @@ impl<'a> SettingsBuilder<'a, settings_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3247,7 +3250,7 @@ impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
         mut self,
         value: impl Into<Option<settings::BehaviorSettings<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `behaviorSettings` field to an Option value (optional)
@@ -3255,7 +3258,7 @@ impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
         mut self,
         value: Option<settings::BehaviorSettings<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -3263,12 +3266,12 @@ impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
 impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
     /// Set the `controlOrder` field (optional)
     pub fn control_order(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `controlOrder` field to an Option value (optional)
     pub fn maybe_control_order(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3279,7 +3282,7 @@ impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
         mut self,
         value: impl Into<Option<settings::ControlSettings<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `controlSettings` field to an Option value (optional)
@@ -3287,7 +3290,7 @@ impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
         mut self,
         value: Option<settings::ControlSettings<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -3302,11 +3305,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SettingsBuilder<'a, settings_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3314,12 +3317,12 @@ where
 impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
     /// Set the `theme` field (optional)
     pub fn theme(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `theme` field to an Option value (optional)
     pub fn maybe_theme(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -3330,12 +3333,12 @@ impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
         mut self,
         value: impl Into<Option<settings::UiSettings<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `uiSettings` field to an Option value (optional)
     pub fn maybe_ui_settings(mut self, value: Option<settings::UiSettings<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -3350,11 +3353,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SettingsBuilder<'a, settings_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         SettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3369,11 +3372,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SettingsBuilder<'a, settings_state::SetVersion<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         SettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3381,21 +3384,21 @@ where
 impl<'a, S> SettingsBuilder<'a, S>
 where
     S: settings_state::State,
+    S::CreatedAt: settings_state::IsSet,
     S::UpdatedAt: settings_state::IsSet,
     S::Version: settings_state::IsSet,
-    S::CreatedAt: settings_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Settings<'a> {
         Settings {
-            behavior_settings: self.__unsafe_private_named.0,
-            control_order: self.__unsafe_private_named.1,
-            control_settings: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            theme: self.__unsafe_private_named.4,
-            ui_settings: self.__unsafe_private_named.5,
-            updated_at: self.__unsafe_private_named.6.unwrap(),
-            version: self.__unsafe_private_named.7.unwrap(),
+            behavior_settings: self._fields.0,
+            control_order: self._fields.1,
+            control_settings: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            theme: self._fields.4,
+            ui_settings: self._fields.5,
+            updated_at: self._fields.6.unwrap(),
+            version: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3408,14 +3411,14 @@ where
         >,
     ) -> Settings<'a> {
         Settings {
-            behavior_settings: self.__unsafe_private_named.0,
-            control_order: self.__unsafe_private_named.1,
-            control_settings: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            theme: self.__unsafe_private_named.4,
-            ui_settings: self.__unsafe_private_named.5,
-            updated_at: self.__unsafe_private_named.6.unwrap(),
-            version: self.__unsafe_private_named.7.unwrap(),
+            behavior_settings: self._fields.0,
+            control_order: self._fields.1,
+            control_settings: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            theme: self._fields.4,
+            ui_settings: self._fields.5,
+            updated_at: self._fields.6.unwrap(),
+            version: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_asadaame5121/at_circle.rs b/crates/jacquard-api/src/net_asadaame5121/at_circle.rs
index b67c48f0..bbf8361e 100644
--- a/crates/jacquard-api/src/net_asadaame5121/at_circle.rs
+++ b/crates/jacquard-api/src/net_asadaame5121/at_circle.rs
@@ -11,7 +11,11 @@ pub mod member;
 pub mod request;
 pub mod ring;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -108,9 +112,9 @@ pub mod ring_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct RingRefBuilder<'a, S: ring_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RingRef<'a> {
@@ -124,9 +128,9 @@ impl<'a> RingRefBuilder<'a, ring_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RingRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -134,12 +138,12 @@ impl<'a> RingRefBuilder<'a, ring_ref_state::Empty> {
 impl<'a, S: ring_ref_state::State> RingRefBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -154,11 +158,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RingRefBuilder<'a, ring_ref_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RingRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -171,8 +175,8 @@ where
     /// Build the final struct
     pub fn build(self) -> RingRef<'a> {
         RingRef {
-            cid: self.__unsafe_private_named.0,
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0,
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -185,8 +189,8 @@ where
         >,
     ) -> RingRef<'a> {
         RingRef {
-            cid: self.__unsafe_private_named.0,
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0,
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_asadaame5121/at_circle/banner.rs b/crates/jacquard-api/src/net_asadaame5121/at_circle/banner.rs
index 33840837..d3530617 100644
--- a/crates/jacquard-api/src/net_asadaame5121/at_circle/banner.rs
+++ b/crates/jacquard-api/src/net_asadaame5121/at_circle/banner.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -202,9 +205,9 @@ pub mod banner_state {
 
 /// Builder for constructing an instance of this type
 pub struct BannerBuilder<'a, S: banner_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>, Option<Datetime>, Option<RingRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>, Option<Datetime>, Option<RingRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Banner<'a> {
@@ -218,9 +221,9 @@ impl<'a> BannerBuilder<'a, banner_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BannerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -235,11 +238,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> BannerBuilder<'a, banner_state::SetBanner<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BannerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -254,11 +257,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BannerBuilder<'a, banner_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BannerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -273,11 +276,11 @@ where
         mut self,
         value: impl Into<RingRef<'a>>,
     ) -> BannerBuilder<'a, banner_state::SetRing<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BannerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -292,9 +295,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Banner<'a> {
         Banner {
-            banner: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            ring: self.__unsafe_private_named.2.unwrap(),
+            banner: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            ring: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -307,9 +310,9 @@ where
         >,
     ) -> Banner<'a> {
         Banner {
-            banner: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            ring: self.__unsafe_private_named.2.unwrap(),
+            banner: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            ring: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_asadaame5121/at_circle/block.rs b/crates/jacquard-api/src/net_asadaame5121/at_circle/block.rs
index 40e0c84d..60e66008 100644
--- a/crates/jacquard-api/src/net_asadaame5121/at_circle/block.rs
+++ b/crates/jacquard-api/src/net_asadaame5121/at_circle/block.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -149,64 +152,64 @@ pub mod block_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Subject;
         type Ring;
         type CreatedAt;
-        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Subject = Unset;
         type Ring = Unset;
         type CreatedAt = Unset;
-        type Subject = Unset;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type Subject = Set<members::subject>;
+        type Ring = S::Ring;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `ring` field to Set
     pub struct SetRing<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRing<S> {}
     impl<S: State> State for SetRing<S> {
+        type Subject = S::Subject;
         type Ring = Set<members::ring>;
         type CreatedAt = S::CreatedAt;
-        type Subject = S::Subject;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Ring = S::Ring;
-        type CreatedAt = Set<members::created_at>;
         type Subject = S::Subject;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
         type Ring = S::Ring;
-        type CreatedAt = S::CreatedAt;
-        type Subject = Set<members::subject>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `subject` field
+        pub struct subject(());
         ///Marker type for the `ring` field
         pub struct ring(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `subject` field
-        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BlockBuilder<'a, S: block_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<RingRef<'a>>,
         Option<Did<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Block<'a> {
@@ -220,9 +223,9 @@ impl<'a> BlockBuilder<'a, block_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -237,11 +240,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BlockBuilder<'a, block_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,12 +252,12 @@ where
 impl<'a, S: block_state::State> BlockBuilder<'a, S> {
     /// Set the `reason` field (optional)
     pub fn reason(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `reason` field to an Option value (optional)
     pub fn maybe_reason(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -269,11 +272,11 @@ where
         mut self,
         value: impl Into<RingRef<'a>>,
     ) -> BlockBuilder<'a, block_state::SetRing<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -288,11 +291,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> BlockBuilder<'a, block_state::SetSubject<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -300,17 +303,17 @@ where
 impl<'a, S> BlockBuilder<'a, S>
 where
     S: block_state::State,
+    S::Subject: block_state::IsSet,
     S::Ring: block_state::IsSet,
     S::CreatedAt: block_state::IsSet,
-    S::Subject: block_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Block<'a> {
         Block {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            reason: self.__unsafe_private_named.1,
-            ring: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            reason: self._fields.1,
+            ring: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -323,10 +326,10 @@ where
         >,
     ) -> Block<'a> {
         Block {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            reason: self.__unsafe_private_named.1,
-            ring: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            reason: self._fields.1,
+            ring: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_asadaame5121/at_circle/member.rs b/crates/jacquard-api/src/net_asadaame5121/at_circle/member.rs
index ead794d5..95167130 100644
--- a/crates/jacquard-api/src/net_asadaame5121/at_circle/member.rs
+++ b/crates/jacquard-api/src/net_asadaame5121/at_circle/member.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -190,65 +193,65 @@ pub mod member_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Title;
-        type Ring;
         type Url;
+        type Ring;
+        type Title;
         type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Title = Unset;
-        type Ring = Unset;
         type Url = Unset;
+        type Ring = Unset;
+        type Title = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Title = Set<members::title>;
+    ///State transition - sets the `url` field to Set
+    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUrl<S> {}
+    impl<S: State> State for SetUrl<S> {
+        type Url = Set<members::url>;
         type Ring = S::Ring;
-        type Url = S::Url;
+        type Title = S::Title;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `ring` field to Set
     pub struct SetRing<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRing<S> {}
     impl<S: State> State for SetRing<S> {
-        type Title = S::Title;
-        type Ring = Set<members::ring>;
         type Url = S::Url;
+        type Ring = Set<members::ring>;
+        type Title = S::Title;
         type CreatedAt = S::CreatedAt;
     }
-    ///State transition - sets the `url` field to Set
-    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUrl<S> {}
-    impl<S: State> State for SetUrl<S> {
-        type Title = S::Title;
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type Url = S::Url;
         type Ring = S::Ring;
-        type Url = Set<members::url>;
+        type Title = Set<members::title>;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Title = S::Title;
-        type Ring = S::Ring;
         type Url = S::Url;
+        type Ring = S::Ring;
+        type Title = S::Title;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `title` field
-        pub struct title(());
-        ///Marker type for the `ring` field
-        pub struct ring(());
         ///Marker type for the `url` field
         pub struct url(());
+        ///Marker type for the `ring` field
+        pub struct ring(());
+        ///Marker type for the `title` field
+        pub struct title(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
     }
@@ -256,8 +259,8 @@ pub mod member_state {
 
 /// Builder for constructing an instance of this type
 pub struct MemberBuilder<'a, S: member_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<RingRef<'a>>,
@@ -265,7 +268,7 @@ pub struct MemberBuilder<'a, S: member_state::State> {
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Member<'a> {
@@ -279,9 +282,9 @@ impl<'a> MemberBuilder<'a, member_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -296,11 +299,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MemberBuilder<'a, member_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -308,12 +311,12 @@ where
 impl<'a, S: member_state::State> MemberBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -328,11 +331,11 @@ where
         mut self,
         value: impl Into<RingRef<'a>>,
     ) -> MemberBuilder<'a, member_state::SetRing<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         MemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -340,12 +343,12 @@ where
 impl<'a, S: member_state::State> MemberBuilder<'a, S> {
     /// Set the `rss` field (optional)
     pub fn rss(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `rss` field to an Option value (optional)
     pub fn maybe_rss(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -360,11 +363,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MemberBuilder<'a, member_state::SetTitle<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         MemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -379,11 +382,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> MemberBuilder<'a, member_state::SetUrl<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         MemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -391,20 +394,20 @@ where
 impl<'a, S> MemberBuilder<'a, S>
 where
     S: member_state::State,
-    S::Title: member_state::IsSet,
-    S::Ring: member_state::IsSet,
     S::Url: member_state::IsSet,
+    S::Ring: member_state::IsSet,
+    S::Title: member_state::IsSet,
     S::CreatedAt: member_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Member<'a> {
         Member {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            note: self.__unsafe_private_named.1,
-            ring: self.__unsafe_private_named.2.unwrap(),
-            rss: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4.unwrap(),
-            url: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            note: self._fields.1,
+            ring: self._fields.2.unwrap(),
+            rss: self._fields.3,
+            title: self._fields.4.unwrap(),
+            url: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -417,12 +420,12 @@ where
         >,
     ) -> Member<'a> {
         Member {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            note: self.__unsafe_private_named.1,
-            ring: self.__unsafe_private_named.2.unwrap(),
-            rss: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4.unwrap(),
-            url: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            note: self._fields.1,
+            ring: self._fields.2.unwrap(),
+            rss: self._fields.3,
+            title: self._fields.4.unwrap(),
+            url: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_asadaame5121/at_circle/request.rs b/crates/jacquard-api/src/net_asadaame5121/at_circle/request.rs
index 891cdedf..d95ae023 100644
--- a/crates/jacquard-api/src/net_asadaame5121/at_circle/request.rs
+++ b/crates/jacquard-api/src/net_asadaame5121/at_circle/request.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -169,74 +172,74 @@ pub mod request_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type SiteTitle;
-        type CreatedAt;
         type Ring;
         type SiteUrl;
+        type CreatedAt;
+        type SiteTitle;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type SiteTitle = Unset;
-        type CreatedAt = Unset;
         type Ring = Unset;
         type SiteUrl = Unset;
-    }
-    ///State transition - sets the `site_title` field to Set
-    pub struct SetSiteTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSiteTitle<S> {}
-    impl<S: State> State for SetSiteTitle<S> {
-        type SiteTitle = Set<members::site_title>;
-        type CreatedAt = S::CreatedAt;
-        type Ring = S::Ring;
-        type SiteUrl = S::SiteUrl;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type SiteTitle = S::SiteTitle;
-        type CreatedAt = Set<members::created_at>;
-        type Ring = S::Ring;
-        type SiteUrl = S::SiteUrl;
+        type CreatedAt = Unset;
+        type SiteTitle = Unset;
     }
     ///State transition - sets the `ring` field to Set
     pub struct SetRing<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRing<S> {}
     impl<S: State> State for SetRing<S> {
-        type SiteTitle = S::SiteTitle;
-        type CreatedAt = S::CreatedAt;
         type Ring = Set<members::ring>;
         type SiteUrl = S::SiteUrl;
+        type CreatedAt = S::CreatedAt;
+        type SiteTitle = S::SiteTitle;
     }
     ///State transition - sets the `site_url` field to Set
     pub struct SetSiteUrl<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSiteUrl<S> {}
     impl<S: State> State for SetSiteUrl<S> {
-        type SiteTitle = S::SiteTitle;
-        type CreatedAt = S::CreatedAt;
         type Ring = S::Ring;
         type SiteUrl = Set<members::site_url>;
+        type CreatedAt = S::CreatedAt;
+        type SiteTitle = S::SiteTitle;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Ring = S::Ring;
+        type SiteUrl = S::SiteUrl;
+        type CreatedAt = Set<members::created_at>;
+        type SiteTitle = S::SiteTitle;
+    }
+    ///State transition - sets the `site_title` field to Set
+    pub struct SetSiteTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSiteTitle<S> {}
+    impl<S: State> State for SetSiteTitle<S> {
+        type Ring = S::Ring;
+        type SiteUrl = S::SiteUrl;
+        type CreatedAt = S::CreatedAt;
+        type SiteTitle = Set<members::site_title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `site_title` field
-        pub struct site_title(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `ring` field
         pub struct ring(());
         ///Marker type for the `site_url` field
         pub struct site_url(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `site_title` field
+        pub struct site_title(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RequestBuilder<'a, S: request_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<RingRef<'a>>,
@@ -244,7 +247,7 @@ pub struct RequestBuilder<'a, S: request_state::State> {
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Request<'a> {
@@ -258,9 +261,9 @@ impl<'a> RequestBuilder<'a, request_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RequestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -275,11 +278,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RequestBuilder<'a, request_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RequestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -287,12 +290,12 @@ where
 impl<'a, S: request_state::State> RequestBuilder<'a, S> {
     /// Set the `message` field (optional)
     pub fn message(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `message` field to an Option value (optional)
     pub fn maybe_message(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -307,11 +310,11 @@ where
         mut self,
         value: impl Into<RingRef<'a>>,
     ) -> RequestBuilder<'a, request_state::SetRing<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RequestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -319,12 +322,12 @@ where
 impl<'a, S: request_state::State> RequestBuilder<'a, S> {
     /// Set the `rssUrl` field (optional)
     pub fn rss_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `rssUrl` field to an Option value (optional)
     pub fn maybe_rss_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -339,11 +342,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RequestBuilder<'a, request_state::SetSiteTitle<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RequestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -358,11 +361,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> RequestBuilder<'a, request_state::SetSiteUrl<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         RequestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -370,20 +373,20 @@ where
 impl<'a, S> RequestBuilder<'a, S>
 where
     S: request_state::State,
-    S::SiteTitle: request_state::IsSet,
-    S::CreatedAt: request_state::IsSet,
     S::Ring: request_state::IsSet,
     S::SiteUrl: request_state::IsSet,
+    S::CreatedAt: request_state::IsSet,
+    S::SiteTitle: request_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Request<'a> {
         Request {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1,
-            ring: self.__unsafe_private_named.2.unwrap(),
-            rss_url: self.__unsafe_private_named.3,
-            site_title: self.__unsafe_private_named.4.unwrap(),
-            site_url: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            message: self._fields.1,
+            ring: self._fields.2.unwrap(),
+            rss_url: self._fields.3,
+            site_title: self._fields.4.unwrap(),
+            site_url: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -396,12 +399,12 @@ where
         >,
     ) -> Request<'a> {
         Request {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1,
-            ring: self.__unsafe_private_named.2.unwrap(),
-            rss_url: self.__unsafe_private_named.3,
-            site_title: self.__unsafe_private_named.4.unwrap(),
-            site_url: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            message: self._fields.1,
+            ring: self._fields.2.unwrap(),
+            rss_url: self._fields.3,
+            site_title: self._fields.4.unwrap(),
+            site_url: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_asadaame5121/at_circle/ring.rs b/crates/jacquard-api/src/net_asadaame5121/at_circle/ring.rs
index a536e1fb..7b21e5b9 100644
--- a/crates/jacquard-api/src/net_asadaame5121/at_circle/ring.rs
+++ b/crates/jacquard-api/src/net_asadaame5121/at_circle/ring.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -369,49 +372,49 @@ pub mod ring_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Status;
         type CreatedAt;
+        type Status;
         type Title;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Status = Unset;
         type CreatedAt = Unset;
+        type Status = Unset;
         type Title = Unset;
     }
-    ///State transition - sets the `status` field to Set
-    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStatus<S> {}
-    impl<S: State> State for SetStatus<S> {
-        type Status = Set<members::status>;
-        type CreatedAt = S::CreatedAt;
-        type Title = S::Title;
-    }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Status = S::Status;
         type CreatedAt = Set<members::created_at>;
+        type Status = S::Status;
+        type Title = S::Title;
+    }
+    ///State transition - sets the `status` field to Set
+    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStatus<S> {}
+    impl<S: State> State for SetStatus<S> {
+        type CreatedAt = S::CreatedAt;
+        type Status = Set<members::status>;
         type Title = S::Title;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Status = S::Status;
         type CreatedAt = S::CreatedAt;
+        type Status = S::Status;
         type Title = Set<members::title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `status` field
-        pub struct status(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `status` field
+        pub struct status(());
         ///Marker type for the `title` field
         pub struct title(());
     }
@@ -419,15 +422,15 @@ pub mod ring_state {
 
 /// Builder for constructing an instance of this type
 pub struct RingBuilder<'a, S: ring_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<RingAcceptancePolicy<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<RingStatus<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Ring<'a> {
@@ -441,9 +444,9 @@ impl<'a> RingBuilder<'a, ring_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -454,7 +457,7 @@ impl<'a, S: ring_state::State> RingBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RingAcceptancePolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `acceptancePolicy` field to an Option value (optional)
@@ -462,7 +465,7 @@ impl<'a, S: ring_state::State> RingBuilder<'a, S> {
         mut self,
         value: Option<RingAcceptancePolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -477,11 +480,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RingBuilder<'a, ring_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -489,12 +492,12 @@ where
 impl<'a, S: ring_state::State> RingBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -509,11 +512,11 @@ where
         mut self,
         value: impl Into<RingStatus<'a>>,
     ) -> RingBuilder<'a, ring_state::SetStatus<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -528,11 +531,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RingBuilder<'a, ring_state::SetTitle<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -540,18 +543,18 @@ where
 impl<'a, S> RingBuilder<'a, S>
 where
     S: ring_state::State,
-    S::Status: ring_state::IsSet,
     S::CreatedAt: ring_state::IsSet,
+    S::Status: ring_state::IsSet,
     S::Title: ring_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Ring<'a> {
         Ring {
-            acceptance_policy: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            status: self.__unsafe_private_named.3.unwrap(),
-            title: self.__unsafe_private_named.4.unwrap(),
+            acceptance_policy: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            status: self._fields.3.unwrap(),
+            title: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -564,11 +567,11 @@ where
         >,
     ) -> Ring<'a> {
         Ring {
-            acceptance_policy: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            status: self.__unsafe_private_named.3.unwrap(),
-            title: self.__unsafe_private_named.4.unwrap(),
+            acceptance_policy: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            status: self._fields.3.unwrap(),
+            title: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_bnewbold/demo/mushies.rs b/crates/jacquard-api/src/net_bnewbold/demo/mushies.rs
index 753f19d8..b34341d0 100644
--- a/crates/jacquard-api/src/net_bnewbold/demo/mushies.rs
+++ b/crates/jacquard-api/src/net_bnewbold/demo/mushies.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -182,9 +185,9 @@ pub mod mushies_state {
 
 /// Builder for constructing an instance of this type
 pub struct MushiesBuilder<'a, S: mushies_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<bool>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<bool>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Mushies<'a> {
@@ -198,9 +201,9 @@ impl<'a> MushiesBuilder<'a, mushies_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MushiesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MushiesBuilder<'a, mushies_state::SetCommonName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MushiesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -227,12 +230,12 @@ where
 impl<'a, S: mushies_state::State> MushiesBuilder<'a, S> {
     /// Set the `edible` field (optional)
     pub fn edible(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `edible` field to an Option value (optional)
     pub fn maybe_edible(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -240,12 +243,12 @@ impl<'a, S: mushies_state::State> MushiesBuilder<'a, S> {
 impl<'a, S: mushies_state::State> MushiesBuilder<'a, S> {
     /// Set the `species` field (optional)
     pub fn species(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `species` field to an Option value (optional)
     pub fn maybe_species(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -258,9 +261,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Mushies<'a> {
         Mushies {
-            common_name: self.__unsafe_private_named.0.unwrap(),
-            edible: self.__unsafe_private_named.1,
-            species: self.__unsafe_private_named.2,
+            common_name: self._fields.0.unwrap(),
+            edible: self._fields.1,
+            species: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -273,9 +276,9 @@ where
         >,
     ) -> Mushies<'a> {
         Mushies {
-            common_name: self.__unsafe_private_named.0.unwrap(),
-            edible: self.__unsafe_private_named.1,
-            species: self.__unsafe_private_named.2,
+            common_name: self._fields.0.unwrap(),
+            edible: self._fields.1,
+            species: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_bnewbold/demo/mushroom.rs b/crates/jacquard-api/src/net_bnewbold/demo/mushroom.rs
index 99d56b67..c0580124 100644
--- a/crates/jacquard-api/src/net_bnewbold/demo/mushroom.rs
+++ b/crates/jacquard-api/src/net_bnewbold/demo/mushroom.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -182,9 +185,9 @@ pub mod mushroom_state {
 
 /// Builder for constructing an instance of this type
 pub struct MushroomBuilder<'a, S: mushroom_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<bool>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<bool>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Mushroom<'a> {
@@ -198,9 +201,9 @@ impl<'a> MushroomBuilder<'a, mushroom_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MushroomBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MushroomBuilder<'a, mushroom_state::SetCommonName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MushroomBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -227,12 +230,12 @@ where
 impl<'a, S: mushroom_state::State> MushroomBuilder<'a, S> {
     /// Set the `edible` field (optional)
     pub fn edible(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `edible` field to an Option value (optional)
     pub fn maybe_edible(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -240,12 +243,12 @@ impl<'a, S: mushroom_state::State> MushroomBuilder<'a, S> {
 impl<'a, S: mushroom_state::State> MushroomBuilder<'a, S> {
     /// Set the `species` field (optional)
     pub fn species(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `species` field to an Option value (optional)
     pub fn maybe_species(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -258,9 +261,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Mushroom<'a> {
         Mushroom {
-            common_name: self.__unsafe_private_named.0.unwrap(),
-            edible: self.__unsafe_private_named.1,
-            species: self.__unsafe_private_named.2,
+            common_name: self._fields.0.unwrap(),
+            edible: self._fields.1,
+            species: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -273,9 +276,9 @@ where
         >,
     ) -> Mushroom<'a> {
         Mushroom {
-            common_name: self.__unsafe_private_named.0.unwrap(),
-            edible: self.__unsafe_private_named.1,
-            species: self.__unsafe_private_named.2,
+            common_name: self._fields.0.unwrap(),
+            edible: self._fields.1,
+            species: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_bnewbold/m.rs b/crates/jacquard-api/src/net_bnewbold/m.rs
index 18fe8292..0d830236 100644
--- a/crates/jacquard-api/src/net_bnewbold/m.rs
+++ b/crates/jacquard-api/src/net_bnewbold/m.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -180,9 +183,9 @@ pub mod m_state {
 
 /// Builder for constructing an instance of this type
 pub struct MBuilder<'a, S: m_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<bool>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<bool>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> M<'a> {
@@ -196,9 +199,9 @@ impl<'a> MBuilder<'a, m_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,11 +216,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MBuilder<'a, m_state::SetCommonName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -225,12 +228,12 @@ where
 impl<'a, S: m_state::State> MBuilder<'a, S> {
     /// Set the `edible` field (optional)
     pub fn edible(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `edible` field to an Option value (optional)
     pub fn maybe_edible(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -238,12 +241,12 @@ impl<'a, S: m_state::State> MBuilder<'a, S> {
 impl<'a, S: m_state::State> MBuilder<'a, S> {
     /// Set the `species` field (optional)
     pub fn species(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `species` field to an Option value (optional)
     pub fn maybe_species(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -256,9 +259,9 @@ where
     /// Build the final struct
     pub fn build(self) -> M<'a> {
         M {
-            common_name: self.__unsafe_private_named.0.unwrap(),
-            edible: self.__unsafe_private_named.1,
-            species: self.__unsafe_private_named.2,
+            common_name: self._fields.0.unwrap(),
+            edible: self._fields.1,
+            species: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -271,9 +274,9 @@ where
         >,
     ) -> M<'a> {
         M {
-            common_name: self.__unsafe_private_named.0.unwrap(),
-            edible: self.__unsafe_private_named.1,
-            species: self.__unsafe_private_named.2,
+            common_name: self._fields.0.unwrap(),
+            edible: self._fields.1,
+            species: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_jbsm/jb/reminder.rs b/crates/jacquard-api/src/net_jbsm/jb/reminder.rs
index 36a27ce5..4a4b1f8a 100644
--- a/crates/jacquard-api/src/net_jbsm/jb/reminder.rs
+++ b/crates/jacquard-api/src/net_jbsm/jb/reminder.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -138,74 +141,74 @@ pub mod reminder_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Requester;
         type CreatedAt;
         type TriggerAt;
         type Subject;
+        type Requester;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Requester = Unset;
         type CreatedAt = Unset;
         type TriggerAt = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `requester` field to Set
-    pub struct SetRequester<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRequester<S> {}
-    impl<S: State> State for SetRequester<S> {
-        type Requester = Set<members::requester>;
-        type CreatedAt = S::CreatedAt;
-        type TriggerAt = S::TriggerAt;
-        type Subject = S::Subject;
+        type Requester = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Requester = S::Requester;
         type CreatedAt = Set<members::created_at>;
         type TriggerAt = S::TriggerAt;
         type Subject = S::Subject;
+        type Requester = S::Requester;
     }
     ///State transition - sets the `trigger_at` field to Set
     pub struct SetTriggerAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTriggerAt<S> {}
     impl<S: State> State for SetTriggerAt<S> {
-        type Requester = S::Requester;
         type CreatedAt = S::CreatedAt;
         type TriggerAt = Set<members::trigger_at>;
         type Subject = S::Subject;
+        type Requester = S::Requester;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type Requester = S::Requester;
         type CreatedAt = S::CreatedAt;
         type TriggerAt = S::TriggerAt;
         type Subject = Set<members::subject>;
+        type Requester = S::Requester;
+    }
+    ///State transition - sets the `requester` field to Set
+    pub struct SetRequester<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRequester<S> {}
+    impl<S: State> State for SetRequester<S> {
+        type CreatedAt = S::CreatedAt;
+        type TriggerAt = S::TriggerAt;
+        type Subject = S::Subject;
+        type Requester = Set<members::requester>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `requester` field
-        pub struct requester(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `trigger_at` field
         pub struct trigger_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `requester` field
+        pub struct requester(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReminderBuilder<'a, S: reminder_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<bool>,
         Option<AtUri<'a>>,
@@ -213,7 +216,7 @@ pub struct ReminderBuilder<'a, S: reminder_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Reminder<'a> {
@@ -227,9 +230,9 @@ impl<'a> ReminderBuilder<'a, reminder_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReminderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,11 +247,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReminderBuilder<'a, reminder_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReminderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -256,12 +259,12 @@ where
 impl<'a, S: reminder_state::State> ReminderBuilder<'a, S> {
     /// Set the `occurred` field (optional)
     pub fn occurred(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `occurred` field to an Option value (optional)
     pub fn maybe_occurred(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -269,12 +272,12 @@ impl<'a, S: reminder_state::State> ReminderBuilder<'a, S> {
 impl<'a, S: reminder_state::State> ReminderBuilder<'a, S> {
     /// Set the `originUri` field (optional)
     pub fn origin_uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `originUri` field to an Option value (optional)
     pub fn maybe_origin_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -289,11 +292,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ReminderBuilder<'a, reminder_state::SetRequester<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ReminderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -308,11 +311,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReminderBuilder<'a, reminder_state::SetSubject<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ReminderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -327,11 +330,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReminderBuilder<'a, reminder_state::SetTriggerAt<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ReminderBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -339,20 +342,20 @@ where
 impl<'a, S> ReminderBuilder<'a, S>
 where
     S: reminder_state::State,
-    S::Requester: reminder_state::IsSet,
     S::CreatedAt: reminder_state::IsSet,
     S::TriggerAt: reminder_state::IsSet,
     S::Subject: reminder_state::IsSet,
+    S::Requester: reminder_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Reminder<'a> {
         Reminder {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            occurred: self.__unsafe_private_named.1.or_else(|| Some(false)),
-            origin_uri: self.__unsafe_private_named.2,
-            requester: self.__unsafe_private_named.3.unwrap(),
-            subject: self.__unsafe_private_named.4.unwrap(),
-            trigger_at: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            occurred: self._fields.1.or_else(|| Some(false)),
+            origin_uri: self._fields.2,
+            requester: self._fields.3.unwrap(),
+            subject: self._fields.4.unwrap(),
+            trigger_at: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -365,12 +368,12 @@ where
         >,
     ) -> Reminder<'a> {
         Reminder {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            occurred: self.__unsafe_private_named.1.or_else(|| Some(false)),
-            origin_uri: self.__unsafe_private_named.2,
-            requester: self.__unsafe_private_named.3.unwrap(),
-            subject: self.__unsafe_private_named.4.unwrap(),
-            trigger_at: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            occurred: self._fields.1.or_else(|| Some(false)),
+            origin_uri: self._fields.2,
+            requester: self._fields.3.unwrap(),
+            subject: self._fields.4.unwrap(),
+            trigger_at: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_mimonelu/klearsky/repost_mutes.rs b/crates/jacquard-api/src/net_mimonelu/klearsky/repost_mutes.rs
index 2719f846..0610dd1d 100644
--- a/crates/jacquard-api/src/net_mimonelu/klearsky/repost_mutes.rs
+++ b/crates/jacquard-api/src/net_mimonelu/klearsky/repost_mutes.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -175,9 +178,9 @@ pub mod repost_mutes_state {
 
 /// Builder for constructing an instance of this type
 pub struct RepostMutesBuilder<'a, S: repost_mutes_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Vec<repost_mutes::Subject<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Vec<repost_mutes::Subject<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RepostMutes<'a> {
@@ -191,9 +194,9 @@ impl<'a> RepostMutesBuilder<'a, repost_mutes_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RepostMutesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -208,11 +211,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RepostMutesBuilder<'a, repost_mutes_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RepostMutesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -227,11 +230,11 @@ where
         mut self,
         value: impl Into<Vec<repost_mutes::Subject<'a>>>,
     ) -> RepostMutesBuilder<'a, repost_mutes_state::SetSubjects<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RepostMutesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -245,8 +248,8 @@ where
     /// Build the final struct
     pub fn build(self) -> RepostMutes<'a> {
         RepostMutes {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subjects: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subjects: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -259,8 +262,8 @@ where
         >,
     ) -> RepostMutes<'a> {
         RepostMutes {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subjects: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subjects: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -426,9 +429,9 @@ pub mod subject_state {
 
 /// Builder for constructing an instance of this type
 pub struct SubjectBuilder<'a, S: subject_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Subject<'a> {
@@ -442,9 +445,9 @@ impl<'a> SubjectBuilder<'a, subject_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -459,11 +462,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SubjectBuilder<'a, subject_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -478,11 +481,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> SubjectBuilder<'a, subject_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -496,8 +499,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Subject<'a> {
         Subject {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -510,8 +513,8 @@ where
         >,
     ) -> Subject<'a> {
         Subject {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_mmatt/my/accounts.rs b/crates/jacquard-api/src/net_mmatt/my/accounts.rs
index 0ae22289..8d13581a 100644
--- a/crates/jacquard-api/src/net_mmatt/my/accounts.rs
+++ b/crates/jacquard-api/src/net_mmatt/my/accounts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -132,9 +135,9 @@ pub mod accounts_state {
 
 /// Builder for constructing an instance of this type
 pub struct AccountsBuilder<'a, S: accounts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<StrongRef<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<StrongRef<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Accounts<'a> {
@@ -148,9 +151,9 @@ impl<'a> AccountsBuilder<'a, accounts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AccountsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -165,11 +168,11 @@ where
         mut self,
         value: impl Into<Vec<StrongRef<'a>>>,
     ) -> AccountsBuilder<'a, accounts_state::SetAccounts<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AccountsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,7 +185,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Accounts<'a> {
         Accounts {
-            accounts: self.__unsafe_private_named.0.unwrap(),
+            accounts: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -195,7 +198,7 @@ where
         >,
     ) -> Accounts<'a> {
         Accounts {
-            accounts: self.__unsafe_private_named.0.unwrap(),
+            accounts: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_mmatt/right/now.rs b/crates/jacquard-api/src/net_mmatt/right/now.rs
index 5db04d09..2c164b65 100644
--- a/crates/jacquard-api/src/net_mmatt/right/now.rs
+++ b/crates/jacquard-api/src/net_mmatt/right/now.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -150,9 +153,9 @@ pub mod now_state {
 
 /// Builder for constructing an instance of this type
 pub struct NowBuilder<'a, S: now_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Now<'a> {
@@ -166,9 +169,9 @@ impl<'a> NowBuilder<'a, now_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,11 +186,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> NowBuilder<'a, now_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -195,12 +198,12 @@ where
 impl<'a, S: now_state::State> NowBuilder<'a, S> {
     /// Set the `emoji` field (optional)
     pub fn emoji(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `emoji` field to an Option value (optional)
     pub fn maybe_emoji(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> NowBuilder<'a, now_state::SetText<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         NowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -233,9 +236,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Now<'a> {
         Now {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            emoji: self.__unsafe_private_named.1,
-            text: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            emoji: self._fields.1,
+            text: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -248,9 +251,9 @@ where
         >,
     ) -> Now<'a> {
         Now {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            emoji: self.__unsafe_private_named.1,
-            text: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            emoji: self._fields.1,
+            text: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_mmatt/vitals/car.rs b/crates/jacquard-api/src/net_mmatt/vitals/car.rs
index 50f2c281..b9651d9f 100644
--- a/crates/jacquard-api/src/net_mmatt/vitals/car.rs
+++ b/crates/jacquard-api/src/net_mmatt/vitals/car.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -127,92 +130,92 @@ pub mod car_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type CarFuelRange;
+        type AmountRemaining;
         type CarTraveledDistance;
-        type CreatedAt;
         type CarPercentFuelRemaining;
-        type AmountRemaining;
-        type CarFuelRange;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type CarFuelRange = Unset;
+        type AmountRemaining = Unset;
         type CarTraveledDistance = Unset;
-        type CreatedAt = Unset;
         type CarPercentFuelRemaining = Unset;
-        type AmountRemaining = Unset;
-        type CarFuelRange = Unset;
+        type CreatedAt = Unset;
+    }
+    ///State transition - sets the `car_fuel_range` field to Set
+    pub struct SetCarFuelRange<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCarFuelRange<S> {}
+    impl<S: State> State for SetCarFuelRange<S> {
+        type CarFuelRange = Set<members::car_fuel_range>;
+        type AmountRemaining = S::AmountRemaining;
+        type CarTraveledDistance = S::CarTraveledDistance;
+        type CarPercentFuelRemaining = S::CarPercentFuelRemaining;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `amount_remaining` field to Set
+    pub struct SetAmountRemaining<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAmountRemaining<S> {}
+    impl<S: State> State for SetAmountRemaining<S> {
+        type CarFuelRange = S::CarFuelRange;
+        type AmountRemaining = Set<members::amount_remaining>;
+        type CarTraveledDistance = S::CarTraveledDistance;
+        type CarPercentFuelRemaining = S::CarPercentFuelRemaining;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `car_traveled_distance` field to Set
     pub struct SetCarTraveledDistance<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCarTraveledDistance<S> {}
     impl<S: State> State for SetCarTraveledDistance<S> {
-        type CarTraveledDistance = Set<members::car_traveled_distance>;
-        type CreatedAt = S::CreatedAt;
-        type CarPercentFuelRemaining = S::CarPercentFuelRemaining;
-        type AmountRemaining = S::AmountRemaining;
         type CarFuelRange = S::CarFuelRange;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CarTraveledDistance = S::CarTraveledDistance;
-        type CreatedAt = Set<members::created_at>;
-        type CarPercentFuelRemaining = S::CarPercentFuelRemaining;
         type AmountRemaining = S::AmountRemaining;
-        type CarFuelRange = S::CarFuelRange;
+        type CarTraveledDistance = Set<members::car_traveled_distance>;
+        type CarPercentFuelRemaining = S::CarPercentFuelRemaining;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `car_percent_fuel_remaining` field to Set
     pub struct SetCarPercentFuelRemaining<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCarPercentFuelRemaining<S> {}
     impl<S: State> State for SetCarPercentFuelRemaining<S> {
-        type CarTraveledDistance = S::CarTraveledDistance;
-        type CreatedAt = S::CreatedAt;
-        type CarPercentFuelRemaining = Set<members::car_percent_fuel_remaining>;
-        type AmountRemaining = S::AmountRemaining;
         type CarFuelRange = S::CarFuelRange;
-    }
-    ///State transition - sets the `amount_remaining` field to Set
-    pub struct SetAmountRemaining<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAmountRemaining<S> {}
-    impl<S: State> State for SetAmountRemaining<S> {
+        type AmountRemaining = S::AmountRemaining;
         type CarTraveledDistance = S::CarTraveledDistance;
+        type CarPercentFuelRemaining = Set<members::car_percent_fuel_remaining>;
         type CreatedAt = S::CreatedAt;
-        type CarPercentFuelRemaining = S::CarPercentFuelRemaining;
-        type AmountRemaining = Set<members::amount_remaining>;
-        type CarFuelRange = S::CarFuelRange;
     }
-    ///State transition - sets the `car_fuel_range` field to Set
-    pub struct SetCarFuelRange<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCarFuelRange<S> {}
-    impl<S: State> State for SetCarFuelRange<S> {
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CarFuelRange = S::CarFuelRange;
+        type AmountRemaining = S::AmountRemaining;
         type CarTraveledDistance = S::CarTraveledDistance;
-        type CreatedAt = S::CreatedAt;
         type CarPercentFuelRemaining = S::CarPercentFuelRemaining;
-        type AmountRemaining = S::AmountRemaining;
-        type CarFuelRange = Set<members::car_fuel_range>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `car_fuel_range` field
+        pub struct car_fuel_range(());
+        ///Marker type for the `amount_remaining` field
+        pub struct amount_remaining(());
         ///Marker type for the `car_traveled_distance` field
         pub struct car_traveled_distance(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `car_percent_fuel_remaining` field
         pub struct car_percent_fuel_remaining(());
-        ///Marker type for the `amount_remaining` field
-        pub struct amount_remaining(());
-        ///Marker type for the `car_fuel_range` field
-        pub struct car_fuel_range(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CarBuilder<'a, S: car_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<i64>,
         Option<CowStr<'a>>,
@@ -222,7 +225,7 @@ pub struct CarBuilder<'a, S: car_state::State> {
         Option<i64>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Car<'a> {
@@ -236,9 +239,9 @@ impl<'a> CarBuilder<'a, car_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CarBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,11 +256,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CarBuilder<'a, car_state::SetAmountRemaining<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CarBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -272,11 +275,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CarBuilder<'a, car_state::SetCarFuelRange<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CarBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -284,12 +287,12 @@ where
 impl<'a, S: car_state::State> CarBuilder<'a, S> {
     /// Set the `carMake` field (optional)
     pub fn car_make(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `carMake` field to an Option value (optional)
     pub fn maybe_car_make(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -297,12 +300,12 @@ impl<'a, S: car_state::State> CarBuilder<'a, S> {
 impl<'a, S: car_state::State> CarBuilder<'a, S> {
     /// Set the `carModel` field (optional)
     pub fn car_model(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `carModel` field to an Option value (optional)
     pub fn maybe_car_model(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -317,11 +320,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CarBuilder<'a, car_state::SetCarPercentFuelRemaining<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         CarBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -336,11 +339,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CarBuilder<'a, car_state::SetCarTraveledDistance<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         CarBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -348,12 +351,12 @@ where
 impl<'a, S: car_state::State> CarBuilder<'a, S> {
     /// Set the `carYear` field (optional)
     pub fn car_year(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `carYear` field to an Option value (optional)
     pub fn maybe_car_year(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -368,11 +371,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CarBuilder<'a, car_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         CarBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -380,23 +383,23 @@ where
 impl<'a, S> CarBuilder<'a, S>
 where
     S: car_state::State,
+    S::CarFuelRange: car_state::IsSet,
+    S::AmountRemaining: car_state::IsSet,
     S::CarTraveledDistance: car_state::IsSet,
-    S::CreatedAt: car_state::IsSet,
     S::CarPercentFuelRemaining: car_state::IsSet,
-    S::AmountRemaining: car_state::IsSet,
-    S::CarFuelRange: car_state::IsSet,
+    S::CreatedAt: car_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Car<'a> {
         Car {
-            amount_remaining: self.__unsafe_private_named.0.unwrap(),
-            car_fuel_range: self.__unsafe_private_named.1.unwrap(),
-            car_make: self.__unsafe_private_named.2,
-            car_model: self.__unsafe_private_named.3,
-            car_percent_fuel_remaining: self.__unsafe_private_named.4.unwrap(),
-            car_traveled_distance: self.__unsafe_private_named.5.unwrap(),
-            car_year: self.__unsafe_private_named.6,
-            created_at: self.__unsafe_private_named.7.unwrap(),
+            amount_remaining: self._fields.0.unwrap(),
+            car_fuel_range: self._fields.1.unwrap(),
+            car_make: self._fields.2,
+            car_model: self._fields.3,
+            car_percent_fuel_remaining: self._fields.4.unwrap(),
+            car_traveled_distance: self._fields.5.unwrap(),
+            car_year: self._fields.6,
+            created_at: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -409,14 +412,14 @@ where
         >,
     ) -> Car<'a> {
         Car {
-            amount_remaining: self.__unsafe_private_named.0.unwrap(),
-            car_fuel_range: self.__unsafe_private_named.1.unwrap(),
-            car_make: self.__unsafe_private_named.2,
-            car_model: self.__unsafe_private_named.3,
-            car_percent_fuel_remaining: self.__unsafe_private_named.4.unwrap(),
-            car_traveled_distance: self.__unsafe_private_named.5.unwrap(),
-            car_year: self.__unsafe_private_named.6,
-            created_at: self.__unsafe_private_named.7.unwrap(),
+            amount_remaining: self._fields.0.unwrap(),
+            car_fuel_range: self._fields.1.unwrap(),
+            car_make: self._fields.2,
+            car_model: self._fields.3,
+            car_percent_fuel_remaining: self._fields.4.unwrap(),
+            car_traveled_distance: self._fields.5.unwrap(),
+            car_year: self._fields.6,
+            created_at: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_shwilliam/hyphae/note.rs b/crates/jacquard-api/src/net_shwilliam/hyphae/note.rs
index 2b9d2620..b89b081e 100644
--- a/crates/jacquard-api/src/net_shwilliam/hyphae/note.rs
+++ b/crates/jacquard-api/src/net_shwilliam/hyphae/note.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -162,50 +165,50 @@ pub mod note_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Text;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Text = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Text = S::Text;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `text` field to Set
     pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetText<S> {}
     impl<S: State> State for SetText<S> {
-        type CreatedAt = S::CreatedAt;
         type Text = Set<members::text>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Text = S::Text;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `text` field
         pub struct text(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct NoteBuilder<'a, S: note_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Vec<StrongRef<'a>>>,
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Note<'a> {
@@ -219,9 +222,9 @@ impl<'a> NoteBuilder<'a, note_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -236,11 +239,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> NoteBuilder<'a, note_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -248,12 +251,12 @@ where
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `refs` field (optional)
     pub fn refs(mut self, value: impl Into<Option<Vec<StrongRef<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `refs` field to an Option value (optional)
     pub fn maybe_refs(mut self, value: Option<Vec<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -261,12 +264,12 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -281,11 +284,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> NoteBuilder<'a, note_state::SetText<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -293,16 +296,16 @@ where
 impl<'a, S> NoteBuilder<'a, S>
 where
     S: note_state::State,
-    S::CreatedAt: note_state::IsSet,
     S::Text: note_state::IsSet,
+    S::CreatedAt: note_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Note<'a> {
         Note {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            refs: self.__unsafe_private_named.1,
-            tags: self.__unsafe_private_named.2,
-            text: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            refs: self._fields.1,
+            tags: self._fields.2,
+            text: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -315,10 +318,10 @@ where
         >,
     ) -> Note<'a> {
         Note {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            refs: self.__unsafe_private_named.1,
-            tags: self.__unsafe_private_named.2,
-            text: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            refs: self._fields.1,
+            tags: self._fields.2,
+            text: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_wafrn/feed/bite.rs b/crates/jacquard-api/src/net_wafrn/feed/bite.rs
index 9d9f1457..a5835f38 100644
--- a/crates/jacquard-api/src/net_wafrn/feed/bite.rs
+++ b/crates/jacquard-api/src/net_wafrn/feed/bite.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -121,9 +124,9 @@ pub mod bite_state {
 
 /// Builder for constructing an instance of this type
 pub struct BiteBuilder<'a, S: bite_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Bite<'a> {
@@ -137,9 +140,9 @@ impl<'a> BiteBuilder<'a, bite_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BiteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -147,12 +150,12 @@ impl<'a> BiteBuilder<'a, bite_state::Empty> {
 impl<'a, S: bite_state::State> BiteBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -160,12 +163,12 @@ impl<'a, S: bite_state::State> BiteBuilder<'a, S> {
 impl<'a, S: bite_state::State> BiteBuilder<'a, S> {
     /// Set the `subject` field (optional)
     pub fn subject(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `subject` field to an Option value (optional)
     pub fn maybe_subject(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -177,8 +180,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Bite<'a> {
         Bite {
-            created_at: self.__unsafe_private_named.0,
-            subject: self.__unsafe_private_named.1,
+            created_at: self._fields.0,
+            subject: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -191,8 +194,8 @@ where
         >,
     ) -> Bite<'a> {
         Bite {
-            created_at: self.__unsafe_private_named.0,
-            subject: self.__unsafe_private_named.1,
+            created_at: self._fields.0,
+            subject: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/net_wafrn/feed/explode.rs b/crates/jacquard-api/src/net_wafrn/feed/explode.rs
index eb6d0e3d..aaa036c1 100644
--- a/crates/jacquard-api/src/net_wafrn/feed/explode.rs
+++ b/crates/jacquard-api/src/net_wafrn/feed/explode.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -122,9 +125,9 @@ pub mod explode_state {
 
 /// Builder for constructing an instance of this type
 pub struct ExplodeBuilder<'a, S: explode_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Explode<'a> {
@@ -138,9 +141,9 @@ impl<'a> ExplodeBuilder<'a, explode_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExplodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,12 +151,12 @@ impl<'a> ExplodeBuilder<'a, explode_state::Empty> {
 impl<'a, S: explode_state::State> ExplodeBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -161,12 +164,12 @@ impl<'a, S: explode_state::State> ExplodeBuilder<'a, S> {
 impl<'a, S: explode_state::State> ExplodeBuilder<'a, S> {
     /// Set the `subject` field (optional)
     pub fn subject(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `subject` field to an Option value (optional)
     pub fn maybe_subject(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -178,8 +181,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Explode<'a> {
         Explode {
-            created_at: self.__unsafe_private_named.0,
-            subject: self.__unsafe_private_named.1,
+            created_at: self._fields.0,
+            subject: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -192,8 +195,8 @@ where
         >,
     ) -> Explode<'a> {
         Explode {
-            created_at: self.__unsafe_private_named.0,
-            subject: self.__unsafe_private_named.1,
+            created_at: self._fields.0,
+            subject: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_cosmik/card.rs b/crates/jacquard-api/src/network_cosmik/card.rs
index 2ee90280..fb0301a5 100644
--- a/crates/jacquard-api/src/network_cosmik/card.rs
+++ b/crates/jacquard-api/src/network_cosmik/card.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -363,44 +366,44 @@ pub mod card_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Type;
         type Content;
+        type Type;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Type = Unset;
         type Content = Unset;
-    }
-    ///State transition - sets the `type` field to Set
-    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetType<S> {}
-    impl<S: State> State for SetType<S> {
-        type Type = Set<members::r#type>;
-        type Content = S::Content;
+        type Type = Unset;
     }
     ///State transition - sets the `content` field to Set
     pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContent<S> {}
     impl<S: State> State for SetContent<S> {
-        type Type = S::Type;
         type Content = Set<members::content>;
+        type Type = S::Type;
+    }
+    ///State transition - sets the `type` field to Set
+    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetType<S> {}
+    impl<S: State> State for SetType<S> {
+        type Content = S::Content;
+        type Type = Set<members::r#type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `type` field
-        pub struct r#type(());
         ///Marker type for the `content` field
         pub struct content(());
+        ///Marker type for the `type` field
+        pub struct r#type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CardBuilder<'a, S: card_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CardContent<'a>>,
         Option<Datetime>,
         Option<StrongRef<'a>>,
@@ -409,7 +412,7 @@ pub struct CardBuilder<'a, S: card_state::State> {
         Option<CardType<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Card<'a> {
@@ -423,9 +426,9 @@ impl<'a> CardBuilder<'a, card_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -440,11 +443,11 @@ where
         mut self,
         value: impl Into<CardContent<'a>>,
     ) -> CardBuilder<'a, card_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -452,12 +455,12 @@ where
 impl<'a, S: card_state::State> CardBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -465,12 +468,12 @@ impl<'a, S: card_state::State> CardBuilder<'a, S> {
 impl<'a, S: card_state::State> CardBuilder<'a, S> {
     /// Set the `originalCard` field (optional)
     pub fn original_card(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `originalCard` field to an Option value (optional)
     pub fn maybe_original_card(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -478,12 +481,12 @@ impl<'a, S: card_state::State> CardBuilder<'a, S> {
 impl<'a, S: card_state::State> CardBuilder<'a, S> {
     /// Set the `parentCard` field (optional)
     pub fn parent_card(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `parentCard` field to an Option value (optional)
     pub fn maybe_parent_card(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -491,12 +494,12 @@ impl<'a, S: card_state::State> CardBuilder<'a, S> {
 impl<'a, S: card_state::State> CardBuilder<'a, S> {
     /// Set the `provenance` field (optional)
     pub fn provenance(mut self, value: impl Into<Option<Provenance<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `provenance` field to an Option value (optional)
     pub fn maybe_provenance(mut self, value: Option<Provenance<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -511,11 +514,11 @@ where
         mut self,
         value: impl Into<CardType<'a>>,
     ) -> CardBuilder<'a, card_state::SetType<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         CardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -523,12 +526,12 @@ where
 impl<'a, S: card_state::State> CardBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -536,19 +539,19 @@ impl<'a, S: card_state::State> CardBuilder<'a, S> {
 impl<'a, S> CardBuilder<'a, S>
 where
     S: card_state::State,
-    S::Type: card_state::IsSet,
     S::Content: card_state::IsSet,
+    S::Type: card_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Card<'a> {
         Card {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1,
-            original_card: self.__unsafe_private_named.2,
-            parent_card: self.__unsafe_private_named.3,
-            provenance: self.__unsafe_private_named.4,
-            r#type: self.__unsafe_private_named.5.unwrap(),
-            url: self.__unsafe_private_named.6,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1,
+            original_card: self._fields.2,
+            parent_card: self._fields.3,
+            provenance: self._fields.4,
+            r#type: self._fields.5.unwrap(),
+            url: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -561,13 +564,13 @@ where
         >,
     ) -> Card<'a> {
         Card {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1,
-            original_card: self.__unsafe_private_named.2,
-            parent_card: self.__unsafe_private_named.3,
-            provenance: self.__unsafe_private_named.4,
-            r#type: self.__unsafe_private_named.5.unwrap(),
-            url: self.__unsafe_private_named.6,
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1,
+            original_card: self._fields.2,
+            parent_card: self._fields.3,
+            provenance: self._fields.4,
+            r#type: self._fields.5.unwrap(),
+            url: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
@@ -877,9 +880,9 @@ pub mod url_content_state {
 
 /// Builder for constructing an instance of this type
 pub struct UrlContentBuilder<'a, S: url_content_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<card::UrlMetadata<'a>>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<card::UrlMetadata<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UrlContent<'a> {
@@ -893,9 +896,9 @@ impl<'a> UrlContentBuilder<'a, url_content_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UrlContentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -903,12 +906,12 @@ impl<'a> UrlContentBuilder<'a, url_content_state::Empty> {
 impl<'a, S: url_content_state::State> UrlContentBuilder<'a, S> {
     /// Set the `metadata` field (optional)
     pub fn metadata(mut self, value: impl Into<Option<card::UrlMetadata<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `metadata` field to an Option value (optional)
     pub fn maybe_metadata(mut self, value: Option<card::UrlMetadata<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -923,11 +926,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> UrlContentBuilder<'a, url_content_state::SetUrl<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UrlContentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -940,8 +943,8 @@ where
     /// Build the final struct
     pub fn build(self) -> UrlContent<'a> {
         UrlContent {
-            metadata: self.__unsafe_private_named.0,
-            url: self.__unsafe_private_named.1.unwrap(),
+            metadata: self._fields.0,
+            url: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -954,8 +957,8 @@ where
         >,
     ) -> UrlContent<'a> {
         UrlContent {
-            metadata: self.__unsafe_private_named.0,
-            url: self.__unsafe_private_named.1.unwrap(),
+            metadata: self._fields.0,
+            url: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_cosmik/collection.rs b/crates/jacquard-api/src/network_cosmik/collection.rs
index 55127e6e..02a8025c 100644
--- a/crates/jacquard-api/src/network_cosmik/collection.rs
+++ b/crates/jacquard-api/src/network_cosmik/collection.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -274,8 +277,8 @@ pub mod collection_state {
 
 /// Builder for constructing an instance of this type
 pub struct CollectionBuilder<'a, S: collection_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CollectionAccessType<'a>>,
         Option<Vec<CowStr<'a>>>,
         Option<Datetime>,
@@ -283,7 +286,7 @@ pub struct CollectionBuilder<'a, S: collection_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Collection<'a> {
@@ -297,9 +300,9 @@ impl<'a> CollectionBuilder<'a, collection_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -314,11 +317,11 @@ where
         mut self,
         value: impl Into<CollectionAccessType<'a>>,
     ) -> CollectionBuilder<'a, collection_state::SetAccessType<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -326,12 +329,12 @@ where
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `collaborators` field (optional)
     pub fn collaborators(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `collaborators` field to an Option value (optional)
     pub fn maybe_collaborators(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -339,12 +342,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -352,12 +355,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -372,11 +375,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CollectionBuilder<'a, collection_state::SetName<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -384,12 +387,12 @@ where
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -403,12 +406,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Collection<'a> {
         Collection {
-            access_type: self.__unsafe_private_named.0.unwrap(),
-            collaborators: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            updated_at: self.__unsafe_private_named.5,
+            access_type: self._fields.0.unwrap(),
+            collaborators: self._fields.1,
+            created_at: self._fields.2,
+            description: self._fields.3,
+            name: self._fields.4.unwrap(),
+            updated_at: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -421,12 +424,12 @@ where
         >,
     ) -> Collection<'a> {
         Collection {
-            access_type: self.__unsafe_private_named.0.unwrap(),
-            collaborators: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            updated_at: self.__unsafe_private_named.5,
+            access_type: self._fields.0.unwrap(),
+            collaborators: self._fields.1,
+            created_at: self._fields.2,
+            description: self._fields.3,
+            name: self._fields.4.unwrap(),
+            updated_at: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_cosmik/collection_link.rs b/crates/jacquard-api/src/network_cosmik/collection_link.rs
index 4f49d40f..8363a744 100644
--- a/crates/jacquard-api/src/network_cosmik/collection_link.rs
+++ b/crates/jacquard-api/src/network_cosmik/collection_link.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -130,73 +133,73 @@ pub mod collection_link_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Card;
+        type Collection;
         type AddedAt;
         type AddedBy;
-        type Collection;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Card = Unset;
+        type Collection = Unset;
         type AddedAt = Unset;
         type AddedBy = Unset;
-        type Collection = Unset;
     }
     ///State transition - sets the `card` field to Set
     pub struct SetCard<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCard<S> {}
     impl<S: State> State for SetCard<S> {
         type Card = Set<members::card>;
+        type Collection = S::Collection;
+        type AddedAt = S::AddedAt;
+        type AddedBy = S::AddedBy;
+    }
+    ///State transition - sets the `collection` field to Set
+    pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCollection<S> {}
+    impl<S: State> State for SetCollection<S> {
+        type Card = S::Card;
+        type Collection = Set<members::collection>;
         type AddedAt = S::AddedAt;
         type AddedBy = S::AddedBy;
-        type Collection = S::Collection;
     }
     ///State transition - sets the `added_at` field to Set
     pub struct SetAddedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAddedAt<S> {}
     impl<S: State> State for SetAddedAt<S> {
         type Card = S::Card;
+        type Collection = S::Collection;
         type AddedAt = Set<members::added_at>;
         type AddedBy = S::AddedBy;
-        type Collection = S::Collection;
     }
     ///State transition - sets the `added_by` field to Set
     pub struct SetAddedBy<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAddedBy<S> {}
     impl<S: State> State for SetAddedBy<S> {
         type Card = S::Card;
-        type AddedAt = S::AddedAt;
-        type AddedBy = Set<members::added_by>;
         type Collection = S::Collection;
-    }
-    ///State transition - sets the `collection` field to Set
-    pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCollection<S> {}
-    impl<S: State> State for SetCollection<S> {
-        type Card = S::Card;
         type AddedAt = S::AddedAt;
-        type AddedBy = S::AddedBy;
-        type Collection = Set<members::collection>;
+        type AddedBy = Set<members::added_by>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `card` field
         pub struct card(());
+        ///Marker type for the `collection` field
+        pub struct collection(());
         ///Marker type for the `added_at` field
         pub struct added_at(());
         ///Marker type for the `added_by` field
         pub struct added_by(());
-        ///Marker type for the `collection` field
-        pub struct collection(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CollectionLinkBuilder<'a, S: collection_link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<StrongRef<'a>>,
@@ -205,7 +208,7 @@ pub struct CollectionLinkBuilder<'a, S: collection_link_state::State> {
         Option<StrongRef<'a>>,
         Option<Provenance<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CollectionLink<'a> {
@@ -219,9 +222,9 @@ impl<'a> CollectionLinkBuilder<'a, collection_link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -236,11 +239,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionLinkBuilder<'a, collection_link_state::SetAddedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -255,11 +258,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CollectionLinkBuilder<'a, collection_link_state::SetAddedBy<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CollectionLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -274,11 +277,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> CollectionLinkBuilder<'a, collection_link_state::SetCard<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CollectionLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -293,11 +296,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> CollectionLinkBuilder<'a, collection_link_state::SetCollection<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CollectionLinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -305,12 +308,12 @@ where
 impl<'a, S: collection_link_state::State> CollectionLinkBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -318,12 +321,12 @@ impl<'a, S: collection_link_state::State> CollectionLinkBuilder<'a, S> {
 impl<'a, S: collection_link_state::State> CollectionLinkBuilder<'a, S> {
     /// Set the `originalCard` field (optional)
     pub fn original_card(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `originalCard` field to an Option value (optional)
     pub fn maybe_original_card(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -331,12 +334,12 @@ impl<'a, S: collection_link_state::State> CollectionLinkBuilder<'a, S> {
 impl<'a, S: collection_link_state::State> CollectionLinkBuilder<'a, S> {
     /// Set the `provenance` field (optional)
     pub fn provenance(mut self, value: impl Into<Option<Provenance<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `provenance` field to an Option value (optional)
     pub fn maybe_provenance(mut self, value: Option<Provenance<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -345,20 +348,20 @@ impl<'a, S> CollectionLinkBuilder<'a, S>
 where
     S: collection_link_state::State,
     S::Card: collection_link_state::IsSet,
+    S::Collection: collection_link_state::IsSet,
     S::AddedAt: collection_link_state::IsSet,
     S::AddedBy: collection_link_state::IsSet,
-    S::Collection: collection_link_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CollectionLink<'a> {
         CollectionLink {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            added_by: self.__unsafe_private_named.1.unwrap(),
-            card: self.__unsafe_private_named.2.unwrap(),
-            collection: self.__unsafe_private_named.3.unwrap(),
-            created_at: self.__unsafe_private_named.4,
-            original_card: self.__unsafe_private_named.5,
-            provenance: self.__unsafe_private_named.6,
+            added_at: self._fields.0.unwrap(),
+            added_by: self._fields.1.unwrap(),
+            card: self._fields.2.unwrap(),
+            collection: self._fields.3.unwrap(),
+            created_at: self._fields.4,
+            original_card: self._fields.5,
+            provenance: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -371,13 +374,13 @@ where
         >,
     ) -> CollectionLink<'a> {
         CollectionLink {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            added_by: self.__unsafe_private_named.1.unwrap(),
-            card: self.__unsafe_private_named.2.unwrap(),
-            collection: self.__unsafe_private_named.3.unwrap(),
-            created_at: self.__unsafe_private_named.4,
-            original_card: self.__unsafe_private_named.5,
-            provenance: self.__unsafe_private_named.6,
+            added_at: self._fields.0.unwrap(),
+            added_by: self._fields.1.unwrap(),
+            card: self._fields.2.unwrap(),
+            collection: self._fields.3.unwrap(),
+            created_at: self._fields.4,
+            original_card: self._fields.5,
+            provenance: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_cosmik/collection_link_removal.rs b/crates/jacquard-api/src/network_cosmik/collection_link_removal.rs
index 1cbcf820..eda809db 100644
--- a/crates/jacquard-api/src/network_cosmik/collection_link_removal.rs
+++ b/crates/jacquard-api/src/network_cosmik/collection_link_removal.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -114,63 +117,59 @@ pub mod collection_link_removal_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type RemovedLink;
         type RemovedAt;
         type Collection;
+        type RemovedLink;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type RemovedLink = Unset;
         type RemovedAt = Unset;
         type Collection = Unset;
-    }
-    ///State transition - sets the `removed_link` field to Set
-    pub struct SetRemovedLink<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRemovedLink<S> {}
-    impl<S: State> State for SetRemovedLink<S> {
-        type RemovedLink = Set<members::removed_link>;
-        type RemovedAt = S::RemovedAt;
-        type Collection = S::Collection;
+        type RemovedLink = Unset;
     }
     ///State transition - sets the `removed_at` field to Set
     pub struct SetRemovedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRemovedAt<S> {}
     impl<S: State> State for SetRemovedAt<S> {
-        type RemovedLink = S::RemovedLink;
         type RemovedAt = Set<members::removed_at>;
         type Collection = S::Collection;
+        type RemovedLink = S::RemovedLink;
     }
     ///State transition - sets the `collection` field to Set
     pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCollection<S> {}
     impl<S: State> State for SetCollection<S> {
-        type RemovedLink = S::RemovedLink;
         type RemovedAt = S::RemovedAt;
         type Collection = Set<members::collection>;
+        type RemovedLink = S::RemovedLink;
+    }
+    ///State transition - sets the `removed_link` field to Set
+    pub struct SetRemovedLink<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRemovedLink<S> {}
+    impl<S: State> State for SetRemovedLink<S> {
+        type RemovedAt = S::RemovedAt;
+        type Collection = S::Collection;
+        type RemovedLink = Set<members::removed_link>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `removed_link` field
-        pub struct removed_link(());
         ///Marker type for the `removed_at` field
         pub struct removed_at(());
         ///Marker type for the `collection` field
         pub struct collection(());
+        ///Marker type for the `removed_link` field
+        pub struct removed_link(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CollectionLinkRemovalBuilder<'a, S: collection_link_removal_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<StrongRef<'a>>,
-        Option<Datetime>,
-        Option<StrongRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>, Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CollectionLinkRemoval<'a> {
@@ -187,9 +186,9 @@ impl<'a> CollectionLinkRemovalBuilder<'a, collection_link_removal_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionLinkRemovalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -207,11 +206,11 @@ where
         'a,
         collection_link_removal_state::SetCollection<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionLinkRemovalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -229,11 +228,11 @@ where
         'a,
         collection_link_removal_state::SetRemovedAt<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CollectionLinkRemovalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -251,11 +250,11 @@ where
         'a,
         collection_link_removal_state::SetRemovedLink<S>,
     > {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CollectionLinkRemovalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -263,16 +262,16 @@ where
 impl<'a, S> CollectionLinkRemovalBuilder<'a, S>
 where
     S: collection_link_removal_state::State,
-    S::RemovedLink: collection_link_removal_state::IsSet,
     S::RemovedAt: collection_link_removal_state::IsSet,
     S::Collection: collection_link_removal_state::IsSet,
+    S::RemovedLink: collection_link_removal_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CollectionLinkRemoval<'a> {
         CollectionLinkRemoval {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            removed_at: self.__unsafe_private_named.1.unwrap(),
-            removed_link: self.__unsafe_private_named.2.unwrap(),
+            collection: self._fields.0.unwrap(),
+            removed_at: self._fields.1.unwrap(),
+            removed_link: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -285,9 +284,9 @@ where
         >,
     ) -> CollectionLinkRemoval<'a> {
         CollectionLinkRemoval {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            removed_at: self.__unsafe_private_named.1.unwrap(),
-            removed_link: self.__unsafe_private_named.2.unwrap(),
+            collection: self._fields.0.unwrap(),
+            removed_at: self._fields.1.unwrap(),
+            removed_link: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_cosmik/connection.rs b/crates/jacquard-api/src/network_cosmik/connection.rs
index c7067dec..5f1f6f65 100644
--- a/crates/jacquard-api/src/network_cosmik/connection.rs
+++ b/crates/jacquard-api/src/network_cosmik/connection.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -135,44 +138,44 @@ pub mod connection_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Target;
         type Source;
+        type Target;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Target = Unset;
         type Source = Unset;
-    }
-    ///State transition - sets the `target` field to Set
-    pub struct SetTarget<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTarget<S> {}
-    impl<S: State> State for SetTarget<S> {
-        type Target = Set<members::target>;
-        type Source = S::Source;
+        type Target = Unset;
     }
     ///State transition - sets the `source` field to Set
     pub struct SetSource<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSource<S> {}
     impl<S: State> State for SetSource<S> {
-        type Target = S::Target;
         type Source = Set<members::source>;
+        type Target = S::Target;
+    }
+    ///State transition - sets the `target` field to Set
+    pub struct SetTarget<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTarget<S> {}
+    impl<S: State> State for SetTarget<S> {
+        type Source = S::Source;
+        type Target = Set<members::target>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `target` field
-        pub struct target(());
         ///Marker type for the `source` field
         pub struct source(());
+        ///Marker type for the `target` field
+        pub struct target(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ConnectionBuilder<'a, S: connection_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -180,7 +183,7 @@ pub struct ConnectionBuilder<'a, S: connection_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Connection<'a> {
@@ -194,9 +197,9 @@ impl<'a> ConnectionBuilder<'a, connection_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ConnectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,12 +207,12 @@ impl<'a> ConnectionBuilder<'a, connection_state::Empty> {
 impl<'a, S: connection_state::State> ConnectionBuilder<'a, S> {
     /// Set the `connectionType` field (optional)
     pub fn connection_type(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `connectionType` field to an Option value (optional)
     pub fn maybe_connection_type(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -217,12 +220,12 @@ impl<'a, S: connection_state::State> ConnectionBuilder<'a, S> {
 impl<'a, S: connection_state::State> ConnectionBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -230,12 +233,12 @@ impl<'a, S: connection_state::State> ConnectionBuilder<'a, S> {
 impl<'a, S: connection_state::State> ConnectionBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -250,11 +253,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ConnectionBuilder<'a, connection_state::SetSource<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ConnectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -269,11 +272,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ConnectionBuilder<'a, connection_state::SetTarget<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ConnectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -281,12 +284,12 @@ where
 impl<'a, S: connection_state::State> ConnectionBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -294,18 +297,18 @@ impl<'a, S: connection_state::State> ConnectionBuilder<'a, S> {
 impl<'a, S> ConnectionBuilder<'a, S>
 where
     S: connection_state::State,
-    S::Target: connection_state::IsSet,
     S::Source: connection_state::IsSet,
+    S::Target: connection_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Connection<'a> {
         Connection {
-            connection_type: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            note: self.__unsafe_private_named.2,
-            source: self.__unsafe_private_named.3.unwrap(),
-            target: self.__unsafe_private_named.4.unwrap(),
-            updated_at: self.__unsafe_private_named.5,
+            connection_type: self._fields.0,
+            created_at: self._fields.1,
+            note: self._fields.2,
+            source: self._fields.3.unwrap(),
+            target: self._fields.4.unwrap(),
+            updated_at: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -318,12 +321,12 @@ where
         >,
     ) -> Connection<'a> {
         Connection {
-            connection_type: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            note: self.__unsafe_private_named.2,
-            source: self.__unsafe_private_named.3.unwrap(),
-            target: self.__unsafe_private_named.4.unwrap(),
-            updated_at: self.__unsafe_private_named.5,
+            connection_type: self._fields.0,
+            created_at: self._fields.1,
+            note: self._fields.2,
+            source: self._fields.3.unwrap(),
+            target: self._fields.4.unwrap(),
+            updated_at: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_cosmik/follow.rs b/crates/jacquard-api/src/network_cosmik/follow.rs
index 7171a676..43464b5c 100644
--- a/crates/jacquard-api/src/network_cosmik/follow.rs
+++ b/crates/jacquard-api/src/network_cosmik/follow.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,9 +149,9 @@ pub mod follow_state {
 
 /// Builder for constructing an instance of this type
 pub struct FollowBuilder<'a, S: follow_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Follow<'a> {
@@ -162,9 +165,9 @@ impl<'a> FollowBuilder<'a, follow_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FollowBuilder<'a, follow_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> FollowBuilder<'a, follow_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,8 +219,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/actor.rs b/crates/jacquard-api/src/network_slices/actor.rs
index 5578b5cc..c8619a5b 100644
--- a/crates/jacquard-api/src/network_slices/actor.rs
+++ b/crates/jacquard-api/src/network_slices/actor.rs
@@ -7,7 +7,11 @@
 
 pub mod profile;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -147,15 +151,15 @@ pub mod profile_view_basic_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileViewBasicBuilder<'a, S: profile_view_basic_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
         Option<Handle<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileViewBasic<'a> {
@@ -169,9 +173,9 @@ impl<'a> ProfileViewBasicBuilder<'a, profile_view_basic_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,12 +183,12 @@ impl<'a> ProfileViewBasicBuilder<'a, profile_view_basic_state::Empty> {
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -192,12 +196,12 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -212,11 +216,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ProfileViewBasicBuilder<'a, profile_view_basic_state::SetDid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ProfileViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -224,12 +228,12 @@ where
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -244,11 +248,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> ProfileViewBasicBuilder<'a, profile_view_basic_state::SetHandle<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ProfileViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -262,11 +266,11 @@ where
     /// Build the final struct
     pub fn build(self) -> ProfileViewBasic<'a> {
         ProfileViewBasic {
-            avatar: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            did: self.__unsafe_private_named.2.unwrap(),
-            display_name: self.__unsafe_private_named.3,
-            handle: self.__unsafe_private_named.4.unwrap(),
+            avatar: self._fields.0,
+            description: self._fields.1,
+            did: self._fields.2.unwrap(),
+            display_name: self._fields.3,
+            handle: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -279,11 +283,11 @@ where
         >,
     ) -> ProfileViewBasic<'a> {
         ProfileViewBasic {
-            avatar: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            did: self.__unsafe_private_named.2.unwrap(),
-            display_name: self.__unsafe_private_named.3,
-            handle: self.__unsafe_private_named.4.unwrap(),
+            avatar: self._fields.0,
+            description: self._fields.1,
+            did: self._fields.2.unwrap(),
+            display_name: self._fields.3,
+            handle: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/actor/profile.rs b/crates/jacquard-api/src/network_slices/actor/profile.rs
index 3e805ba8..436145d9 100644
--- a/crates/jacquard-api/src/network_slices/actor/profile.rs
+++ b/crates/jacquard-api/src/network_slices/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -214,14 +217,14 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -235,9 +238,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -245,12 +248,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -258,12 +261,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -271,12 +274,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -284,12 +287,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -301,10 +304,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3,
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            description: self._fields.2,
+            display_name: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -317,10 +320,10 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3,
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            description: self._fields.2,
+            display_name: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/lexicon.rs b/crates/jacquard-api/src/network_slices/lexicon.rs
index 07412d65..dedf3e12 100644
--- a/crates/jacquard-api/src/network_slices/lexicon.rs
+++ b/crates/jacquard-api/src/network_slices/lexicon.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -151,74 +154,74 @@ pub mod lexicon_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Slice;
         type Nsid;
-        type Definitions;
+        type Slice;
         type CreatedAt;
+        type Definitions;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Slice = Unset;
         type Nsid = Unset;
-        type Definitions = Unset;
+        type Slice = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `slice` field to Set
-    pub struct SetSlice<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSlice<S> {}
-    impl<S: State> State for SetSlice<S> {
-        type Slice = Set<members::slice>;
-        type Nsid = S::Nsid;
-        type Definitions = S::Definitions;
-        type CreatedAt = S::CreatedAt;
+        type Definitions = Unset;
     }
     ///State transition - sets the `nsid` field to Set
     pub struct SetNsid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetNsid<S> {}
     impl<S: State> State for SetNsid<S> {
-        type Slice = S::Slice;
         type Nsid = Set<members::nsid>;
-        type Definitions = S::Definitions;
+        type Slice = S::Slice;
         type CreatedAt = S::CreatedAt;
+        type Definitions = S::Definitions;
     }
-    ///State transition - sets the `definitions` field to Set
-    pub struct SetDefinitions<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDefinitions<S> {}
-    impl<S: State> State for SetDefinitions<S> {
-        type Slice = S::Slice;
+    ///State transition - sets the `slice` field to Set
+    pub struct SetSlice<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSlice<S> {}
+    impl<S: State> State for SetSlice<S> {
         type Nsid = S::Nsid;
-        type Definitions = Set<members::definitions>;
+        type Slice = Set<members::slice>;
         type CreatedAt = S::CreatedAt;
+        type Definitions = S::Definitions;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Slice = S::Slice;
         type Nsid = S::Nsid;
-        type Definitions = S::Definitions;
+        type Slice = S::Slice;
         type CreatedAt = Set<members::created_at>;
+        type Definitions = S::Definitions;
+    }
+    ///State transition - sets the `definitions` field to Set
+    pub struct SetDefinitions<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDefinitions<S> {}
+    impl<S: State> State for SetDefinitions<S> {
+        type Nsid = S::Nsid;
+        type Slice = S::Slice;
+        type CreatedAt = S::CreatedAt;
+        type Definitions = Set<members::definitions>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `slice` field
-        pub struct slice(());
         ///Marker type for the `nsid` field
         pub struct nsid(());
-        ///Marker type for the `definitions` field
-        pub struct definitions(());
+        ///Marker type for the `slice` field
+        pub struct slice(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `definitions` field
+        pub struct definitions(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LexiconBuilder<'a, S: lexicon_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -227,7 +230,7 @@ pub struct LexiconBuilder<'a, S: lexicon_state::State> {
         Option<AtUri<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Lexicon<'a> {
@@ -241,9 +244,9 @@ impl<'a> LexiconBuilder<'a, lexicon_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LexiconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -258,11 +261,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LexiconBuilder<'a, lexicon_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LexiconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -277,11 +280,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LexiconBuilder<'a, lexicon_state::SetDefinitions<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LexiconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -289,12 +292,12 @@ where
 impl<'a, S: lexicon_state::State> LexiconBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -302,12 +305,12 @@ impl<'a, S: lexicon_state::State> LexiconBuilder<'a, S> {
 impl<'a, S: lexicon_state::State> LexiconBuilder<'a, S> {
     /// Set the `excludedFromSync` field (optional)
     pub fn excluded_from_sync(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `excludedFromSync` field to an Option value (optional)
     pub fn maybe_excluded_from_sync(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -322,11 +325,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LexiconBuilder<'a, lexicon_state::SetNsid<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         LexiconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -341,11 +344,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> LexiconBuilder<'a, lexicon_state::SetSlice<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         LexiconBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -353,12 +356,12 @@ where
 impl<'a, S: lexicon_state::State> LexiconBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -366,21 +369,21 @@ impl<'a, S: lexicon_state::State> LexiconBuilder<'a, S> {
 impl<'a, S> LexiconBuilder<'a, S>
 where
     S: lexicon_state::State,
-    S::Slice: lexicon_state::IsSet,
     S::Nsid: lexicon_state::IsSet,
-    S::Definitions: lexicon_state::IsSet,
+    S::Slice: lexicon_state::IsSet,
     S::CreatedAt: lexicon_state::IsSet,
+    S::Definitions: lexicon_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Lexicon<'a> {
         Lexicon {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            definitions: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            excluded_from_sync: self.__unsafe_private_named.3.or_else(|| Some(false)),
-            nsid: self.__unsafe_private_named.4.unwrap(),
-            slice: self.__unsafe_private_named.5.unwrap(),
-            updated_at: self.__unsafe_private_named.6,
+            created_at: self._fields.0.unwrap(),
+            definitions: self._fields.1.unwrap(),
+            description: self._fields.2,
+            excluded_from_sync: self._fields.3.or_else(|| Some(false)),
+            nsid: self._fields.4.unwrap(),
+            slice: self._fields.5.unwrap(),
+            updated_at: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -393,13 +396,13 @@ where
         >,
     ) -> Lexicon<'a> {
         Lexicon {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            definitions: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            excluded_from_sync: self.__unsafe_private_named.3.or_else(|| Some(false)),
-            nsid: self.__unsafe_private_named.4.unwrap(),
-            slice: self.__unsafe_private_named.5.unwrap(),
-            updated_at: self.__unsafe_private_named.6,
+            created_at: self._fields.0.unwrap(),
+            definitions: self._fields.1.unwrap(),
+            description: self._fields.2,
+            excluded_from_sync: self._fields.3.or_else(|| Some(false)),
+            nsid: self._fields.4.unwrap(),
+            slice: self._fields.5.unwrap(),
+            updated_at: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/slice.rs b/crates/jacquard-api/src/network_slices/slice.rs
index 531d6f26..0195e361 100644
--- a/crates/jacquard-api/src/network_slices/slice.rs
+++ b/crates/jacquard-api/src/network_slices/slice.rs
@@ -22,7 +22,11 @@ pub mod stats;
 pub mod sync_user_collections;
 pub mod update_o_auth_client;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -243,58 +247,58 @@ pub mod slice_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Name;
-        type CreatedAt;
         type Domain;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Name = Unset;
-        type CreatedAt = Unset;
         type Domain = Unset;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
         type Name = Set<members::name>;
-        type CreatedAt = S::CreatedAt;
-        type Domain = S::Domain;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type Name = S::Name;
-        type CreatedAt = Set<members::created_at>;
         type Domain = S::Domain;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `domain` field to Set
     pub struct SetDomain<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDomain<S> {}
     impl<S: State> State for SetDomain<S> {
         type Name = S::Name;
-        type CreatedAt = S::CreatedAt;
         type Domain = Set<members::domain>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Name = S::Name;
+        type Domain = S::Domain;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `domain` field
         pub struct domain(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SliceBuilder<'a, S: slice_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Slice<'a> {
@@ -308,9 +312,9 @@ impl<'a> SliceBuilder<'a, slice_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -325,11 +329,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SliceBuilder<'a, slice_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -344,11 +348,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SliceBuilder<'a, slice_state::SetDomain<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -363,11 +367,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SliceBuilder<'a, slice_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -376,15 +380,15 @@ impl<'a, S> SliceBuilder<'a, S>
 where
     S: slice_state::State,
     S::Name: slice_state::IsSet,
-    S::CreatedAt: slice_state::IsSet,
     S::Domain: slice_state::IsSet,
+    S::CreatedAt: slice_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Slice<'a> {
         Slice {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            domain: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            domain: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -397,9 +401,9 @@ where
         >,
     ) -> Slice<'a> {
         Slice {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            domain: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            domain: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -482,103 +486,103 @@ pub mod slice_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Domain;
-        type Cid;
-        type Uri;
         type Creator;
         type CreatedAt;
+        type Uri;
+        type Cid;
+        type Domain;
         type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Domain = Unset;
-        type Cid = Unset;
-        type Uri = Unset;
         type Creator = Unset;
         type CreatedAt = Unset;
+        type Uri = Unset;
+        type Cid = Unset;
+        type Domain = Unset;
         type Name = Unset;
     }
-    ///State transition - sets the `domain` field to Set
-    pub struct SetDomain<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDomain<S> {}
-    impl<S: State> State for SetDomain<S> {
-        type Domain = Set<members::domain>;
-        type Cid = S::Cid;
-        type Uri = S::Uri;
-        type Creator = S::Creator;
+    ///State transition - sets the `creator` field to Set
+    pub struct SetCreator<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreator<S> {}
+    impl<S: State> State for SetCreator<S> {
+        type Creator = Set<members::creator>;
         type CreatedAt = S::CreatedAt;
+        type Uri = S::Uri;
+        type Cid = S::Cid;
+        type Domain = S::Domain;
         type Name = S::Name;
     }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type Domain = S::Domain;
-        type Cid = Set<members::cid>;
-        type Uri = S::Uri;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
         type Creator = S::Creator;
-        type CreatedAt = S::CreatedAt;
+        type CreatedAt = Set<members::created_at>;
+        type Uri = S::Uri;
+        type Cid = S::Cid;
+        type Domain = S::Domain;
         type Name = S::Name;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Domain = S::Domain;
-        type Cid = S::Cid;
-        type Uri = Set<members::uri>;
         type Creator = S::Creator;
         type CreatedAt = S::CreatedAt;
+        type Uri = Set<members::uri>;
+        type Cid = S::Cid;
+        type Domain = S::Domain;
         type Name = S::Name;
     }
-    ///State transition - sets the `creator` field to Set
-    pub struct SetCreator<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreator<S> {}
-    impl<S: State> State for SetCreator<S> {
-        type Domain = S::Domain;
-        type Cid = S::Cid;
-        type Uri = S::Uri;
-        type Creator = Set<members::creator>;
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Creator = S::Creator;
         type CreatedAt = S::CreatedAt;
+        type Uri = S::Uri;
+        type Cid = Set<members::cid>;
+        type Domain = S::Domain;
         type Name = S::Name;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type Domain = S::Domain;
-        type Cid = S::Cid;
-        type Uri = S::Uri;
+    ///State transition - sets the `domain` field to Set
+    pub struct SetDomain<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDomain<S> {}
+    impl<S: State> State for SetDomain<S> {
         type Creator = S::Creator;
-        type CreatedAt = Set<members::created_at>;
+        type CreatedAt = S::CreatedAt;
+        type Uri = S::Uri;
+        type Cid = S::Cid;
+        type Domain = Set<members::domain>;
         type Name = S::Name;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Domain = S::Domain;
-        type Cid = S::Cid;
-        type Uri = S::Uri;
         type Creator = S::Creator;
         type CreatedAt = S::CreatedAt;
+        type Uri = S::Uri;
+        type Cid = S::Cid;
+        type Domain = S::Domain;
         type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `domain` field
-        pub struct domain(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `creator` field
         pub struct creator(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
+        ///Marker type for the `domain` field
+        pub struct domain(());
         ///Marker type for the `name` field
         pub struct name(());
     }
@@ -586,8 +590,8 @@ pub mod slice_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct SliceViewBuilder<'a, S: slice_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<Datetime>,
         Option<ProfileViewBasic<'a>>,
@@ -601,7 +605,7 @@ pub struct SliceViewBuilder<'a, S: slice_view_state::State> {
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SliceView<'a> {
@@ -615,8 +619,8 @@ impl<'a> SliceViewBuilder<'a, slice_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SliceViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -630,7 +634,7 @@ impl<'a> SliceViewBuilder<'a, slice_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -645,11 +649,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> SliceViewBuilder<'a, slice_view_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SliceViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -664,11 +668,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SliceViewBuilder<'a, slice_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SliceViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -683,11 +687,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> SliceViewBuilder<'a, slice_view_state::SetCreator<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SliceViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -702,11 +706,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SliceViewBuilder<'a, slice_view_state::SetDomain<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SliceViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -714,12 +718,12 @@ where
 impl<'a, S: slice_view_state::State> SliceViewBuilder<'a, S> {
     /// Set the `indexedActorCount` field (optional)
     pub fn indexed_actor_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `indexedActorCount` field to an Option value (optional)
     pub fn maybe_indexed_actor_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -727,12 +731,12 @@ impl<'a, S: slice_view_state::State> SliceViewBuilder<'a, S> {
 impl<'a, S: slice_view_state::State> SliceViewBuilder<'a, S> {
     /// Set the `indexedCollectionCount` field (optional)
     pub fn indexed_collection_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `indexedCollectionCount` field to an Option value (optional)
     pub fn maybe_indexed_collection_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -740,12 +744,12 @@ impl<'a, S: slice_view_state::State> SliceViewBuilder<'a, S> {
 impl<'a, S: slice_view_state::State> SliceViewBuilder<'a, S> {
     /// Set the `indexedRecordCount` field (optional)
     pub fn indexed_record_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `indexedRecordCount` field to an Option value (optional)
     pub fn maybe_indexed_record_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -760,11 +764,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SliceViewBuilder<'a, slice_view_state::SetName<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         SliceViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -775,7 +779,7 @@ impl<'a, S: slice_view_state::State> SliceViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<slice::SparklinePoint<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `sparkline` field to an Option value (optional)
@@ -783,7 +787,7 @@ impl<'a, S: slice_view_state::State> SliceViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<slice::SparklinePoint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -798,11 +802,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SliceViewBuilder<'a, slice_view_state::SetUri<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         SliceViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -810,12 +814,12 @@ where
 impl<'a, S: slice_view_state::State> SliceViewBuilder<'a, S> {
     /// Set the `waitlistInviteCount` field (optional)
     pub fn waitlist_invite_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `waitlistInviteCount` field to an Option value (optional)
     pub fn maybe_waitlist_invite_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -823,12 +827,12 @@ impl<'a, S: slice_view_state::State> SliceViewBuilder<'a, S> {
 impl<'a, S: slice_view_state::State> SliceViewBuilder<'a, S> {
     /// Set the `waitlistRequestCount` field (optional)
     pub fn waitlist_request_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `waitlistRequestCount` field to an Option value (optional)
     pub fn maybe_waitlist_request_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -836,28 +840,28 @@ impl<'a, S: slice_view_state::State> SliceViewBuilder<'a, S> {
 impl<'a, S> SliceViewBuilder<'a, S>
 where
     S: slice_view_state::State,
-    S::Domain: slice_view_state::IsSet,
-    S::Cid: slice_view_state::IsSet,
-    S::Uri: slice_view_state::IsSet,
     S::Creator: slice_view_state::IsSet,
     S::CreatedAt: slice_view_state::IsSet,
+    S::Uri: slice_view_state::IsSet,
+    S::Cid: slice_view_state::IsSet,
+    S::Domain: slice_view_state::IsSet,
     S::Name: slice_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SliceView<'a> {
         SliceView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            creator: self.__unsafe_private_named.2.unwrap(),
-            domain: self.__unsafe_private_named.3.unwrap(),
-            indexed_actor_count: self.__unsafe_private_named.4,
-            indexed_collection_count: self.__unsafe_private_named.5,
-            indexed_record_count: self.__unsafe_private_named.6,
-            name: self.__unsafe_private_named.7.unwrap(),
-            sparkline: self.__unsafe_private_named.8,
-            uri: self.__unsafe_private_named.9.unwrap(),
-            waitlist_invite_count: self.__unsafe_private_named.10,
-            waitlist_request_count: self.__unsafe_private_named.11,
+            cid: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            creator: self._fields.2.unwrap(),
+            domain: self._fields.3.unwrap(),
+            indexed_actor_count: self._fields.4,
+            indexed_collection_count: self._fields.5,
+            indexed_record_count: self._fields.6,
+            name: self._fields.7.unwrap(),
+            sparkline: self._fields.8,
+            uri: self._fields.9.unwrap(),
+            waitlist_invite_count: self._fields.10,
+            waitlist_request_count: self._fields.11,
             extra_data: Default::default(),
         }
     }
@@ -870,18 +874,18 @@ where
         >,
     ) -> SliceView<'a> {
         SliceView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            creator: self.__unsafe_private_named.2.unwrap(),
-            domain: self.__unsafe_private_named.3.unwrap(),
-            indexed_actor_count: self.__unsafe_private_named.4,
-            indexed_collection_count: self.__unsafe_private_named.5,
-            indexed_record_count: self.__unsafe_private_named.6,
-            name: self.__unsafe_private_named.7.unwrap(),
-            sparkline: self.__unsafe_private_named.8,
-            uri: self.__unsafe_private_named.9.unwrap(),
-            waitlist_invite_count: self.__unsafe_private_named.10,
-            waitlist_request_count: self.__unsafe_private_named.11,
+            cid: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            creator: self._fields.2.unwrap(),
+            domain: self._fields.3.unwrap(),
+            indexed_actor_count: self._fields.4,
+            indexed_collection_count: self._fields.5,
+            indexed_record_count: self._fields.6,
+            name: self._fields.7.unwrap(),
+            sparkline: self._fields.8,
+            uri: self._fields.9.unwrap(),
+            waitlist_invite_count: self._fields.10,
+            waitlist_request_count: self._fields.11,
             extra_data: Some(extra_data),
         }
     }
@@ -1094,9 +1098,9 @@ pub mod sparkline_point_state {
 
 /// Builder for constructing an instance of this type
 pub struct SparklinePointBuilder<'a, S: sparkline_point_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SparklinePoint<'a> {
@@ -1110,9 +1114,9 @@ impl<'a> SparklinePointBuilder<'a, sparkline_point_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SparklinePointBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1127,11 +1131,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SparklinePointBuilder<'a, sparkline_point_state::SetCount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SparklinePointBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1146,11 +1150,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SparklinePointBuilder<'a, sparkline_point_state::SetTimestamp<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SparklinePointBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1164,8 +1168,8 @@ where
     /// Build the final struct
     pub fn build(self) -> SparklinePoint<'a> {
         SparklinePoint {
-            count: self.__unsafe_private_named.0.unwrap(),
-            timestamp: self.__unsafe_private_named.1.unwrap(),
+            count: self._fields.0.unwrap(),
+            timestamp: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1178,8 +1182,8 @@ where
         >,
     ) -> SparklinePoint<'a> {
         SparklinePoint {
-            count: self.__unsafe_private_named.0.unwrap(),
-            timestamp: self.__unsafe_private_named.1.unwrap(),
+            count: self._fields.0.unwrap(),
+            timestamp: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/slice/clear_slice_records.rs b/crates/jacquard-api/src/network_slices/slice/clear_slice_records.rs
index d8a1268d..1376e263 100644
--- a/crates/jacquard-api/src/network_slices/slice/clear_slice_records.rs
+++ b/crates/jacquard-api/src/network_slices/slice/clear_slice_records.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/network_slices/slice/create_o_auth_client.rs b/crates/jacquard-api/src/network_slices/slice/create_o_auth_client.rs
index e6ad94f3..412909b9 100644
--- a/crates/jacquard-api/src/network_slices/slice/create_o_auth_client.rs
+++ b/crates/jacquard-api/src/network_slices/slice/create_o_auth_client.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::UriValue;
@@ -104,58 +107,58 @@ pub mod create_o_auth_client_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type SliceUri;
         type ClientName;
         type RedirectUris;
-        type SliceUri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type SliceUri = Unset;
         type ClientName = Unset;
         type RedirectUris = Unset;
-        type SliceUri = Unset;
+    }
+    ///State transition - sets the `slice_uri` field to Set
+    pub struct SetSliceUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSliceUri<S> {}
+    impl<S: State> State for SetSliceUri<S> {
+        type SliceUri = Set<members::slice_uri>;
+        type ClientName = S::ClientName;
+        type RedirectUris = S::RedirectUris;
     }
     ///State transition - sets the `client_name` field to Set
     pub struct SetClientName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetClientName<S> {}
     impl<S: State> State for SetClientName<S> {
+        type SliceUri = S::SliceUri;
         type ClientName = Set<members::client_name>;
         type RedirectUris = S::RedirectUris;
-        type SliceUri = S::SliceUri;
     }
     ///State transition - sets the `redirect_uris` field to Set
     pub struct SetRedirectUris<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRedirectUris<S> {}
     impl<S: State> State for SetRedirectUris<S> {
-        type ClientName = S::ClientName;
-        type RedirectUris = Set<members::redirect_uris>;
         type SliceUri = S::SliceUri;
-    }
-    ///State transition - sets the `slice_uri` field to Set
-    pub struct SetSliceUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSliceUri<S> {}
-    impl<S: State> State for SetSliceUri<S> {
         type ClientName = S::ClientName;
-        type RedirectUris = S::RedirectUris;
-        type SliceUri = Set<members::slice_uri>;
+        type RedirectUris = Set<members::redirect_uris>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `slice_uri` field
+        pub struct slice_uri(());
         ///Marker type for the `client_name` field
         pub struct client_name(());
         ///Marker type for the `redirect_uris` field
         pub struct redirect_uris(());
-        ///Marker type for the `slice_uri` field
-        pub struct slice_uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CreateOAuthClientBuilder<'a, S: create_o_auth_client_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<Vec<CowStr<'a>>>,
@@ -167,7 +170,7 @@ pub struct CreateOAuthClientBuilder<'a, S: create_o_auth_client_state::State> {
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CreateOAuthClient<'a> {
@@ -181,20 +184,9 @@ impl<'a> CreateOAuthClientBuilder<'a, create_o_auth_client_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreateOAuthClientBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,11 +201,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CreateOAuthClientBuilder<'a, create_o_auth_client_state::SetClientName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CreateOAuthClientBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,12 +213,12 @@ where
 impl<'a, S: create_o_auth_client_state::State> CreateOAuthClientBuilder<'a, S> {
     /// Set the `clientUri` field (optional)
     pub fn client_uri(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `clientUri` field to an Option value (optional)
     pub fn maybe_client_uri(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -234,12 +226,12 @@ impl<'a, S: create_o_auth_client_state::State> CreateOAuthClientBuilder<'a, S> {
 impl<'a, S: create_o_auth_client_state::State> CreateOAuthClientBuilder<'a, S> {
     /// Set the `grantTypes` field (optional)
     pub fn grant_types(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `grantTypes` field to an Option value (optional)
     pub fn maybe_grant_types(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -247,12 +239,12 @@ impl<'a, S: create_o_auth_client_state::State> CreateOAuthClientBuilder<'a, S> {
 impl<'a, S: create_o_auth_client_state::State> CreateOAuthClientBuilder<'a, S> {
     /// Set the `logoUri` field (optional)
     pub fn logo_uri(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `logoUri` field to an Option value (optional)
     pub fn maybe_logo_uri(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -260,12 +252,12 @@ impl<'a, S: create_o_auth_client_state::State> CreateOAuthClientBuilder<'a, S> {
 impl<'a, S: create_o_auth_client_state::State> CreateOAuthClientBuilder<'a, S> {
     /// Set the `policyUri` field (optional)
     pub fn policy_uri(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `policyUri` field to an Option value (optional)
     pub fn maybe_policy_uri(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -280,11 +272,11 @@ where
         mut self,
         value: impl Into<Vec<UriValue<'a>>>,
     ) -> CreateOAuthClientBuilder<'a, create_o_auth_client_state::SetRedirectUris<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         CreateOAuthClientBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -292,12 +284,12 @@ where
 impl<'a, S: create_o_auth_client_state::State> CreateOAuthClientBuilder<'a, S> {
     /// Set the `responseTypes` field (optional)
     pub fn response_types(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `responseTypes` field to an Option value (optional)
     pub fn maybe_response_types(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -305,12 +297,12 @@ impl<'a, S: create_o_auth_client_state::State> CreateOAuthClientBuilder<'a, S> {
 impl<'a, S: create_o_auth_client_state::State> CreateOAuthClientBuilder<'a, S> {
     /// Set the `scope` field (optional)
     pub fn scope(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `scope` field to an Option value (optional)
     pub fn maybe_scope(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -325,11 +317,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CreateOAuthClientBuilder<'a, create_o_auth_client_state::SetSliceUri<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         CreateOAuthClientBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -337,12 +329,12 @@ where
 impl<'a, S: create_o_auth_client_state::State> CreateOAuthClientBuilder<'a, S> {
     /// Set the `tosUri` field (optional)
     pub fn tos_uri(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `tosUri` field to an Option value (optional)
     pub fn maybe_tos_uri(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -350,23 +342,23 @@ impl<'a, S: create_o_auth_client_state::State> CreateOAuthClientBuilder<'a, S> {
 impl<'a, S> CreateOAuthClientBuilder<'a, S>
 where
     S: create_o_auth_client_state::State,
+    S::SliceUri: create_o_auth_client_state::IsSet,
     S::ClientName: create_o_auth_client_state::IsSet,
     S::RedirectUris: create_o_auth_client_state::IsSet,
-    S::SliceUri: create_o_auth_client_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CreateOAuthClient<'a> {
         CreateOAuthClient {
-            client_name: self.__unsafe_private_named.0.unwrap(),
-            client_uri: self.__unsafe_private_named.1,
-            grant_types: self.__unsafe_private_named.2,
-            logo_uri: self.__unsafe_private_named.3,
-            policy_uri: self.__unsafe_private_named.4,
-            redirect_uris: self.__unsafe_private_named.5.unwrap(),
-            response_types: self.__unsafe_private_named.6,
-            scope: self.__unsafe_private_named.7,
-            slice_uri: self.__unsafe_private_named.8.unwrap(),
-            tos_uri: self.__unsafe_private_named.9,
+            client_name: self._fields.0.unwrap(),
+            client_uri: self._fields.1,
+            grant_types: self._fields.2,
+            logo_uri: self._fields.3,
+            policy_uri: self._fields.4,
+            redirect_uris: self._fields.5.unwrap(),
+            response_types: self._fields.6,
+            scope: self._fields.7,
+            slice_uri: self._fields.8.unwrap(),
+            tos_uri: self._fields.9,
             extra_data: Default::default(),
         }
     }
@@ -379,16 +371,16 @@ where
         >,
     ) -> CreateOAuthClient<'a> {
         CreateOAuthClient {
-            client_name: self.__unsafe_private_named.0.unwrap(),
-            client_uri: self.__unsafe_private_named.1,
-            grant_types: self.__unsafe_private_named.2,
-            logo_uri: self.__unsafe_private_named.3,
-            policy_uri: self.__unsafe_private_named.4,
-            redirect_uris: self.__unsafe_private_named.5.unwrap(),
-            response_types: self.__unsafe_private_named.6,
-            scope: self.__unsafe_private_named.7,
-            slice_uri: self.__unsafe_private_named.8.unwrap(),
-            tos_uri: self.__unsafe_private_named.9,
+            client_name: self._fields.0.unwrap(),
+            client_uri: self._fields.1,
+            grant_types: self._fields.2,
+            logo_uri: self._fields.3,
+            policy_uri: self._fields.4,
+            redirect_uris: self._fields.5.unwrap(),
+            response_types: self._fields.6,
+            scope: self._fields.7,
+            slice_uri: self._fields.8.unwrap(),
+            tos_uri: self._fields.9,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/slice/delete_o_auth_client.rs b/crates/jacquard-api/src/network_slices/slice/delete_o_auth_client.rs
index f10324b3..1c249e61 100644
--- a/crates/jacquard-api/src/network_slices/slice/delete_o_auth_client.rs
+++ b/crates/jacquard-api/src/network_slices/slice/delete_o_auth_client.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/network_slices/slice/get_actors.rs b/crates/jacquard-api/src/network_slices/slice/get_actors.rs
index 71ba909a..8659377c 100644
--- a/crates/jacquard-api/src/network_slices/slice/get_actors.rs
+++ b/crates/jacquard-api/src/network_slices/slice/get_actors.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -128,64 +131,59 @@ pub mod actor_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Did;
-        type SliceUri;
         type IndexedAt;
+        type SliceUri;
+        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Did = Unset;
-        type SliceUri = Unset;
         type IndexedAt = Unset;
+        type SliceUri = Unset;
+        type Did = Unset;
     }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Did = Set<members::did>;
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
+        type IndexedAt = Set<members::indexed_at>;
         type SliceUri = S::SliceUri;
-        type IndexedAt = S::IndexedAt;
+        type Did = S::Did;
     }
     ///State transition - sets the `slice_uri` field to Set
     pub struct SetSliceUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSliceUri<S> {}
     impl<S: State> State for SetSliceUri<S> {
-        type Did = S::Did;
-        type SliceUri = Set<members::slice_uri>;
         type IndexedAt = S::IndexedAt;
-    }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
+        type SliceUri = Set<members::slice_uri>;
         type Did = S::Did;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type IndexedAt = S::IndexedAt;
         type SliceUri = S::SliceUri;
-        type IndexedAt = Set<members::indexed_at>;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `did` field
-        pub struct did(());
-        ///Marker type for the `slice_uri` field
-        pub struct slice_uri(());
         ///Marker type for the `indexed_at` field
         pub struct indexed_at(());
+        ///Marker type for the `slice_uri` field
+        pub struct slice_uri(());
+        ///Marker type for the `did` field
+        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ActorBuilder<'a, S: actor_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Did<'a>>,
-        Option<Handle<'a>>,
-        Option<Datetime>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Handle<'a>>, Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Actor<'a> {
@@ -199,9 +197,9 @@ impl<'a> ActorBuilder<'a, actor_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,11 +214,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ActorBuilder<'a, actor_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -228,12 +226,12 @@ where
 impl<'a, S: actor_state::State> ActorBuilder<'a, S> {
     /// Set the `handle` field (optional)
     pub fn handle(mut self, value: impl Into<Option<Handle<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `handle` field to an Option value (optional)
     pub fn maybe_handle(mut self, value: Option<Handle<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -248,11 +246,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ActorBuilder<'a, actor_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -267,11 +265,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ActorBuilder<'a, actor_state::SetSliceUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -279,17 +277,17 @@ where
 impl<'a, S> ActorBuilder<'a, S>
 where
     S: actor_state::State,
-    S::Did: actor_state::IsSet,
-    S::SliceUri: actor_state::IsSet,
     S::IndexedAt: actor_state::IsSet,
+    S::SliceUri: actor_state::IsSet,
+    S::Did: actor_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Actor<'a> {
         Actor {
-            did: self.__unsafe_private_named.0.unwrap(),
-            handle: self.__unsafe_private_named.1,
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            slice_uri: self.__unsafe_private_named.3.unwrap(),
+            did: self._fields.0.unwrap(),
+            handle: self._fields.1,
+            indexed_at: self._fields.2.unwrap(),
+            slice_uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -299,10 +297,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Actor<'a> {
         Actor {
-            did: self.__unsafe_private_named.0.unwrap(),
-            handle: self.__unsafe_private_named.1,
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            slice_uri: self.__unsafe_private_named.3.unwrap(),
+            did: self._fields.0.unwrap(),
+            handle: self._fields.1,
+            indexed_at: self._fields.2.unwrap(),
+            slice_uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/slice/get_jetstream_logs.rs b/crates/jacquard-api/src/network_slices/slice/get_jetstream_logs.rs
index 34477ab5..43e6bf6c 100644
--- a/crates/jacquard-api/src/network_slices/slice/get_jetstream_logs.rs
+++ b/crates/jacquard-api/src/network_slices/slice/get_jetstream_logs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -82,9 +85,9 @@ pub mod get_jetstream_logs_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetJetstreamLogsBuilder<'a, S: get_jetstream_logs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetJetstreamLogs<'a> {
@@ -98,9 +101,9 @@ impl<'a> GetJetstreamLogsBuilder<'a, get_jetstream_logs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetJetstreamLogsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -108,12 +111,12 @@ impl<'a> GetJetstreamLogsBuilder<'a, get_jetstream_logs_state::Empty> {
 impl<'a, S: get_jetstream_logs_state::State> GetJetstreamLogsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -121,12 +124,12 @@ impl<'a, S: get_jetstream_logs_state::State> GetJetstreamLogsBuilder<'a, S> {
 impl<'a, S: get_jetstream_logs_state::State> GetJetstreamLogsBuilder<'a, S> {
     /// Set the `slice` field (optional)
     pub fn slice(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `slice` field to an Option value (optional)
     pub fn maybe_slice(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -138,8 +141,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetJetstreamLogs<'a> {
         GetJetstreamLogs {
-            limit: self.__unsafe_private_named.0,
-            slice: self.__unsafe_private_named.1,
+            limit: self._fields.0,
+            slice: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/network_slices/slice/get_jetstream_status.rs b/crates/jacquard-api/src/network_slices/slice/get_jetstream_status.rs
index bc301b3b..a15d6d6d 100644
--- a/crates/jacquard-api/src/network_slices/slice/get_jetstream_status.rs
+++ b/crates/jacquard-api/src/network_slices/slice/get_jetstream_status.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/network_slices/slice/get_job_logs.rs b/crates/jacquard-api/src/network_slices/slice/get_job_logs.rs
index 4be5cb72..0071c8e5 100644
--- a/crates/jacquard-api/src/network_slices/slice/get_job_logs.rs
+++ b/crates/jacquard-api/src/network_slices/slice/get_job_logs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -127,92 +130,92 @@ pub mod log_entry_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type LogType;
-        type Message;
-        type Level;
         type Id;
         type CreatedAt;
+        type Level;
+        type LogType;
+        type Message;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type LogType = Unset;
-        type Message = Unset;
-        type Level = Unset;
         type Id = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `log_type` field to Set
-    pub struct SetLogType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLogType<S> {}
-    impl<S: State> State for SetLogType<S> {
-        type LogType = Set<members::log_type>;
-        type Message = S::Message;
-        type Level = S::Level;
-        type Id = S::Id;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `message` field to Set
-    pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMessage<S> {}
-    impl<S: State> State for SetMessage<S> {
-        type LogType = S::LogType;
-        type Message = Set<members::message>;
-        type Level = S::Level;
-        type Id = S::Id;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `level` field to Set
-    pub struct SetLevel<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLevel<S> {}
-    impl<S: State> State for SetLevel<S> {
-        type LogType = S::LogType;
-        type Message = S::Message;
-        type Level = Set<members::level>;
-        type Id = S::Id;
-        type CreatedAt = S::CreatedAt;
+        type Level = Unset;
+        type LogType = Unset;
+        type Message = Unset;
     }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetId<S> {}
     impl<S: State> State for SetId<S> {
-        type LogType = S::LogType;
-        type Message = S::Message;
-        type Level = S::Level;
         type Id = Set<members::id>;
         type CreatedAt = S::CreatedAt;
+        type Level = S::Level;
+        type LogType = S::LogType;
+        type Message = S::Message;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Id = S::Id;
+        type CreatedAt = Set<members::created_at>;
+        type Level = S::Level;
+        type LogType = S::LogType;
+        type Message = S::Message;
+    }
+    ///State transition - sets the `level` field to Set
+    pub struct SetLevel<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLevel<S> {}
+    impl<S: State> State for SetLevel<S> {
+        type Id = S::Id;
+        type CreatedAt = S::CreatedAt;
+        type Level = Set<members::level>;
         type LogType = S::LogType;
         type Message = S::Message;
+    }
+    ///State transition - sets the `log_type` field to Set
+    pub struct SetLogType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLogType<S> {}
+    impl<S: State> State for SetLogType<S> {
+        type Id = S::Id;
+        type CreatedAt = S::CreatedAt;
         type Level = S::Level;
+        type LogType = Set<members::log_type>;
+        type Message = S::Message;
+    }
+    ///State transition - sets the `message` field to Set
+    pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMessage<S> {}
+    impl<S: State> State for SetMessage<S> {
         type Id = S::Id;
-        type CreatedAt = Set<members::created_at>;
+        type CreatedAt = S::CreatedAt;
+        type Level = S::Level;
+        type LogType = S::LogType;
+        type Message = Set<members::message>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `log_type` field
-        pub struct log_type(());
-        ///Marker type for the `message` field
-        pub struct message(());
-        ///Marker type for the `level` field
-        pub struct level(());
         ///Marker type for the `id` field
         pub struct id(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `level` field
+        pub struct level(());
+        ///Marker type for the `log_type` field
+        pub struct log_type(());
+        ///Marker type for the `message` field
+        pub struct message(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LogEntryBuilder<'a, S: log_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<i64>,
         Option<CowStr<'a>>,
@@ -223,7 +226,7 @@ pub struct LogEntryBuilder<'a, S: log_entry_state::State> {
         Option<CowStr<'a>>,
         Option<Did<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LogEntry<'a> {
@@ -237,19 +240,9 @@ impl<'a> LogEntryBuilder<'a, log_entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LogEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -264,11 +257,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LogEntryBuilder<'a, log_entry_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LogEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -283,11 +276,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> LogEntryBuilder<'a, log_entry_state::SetId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LogEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -295,12 +288,12 @@ where
 impl<'a, S: log_entry_state::State> LogEntryBuilder<'a, S> {
     /// Set the `jobId` field (optional)
     pub fn job_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `jobId` field to an Option value (optional)
     pub fn maybe_job_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -315,11 +308,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogEntryBuilder<'a, log_entry_state::SetLevel<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LogEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -334,11 +327,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogEntryBuilder<'a, log_entry_state::SetLogType<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         LogEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -353,11 +346,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogEntryBuilder<'a, log_entry_state::SetMessage<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         LogEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -365,12 +358,12 @@ where
 impl<'a, S: log_entry_state::State> LogEntryBuilder<'a, S> {
     /// Set the `metadata` field (optional)
     pub fn metadata(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `metadata` field to an Option value (optional)
     pub fn maybe_metadata(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -378,12 +371,12 @@ impl<'a, S: log_entry_state::State> LogEntryBuilder<'a, S> {
 impl<'a, S: log_entry_state::State> LogEntryBuilder<'a, S> {
     /// Set the `sliceUri` field (optional)
     pub fn slice_uri(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `sliceUri` field to an Option value (optional)
     pub fn maybe_slice_uri(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -391,12 +384,12 @@ impl<'a, S: log_entry_state::State> LogEntryBuilder<'a, S> {
 impl<'a, S: log_entry_state::State> LogEntryBuilder<'a, S> {
     /// Set the `userDid` field (optional)
     pub fn user_did(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `userDid` field to an Option value (optional)
     pub fn maybe_user_did(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -404,24 +397,24 @@ impl<'a, S: log_entry_state::State> LogEntryBuilder<'a, S> {
 impl<'a, S> LogEntryBuilder<'a, S>
 where
     S: log_entry_state::State,
-    S::LogType: log_entry_state::IsSet,
-    S::Message: log_entry_state::IsSet,
-    S::Level: log_entry_state::IsSet,
     S::Id: log_entry_state::IsSet,
     S::CreatedAt: log_entry_state::IsSet,
+    S::Level: log_entry_state::IsSet,
+    S::LogType: log_entry_state::IsSet,
+    S::Message: log_entry_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LogEntry<'a> {
         LogEntry {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            id: self.__unsafe_private_named.1.unwrap(),
-            job_id: self.__unsafe_private_named.2,
-            level: self.__unsafe_private_named.3.unwrap(),
-            log_type: self.__unsafe_private_named.4.unwrap(),
-            message: self.__unsafe_private_named.5.unwrap(),
-            metadata: self.__unsafe_private_named.6,
-            slice_uri: self.__unsafe_private_named.7,
-            user_did: self.__unsafe_private_named.8,
+            created_at: self._fields.0.unwrap(),
+            id: self._fields.1.unwrap(),
+            job_id: self._fields.2,
+            level: self._fields.3.unwrap(),
+            log_type: self._fields.4.unwrap(),
+            message: self._fields.5.unwrap(),
+            metadata: self._fields.6,
+            slice_uri: self._fields.7,
+            user_did: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -431,15 +424,15 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> LogEntry<'a> {
         LogEntry {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            id: self.__unsafe_private_named.1.unwrap(),
-            job_id: self.__unsafe_private_named.2,
-            level: self.__unsafe_private_named.3.unwrap(),
-            log_type: self.__unsafe_private_named.4.unwrap(),
-            message: self.__unsafe_private_named.5.unwrap(),
-            metadata: self.__unsafe_private_named.6,
-            slice_uri: self.__unsafe_private_named.7,
-            user_did: self.__unsafe_private_named.8,
+            created_at: self._fields.0.unwrap(),
+            id: self._fields.1.unwrap(),
+            job_id: self._fields.2,
+            level: self._fields.3.unwrap(),
+            log_type: self._fields.4.unwrap(),
+            message: self._fields.5.unwrap(),
+            metadata: self._fields.6,
+            slice_uri: self._fields.7,
+            user_did: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
@@ -620,9 +613,9 @@ pub mod get_job_logs_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetJobLogsBuilder<'a, S: get_job_logs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetJobLogs<'a> {
@@ -636,9 +629,9 @@ impl<'a> GetJobLogsBuilder<'a, get_job_logs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetJobLogsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -653,11 +646,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetJobLogsBuilder<'a, get_job_logs_state::SetJobId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetJobLogsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -665,12 +658,12 @@ where
 impl<'a, S: get_job_logs_state::State> GetJobLogsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -683,8 +676,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetJobLogs<'a> {
         GetJobLogs {
-            job_id: self.__unsafe_private_named.0.unwrap(),
-            limit: self.__unsafe_private_named.1,
+            job_id: self._fields.0.unwrap(),
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/network_slices/slice/get_job_status.rs b/crates/jacquard-api/src/network_slices/slice/get_job_status.rs
index f0e761cd..daa3a66d 100644
--- a/crates/jacquard-api/src/network_slices/slice/get_job_status.rs
+++ b/crates/jacquard-api/src/network_slices/slice/get_job_status.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -152,74 +155,74 @@ pub mod job_status_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type RetryCount;
-        type CreatedAt;
         type Status;
+        type CreatedAt;
         type JobId;
+        type RetryCount;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type RetryCount = Unset;
-        type CreatedAt = Unset;
         type Status = Unset;
+        type CreatedAt = Unset;
         type JobId = Unset;
+        type RetryCount = Unset;
     }
-    ///State transition - sets the `retry_count` field to Set
-    pub struct SetRetryCount<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRetryCount<S> {}
-    impl<S: State> State for SetRetryCount<S> {
-        type RetryCount = Set<members::retry_count>;
+    ///State transition - sets the `status` field to Set
+    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStatus<S> {}
+    impl<S: State> State for SetStatus<S> {
+        type Status = Set<members::status>;
         type CreatedAt = S::CreatedAt;
-        type Status = S::Status;
         type JobId = S::JobId;
+        type RetryCount = S::RetryCount;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type RetryCount = S::RetryCount;
-        type CreatedAt = Set<members::created_at>;
         type Status = S::Status;
+        type CreatedAt = Set<members::created_at>;
         type JobId = S::JobId;
-    }
-    ///State transition - sets the `status` field to Set
-    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStatus<S> {}
-    impl<S: State> State for SetStatus<S> {
         type RetryCount = S::RetryCount;
-        type CreatedAt = S::CreatedAt;
-        type Status = Set<members::status>;
-        type JobId = S::JobId;
     }
     ///State transition - sets the `job_id` field to Set
     pub struct SetJobId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetJobId<S> {}
     impl<S: State> State for SetJobId<S> {
-        type RetryCount = S::RetryCount;
-        type CreatedAt = S::CreatedAt;
         type Status = S::Status;
+        type CreatedAt = S::CreatedAt;
         type JobId = Set<members::job_id>;
+        type RetryCount = S::RetryCount;
+    }
+    ///State transition - sets the `retry_count` field to Set
+    pub struct SetRetryCount<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRetryCount<S> {}
+    impl<S: State> State for SetRetryCount<S> {
+        type Status = S::Status;
+        type CreatedAt = S::CreatedAt;
+        type JobId = S::JobId;
+        type RetryCount = Set<members::retry_count>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `retry_count` field
-        pub struct retry_count(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `status` field
         pub struct status(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `job_id` field
         pub struct job_id(());
+        ///Marker type for the `retry_count` field
+        pub struct retry_count(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct JobStatusBuilder<'a, S: job_status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -229,7 +232,7 @@ pub struct JobStatusBuilder<'a, S: job_status_state::State> {
         Option<Datetime>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> JobStatus<'a> {
@@ -243,9 +246,9 @@ impl<'a> JobStatusBuilder<'a, job_status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         JobStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,12 +256,12 @@ impl<'a> JobStatusBuilder<'a, job_status_state::Empty> {
 impl<'a, S: job_status_state::State> JobStatusBuilder<'a, S> {
     /// Set the `completedAt` field (optional)
     pub fn completed_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `completedAt` field to an Option value (optional)
     pub fn maybe_completed_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -273,11 +276,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> JobStatusBuilder<'a, job_status_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         JobStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -285,12 +288,12 @@ where
 impl<'a, S: job_status_state::State> JobStatusBuilder<'a, S> {
     /// Set the `error` field (optional)
     pub fn error(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `error` field to an Option value (optional)
     pub fn maybe_error(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -305,11 +308,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> JobStatusBuilder<'a, job_status_state::SetJobId<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         JobStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -320,7 +323,7 @@ impl<'a, S: job_status_state::State> JobStatusBuilder<'a, S> {
         mut self,
         value: impl Into<Option<get_job_status::SyncJobResult<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `result` field to an Option value (optional)
@@ -328,7 +331,7 @@ impl<'a, S: job_status_state::State> JobStatusBuilder<'a, S> {
         mut self,
         value: Option<get_job_status::SyncJobResult<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -343,11 +346,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> JobStatusBuilder<'a, job_status_state::SetRetryCount<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         JobStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -355,12 +358,12 @@ where
 impl<'a, S: job_status_state::State> JobStatusBuilder<'a, S> {
     /// Set the `startedAt` field (optional)
     pub fn started_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `startedAt` field to an Option value (optional)
     pub fn maybe_started_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -375,11 +378,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> JobStatusBuilder<'a, job_status_state::SetStatus<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         JobStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -387,22 +390,22 @@ where
 impl<'a, S> JobStatusBuilder<'a, S>
 where
     S: job_status_state::State,
-    S::RetryCount: job_status_state::IsSet,
-    S::CreatedAt: job_status_state::IsSet,
     S::Status: job_status_state::IsSet,
+    S::CreatedAt: job_status_state::IsSet,
     S::JobId: job_status_state::IsSet,
+    S::RetryCount: job_status_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> JobStatus<'a> {
         JobStatus {
-            completed_at: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            error: self.__unsafe_private_named.2,
-            job_id: self.__unsafe_private_named.3.unwrap(),
-            result: self.__unsafe_private_named.4,
-            retry_count: self.__unsafe_private_named.5.unwrap(),
-            started_at: self.__unsafe_private_named.6,
-            status: self.__unsafe_private_named.7.unwrap(),
+            completed_at: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            error: self._fields.2,
+            job_id: self._fields.3.unwrap(),
+            result: self._fields.4,
+            retry_count: self._fields.5.unwrap(),
+            started_at: self._fields.6,
+            status: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -415,14 +418,14 @@ where
         >,
     ) -> JobStatus<'a> {
         JobStatus {
-            completed_at: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            error: self.__unsafe_private_named.2,
-            job_id: self.__unsafe_private_named.3.unwrap(),
-            result: self.__unsafe_private_named.4,
-            retry_count: self.__unsafe_private_named.5.unwrap(),
-            started_at: self.__unsafe_private_named.6,
-            status: self.__unsafe_private_named.7.unwrap(),
+            completed_at: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            error: self._fields.2,
+            job_id: self._fields.3.unwrap(),
+            result: self._fields.4,
+            retry_count: self._fields.5.unwrap(),
+            started_at: self._fields.6,
+            status: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -654,9 +657,9 @@ pub mod get_job_status_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetJobStatusBuilder<'a, S: get_job_status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetJobStatus<'a> {
@@ -670,9 +673,9 @@ impl<'a> GetJobStatusBuilder<'a, get_job_status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetJobStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -687,11 +690,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetJobStatusBuilder<'a, get_job_status_state::SetJobId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetJobStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -704,7 +707,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetJobStatus<'a> {
         GetJobStatus {
-            job_id: self.__unsafe_private_named.0.unwrap(),
+            job_id: self._fields.0.unwrap(),
         }
     }
 }
@@ -719,99 +722,99 @@ pub mod sync_job_result_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Success;
+        type CollectionsSynced;
         type TotalRecords;
         type ReposProcessed;
         type Message;
-        type CollectionsSynced;
-        type Success;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Success = Unset;
+        type CollectionsSynced = Unset;
         type TotalRecords = Unset;
         type ReposProcessed = Unset;
         type Message = Unset;
-        type CollectionsSynced = Unset;
-        type Success = Unset;
+    }
+    ///State transition - sets the `success` field to Set
+    pub struct SetSuccess<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSuccess<S> {}
+    impl<S: State> State for SetSuccess<S> {
+        type Success = Set<members::success>;
+        type CollectionsSynced = S::CollectionsSynced;
+        type TotalRecords = S::TotalRecords;
+        type ReposProcessed = S::ReposProcessed;
+        type Message = S::Message;
+    }
+    ///State transition - sets the `collections_synced` field to Set
+    pub struct SetCollectionsSynced<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCollectionsSynced<S> {}
+    impl<S: State> State for SetCollectionsSynced<S> {
+        type Success = S::Success;
+        type CollectionsSynced = Set<members::collections_synced>;
+        type TotalRecords = S::TotalRecords;
+        type ReposProcessed = S::ReposProcessed;
+        type Message = S::Message;
     }
     ///State transition - sets the `total_records` field to Set
     pub struct SetTotalRecords<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTotalRecords<S> {}
     impl<S: State> State for SetTotalRecords<S> {
+        type Success = S::Success;
+        type CollectionsSynced = S::CollectionsSynced;
         type TotalRecords = Set<members::total_records>;
         type ReposProcessed = S::ReposProcessed;
         type Message = S::Message;
-        type CollectionsSynced = S::CollectionsSynced;
-        type Success = S::Success;
     }
     ///State transition - sets the `repos_processed` field to Set
     pub struct SetReposProcessed<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetReposProcessed<S> {}
     impl<S: State> State for SetReposProcessed<S> {
+        type Success = S::Success;
+        type CollectionsSynced = S::CollectionsSynced;
         type TotalRecords = S::TotalRecords;
         type ReposProcessed = Set<members::repos_processed>;
         type Message = S::Message;
-        type CollectionsSynced = S::CollectionsSynced;
-        type Success = S::Success;
     }
     ///State transition - sets the `message` field to Set
     pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMessage<S> {}
     impl<S: State> State for SetMessage<S> {
-        type TotalRecords = S::TotalRecords;
-        type ReposProcessed = S::ReposProcessed;
-        type Message = Set<members::message>;
-        type CollectionsSynced = S::CollectionsSynced;
         type Success = S::Success;
-    }
-    ///State transition - sets the `collections_synced` field to Set
-    pub struct SetCollectionsSynced<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCollectionsSynced<S> {}
-    impl<S: State> State for SetCollectionsSynced<S> {
-        type TotalRecords = S::TotalRecords;
-        type ReposProcessed = S::ReposProcessed;
-        type Message = S::Message;
-        type CollectionsSynced = Set<members::collections_synced>;
-        type Success = S::Success;
-    }
-    ///State transition - sets the `success` field to Set
-    pub struct SetSuccess<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSuccess<S> {}
-    impl<S: State> State for SetSuccess<S> {
+        type CollectionsSynced = S::CollectionsSynced;
         type TotalRecords = S::TotalRecords;
         type ReposProcessed = S::ReposProcessed;
-        type Message = S::Message;
-        type CollectionsSynced = S::CollectionsSynced;
-        type Success = Set<members::success>;
+        type Message = Set<members::message>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `success` field
+        pub struct success(());
+        ///Marker type for the `collections_synced` field
+        pub struct collections_synced(());
         ///Marker type for the `total_records` field
         pub struct total_records(());
         ///Marker type for the `repos_processed` field
         pub struct repos_processed(());
         ///Marker type for the `message` field
         pub struct message(());
-        ///Marker type for the `collections_synced` field
-        pub struct collections_synced(());
-        ///Marker type for the `success` field
-        pub struct success(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SyncJobResultBuilder<'a, S: sync_job_result_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<Nsid<'a>>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<bool>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SyncJobResult<'a> {
@@ -825,9 +828,9 @@ impl<'a> SyncJobResultBuilder<'a, sync_job_result_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SyncJobResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -842,11 +845,11 @@ where
         mut self,
         value: impl Into<Vec<Nsid<'a>>>,
     ) -> SyncJobResultBuilder<'a, sync_job_result_state::SetCollectionsSynced<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SyncJobResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -861,11 +864,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SyncJobResultBuilder<'a, sync_job_result_state::SetMessage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SyncJobResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -880,11 +883,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SyncJobResultBuilder<'a, sync_job_result_state::SetReposProcessed<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SyncJobResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -899,11 +902,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> SyncJobResultBuilder<'a, sync_job_result_state::SetSuccess<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SyncJobResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -918,11 +921,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SyncJobResultBuilder<'a, sync_job_result_state::SetTotalRecords<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         SyncJobResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -930,20 +933,20 @@ where
 impl<'a, S> SyncJobResultBuilder<'a, S>
 where
     S: sync_job_result_state::State,
+    S::Success: sync_job_result_state::IsSet,
+    S::CollectionsSynced: sync_job_result_state::IsSet,
     S::TotalRecords: sync_job_result_state::IsSet,
     S::ReposProcessed: sync_job_result_state::IsSet,
     S::Message: sync_job_result_state::IsSet,
-    S::CollectionsSynced: sync_job_result_state::IsSet,
-    S::Success: sync_job_result_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SyncJobResult<'a> {
         SyncJobResult {
-            collections_synced: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            repos_processed: self.__unsafe_private_named.2.unwrap(),
-            success: self.__unsafe_private_named.3.unwrap(),
-            total_records: self.__unsafe_private_named.4.unwrap(),
+            collections_synced: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            repos_processed: self._fields.2.unwrap(),
+            success: self._fields.3.unwrap(),
+            total_records: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -956,11 +959,11 @@ where
         >,
     ) -> SyncJobResult<'a> {
         SyncJobResult {
-            collections_synced: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            repos_processed: self.__unsafe_private_named.2.unwrap(),
-            success: self.__unsafe_private_named.3.unwrap(),
-            total_records: self.__unsafe_private_named.4.unwrap(),
+            collections_synced: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            repos_processed: self._fields.2.unwrap(),
+            success: self._fields.3.unwrap(),
+            total_records: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/slice/get_o_auth_clients.rs b/crates/jacquard-api/src/network_slices/slice/get_o_auth_clients.rs
index f6e29ef8..1264b76b 100644
--- a/crates/jacquard-api/src/network_slices/slice/get_o_auth_clients.rs
+++ b/crates/jacquard-api/src/network_slices/slice/get_o_auth_clients.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -161,9 +164,9 @@ pub mod get_o_auth_clients_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetOAuthClientsBuilder<'a, S: get_o_auth_clients_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetOAuthClients<'a> {
@@ -177,9 +180,9 @@ impl<'a> GetOAuthClientsBuilder<'a, get_o_auth_clients_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetOAuthClientsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -194,11 +197,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetOAuthClientsBuilder<'a, get_o_auth_clients_state::SetSlice<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetOAuthClientsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -211,7 +214,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetOAuthClients<'a> {
         GetOAuthClients {
-            slice: self.__unsafe_private_named.0.unwrap(),
+            slice: self._fields.0.unwrap(),
         }
     }
 }
@@ -226,134 +229,134 @@ pub mod oauth_client_details_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ClientName;
-        type RedirectUris;
+        type CreatedAt;
+        type ClientId;
         type GrantTypes;
         type CreatedByDid;
         type ResponseTypes;
-        type CreatedAt;
-        type ClientId;
+        type ClientName;
+        type RedirectUris;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ClientName = Unset;
-        type RedirectUris = Unset;
+        type CreatedAt = Unset;
+        type ClientId = Unset;
         type GrantTypes = Unset;
         type CreatedByDid = Unset;
         type ResponseTypes = Unset;
-        type CreatedAt = Unset;
-        type ClientId = Unset;
+        type ClientName = Unset;
+        type RedirectUris = Unset;
     }
-    ///State transition - sets the `client_name` field to Set
-    pub struct SetClientName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetClientName<S> {}
-    impl<S: State> State for SetClientName<S> {
-        type ClientName = Set<members::client_name>;
-        type RedirectUris = S::RedirectUris;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type ClientId = S::ClientId;
         type GrantTypes = S::GrantTypes;
         type CreatedByDid = S::CreatedByDid;
         type ResponseTypes = S::ResponseTypes;
-        type CreatedAt = S::CreatedAt;
-        type ClientId = S::ClientId;
-    }
-    ///State transition - sets the `redirect_uris` field to Set
-    pub struct SetRedirectUris<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRedirectUris<S> {}
-    impl<S: State> State for SetRedirectUris<S> {
         type ClientName = S::ClientName;
-        type RedirectUris = Set<members::redirect_uris>;
+        type RedirectUris = S::RedirectUris;
+    }
+    ///State transition - sets the `client_id` field to Set
+    pub struct SetClientId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetClientId<S> {}
+    impl<S: State> State for SetClientId<S> {
+        type CreatedAt = S::CreatedAt;
+        type ClientId = Set<members::client_id>;
         type GrantTypes = S::GrantTypes;
         type CreatedByDid = S::CreatedByDid;
         type ResponseTypes = S::ResponseTypes;
-        type CreatedAt = S::CreatedAt;
-        type ClientId = S::ClientId;
+        type ClientName = S::ClientName;
+        type RedirectUris = S::RedirectUris;
     }
     ///State transition - sets the `grant_types` field to Set
     pub struct SetGrantTypes<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetGrantTypes<S> {}
     impl<S: State> State for SetGrantTypes<S> {
-        type ClientName = S::ClientName;
-        type RedirectUris = S::RedirectUris;
+        type CreatedAt = S::CreatedAt;
+        type ClientId = S::ClientId;
         type GrantTypes = Set<members::grant_types>;
         type CreatedByDid = S::CreatedByDid;
         type ResponseTypes = S::ResponseTypes;
-        type CreatedAt = S::CreatedAt;
-        type ClientId = S::ClientId;
+        type ClientName = S::ClientName;
+        type RedirectUris = S::RedirectUris;
     }
     ///State transition - sets the `created_by_did` field to Set
     pub struct SetCreatedByDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedByDid<S> {}
     impl<S: State> State for SetCreatedByDid<S> {
-        type ClientName = S::ClientName;
-        type RedirectUris = S::RedirectUris;
+        type CreatedAt = S::CreatedAt;
+        type ClientId = S::ClientId;
         type GrantTypes = S::GrantTypes;
         type CreatedByDid = Set<members::created_by_did>;
         type ResponseTypes = S::ResponseTypes;
-        type CreatedAt = S::CreatedAt;
-        type ClientId = S::ClientId;
+        type ClientName = S::ClientName;
+        type RedirectUris = S::RedirectUris;
     }
     ///State transition - sets the `response_types` field to Set
     pub struct SetResponseTypes<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetResponseTypes<S> {}
     impl<S: State> State for SetResponseTypes<S> {
-        type ClientName = S::ClientName;
-        type RedirectUris = S::RedirectUris;
+        type CreatedAt = S::CreatedAt;
+        type ClientId = S::ClientId;
         type GrantTypes = S::GrantTypes;
         type CreatedByDid = S::CreatedByDid;
         type ResponseTypes = Set<members::response_types>;
-        type CreatedAt = S::CreatedAt;
-        type ClientId = S::ClientId;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type ClientName = S::ClientName;
         type RedirectUris = S::RedirectUris;
+    }
+    ///State transition - sets the `client_name` field to Set
+    pub struct SetClientName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetClientName<S> {}
+    impl<S: State> State for SetClientName<S> {
+        type CreatedAt = S::CreatedAt;
+        type ClientId = S::ClientId;
         type GrantTypes = S::GrantTypes;
         type CreatedByDid = S::CreatedByDid;
         type ResponseTypes = S::ResponseTypes;
-        type CreatedAt = Set<members::created_at>;
-        type ClientId = S::ClientId;
-    }
-    ///State transition - sets the `client_id` field to Set
-    pub struct SetClientId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetClientId<S> {}
-    impl<S: State> State for SetClientId<S> {
-        type ClientName = S::ClientName;
+        type ClientName = Set<members::client_name>;
         type RedirectUris = S::RedirectUris;
+    }
+    ///State transition - sets the `redirect_uris` field to Set
+    pub struct SetRedirectUris<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRedirectUris<S> {}
+    impl<S: State> State for SetRedirectUris<S> {
+        type CreatedAt = S::CreatedAt;
+        type ClientId = S::ClientId;
         type GrantTypes = S::GrantTypes;
         type CreatedByDid = S::CreatedByDid;
         type ResponseTypes = S::ResponseTypes;
-        type CreatedAt = S::CreatedAt;
-        type ClientId = Set<members::client_id>;
+        type ClientName = S::ClientName;
+        type RedirectUris = Set<members::redirect_uris>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `client_name` field
-        pub struct client_name(());
-        ///Marker type for the `redirect_uris` field
-        pub struct redirect_uris(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `client_id` field
+        pub struct client_id(());
         ///Marker type for the `grant_types` field
         pub struct grant_types(());
         ///Marker type for the `created_by_did` field
         pub struct created_by_did(());
         ///Marker type for the `response_types` field
         pub struct response_types(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `client_id` field
-        pub struct client_id(());
+        ///Marker type for the `client_name` field
+        pub struct client_name(());
+        ///Marker type for the `redirect_uris` field
+        pub struct redirect_uris(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct OauthClientDetailsBuilder<'a, S: oauth_client_details_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -368,7 +371,7 @@ pub struct OauthClientDetailsBuilder<'a, S: oauth_client_details_state::State> {
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> OauthClientDetails<'a> {
@@ -382,8 +385,8 @@ impl<'a> OauthClientDetailsBuilder<'a, oauth_client_details_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OauthClientDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -398,7 +401,7 @@ impl<'a> OauthClientDetailsBuilder<'a, oauth_client_details_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -413,11 +416,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> OauthClientDetailsBuilder<'a, oauth_client_details_state::SetClientId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         OauthClientDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -432,11 +435,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> OauthClientDetailsBuilder<'a, oauth_client_details_state::SetClientName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         OauthClientDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -444,12 +447,12 @@ where
 impl<'a, S: oauth_client_details_state::State> OauthClientDetailsBuilder<'a, S> {
     /// Set the `clientSecret` field (optional)
     pub fn client_secret(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `clientSecret` field to an Option value (optional)
     pub fn maybe_client_secret(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -457,12 +460,12 @@ impl<'a, S: oauth_client_details_state::State> OauthClientDetailsBuilder<'a, S>
 impl<'a, S: oauth_client_details_state::State> OauthClientDetailsBuilder<'a, S> {
     /// Set the `clientUri` field (optional)
     pub fn client_uri(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `clientUri` field to an Option value (optional)
     pub fn maybe_client_uri(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -477,11 +480,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> OauthClientDetailsBuilder<'a, oauth_client_details_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         OauthClientDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -496,11 +499,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> OauthClientDetailsBuilder<'a, oauth_client_details_state::SetCreatedByDid<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         OauthClientDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -515,11 +518,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> OauthClientDetailsBuilder<'a, oauth_client_details_state::SetGrantTypes<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         OauthClientDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -527,12 +530,12 @@ where
 impl<'a, S: oauth_client_details_state::State> OauthClientDetailsBuilder<'a, S> {
     /// Set the `logoUri` field (optional)
     pub fn logo_uri(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `logoUri` field to an Option value (optional)
     pub fn maybe_logo_uri(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -540,12 +543,12 @@ impl<'a, S: oauth_client_details_state::State> OauthClientDetailsBuilder<'a, S>
 impl<'a, S: oauth_client_details_state::State> OauthClientDetailsBuilder<'a, S> {
     /// Set the `policyUri` field (optional)
     pub fn policy_uri(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `policyUri` field to an Option value (optional)
     pub fn maybe_policy_uri(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -560,11 +563,11 @@ where
         mut self,
         value: impl Into<Vec<UriValue<'a>>>,
     ) -> OauthClientDetailsBuilder<'a, oauth_client_details_state::SetRedirectUris<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         OauthClientDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -579,11 +582,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> OauthClientDetailsBuilder<'a, oauth_client_details_state::SetResponseTypes<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         OauthClientDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -591,12 +594,12 @@ where
 impl<'a, S: oauth_client_details_state::State> OauthClientDetailsBuilder<'a, S> {
     /// Set the `scope` field (optional)
     pub fn scope(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `scope` field to an Option value (optional)
     pub fn maybe_scope(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -604,12 +607,12 @@ impl<'a, S: oauth_client_details_state::State> OauthClientDetailsBuilder<'a, S>
 impl<'a, S: oauth_client_details_state::State> OauthClientDetailsBuilder<'a, S> {
     /// Set the `tosUri` field (optional)
     pub fn tos_uri(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `tosUri` field to an Option value (optional)
     pub fn maybe_tos_uri(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -617,30 +620,30 @@ impl<'a, S: oauth_client_details_state::State> OauthClientDetailsBuilder<'a, S>
 impl<'a, S> OauthClientDetailsBuilder<'a, S>
 where
     S: oauth_client_details_state::State,
-    S::ClientName: oauth_client_details_state::IsSet,
-    S::RedirectUris: oauth_client_details_state::IsSet,
+    S::CreatedAt: oauth_client_details_state::IsSet,
+    S::ClientId: oauth_client_details_state::IsSet,
     S::GrantTypes: oauth_client_details_state::IsSet,
     S::CreatedByDid: oauth_client_details_state::IsSet,
     S::ResponseTypes: oauth_client_details_state::IsSet,
-    S::CreatedAt: oauth_client_details_state::IsSet,
-    S::ClientId: oauth_client_details_state::IsSet,
+    S::ClientName: oauth_client_details_state::IsSet,
+    S::RedirectUris: oauth_client_details_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> OauthClientDetails<'a> {
         OauthClientDetails {
-            client_id: self.__unsafe_private_named.0.unwrap(),
-            client_name: self.__unsafe_private_named.1.unwrap(),
-            client_secret: self.__unsafe_private_named.2,
-            client_uri: self.__unsafe_private_named.3,
-            created_at: self.__unsafe_private_named.4.unwrap(),
-            created_by_did: self.__unsafe_private_named.5.unwrap(),
-            grant_types: self.__unsafe_private_named.6.unwrap(),
-            logo_uri: self.__unsafe_private_named.7,
-            policy_uri: self.__unsafe_private_named.8,
-            redirect_uris: self.__unsafe_private_named.9.unwrap(),
-            response_types: self.__unsafe_private_named.10.unwrap(),
-            scope: self.__unsafe_private_named.11,
-            tos_uri: self.__unsafe_private_named.12,
+            client_id: self._fields.0.unwrap(),
+            client_name: self._fields.1.unwrap(),
+            client_secret: self._fields.2,
+            client_uri: self._fields.3,
+            created_at: self._fields.4.unwrap(),
+            created_by_did: self._fields.5.unwrap(),
+            grant_types: self._fields.6.unwrap(),
+            logo_uri: self._fields.7,
+            policy_uri: self._fields.8,
+            redirect_uris: self._fields.9.unwrap(),
+            response_types: self._fields.10.unwrap(),
+            scope: self._fields.11,
+            tos_uri: self._fields.12,
             extra_data: Default::default(),
         }
     }
@@ -653,19 +656,19 @@ where
         >,
     ) -> OauthClientDetails<'a> {
         OauthClientDetails {
-            client_id: self.__unsafe_private_named.0.unwrap(),
-            client_name: self.__unsafe_private_named.1.unwrap(),
-            client_secret: self.__unsafe_private_named.2,
-            client_uri: self.__unsafe_private_named.3,
-            created_at: self.__unsafe_private_named.4.unwrap(),
-            created_by_did: self.__unsafe_private_named.5.unwrap(),
-            grant_types: self.__unsafe_private_named.6.unwrap(),
-            logo_uri: self.__unsafe_private_named.7,
-            policy_uri: self.__unsafe_private_named.8,
-            redirect_uris: self.__unsafe_private_named.9.unwrap(),
-            response_types: self.__unsafe_private_named.10.unwrap(),
-            scope: self.__unsafe_private_named.11,
-            tos_uri: self.__unsafe_private_named.12,
+            client_id: self._fields.0.unwrap(),
+            client_name: self._fields.1.unwrap(),
+            client_secret: self._fields.2,
+            client_uri: self._fields.3,
+            created_at: self._fields.4.unwrap(),
+            created_by_did: self._fields.5.unwrap(),
+            grant_types: self._fields.6.unwrap(),
+            logo_uri: self._fields.7,
+            policy_uri: self._fields.8,
+            redirect_uris: self._fields.9.unwrap(),
+            response_types: self._fields.10.unwrap(),
+            scope: self._fields.11,
+            tos_uri: self._fields.12,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/slice/get_slice_records.rs b/crates/jacquard-api/src/network_slices/slice/get_slice_records.rs
index c7199841..eb014407 100644
--- a/crates/jacquard-api/src/network_slices/slice/get_slice_records.rs
+++ b/crates/jacquard-api/src/network_slices/slice/get_slice_records.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -137,112 +140,112 @@ pub mod indexed_record_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Value;
+        type Uri;
+        type Cid;
+        type IndexedAt;
         type Did;
         type Collection;
-        type IndexedAt;
-        type Cid;
-        type Uri;
-        type Value;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Value = Unset;
+        type Uri = Unset;
+        type Cid = Unset;
+        type IndexedAt = Unset;
         type Did = Unset;
         type Collection = Unset;
-        type IndexedAt = Unset;
-        type Cid = Unset;
-        type Uri = Unset;
-        type Value = Unset;
     }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Did = Set<members::did>;
-        type Collection = S::Collection;
-        type IndexedAt = S::IndexedAt;
-        type Cid = S::Cid;
+    ///State transition - sets the `value` field to Set
+    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetValue<S> {}
+    impl<S: State> State for SetValue<S> {
+        type Value = Set<members::value>;
         type Uri = S::Uri;
-        type Value = S::Value;
-    }
-    ///State transition - sets the `collection` field to Set
-    pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCollection<S> {}
-    impl<S: State> State for SetCollection<S> {
-        type Did = S::Did;
-        type Collection = Set<members::collection>;
-        type IndexedAt = S::IndexedAt;
         type Cid = S::Cid;
-        type Uri = S::Uri;
-        type Value = S::Value;
-    }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
+        type IndexedAt = S::IndexedAt;
         type Did = S::Did;
         type Collection = S::Collection;
-        type IndexedAt = Set<members::indexed_at>;
-        type Cid = S::Cid;
-        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
         type Value = S::Value;
+        type Uri = Set<members::uri>;
+        type Cid = S::Cid;
+        type IndexedAt = S::IndexedAt;
+        type Did = S::Did;
+        type Collection = S::Collection;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type Did = S::Did;
-        type Collection = S::Collection;
-        type IndexedAt = S::IndexedAt;
-        type Cid = Set<members::cid>;
-        type Uri = S::Uri;
         type Value = S::Value;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
+        type Uri = S::Uri;
+        type Cid = Set<members::cid>;
+        type IndexedAt = S::IndexedAt;
         type Did = S::Did;
         type Collection = S::Collection;
-        type IndexedAt = S::IndexedAt;
-        type Cid = S::Cid;
-        type Uri = Set<members::uri>;
-        type Value = S::Value;
     }
-    ///State transition - sets the `value` field to Set
-    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetValue<S> {}
-    impl<S: State> State for SetValue<S> {
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
+        type Value = S::Value;
+        type Uri = S::Uri;
+        type Cid = S::Cid;
+        type IndexedAt = Set<members::indexed_at>;
         type Did = S::Did;
         type Collection = S::Collection;
-        type IndexedAt = S::IndexedAt;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Value = S::Value;
+        type Uri = S::Uri;
         type Cid = S::Cid;
+        type IndexedAt = S::IndexedAt;
+        type Did = Set<members::did>;
+        type Collection = S::Collection;
+    }
+    ///State transition - sets the `collection` field to Set
+    pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCollection<S> {}
+    impl<S: State> State for SetCollection<S> {
+        type Value = S::Value;
         type Uri = S::Uri;
-        type Value = Set<members::value>;
+        type Cid = S::Cid;
+        type IndexedAt = S::IndexedAt;
+        type Did = S::Did;
+        type Collection = Set<members::collection>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `value` field
+        pub struct value(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
+        ///Marker type for the `indexed_at` field
+        pub struct indexed_at(());
         ///Marker type for the `did` field
         pub struct did(());
         ///Marker type for the `collection` field
         pub struct collection(());
-        ///Marker type for the `indexed_at` field
-        pub struct indexed_at(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
-        ///Marker type for the `value` field
-        pub struct value(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct IndexedRecordBuilder<'a, S: indexed_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<Nsid<'a>>,
         Option<Did<'a>>,
@@ -250,7 +253,7 @@ pub struct IndexedRecordBuilder<'a, S: indexed_record_state::State> {
         Option<AtUri<'a>>,
         Option<Data<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> IndexedRecord<'a> {
@@ -264,9 +267,9 @@ impl<'a> IndexedRecordBuilder<'a, indexed_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IndexedRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -281,11 +284,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> IndexedRecordBuilder<'a, indexed_record_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         IndexedRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -300,11 +303,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> IndexedRecordBuilder<'a, indexed_record_state::SetCollection<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         IndexedRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -319,11 +322,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> IndexedRecordBuilder<'a, indexed_record_state::SetDid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         IndexedRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -338,11 +341,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> IndexedRecordBuilder<'a, indexed_record_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         IndexedRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -357,11 +360,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> IndexedRecordBuilder<'a, indexed_record_state::SetUri<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         IndexedRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -376,11 +379,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> IndexedRecordBuilder<'a, indexed_record_state::SetValue<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         IndexedRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -388,22 +391,22 @@ where
 impl<'a, S> IndexedRecordBuilder<'a, S>
 where
     S: indexed_record_state::State,
+    S::Value: indexed_record_state::IsSet,
+    S::Uri: indexed_record_state::IsSet,
+    S::Cid: indexed_record_state::IsSet,
+    S::IndexedAt: indexed_record_state::IsSet,
     S::Did: indexed_record_state::IsSet,
     S::Collection: indexed_record_state::IsSet,
-    S::IndexedAt: indexed_record_state::IsSet,
-    S::Cid: indexed_record_state::IsSet,
-    S::Uri: indexed_record_state::IsSet,
-    S::Value: indexed_record_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> IndexedRecord<'a> {
         IndexedRecord {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            collection: self.__unsafe_private_named.1.unwrap(),
-            did: self.__unsafe_private_named.2.unwrap(),
-            indexed_at: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
-            value: self.__unsafe_private_named.5.unwrap(),
+            cid: self._fields.0.unwrap(),
+            collection: self._fields.1.unwrap(),
+            did: self._fields.2.unwrap(),
+            indexed_at: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
+            value: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -413,12 +416,12 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> IndexedRecord<'a> {
         IndexedRecord {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            collection: self.__unsafe_private_named.1.unwrap(),
-            did: self.__unsafe_private_named.2.unwrap(),
-            indexed_at: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
-            value: self.__unsafe_private_named.5.unwrap(),
+            cid: self._fields.0.unwrap(),
+            collection: self._fields.1.unwrap(),
+            did: self._fields.2.unwrap(),
+            indexed_at: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
+            value: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/slice/get_sparklines.rs b/crates/jacquard-api/src/network_slices/slice/get_sparklines.rs
index d564f16b..41c9f517 100644
--- a/crates/jacquard-api/src/network_slices/slice/get_sparklines.rs
+++ b/crates/jacquard-api/src/network_slices/slice/get_sparklines.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -148,13 +151,9 @@ pub mod get_sparklines_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSparklinesBuilder<'a, S: get_sparklines_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-        Option<Vec<CowStr<'a>>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Vec<CowStr<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSparklines<'a> {
@@ -168,9 +167,9 @@ impl<'a> GetSparklinesBuilder<'a, get_sparklines_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSparklinesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,12 +177,12 @@ impl<'a> GetSparklinesBuilder<'a, get_sparklines_state::Empty> {
 impl<'a, S: get_sparklines_state::State> GetSparklinesBuilder<'a, S> {
     /// Set the `duration` field (optional)
     pub fn duration(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `duration` field to an Option value (optional)
     pub fn maybe_duration(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -191,12 +190,12 @@ impl<'a, S: get_sparklines_state::State> GetSparklinesBuilder<'a, S> {
 impl<'a, S: get_sparklines_state::State> GetSparklinesBuilder<'a, S> {
     /// Set the `interval` field (optional)
     pub fn interval(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `interval` field to an Option value (optional)
     pub fn maybe_interval(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -211,11 +210,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> GetSparklinesBuilder<'a, get_sparklines_state::SetSlices<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetSparklinesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -228,15 +227,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSparklines<'a> {
         GetSparklines {
-            duration: self
-                .__unsafe_private_named
-                .0
-                .or_else(|| Some(CowStr::from("24h"))),
-            interval: self
-                .__unsafe_private_named
-                .1
-                .or_else(|| Some(CowStr::from("hour"))),
-            slices: self.__unsafe_private_named.2.unwrap(),
+            duration: self._fields.0.or_else(|| Some(CowStr::from("24h"))),
+            interval: self._fields.1.or_else(|| Some(CowStr::from("hour"))),
+            slices: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -249,15 +242,9 @@ where
         >,
     ) -> GetSparklines<'a> {
         GetSparklines {
-            duration: self
-                .__unsafe_private_named
-                .0
-                .or_else(|| Some(CowStr::from("24h"))),
-            interval: self
-                .__unsafe_private_named
-                .1
-                .or_else(|| Some(CowStr::from("hour"))),
-            slices: self.__unsafe_private_named.2.unwrap(),
+            duration: self._fields.0.or_else(|| Some(CowStr::from("24h"))),
+            interval: self._fields.1.or_else(|| Some(CowStr::from("hour"))),
+            slices: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -273,45 +260,45 @@ pub mod sparkline_entry_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Points;
         type SliceUri;
+        type Points;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Points = Unset;
         type SliceUri = Unset;
-    }
-    ///State transition - sets the `points` field to Set
-    pub struct SetPoints<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPoints<S> {}
-    impl<S: State> State for SetPoints<S> {
-        type Points = Set<members::points>;
-        type SliceUri = S::SliceUri;
+        type Points = Unset;
     }
     ///State transition - sets the `slice_uri` field to Set
     pub struct SetSliceUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSliceUri<S> {}
     impl<S: State> State for SetSliceUri<S> {
-        type Points = S::Points;
         type SliceUri = Set<members::slice_uri>;
+        type Points = S::Points;
+    }
+    ///State transition - sets the `points` field to Set
+    pub struct SetPoints<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPoints<S> {}
+    impl<S: State> State for SetPoints<S> {
+        type SliceUri = S::SliceUri;
+        type Points = Set<members::points>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `points` field
-        pub struct points(());
         ///Marker type for the `slice_uri` field
         pub struct slice_uri(());
+        ///Marker type for the `points` field
+        pub struct points(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SparklineEntryBuilder<'a, S: sparkline_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<SparklinePoint<'a>>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<SparklinePoint<'a>>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SparklineEntry<'a> {
@@ -325,9 +312,9 @@ impl<'a> SparklineEntryBuilder<'a, sparkline_entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SparklineEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -342,11 +329,11 @@ where
         mut self,
         value: impl Into<Vec<SparklinePoint<'a>>>,
     ) -> SparklineEntryBuilder<'a, sparkline_entry_state::SetPoints<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SparklineEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -361,11 +348,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SparklineEntryBuilder<'a, sparkline_entry_state::SetSliceUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SparklineEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -373,14 +360,14 @@ where
 impl<'a, S> SparklineEntryBuilder<'a, S>
 where
     S: sparkline_entry_state::State,
-    S::Points: sparkline_entry_state::IsSet,
     S::SliceUri: sparkline_entry_state::IsSet,
+    S::Points: sparkline_entry_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SparklineEntry<'a> {
         SparklineEntry {
-            points: self.__unsafe_private_named.0.unwrap(),
-            slice_uri: self.__unsafe_private_named.1.unwrap(),
+            points: self._fields.0.unwrap(),
+            slice_uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -393,8 +380,8 @@ where
         >,
     ) -> SparklineEntry<'a> {
         SparklineEntry {
-            points: self.__unsafe_private_named.0.unwrap(),
-            slice_uri: self.__unsafe_private_named.1.unwrap(),
+            points: self._fields.0.unwrap(),
+            slice_uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/slice/get_sync_summary.rs b/crates/jacquard-api/src/network_slices/slice/get_sync_summary.rs
index 2d524fb3..1b3d4d13 100644
--- a/crates/jacquard-api/src/network_slices/slice/get_sync_summary.rs
+++ b/crates/jacquard-api/src/network_slices/slice/get_sync_summary.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -163,9 +166,9 @@ pub mod collection_summary_state {
 
 /// Builder for constructing an instance of this type
 pub struct CollectionSummaryBuilder<'a, S: collection_summary_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<bool>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CollectionSummary<'a> {
@@ -179,9 +182,9 @@ impl<'a> CollectionSummaryBuilder<'a, collection_summary_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionSummaryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CollectionSummaryBuilder<'a, collection_summary_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionSummaryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CollectionSummaryBuilder<'a, collection_summary_state::SetEstimatedRepos<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CollectionSummaryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> CollectionSummaryBuilder<'a, collection_summary_state::SetIsExternal<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CollectionSummaryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,9 +256,9 @@ where
     /// Build the final struct
     pub fn build(self) -> CollectionSummary<'a> {
         CollectionSummary {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            estimated_repos: self.__unsafe_private_named.1.unwrap(),
-            is_external: self.__unsafe_private_named.2.unwrap(),
+            collection: self._fields.0.unwrap(),
+            estimated_repos: self._fields.1.unwrap(),
+            is_external: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -268,9 +271,9 @@ where
         >,
     ) -> CollectionSummary<'a> {
         CollectionSummary {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            estimated_repos: self.__unsafe_private_named.1.unwrap(),
-            is_external: self.__unsafe_private_named.2.unwrap(),
+            collection: self._fields.0.unwrap(),
+            estimated_repos: self._fields.1.unwrap(),
+            is_external: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -413,14 +416,14 @@ pub mod get_sync_summary_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSyncSummaryBuilder<'a, S: get_sync_summary_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<CowStr<'a>>>,
         Option<Vec<CowStr<'a>>>,
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSyncSummary<'a> {
@@ -434,9 +437,9 @@ impl<'a> GetSyncSummaryBuilder<'a, get_sync_summary_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSyncSummaryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -444,12 +447,12 @@ impl<'a> GetSyncSummaryBuilder<'a, get_sync_summary_state::Empty> {
 impl<'a, S: get_sync_summary_state::State> GetSyncSummaryBuilder<'a, S> {
     /// Set the `collections` field (optional)
     pub fn collections(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `collections` field to an Option value (optional)
     pub fn maybe_collections(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -460,12 +463,12 @@ impl<'a, S: get_sync_summary_state::State> GetSyncSummaryBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<CowStr<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `externalCollections` field to an Option value (optional)
     pub fn maybe_external_collections(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -473,12 +476,12 @@ impl<'a, S: get_sync_summary_state::State> GetSyncSummaryBuilder<'a, S> {
 impl<'a, S: get_sync_summary_state::State> GetSyncSummaryBuilder<'a, S> {
     /// Set the `repos` field (optional)
     pub fn repos(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `repos` field to an Option value (optional)
     pub fn maybe_repos(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -493,11 +496,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetSyncSummaryBuilder<'a, get_sync_summary_state::SetSlice<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         GetSyncSummaryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -510,10 +513,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSyncSummary<'a> {
         GetSyncSummary {
-            collections: self.__unsafe_private_named.0,
-            external_collections: self.__unsafe_private_named.1,
-            repos: self.__unsafe_private_named.2,
-            slice: self.__unsafe_private_named.3.unwrap(),
+            collections: self._fields.0,
+            external_collections: self._fields.1,
+            repos: self._fields.2,
+            slice: self._fields.3.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/network_slices/slice/start_sync.rs b/crates/jacquard-api/src/network_slices/slice/start_sync.rs
index 85ccd150..12fa7b0d 100644
--- a/crates/jacquard-api/src/network_slices/slice/start_sync.rs
+++ b/crates/jacquard-api/src/network_slices/slice/start_sync.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Nsid};
diff --git a/crates/jacquard-api/src/network_slices/slice/stats.rs b/crates/jacquard-api/src/network_slices/slice/stats.rs
index 82f5e88a..f74c3741 100644
--- a/crates/jacquard-api/src/network_slices/slice/stats.rs
+++ b/crates/jacquard-api/src/network_slices/slice/stats.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -110,59 +113,59 @@ pub mod collection_stats_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type UniqueActors;
         type Collection;
         type RecordCount;
-        type UniqueActors;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type UniqueActors = Unset;
         type Collection = Unset;
         type RecordCount = Unset;
-        type UniqueActors = Unset;
+    }
+    ///State transition - sets the `unique_actors` field to Set
+    pub struct SetUniqueActors<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUniqueActors<S> {}
+    impl<S: State> State for SetUniqueActors<S> {
+        type UniqueActors = Set<members::unique_actors>;
+        type Collection = S::Collection;
+        type RecordCount = S::RecordCount;
     }
     ///State transition - sets the `collection` field to Set
     pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCollection<S> {}
     impl<S: State> State for SetCollection<S> {
+        type UniqueActors = S::UniqueActors;
         type Collection = Set<members::collection>;
         type RecordCount = S::RecordCount;
-        type UniqueActors = S::UniqueActors;
     }
     ///State transition - sets the `record_count` field to Set
     pub struct SetRecordCount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecordCount<S> {}
     impl<S: State> State for SetRecordCount<S> {
-        type Collection = S::Collection;
-        type RecordCount = Set<members::record_count>;
         type UniqueActors = S::UniqueActors;
-    }
-    ///State transition - sets the `unique_actors` field to Set
-    pub struct SetUniqueActors<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUniqueActors<S> {}
-    impl<S: State> State for SetUniqueActors<S> {
         type Collection = S::Collection;
-        type RecordCount = S::RecordCount;
-        type UniqueActors = Set<members::unique_actors>;
+        type RecordCount = Set<members::record_count>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `unique_actors` field
+        pub struct unique_actors(());
         ///Marker type for the `collection` field
         pub struct collection(());
         ///Marker type for the `record_count` field
         pub struct record_count(());
-        ///Marker type for the `unique_actors` field
-        pub struct unique_actors(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CollectionStatsBuilder<'a, S: collection_stats_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Nsid<'a>>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Nsid<'a>>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CollectionStats<'a> {
@@ -176,9 +179,9 @@ impl<'a> CollectionStatsBuilder<'a, collection_stats_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -193,11 +196,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> CollectionStatsBuilder<'a, collection_stats_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,11 +215,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CollectionStatsBuilder<'a, collection_stats_state::SetRecordCount<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CollectionStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -231,11 +234,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CollectionStatsBuilder<'a, collection_stats_state::SetUniqueActors<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CollectionStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -243,16 +246,16 @@ where
 impl<'a, S> CollectionStatsBuilder<'a, S>
 where
     S: collection_stats_state::State,
+    S::UniqueActors: collection_stats_state::IsSet,
     S::Collection: collection_stats_state::IsSet,
     S::RecordCount: collection_stats_state::IsSet,
-    S::UniqueActors: collection_stats_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CollectionStats<'a> {
         CollectionStats {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            record_count: self.__unsafe_private_named.1.unwrap(),
-            unique_actors: self.__unsafe_private_named.2.unwrap(),
+            collection: self._fields.0.unwrap(),
+            record_count: self._fields.1.unwrap(),
+            unique_actors: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -265,9 +268,9 @@ where
         >,
     ) -> CollectionStats<'a> {
         CollectionStats {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            record_count: self.__unsafe_private_named.1.unwrap(),
-            unique_actors: self.__unsafe_private_named.2.unwrap(),
+            collection: self._fields.0.unwrap(),
+            record_count: self._fields.1.unwrap(),
+            unique_actors: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -389,9 +392,9 @@ pub mod stats_state {
 
 /// Builder for constructing an instance of this type
 pub struct StatsBuilder<'a, S: stats_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Stats<'a> {
@@ -405,9 +408,9 @@ impl<'a> StatsBuilder<'a, stats_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -422,11 +425,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> StatsBuilder<'a, stats_state::SetSlice<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -439,7 +442,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Stats<'a> {
         Stats {
-            slice: self.__unsafe_private_named.0.unwrap(),
+            slice: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/network_slices/slice/sync_user_collections.rs b/crates/jacquard-api/src/network_slices/slice/sync_user_collections.rs
index bd9409eb..822a2340 100644
--- a/crates/jacquard-api/src/network_slices/slice/sync_user_collections.rs
+++ b/crates/jacquard-api/src/network_slices/slice/sync_user_collections.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/network_slices/slice/update_o_auth_client.rs b/crates/jacquard-api/src/network_slices/slice/update_o_auth_client.rs
index eb2fef3d..26ad48ee 100644
--- a/crates/jacquard-api/src/network_slices/slice/update_o_auth_client.rs
+++ b/crates/jacquard-api/src/network_slices/slice/update_o_auth_client.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::UriValue;
diff --git a/crates/jacquard-api/src/network_slices/tools.rs b/crates/jacquard-api/src/network_slices/tools.rs
index b06bbaa2..6f05a6f7 100644
--- a/crates/jacquard-api/src/network_slices/tools.rs
+++ b/crates/jacquard-api/src/network_slices/tools.rs
@@ -9,7 +9,11 @@ pub mod bug;
 pub mod document;
 pub mod richtext;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -136,45 +140,45 @@ pub mod image_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Alt;
         type Image;
+        type Alt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Alt = Unset;
         type Image = Unset;
-    }
-    ///State transition - sets the `alt` field to Set
-    pub struct SetAlt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAlt<S> {}
-    impl<S: State> State for SetAlt<S> {
-        type Alt = Set<members::alt>;
-        type Image = S::Image;
+        type Alt = Unset;
     }
     ///State transition - sets the `image` field to Set
     pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetImage<S> {}
     impl<S: State> State for SetImage<S> {
-        type Alt = S::Alt;
         type Image = Set<members::image>;
+        type Alt = S::Alt;
+    }
+    ///State transition - sets the `alt` field to Set
+    pub struct SetAlt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAlt<S> {}
+    impl<S: State> State for SetAlt<S> {
+        type Image = S::Image;
+        type Alt = Set<members::alt>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `alt` field
-        pub struct alt(());
         ///Marker type for the `image` field
         pub struct image(());
+        ///Marker type for the `alt` field
+        pub struct alt(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ImageBuilder<'a, S: image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<BlobRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<BlobRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Image<'a> {
@@ -188,9 +192,9 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -205,11 +209,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ImageBuilder<'a, image_state::SetAlt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -224,11 +228,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ImageBuilder<'a, image_state::SetImage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -236,14 +240,14 @@ where
 impl<'a, S> ImageBuilder<'a, S>
 where
     S: image_state::State,
-    S::Alt: image_state::IsSet,
     S::Image: image_state::IsSet,
+    S::Alt: image_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            image: self.__unsafe_private_named.1.unwrap(),
+            alt: self._fields.0.unwrap(),
+            image: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -256,8 +260,8 @@ where
         >,
     ) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            image: self.__unsafe_private_named.1.unwrap(),
+            alt: self._fields.0.unwrap(),
+            image: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -365,9 +369,9 @@ pub mod images_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImagesBuilder<'a, S: images_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<tools::Image<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<tools::Image<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Images<'a> {
@@ -381,9 +385,9 @@ impl<'a> ImagesBuilder<'a, images_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImagesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -398,11 +402,11 @@ where
         mut self,
         value: impl Into<Vec<tools::Image<'a>>>,
     ) -> ImagesBuilder<'a, images_state::SetImages<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ImagesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -415,7 +419,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Images<'a> {
         Images {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -428,7 +432,7 @@ where
         >,
     ) -> Images<'a> {
         Images {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/tools/bug.rs b/crates/jacquard-api/src/network_slices/tools/bug.rs
index 5000457c..9b288a4b 100644
--- a/crates/jacquard-api/src/network_slices/tools/bug.rs
+++ b/crates/jacquard-api/src/network_slices/tools/bug.rs
@@ -9,7 +9,11 @@ pub mod comment;
 pub mod issue;
 pub mod response;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -317,112 +321,112 @@ pub mod bug_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Severity;
-        type Description;
         type StepsToReproduce;
-        type Namespace;
         type CreatedAt;
+        type Severity;
+        type Namespace;
         type Title;
+        type Description;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Severity = Unset;
-        type Description = Unset;
         type StepsToReproduce = Unset;
-        type Namespace = Unset;
         type CreatedAt = Unset;
+        type Severity = Unset;
+        type Namespace = Unset;
         type Title = Unset;
-    }
-    ///State transition - sets the `severity` field to Set
-    pub struct SetSeverity<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSeverity<S> {}
-    impl<S: State> State for SetSeverity<S> {
-        type Severity = Set<members::severity>;
-        type Description = S::Description;
-        type StepsToReproduce = S::StepsToReproduce;
-        type Namespace = S::Namespace;
-        type CreatedAt = S::CreatedAt;
-        type Title = S::Title;
-    }
-    ///State transition - sets the `description` field to Set
-    pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDescription<S> {}
-    impl<S: State> State for SetDescription<S> {
-        type Severity = S::Severity;
-        type Description = Set<members::description>;
-        type StepsToReproduce = S::StepsToReproduce;
-        type Namespace = S::Namespace;
-        type CreatedAt = S::CreatedAt;
-        type Title = S::Title;
+        type Description = Unset;
     }
     ///State transition - sets the `steps_to_reproduce` field to Set
     pub struct SetStepsToReproduce<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStepsToReproduce<S> {}
     impl<S: State> State for SetStepsToReproduce<S> {
-        type Severity = S::Severity;
-        type Description = S::Description;
         type StepsToReproduce = Set<members::steps_to_reproduce>;
-        type Namespace = S::Namespace;
         type CreatedAt = S::CreatedAt;
-        type Title = S::Title;
-    }
-    ///State transition - sets the `namespace` field to Set
-    pub struct SetNamespace<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetNamespace<S> {}
-    impl<S: State> State for SetNamespace<S> {
         type Severity = S::Severity;
-        type Description = S::Description;
-        type StepsToReproduce = S::StepsToReproduce;
-        type Namespace = Set<members::namespace>;
-        type CreatedAt = S::CreatedAt;
+        type Namespace = S::Namespace;
         type Title = S::Title;
+        type Description = S::Description;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type StepsToReproduce = S::StepsToReproduce;
+        type CreatedAt = Set<members::created_at>;
         type Severity = S::Severity;
+        type Namespace = S::Namespace;
+        type Title = S::Title;
         type Description = S::Description;
+    }
+    ///State transition - sets the `severity` field to Set
+    pub struct SetSeverity<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSeverity<S> {}
+    impl<S: State> State for SetSeverity<S> {
         type StepsToReproduce = S::StepsToReproduce;
+        type CreatedAt = S::CreatedAt;
+        type Severity = Set<members::severity>;
         type Namespace = S::Namespace;
-        type CreatedAt = Set<members::created_at>;
         type Title = S::Title;
+        type Description = S::Description;
+    }
+    ///State transition - sets the `namespace` field to Set
+    pub struct SetNamespace<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetNamespace<S> {}
+    impl<S: State> State for SetNamespace<S> {
+        type StepsToReproduce = S::StepsToReproduce;
+        type CreatedAt = S::CreatedAt;
+        type Severity = S::Severity;
+        type Namespace = Set<members::namespace>;
+        type Title = S::Title;
+        type Description = S::Description;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
+        type StepsToReproduce = S::StepsToReproduce;
+        type CreatedAt = S::CreatedAt;
         type Severity = S::Severity;
+        type Namespace = S::Namespace;
+        type Title = Set<members::title>;
         type Description = S::Description;
+    }
+    ///State transition - sets the `description` field to Set
+    pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDescription<S> {}
+    impl<S: State> State for SetDescription<S> {
         type StepsToReproduce = S::StepsToReproduce;
-        type Namespace = S::Namespace;
         type CreatedAt = S::CreatedAt;
-        type Title = Set<members::title>;
+        type Severity = S::Severity;
+        type Namespace = S::Namespace;
+        type Title = S::Title;
+        type Description = Set<members::description>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `severity` field
-        pub struct severity(());
-        ///Marker type for the `description` field
-        pub struct description(());
         ///Marker type for the `steps_to_reproduce` field
         pub struct steps_to_reproduce(());
-        ///Marker type for the `namespace` field
-        pub struct namespace(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `severity` field
+        pub struct severity(());
+        ///Marker type for the `namespace` field
+        pub struct namespace(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `description` field
+        pub struct description(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BugBuilder<'a, S: bug_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Images<'a>>,
         Option<Datetime>,
@@ -434,7 +438,7 @@ pub struct BugBuilder<'a, S: bug_state::State> {
         Option<Vec<Facet<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Bug<'a> {
@@ -448,20 +452,9 @@ impl<'a> BugBuilder<'a, bug_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BugBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -469,12 +462,12 @@ impl<'a> BugBuilder<'a, bug_state::Empty> {
 impl<'a, S: bug_state::State> BugBuilder<'a, S> {
     /// Set the `appUsed` field (optional)
     pub fn app_used(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `appUsed` field to an Option value (optional)
     pub fn maybe_app_used(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -482,12 +475,12 @@ impl<'a, S: bug_state::State> BugBuilder<'a, S> {
 impl<'a, S: bug_state::State> BugBuilder<'a, S> {
     /// Set the `attachments` field (optional)
     pub fn attachments(mut self, value: impl Into<Option<Images<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `attachments` field to an Option value (optional)
     pub fn maybe_attachments(mut self, value: Option<Images<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -502,11 +495,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BugBuilder<'a, bug_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BugBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -521,11 +514,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BugBuilder<'a, bug_state::SetDescription<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BugBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -536,12 +529,12 @@ impl<'a, S: bug_state::State> BugBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `descriptionFacets` field to an Option value (optional)
     pub fn maybe_description_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -556,11 +549,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BugBuilder<'a, bug_state::SetNamespace<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         BugBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -575,11 +568,11 @@ where
         mut self,
         value: impl Into<BugSeverity<'a>>,
     ) -> BugBuilder<'a, bug_state::SetSeverity<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         BugBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -594,11 +587,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BugBuilder<'a, bug_state::SetStepsToReproduce<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         BugBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -609,7 +602,7 @@ impl<'a, S: bug_state::State> BugBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `stepsToReproduceFacets` field to an Option value (optional)
@@ -617,7 +610,7 @@ impl<'a, S: bug_state::State> BugBuilder<'a, S> {
         mut self,
         value: Option<Vec<Facet<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -632,11 +625,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BugBuilder<'a, bug_state::SetTitle<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         BugBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -644,26 +637,26 @@ where
 impl<'a, S> BugBuilder<'a, S>
 where
     S: bug_state::State,
-    S::Severity: bug_state::IsSet,
-    S::Description: bug_state::IsSet,
     S::StepsToReproduce: bug_state::IsSet,
-    S::Namespace: bug_state::IsSet,
     S::CreatedAt: bug_state::IsSet,
+    S::Severity: bug_state::IsSet,
+    S::Namespace: bug_state::IsSet,
     S::Title: bug_state::IsSet,
+    S::Description: bug_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Bug<'a> {
         Bug {
-            app_used: self.__unsafe_private_named.0,
-            attachments: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3.unwrap(),
-            description_facets: self.__unsafe_private_named.4,
-            namespace: self.__unsafe_private_named.5.unwrap(),
-            severity: self.__unsafe_private_named.6.unwrap(),
-            steps_to_reproduce: self.__unsafe_private_named.7.unwrap(),
-            steps_to_reproduce_facets: self.__unsafe_private_named.8,
-            title: self.__unsafe_private_named.9.unwrap(),
+            app_used: self._fields.0,
+            attachments: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3.unwrap(),
+            description_facets: self._fields.4,
+            namespace: self._fields.5.unwrap(),
+            severity: self._fields.6.unwrap(),
+            steps_to_reproduce: self._fields.7.unwrap(),
+            steps_to_reproduce_facets: self._fields.8,
+            title: self._fields.9.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -676,16 +669,16 @@ where
         >,
     ) -> Bug<'a> {
         Bug {
-            app_used: self.__unsafe_private_named.0,
-            attachments: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3.unwrap(),
-            description_facets: self.__unsafe_private_named.4,
-            namespace: self.__unsafe_private_named.5.unwrap(),
-            severity: self.__unsafe_private_named.6.unwrap(),
-            steps_to_reproduce: self.__unsafe_private_named.7.unwrap(),
-            steps_to_reproduce_facets: self.__unsafe_private_named.8,
-            title: self.__unsafe_private_named.9.unwrap(),
+            app_used: self._fields.0,
+            attachments: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3.unwrap(),
+            description_facets: self._fields.4,
+            namespace: self._fields.5.unwrap(),
+            severity: self._fields.6.unwrap(),
+            steps_to_reproduce: self._fields.7.unwrap(),
+            steps_to_reproduce_facets: self._fields.8,
+            title: self._fields.9.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/tools/bug/comment.rs b/crates/jacquard-api/src/network_slices/tools/bug/comment.rs
index 715ce28f..7e35819e 100644
--- a/crates/jacquard-api/src/network_slices/tools/bug/comment.rs
+++ b/crates/jacquard-api/src/network_slices/tools/bug/comment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -197,8 +200,8 @@ pub mod comment_state {
 
 /// Builder for constructing an instance of this type
 pub struct CommentBuilder<'a, S: comment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Images<'a>>,
         Option<CowStr<'a>>,
         Option<Vec<Facet<'a>>>,
@@ -206,7 +209,7 @@ pub struct CommentBuilder<'a, S: comment_state::State> {
         Option<Datetime>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Comment<'a> {
@@ -220,9 +223,9 @@ impl<'a> CommentBuilder<'a, comment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -230,12 +233,12 @@ impl<'a> CommentBuilder<'a, comment_state::Empty> {
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `attachments` field (optional)
     pub fn attachments(mut self, value: impl Into<Option<Images<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `attachments` field to an Option value (optional)
     pub fn maybe_attachments(mut self, value: Option<Images<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -250,11 +253,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetBody<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -262,12 +265,12 @@ where
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `bodyFacets` field (optional)
     pub fn body_facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `bodyFacets` field to an Option value (optional)
     pub fn maybe_body_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -282,11 +285,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetBug<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -301,11 +304,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CommentBuilder<'a, comment_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -313,12 +316,12 @@ where
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -333,12 +336,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Comment<'a> {
         Comment {
-            attachments: self.__unsafe_private_named.0,
-            body: self.__unsafe_private_named.1.unwrap(),
-            body_facets: self.__unsafe_private_named.2,
-            bug: self.__unsafe_private_named.3.unwrap(),
-            created_at: self.__unsafe_private_named.4.unwrap(),
-            parent: self.__unsafe_private_named.5,
+            attachments: self._fields.0,
+            body: self._fields.1.unwrap(),
+            body_facets: self._fields.2,
+            bug: self._fields.3.unwrap(),
+            created_at: self._fields.4.unwrap(),
+            parent: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -351,12 +354,12 @@ where
         >,
     ) -> Comment<'a> {
         Comment {
-            attachments: self.__unsafe_private_named.0,
-            body: self.__unsafe_private_named.1.unwrap(),
-            body_facets: self.__unsafe_private_named.2,
-            bug: self.__unsafe_private_named.3.unwrap(),
-            created_at: self.__unsafe_private_named.4.unwrap(),
-            parent: self.__unsafe_private_named.5,
+            attachments: self._fields.0,
+            body: self._fields.1.unwrap(),
+            body_facets: self._fields.2,
+            bug: self._fields.3.unwrap(),
+            created_at: self._fields.4.unwrap(),
+            parent: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/tools/bug/issue.rs b/crates/jacquard-api/src/network_slices/tools/bug/issue.rs
index 335a5176..e878b82c 100644
--- a/crates/jacquard-api/src/network_slices/tools/bug/issue.rs
+++ b/crates/jacquard-api/src/network_slices/tools/bug/issue.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -111,59 +114,59 @@ pub mod issue_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Bug;
-        type CreatedAt;
         type Issue;
+        type CreatedAt;
+        type Bug;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Bug = Unset;
-        type CreatedAt = Unset;
         type Issue = Unset;
+        type CreatedAt = Unset;
+        type Bug = Unset;
     }
-    ///State transition - sets the `bug` field to Set
-    pub struct SetBug<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBug<S> {}
-    impl<S: State> State for SetBug<S> {
-        type Bug = Set<members::bug>;
+    ///State transition - sets the `issue` field to Set
+    pub struct SetIssue<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIssue<S> {}
+    impl<S: State> State for SetIssue<S> {
+        type Issue = Set<members::issue>;
         type CreatedAt = S::CreatedAt;
-        type Issue = S::Issue;
+        type Bug = S::Bug;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Bug = S::Bug;
-        type CreatedAt = Set<members::created_at>;
         type Issue = S::Issue;
-    }
-    ///State transition - sets the `issue` field to Set
-    pub struct SetIssue<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIssue<S> {}
-    impl<S: State> State for SetIssue<S> {
+        type CreatedAt = Set<members::created_at>;
         type Bug = S::Bug;
+    }
+    ///State transition - sets the `bug` field to Set
+    pub struct SetBug<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBug<S> {}
+    impl<S: State> State for SetBug<S> {
+        type Issue = S::Issue;
         type CreatedAt = S::CreatedAt;
-        type Issue = Set<members::issue>;
+        type Bug = Set<members::bug>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `bug` field
-        pub struct bug(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `issue` field
         pub struct issue(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `bug` field
+        pub struct bug(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct IssueBuilder<'a, S: issue_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<Datetime>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<Datetime>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Issue<'a> {
@@ -177,9 +180,9 @@ impl<'a> IssueBuilder<'a, issue_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IssueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -194,11 +197,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> IssueBuilder<'a, issue_state::SetBug<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         IssueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,11 +216,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> IssueBuilder<'a, issue_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         IssueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,11 +235,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> IssueBuilder<'a, issue_state::SetIssue<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         IssueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,16 +247,16 @@ where
 impl<'a, S> IssueBuilder<'a, S>
 where
     S: issue_state::State,
-    S::Bug: issue_state::IsSet,
-    S::CreatedAt: issue_state::IsSet,
     S::Issue: issue_state::IsSet,
+    S::CreatedAt: issue_state::IsSet,
+    S::Bug: issue_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Issue<'a> {
         Issue {
-            bug: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            issue: self.__unsafe_private_named.2.unwrap(),
+            bug: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            issue: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -266,9 +269,9 @@ where
         >,
     ) -> Issue<'a> {
         Issue {
-            bug: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            issue: self.__unsafe_private_named.2.unwrap(),
+            bug: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            issue: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/tools/bug/response.rs b/crates/jacquard-api/src/network_slices/tools/bug/response.rs
index f62e5698..d323672a 100644
--- a/crates/jacquard-api/src/network_slices/tools/bug/response.rs
+++ b/crates/jacquard-api/src/network_slices/tools/bug/response.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -245,49 +248,49 @@ pub mod response_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Status;
         type Bug;
+        type Status;
         type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Status = Unset;
         type Bug = Unset;
+        type Status = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `status` field to Set
-    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStatus<S> {}
-    impl<S: State> State for SetStatus<S> {
-        type Status = Set<members::status>;
-        type Bug = S::Bug;
-        type CreatedAt = S::CreatedAt;
-    }
     ///State transition - sets the `bug` field to Set
     pub struct SetBug<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBug<S> {}
     impl<S: State> State for SetBug<S> {
-        type Status = S::Status;
         type Bug = Set<members::bug>;
+        type Status = S::Status;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `status` field to Set
+    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStatus<S> {}
+    impl<S: State> State for SetStatus<S> {
+        type Bug = S::Bug;
+        type Status = Set<members::status>;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Status = S::Status;
         type Bug = S::Bug;
+        type Status = S::Status;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `status` field
-        pub struct status(());
         ///Marker type for the `bug` field
         pub struct bug(());
+        ///Marker type for the `status` field
+        pub struct status(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
     }
@@ -295,15 +298,15 @@ pub mod response_state {
 
 /// Builder for constructing an instance of this type
 pub struct ResponseBuilder<'a, S: response_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Vec<Facet<'a>>>,
         Option<ResponseStatus<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Response<'a> {
@@ -317,9 +320,9 @@ impl<'a> ResponseBuilder<'a, response_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -334,11 +337,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ResponseBuilder<'a, response_state::SetBug<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -353,11 +356,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ResponseBuilder<'a, response_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -365,12 +368,12 @@ where
 impl<'a, S: response_state::State> ResponseBuilder<'a, S> {
     /// Set the `message` field (optional)
     pub fn message(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `message` field to an Option value (optional)
     pub fn maybe_message(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -378,12 +381,12 @@ impl<'a, S: response_state::State> ResponseBuilder<'a, S> {
 impl<'a, S: response_state::State> ResponseBuilder<'a, S> {
     /// Set the `messageFacets` field (optional)
     pub fn message_facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `messageFacets` field to an Option value (optional)
     pub fn maybe_message_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -398,11 +401,11 @@ where
         mut self,
         value: impl Into<ResponseStatus<'a>>,
     ) -> ResponseBuilder<'a, response_state::SetStatus<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -410,18 +413,18 @@ where
 impl<'a, S> ResponseBuilder<'a, S>
 where
     S: response_state::State,
-    S::Status: response_state::IsSet,
     S::Bug: response_state::IsSet,
+    S::Status: response_state::IsSet,
     S::CreatedAt: response_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Response<'a> {
         Response {
-            bug: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            message: self.__unsafe_private_named.2,
-            message_facets: self.__unsafe_private_named.3,
-            status: self.__unsafe_private_named.4.unwrap(),
+            bug: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            message: self._fields.2,
+            message_facets: self._fields.3,
+            status: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -434,11 +437,11 @@ where
         >,
     ) -> Response<'a> {
         Response {
-            bug: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            message: self.__unsafe_private_named.2,
-            message_facets: self.__unsafe_private_named.3,
-            status: self.__unsafe_private_named.4.unwrap(),
+            bug: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            message: self._fields.2,
+            message_facets: self._fields.3,
+            status: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/tools/document.rs b/crates/jacquard-api/src/network_slices/tools/document.rs
index 89ccfacc..0f96506a 100644
--- a/crates/jacquard-api/src/network_slices/tools/document.rs
+++ b/crates/jacquard-api/src/network_slices/tools/document.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -817,9 +820,9 @@ pub mod heading_state {
 
 /// Builder for constructing an instance of this type
 pub struct HeadingBuilder<'a, S: heading_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<Facet<'a>>>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<Facet<'a>>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Heading<'a> {
@@ -833,9 +836,9 @@ impl<'a> HeadingBuilder<'a, heading_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HeadingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -843,12 +846,12 @@ impl<'a> HeadingBuilder<'a, heading_state::Empty> {
 impl<'a, S: heading_state::State> HeadingBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -863,11 +866,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> HeadingBuilder<'a, heading_state::SetLevel<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         HeadingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -882,11 +885,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> HeadingBuilder<'a, heading_state::SetText<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         HeadingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -900,9 +903,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Heading<'a> {
         Heading {
-            facets: self.__unsafe_private_named.0,
-            level: self.__unsafe_private_named.1.unwrap(),
-            text: self.__unsafe_private_named.2.unwrap(),
+            facets: self._fields.0,
+            level: self._fields.1.unwrap(),
+            text: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -915,9 +918,9 @@ where
         >,
     ) -> Heading<'a> {
         Heading {
-            facets: self.__unsafe_private_named.0,
-            level: self.__unsafe_private_named.1.unwrap(),
-            text: self.__unsafe_private_named.2.unwrap(),
+            facets: self._fields.0,
+            level: self._fields.1.unwrap(),
+            text: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -957,9 +960,9 @@ pub mod image_embed_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImageEmbedBuilder<'a, S: image_embed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<BlobRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<BlobRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ImageEmbed<'a> {
@@ -973,9 +976,9 @@ impl<'a> ImageEmbedBuilder<'a, image_embed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -983,12 +986,12 @@ impl<'a> ImageEmbedBuilder<'a, image_embed_state::Empty> {
 impl<'a, S: image_embed_state::State> ImageEmbedBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1003,11 +1006,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ImageEmbedBuilder<'a, image_embed_state::SetImage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ImageEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1020,8 +1023,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ImageEmbed<'a> {
         ImageEmbed {
-            alt: self.__unsafe_private_named.0,
-            image: self.__unsafe_private_named.1.unwrap(),
+            alt: self._fields.0,
+            image: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1034,8 +1037,8 @@ where
         >,
     ) -> ImageEmbed<'a> {
         ImageEmbed {
-            alt: self.__unsafe_private_named.0,
-            image: self.__unsafe_private_named.1.unwrap(),
+            alt: self._fields.0,
+            image: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1051,81 +1054,81 @@ pub mod document_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Title;
-        type CreatedAt;
-        type Blocks;
         type Slug;
+        type Blocks;
+        type CreatedAt;
+        type Title;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Title = Unset;
-        type CreatedAt = Unset;
-        type Blocks = Unset;
         type Slug = Unset;
+        type Blocks = Unset;
+        type CreatedAt = Unset;
+        type Title = Unset;
     }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Title = Set<members::title>;
-        type CreatedAt = S::CreatedAt;
+    ///State transition - sets the `slug` field to Set
+    pub struct SetSlug<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSlug<S> {}
+    impl<S: State> State for SetSlug<S> {
+        type Slug = Set<members::slug>;
         type Blocks = S::Blocks;
-        type Slug = S::Slug;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = S::CreatedAt;
         type Title = S::Title;
-        type CreatedAt = Set<members::created_at>;
-        type Blocks = S::Blocks;
-        type Slug = S::Slug;
     }
     ///State transition - sets the `blocks` field to Set
     pub struct SetBlocks<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBlocks<S> {}
     impl<S: State> State for SetBlocks<S> {
-        type Title = S::Title;
-        type CreatedAt = S::CreatedAt;
-        type Blocks = Set<members::blocks>;
         type Slug = S::Slug;
+        type Blocks = Set<members::blocks>;
+        type CreatedAt = S::CreatedAt;
+        type Title = S::Title;
     }
-    ///State transition - sets the `slug` field to Set
-    pub struct SetSlug<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSlug<S> {}
-    impl<S: State> State for SetSlug<S> {
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Slug = S::Slug;
+        type Blocks = S::Blocks;
+        type CreatedAt = Set<members::created_at>;
         type Title = S::Title;
-        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type Slug = S::Slug;
         type Blocks = S::Blocks;
-        type Slug = Set<members::slug>;
+        type CreatedAt = S::CreatedAt;
+        type Title = Set<members::title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `title` field
-        pub struct title(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `blocks` field
-        pub struct blocks(());
         ///Marker type for the `slug` field
         pub struct slug(());
+        ///Marker type for the `blocks` field
+        pub struct blocks(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `title` field
+        pub struct title(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DocumentBuilder<'a, S: document_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<DocumentBlocksItem<'a>>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Document<'a> {
@@ -1139,9 +1142,9 @@ impl<'a> DocumentBuilder<'a, document_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1156,11 +1159,11 @@ where
         mut self,
         value: impl Into<Vec<DocumentBlocksItem<'a>>>,
     ) -> DocumentBuilder<'a, document_state::SetBlocks<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1175,11 +1178,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DocumentBuilder<'a, document_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1194,11 +1197,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DocumentBuilder<'a, document_state::SetSlug<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1213,11 +1216,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DocumentBuilder<'a, document_state::SetTitle<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1225,12 +1228,12 @@ where
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1238,19 +1241,19 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S> DocumentBuilder<'a, S>
 where
     S: document_state::State,
-    S::Title: document_state::IsSet,
-    S::CreatedAt: document_state::IsSet,
-    S::Blocks: document_state::IsSet,
     S::Slug: document_state::IsSet,
+    S::Blocks: document_state::IsSet,
+    S::CreatedAt: document_state::IsSet,
+    S::Title: document_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Document<'a> {
         Document {
-            blocks: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            slug: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4,
+            blocks: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            slug: self._fields.2.unwrap(),
+            title: self._fields.3.unwrap(),
+            updated_at: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -1263,11 +1266,11 @@ where
         >,
     ) -> Document<'a> {
         Document {
-            blocks: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            slug: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4,
+            blocks: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            slug: self._fields.2.unwrap(),
+            title: self._fields.3.unwrap(),
+            updated_at: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/tools/richtext/facet.rs b/crates/jacquard-api/src/network_slices/tools/richtext/facet.rs
index 7c451578..4a3d49ba 100644
--- a/crates/jacquard-api/src/network_slices/tools/richtext/facet.rs
+++ b/crates/jacquard-api/src/network_slices/tools/richtext/facet.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -420,45 +423,45 @@ pub mod byte_slice_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ByteEnd;
         type ByteStart;
+        type ByteEnd;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ByteEnd = Unset;
         type ByteStart = Unset;
-    }
-    ///State transition - sets the `byte_end` field to Set
-    pub struct SetByteEnd<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetByteEnd<S> {}
-    impl<S: State> State for SetByteEnd<S> {
-        type ByteEnd = Set<members::byte_end>;
-        type ByteStart = S::ByteStart;
+        type ByteEnd = Unset;
     }
     ///State transition - sets the `byte_start` field to Set
     pub struct SetByteStart<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetByteStart<S> {}
     impl<S: State> State for SetByteStart<S> {
-        type ByteEnd = S::ByteEnd;
         type ByteStart = Set<members::byte_start>;
+        type ByteEnd = S::ByteEnd;
+    }
+    ///State transition - sets the `byte_end` field to Set
+    pub struct SetByteEnd<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetByteEnd<S> {}
+    impl<S: State> State for SetByteEnd<S> {
+        type ByteStart = S::ByteStart;
+        type ByteEnd = Set<members::byte_end>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `byte_end` field
-        pub struct byte_end(());
         ///Marker type for the `byte_start` field
         pub struct byte_start(());
+        ///Marker type for the `byte_end` field
+        pub struct byte_end(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ByteSliceBuilder<'a, S: byte_slice_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ByteSlice<'a> {
@@ -472,9 +475,9 @@ impl<'a> ByteSliceBuilder<'a, byte_slice_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -489,11 +492,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteEnd<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -508,11 +511,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteStart<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -520,14 +523,14 @@ where
 impl<'a, S> ByteSliceBuilder<'a, S>
 where
     S: byte_slice_state::State,
-    S::ByteEnd: byte_slice_state::IsSet,
     S::ByteStart: byte_slice_state::IsSet,
+    S::ByteEnd: byte_slice_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -540,8 +543,8 @@ where
         >,
     ) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -581,9 +584,9 @@ pub mod link_state {
 
 /// Builder for constructing an instance of this type
 pub struct LinkBuilder<'a, S: link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Link<'a> {
@@ -597,9 +600,9 @@ impl<'a> LinkBuilder<'a, link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -614,11 +617,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LinkBuilder<'a, link_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -631,7 +634,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Link<'a> {
         Link {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -644,7 +647,7 @@ where
         >,
     ) -> Link<'a> {
         Link {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -696,12 +699,9 @@ pub mod facet_state {
 
 /// Builder for constructing an instance of this type
 pub struct FacetBuilder<'a, S: facet_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<FacetFeaturesItem<'a>>>,
-        Option<facet::ByteSlice<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<FacetFeaturesItem<'a>>>, Option<facet::ByteSlice<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Facet<'a> {
@@ -715,9 +715,9 @@ impl<'a> FacetBuilder<'a, facet_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -732,11 +732,11 @@ where
         mut self,
         value: impl Into<Vec<FacetFeaturesItem<'a>>>,
     ) -> FacetBuilder<'a, facet_state::SetFeatures<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -751,11 +751,11 @@ where
         mut self,
         value: impl Into<facet::ByteSlice<'a>>,
     ) -> FacetBuilder<'a, facet_state::SetIndex<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -769,8 +769,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -783,8 +783,8 @@ where
         >,
     ) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/waitlist.rs b/crates/jacquard-api/src/network_slices/waitlist.rs
index f1d84e96..31a26c96 100644
--- a/crates/jacquard-api/src/network_slices/waitlist.rs
+++ b/crates/jacquard-api/src/network_slices/waitlist.rs
@@ -8,7 +8,11 @@
 pub mod invite;
 pub mod request;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -107,57 +111,57 @@ pub mod invite_view_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Slice;
-        type CreatedAt;
         type Did;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Slice = Unset;
-        type CreatedAt = Unset;
         type Did = Unset;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `slice` field to Set
     pub struct SetSlice<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSlice<S> {}
     impl<S: State> State for SetSlice<S> {
         type Slice = Set<members::slice>;
-        type CreatedAt = S::CreatedAt;
-        type Did = S::Did;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type Slice = S::Slice;
-        type CreatedAt = Set<members::created_at>;
         type Did = S::Did;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
         type Slice = S::Slice;
-        type CreatedAt = S::CreatedAt;
         type Did = Set<members::did>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Slice = S::Slice;
+        type Did = S::Did;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `slice` field
         pub struct slice(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct InviteViewBuilder<'a, S: invite_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Did<'a>>,
         Option<Datetime>,
@@ -165,7 +169,7 @@ pub struct InviteViewBuilder<'a, S: invite_view_state::State> {
         Option<AtUri<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> InviteView<'a> {
@@ -179,9 +183,9 @@ impl<'a> InviteViewBuilder<'a, invite_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         InviteViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +200,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> InviteViewBuilder<'a, invite_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         InviteViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +219,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> InviteViewBuilder<'a, invite_view_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         InviteViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -227,12 +231,12 @@ where
 impl<'a, S: invite_view_state::State> InviteViewBuilder<'a, S> {
     /// Set the `expiresAt` field (optional)
     pub fn expires_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `expiresAt` field to an Option value (optional)
     pub fn maybe_expires_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -240,12 +244,12 @@ impl<'a, S: invite_view_state::State> InviteViewBuilder<'a, S> {
 impl<'a, S: invite_view_state::State> InviteViewBuilder<'a, S> {
     /// Set the `profile` field (optional)
     pub fn profile(mut self, value: impl Into<Option<ProfileViewBasic<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `profile` field to an Option value (optional)
     pub fn maybe_profile(mut self, value: Option<ProfileViewBasic<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -260,11 +264,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> InviteViewBuilder<'a, invite_view_state::SetSlice<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         InviteViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -272,12 +276,12 @@ where
 impl<'a, S: invite_view_state::State> InviteViewBuilder<'a, S> {
     /// Set the `uri` field (optional)
     pub fn uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `uri` field to an Option value (optional)
     pub fn maybe_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -286,18 +290,18 @@ impl<'a, S> InviteViewBuilder<'a, S>
 where
     S: invite_view_state::State,
     S::Slice: invite_view_state::IsSet,
-    S::CreatedAt: invite_view_state::IsSet,
     S::Did: invite_view_state::IsSet,
+    S::CreatedAt: invite_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> InviteView<'a> {
         InviteView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            expires_at: self.__unsafe_private_named.2,
-            profile: self.__unsafe_private_named.3,
-            slice: self.__unsafe_private_named.4.unwrap(),
-            uri: self.__unsafe_private_named.5,
+            created_at: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            expires_at: self._fields.2,
+            profile: self._fields.3,
+            slice: self._fields.4.unwrap(),
+            uri: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -310,12 +314,12 @@ where
         >,
     ) -> InviteView<'a> {
         InviteView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            expires_at: self.__unsafe_private_named.2,
-            profile: self.__unsafe_private_named.3,
-            slice: self.__unsafe_private_named.4.unwrap(),
-            uri: self.__unsafe_private_named.5,
+            created_at: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            expires_at: self._fields.2,
+            profile: self._fields.3,
+            slice: self._fields.4.unwrap(),
+            uri: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
@@ -521,13 +525,9 @@ pub mod request_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct RequestViewBuilder<'a, S: request_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<ProfileViewBasic<'a>>,
-        Option<AtUri<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<ProfileViewBasic<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RequestView<'a> {
@@ -541,9 +541,9 @@ impl<'a> RequestViewBuilder<'a, request_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RequestViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -558,11 +558,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RequestViewBuilder<'a, request_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RequestViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -570,12 +570,12 @@ where
 impl<'a, S: request_view_state::State> RequestViewBuilder<'a, S> {
     /// Set the `profile` field (optional)
     pub fn profile(mut self, value: impl Into<Option<ProfileViewBasic<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `profile` field to an Option value (optional)
     pub fn maybe_profile(mut self, value: Option<ProfileViewBasic<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -590,11 +590,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RequestViewBuilder<'a, request_view_state::SetSlice<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RequestViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -608,9 +608,9 @@ where
     /// Build the final struct
     pub fn build(self) -> RequestView<'a> {
         RequestView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            profile: self.__unsafe_private_named.1,
-            slice: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            profile: self._fields.1,
+            slice: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -623,9 +623,9 @@ where
         >,
     ) -> RequestView<'a> {
         RequestView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            profile: self.__unsafe_private_named.1,
-            slice: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            profile: self._fields.1,
+            slice: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/waitlist/invite.rs b/crates/jacquard-api/src/network_slices/waitlist/invite.rs
index f36006a0..a56766d5 100644
--- a/crates/jacquard-api/src/network_slices/waitlist/invite.rs
+++ b/crates/jacquard-api/src/network_slices/waitlist/invite.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -116,49 +119,49 @@ pub mod invite_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Did;
         type Slice;
+        type Did;
         type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Did = Unset;
         type Slice = Unset;
+        type Did = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Did = Set<members::did>;
-        type Slice = S::Slice;
-        type CreatedAt = S::CreatedAt;
-    }
     ///State transition - sets the `slice` field to Set
     pub struct SetSlice<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSlice<S> {}
     impl<S: State> State for SetSlice<S> {
-        type Did = S::Did;
         type Slice = Set<members::slice>;
+        type Did = S::Did;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Slice = S::Slice;
+        type Did = Set<members::did>;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Did = S::Did;
         type Slice = S::Slice;
+        type Did = S::Did;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `slice` field
         pub struct slice(());
+        ///Marker type for the `did` field
+        pub struct did(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
     }
@@ -166,14 +169,9 @@ pub mod invite_state {
 
 /// Builder for constructing an instance of this type
 pub struct InviteBuilder<'a, S: invite_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<Did<'a>>,
-        Option<Datetime>,
-        Option<AtUri<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>, Option<Datetime>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Invite<'a> {
@@ -187,9 +185,9 @@ impl<'a> InviteBuilder<'a, invite_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         InviteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,11 +202,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> InviteBuilder<'a, invite_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         InviteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -223,11 +221,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> InviteBuilder<'a, invite_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         InviteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -235,12 +233,12 @@ where
 impl<'a, S: invite_state::State> InviteBuilder<'a, S> {
     /// Set the `expiresAt` field (optional)
     pub fn expires_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `expiresAt` field to an Option value (optional)
     pub fn maybe_expires_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -255,11 +253,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> InviteBuilder<'a, invite_state::SetSlice<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         InviteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -267,17 +265,17 @@ where
 impl<'a, S> InviteBuilder<'a, S>
 where
     S: invite_state::State,
-    S::Did: invite_state::IsSet,
     S::Slice: invite_state::IsSet,
+    S::Did: invite_state::IsSet,
     S::CreatedAt: invite_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Invite<'a> {
         Invite {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            expires_at: self.__unsafe_private_named.2,
-            slice: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            expires_at: self._fields.2,
+            slice: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -290,10 +288,10 @@ where
         >,
     ) -> Invite<'a> {
         Invite {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            expires_at: self.__unsafe_private_named.2,
-            slice: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            expires_at: self._fields.2,
+            slice: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/network_slices/waitlist/request.rs b/crates/jacquard-api/src/network_slices/waitlist/request.rs
index 432c4a40..9b27cea7 100644
--- a/crates/jacquard-api/src/network_slices/waitlist/request.rs
+++ b/crates/jacquard-api/src/network_slices/waitlist/request.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,9 +149,9 @@ pub mod request_state {
 
 /// Builder for constructing an instance of this type
 pub struct RequestBuilder<'a, S: request_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Request<'a> {
@@ -162,9 +165,9 @@ impl<'a> RequestBuilder<'a, request_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RequestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RequestBuilder<'a, request_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RequestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RequestBuilder<'a, request_state::SetSlice<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RequestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,8 +219,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Request<'a> {
         Request {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            slice: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            slice: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Request<'a> {
         Request {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            slice: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            slice: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/ooo_bsky/authfetch/delete_records.rs b/crates/jacquard-api/src/ooo_bsky/authfetch/delete_records.rs
index 9fbfdccd..9b49bdec 100644
--- a/crates/jacquard-api/src/ooo_bsky/authfetch/delete_records.rs
+++ b/crates/jacquard-api/src/ooo_bsky/authfetch/delete_records.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -82,9 +85,9 @@ pub mod delete_records_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeleteRecordsBuilder<'a, S: delete_records_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<AtUri<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<AtUri<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeleteRecords<'a> {
@@ -98,9 +101,9 @@ impl<'a> DeleteRecordsBuilder<'a, delete_records_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteRecordsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -115,11 +118,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> DeleteRecordsBuilder<'a, delete_records_state::SetUris<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeleteRecordsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -132,7 +135,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DeleteRecords<'a> {
         DeleteRecords {
-            uris: self.__unsafe_private_named.0.unwrap(),
+            uris: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -145,7 +148,7 @@ where
         >,
     ) -> DeleteRecords<'a> {
         DeleteRecords {
-            uris: self.__unsafe_private_named.0.unwrap(),
+            uris: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/ooo_bsky/authfetch/describe_repo.rs b/crates/jacquard-api/src/ooo_bsky/authfetch/describe_repo.rs
index 23943000..7d1d7d35 100644
--- a/crates/jacquard-api/src/ooo_bsky/authfetch/describe_repo.rs
+++ b/crates/jacquard-api/src/ooo_bsky/authfetch/describe_repo.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::{Did, Nsid};
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/ooo_bsky/authfetch/destroy_repo.rs b/crates/jacquard-api/src/ooo_bsky/authfetch/destroy_repo.rs
index 026ff471..fa820db7 100644
--- a/crates/jacquard-api/src/ooo_bsky/authfetch/destroy_repo.rs
+++ b/crates/jacquard-api/src/ooo_bsky/authfetch/destroy_repo.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::IntoStatic;
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/ooo_bsky/authfetch/export_repo.rs b/crates/jacquard-api/src/ooo_bsky/authfetch/export_repo.rs
index 121fd925..f632d67d 100644
--- a/crates/jacquard-api/src/ooo_bsky/authfetch/export_repo.rs
+++ b/crates/jacquard-api/src/ooo_bsky/authfetch/export_repo.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::deps::bytes::Bytes;
 use jacquard_derive::IntoStatic;
diff --git a/crates/jacquard-api/src/ooo_bsky/authfetch/fetch_records.rs b/crates/jacquard-api/src/ooo_bsky/authfetch/fetch_records.rs
index 6d2224f6..f1c1652a 100644
--- a/crates/jacquard-api/src/ooo_bsky/authfetch/fetch_records.rs
+++ b/crates/jacquard-api/src/ooo_bsky/authfetch/fetch_records.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -129,9 +132,9 @@ pub mod fetch_records_state {
 
 /// Builder for constructing an instance of this type
 pub struct FetchRecordsBuilder<'a, S: fetch_records_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<AtUri<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<AtUri<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> FetchRecords<'a> {
@@ -145,9 +148,9 @@ impl<'a> FetchRecordsBuilder<'a, fetch_records_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FetchRecordsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -162,11 +165,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> FetchRecordsBuilder<'a, fetch_records_state::SetUris<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FetchRecordsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,7 +182,7 @@ where
     /// Build the final struct
     pub fn build(self) -> FetchRecords<'a> {
         FetchRecords {
-            uris: self.__unsafe_private_named.0.unwrap(),
+            uris: self._fields.0.unwrap(),
         }
     }
 }
@@ -194,59 +197,59 @@ pub mod fetch_records_result_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Strategy;
         type Uri;
         type Record;
-        type Strategy;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Strategy = Unset;
         type Uri = Unset;
         type Record = Unset;
-        type Strategy = Unset;
+    }
+    ///State transition - sets the `strategy` field to Set
+    pub struct SetStrategy<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStrategy<S> {}
+    impl<S: State> State for SetStrategy<S> {
+        type Strategy = Set<members::strategy>;
+        type Uri = S::Uri;
+        type Record = S::Record;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
+        type Strategy = S::Strategy;
         type Uri = Set<members::uri>;
         type Record = S::Record;
-        type Strategy = S::Strategy;
     }
     ///State transition - sets the `record` field to Set
     pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecord<S> {}
     impl<S: State> State for SetRecord<S> {
-        type Uri = S::Uri;
-        type Record = Set<members::record>;
         type Strategy = S::Strategy;
-    }
-    ///State transition - sets the `strategy` field to Set
-    pub struct SetStrategy<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStrategy<S> {}
-    impl<S: State> State for SetStrategy<S> {
         type Uri = S::Uri;
-        type Record = S::Record;
-        type Strategy = Set<members::strategy>;
+        type Record = Set<members::record>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `strategy` field
+        pub struct strategy(());
         ///Marker type for the `uri` field
         pub struct uri(());
         ///Marker type for the `record` field
         pub struct record(());
-        ///Marker type for the `strategy` field
-        pub struct strategy(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FetchRecordsResultBuilder<'a, S: fetch_records_result_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Data<'a>>, Option<Strategy<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Data<'a>>, Option<Strategy<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> FetchRecordsResult<'a> {
@@ -260,9 +263,9 @@ impl<'a> FetchRecordsResultBuilder<'a, fetch_records_result_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FetchRecordsResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -277,11 +280,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> FetchRecordsResultBuilder<'a, fetch_records_result_state::SetRecord<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FetchRecordsResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -296,11 +299,11 @@ where
         mut self,
         value: impl Into<Strategy<'a>>,
     ) -> FetchRecordsResultBuilder<'a, fetch_records_result_state::SetStrategy<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FetchRecordsResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -315,11 +318,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> FetchRecordsResultBuilder<'a, fetch_records_result_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         FetchRecordsResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -327,16 +330,16 @@ where
 impl<'a, S> FetchRecordsResultBuilder<'a, S>
 where
     S: fetch_records_result_state::State,
+    S::Strategy: fetch_records_result_state::IsSet,
     S::Uri: fetch_records_result_state::IsSet,
     S::Record: fetch_records_result_state::IsSet,
-    S::Strategy: fetch_records_result_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> FetchRecordsResult<'a> {
         FetchRecordsResult {
-            record: self.__unsafe_private_named.0.unwrap(),
-            strategy: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            record: self._fields.0.unwrap(),
+            strategy: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -346,9 +349,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> FetchRecordsResult<'a> {
         FetchRecordsResult {
-            record: self.__unsafe_private_named.0.unwrap(),
-            strategy: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            record: self._fields.0.unwrap(),
+            strategy: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/ooo_bsky/authfetch/import_repo.rs b/crates/jacquard-api/src/ooo_bsky/authfetch/import_repo.rs
index 6357f483..17c9df6f 100644
--- a/crates/jacquard-api/src/ooo_bsky/authfetch/import_repo.rs
+++ b/crates/jacquard-api/src/ooo_bsky/authfetch/import_repo.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::deps::bytes::Bytes;
 use jacquard_derive::IntoStatic;
diff --git a/crates/jacquard-api/src/ooo_bsky/authfetch/list_records.rs b/crates/jacquard-api/src/ooo_bsky/authfetch/list_records.rs
index d875f036..aededb46 100644
--- a/crates/jacquard-api/src/ooo_bsky/authfetch/list_records.rs
+++ b/crates/jacquard-api/src/ooo_bsky/authfetch/list_records.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -145,14 +148,9 @@ pub mod list_records_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListRecordsBuilder<'a, S: list_records_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Nsid<'a>>,
-        Option<CowStr<'a>>,
-        Option<i64>,
-        Option<bool>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Nsid<'a>>, Option<CowStr<'a>>, Option<i64>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListRecords<'a> {
@@ -166,9 +164,9 @@ impl<'a> ListRecordsBuilder<'a, list_records_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListRecordsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,11 +181,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> ListRecordsBuilder<'a, list_records_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListRecordsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -195,12 +193,12 @@ where
 impl<'a, S: list_records_state::State> ListRecordsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -208,12 +206,12 @@ impl<'a, S: list_records_state::State> ListRecordsBuilder<'a, S> {
 impl<'a, S: list_records_state::State> ListRecordsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -221,12 +219,12 @@ impl<'a, S: list_records_state::State> ListRecordsBuilder<'a, S> {
 impl<'a, S: list_records_state::State> ListRecordsBuilder<'a, S> {
     /// Set the `reverse` field (optional)
     pub fn reverse(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `reverse` field to an Option value (optional)
     pub fn maybe_reverse(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -239,10 +237,10 @@ where
     /// Build the final struct
     pub fn build(self) -> ListRecords<'a> {
         ListRecords {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            reverse: self.__unsafe_private_named.3,
+            collection: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
+            reverse: self._fields.3,
         }
     }
 }
@@ -258,58 +256,58 @@ pub mod record_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Uri;
-        type Value;
         type Strategy;
+        type Value;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Uri = Unset;
-        type Value = Unset;
         type Strategy = Unset;
+        type Value = Unset;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
         type Uri = Set<members::uri>;
-        type Value = S::Value;
-        type Strategy = S::Strategy;
-    }
-    ///State transition - sets the `value` field to Set
-    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetValue<S> {}
-    impl<S: State> State for SetValue<S> {
-        type Uri = S::Uri;
-        type Value = Set<members::value>;
         type Strategy = S::Strategy;
+        type Value = S::Value;
     }
     ///State transition - sets the `strategy` field to Set
     pub struct SetStrategy<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStrategy<S> {}
     impl<S: State> State for SetStrategy<S> {
         type Uri = S::Uri;
-        type Value = S::Value;
         type Strategy = Set<members::strategy>;
+        type Value = S::Value;
+    }
+    ///State transition - sets the `value` field to Set
+    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetValue<S> {}
+    impl<S: State> State for SetValue<S> {
+        type Uri = S::Uri;
+        type Strategy = S::Strategy;
+        type Value = Set<members::value>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `value` field
-        pub struct value(());
         ///Marker type for the `strategy` field
         pub struct strategy(());
+        ///Marker type for the `value` field
+        pub struct value(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RecordBuilder<'a, S: record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Strategy<'a>>, Option<AtUri<'a>>, Option<Data<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Strategy<'a>>, Option<AtUri<'a>>, Option<Data<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Record<'a> {
@@ -323,9 +321,9 @@ impl<'a> RecordBuilder<'a, record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -340,11 +338,11 @@ where
         mut self,
         value: impl Into<Strategy<'a>>,
     ) -> RecordBuilder<'a, record_state::SetStrategy<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -359,11 +357,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RecordBuilder<'a, record_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -378,11 +376,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> RecordBuilder<'a, record_state::SetValue<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -391,15 +389,15 @@ impl<'a, S> RecordBuilder<'a, S>
 where
     S: record_state::State,
     S::Uri: record_state::IsSet,
-    S::Value: record_state::IsSet,
     S::Strategy: record_state::IsSet,
+    S::Value: record_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Record<'a> {
         Record {
-            strategy: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            strategy: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -409,9 +407,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Record<'a> {
         Record {
-            strategy: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            strategy: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/ooo_bsky/authfetch/put_record.rs b/crates/jacquard-api/src/ooo_bsky/authfetch/put_record.rs
index 729ee28e..c3021c96 100644
--- a/crates/jacquard-api/src/ooo_bsky/authfetch/put_record.rs
+++ b/crates/jacquard-api/src/ooo_bsky/authfetch/put_record.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::{AtUri, Nsid, RecordKey, Rkey};
 use jacquard_common::types::value::Data;
@@ -79,80 +82,80 @@ pub mod put_record_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Record;
         type Rkey;
         type Collection;
         type Strategy;
+        type Record;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Record = Unset;
         type Rkey = Unset;
         type Collection = Unset;
         type Strategy = Unset;
-    }
-    ///State transition - sets the `record` field to Set
-    pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRecord<S> {}
-    impl<S: State> State for SetRecord<S> {
-        type Record = Set<members::record>;
-        type Rkey = S::Rkey;
-        type Collection = S::Collection;
-        type Strategy = S::Strategy;
+        type Record = Unset;
     }
     ///State transition - sets the `rkey` field to Set
     pub struct SetRkey<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRkey<S> {}
     impl<S: State> State for SetRkey<S> {
-        type Record = S::Record;
         type Rkey = Set<members::rkey>;
         type Collection = S::Collection;
         type Strategy = S::Strategy;
+        type Record = S::Record;
     }
     ///State transition - sets the `collection` field to Set
     pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCollection<S> {}
     impl<S: State> State for SetCollection<S> {
-        type Record = S::Record;
         type Rkey = S::Rkey;
         type Collection = Set<members::collection>;
         type Strategy = S::Strategy;
+        type Record = S::Record;
     }
     ///State transition - sets the `strategy` field to Set
     pub struct SetStrategy<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStrategy<S> {}
     impl<S: State> State for SetStrategy<S> {
-        type Record = S::Record;
         type Rkey = S::Rkey;
         type Collection = S::Collection;
         type Strategy = Set<members::strategy>;
+        type Record = S::Record;
+    }
+    ///State transition - sets the `record` field to Set
+    pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRecord<S> {}
+    impl<S: State> State for SetRecord<S> {
+        type Rkey = S::Rkey;
+        type Collection = S::Collection;
+        type Strategy = S::Strategy;
+        type Record = Set<members::record>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `record` field
-        pub struct record(());
         ///Marker type for the `rkey` field
         pub struct rkey(());
         ///Marker type for the `collection` field
         pub struct collection(());
         ///Marker type for the `strategy` field
         pub struct strategy(());
+        ///Marker type for the `record` field
+        pub struct record(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PutRecordBuilder<'a, S: put_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Nsid<'a>>,
         Option<Data<'a>>,
         Option<RecordKey<Rkey<'a>>>,
         Option<Strategy<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PutRecord<'a> {
@@ -166,9 +169,9 @@ impl<'a> PutRecordBuilder<'a, put_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PutRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,11 +186,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> PutRecordBuilder<'a, put_record_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PutRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -202,11 +205,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> PutRecordBuilder<'a, put_record_state::SetRecord<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PutRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,11 +224,11 @@ where
         mut self,
         value: impl Into<RecordKey<Rkey<'a>>>,
     ) -> PutRecordBuilder<'a, put_record_state::SetRkey<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PutRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -240,11 +243,11 @@ where
         mut self,
         value: impl Into<Strategy<'a>>,
     ) -> PutRecordBuilder<'a, put_record_state::SetStrategy<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PutRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -252,18 +255,18 @@ where
 impl<'a, S> PutRecordBuilder<'a, S>
 where
     S: put_record_state::State,
-    S::Record: put_record_state::IsSet,
     S::Rkey: put_record_state::IsSet,
     S::Collection: put_record_state::IsSet,
     S::Strategy: put_record_state::IsSet,
+    S::Record: put_record_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PutRecord<'a> {
         PutRecord {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            record: self.__unsafe_private_named.1.unwrap(),
-            rkey: self.__unsafe_private_named.2.unwrap(),
-            strategy: self.__unsafe_private_named.3.unwrap(),
+            collection: self._fields.0.unwrap(),
+            record: self._fields.1.unwrap(),
+            rkey: self._fields.2.unwrap(),
+            strategy: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -273,10 +276,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> PutRecord<'a> {
         PutRecord {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            record: self.__unsafe_private_named.1.unwrap(),
-            rkey: self.__unsafe_private_named.2.unwrap(),
-            strategy: self.__unsafe_private_named.3.unwrap(),
+            collection: self._fields.0.unwrap(),
+            record: self._fields.1.unwrap(),
+            rkey: self._fields.2.unwrap(),
+            strategy: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atpodcasting/episode.rs b/crates/jacquard-api/src/org_atpodcasting/episode.rs
index 2b3f5dff..791c6552 100644
--- a/crates/jacquard-api/src/org_atpodcasting/episode.rs
+++ b/crates/jacquard-api/src/org_atpodcasting/episode.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -468,45 +471,45 @@ pub mod chapters_ref_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Url;
         type MimeType;
+        type Url;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Url = Unset;
         type MimeType = Unset;
-    }
-    ///State transition - sets the `url` field to Set
-    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUrl<S> {}
-    impl<S: State> State for SetUrl<S> {
-        type Url = Set<members::url>;
-        type MimeType = S::MimeType;
+        type Url = Unset;
     }
     ///State transition - sets the `mime_type` field to Set
     pub struct SetMimeType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMimeType<S> {}
     impl<S: State> State for SetMimeType<S> {
-        type Url = S::Url;
         type MimeType = Set<members::mime_type>;
+        type Url = S::Url;
+    }
+    ///State transition - sets the `url` field to Set
+    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUrl<S> {}
+    impl<S: State> State for SetUrl<S> {
+        type MimeType = S::MimeType;
+        type Url = Set<members::url>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `url` field
-        pub struct url(());
         ///Marker type for the `mime_type` field
         pub struct mime_type(());
+        ///Marker type for the `url` field
+        pub struct url(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ChaptersRefBuilder<'a, S: chapters_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ChaptersRef<'a> {
@@ -520,9 +523,9 @@ impl<'a> ChaptersRefBuilder<'a, chapters_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ChaptersRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -537,11 +540,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ChaptersRefBuilder<'a, chapters_ref_state::SetMimeType<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ChaptersRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -556,11 +559,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ChaptersRefBuilder<'a, chapters_ref_state::SetUrl<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ChaptersRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -568,14 +571,14 @@ where
 impl<'a, S> ChaptersRefBuilder<'a, S>
 where
     S: chapters_ref_state::State,
-    S::Url: chapters_ref_state::IsSet,
     S::MimeType: chapters_ref_state::IsSet,
+    S::Url: chapters_ref_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ChaptersRef<'a> {
         ChaptersRef {
-            mime_type: self.__unsafe_private_named.0.unwrap(),
-            url: self.__unsafe_private_named.1.unwrap(),
+            mime_type: self._fields.0.unwrap(),
+            url: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -588,8 +591,8 @@ where
         >,
     ) -> ChaptersRef<'a> {
         ChaptersRef {
-            mime_type: self.__unsafe_private_named.0.unwrap(),
-            url: self.__unsafe_private_named.1.unwrap(),
+            mime_type: self._fields.0.unwrap(),
+            url: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -944,134 +947,134 @@ pub mod episode_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type FeedItemGuid;
-        type Media;
-        type CreatedAt;
         type Title;
         type PublishedAt;
-        type Duration;
+        type FeedItemGuid;
         type Podcast;
+        type Duration;
+        type CreatedAt;
+        type Media;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type FeedItemGuid = Unset;
-        type Media = Unset;
-        type CreatedAt = Unset;
         type Title = Unset;
         type PublishedAt = Unset;
-        type Duration = Unset;
+        type FeedItemGuid = Unset;
         type Podcast = Unset;
-    }
-    ///State transition - sets the `feed_item_guid` field to Set
-    pub struct SetFeedItemGuid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetFeedItemGuid<S> {}
-    impl<S: State> State for SetFeedItemGuid<S> {
-        type FeedItemGuid = Set<members::feed_item_guid>;
-        type Media = S::Media;
-        type CreatedAt = S::CreatedAt;
-        type Title = S::Title;
-        type PublishedAt = S::PublishedAt;
-        type Duration = S::Duration;
-        type Podcast = S::Podcast;
-    }
-    ///State transition - sets the `media` field to Set
-    pub struct SetMedia<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMedia<S> {}
-    impl<S: State> State for SetMedia<S> {
-        type FeedItemGuid = S::FeedItemGuid;
-        type Media = Set<members::media>;
-        type CreatedAt = S::CreatedAt;
-        type Title = S::Title;
-        type PublishedAt = S::PublishedAt;
-        type Duration = S::Duration;
-        type Podcast = S::Podcast;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type FeedItemGuid = S::FeedItemGuid;
-        type Media = S::Media;
-        type CreatedAt = Set<members::created_at>;
-        type Title = S::Title;
-        type PublishedAt = S::PublishedAt;
-        type Duration = S::Duration;
-        type Podcast = S::Podcast;
+        type Duration = Unset;
+        type CreatedAt = Unset;
+        type Media = Unset;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type FeedItemGuid = S::FeedItemGuid;
-        type Media = S::Media;
-        type CreatedAt = S::CreatedAt;
         type Title = Set<members::title>;
         type PublishedAt = S::PublishedAt;
-        type Duration = S::Duration;
+        type FeedItemGuid = S::FeedItemGuid;
         type Podcast = S::Podcast;
+        type Duration = S::Duration;
+        type CreatedAt = S::CreatedAt;
+        type Media = S::Media;
     }
     ///State transition - sets the `published_at` field to Set
     pub struct SetPublishedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPublishedAt<S> {}
     impl<S: State> State for SetPublishedAt<S> {
+        type Title = S::Title;
+        type PublishedAt = Set<members::published_at>;
         type FeedItemGuid = S::FeedItemGuid;
+        type Podcast = S::Podcast;
+        type Duration = S::Duration;
+        type CreatedAt = S::CreatedAt;
         type Media = S::Media;
+    }
+    ///State transition - sets the `feed_item_guid` field to Set
+    pub struct SetFeedItemGuid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetFeedItemGuid<S> {}
+    impl<S: State> State for SetFeedItemGuid<S> {
+        type Title = S::Title;
+        type PublishedAt = S::PublishedAt;
+        type FeedItemGuid = Set<members::feed_item_guid>;
+        type Podcast = S::Podcast;
+        type Duration = S::Duration;
         type CreatedAt = S::CreatedAt;
+        type Media = S::Media;
+    }
+    ///State transition - sets the `podcast` field to Set
+    pub struct SetPodcast<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPodcast<S> {}
+    impl<S: State> State for SetPodcast<S> {
         type Title = S::Title;
-        type PublishedAt = Set<members::published_at>;
+        type PublishedAt = S::PublishedAt;
+        type FeedItemGuid = S::FeedItemGuid;
+        type Podcast = Set<members::podcast>;
         type Duration = S::Duration;
-        type Podcast = S::Podcast;
+        type CreatedAt = S::CreatedAt;
+        type Media = S::Media;
     }
     ///State transition - sets the `duration` field to Set
     pub struct SetDuration<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDuration<S> {}
     impl<S: State> State for SetDuration<S> {
-        type FeedItemGuid = S::FeedItemGuid;
-        type Media = S::Media;
-        type CreatedAt = S::CreatedAt;
         type Title = S::Title;
         type PublishedAt = S::PublishedAt;
-        type Duration = Set<members::duration>;
+        type FeedItemGuid = S::FeedItemGuid;
         type Podcast = S::Podcast;
+        type Duration = Set<members::duration>;
+        type CreatedAt = S::CreatedAt;
+        type Media = S::Media;
     }
-    ///State transition - sets the `podcast` field to Set
-    pub struct SetPodcast<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPodcast<S> {}
-    impl<S: State> State for SetPodcast<S> {
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Title = S::Title;
+        type PublishedAt = S::PublishedAt;
         type FeedItemGuid = S::FeedItemGuid;
+        type Podcast = S::Podcast;
+        type Duration = S::Duration;
+        type CreatedAt = Set<members::created_at>;
         type Media = S::Media;
-        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `media` field to Set
+    pub struct SetMedia<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMedia<S> {}
+    impl<S: State> State for SetMedia<S> {
         type Title = S::Title;
         type PublishedAt = S::PublishedAt;
+        type FeedItemGuid = S::FeedItemGuid;
+        type Podcast = S::Podcast;
         type Duration = S::Duration;
-        type Podcast = Set<members::podcast>;
+        type CreatedAt = S::CreatedAt;
+        type Media = Set<members::media>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `feed_item_guid` field
-        pub struct feed_item_guid(());
-        ///Marker type for the `media` field
-        pub struct media(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `title` field
         pub struct title(());
         ///Marker type for the `published_at` field
         pub struct published_at(());
-        ///Marker type for the `duration` field
-        pub struct duration(());
+        ///Marker type for the `feed_item_guid` field
+        pub struct feed_item_guid(());
         ///Marker type for the `podcast` field
         pub struct podcast(());
+        ///Marker type for the `duration` field
+        pub struct duration(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `media` field
+        pub struct media(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EpisodeBuilder<'a, S: episode_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<episode::MediaRef<'a>>>,
         Option<BlobRef<'a>>,
         Option<episode::ChaptersRef<'a>>,
@@ -1090,7 +1093,7 @@ pub struct EpisodeBuilder<'a, S: episode_state::State> {
         Option<CowStr<'a>>,
         Option<Vec<episode::TranscriptRef<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Episode<'a> {
@@ -1104,8 +1107,8 @@ impl<'a> EpisodeBuilder<'a, episode_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -1124,7 +1127,7 @@ impl<'a> EpisodeBuilder<'a, episode_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1135,7 +1138,7 @@ impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<episode::MediaRef<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alternateMedia` field to an Option value (optional)
@@ -1143,7 +1146,7 @@ impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
         mut self,
         value: Option<Vec<episode::MediaRef<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1151,12 +1154,12 @@ impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
 impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
     /// Set the `artwork` field (optional)
     pub fn artwork(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `artwork` field to an Option value (optional)
     pub fn maybe_artwork(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1167,12 +1170,12 @@ impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<episode::ChaptersRef<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `chapters` field to an Option value (optional)
     pub fn maybe_chapters(mut self, value: Option<episode::ChaptersRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1187,11 +1190,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EpisodeBuilder<'a, episode_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         EpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1199,12 +1202,12 @@ where
 impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1219,11 +1222,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> EpisodeBuilder<'a, episode_state::SetDuration<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         EpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1231,12 +1234,12 @@ where
 impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
     /// Set the `episodeNumber` field (optional)
     pub fn episode_number(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `episodeNumber` field to an Option value (optional)
     pub fn maybe_episode_number(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1247,12 +1250,12 @@ impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EpisodeEpisodeType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `episodeType` field to an Option value (optional)
     pub fn maybe_episode_type(mut self, value: Option<EpisodeEpisodeType<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -1260,12 +1263,12 @@ impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
 impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
     /// Set the `explicit` field (optional)
     pub fn explicit(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `explicit` field to an Option value (optional)
     pub fn maybe_explicit(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -1280,11 +1283,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EpisodeBuilder<'a, episode_state::SetFeedItemGuid<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         EpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1292,12 +1295,12 @@ where
 impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
     /// Set the `link` field (optional)
     pub fn link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `link` field to an Option value (optional)
     pub fn maybe_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -1312,11 +1315,11 @@ where
         mut self,
         value: impl Into<episode::MediaRef<'a>>,
     ) -> EpisodeBuilder<'a, episode_state::SetMedia<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         EpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1331,11 +1334,11 @@ where
         mut self,
         value: impl Into<PodcastRef<'a>>,
     ) -> EpisodeBuilder<'a, episode_state::SetPodcast<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         EpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1350,11 +1353,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EpisodeBuilder<'a, episode_state::SetPublishedAt<S>> {
-        self.__unsafe_private_named.13 = Option::Some(value.into());
+        self._fields.13 = Option::Some(value.into());
         EpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1362,12 +1365,12 @@ where
 impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
     /// Set the `seasonNumber` field (optional)
     pub fn season_number(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `seasonNumber` field to an Option value (optional)
     pub fn maybe_season_number(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -1382,11 +1385,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EpisodeBuilder<'a, episode_state::SetTitle<S>> {
-        self.__unsafe_private_named.15 = Option::Some(value.into());
+        self._fields.15 = Option::Some(value.into());
         EpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1397,7 +1400,7 @@ impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<episode::TranscriptRef<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `transcript` field to an Option value (optional)
@@ -1405,7 +1408,7 @@ impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
         mut self,
         value: Option<Vec<episode::TranscriptRef<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -1413,34 +1416,34 @@ impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
 impl<'a, S> EpisodeBuilder<'a, S>
 where
     S: episode_state::State,
-    S::FeedItemGuid: episode_state::IsSet,
-    S::Media: episode_state::IsSet,
-    S::CreatedAt: episode_state::IsSet,
     S::Title: episode_state::IsSet,
     S::PublishedAt: episode_state::IsSet,
-    S::Duration: episode_state::IsSet,
+    S::FeedItemGuid: episode_state::IsSet,
     S::Podcast: episode_state::IsSet,
+    S::Duration: episode_state::IsSet,
+    S::CreatedAt: episode_state::IsSet,
+    S::Media: episode_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Episode<'a> {
         Episode {
-            alternate_media: self.__unsafe_private_named.0,
-            artwork: self.__unsafe_private_named.1,
-            chapters: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            description: self.__unsafe_private_named.4,
-            duration: self.__unsafe_private_named.5.unwrap(),
-            episode_number: self.__unsafe_private_named.6,
-            episode_type: self.__unsafe_private_named.7,
-            explicit: self.__unsafe_private_named.8,
-            feed_item_guid: self.__unsafe_private_named.9.unwrap(),
-            link: self.__unsafe_private_named.10,
-            media: self.__unsafe_private_named.11.unwrap(),
-            podcast: self.__unsafe_private_named.12.unwrap(),
-            published_at: self.__unsafe_private_named.13.unwrap(),
-            season_number: self.__unsafe_private_named.14,
-            title: self.__unsafe_private_named.15.unwrap(),
-            transcript: self.__unsafe_private_named.16,
+            alternate_media: self._fields.0,
+            artwork: self._fields.1,
+            chapters: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            description: self._fields.4,
+            duration: self._fields.5.unwrap(),
+            episode_number: self._fields.6,
+            episode_type: self._fields.7,
+            explicit: self._fields.8,
+            feed_item_guid: self._fields.9.unwrap(),
+            link: self._fields.10,
+            media: self._fields.11.unwrap(),
+            podcast: self._fields.12.unwrap(),
+            published_at: self._fields.13.unwrap(),
+            season_number: self._fields.14,
+            title: self._fields.15.unwrap(),
+            transcript: self._fields.16,
             extra_data: Default::default(),
         }
     }
@@ -1453,23 +1456,23 @@ where
         >,
     ) -> Episode<'a> {
         Episode {
-            alternate_media: self.__unsafe_private_named.0,
-            artwork: self.__unsafe_private_named.1,
-            chapters: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            description: self.__unsafe_private_named.4,
-            duration: self.__unsafe_private_named.5.unwrap(),
-            episode_number: self.__unsafe_private_named.6,
-            episode_type: self.__unsafe_private_named.7,
-            explicit: self.__unsafe_private_named.8,
-            feed_item_guid: self.__unsafe_private_named.9.unwrap(),
-            link: self.__unsafe_private_named.10,
-            media: self.__unsafe_private_named.11.unwrap(),
-            podcast: self.__unsafe_private_named.12.unwrap(),
-            published_at: self.__unsafe_private_named.13.unwrap(),
-            season_number: self.__unsafe_private_named.14,
-            title: self.__unsafe_private_named.15.unwrap(),
-            transcript: self.__unsafe_private_named.16,
+            alternate_media: self._fields.0,
+            artwork: self._fields.1,
+            chapters: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            description: self._fields.4,
+            duration: self._fields.5.unwrap(),
+            episode_number: self._fields.6,
+            episode_type: self._fields.7,
+            explicit: self._fields.8,
+            feed_item_guid: self._fields.9.unwrap(),
+            link: self._fields.10,
+            media: self._fields.11.unwrap(),
+            podcast: self._fields.12.unwrap(),
+            published_at: self._fields.13.unwrap(),
+            season_number: self._fields.14,
+            title: self._fields.15.unwrap(),
+            transcript: self._fields.16,
             extra_data: Some(extra_data),
         }
     }
@@ -1485,45 +1488,45 @@ pub mod media_ref_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type MimeType;
         type Url;
+        type MimeType;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type MimeType = Unset;
         type Url = Unset;
-    }
-    ///State transition - sets the `mime_type` field to Set
-    pub struct SetMimeType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMimeType<S> {}
-    impl<S: State> State for SetMimeType<S> {
-        type MimeType = Set<members::mime_type>;
-        type Url = S::Url;
+        type MimeType = Unset;
     }
     ///State transition - sets the `url` field to Set
     pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUrl<S> {}
     impl<S: State> State for SetUrl<S> {
-        type MimeType = S::MimeType;
         type Url = Set<members::url>;
+        type MimeType = S::MimeType;
+    }
+    ///State transition - sets the `mime_type` field to Set
+    pub struct SetMimeType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMimeType<S> {}
+    impl<S: State> State for SetMimeType<S> {
+        type Url = S::Url;
+        type MimeType = Set<members::mime_type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `mime_type` field
-        pub struct mime_type(());
         ///Marker type for the `url` field
         pub struct url(());
+        ///Marker type for the `mime_type` field
+        pub struct mime_type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MediaRefBuilder<'a, S: media_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MediaRef<'a> {
@@ -1537,9 +1540,9 @@ impl<'a> MediaRefBuilder<'a, media_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MediaRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1554,11 +1557,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MediaRefBuilder<'a, media_ref_state::SetMimeType<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MediaRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1573,11 +1576,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> MediaRefBuilder<'a, media_ref_state::SetUrl<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MediaRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1585,14 +1588,14 @@ where
 impl<'a, S> MediaRefBuilder<'a, S>
 where
     S: media_ref_state::State,
-    S::MimeType: media_ref_state::IsSet,
     S::Url: media_ref_state::IsSet,
+    S::MimeType: media_ref_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> MediaRef<'a> {
         MediaRef {
-            mime_type: self.__unsafe_private_named.0.unwrap(),
-            url: self.__unsafe_private_named.1.unwrap(),
+            mime_type: self._fields.0.unwrap(),
+            url: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1605,8 +1608,8 @@ where
         >,
     ) -> MediaRef<'a> {
         MediaRef {
-            mime_type: self.__unsafe_private_named.0.unwrap(),
-            url: self.__unsafe_private_named.1.unwrap(),
+            mime_type: self._fields.0.unwrap(),
+            url: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1622,45 +1625,45 @@ pub mod transcript_ref_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type MimeType;
         type Url;
+        type MimeType;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type MimeType = Unset;
         type Url = Unset;
-    }
-    ///State transition - sets the `mime_type` field to Set
-    pub struct SetMimeType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMimeType<S> {}
-    impl<S: State> State for SetMimeType<S> {
-        type MimeType = Set<members::mime_type>;
-        type Url = S::Url;
+        type MimeType = Unset;
     }
     ///State transition - sets the `url` field to Set
     pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUrl<S> {}
     impl<S: State> State for SetUrl<S> {
-        type MimeType = S::MimeType;
         type Url = Set<members::url>;
+        type MimeType = S::MimeType;
+    }
+    ///State transition - sets the `mime_type` field to Set
+    pub struct SetMimeType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMimeType<S> {}
+    impl<S: State> State for SetMimeType<S> {
+        type Url = S::Url;
+        type MimeType = Set<members::mime_type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `mime_type` field
-        pub struct mime_type(());
         ///Marker type for the `url` field
         pub struct url(());
+        ///Marker type for the `mime_type` field
+        pub struct mime_type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TranscriptRefBuilder<'a, S: transcript_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Language>, Option<CowStr<'a>>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Language>, Option<CowStr<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TranscriptRef<'a> {
@@ -1674,9 +1677,9 @@ impl<'a> TranscriptRefBuilder<'a, transcript_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TranscriptRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1684,12 +1687,12 @@ impl<'a> TranscriptRefBuilder<'a, transcript_ref_state::Empty> {
 impl<'a, S: transcript_ref_state::State> TranscriptRefBuilder<'a, S> {
     /// Set the `language` field (optional)
     pub fn language(mut self, value: impl Into<Option<Language>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `language` field to an Option value (optional)
     pub fn maybe_language(mut self, value: Option<Language>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1704,11 +1707,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TranscriptRefBuilder<'a, transcript_ref_state::SetMimeType<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TranscriptRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1723,11 +1726,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> TranscriptRefBuilder<'a, transcript_ref_state::SetUrl<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TranscriptRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1735,15 +1738,15 @@ where
 impl<'a, S> TranscriptRefBuilder<'a, S>
 where
     S: transcript_ref_state::State,
-    S::MimeType: transcript_ref_state::IsSet,
     S::Url: transcript_ref_state::IsSet,
+    S::MimeType: transcript_ref_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TranscriptRef<'a> {
         TranscriptRef {
-            language: self.__unsafe_private_named.0,
-            mime_type: self.__unsafe_private_named.1.unwrap(),
-            url: self.__unsafe_private_named.2.unwrap(),
+            language: self._fields.0,
+            mime_type: self._fields.1.unwrap(),
+            url: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1756,9 +1759,9 @@ where
         >,
     ) -> TranscriptRef<'a> {
         TranscriptRef {
-            language: self.__unsafe_private_named.0,
-            mime_type: self.__unsafe_private_named.1.unwrap(),
-            url: self.__unsafe_private_named.2.unwrap(),
+            language: self._fields.0,
+            mime_type: self._fields.1.unwrap(),
+            url: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atpodcasting/follow.rs b/crates/jacquard-api/src/org_atpodcasting/follow.rs
index ce093d3b..08f08516 100644
--- a/crates/jacquard-api/src/org_atpodcasting/follow.rs
+++ b/crates/jacquard-api/src/org_atpodcasting/follow.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -147,9 +150,9 @@ pub mod follow_state {
 
 /// Builder for constructing an instance of this type
 pub struct FollowBuilder<'a, S: follow_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<PodcastRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<PodcastRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Follow<'a> {
@@ -163,9 +166,9 @@ impl<'a> FollowBuilder<'a, follow_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,11 +183,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FollowBuilder<'a, follow_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -199,11 +202,11 @@ where
         mut self,
         value: impl Into<PodcastRef<'a>>,
     ) -> FollowBuilder<'a, follow_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -217,8 +220,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -231,8 +234,8 @@ where
         >,
     ) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atpodcasting/like.rs b/crates/jacquard-api/src/org_atpodcasting/like.rs
index d85658c6..463ae9b0 100644
--- a/crates/jacquard-api/src/org_atpodcasting/like.rs
+++ b/crates/jacquard-api/src/org_atpodcasting/like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -111,45 +114,45 @@ pub mod like_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type CreatedAt;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
+        type Subject = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<EpisodeRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<EpisodeRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -163,9 +166,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,11 +183,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -199,11 +202,11 @@ where
         mut self,
         value: impl Into<EpisodeRef<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -211,14 +214,14 @@ where
 impl<'a, S> LikeBuilder<'a, S>
 where
     S: like_state::State,
-    S::Subject: like_state::IsSet,
     S::CreatedAt: like_state::IsSet,
+    S::Subject: like_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -231,8 +234,8 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atpodcasting/podcast.rs b/crates/jacquard-api/src/org_atpodcasting/podcast.rs
index 9b2a79bc..e84c6965 100644
--- a/crates/jacquard-api/src/org_atpodcasting/podcast.rs
+++ b/crates/jacquard-api/src/org_atpodcasting/podcast.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -226,12 +229,12 @@ pub mod podcast_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Title;
         type Artwork;
         type FeedUrl;
+        type Title;
+        type Language;
         type Categories;
         type CreatedAt;
-        type Language;
         type Guid;
         type Description;
     }
@@ -239,38 +242,25 @@ pub mod podcast_state {
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Title = Unset;
         type Artwork = Unset;
         type FeedUrl = Unset;
+        type Title = Unset;
+        type Language = Unset;
         type Categories = Unset;
         type CreatedAt = Unset;
-        type Language = Unset;
         type Guid = Unset;
         type Description = Unset;
     }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Title = Set<members::title>;
-        type Artwork = S::Artwork;
-        type FeedUrl = S::FeedUrl;
-        type Categories = S::Categories;
-        type CreatedAt = S::CreatedAt;
-        type Language = S::Language;
-        type Guid = S::Guid;
-        type Description = S::Description;
-    }
     ///State transition - sets the `artwork` field to Set
     pub struct SetArtwork<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetArtwork<S> {}
     impl<S: State> State for SetArtwork<S> {
-        type Title = S::Title;
         type Artwork = Set<members::artwork>;
         type FeedUrl = S::FeedUrl;
+        type Title = S::Title;
+        type Language = S::Language;
         type Categories = S::Categories;
         type CreatedAt = S::CreatedAt;
-        type Language = S::Language;
         type Guid = S::Guid;
         type Description = S::Description;
     }
@@ -278,12 +268,38 @@ pub mod podcast_state {
     pub struct SetFeedUrl<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetFeedUrl<S> {}
     impl<S: State> State for SetFeedUrl<S> {
-        type Title = S::Title;
         type Artwork = S::Artwork;
         type FeedUrl = Set<members::feed_url>;
+        type Title = S::Title;
+        type Language = S::Language;
         type Categories = S::Categories;
         type CreatedAt = S::CreatedAt;
+        type Guid = S::Guid;
+        type Description = S::Description;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type Artwork = S::Artwork;
+        type FeedUrl = S::FeedUrl;
+        type Title = Set<members::title>;
         type Language = S::Language;
+        type Categories = S::Categories;
+        type CreatedAt = S::CreatedAt;
+        type Guid = S::Guid;
+        type Description = S::Description;
+    }
+    ///State transition - sets the `language` field to Set
+    pub struct SetLanguage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLanguage<S> {}
+    impl<S: State> State for SetLanguage<S> {
+        type Artwork = S::Artwork;
+        type FeedUrl = S::FeedUrl;
+        type Title = S::Title;
+        type Language = Set<members::language>;
+        type Categories = S::Categories;
+        type CreatedAt = S::CreatedAt;
         type Guid = S::Guid;
         type Description = S::Description;
     }
@@ -291,12 +307,12 @@ pub mod podcast_state {
     pub struct SetCategories<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCategories<S> {}
     impl<S: State> State for SetCategories<S> {
-        type Title = S::Title;
         type Artwork = S::Artwork;
         type FeedUrl = S::FeedUrl;
+        type Title = S::Title;
+        type Language = S::Language;
         type Categories = Set<members::categories>;
         type CreatedAt = S::CreatedAt;
-        type Language = S::Language;
         type Guid = S::Guid;
         type Description = S::Description;
     }
@@ -304,25 +320,12 @@ pub mod podcast_state {
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Title = S::Title;
         type Artwork = S::Artwork;
         type FeedUrl = S::FeedUrl;
-        type Categories = S::Categories;
-        type CreatedAt = Set<members::created_at>;
-        type Language = S::Language;
-        type Guid = S::Guid;
-        type Description = S::Description;
-    }
-    ///State transition - sets the `language` field to Set
-    pub struct SetLanguage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLanguage<S> {}
-    impl<S: State> State for SetLanguage<S> {
         type Title = S::Title;
-        type Artwork = S::Artwork;
-        type FeedUrl = S::FeedUrl;
+        type Language = S::Language;
         type Categories = S::Categories;
-        type CreatedAt = S::CreatedAt;
-        type Language = Set<members::language>;
+        type CreatedAt = Set<members::created_at>;
         type Guid = S::Guid;
         type Description = S::Description;
     }
@@ -330,12 +333,12 @@ pub mod podcast_state {
     pub struct SetGuid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetGuid<S> {}
     impl<S: State> State for SetGuid<S> {
-        type Title = S::Title;
         type Artwork = S::Artwork;
         type FeedUrl = S::FeedUrl;
+        type Title = S::Title;
+        type Language = S::Language;
         type Categories = S::Categories;
         type CreatedAt = S::CreatedAt;
-        type Language = S::Language;
         type Guid = Set<members::guid>;
         type Description = S::Description;
     }
@@ -343,30 +346,30 @@ pub mod podcast_state {
     pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDescription<S> {}
     impl<S: State> State for SetDescription<S> {
-        type Title = S::Title;
         type Artwork = S::Artwork;
         type FeedUrl = S::FeedUrl;
+        type Title = S::Title;
+        type Language = S::Language;
         type Categories = S::Categories;
         type CreatedAt = S::CreatedAt;
-        type Language = S::Language;
         type Guid = S::Guid;
         type Description = Set<members::description>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `title` field
-        pub struct title(());
         ///Marker type for the `artwork` field
         pub struct artwork(());
         ///Marker type for the `feed_url` field
         pub struct feed_url(());
+        ///Marker type for the `title` field
+        pub struct title(());
+        ///Marker type for the `language` field
+        pub struct language(());
         ///Marker type for the `categories` field
         pub struct categories(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `language` field
-        pub struct language(());
         ///Marker type for the `guid` field
         pub struct guid(());
         ///Marker type for the `description` field
@@ -376,8 +379,8 @@ pub mod podcast_state {
 
 /// Builder for constructing an instance of this type
 pub struct PodcastBuilder<'a, S: podcast_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Vec<AppleCategory<'a>>>,
         Option<Datetime>,
@@ -390,7 +393,7 @@ pub struct PodcastBuilder<'a, S: podcast_state::State> {
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Podcast<'a> {
@@ -404,21 +407,9 @@ impl<'a> PodcastBuilder<'a, podcast_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PodcastBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -433,11 +424,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> PodcastBuilder<'a, podcast_state::SetArtwork<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PodcastBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -452,11 +443,11 @@ where
         mut self,
         value: impl Into<Vec<AppleCategory<'a>>>,
     ) -> PodcastBuilder<'a, podcast_state::SetCategories<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PodcastBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -471,11 +462,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PodcastBuilder<'a, podcast_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PodcastBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -490,11 +481,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PodcastBuilder<'a, podcast_state::SetDescription<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PodcastBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -502,12 +493,12 @@ where
 impl<'a, S: podcast_state::State> PodcastBuilder<'a, S> {
     /// Set the `explicit` field (optional)
     pub fn explicit(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `explicit` field to an Option value (optional)
     pub fn maybe_explicit(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -522,11 +513,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> PodcastBuilder<'a, podcast_state::SetFeedUrl<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         PodcastBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -541,11 +532,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PodcastBuilder<'a, podcast_state::SetGuid<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         PodcastBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -560,11 +551,11 @@ where
         mut self,
         value: impl Into<Language>,
     ) -> PodcastBuilder<'a, podcast_state::SetLanguage<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         PodcastBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -572,12 +563,12 @@ where
 impl<'a, S: podcast_state::State> PodcastBuilder<'a, S> {
     /// Set the `link` field (optional)
     pub fn link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `link` field to an Option value (optional)
     pub fn maybe_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -585,12 +576,12 @@ impl<'a, S: podcast_state::State> PodcastBuilder<'a, S> {
 impl<'a, S: podcast_state::State> PodcastBuilder<'a, S> {
     /// Set the `movedTo` field (optional)
     pub fn moved_to(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `movedTo` field to an Option value (optional)
     pub fn maybe_moved_to(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -605,11 +596,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PodcastBuilder<'a, podcast_state::SetTitle<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         PodcastBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -617,29 +608,29 @@ where
 impl<'a, S> PodcastBuilder<'a, S>
 where
     S: podcast_state::State,
-    S::Title: podcast_state::IsSet,
     S::Artwork: podcast_state::IsSet,
     S::FeedUrl: podcast_state::IsSet,
+    S::Title: podcast_state::IsSet,
+    S::Language: podcast_state::IsSet,
     S::Categories: podcast_state::IsSet,
     S::CreatedAt: podcast_state::IsSet,
-    S::Language: podcast_state::IsSet,
     S::Guid: podcast_state::IsSet,
     S::Description: podcast_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Podcast<'a> {
         Podcast {
-            artwork: self.__unsafe_private_named.0.unwrap(),
-            categories: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3.unwrap(),
-            explicit: self.__unsafe_private_named.4,
-            feed_url: self.__unsafe_private_named.5.unwrap(),
-            guid: self.__unsafe_private_named.6.unwrap(),
-            language: self.__unsafe_private_named.7.unwrap(),
-            link: self.__unsafe_private_named.8,
-            moved_to: self.__unsafe_private_named.9,
-            title: self.__unsafe_private_named.10.unwrap(),
+            artwork: self._fields.0.unwrap(),
+            categories: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3.unwrap(),
+            explicit: self._fields.4,
+            feed_url: self._fields.5.unwrap(),
+            guid: self._fields.6.unwrap(),
+            language: self._fields.7.unwrap(),
+            link: self._fields.8,
+            moved_to: self._fields.9,
+            title: self._fields.10.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -652,17 +643,17 @@ where
         >,
     ) -> Podcast<'a> {
         Podcast {
-            artwork: self.__unsafe_private_named.0.unwrap(),
-            categories: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3.unwrap(),
-            explicit: self.__unsafe_private_named.4,
-            feed_url: self.__unsafe_private_named.5.unwrap(),
-            guid: self.__unsafe_private_named.6.unwrap(),
-            language: self.__unsafe_private_named.7.unwrap(),
-            link: self.__unsafe_private_named.8,
-            moved_to: self.__unsafe_private_named.9,
-            title: self.__unsafe_private_named.10.unwrap(),
+            artwork: self._fields.0.unwrap(),
+            categories: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3.unwrap(),
+            explicit: self._fields.4,
+            feed_url: self._fields.5.unwrap(),
+            guid: self._fields.6.unwrap(),
+            language: self._fields.7.unwrap(),
+            link: self._fields.8,
+            moved_to: self._fields.9,
+            title: self._fields.10.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/avatar.rs b/crates/jacquard-api/src/org_atsui/avatar.rs
index 26c3e2fe..ced88faf 100644
--- a/crates/jacquard-api/src/org_atsui/avatar.rs
+++ b/crates/jacquard-api/src/org_atsui/avatar.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -206,14 +209,9 @@ pub mod avatar_state {
 
 /// Builder for constructing an instance of this type
 pub struct AvatarBuilder<'a, S: avatar_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Did<'a>>,
-        Option<bool>,
-        Option<AvatarSize<'a>>,
-        Option<Data<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<bool>, Option<AvatarSize<'a>>, Option<Data<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Avatar<'a> {
@@ -227,9 +225,9 @@ impl<'a> AvatarBuilder<'a, avatar_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AvatarBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -237,12 +235,12 @@ impl<'a> AvatarBuilder<'a, avatar_state::Empty> {
 impl<'a, S: avatar_state::State> AvatarBuilder<'a, S> {
     /// Set the `did` field (optional)
     pub fn did(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `did` field to an Option value (optional)
     pub fn maybe_did(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -250,12 +248,12 @@ impl<'a, S: avatar_state::State> AvatarBuilder<'a, S> {
 impl<'a, S: avatar_state::State> AvatarBuilder<'a, S> {
     /// Set the `lift` field (optional)
     pub fn lift(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `lift` field to an Option value (optional)
     pub fn maybe_lift(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -263,12 +261,12 @@ impl<'a, S: avatar_state::State> AvatarBuilder<'a, S> {
 impl<'a, S: avatar_state::State> AvatarBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<AvatarSize<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<AvatarSize<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -283,11 +281,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> AvatarBuilder<'a, avatar_state::SetSrc<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         AvatarBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -300,10 +298,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Avatar<'a> {
         Avatar {
-            did: self.__unsafe_private_named.0,
-            lift: self.__unsafe_private_named.1,
-            size: self.__unsafe_private_named.2,
-            src: self.__unsafe_private_named.3.unwrap(),
+            did: self._fields.0,
+            lift: self._fields.1,
+            size: self._fields.2,
+            src: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -313,10 +311,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Avatar<'a> {
         Avatar {
-            did: self.__unsafe_private_named.0,
-            lift: self.__unsafe_private_named.1,
-            size: self.__unsafe_private_named.2,
-            src: self.__unsafe_private_named.3.unwrap(),
+            did: self._fields.0,
+            lift: self._fields.1,
+            size: self._fields.2,
+            src: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/blob.rs b/crates/jacquard-api/src/org_atsui/blob.rs
index d65aab1e..d3c48fdb 100644
--- a/crates/jacquard-api/src/org_atsui/blob.rs
+++ b/crates/jacquard-api/src/org_atsui/blob.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -135,45 +138,45 @@ pub mod aspect_ratio_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Height;
         type Width;
+        type Height;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Height = Unset;
         type Width = Unset;
-    }
-    ///State transition - sets the `height` field to Set
-    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHeight<S> {}
-    impl<S: State> State for SetHeight<S> {
-        type Height = Set<members::height>;
-        type Width = S::Width;
+        type Height = Unset;
     }
     ///State transition - sets the `width` field to Set
     pub struct SetWidth<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWidth<S> {}
     impl<S: State> State for SetWidth<S> {
-        type Height = S::Height;
         type Width = Set<members::width>;
+        type Height = S::Height;
+    }
+    ///State transition - sets the `height` field to Set
+    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHeight<S> {}
+    impl<S: State> State for SetHeight<S> {
+        type Width = S::Width;
+        type Height = Set<members::height>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `height` field
-        pub struct height(());
         ///Marker type for the `width` field
         pub struct width(());
+        ///Marker type for the `height` field
+        pub struct height(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AspectRatioBuilder<'a, S: aspect_ratio_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AspectRatio<'a> {
@@ -187,9 +190,9 @@ impl<'a> AspectRatioBuilder<'a, aspect_ratio_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,11 +207,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -223,11 +226,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetWidth<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -235,14 +238,14 @@ where
 impl<'a, S> AspectRatioBuilder<'a, S>
 where
     S: aspect_ratio_state::State,
-    S::Height: aspect_ratio_state::IsSet,
     S::Width: aspect_ratio_state::IsSet,
+    S::Height: aspect_ratio_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -252,8 +255,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -409,14 +412,14 @@ pub mod blob_state {
 
 /// Builder for constructing an instance of this type
 pub struct BlobBuilder<'a, S: blob_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Did<'a>>,
         Option<CowStr<'a>>,
         Option<blob::AspectRatio<'a>>,
         Option<Data<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Blob<'a> {
@@ -430,9 +433,9 @@ impl<'a> BlobBuilder<'a, blob_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -447,11 +450,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> BlobBuilder<'a, blob_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -459,12 +462,12 @@ where
 impl<'a, S: blob_state::State> BlobBuilder<'a, S> {
     /// Set the `fit` field (optional)
     pub fn fit(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `fit` field to an Option value (optional)
     pub fn maybe_fit(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -472,12 +475,12 @@ impl<'a, S: blob_state::State> BlobBuilder<'a, S> {
 impl<'a, S: blob_state::State> BlobBuilder<'a, S> {
     /// Set the `ratio` field (optional)
     pub fn ratio(mut self, value: impl Into<Option<blob::AspectRatio<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `ratio` field to an Option value (optional)
     pub fn maybe_ratio(mut self, value: Option<blob::AspectRatio<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -492,11 +495,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> BlobBuilder<'a, blob_state::SetSrc<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -510,10 +513,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Blob<'a> {
         Blob {
-            did: self.__unsafe_private_named.0.unwrap(),
-            fit: self.__unsafe_private_named.1,
-            ratio: self.__unsafe_private_named.2,
-            src: self.__unsafe_private_named.3.unwrap(),
+            did: self._fields.0.unwrap(),
+            fit: self._fields.1,
+            ratio: self._fields.2,
+            src: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -523,10 +526,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Blob<'a> {
         Blob {
-            did: self.__unsafe_private_named.0.unwrap(),
-            fit: self.__unsafe_private_named.1,
-            ratio: self.__unsafe_private_named.2,
-            src: self.__unsafe_private_named.3.unwrap(),
+            did: self._fields.0.unwrap(),
+            fit: self._fields.1,
+            ratio: self._fields.2,
+            src: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/caption.rs b/crates/jacquard-api/src/org_atsui/caption.rs
index 3e896202..85ecdca9 100644
--- a/crates/jacquard-api/src/org_atsui/caption.rs
+++ b/crates/jacquard-api/src/org_atsui/caption.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::value::Data;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -92,9 +95,9 @@ pub mod caption_state {
 
 /// Builder for constructing an instance of this type
 pub struct CaptionBuilder<'a, S: caption_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Data<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Data<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Caption<'a> {
@@ -108,9 +111,9 @@ impl<'a> CaptionBuilder<'a, caption_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CaptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -125,11 +128,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> CaptionBuilder<'a, caption_state::SetChildren<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CaptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,7 +145,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Caption<'a> {
         Caption {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -152,7 +155,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Caption<'a> {
         Caption {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/clip.rs b/crates/jacquard-api/src/org_atsui/clip.rs
index 923ca6e8..aa9db0ff 100644
--- a/crates/jacquard-api/src/org_atsui/clip.rs
+++ b/crates/jacquard-api/src/org_atsui/clip.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -165,9 +168,9 @@ pub mod aspect_ratio_state {
 
 /// Builder for constructing an instance of this type
 pub struct AspectRatioBuilder<'a, S: aspect_ratio_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AspectRatio<'a> {
@@ -181,9 +184,9 @@ impl<'a> AspectRatioBuilder<'a, aspect_ratio_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -217,11 +220,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetWidth<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -235,8 +238,8 @@ where
     /// Build the final struct
     pub fn build(self) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -246,8 +249,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -372,13 +375,13 @@ pub mod clip_state {
 
 /// Builder for constructing an instance of this type
 pub struct ClipBuilder<'a, S: clip_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Data<'a>>,
         Option<clip::AspectRatio<'a>>,
         Option<clip::AspectRatio<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Clip<'a> {
@@ -392,9 +395,9 @@ impl<'a> ClipBuilder<'a, clip_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ClipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -409,11 +412,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> ClipBuilder<'a, clip_state::SetChildren<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ClipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -421,12 +424,12 @@ where
 impl<'a, S: clip_state::State> ClipBuilder<'a, S> {
     /// Set the `max` field (optional)
     pub fn max(mut self, value: impl Into<Option<clip::AspectRatio<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `max` field to an Option value (optional)
     pub fn maybe_max(mut self, value: Option<clip::AspectRatio<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -434,12 +437,12 @@ impl<'a, S: clip_state::State> ClipBuilder<'a, S> {
 impl<'a, S: clip_state::State> ClipBuilder<'a, S> {
     /// Set the `min` field (optional)
     pub fn min(mut self, value: impl Into<Option<clip::AspectRatio<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `min` field to an Option value (optional)
     pub fn maybe_min(mut self, value: Option<clip::AspectRatio<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -452,9 +455,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Clip<'a> {
         Clip {
-            children: self.__unsafe_private_named.0.unwrap(),
-            max: self.__unsafe_private_named.1,
-            min: self.__unsafe_private_named.2,
+            children: self._fields.0.unwrap(),
+            max: self._fields.1,
+            min: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -464,9 +467,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Clip<'a> {
         Clip {
-            children: self.__unsafe_private_named.0.unwrap(),
-            max: self.__unsafe_private_named.1,
-            min: self.__unsafe_private_named.2,
+            children: self._fields.0.unwrap(),
+            max: self._fields.1,
+            min: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/cover.rs b/crates/jacquard-api/src/org_atsui/cover.rs
index 613235b9..16003243 100644
--- a/crates/jacquard-api/src/org_atsui/cover.rs
+++ b/crates/jacquard-api/src/org_atsui/cover.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_common::types::value::Data;
@@ -98,9 +101,9 @@ pub mod cover_state {
 
 /// Builder for constructing an instance of this type
 pub struct CoverBuilder<'a, S: cover_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Data<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Data<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Cover<'a> {
@@ -114,9 +117,9 @@ impl<'a> CoverBuilder<'a, cover_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CoverBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -124,12 +127,12 @@ impl<'a> CoverBuilder<'a, cover_state::Empty> {
 impl<'a, S: cover_state::State> CoverBuilder<'a, S> {
     /// Set the `did` field (optional)
     pub fn did(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `did` field to an Option value (optional)
     pub fn maybe_did(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -144,11 +147,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> CoverBuilder<'a, cover_state::SetSrc<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CoverBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -161,8 +164,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Cover<'a> {
         Cover {
-            did: self.__unsafe_private_named.0,
-            src: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0,
+            src: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -172,8 +175,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Cover<'a> {
         Cover {
-            did: self.__unsafe_private_named.0,
-            src: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0,
+            src: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/editor.rs b/crates/jacquard-api/src/org_atsui/editor.rs
index fc20652e..436fa0d8 100644
--- a/crates/jacquard-api/src/org_atsui/editor.rs
+++ b/crates/jacquard-api/src/org_atsui/editor.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -93,9 +96,9 @@ pub mod editor_state {
 
 /// Builder for constructing an instance of this type
 pub struct EditorBuilder<'a, S: editor_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Editor<'a> {
@@ -109,9 +112,9 @@ impl<'a> EditorBuilder<'a, editor_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EditorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -126,11 +129,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> EditorBuilder<'a, editor_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EditorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -143,7 +146,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Editor<'a> {
         Editor {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -156,7 +159,7 @@ where
         >,
     ) -> Editor<'a> {
         Editor {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/fill.rs b/crates/jacquard-api/src/org_atsui/fill.rs
index ef436420..34f5a4b2 100644
--- a/crates/jacquard-api/src/org_atsui/fill.rs
+++ b/crates/jacquard-api/src/org_atsui/fill.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::value::Data;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -92,9 +95,9 @@ pub mod fill_state {
 
 /// Builder for constructing an instance of this type
 pub struct FillBuilder<'a, S: fill_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Data<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Data<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Fill<'a> {
@@ -108,9 +111,9 @@ impl<'a> FillBuilder<'a, fill_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FillBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -125,11 +128,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> FillBuilder<'a, fill_state::SetChildren<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FillBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,7 +145,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Fill<'a> {
         Fill {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -152,7 +155,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Fill<'a> {
         Fill {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/grid.rs b/crates/jacquard-api/src/org_atsui/grid.rs
index 80594066..45d05f56 100644
--- a/crates/jacquard-api/src/org_atsui/grid.rs
+++ b/crates/jacquard-api/src/org_atsui/grid.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::value::Data;
@@ -205,9 +208,9 @@ pub mod grid_state {
 
 /// Builder for constructing an instance of this type
 pub struct GridBuilder<'a, S: grid_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Data<'a>>, Option<i64>, Option<GridGap<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Data<'a>>, Option<i64>, Option<GridGap<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Grid<'a> {
@@ -221,9 +224,9 @@ impl<'a> GridBuilder<'a, grid_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GridBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -238,11 +241,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> GridBuilder<'a, grid_state::SetChildren<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GridBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -250,12 +253,12 @@ where
 impl<'a, S: grid_state::State> GridBuilder<'a, S> {
     /// Set the `columns` field (optional)
     pub fn columns(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `columns` field to an Option value (optional)
     pub fn maybe_columns(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -263,12 +266,12 @@ impl<'a, S: grid_state::State> GridBuilder<'a, S> {
 impl<'a, S: grid_state::State> GridBuilder<'a, S> {
     /// Set the `gap` field (optional)
     pub fn gap(mut self, value: impl Into<Option<GridGap<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `gap` field to an Option value (optional)
     pub fn maybe_gap(mut self, value: Option<GridGap<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -281,9 +284,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Grid<'a> {
         Grid {
-            children: self.__unsafe_private_named.0.unwrap(),
-            columns: self.__unsafe_private_named.1.or_else(|| Some(3i64)),
-            gap: self.__unsafe_private_named.2,
+            children: self._fields.0.unwrap(),
+            columns: self._fields.1.or_else(|| Some(3i64)),
+            gap: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -293,9 +296,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Grid<'a> {
         Grid {
-            children: self.__unsafe_private_named.0.unwrap(),
-            columns: self.__unsafe_private_named.1.or_else(|| Some(3i64)),
-            gap: self.__unsafe_private_named.2,
+            children: self._fields.0.unwrap(),
+            columns: self._fields.1.or_else(|| Some(3i64)),
+            gap: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/heading.rs b/crates/jacquard-api/src/org_atsui/heading.rs
index 02287192..99ac512d 100644
--- a/crates/jacquard-api/src/org_atsui/heading.rs
+++ b/crates/jacquard-api/src/org_atsui/heading.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::value::Data;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -92,9 +95,9 @@ pub mod heading_state {
 
 /// Builder for constructing an instance of this type
 pub struct HeadingBuilder<'a, S: heading_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Data<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Data<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Heading<'a> {
@@ -108,9 +111,9 @@ impl<'a> HeadingBuilder<'a, heading_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HeadingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -125,11 +128,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> HeadingBuilder<'a, heading_state::SetChildren<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         HeadingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,7 +145,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Heading<'a> {
         Heading {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -152,7 +155,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Heading<'a> {
         Heading {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/link.rs b/crates/jacquard-api/src/org_atsui/link.rs
index 59795129..433994f8 100644
--- a/crates/jacquard-api/src/org_atsui/link.rs
+++ b/crates/jacquard-api/src/org_atsui/link.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::UriValue;
@@ -189,13 +192,9 @@ pub mod link_state {
 
 /// Builder for constructing an instance of this type
 pub struct LinkBuilder<'a, S: link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Data<'a>>,
-        Option<LinkDecoration<'a>>,
-        Option<UriValue<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Data<'a>>, Option<LinkDecoration<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Link<'a> {
@@ -209,9 +208,9 @@ impl<'a> LinkBuilder<'a, link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -219,12 +218,12 @@ impl<'a> LinkBuilder<'a, link_state::Empty> {
 impl<'a, S: link_state::State> LinkBuilder<'a, S> {
     /// Set the `children` field (optional)
     pub fn children(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `children` field to an Option value (optional)
     pub fn maybe_children(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -232,12 +231,12 @@ impl<'a, S: link_state::State> LinkBuilder<'a, S> {
 impl<'a, S: link_state::State> LinkBuilder<'a, S> {
     /// Set the `decoration` field (optional)
     pub fn decoration(mut self, value: impl Into<Option<LinkDecoration<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `decoration` field to an Option value (optional)
     pub fn maybe_decoration(mut self, value: Option<LinkDecoration<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -252,11 +251,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LinkBuilder<'a, link_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -269,9 +268,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Link<'a> {
         Link {
-            children: self.__unsafe_private_named.0,
-            decoration: self.__unsafe_private_named.1,
-            uri: self.__unsafe_private_named.2.unwrap(),
+            children: self._fields.0,
+            decoration: self._fields.1,
+            uri: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -281,9 +280,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Link<'a> {
         Link {
-            children: self.__unsafe_private_named.0,
-            decoration: self.__unsafe_private_named.1,
-            uri: self.__unsafe_private_named.2.unwrap(),
+            children: self._fields.0,
+            decoration: self._fields.1,
+            uri: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/list.rs b/crates/jacquard-api/src/org_atsui/list.rs
index 24f450cd..f39b277e 100644
--- a/crates/jacquard-api/src/org_atsui/list.rs
+++ b/crates/jacquard-api/src/org_atsui/list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -127,45 +130,45 @@ pub mod list_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Did;
         type Query;
+        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Did = Unset;
         type Query = Unset;
-    }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Did = Set<members::did>;
-        type Query = S::Query;
+        type Did = Unset;
     }
     ///State transition - sets the `query` field to Set
     pub struct SetQuery<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetQuery<S> {}
     impl<S: State> State for SetQuery<S> {
-        type Did = S::Did;
         type Query = Set<members::query>;
+        type Did = S::Did;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Query = S::Query;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `query` field
         pub struct query(());
+        ///Marker type for the `did` field
+        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ListBuilder<'a, S: list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Data<'a>>, Option<Nsid<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Data<'a>>, Option<Nsid<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> List<'a> {
@@ -179,9 +182,9 @@ impl<'a> ListBuilder<'a, list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ListBuilder<'a, list_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -208,12 +211,12 @@ where
 impl<'a, S: list_state::State> ListBuilder<'a, S> {
     /// Set the `input` field (optional)
     pub fn input(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `input` field to an Option value (optional)
     pub fn maybe_input(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -228,11 +231,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> ListBuilder<'a, list_state::SetQuery<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -240,15 +243,15 @@ where
 impl<'a, S> ListBuilder<'a, S>
 where
     S: list_state::State,
-    S::Did: list_state::IsSet,
     S::Query: list_state::IsSet,
+    S::Did: list_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> List<'a> {
         List {
-            did: self.__unsafe_private_named.0.unwrap(),
-            input: self.__unsafe_private_named.1,
-            query: self.__unsafe_private_named.2.unwrap(),
+            did: self._fields.0.unwrap(),
+            input: self._fields.1,
+            query: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -258,9 +261,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> List<'a> {
         List {
-            did: self.__unsafe_private_named.0.unwrap(),
-            input: self.__unsafe_private_named.1,
-            query: self.__unsafe_private_named.2.unwrap(),
+            did: self._fields.0.unwrap(),
+            input: self._fields.1,
+            query: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -300,9 +303,9 @@ pub mod page_state {
 
 /// Builder for constructing an instance of this type
 pub struct PageBuilder<'a, S: page_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Vec<Element<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Vec<Element<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Page<'a> {
@@ -316,9 +319,9 @@ impl<'a> PageBuilder<'a, page_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -326,12 +329,12 @@ impl<'a> PageBuilder<'a, page_state::Empty> {
 impl<'a, S: page_state::State> PageBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -346,11 +349,11 @@ where
         mut self,
         value: impl Into<Vec<Element<'a>>>,
     ) -> PageBuilder<'a, page_state::SetItems<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -363,8 +366,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Page<'a> {
         Page {
-            cursor: self.__unsafe_private_named.0,
-            items: self.__unsafe_private_named.1.unwrap(),
+            cursor: self._fields.0,
+            items: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -374,8 +377,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Page<'a> {
         Page {
-            cursor: self.__unsafe_private_named.0,
-            items: self.__unsafe_private_named.1.unwrap(),
+            cursor: self._fields.0,
+            items: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/record.rs b/crates/jacquard-api/src/org_atsui/record.rs
index a4aaa3b5..965988af 100644
--- a/crates/jacquard-api/src/org_atsui/record.rs
+++ b/crates/jacquard-api/src/org_atsui/record.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -93,9 +96,9 @@ pub mod record_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordBuilder<'a, S: record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Record<'a> {
@@ -109,9 +112,9 @@ impl<'a> RecordBuilder<'a, record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -126,11 +129,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RecordBuilder<'a, record_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -143,7 +146,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Record<'a> {
         Record {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -156,7 +159,7 @@ where
         >,
     ) -> Record<'a> {
         Record {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/row.rs b/crates/jacquard-api/src/org_atsui/row.rs
index b606f9da..8b4dbbb3 100644
--- a/crates/jacquard-api/src/org_atsui/row.rs
+++ b/crates/jacquard-api/src/org_atsui/row.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::value::Data;
@@ -414,8 +417,8 @@ pub mod row_state {
 
 /// Builder for constructing an instance of this type
 pub struct RowBuilder<'a, S: row_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<RowAlign<'a>>,
         Option<Data<'a>>,
         Option<RowGap<'a>>,
@@ -424,7 +427,7 @@ pub struct RowBuilder<'a, S: row_state::State> {
         Option<bool>,
         Option<bool>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Row<'a> {
@@ -438,9 +441,9 @@ impl<'a> RowBuilder<'a, row_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -448,12 +451,12 @@ impl<'a> RowBuilder<'a, row_state::Empty> {
 impl<'a, S: row_state::State> RowBuilder<'a, S> {
     /// Set the `align` field (optional)
     pub fn align(mut self, value: impl Into<Option<RowAlign<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `align` field to an Option value (optional)
     pub fn maybe_align(mut self, value: Option<RowAlign<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -468,11 +471,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> RowBuilder<'a, row_state::SetChildren<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -480,12 +483,12 @@ where
 impl<'a, S: row_state::State> RowBuilder<'a, S> {
     /// Set the `gap` field (optional)
     pub fn gap(mut self, value: impl Into<Option<RowGap<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `gap` field to an Option value (optional)
     pub fn maybe_gap(mut self, value: Option<RowGap<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -493,12 +496,12 @@ impl<'a, S: row_state::State> RowBuilder<'a, S> {
 impl<'a, S: row_state::State> RowBuilder<'a, S> {
     /// Set the `inset` field (optional)
     pub fn inset(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `inset` field to an Option value (optional)
     pub fn maybe_inset(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -506,12 +509,12 @@ impl<'a, S: row_state::State> RowBuilder<'a, S> {
 impl<'a, S: row_state::State> RowBuilder<'a, S> {
     /// Set the `justify` field (optional)
     pub fn justify(mut self, value: impl Into<Option<RowJustify<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `justify` field to an Option value (optional)
     pub fn maybe_justify(mut self, value: Option<RowJustify<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -519,12 +522,12 @@ impl<'a, S: row_state::State> RowBuilder<'a, S> {
 impl<'a, S: row_state::State> RowBuilder<'a, S> {
     /// Set the `opaque` field (optional)
     pub fn opaque(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `opaque` field to an Option value (optional)
     pub fn maybe_opaque(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -532,12 +535,12 @@ impl<'a, S: row_state::State> RowBuilder<'a, S> {
 impl<'a, S: row_state::State> RowBuilder<'a, S> {
     /// Set the `sticky` field (optional)
     pub fn sticky(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `sticky` field to an Option value (optional)
     pub fn maybe_sticky(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -550,13 +553,13 @@ where
     /// Build the final struct
     pub fn build(self) -> Row<'a> {
         Row {
-            align: self.__unsafe_private_named.0,
-            children: self.__unsafe_private_named.1.unwrap(),
-            gap: self.__unsafe_private_named.2,
-            inset: self.__unsafe_private_named.3,
-            justify: self.__unsafe_private_named.4,
-            opaque: self.__unsafe_private_named.5,
-            sticky: self.__unsafe_private_named.6,
+            align: self._fields.0,
+            children: self._fields.1.unwrap(),
+            gap: self._fields.2,
+            inset: self._fields.3,
+            justify: self._fields.4,
+            opaque: self._fields.5,
+            sticky: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -566,13 +569,13 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Row<'a> {
         Row {
-            align: self.__unsafe_private_named.0,
-            children: self.__unsafe_private_named.1.unwrap(),
-            gap: self.__unsafe_private_named.2,
-            inset: self.__unsafe_private_named.3,
-            justify: self.__unsafe_private_named.4,
-            opaque: self.__unsafe_private_named.5,
-            sticky: self.__unsafe_private_named.6,
+            align: self._fields.0,
+            children: self._fields.1.unwrap(),
+            gap: self._fields.2,
+            inset: self._fields.3,
+            justify: self._fields.4,
+            opaque: self._fields.5,
+            sticky: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/stack.rs b/crates/jacquard-api/src/org_atsui/stack.rs
index 340d19c3..dd30c95f 100644
--- a/crates/jacquard-api/src/org_atsui/stack.rs
+++ b/crates/jacquard-api/src/org_atsui/stack.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::value::Data;
@@ -417,8 +420,8 @@ pub mod stack_state {
 
 /// Builder for constructing an instance of this type
 pub struct StackBuilder<'a, S: stack_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<StackAlign<'a>>,
         Option<Data<'a>>,
         Option<StackGap<'a>>,
@@ -428,7 +431,7 @@ pub struct StackBuilder<'a, S: stack_state::State> {
         Option<bool>,
         Option<bool>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Stack<'a> {
@@ -442,9 +445,9 @@ impl<'a> StackBuilder<'a, stack_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -452,12 +455,12 @@ impl<'a> StackBuilder<'a, stack_state::Empty> {
 impl<'a, S: stack_state::State> StackBuilder<'a, S> {
     /// Set the `align` field (optional)
     pub fn align(mut self, value: impl Into<Option<StackAlign<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `align` field to an Option value (optional)
     pub fn maybe_align(mut self, value: Option<StackAlign<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -472,11 +475,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> StackBuilder<'a, stack_state::SetChildren<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StackBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -484,12 +487,12 @@ where
 impl<'a, S: stack_state::State> StackBuilder<'a, S> {
     /// Set the `gap` field (optional)
     pub fn gap(mut self, value: impl Into<Option<StackGap<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `gap` field to an Option value (optional)
     pub fn maybe_gap(mut self, value: Option<StackGap<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -497,12 +500,12 @@ impl<'a, S: stack_state::State> StackBuilder<'a, S> {
 impl<'a, S: stack_state::State> StackBuilder<'a, S> {
     /// Set the `inset` field (optional)
     pub fn inset(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `inset` field to an Option value (optional)
     pub fn maybe_inset(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -510,12 +513,12 @@ impl<'a, S: stack_state::State> StackBuilder<'a, S> {
 impl<'a, S: stack_state::State> StackBuilder<'a, S> {
     /// Set the `justify` field (optional)
     pub fn justify(mut self, value: impl Into<Option<StackJustify<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `justify` field to an Option value (optional)
     pub fn maybe_justify(mut self, value: Option<StackJustify<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -523,12 +526,12 @@ impl<'a, S: stack_state::State> StackBuilder<'a, S> {
 impl<'a, S: stack_state::State> StackBuilder<'a, S> {
     /// Set the `opaque` field (optional)
     pub fn opaque(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `opaque` field to an Option value (optional)
     pub fn maybe_opaque(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -536,12 +539,12 @@ impl<'a, S: stack_state::State> StackBuilder<'a, S> {
 impl<'a, S: stack_state::State> StackBuilder<'a, S> {
     /// Set the `separator` field (optional)
     pub fn separator(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `separator` field to an Option value (optional)
     pub fn maybe_separator(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -549,12 +552,12 @@ impl<'a, S: stack_state::State> StackBuilder<'a, S> {
 impl<'a, S: stack_state::State> StackBuilder<'a, S> {
     /// Set the `sticky` field (optional)
     pub fn sticky(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `sticky` field to an Option value (optional)
     pub fn maybe_sticky(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -567,14 +570,14 @@ where
     /// Build the final struct
     pub fn build(self) -> Stack<'a> {
         Stack {
-            align: self.__unsafe_private_named.0,
-            children: self.__unsafe_private_named.1.unwrap(),
-            gap: self.__unsafe_private_named.2,
-            inset: self.__unsafe_private_named.3,
-            justify: self.__unsafe_private_named.4,
-            opaque: self.__unsafe_private_named.5,
-            separator: self.__unsafe_private_named.6,
-            sticky: self.__unsafe_private_named.7,
+            align: self._fields.0,
+            children: self._fields.1.unwrap(),
+            gap: self._fields.2,
+            inset: self._fields.3,
+            justify: self._fields.4,
+            opaque: self._fields.5,
+            separator: self._fields.6,
+            sticky: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -584,14 +587,14 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Stack<'a> {
         Stack {
-            align: self.__unsafe_private_named.0,
-            children: self.__unsafe_private_named.1.unwrap(),
-            gap: self.__unsafe_private_named.2,
-            inset: self.__unsafe_private_named.3,
-            justify: self.__unsafe_private_named.4,
-            opaque: self.__unsafe_private_named.5,
-            separator: self.__unsafe_private_named.6,
-            sticky: self.__unsafe_private_named.7,
+            align: self._fields.0,
+            children: self._fields.1.unwrap(),
+            gap: self._fields.2,
+            inset: self._fields.3,
+            justify: self._fields.4,
+            opaque: self._fields.5,
+            separator: self._fields.6,
+            sticky: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/tabs.rs b/crates/jacquard-api/src/org_atsui/tabs.rs
index 72d45bd9..4f92d437 100644
--- a/crates/jacquard-api/src/org_atsui/tabs.rs
+++ b/crates/jacquard-api/src/org_atsui/tabs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -156,9 +159,9 @@ pub mod tabs_state {
 
 /// Builder for constructing an instance of this type
 pub struct TabsBuilder<'a, S: tabs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<tabs::Tab<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<tabs::Tab<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Tabs<'a> {
@@ -172,9 +175,9 @@ impl<'a> TabsBuilder<'a, tabs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TabsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -189,11 +192,11 @@ where
         mut self,
         value: impl Into<Vec<tabs::Tab<'a>>>,
     ) -> TabsBuilder<'a, tabs_state::SetItems<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TabsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -206,7 +209,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Tabs<'a> {
         Tabs {
-            items: self.__unsafe_private_named.0.unwrap(),
+            items: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -219,7 +222,7 @@ where
         >,
     ) -> Tabs<'a> {
         Tabs {
-            items: self.__unsafe_private_named.0.unwrap(),
+            items: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -235,63 +238,59 @@ pub mod tab_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Label;
-        type Key;
         type Content;
+        type Key;
+        type Label;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Label = Unset;
-        type Key = Unset;
         type Content = Unset;
+        type Key = Unset;
+        type Label = Unset;
     }
-    ///State transition - sets the `label` field to Set
-    pub struct SetLabel<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLabel<S> {}
-    impl<S: State> State for SetLabel<S> {
-        type Label = Set<members::label>;
+    ///State transition - sets the `content` field to Set
+    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContent<S> {}
+    impl<S: State> State for SetContent<S> {
+        type Content = Set<members::content>;
         type Key = S::Key;
-        type Content = S::Content;
+        type Label = S::Label;
     }
     ///State transition - sets the `key` field to Set
     pub struct SetKey<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetKey<S> {}
     impl<S: State> State for SetKey<S> {
-        type Label = S::Label;
-        type Key = Set<members::key>;
         type Content = S::Content;
-    }
-    ///State transition - sets the `content` field to Set
-    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContent<S> {}
-    impl<S: State> State for SetContent<S> {
+        type Key = Set<members::key>;
         type Label = S::Label;
+    }
+    ///State transition - sets the `label` field to Set
+    pub struct SetLabel<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLabel<S> {}
+    impl<S: State> State for SetLabel<S> {
+        type Content = S::Content;
         type Key = S::Key;
-        type Content = Set<members::content>;
+        type Label = Set<members::label>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `label` field
-        pub struct label(());
-        ///Marker type for the `key` field
-        pub struct key(());
         ///Marker type for the `content` field
         pub struct content(());
+        ///Marker type for the `key` field
+        pub struct key(());
+        ///Marker type for the `label` field
+        pub struct label(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TabBuilder<'a, S: tab_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Element<'a>>,
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Element<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Tab<'a> {
@@ -305,9 +304,9 @@ impl<'a> TabBuilder<'a, tab_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TabBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -322,11 +321,11 @@ where
         mut self,
         value: impl Into<Element<'a>>,
     ) -> TabBuilder<'a, tab_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TabBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -341,11 +340,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TabBuilder<'a, tab_state::SetKey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TabBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -360,11 +359,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TabBuilder<'a, tab_state::SetLabel<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TabBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -372,16 +371,16 @@ where
 impl<'a, S> TabBuilder<'a, S>
 where
     S: tab_state::State,
-    S::Label: tab_state::IsSet,
-    S::Key: tab_state::IsSet,
     S::Content: tab_state::IsSet,
+    S::Key: tab_state::IsSet,
+    S::Label: tab_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Tab<'a> {
         Tab {
-            content: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1.unwrap(),
-            label: self.__unsafe_private_named.2.unwrap(),
+            content: self._fields.0.unwrap(),
+            key: self._fields.1.unwrap(),
+            label: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -394,9 +393,9 @@ where
         >,
     ) -> Tab<'a> {
         Tab {
-            content: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1.unwrap(),
-            label: self.__unsafe_private_named.2.unwrap(),
+            content: self._fields.0.unwrap(),
+            key: self._fields.1.unwrap(),
+            label: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/text.rs b/crates/jacquard-api/src/org_atsui/text.rs
index c6a31933..9d989d25 100644
--- a/crates/jacquard-api/src/org_atsui/text.rs
+++ b/crates/jacquard-api/src/org_atsui/text.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::value::Data;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -92,9 +95,9 @@ pub mod text_state {
 
 /// Builder for constructing an instance of this type
 pub struct TextBuilder<'a, S: text_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Data<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Data<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Text<'a> {
@@ -108,9 +111,9 @@ impl<'a> TextBuilder<'a, text_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TextBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -125,11 +128,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> TextBuilder<'a, text_state::SetChildren<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TextBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,7 +145,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Text<'a> {
         Text {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -152,7 +155,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Text<'a> {
         Text {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/timestamp.rs b/crates/jacquard-api/src/org_atsui/timestamp.rs
index cf059d23..390aa137 100644
--- a/crates/jacquard-api/src/org_atsui/timestamp.rs
+++ b/crates/jacquard-api/src/org_atsui/timestamp.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Datetime;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -91,9 +94,9 @@ pub mod timestamp_state {
 
 /// Builder for constructing an instance of this type
 pub struct TimestampBuilder<'a, S: timestamp_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Timestamp<'a> {
@@ -107,9 +110,9 @@ impl<'a> TimestampBuilder<'a, timestamp_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TimestampBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -124,11 +127,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TimestampBuilder<'a, timestamp_state::SetValue<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TimestampBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -141,7 +144,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Timestamp<'a> {
         Timestamp {
-            value: self.__unsafe_private_named.0.unwrap(),
+            value: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -154,7 +157,7 @@ where
         >,
     ) -> Timestamp<'a> {
         Timestamp {
-            value: self.__unsafe_private_named.0.unwrap(),
+            value: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_atsui/title.rs b/crates/jacquard-api/src/org_atsui/title.rs
index 79afb37e..bc7dba86 100644
--- a/crates/jacquard-api/src/org_atsui/title.rs
+++ b/crates/jacquard-api/src/org_atsui/title.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::value::Data;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -92,9 +95,9 @@ pub mod title_state {
 
 /// Builder for constructing an instance of this type
 pub struct TitleBuilder<'a, S: title_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Data<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Data<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Title<'a> {
@@ -108,9 +111,9 @@ impl<'a> TitleBuilder<'a, title_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TitleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -125,11 +128,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> TitleBuilder<'a, title_state::SetChildren<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TitleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,7 +145,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Title<'a> {
         Title {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -152,7 +155,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Title<'a> {
         Title {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_custorium/temp/jsonfg/coord_ref_sys.rs b/crates/jacquard-api/src/org_custorium/temp/jsonfg/coord_ref_sys.rs
index f45b9560..01c192c8 100644
--- a/crates/jacquard-api/src/org_custorium/temp/jsonfg/coord_ref_sys.rs
+++ b/crates/jacquard-api/src/org_custorium/temp/jsonfg/coord_ref_sys.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -331,9 +334,9 @@ pub mod ref_sys_by_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct RefSysByRefBuilder<'a, S: ref_sys_by_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RefSysByRef<'a> {
@@ -347,9 +350,9 @@ impl<'a> RefSysByRefBuilder<'a, ref_sys_by_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RefSysByRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -357,12 +360,12 @@ impl<'a> RefSysByRefBuilder<'a, ref_sys_by_ref_state::Empty> {
 impl<'a, S: ref_sys_by_ref_state::State> RefSysByRefBuilder<'a, S> {
     /// Set the `epoch` field (optional)
     pub fn epoch(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `epoch` field to an Option value (optional)
     pub fn maybe_epoch(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -377,11 +380,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> RefSysByRefBuilder<'a, ref_sys_by_ref_state::SetHref<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RefSysByRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -394,8 +397,8 @@ where
     /// Build the final struct
     pub fn build(self) -> RefSysByRef<'a> {
         RefSysByRef {
-            epoch: self.__unsafe_private_named.0,
-            href: self.__unsafe_private_named.1.unwrap(),
+            epoch: self._fields.0,
+            href: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -408,8 +411,8 @@ where
         >,
     ) -> RefSysByRef<'a> {
         RefSysByRef {
-            epoch: self.__unsafe_private_named.0,
-            href: self.__unsafe_private_named.1.unwrap(),
+            epoch: self._fields.0,
+            href: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -449,9 +452,9 @@ pub mod single_ref_sys_state {
 
 /// Builder for constructing an instance of this type
 pub struct SingleRefSysBuilder<'a, S: single_ref_sys_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<SingleRefSysRefSys<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<SingleRefSysRefSys<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SingleRefSys<'a> {
@@ -465,9 +468,9 @@ impl<'a> SingleRefSysBuilder<'a, single_ref_sys_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SingleRefSysBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -482,11 +485,11 @@ where
         mut self,
         value: impl Into<SingleRefSysRefSys<'a>>,
     ) -> SingleRefSysBuilder<'a, single_ref_sys_state::SetRefSys<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SingleRefSysBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -499,7 +502,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SingleRefSys<'a> {
         SingleRefSys {
-            ref_sys: self.__unsafe_private_named.0.unwrap(),
+            ref_sys: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -512,7 +515,7 @@ where
         >,
     ) -> SingleRefSys<'a> {
         SingleRefSys {
-            ref_sys: self.__unsafe_private_named.0.unwrap(),
+            ref_sys: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_custorium/temp/jsonfg/test_record.rs b/crates/jacquard-api/src/org_custorium/temp/jsonfg/test_record.rs
index 866a5a0b..ddc3f68a 100644
--- a/crates/jacquard-api/src/org_custorium/temp/jsonfg/test_record.rs
+++ b/crates/jacquard-api/src/org_custorium/temp/jsonfg/test_record.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -127,45 +130,45 @@ pub mod test_record_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Geometry;
         type Text;
+        type Geometry;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Geometry = Unset;
         type Text = Unset;
-    }
-    ///State transition - sets the `geometry` field to Set
-    pub struct SetGeometry<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetGeometry<S> {}
-    impl<S: State> State for SetGeometry<S> {
-        type Geometry = Set<members::geometry>;
-        type Text = S::Text;
+        type Geometry = Unset;
     }
     ///State transition - sets the `text` field to Set
     pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetText<S> {}
     impl<S: State> State for SetText<S> {
-        type Geometry = S::Geometry;
         type Text = Set<members::text>;
+        type Geometry = S::Geometry;
+    }
+    ///State transition - sets the `geometry` field to Set
+    pub struct SetGeometry<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetGeometry<S> {}
+    impl<S: State> State for SetGeometry<S> {
+        type Text = S::Text;
+        type Geometry = Set<members::geometry>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `geometry` field
-        pub struct geometry(());
         ///Marker type for the `text` field
         pub struct text(());
+        ///Marker type for the `geometry` field
+        pub struct geometry(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TestRecordBuilder<'a, S: test_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<TestRecordGeometry<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<TestRecordGeometry<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TestRecord<'a> {
@@ -179,9 +182,9 @@ impl<'a> TestRecordBuilder<'a, test_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TestRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<TestRecordGeometry<'a>>,
     ) -> TestRecordBuilder<'a, test_record_state::SetGeometry<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TestRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TestRecordBuilder<'a, test_record_state::SetText<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TestRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -227,14 +230,14 @@ where
 impl<'a, S> TestRecordBuilder<'a, S>
 where
     S: test_record_state::State,
-    S::Geometry: test_record_state::IsSet,
     S::Text: test_record_state::IsSet,
+    S::Geometry: test_record_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TestRecord<'a> {
         TestRecord {
-            geometry: self.__unsafe_private_named.0.unwrap(),
-            text: self.__unsafe_private_named.1.unwrap(),
+            geometry: self._fields.0.unwrap(),
+            text: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -244,8 +247,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> TestRecord<'a> {
         TestRecord {
-            geometry: self.__unsafe_private_named.0.unwrap(),
-            text: self.__unsafe_private_named.1.unwrap(),
+            geometry: self._fields.0.unwrap(),
+            text: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_devcon/event/test.rs b/crates/jacquard-api/src/org_devcon/event/test.rs
index e956da19..a1157983 100644
--- a/crates/jacquard-api/src/org_devcon/event/test.rs
+++ b/crates/jacquard-api/src/org_devcon/event/test.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -125,58 +128,58 @@ pub mod test_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Title;
         type Start;
         type End;
+        type Title;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Title = Unset;
         type Start = Unset;
         type End = Unset;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Title = Set<members::title>;
-        type Start = S::Start;
-        type End = S::End;
+        type Title = Unset;
     }
     ///State transition - sets the `start` field to Set
     pub struct SetStart<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStart<S> {}
     impl<S: State> State for SetStart<S> {
-        type Title = S::Title;
         type Start = Set<members::start>;
         type End = S::End;
+        type Title = S::Title;
     }
     ///State transition - sets the `end` field to Set
     pub struct SetEnd<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEnd<S> {}
     impl<S: State> State for SetEnd<S> {
-        type Title = S::Title;
         type Start = S::Start;
         type End = Set<members::end>;
+        type Title = S::Title;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type Start = S::Start;
+        type End = S::End;
+        type Title = Set<members::title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `title` field
-        pub struct title(());
         ///Marker type for the `start` field
         pub struct start(());
         ///Marker type for the `end` field
         pub struct end(());
+        ///Marker type for the `title` field
+        pub struct title(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TestBuilder<'a, S: test_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -185,7 +188,7 @@ pub struct TestBuilder<'a, S: test_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Test<'a> {
@@ -199,9 +202,9 @@ impl<'a> TestBuilder<'a, test_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,12 +212,12 @@ impl<'a> TestBuilder<'a, test_state::Empty> {
 impl<'a, S: test_state::State> TestBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -222,12 +225,12 @@ impl<'a, S: test_state::State> TestBuilder<'a, S> {
 impl<'a, S: test_state::State> TestBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -242,11 +245,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TestBuilder<'a, test_state::SetEnd<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -254,12 +257,12 @@ where
 impl<'a, S: test_state::State> TestBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -274,11 +277,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TestBuilder<'a, test_state::SetStart<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         TestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -293,11 +296,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TestBuilder<'a, test_state::SetTitle<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         TestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -305,12 +308,12 @@ where
 impl<'a, S: test_state::State> TestBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -318,20 +321,20 @@ impl<'a, S: test_state::State> TestBuilder<'a, S> {
 impl<'a, S> TestBuilder<'a, S>
 where
     S: test_state::State,
-    S::Title: test_state::IsSet,
     S::Start: test_state::IsSet,
     S::End: test_state::IsSet,
+    S::Title: test_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Test<'a> {
         Test {
-            created_at: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            end: self.__unsafe_private_named.2.unwrap(),
-            location: self.__unsafe_private_named.3,
-            start: self.__unsafe_private_named.4.unwrap(),
-            title: self.__unsafe_private_named.5.unwrap(),
-            url: self.__unsafe_private_named.6,
+            created_at: self._fields.0,
+            description: self._fields.1,
+            end: self._fields.2.unwrap(),
+            location: self._fields.3,
+            start: self._fields.4.unwrap(),
+            title: self._fields.5.unwrap(),
+            url: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -344,13 +347,13 @@ where
         >,
     ) -> Test<'a> {
         Test {
-            created_at: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            end: self.__unsafe_private_named.2.unwrap(),
-            location: self.__unsafe_private_named.3,
-            start: self.__unsafe_private_named.4.unwrap(),
-            title: self.__unsafe_private_named.5.unwrap(),
-            url: self.__unsafe_private_named.6,
+            created_at: self._fields.0,
+            description: self._fields.1,
+            end: self._fields.2.unwrap(),
+            location: self._fields.3,
+            start: self._fields.4.unwrap(),
+            title: self._fields.5.unwrap(),
+            url: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_farmapps/temp/agroconnect/cl022.rs b/crates/jacquard-api/src/org_farmapps/temp/agroconnect/cl022.rs
index 7e6ad686..c4eadce0 100644
--- a/crates/jacquard-api/src/org_farmapps/temp/agroconnect/cl022.rs
+++ b/crates/jacquard-api/src/org_farmapps/temp/agroconnect/cl022.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -178,44 +181,44 @@ pub mod cl022_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Description;
         type Id;
+        type Description;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Description = Unset;
         type Id = Unset;
-    }
-    ///State transition - sets the `description` field to Set
-    pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDescription<S> {}
-    impl<S: State> State for SetDescription<S> {
-        type Description = Set<members::description>;
-        type Id = S::Id;
+        type Description = Unset;
     }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetId<S> {}
     impl<S: State> State for SetId<S> {
-        type Description = S::Description;
         type Id = Set<members::id>;
+        type Description = S::Description;
+    }
+    ///State transition - sets the `description` field to Set
+    pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDescription<S> {}
+    impl<S: State> State for SetDescription<S> {
+        type Id = S::Id;
+        type Description = Set<members::description>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `description` field
-        pub struct description(());
         ///Marker type for the `id` field
         pub struct id(());
+        ///Marker type for the `description` field
+        pub struct description(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct Cl022Builder<'a, S: cl022_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<i64>,
@@ -228,7 +231,7 @@ pub struct Cl022Builder<'a, S: cl022_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Cl022<'a> {
@@ -242,21 +245,9 @@ impl<'a> Cl022Builder<'a, cl022_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         Cl022Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -264,12 +255,12 @@ impl<'a> Cl022Builder<'a, cl022_state::Empty> {
 impl<'a, S: cl022_state::State> Cl022Builder<'a, S> {
     /// Set the `added` field (optional)
     pub fn added(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `added` field to an Option value (optional)
     pub fn maybe_added(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -277,12 +268,12 @@ impl<'a, S: cl022_state::State> Cl022Builder<'a, S> {
 impl<'a, S: cl022_state::State> Cl022Builder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -290,12 +281,12 @@ impl<'a, S: cl022_state::State> Cl022Builder<'a, S> {
 impl<'a, S: cl022_state::State> Cl022Builder<'a, S> {
     /// Set the `denominator` field (optional)
     pub fn denominator(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `denominator` field to an Option value (optional)
     pub fn maybe_denominator(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -310,11 +301,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> Cl022Builder<'a, cl022_state::SetDescription<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         Cl022Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -329,11 +320,11 @@ where
         mut self,
         value: impl Into<CodeType<'a>>,
     ) -> Cl022Builder<'a, cl022_state::SetId<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         Cl022Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -341,12 +332,12 @@ where
 impl<'a, S: cl022_state::State> Cl022Builder<'a, S> {
     /// Set the `k2o` field (optional)
     pub fn k2o(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `k2o` field to an Option value (optional)
     pub fn maybe_k2o(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -354,12 +345,12 @@ impl<'a, S: cl022_state::State> Cl022Builder<'a, S> {
 impl<'a, S: cl022_state::State> Cl022Builder<'a, S> {
     /// Set the `n` field (optional)
     pub fn n(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `n` field to an Option value (optional)
     pub fn maybe_n(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -367,12 +358,12 @@ impl<'a, S: cl022_state::State> Cl022Builder<'a, S> {
 impl<'a, S: cl022_state::State> Cl022Builder<'a, S> {
     /// Set the `p2o5` field (optional)
     pub fn p2o5(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `p2o5` field to an Option value (optional)
     pub fn maybe_p2o5(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -380,12 +371,12 @@ impl<'a, S: cl022_state::State> Cl022Builder<'a, S> {
 impl<'a, S: cl022_state::State> Cl022Builder<'a, S> {
     /// Set the `type` field (optional)
     pub fn r#type(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `type` field to an Option value (optional)
     pub fn maybe_type(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -393,12 +384,12 @@ impl<'a, S: cl022_state::State> Cl022Builder<'a, S> {
 impl<'a, S: cl022_state::State> Cl022Builder<'a, S> {
     /// Set the `unit` field (optional)
     pub fn unit(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `unit` field to an Option value (optional)
     pub fn maybe_unit(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -406,12 +397,12 @@ impl<'a, S: cl022_state::State> Cl022Builder<'a, S> {
 impl<'a, S: cl022_state::State> Cl022Builder<'a, S> {
     /// Set the `updated` field (optional)
     pub fn updated(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `updated` field to an Option value (optional)
     pub fn maybe_updated(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -419,23 +410,23 @@ impl<'a, S: cl022_state::State> Cl022Builder<'a, S> {
 impl<'a, S> Cl022Builder<'a, S>
 where
     S: cl022_state::State,
-    S::Description: cl022_state::IsSet,
     S::Id: cl022_state::IsSet,
+    S::Description: cl022_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Cl022<'a> {
         Cl022 {
-            added: self.__unsafe_private_named.0,
-            comment: self.__unsafe_private_named.1,
-            denominator: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3.unwrap(),
-            id: self.__unsafe_private_named.4.unwrap(),
-            k2o: self.__unsafe_private_named.5,
-            n: self.__unsafe_private_named.6,
-            p2o5: self.__unsafe_private_named.7,
-            r#type: self.__unsafe_private_named.8,
-            unit: self.__unsafe_private_named.9,
-            updated: self.__unsafe_private_named.10,
+            added: self._fields.0,
+            comment: self._fields.1,
+            denominator: self._fields.2,
+            description: self._fields.3.unwrap(),
+            id: self._fields.4.unwrap(),
+            k2o: self._fields.5,
+            n: self._fields.6,
+            p2o5: self._fields.7,
+            r#type: self._fields.8,
+            unit: self._fields.9,
+            updated: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -448,17 +439,17 @@ where
         >,
     ) -> Cl022<'a> {
         Cl022 {
-            added: self.__unsafe_private_named.0,
-            comment: self.__unsafe_private_named.1,
-            denominator: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3.unwrap(),
-            id: self.__unsafe_private_named.4.unwrap(),
-            k2o: self.__unsafe_private_named.5,
-            n: self.__unsafe_private_named.6,
-            p2o5: self.__unsafe_private_named.7,
-            r#type: self.__unsafe_private_named.8,
-            unit: self.__unsafe_private_named.9,
-            updated: self.__unsafe_private_named.10,
+            added: self._fields.0,
+            comment: self._fields.1,
+            denominator: self._fields.2,
+            description: self._fields.3.unwrap(),
+            id: self._fields.4.unwrap(),
+            k2o: self._fields.5,
+            n: self._fields.6,
+            p2o5: self._fields.7,
+            r#type: self._fields.8,
+            unit: self._fields.9,
+            updated: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_farmapps/temp/ecrop.rs b/crates/jacquard-api/src/org_farmapps/temp/ecrop.rs
index 774726bb..dbb73df7 100644
--- a/crates/jacquard-api/src/org_farmapps/temp/ecrop.rs
+++ b/crates/jacquard-api/src/org_farmapps/temp/ecrop.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -56,45 +59,45 @@ pub mod code_type_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Code;
         type ListId;
+        type Code;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Code = Unset;
         type ListId = Unset;
-    }
-    ///State transition - sets the `code` field to Set
-    pub struct SetCode<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCode<S> {}
-    impl<S: State> State for SetCode<S> {
-        type Code = Set<members::code>;
-        type ListId = S::ListId;
+        type Code = Unset;
     }
     ///State transition - sets the `list_id` field to Set
     pub struct SetListId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetListId<S> {}
     impl<S: State> State for SetListId<S> {
-        type Code = S::Code;
         type ListId = Set<members::list_id>;
+        type Code = S::Code;
+    }
+    ///State transition - sets the `code` field to Set
+    pub struct SetCode<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCode<S> {}
+    impl<S: State> State for SetCode<S> {
+        type ListId = S::ListId;
+        type Code = Set<members::code>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `code` field
-        pub struct code(());
         ///Marker type for the `list_id` field
         pub struct list_id(());
+        ///Marker type for the `code` field
+        pub struct code(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CodeTypeBuilder<'a, S: code_type_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<RecordKey<Rkey<'a>>>, Option<Nsid<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<RecordKey<Rkey<'a>>>, Option<Nsid<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CodeType<'a> {
@@ -108,9 +111,9 @@ impl<'a> CodeTypeBuilder<'a, code_type_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CodeTypeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -125,11 +128,11 @@ where
         mut self,
         value: impl Into<RecordKey<Rkey<'a>>>,
     ) -> CodeTypeBuilder<'a, code_type_state::SetCode<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CodeTypeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -144,11 +147,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> CodeTypeBuilder<'a, code_type_state::SetListId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CodeTypeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -156,14 +159,14 @@ where
 impl<'a, S> CodeTypeBuilder<'a, S>
 where
     S: code_type_state::State,
-    S::Code: code_type_state::IsSet,
     S::ListId: code_type_state::IsSet,
+    S::Code: code_type_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CodeType<'a> {
         CodeType {
-            code: self.__unsafe_private_named.0.unwrap(),
-            list_id: self.__unsafe_private_named.1.unwrap(),
+            code: self._fields.0.unwrap(),
+            list_id: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -176,8 +179,8 @@ where
         >,
     ) -> CodeType<'a> {
         CodeType {
-            code: self.__unsafe_private_named.0.unwrap(),
-            list_id: self.__unsafe_private_named.1.unwrap(),
+            code: self._fields.0.unwrap(),
+            list_id: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_hyperboards/board.rs b/crates/jacquard-api/src/org_hyperboards/board.rs
index 0243ba18..88432dbf 100644
--- a/crates/jacquard-api/src/org_hyperboards/board.rs
+++ b/crates/jacquard-api/src/org_hyperboards/board.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -1056,8 +1059,8 @@ pub mod contributor_config_state {
 
 /// Builder for constructing an instance of this type
 pub struct ContributorConfigBuilder<'a, S: contributor_config_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ContributorConfigContributor<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
@@ -1067,7 +1070,7 @@ pub struct ContributorConfigBuilder<'a, S: contributor_config_state::State> {
         Option<UriValue<'a>>,
         Option<ContributorConfigVideo<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ContributorConfig<'a> {
@@ -1081,9 +1084,9 @@ impl<'a> ContributorConfigBuilder<'a, contributor_config_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ContributorConfigBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1098,11 +1101,11 @@ where
         mut self,
         value: impl Into<ContributorConfigContributor<'a>>,
     ) -> ContributorConfigBuilder<'a, contributor_config_state::SetContributor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ContributorConfigBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1110,12 +1113,12 @@ where
 impl<'a, S: contributor_config_state::State> ContributorConfigBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1123,12 +1126,12 @@ impl<'a, S: contributor_config_state::State> ContributorConfigBuilder<'a, S> {
 impl<'a, S: contributor_config_state::State> ContributorConfigBuilder<'a, S> {
     /// Set the `hoverIframeUrl` field (optional)
     pub fn hover_iframe_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `hoverIframeUrl` field to an Option value (optional)
     pub fn maybe_hover_iframe_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1139,7 +1142,7 @@ impl<'a, S: contributor_config_state::State> ContributorConfigBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ContributorConfigHoverImage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `hoverImage` field to an Option value (optional)
@@ -1147,7 +1150,7 @@ impl<'a, S: contributor_config_state::State> ContributorConfigBuilder<'a, S> {
         mut self,
         value: Option<ContributorConfigHoverImage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1158,12 +1161,12 @@ impl<'a, S: contributor_config_state::State> ContributorConfigBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ContributorConfigImage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<ContributorConfigImage<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1171,12 +1174,12 @@ impl<'a, S: contributor_config_state::State> ContributorConfigBuilder<'a, S> {
 impl<'a, S: contributor_config_state::State> ContributorConfigBuilder<'a, S> {
     /// Set the `override` field (optional)
     pub fn r#override(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `override` field to an Option value (optional)
     pub fn maybe_override(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1184,12 +1187,12 @@ impl<'a, S: contributor_config_state::State> ContributorConfigBuilder<'a, S> {
 impl<'a, S: contributor_config_state::State> ContributorConfigBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1200,12 +1203,12 @@ impl<'a, S: contributor_config_state::State> ContributorConfigBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ContributorConfigVideo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `video` field to an Option value (optional)
     pub fn maybe_video(mut self, value: Option<ContributorConfigVideo<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -1218,14 +1221,14 @@ where
     /// Build the final struct
     pub fn build(self) -> ContributorConfig<'a> {
         ContributorConfig {
-            contributor: self.__unsafe_private_named.0.unwrap(),
-            display_name: self.__unsafe_private_named.1,
-            hover_iframe_url: self.__unsafe_private_named.2,
-            hover_image: self.__unsafe_private_named.3,
-            image: self.__unsafe_private_named.4,
-            r#override: self.__unsafe_private_named.5,
-            url: self.__unsafe_private_named.6,
-            video: self.__unsafe_private_named.7,
+            contributor: self._fields.0.unwrap(),
+            display_name: self._fields.1,
+            hover_iframe_url: self._fields.2,
+            hover_image: self._fields.3,
+            image: self._fields.4,
+            r#override: self._fields.5,
+            url: self._fields.6,
+            video: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -1238,14 +1241,14 @@ where
         >,
     ) -> ContributorConfig<'a> {
         ContributorConfig {
-            contributor: self.__unsafe_private_named.0.unwrap(),
-            display_name: self.__unsafe_private_named.1,
-            hover_iframe_url: self.__unsafe_private_named.2,
-            hover_image: self.__unsafe_private_named.3,
-            image: self.__unsafe_private_named.4,
-            r#override: self.__unsafe_private_named.5,
-            url: self.__unsafe_private_named.6,
-            video: self.__unsafe_private_named.7,
+            contributor: self._fields.0.unwrap(),
+            display_name: self._fields.1,
+            hover_iframe_url: self._fields.2,
+            hover_image: self._fields.3,
+            image: self._fields.4,
+            r#override: self._fields.5,
+            url: self._fields.6,
+            video: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
@@ -1297,14 +1300,14 @@ pub mod board_state {
 
 /// Builder for constructing an instance of this type
 pub struct BoardBuilder<'a, S: board_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<board::BoardConfig<'a>>,
         Option<Vec<board::ContributorConfig<'a>>>,
         Option<Datetime>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Board<'a> {
@@ -1318,9 +1321,9 @@ impl<'a> BoardBuilder<'a, board_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BoardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1328,12 +1331,12 @@ impl<'a> BoardBuilder<'a, board_state::Empty> {
 impl<'a, S: board_state::State> BoardBuilder<'a, S> {
     /// Set the `config` field (optional)
     pub fn config(mut self, value: impl Into<Option<board::BoardConfig<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `config` field to an Option value (optional)
     pub fn maybe_config(mut self, value: Option<board::BoardConfig<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1344,7 +1347,7 @@ impl<'a, S: board_state::State> BoardBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<board::ContributorConfig<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `contributorConfigs` field to an Option value (optional)
@@ -1352,7 +1355,7 @@ impl<'a, S: board_state::State> BoardBuilder<'a, S> {
         mut self,
         value: Option<Vec<board::ContributorConfig<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1367,11 +1370,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BoardBuilder<'a, board_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BoardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1386,11 +1389,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> BoardBuilder<'a, board_state::SetSubject<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BoardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1404,10 +1407,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Board<'a> {
         Board {
-            config: self.__unsafe_private_named.0,
-            contributor_configs: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
+            config: self._fields.0,
+            contributor_configs: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1420,10 +1423,10 @@ where
         >,
     ) -> Board<'a> {
         Board {
-            config: self.__unsafe_private_named.0,
-            contributor_configs: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
+            config: self._fields.0,
+            contributor_configs: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_hyperboards/contributor.rs b/crates/jacquard-api/src/org_hyperboards/contributor.rs
index 0e9f4bc3..1a6caaf3 100644
--- a/crates/jacquard-api/src/org_hyperboards/contributor.rs
+++ b/crates/jacquard-api/src/org_hyperboards/contributor.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -166,8 +169,8 @@ pub mod contributor_state {
 
 /// Builder for constructing an instance of this type
 pub struct ContributorBuilder<'a, S: contributor_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<StrongRef<'a>>,
         Option<Datetime>,
@@ -176,7 +179,7 @@ pub struct ContributorBuilder<'a, S: contributor_state::State> {
         Option<UriValue<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Contributor<'a> {
@@ -190,9 +193,9 @@ impl<'a> ContributorBuilder<'a, contributor_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ContributorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,12 +203,12 @@ impl<'a> ContributorBuilder<'a, contributor_state::Empty> {
 impl<'a, S: contributor_state::State> ContributorBuilder<'a, S> {
     /// Set the `circularImage` field (optional)
     pub fn circular_image(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `circularImage` field to an Option value (optional)
     pub fn maybe_circular_image(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -220,11 +223,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ContributorBuilder<'a, contributor_state::SetContributorRef<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ContributorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,11 +242,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ContributorBuilder<'a, contributor_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ContributorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -251,12 +254,12 @@ where
 impl<'a, S: contributor_state::State> ContributorBuilder<'a, S> {
     /// Set the `hoverIframeUrl` field (optional)
     pub fn hover_iframe_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `hoverIframeUrl` field to an Option value (optional)
     pub fn maybe_hover_iframe_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -264,12 +267,12 @@ impl<'a, S: contributor_state::State> ContributorBuilder<'a, S> {
 impl<'a, S: contributor_state::State> ContributorBuilder<'a, S> {
     /// Set the `hoverImageUrl` field (optional)
     pub fn hover_image_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `hoverImageUrl` field to an Option value (optional)
     pub fn maybe_hover_image_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -277,12 +280,12 @@ impl<'a, S: contributor_state::State> ContributorBuilder<'a, S> {
 impl<'a, S: contributor_state::State> ContributorBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -290,12 +293,12 @@ impl<'a, S: contributor_state::State> ContributorBuilder<'a, S> {
 impl<'a, S: contributor_state::State> ContributorBuilder<'a, S> {
     /// Set the `videoUrl` field (optional)
     pub fn video_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `videoUrl` field to an Option value (optional)
     pub fn maybe_video_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -309,13 +312,13 @@ where
     /// Build the final struct
     pub fn build(self) -> Contributor<'a> {
         Contributor {
-            circular_image: self.__unsafe_private_named.0,
-            contributor_ref: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            hover_iframe_url: self.__unsafe_private_named.3,
-            hover_image_url: self.__unsafe_private_named.4,
-            url: self.__unsafe_private_named.5,
-            video_url: self.__unsafe_private_named.6,
+            circular_image: self._fields.0,
+            contributor_ref: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            hover_iframe_url: self._fields.3,
+            hover_image_url: self._fields.4,
+            url: self._fields.5,
+            video_url: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -328,13 +331,13 @@ where
         >,
     ) -> Contributor<'a> {
         Contributor {
-            circular_image: self.__unsafe_private_named.0,
-            contributor_ref: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            hover_iframe_url: self.__unsafe_private_named.3,
-            hover_image_url: self.__unsafe_private_named.4,
-            url: self.__unsafe_private_named.5,
-            video_url: self.__unsafe_private_named.6,
+            circular_image: self._fields.0,
+            contributor_ref: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            hover_iframe_url: self._fields.3,
+            hover_image_url: self._fields.4,
+            url: self._fields.5,
+            video_url: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_hyperboards/display_profile.rs b/crates/jacquard-api/src/org_hyperboards/display_profile.rs
index a73ef228..636bd3c2 100644
--- a/crates/jacquard-api/src/org_hyperboards/display_profile.rs
+++ b/crates/jacquard-api/src/org_hyperboards/display_profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -236,8 +239,8 @@ pub mod display_profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct DisplayProfileBuilder<'a, S: display_profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
@@ -246,7 +249,7 @@ pub struct DisplayProfileBuilder<'a, S: display_profile_state::State> {
         Option<UriValue<'a>>,
         Option<DisplayProfileVideo<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DisplayProfile<'a> {
@@ -260,9 +263,9 @@ impl<'a> DisplayProfileBuilder<'a, display_profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DisplayProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -277,11 +280,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DisplayProfileBuilder<'a, display_profile_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DisplayProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -289,12 +292,12 @@ where
 impl<'a, S: display_profile_state::State> DisplayProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -302,12 +305,12 @@ impl<'a, S: display_profile_state::State> DisplayProfileBuilder<'a, S> {
 impl<'a, S: display_profile_state::State> DisplayProfileBuilder<'a, S> {
     /// Set the `hoverIframeUrl` field (optional)
     pub fn hover_iframe_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `hoverIframeUrl` field to an Option value (optional)
     pub fn maybe_hover_iframe_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -318,7 +321,7 @@ impl<'a, S: display_profile_state::State> DisplayProfileBuilder<'a, S> {
         mut self,
         value: impl Into<Option<DisplayProfileHoverImage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `hoverImage` field to an Option value (optional)
@@ -326,7 +329,7 @@ impl<'a, S: display_profile_state::State> DisplayProfileBuilder<'a, S> {
         mut self,
         value: Option<DisplayProfileHoverImage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -334,12 +337,12 @@ impl<'a, S: display_profile_state::State> DisplayProfileBuilder<'a, S> {
 impl<'a, S: display_profile_state::State> DisplayProfileBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<DisplayProfileImage<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<DisplayProfileImage<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -347,12 +350,12 @@ impl<'a, S: display_profile_state::State> DisplayProfileBuilder<'a, S> {
 impl<'a, S: display_profile_state::State> DisplayProfileBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -360,12 +363,12 @@ impl<'a, S: display_profile_state::State> DisplayProfileBuilder<'a, S> {
 impl<'a, S: display_profile_state::State> DisplayProfileBuilder<'a, S> {
     /// Set the `video` field (optional)
     pub fn video(mut self, value: impl Into<Option<DisplayProfileVideo<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `video` field to an Option value (optional)
     pub fn maybe_video(mut self, value: Option<DisplayProfileVideo<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -378,13 +381,13 @@ where
     /// Build the final struct
     pub fn build(self) -> DisplayProfile<'a> {
         DisplayProfile {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            display_name: self.__unsafe_private_named.1,
-            hover_iframe_url: self.__unsafe_private_named.2,
-            hover_image: self.__unsafe_private_named.3,
-            image: self.__unsafe_private_named.4,
-            url: self.__unsafe_private_named.5,
-            video: self.__unsafe_private_named.6,
+            created_at: self._fields.0.unwrap(),
+            display_name: self._fields.1,
+            hover_iframe_url: self._fields.2,
+            hover_image: self._fields.3,
+            image: self._fields.4,
+            url: self._fields.5,
+            video: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -397,13 +400,13 @@ where
         >,
     ) -> DisplayProfile<'a> {
         DisplayProfile {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            display_name: self.__unsafe_private_named.1,
-            hover_iframe_url: self.__unsafe_private_named.2,
-            hover_image: self.__unsafe_private_named.3,
-            image: self.__unsafe_private_named.4,
-            url: self.__unsafe_private_named.5,
-            video: self.__unsafe_private_named.6,
+            created_at: self._fields.0.unwrap(),
+            display_name: self._fields.1,
+            hover_iframe_url: self._fields.2,
+            hover_image: self._fields.3,
+            image: self._fields.4,
+            url: self._fields.5,
+            video: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_hypercerts.rs b/crates/jacquard-api/src/org_hypercerts.rs
index 4c40976a..e48f4a76 100644
--- a/crates/jacquard-api/src/org_hypercerts.rs
+++ b/crates/jacquard-api/src/org_hypercerts.rs
@@ -12,7 +12,11 @@ pub mod funding;
 pub mod helper;
 pub mod workscope;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -434,9 +438,9 @@ pub mod large_blob_state {
 
 /// Builder for constructing an instance of this type
 pub struct LargeBlobBuilder<'a, S: large_blob_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LargeBlob<'a> {
@@ -450,9 +454,9 @@ impl<'a> LargeBlobBuilder<'a, large_blob_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LargeBlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -467,11 +471,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> LargeBlobBuilder<'a, large_blob_state::SetBlob<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LargeBlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -484,7 +488,7 @@ where
     /// Build the final struct
     pub fn build(self) -> LargeBlob<'a> {
         LargeBlob {
-            blob: self.__unsafe_private_named.0.unwrap(),
+            blob: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -497,7 +501,7 @@ where
         >,
     ) -> LargeBlob<'a> {
         LargeBlob {
-            blob: self.__unsafe_private_named.0.unwrap(),
+            blob: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -673,9 +677,9 @@ pub mod large_image_state {
 
 /// Builder for constructing an instance of this type
 pub struct LargeImageBuilder<'a, S: large_image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LargeImage<'a> {
@@ -689,9 +693,9 @@ impl<'a> LargeImageBuilder<'a, large_image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LargeImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -706,11 +710,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> LargeImageBuilder<'a, large_image_state::SetImage<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LargeImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -723,7 +727,7 @@ where
     /// Build the final struct
     pub fn build(self) -> LargeImage<'a> {
         LargeImage {
-            image: self.__unsafe_private_named.0.unwrap(),
+            image: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -736,7 +740,7 @@ where
         >,
     ) -> LargeImage<'a> {
         LargeImage {
-            image: self.__unsafe_private_named.0.unwrap(),
+            image: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -776,9 +780,9 @@ pub mod small_blob_state {
 
 /// Builder for constructing an instance of this type
 pub struct SmallBlobBuilder<'a, S: small_blob_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SmallBlob<'a> {
@@ -792,9 +796,9 @@ impl<'a> SmallBlobBuilder<'a, small_blob_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SmallBlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -809,11 +813,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> SmallBlobBuilder<'a, small_blob_state::SetBlob<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SmallBlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -826,7 +830,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SmallBlob<'a> {
         SmallBlob {
-            blob: self.__unsafe_private_named.0.unwrap(),
+            blob: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -839,7 +843,7 @@ where
         >,
     ) -> SmallBlob<'a> {
         SmallBlob {
-            blob: self.__unsafe_private_named.0.unwrap(),
+            blob: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -879,9 +883,9 @@ pub mod small_image_state {
 
 /// Builder for constructing an instance of this type
 pub struct SmallImageBuilder<'a, S: small_image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SmallImage<'a> {
@@ -895,9 +899,9 @@ impl<'a> SmallImageBuilder<'a, small_image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SmallImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -912,11 +916,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> SmallImageBuilder<'a, small_image_state::SetImage<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SmallImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -929,7 +933,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SmallImage<'a> {
         SmallImage {
-            image: self.__unsafe_private_named.0.unwrap(),
+            image: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -942,7 +946,7 @@ where
         >,
     ) -> SmallImage<'a> {
         SmallImage {
-            image: self.__unsafe_private_named.0.unwrap(),
+            image: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -982,9 +986,9 @@ pub mod small_video_state {
 
 /// Builder for constructing an instance of this type
 pub struct SmallVideoBuilder<'a, S: small_video_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SmallVideo<'a> {
@@ -998,9 +1002,9 @@ impl<'a> SmallVideoBuilder<'a, small_video_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SmallVideoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1015,11 +1019,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> SmallVideoBuilder<'a, small_video_state::SetVideo<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SmallVideoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1032,7 +1036,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SmallVideo<'a> {
         SmallVideo {
-            video: self.__unsafe_private_named.0.unwrap(),
+            video: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1045,7 +1049,7 @@ where
         >,
     ) -> SmallVideo<'a> {
         SmallVideo {
-            video: self.__unsafe_private_named.0.unwrap(),
+            video: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1085,9 +1089,9 @@ pub mod uri_state {
 
 /// Builder for constructing an instance of this type
 pub struct UriBuilder<'a, S: uri_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Uri<'a> {
@@ -1101,9 +1105,9 @@ impl<'a> UriBuilder<'a, uri_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UriBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1118,11 +1122,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> UriBuilder<'a, uri_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UriBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1135,7 +1139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Uri<'a> {
         Uri {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1148,7 +1152,7 @@ where
         >,
     ) -> Uri<'a> {
         Uri {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_hypercerts/claim/activity.rs b/crates/jacquard-api/src/org_hypercerts/claim/activity.rs
index 3cbbbd86..fa7d18a1 100644
--- a/crates/jacquard-api/src/org_hypercerts/claim/activity.rs
+++ b/crates/jacquard-api/src/org_hypercerts/claim/activity.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -474,13 +477,13 @@ pub mod contributor_state {
 
 /// Builder for constructing an instance of this type
 pub struct ContributorBuilder<'a, S: contributor_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ContributorContributionDetails<'a>>,
         Option<CowStr<'a>>,
         Option<ContributorContributorIdentity<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Contributor<'a> {
@@ -494,9 +497,9 @@ impl<'a> ContributorBuilder<'a, contributor_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ContributorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -507,7 +510,7 @@ impl<'a, S: contributor_state::State> ContributorBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ContributorContributionDetails<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `contributionDetails` field to an Option value (optional)
@@ -515,7 +518,7 @@ impl<'a, S: contributor_state::State> ContributorBuilder<'a, S> {
         mut self,
         value: Option<ContributorContributionDetails<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -523,12 +526,12 @@ impl<'a, S: contributor_state::State> ContributorBuilder<'a, S> {
 impl<'a, S: contributor_state::State> ContributorBuilder<'a, S> {
     /// Set the `contributionWeight` field (optional)
     pub fn contribution_weight(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `contributionWeight` field to an Option value (optional)
     pub fn maybe_contribution_weight(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -543,11 +546,11 @@ where
         mut self,
         value: impl Into<ContributorContributorIdentity<'a>>,
     ) -> ContributorBuilder<'a, contributor_state::SetContributorIdentity<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ContributorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -560,9 +563,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Contributor<'a> {
         Contributor {
-            contribution_details: self.__unsafe_private_named.0,
-            contribution_weight: self.__unsafe_private_named.1,
-            contributor_identity: self.__unsafe_private_named.2.unwrap(),
+            contribution_details: self._fields.0,
+            contribution_weight: self._fields.1,
+            contributor_identity: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -575,9 +578,9 @@ where
         >,
     ) -> Contributor<'a> {
         Contributor {
-            contribution_details: self.__unsafe_private_named.0,
-            contribution_weight: self.__unsafe_private_named.1,
-            contributor_identity: self.__unsafe_private_named.2.unwrap(),
+            contribution_details: self._fields.0,
+            contribution_weight: self._fields.1,
+            contributor_identity: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -923,57 +926,57 @@ pub mod activity_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Title;
-        type ShortDescription;
         type CreatedAt;
+        type ShortDescription;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Title = Unset;
-        type ShortDescription = Unset;
         type CreatedAt = Unset;
+        type ShortDescription = Unset;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
         type Title = Set<members::title>;
-        type ShortDescription = S::ShortDescription;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `short_description` field to Set
-    pub struct SetShortDescription<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetShortDescription<S> {}
-    impl<S: State> State for SetShortDescription<S> {
-        type Title = S::Title;
-        type ShortDescription = Set<members::short_description>;
         type CreatedAt = S::CreatedAt;
+        type ShortDescription = S::ShortDescription;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type Title = S::Title;
-        type ShortDescription = S::ShortDescription;
         type CreatedAt = Set<members::created_at>;
+        type ShortDescription = S::ShortDescription;
+    }
+    ///State transition - sets the `short_description` field to Set
+    pub struct SetShortDescription<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetShortDescription<S> {}
+    impl<S: State> State for SetShortDescription<S> {
+        type Title = S::Title;
+        type CreatedAt = S::CreatedAt;
+        type ShortDescription = Set<members::short_description>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `title` field
         pub struct title(());
-        ///Marker type for the `short_description` field
-        pub struct short_description(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `short_description` field
+        pub struct short_description(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ActivityBuilder<'a, S: activity_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<activity::Contributor<'a>>>,
         Option<Datetime>,
         Option<LinearDocument<'a>>,
@@ -987,7 +990,7 @@ pub struct ActivityBuilder<'a, S: activity_state::State> {
         Option<CowStr<'a>>,
         Option<ActivityWorkScope<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Activity<'a> {
@@ -1001,8 +1004,8 @@ impl<'a> ActivityBuilder<'a, activity_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -1016,7 +1019,7 @@ impl<'a> ActivityBuilder<'a, activity_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1027,7 +1030,7 @@ impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<activity::Contributor<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `contributors` field to an Option value (optional)
@@ -1035,7 +1038,7 @@ impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
         mut self,
         value: Option<Vec<activity::Contributor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1050,11 +1053,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ActivityBuilder<'a, activity_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1062,12 +1065,12 @@ where
 impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<LinearDocument<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<LinearDocument<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1075,12 +1078,12 @@ impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
 impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
     /// Set the `endDate` field (optional)
     pub fn end_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `endDate` field to an Option value (optional)
     pub fn maybe_end_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1088,12 +1091,12 @@ impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
 impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<ActivityImage<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<ActivityImage<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1101,12 +1104,12 @@ impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
 impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
     /// Set the `locations` field (optional)
     pub fn locations(mut self, value: impl Into<Option<Vec<StrongRef<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `locations` field to an Option value (optional)
     pub fn maybe_locations(mut self, value: Option<Vec<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1114,12 +1117,12 @@ impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
 impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
     /// Set the `rights` field (optional)
     pub fn rights(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `rights` field to an Option value (optional)
     pub fn maybe_rights(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1134,11 +1137,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ActivityBuilder<'a, activity_state::SetShortDescription<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1149,7 +1152,7 @@ impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `shortDescriptionFacets` field to an Option value (optional)
@@ -1157,7 +1160,7 @@ impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
         mut self,
         value: Option<Vec<Facet<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -1165,12 +1168,12 @@ impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
 impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
     /// Set the `startDate` field (optional)
     pub fn start_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `startDate` field to an Option value (optional)
     pub fn maybe_start_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -1185,11 +1188,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ActivityBuilder<'a, activity_state::SetTitle<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1200,12 +1203,12 @@ impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ActivityWorkScope<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `workScope` field to an Option value (optional)
     pub fn maybe_work_scope(mut self, value: Option<ActivityWorkScope<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -1214,24 +1217,24 @@ impl<'a, S> ActivityBuilder<'a, S>
 where
     S: activity_state::State,
     S::Title: activity_state::IsSet,
-    S::ShortDescription: activity_state::IsSet,
     S::CreatedAt: activity_state::IsSet,
+    S::ShortDescription: activity_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Activity<'a> {
         Activity {
-            contributors: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            end_date: self.__unsafe_private_named.3,
-            image: self.__unsafe_private_named.4,
-            locations: self.__unsafe_private_named.5,
-            rights: self.__unsafe_private_named.6,
-            short_description: self.__unsafe_private_named.7.unwrap(),
-            short_description_facets: self.__unsafe_private_named.8,
-            start_date: self.__unsafe_private_named.9,
-            title: self.__unsafe_private_named.10.unwrap(),
-            work_scope: self.__unsafe_private_named.11,
+            contributors: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            end_date: self._fields.3,
+            image: self._fields.4,
+            locations: self._fields.5,
+            rights: self._fields.6,
+            short_description: self._fields.7.unwrap(),
+            short_description_facets: self._fields.8,
+            start_date: self._fields.9,
+            title: self._fields.10.unwrap(),
+            work_scope: self._fields.11,
             extra_data: Default::default(),
         }
     }
@@ -1244,18 +1247,18 @@ where
         >,
     ) -> Activity<'a> {
         Activity {
-            contributors: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            end_date: self.__unsafe_private_named.3,
-            image: self.__unsafe_private_named.4,
-            locations: self.__unsafe_private_named.5,
-            rights: self.__unsafe_private_named.6,
-            short_description: self.__unsafe_private_named.7.unwrap(),
-            short_description_facets: self.__unsafe_private_named.8,
-            start_date: self.__unsafe_private_named.9,
-            title: self.__unsafe_private_named.10.unwrap(),
-            work_scope: self.__unsafe_private_named.11,
+            contributors: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            end_date: self._fields.3,
+            image: self._fields.4,
+            locations: self._fields.5,
+            rights: self._fields.6,
+            short_description: self._fields.7.unwrap(),
+            short_description_facets: self._fields.8,
+            start_date: self._fields.9,
+            title: self._fields.10.unwrap(),
+            work_scope: self._fields.11,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_hypercerts/claim/contribution.rs b/crates/jacquard-api/src/org_hypercerts/claim/contribution.rs
index 9aac332a..d930f45f 100644
--- a/crates/jacquard-api/src/org_hypercerts/claim/contribution.rs
+++ b/crates/jacquard-api/src/org_hypercerts/claim/contribution.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -177,15 +180,15 @@ pub mod contribution_state {
 
 /// Builder for constructing an instance of this type
 pub struct ContributionBuilder<'a, S: contribution_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Contribution<'a> {
@@ -199,9 +202,9 @@ impl<'a> ContributionBuilder<'a, contribution_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ContributionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,12 +215,12 @@ impl<'a, S: contribution_state::State> ContributionBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `contributionDescription` field to an Option value (optional)
     pub fn maybe_contribution_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -232,11 +235,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ContributionBuilder<'a, contribution_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ContributionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,12 +247,12 @@ where
 impl<'a, S: contribution_state::State> ContributionBuilder<'a, S> {
     /// Set the `endDate` field (optional)
     pub fn end_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `endDate` field to an Option value (optional)
     pub fn maybe_end_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -257,12 +260,12 @@ impl<'a, S: contribution_state::State> ContributionBuilder<'a, S> {
 impl<'a, S: contribution_state::State> ContributionBuilder<'a, S> {
     /// Set the `role` field (optional)
     pub fn role(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `role` field to an Option value (optional)
     pub fn maybe_role(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -270,12 +273,12 @@ impl<'a, S: contribution_state::State> ContributionBuilder<'a, S> {
 impl<'a, S: contribution_state::State> ContributionBuilder<'a, S> {
     /// Set the `startDate` field (optional)
     pub fn start_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `startDate` field to an Option value (optional)
     pub fn maybe_start_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -288,11 +291,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Contribution<'a> {
         Contribution {
-            contribution_description: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            end_date: self.__unsafe_private_named.2,
-            role: self.__unsafe_private_named.3,
-            start_date: self.__unsafe_private_named.4,
+            contribution_description: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            end_date: self._fields.2,
+            role: self._fields.3,
+            start_date: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -305,11 +308,11 @@ where
         >,
     ) -> Contribution<'a> {
         Contribution {
-            contribution_description: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            end_date: self.__unsafe_private_named.2,
-            role: self.__unsafe_private_named.3,
-            start_date: self.__unsafe_private_named.4,
+            contribution_description: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            end_date: self._fields.2,
+            role: self._fields.3,
+            start_date: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_hypercerts/claim/contributor_information.rs b/crates/jacquard-api/src/org_hypercerts/claim/contributor_information.rs
index 02e8b29a..90cdc86a 100644
--- a/crates/jacquard-api/src/org_hypercerts/claim/contributor_information.rs
+++ b/crates/jacquard-api/src/org_hypercerts/claim/contributor_information.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -177,14 +180,14 @@ pub mod contributor_information_state {
 
 /// Builder for constructing an instance of this type
 pub struct ContributorInformationBuilder<'a, S: contributor_information_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<ContributorInformationImage<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ContributorInformation<'a> {
@@ -201,9 +204,9 @@ impl<'a> ContributorInformationBuilder<'a, contributor_information_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ContributorInformationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,11 +224,11 @@ where
         'a,
         contributor_information_state::SetCreatedAt<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ContributorInformationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -233,12 +236,12 @@ where
 impl<'a, S: contributor_information_state::State> ContributorInformationBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -246,12 +249,12 @@ impl<'a, S: contributor_information_state::State> ContributorInformationBuilder<
 impl<'a, S: contributor_information_state::State> ContributorInformationBuilder<'a, S> {
     /// Set the `identifier` field (optional)
     pub fn identifier(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -262,7 +265,7 @@ impl<'a, S: contributor_information_state::State> ContributorInformationBuilder<
         mut self,
         value: impl Into<Option<ContributorInformationImage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
@@ -270,7 +273,7 @@ impl<'a, S: contributor_information_state::State> ContributorInformationBuilder<
         mut self,
         value: Option<ContributorInformationImage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -283,10 +286,10 @@ where
     /// Build the final struct
     pub fn build(self) -> ContributorInformation<'a> {
         ContributorInformation {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            display_name: self.__unsafe_private_named.1,
-            identifier: self.__unsafe_private_named.2,
-            image: self.__unsafe_private_named.3,
+            created_at: self._fields.0.unwrap(),
+            display_name: self._fields.1,
+            identifier: self._fields.2,
+            image: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -299,10 +302,10 @@ where
         >,
     ) -> ContributorInformation<'a> {
         ContributorInformation {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            display_name: self.__unsafe_private_named.1,
-            identifier: self.__unsafe_private_named.2,
-            image: self.__unsafe_private_named.3,
+            created_at: self._fields.0.unwrap(),
+            display_name: self._fields.1,
+            identifier: self._fields.2,
+            image: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_hypercerts/claim/rights.rs b/crates/jacquard-api/src/org_hypercerts/claim/rights.rs
index 527c730e..206493a1 100644
--- a/crates/jacquard-api/src/org_hypercerts/claim/rights.rs
+++ b/crates/jacquard-api/src/org_hypercerts/claim/rights.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -180,8 +183,8 @@ pub mod rights_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type RightsName;
         type RightsDescription;
+        type RightsName;
         type RightsType;
         type CreatedAt;
     }
@@ -189,26 +192,26 @@ pub mod rights_state {
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type RightsName = Unset;
         type RightsDescription = Unset;
+        type RightsName = Unset;
         type RightsType = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `rights_name` field to Set
-    pub struct SetRightsName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRightsName<S> {}
-    impl<S: State> State for SetRightsName<S> {
-        type RightsName = Set<members::rights_name>;
-        type RightsDescription = S::RightsDescription;
-        type RightsType = S::RightsType;
-        type CreatedAt = S::CreatedAt;
-    }
     ///State transition - sets the `rights_description` field to Set
     pub struct SetRightsDescription<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRightsDescription<S> {}
     impl<S: State> State for SetRightsDescription<S> {
-        type RightsName = S::RightsName;
         type RightsDescription = Set<members::rights_description>;
+        type RightsName = S::RightsName;
+        type RightsType = S::RightsType;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `rights_name` field to Set
+    pub struct SetRightsName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRightsName<S> {}
+    impl<S: State> State for SetRightsName<S> {
+        type RightsDescription = S::RightsDescription;
+        type RightsName = Set<members::rights_name>;
         type RightsType = S::RightsType;
         type CreatedAt = S::CreatedAt;
     }
@@ -216,8 +219,8 @@ pub mod rights_state {
     pub struct SetRightsType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRightsType<S> {}
     impl<S: State> State for SetRightsType<S> {
-        type RightsName = S::RightsName;
         type RightsDescription = S::RightsDescription;
+        type RightsName = S::RightsName;
         type RightsType = Set<members::rights_type>;
         type CreatedAt = S::CreatedAt;
     }
@@ -225,18 +228,18 @@ pub mod rights_state {
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type RightsName = S::RightsName;
         type RightsDescription = S::RightsDescription;
+        type RightsName = S::RightsName;
         type RightsType = S::RightsType;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `rights_name` field
-        pub struct rights_name(());
         ///Marker type for the `rights_description` field
         pub struct rights_description(());
+        ///Marker type for the `rights_name` field
+        pub struct rights_name(());
         ///Marker type for the `rights_type` field
         pub struct rights_type(());
         ///Marker type for the `created_at` field
@@ -246,15 +249,15 @@ pub mod rights_state {
 
 /// Builder for constructing an instance of this type
 pub struct RightsBuilder<'a, S: rights_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<RightsAttachment<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Rights<'a> {
@@ -268,9 +271,9 @@ impl<'a> RightsBuilder<'a, rights_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RightsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -278,12 +281,12 @@ impl<'a> RightsBuilder<'a, rights_state::Empty> {
 impl<'a, S: rights_state::State> RightsBuilder<'a, S> {
     /// Set the `attachment` field (optional)
     pub fn attachment(mut self, value: impl Into<Option<RightsAttachment<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `attachment` field to an Option value (optional)
     pub fn maybe_attachment(mut self, value: Option<RightsAttachment<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -298,11 +301,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RightsBuilder<'a, rights_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RightsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -317,11 +320,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RightsBuilder<'a, rights_state::SetRightsDescription<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RightsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -336,11 +339,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RightsBuilder<'a, rights_state::SetRightsName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RightsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -355,11 +358,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RightsBuilder<'a, rights_state::SetRightsType<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RightsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -367,19 +370,19 @@ where
 impl<'a, S> RightsBuilder<'a, S>
 where
     S: rights_state::State,
-    S::RightsName: rights_state::IsSet,
     S::RightsDescription: rights_state::IsSet,
+    S::RightsName: rights_state::IsSet,
     S::RightsType: rights_state::IsSet,
     S::CreatedAt: rights_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Rights<'a> {
         Rights {
-            attachment: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            rights_description: self.__unsafe_private_named.2.unwrap(),
-            rights_name: self.__unsafe_private_named.3.unwrap(),
-            rights_type: self.__unsafe_private_named.4.unwrap(),
+            attachment: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            rights_description: self._fields.2.unwrap(),
+            rights_name: self._fields.3.unwrap(),
+            rights_type: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -392,11 +395,11 @@ where
         >,
     ) -> Rights<'a> {
         Rights {
-            attachment: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            rights_description: self.__unsafe_private_named.2.unwrap(),
-            rights_name: self.__unsafe_private_named.3.unwrap(),
-            rights_type: self.__unsafe_private_named.4.unwrap(),
+            attachment: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            rights_description: self._fields.2.unwrap(),
+            rights_name: self._fields.3.unwrap(),
+            rights_type: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_hypercerts/collection.rs b/crates/jacquard-api/src/org_hypercerts/collection.rs
index f8a77a8e..f0982aba 100644
--- a/crates/jacquard-api/src/org_hypercerts/collection.rs
+++ b/crates/jacquard-api/src/org_hypercerts/collection.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -297,9 +300,9 @@ pub mod item_state {
 
 /// Builder for constructing an instance of this type
 pub struct ItemBuilder<'a, S: item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Item<'a> {
@@ -313,9 +316,9 @@ impl<'a> ItemBuilder<'a, item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -330,11 +333,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ItemBuilder<'a, item_state::SetItemIdentifier<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -342,12 +345,12 @@ where
 impl<'a, S: item_state::State> ItemBuilder<'a, S> {
     /// Set the `itemWeight` field (optional)
     pub fn item_weight(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `itemWeight` field to an Option value (optional)
     pub fn maybe_item_weight(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -360,8 +363,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Item<'a> {
         Item {
-            item_identifier: self.__unsafe_private_named.0.unwrap(),
-            item_weight: self.__unsafe_private_named.1,
+            item_identifier: self._fields.0.unwrap(),
+            item_weight: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -374,8 +377,8 @@ where
         >,
     ) -> Item<'a> {
         Item {
-            item_identifier: self.__unsafe_private_named.0.unwrap(),
-            item_weight: self.__unsafe_private_named.1,
+            item_identifier: self._fields.0.unwrap(),
+            item_weight: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
@@ -576,44 +579,44 @@ pub mod collection_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Title;
         type CreatedAt;
+        type Title;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Title = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Title = Set<members::title>;
-        type CreatedAt = S::CreatedAt;
+        type Title = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Title = S::Title;
         type CreatedAt = Set<members::created_at>;
+        type Title = S::Title;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type CreatedAt = S::CreatedAt;
+        type Title = Set<members::title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `title` field
-        pub struct title(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `title` field
+        pub struct title(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CollectionBuilder<'a, S: collection_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CollectionAvatar<'a>>,
         Option<CollectionBanner<'a>>,
         Option<Datetime>,
@@ -624,7 +627,7 @@ pub struct CollectionBuilder<'a, S: collection_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Collection<'a> {
@@ -638,19 +641,9 @@ impl<'a> CollectionBuilder<'a, collection_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -658,12 +651,12 @@ impl<'a> CollectionBuilder<'a, collection_state::Empty> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<CollectionAvatar<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<CollectionAvatar<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -671,12 +664,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<CollectionBanner<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<CollectionBanner<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -691,11 +684,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionBuilder<'a, collection_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -703,12 +696,12 @@ where
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<LinearDocument<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<LinearDocument<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -716,12 +709,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `items` field (optional)
     pub fn items(mut self, value: impl Into<Option<Vec<collection::Item<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `items` field to an Option value (optional)
     pub fn maybe_items(mut self, value: Option<Vec<collection::Item<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -729,12 +722,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -742,12 +735,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `shortDescription` field (optional)
     pub fn short_description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `shortDescription` field to an Option value (optional)
     pub fn maybe_short_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -762,11 +755,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CollectionBuilder<'a, collection_state::SetTitle<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -774,12 +767,12 @@ where
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `type` field (optional)
     pub fn r#type(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `type` field to an Option value (optional)
     pub fn maybe_type(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -787,21 +780,21 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S> CollectionBuilder<'a, S>
 where
     S: collection_state::State,
-    S::Title: collection_state::IsSet,
     S::CreatedAt: collection_state::IsSet,
+    S::Title: collection_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Collection<'a> {
         Collection {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            items: self.__unsafe_private_named.4,
-            location: self.__unsafe_private_named.5,
-            short_description: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7.unwrap(),
-            r#type: self.__unsafe_private_named.8,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            items: self._fields.4,
+            location: self._fields.5,
+            short_description: self._fields.6,
+            title: self._fields.7.unwrap(),
+            r#type: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -814,15 +807,15 @@ where
         >,
     ) -> Collection<'a> {
         Collection {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            items: self.__unsafe_private_named.4,
-            location: self.__unsafe_private_named.5,
-            short_description: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7.unwrap(),
-            r#type: self.__unsafe_private_named.8,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            items: self._fields.4,
+            location: self._fields.5,
+            short_description: self._fields.6,
+            title: self._fields.7.unwrap(),
+            r#type: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_hypercerts/context/acknowledgement.rs b/crates/jacquard-api/src/org_hypercerts/context/acknowledgement.rs
index a5245c97..e5cce02c 100644
--- a/crates/jacquard-api/src/org_hypercerts/context/acknowledgement.rs
+++ b/crates/jacquard-api/src/org_hypercerts/context/acknowledgement.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -157,64 +160,64 @@ pub mod acknowledgement_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Acknowledged;
-        type Subject;
         type CreatedAt;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Acknowledged = Unset;
-        type Subject = Unset;
         type CreatedAt = Unset;
+        type Subject = Unset;
     }
     ///State transition - sets the `acknowledged` field to Set
     pub struct SetAcknowledged<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAcknowledged<S> {}
     impl<S: State> State for SetAcknowledged<S> {
         type Acknowledged = Set<members::acknowledged>;
-        type Subject = S::Subject;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Acknowledged = S::Acknowledged;
-        type Subject = Set<members::subject>;
         type CreatedAt = S::CreatedAt;
+        type Subject = S::Subject;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type Acknowledged = S::Acknowledged;
-        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type Acknowledged = S::Acknowledged;
+        type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `acknowledged` field
         pub struct acknowledged(());
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AcknowledgementBuilder<'a, S: acknowledgement_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<CowStr<'a>>,
         Option<AcknowledgementContext<'a>>,
         Option<Datetime>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Acknowledgement<'a> {
@@ -228,9 +231,9 @@ impl<'a> AcknowledgementBuilder<'a, acknowledgement_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AcknowledgementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -245,11 +248,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> AcknowledgementBuilder<'a, acknowledgement_state::SetAcknowledged<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AcknowledgementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -257,12 +260,12 @@ where
 impl<'a, S: acknowledgement_state::State> AcknowledgementBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -273,12 +276,12 @@ impl<'a, S: acknowledgement_state::State> AcknowledgementBuilder<'a, S> {
         mut self,
         value: impl Into<Option<AcknowledgementContext<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `context` field to an Option value (optional)
     pub fn maybe_context(mut self, value: Option<AcknowledgementContext<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -293,11 +296,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AcknowledgementBuilder<'a, acknowledgement_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         AcknowledgementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -312,11 +315,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> AcknowledgementBuilder<'a, acknowledgement_state::SetSubject<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         AcknowledgementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -325,17 +328,17 @@ impl<'a, S> AcknowledgementBuilder<'a, S>
 where
     S: acknowledgement_state::State,
     S::Acknowledged: acknowledgement_state::IsSet,
-    S::Subject: acknowledgement_state::IsSet,
     S::CreatedAt: acknowledgement_state::IsSet,
+    S::Subject: acknowledgement_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Acknowledgement<'a> {
         Acknowledgement {
-            acknowledged: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1,
-            context: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            subject: self.__unsafe_private_named.4.unwrap(),
+            acknowledged: self._fields.0.unwrap(),
+            comment: self._fields.1,
+            context: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            subject: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -348,11 +351,11 @@ where
         >,
     ) -> Acknowledgement<'a> {
         Acknowledgement {
-            acknowledged: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1,
-            context: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            subject: self.__unsafe_private_named.4.unwrap(),
+            acknowledged: self._fields.0.unwrap(),
+            comment: self._fields.1,
+            context: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            subject: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_hypercerts/context/attachment.rs b/crates/jacquard-api/src/org_hypercerts/context/attachment.rs
index 827da3d7..8558fc7f 100644
--- a/crates/jacquard-api/src/org_hypercerts/context/attachment.rs
+++ b/crates/jacquard-api/src/org_hypercerts/context/attachment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -254,8 +257,8 @@ pub mod attachment_state {
 
 /// Builder for constructing an instance of this type
 pub struct AttachmentBuilder<'a, S: attachment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<AttachmentContentItem<'a>>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -266,7 +269,7 @@ pub struct AttachmentBuilder<'a, S: attachment_state::State> {
         Option<Vec<StrongRef<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Attachment<'a> {
@@ -280,19 +283,9 @@ impl<'a> AttachmentBuilder<'a, attachment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AttachmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -303,7 +296,7 @@ impl<'a, S: attachment_state::State> AttachmentBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<AttachmentContentItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `content` field to an Option value (optional)
@@ -311,7 +304,7 @@ impl<'a, S: attachment_state::State> AttachmentBuilder<'a, S> {
         mut self,
         value: Option<Vec<AttachmentContentItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -319,12 +312,12 @@ impl<'a, S: attachment_state::State> AttachmentBuilder<'a, S> {
 impl<'a, S: attachment_state::State> AttachmentBuilder<'a, S> {
     /// Set the `contentType` field (optional)
     pub fn content_type(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `contentType` field to an Option value (optional)
     pub fn maybe_content_type(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -339,11 +332,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AttachmentBuilder<'a, attachment_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AttachmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -351,12 +344,12 @@ where
 impl<'a, S: attachment_state::State> AttachmentBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<LinearDocument<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<LinearDocument<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -364,12 +357,12 @@ impl<'a, S: attachment_state::State> AttachmentBuilder<'a, S> {
 impl<'a, S: attachment_state::State> AttachmentBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -377,12 +370,12 @@ impl<'a, S: attachment_state::State> AttachmentBuilder<'a, S> {
 impl<'a, S: attachment_state::State> AttachmentBuilder<'a, S> {
     /// Set the `shortDescription` field (optional)
     pub fn short_description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `shortDescription` field to an Option value (optional)
     pub fn maybe_short_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -393,7 +386,7 @@ impl<'a, S: attachment_state::State> AttachmentBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `shortDescriptionFacets` field to an Option value (optional)
@@ -401,7 +394,7 @@ impl<'a, S: attachment_state::State> AttachmentBuilder<'a, S> {
         mut self,
         value: Option<Vec<Facet<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -409,12 +402,12 @@ impl<'a, S: attachment_state::State> AttachmentBuilder<'a, S> {
 impl<'a, S: attachment_state::State> AttachmentBuilder<'a, S> {
     /// Set the `subjects` field (optional)
     pub fn subjects(mut self, value: impl Into<Option<Vec<StrongRef<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `subjects` field to an Option value (optional)
     pub fn maybe_subjects(mut self, value: Option<Vec<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -429,11 +422,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AttachmentBuilder<'a, attachment_state::SetTitle<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         AttachmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -447,15 +440,15 @@ where
     /// Build the final struct
     pub fn build(self) -> Attachment<'a> {
         Attachment {
-            content: self.__unsafe_private_named.0,
-            content_type: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            location: self.__unsafe_private_named.4,
-            short_description: self.__unsafe_private_named.5,
-            short_description_facets: self.__unsafe_private_named.6,
-            subjects: self.__unsafe_private_named.7,
-            title: self.__unsafe_private_named.8.unwrap(),
+            content: self._fields.0,
+            content_type: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            location: self._fields.4,
+            short_description: self._fields.5,
+            short_description_facets: self._fields.6,
+            subjects: self._fields.7,
+            title: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -468,15 +461,15 @@ where
         >,
     ) -> Attachment<'a> {
         Attachment {
-            content: self.__unsafe_private_named.0,
-            content_type: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            location: self.__unsafe_private_named.4,
-            short_description: self.__unsafe_private_named.5,
-            short_description_facets: self.__unsafe_private_named.6,
-            subjects: self.__unsafe_private_named.7,
-            title: self.__unsafe_private_named.8.unwrap(),
+            content: self._fields.0,
+            content_type: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            location: self._fields.4,
+            short_description: self._fields.5,
+            short_description_facets: self._fields.6,
+            subjects: self._fields.7,
+            title: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_hypercerts/context/evaluation.rs b/crates/jacquard-api/src/org_hypercerts/context/evaluation.rs
index d0fd3299..3322e91d 100644
--- a/crates/jacquard-api/src/org_hypercerts/context/evaluation.rs
+++ b/crates/jacquard-api/src/org_hypercerts/context/evaluation.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -234,58 +237,58 @@ pub mod evaluation_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type Summary;
         type Evaluators;
+        type Summary;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type Summary = Unset;
         type Evaluators = Unset;
+        type Summary = Unset;
+        type CreatedAt = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
+    ///State transition - sets the `evaluators` field to Set
+    pub struct SetEvaluators<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetEvaluators<S> {}
+    impl<S: State> State for SetEvaluators<S> {
+        type Evaluators = Set<members::evaluators>;
         type Summary = S::Summary;
-        type Evaluators = S::Evaluators;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `summary` field to Set
     pub struct SetSummary<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSummary<S> {}
     impl<S: State> State for SetSummary<S> {
-        type CreatedAt = S::CreatedAt;
-        type Summary = Set<members::summary>;
         type Evaluators = S::Evaluators;
-    }
-    ///State transition - sets the `evaluators` field to Set
-    pub struct SetEvaluators<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetEvaluators<S> {}
-    impl<S: State> State for SetEvaluators<S> {
+        type Summary = Set<members::summary>;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Evaluators = S::Evaluators;
         type Summary = S::Summary;
-        type Evaluators = Set<members::evaluators>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `summary` field
-        pub struct summary(());
         ///Marker type for the `evaluators` field
         pub struct evaluators(());
+        ///Marker type for the `summary` field
+        pub struct summary(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EvaluationBuilder<'a, S: evaluation_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<EvaluationContentItem<'a>>>,
         Option<Datetime>,
         Option<Vec<Did<'a>>>,
@@ -295,7 +298,7 @@ pub struct EvaluationBuilder<'a, S: evaluation_state::State> {
         Option<StrongRef<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Evaluation<'a> {
@@ -309,9 +312,9 @@ impl<'a> EvaluationBuilder<'a, evaluation_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EvaluationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -322,7 +325,7 @@ impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<EvaluationContentItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `content` field to an Option value (optional)
@@ -330,7 +333,7 @@ impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
         mut self,
         value: Option<Vec<EvaluationContentItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -345,11 +348,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EvaluationBuilder<'a, evaluation_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EvaluationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -364,11 +367,11 @@ where
         mut self,
         value: impl Into<Vec<Did<'a>>>,
     ) -> EvaluationBuilder<'a, evaluation_state::SetEvaluators<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EvaluationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -376,12 +379,12 @@ where
 impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -389,12 +392,12 @@ impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
 impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
     /// Set the `measurements` field (optional)
     pub fn measurements(mut self, value: impl Into<Option<Vec<StrongRef<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `measurements` field to an Option value (optional)
     pub fn maybe_measurements(mut self, value: Option<Vec<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -402,12 +405,12 @@ impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
 impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
     /// Set the `score` field (optional)
     pub fn score(mut self, value: impl Into<Option<evaluation::Score<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `score` field to an Option value (optional)
     pub fn maybe_score(mut self, value: Option<evaluation::Score<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -415,12 +418,12 @@ impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
 impl<'a, S: evaluation_state::State> EvaluationBuilder<'a, S> {
     /// Set the `subject` field (optional)
     pub fn subject(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `subject` field to an Option value (optional)
     pub fn maybe_subject(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -435,11 +438,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EvaluationBuilder<'a, evaluation_state::SetSummary<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         EvaluationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -447,21 +450,21 @@ where
 impl<'a, S> EvaluationBuilder<'a, S>
 where
     S: evaluation_state::State,
-    S::CreatedAt: evaluation_state::IsSet,
-    S::Summary: evaluation_state::IsSet,
     S::Evaluators: evaluation_state::IsSet,
+    S::Summary: evaluation_state::IsSet,
+    S::CreatedAt: evaluation_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Evaluation<'a> {
         Evaluation {
-            content: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            evaluators: self.__unsafe_private_named.2.unwrap(),
-            location: self.__unsafe_private_named.3,
-            measurements: self.__unsafe_private_named.4,
-            score: self.__unsafe_private_named.5,
-            subject: self.__unsafe_private_named.6,
-            summary: self.__unsafe_private_named.7.unwrap(),
+            content: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            evaluators: self._fields.2.unwrap(),
+            location: self._fields.3,
+            measurements: self._fields.4,
+            score: self._fields.5,
+            subject: self._fields.6,
+            summary: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -474,14 +477,14 @@ where
         >,
     ) -> Evaluation<'a> {
         Evaluation {
-            content: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            evaluators: self.__unsafe_private_named.2.unwrap(),
-            location: self.__unsafe_private_named.3,
-            measurements: self.__unsafe_private_named.4,
-            score: self.__unsafe_private_named.5,
-            subject: self.__unsafe_private_named.6,
-            summary: self.__unsafe_private_named.7.unwrap(),
+            content: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            evaluators: self._fields.2.unwrap(),
+            location: self._fields.3,
+            measurements: self._fields.4,
+            score: self._fields.5,
+            subject: self._fields.6,
+            summary: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -673,59 +676,59 @@ pub mod score_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Max;
         type Min;
         type Value;
+        type Max;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Max = Unset;
         type Min = Unset;
         type Value = Unset;
-    }
-    ///State transition - sets the `max` field to Set
-    pub struct SetMax<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMax<S> {}
-    impl<S: State> State for SetMax<S> {
-        type Max = Set<members::max>;
-        type Min = S::Min;
-        type Value = S::Value;
+        type Max = Unset;
     }
     ///State transition - sets the `min` field to Set
     pub struct SetMin<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMin<S> {}
     impl<S: State> State for SetMin<S> {
-        type Max = S::Max;
         type Min = Set<members::min>;
         type Value = S::Value;
+        type Max = S::Max;
     }
     ///State transition - sets the `value` field to Set
     pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetValue<S> {}
     impl<S: State> State for SetValue<S> {
-        type Max = S::Max;
         type Min = S::Min;
         type Value = Set<members::value>;
+        type Max = S::Max;
+    }
+    ///State transition - sets the `max` field to Set
+    pub struct SetMax<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMax<S> {}
+    impl<S: State> State for SetMax<S> {
+        type Min = S::Min;
+        type Value = S::Value;
+        type Max = Set<members::max>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `max` field
-        pub struct max(());
         ///Marker type for the `min` field
         pub struct min(());
         ///Marker type for the `value` field
         pub struct value(());
+        ///Marker type for the `max` field
+        pub struct max(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ScoreBuilder<'a, S: score_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Score<'a> {
@@ -739,9 +742,9 @@ impl<'a> ScoreBuilder<'a, score_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -756,11 +759,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ScoreBuilder<'a, score_state::SetMax<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -775,11 +778,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ScoreBuilder<'a, score_state::SetMin<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -794,11 +797,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ScoreBuilder<'a, score_state::SetValue<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -806,16 +809,16 @@ where
 impl<'a, S> ScoreBuilder<'a, S>
 where
     S: score_state::State,
-    S::Max: score_state::IsSet,
     S::Min: score_state::IsSet,
     S::Value: score_state::IsSet,
+    S::Max: score_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Score<'a> {
         Score {
-            max: self.__unsafe_private_named.0.unwrap(),
-            min: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            max: self._fields.0.unwrap(),
+            min: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -828,9 +831,9 @@ where
         >,
     ) -> Score<'a> {
         Score {
-            max: self.__unsafe_private_named.0.unwrap(),
-            min: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            max: self._fields.0.unwrap(),
+            min: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_hypercerts/context/measurement.rs b/crates/jacquard-api/src/org_hypercerts/context/measurement.rs
index b78ac2a6..61990618 100644
--- a/crates/jacquard-api/src/org_hypercerts/context/measurement.rs
+++ b/crates/jacquard-api/src/org_hypercerts/context/measurement.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -262,74 +265,74 @@ pub mod measurement_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Unit;
         type Metric;
-        type Value;
+        type Unit;
         type CreatedAt;
+        type Value;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Unit = Unset;
         type Metric = Unset;
-        type Value = Unset;
+        type Unit = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `unit` field to Set
-    pub struct SetUnit<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUnit<S> {}
-    impl<S: State> State for SetUnit<S> {
-        type Unit = Set<members::unit>;
-        type Metric = S::Metric;
-        type Value = S::Value;
-        type CreatedAt = S::CreatedAt;
+        type Value = Unset;
     }
     ///State transition - sets the `metric` field to Set
     pub struct SetMetric<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMetric<S> {}
     impl<S: State> State for SetMetric<S> {
-        type Unit = S::Unit;
         type Metric = Set<members::metric>;
-        type Value = S::Value;
+        type Unit = S::Unit;
         type CreatedAt = S::CreatedAt;
+        type Value = S::Value;
     }
-    ///State transition - sets the `value` field to Set
-    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetValue<S> {}
-    impl<S: State> State for SetValue<S> {
-        type Unit = S::Unit;
+    ///State transition - sets the `unit` field to Set
+    pub struct SetUnit<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUnit<S> {}
+    impl<S: State> State for SetUnit<S> {
         type Metric = S::Metric;
-        type Value = Set<members::value>;
+        type Unit = Set<members::unit>;
         type CreatedAt = S::CreatedAt;
+        type Value = S::Value;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Unit = S::Unit;
         type Metric = S::Metric;
-        type Value = S::Value;
+        type Unit = S::Unit;
         type CreatedAt = Set<members::created_at>;
+        type Value = S::Value;
+    }
+    ///State transition - sets the `value` field to Set
+    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetValue<S> {}
+    impl<S: State> State for SetValue<S> {
+        type Metric = S::Metric;
+        type Unit = S::Unit;
+        type CreatedAt = S::CreatedAt;
+        type Value = Set<members::value>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `unit` field
-        pub struct unit(());
         ///Marker type for the `metric` field
         pub struct metric(());
-        ///Marker type for the `value` field
-        pub struct value(());
+        ///Marker type for the `unit` field
+        pub struct unit(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `value` field
+        pub struct value(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MeasurementBuilder<'a, S: measurement_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Vec<Facet<'a>>>,
         Option<Datetime>,
@@ -345,7 +348,7 @@ pub struct MeasurementBuilder<'a, S: measurement_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Measurement<'a> {
@@ -359,8 +362,8 @@ impl<'a> MeasurementBuilder<'a, measurement_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MeasurementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -376,7 +379,7 @@ impl<'a> MeasurementBuilder<'a, measurement_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -384,12 +387,12 @@ impl<'a> MeasurementBuilder<'a, measurement_state::Empty> {
 impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -397,12 +400,12 @@ impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
 impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
     /// Set the `commentFacets` field (optional)
     pub fn comment_facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `commentFacets` field to an Option value (optional)
     pub fn maybe_comment_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -417,11 +420,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MeasurementBuilder<'a, measurement_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         MeasurementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -429,12 +432,12 @@ where
 impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
     /// Set the `endDate` field (optional)
     pub fn end_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `endDate` field to an Option value (optional)
     pub fn maybe_end_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -442,12 +445,12 @@ impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
 impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
     /// Set the `evidenceURI` field (optional)
     pub fn evidence_uri(mut self, value: impl Into<Option<Vec<UriValue<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `evidenceURI` field to an Option value (optional)
     pub fn maybe_evidence_uri(mut self, value: Option<Vec<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -455,12 +458,12 @@ impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
 impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
     /// Set the `locations` field (optional)
     pub fn locations(mut self, value: impl Into<Option<Vec<StrongRef<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `locations` field to an Option value (optional)
     pub fn maybe_locations(mut self, value: Option<Vec<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -468,12 +471,12 @@ impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
 impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
     /// Set the `measurers` field (optional)
     pub fn measurers(mut self, value: impl Into<Option<Vec<Did<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `measurers` field to an Option value (optional)
     pub fn maybe_measurers(mut self, value: Option<Vec<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -481,12 +484,12 @@ impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
 impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
     /// Set the `methodType` field (optional)
     pub fn method_type(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `methodType` field to an Option value (optional)
     pub fn maybe_method_type(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -494,12 +497,12 @@ impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
 impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
     /// Set the `methodURI` field (optional)
     pub fn method_uri(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `methodURI` field to an Option value (optional)
     pub fn maybe_method_uri(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -514,11 +517,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MeasurementBuilder<'a, measurement_state::SetMetric<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         MeasurementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -526,12 +529,12 @@ where
 impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
     /// Set the `startDate` field (optional)
     pub fn start_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `startDate` field to an Option value (optional)
     pub fn maybe_start_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -539,12 +542,12 @@ impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
 impl<'a, S: measurement_state::State> MeasurementBuilder<'a, S> {
     /// Set the `subjects` field (optional)
     pub fn subjects(mut self, value: impl Into<Option<Vec<StrongRef<'a>>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `subjects` field to an Option value (optional)
     pub fn maybe_subjects(mut self, value: Option<Vec<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -559,11 +562,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MeasurementBuilder<'a, measurement_state::SetUnit<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         MeasurementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -578,11 +581,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MeasurementBuilder<'a, measurement_state::SetValue<S>> {
-        self.__unsafe_private_named.13 = Option::Some(value.into());
+        self._fields.13 = Option::Some(value.into());
         MeasurementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -590,28 +593,28 @@ where
 impl<'a, S> MeasurementBuilder<'a, S>
 where
     S: measurement_state::State,
-    S::Unit: measurement_state::IsSet,
     S::Metric: measurement_state::IsSet,
-    S::Value: measurement_state::IsSet,
+    S::Unit: measurement_state::IsSet,
     S::CreatedAt: measurement_state::IsSet,
+    S::Value: measurement_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Measurement<'a> {
         Measurement {
-            comment: self.__unsafe_private_named.0,
-            comment_facets: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            end_date: self.__unsafe_private_named.3,
-            evidence_uri: self.__unsafe_private_named.4,
-            locations: self.__unsafe_private_named.5,
-            measurers: self.__unsafe_private_named.6,
-            method_type: self.__unsafe_private_named.7,
-            method_uri: self.__unsafe_private_named.8,
-            metric: self.__unsafe_private_named.9.unwrap(),
-            start_date: self.__unsafe_private_named.10,
-            subjects: self.__unsafe_private_named.11,
-            unit: self.__unsafe_private_named.12.unwrap(),
-            value: self.__unsafe_private_named.13.unwrap(),
+            comment: self._fields.0,
+            comment_facets: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            end_date: self._fields.3,
+            evidence_uri: self._fields.4,
+            locations: self._fields.5,
+            measurers: self._fields.6,
+            method_type: self._fields.7,
+            method_uri: self._fields.8,
+            metric: self._fields.9.unwrap(),
+            start_date: self._fields.10,
+            subjects: self._fields.11,
+            unit: self._fields.12.unwrap(),
+            value: self._fields.13.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -624,20 +627,20 @@ where
         >,
     ) -> Measurement<'a> {
         Measurement {
-            comment: self.__unsafe_private_named.0,
-            comment_facets: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            end_date: self.__unsafe_private_named.3,
-            evidence_uri: self.__unsafe_private_named.4,
-            locations: self.__unsafe_private_named.5,
-            measurers: self.__unsafe_private_named.6,
-            method_type: self.__unsafe_private_named.7,
-            method_uri: self.__unsafe_private_named.8,
-            metric: self.__unsafe_private_named.9.unwrap(),
-            start_date: self.__unsafe_private_named.10,
-            subjects: self.__unsafe_private_named.11,
-            unit: self.__unsafe_private_named.12.unwrap(),
-            value: self.__unsafe_private_named.13.unwrap(),
+            comment: self._fields.0,
+            comment_facets: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            end_date: self._fields.3,
+            evidence_uri: self._fields.4,
+            locations: self._fields.5,
+            measurers: self._fields.6,
+            method_type: self._fields.7,
+            method_uri: self._fields.8,
+            metric: self._fields.9.unwrap(),
+            start_date: self._fields.10,
+            subjects: self._fields.11,
+            unit: self._fields.12.unwrap(),
+            value: self._fields.13.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_hypercerts/funding/receipt.rs b/crates/jacquard-api/src/org_hypercerts/funding/receipt.rs
index 3ee417b7..e9298acb 100644
--- a/crates/jacquard-api/src/org_hypercerts/funding/receipt.rs
+++ b/crates/jacquard-api/src/org_hypercerts/funding/receipt.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -216,92 +219,92 @@ pub mod receipt_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type From;
         type Amount;
-        type CreatedAt;
-        type To;
         type Currency;
-        type From;
+        type To;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type From = Unset;
         type Amount = Unset;
-        type CreatedAt = Unset;
-        type To = Unset;
         type Currency = Unset;
-        type From = Unset;
+        type To = Unset;
+        type CreatedAt = Unset;
+    }
+    ///State transition - sets the `from` field to Set
+    pub struct SetFrom<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetFrom<S> {}
+    impl<S: State> State for SetFrom<S> {
+        type From = Set<members::from>;
+        type Amount = S::Amount;
+        type Currency = S::Currency;
+        type To = S::To;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `amount` field to Set
     pub struct SetAmount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAmount<S> {}
     impl<S: State> State for SetAmount<S> {
+        type From = S::From;
         type Amount = Set<members::amount>;
-        type CreatedAt = S::CreatedAt;
-        type To = S::To;
         type Currency = S::Currency;
-        type From = S::From;
+        type To = S::To;
+        type CreatedAt = S::CreatedAt;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+    ///State transition - sets the `currency` field to Set
+    pub struct SetCurrency<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCurrency<S> {}
+    impl<S: State> State for SetCurrency<S> {
+        type From = S::From;
         type Amount = S::Amount;
-        type CreatedAt = Set<members::created_at>;
+        type Currency = Set<members::currency>;
         type To = S::To;
-        type Currency = S::Currency;
-        type From = S::From;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `to` field to Set
     pub struct SetTo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTo<S> {}
     impl<S: State> State for SetTo<S> {
-        type Amount = S::Amount;
-        type CreatedAt = S::CreatedAt;
-        type To = Set<members::to>;
-        type Currency = S::Currency;
         type From = S::From;
-    }
-    ///State transition - sets the `currency` field to Set
-    pub struct SetCurrency<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCurrency<S> {}
-    impl<S: State> State for SetCurrency<S> {
         type Amount = S::Amount;
+        type Currency = S::Currency;
+        type To = Set<members::to>;
         type CreatedAt = S::CreatedAt;
-        type To = S::To;
-        type Currency = Set<members::currency>;
-        type From = S::From;
     }
-    ///State transition - sets the `from` field to Set
-    pub struct SetFrom<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetFrom<S> {}
-    impl<S: State> State for SetFrom<S> {
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type From = S::From;
         type Amount = S::Amount;
-        type CreatedAt = S::CreatedAt;
-        type To = S::To;
         type Currency = S::Currency;
-        type From = Set<members::from>;
+        type To = S::To;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `from` field
+        pub struct from(());
         ///Marker type for the `amount` field
         pub struct amount(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `to` field
-        pub struct to(());
         ///Marker type for the `currency` field
         pub struct currency(());
-        ///Marker type for the `from` field
-        pub struct from(());
+        ///Marker type for the `to` field
+        pub struct to(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReceiptBuilder<'a, S: receipt_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -314,7 +317,7 @@ pub struct ReceiptBuilder<'a, S: receipt_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Receipt<'a> {
@@ -328,21 +331,9 @@ impl<'a> ReceiptBuilder<'a, receipt_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReceiptBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -357,11 +348,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReceiptBuilder<'a, receipt_state::SetAmount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReceiptBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -376,11 +367,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReceiptBuilder<'a, receipt_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReceiptBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -395,11 +386,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReceiptBuilder<'a, receipt_state::SetCurrency<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReceiptBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -407,12 +398,12 @@ where
 impl<'a, S: receipt_state::State> ReceiptBuilder<'a, S> {
     /// Set the `for` field (optional)
     pub fn r#for(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `for` field to an Option value (optional)
     pub fn maybe_for(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -427,11 +418,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ReceiptBuilder<'a, receipt_state::SetFrom<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ReceiptBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -439,12 +430,12 @@ where
 impl<'a, S: receipt_state::State> ReceiptBuilder<'a, S> {
     /// Set the `notes` field (optional)
     pub fn notes(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `notes` field to an Option value (optional)
     pub fn maybe_notes(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -452,12 +443,12 @@ impl<'a, S: receipt_state::State> ReceiptBuilder<'a, S> {
 impl<'a, S: receipt_state::State> ReceiptBuilder<'a, S> {
     /// Set the `occurredAt` field (optional)
     pub fn occurred_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `occurredAt` field to an Option value (optional)
     pub fn maybe_occurred_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -465,12 +456,12 @@ impl<'a, S: receipt_state::State> ReceiptBuilder<'a, S> {
 impl<'a, S: receipt_state::State> ReceiptBuilder<'a, S> {
     /// Set the `paymentNetwork` field (optional)
     pub fn payment_network(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `paymentNetwork` field to an Option value (optional)
     pub fn maybe_payment_network(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -478,12 +469,12 @@ impl<'a, S: receipt_state::State> ReceiptBuilder<'a, S> {
 impl<'a, S: receipt_state::State> ReceiptBuilder<'a, S> {
     /// Set the `paymentRail` field (optional)
     pub fn payment_rail(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `paymentRail` field to an Option value (optional)
     pub fn maybe_payment_rail(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -498,11 +489,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReceiptBuilder<'a, receipt_state::SetTo<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ReceiptBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -510,12 +501,12 @@ where
 impl<'a, S: receipt_state::State> ReceiptBuilder<'a, S> {
     /// Set the `transactionId` field (optional)
     pub fn transaction_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `transactionId` field to an Option value (optional)
     pub fn maybe_transaction_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -523,26 +514,26 @@ impl<'a, S: receipt_state::State> ReceiptBuilder<'a, S> {
 impl<'a, S> ReceiptBuilder<'a, S>
 where
     S: receipt_state::State,
+    S::From: receipt_state::IsSet,
     S::Amount: receipt_state::IsSet,
-    S::CreatedAt: receipt_state::IsSet,
-    S::To: receipt_state::IsSet,
     S::Currency: receipt_state::IsSet,
-    S::From: receipt_state::IsSet,
+    S::To: receipt_state::IsSet,
+    S::CreatedAt: receipt_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Receipt<'a> {
         Receipt {
-            amount: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            currency: self.__unsafe_private_named.2.unwrap(),
-            r#for: self.__unsafe_private_named.3,
-            from: self.__unsafe_private_named.4.unwrap(),
-            notes: self.__unsafe_private_named.5,
-            occurred_at: self.__unsafe_private_named.6,
-            payment_network: self.__unsafe_private_named.7,
-            payment_rail: self.__unsafe_private_named.8,
-            to: self.__unsafe_private_named.9.unwrap(),
-            transaction_id: self.__unsafe_private_named.10,
+            amount: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            currency: self._fields.2.unwrap(),
+            r#for: self._fields.3,
+            from: self._fields.4.unwrap(),
+            notes: self._fields.5,
+            occurred_at: self._fields.6,
+            payment_network: self._fields.7,
+            payment_rail: self._fields.8,
+            to: self._fields.9.unwrap(),
+            transaction_id: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -555,17 +546,17 @@ where
         >,
     ) -> Receipt<'a> {
         Receipt {
-            amount: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            currency: self.__unsafe_private_named.2.unwrap(),
-            r#for: self.__unsafe_private_named.3,
-            from: self.__unsafe_private_named.4.unwrap(),
-            notes: self.__unsafe_private_named.5,
-            occurred_at: self.__unsafe_private_named.6,
-            payment_network: self.__unsafe_private_named.7,
-            payment_rail: self.__unsafe_private_named.8,
-            to: self.__unsafe_private_named.9.unwrap(),
-            transaction_id: self.__unsafe_private_named.10,
+            amount: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            currency: self._fields.2.unwrap(),
+            r#for: self._fields.3,
+            from: self._fields.4.unwrap(),
+            notes: self._fields.5,
+            occurred_at: self._fields.6,
+            payment_network: self._fields.7,
+            payment_rail: self._fields.8,
+            to: self._fields.9.unwrap(),
+            transaction_id: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_hypercerts/helper/work_scope_tag.rs b/crates/jacquard-api/src/org_hypercerts/helper/work_scope_tag.rs
index bdd2c4ab..d99c7c08 100644
--- a/crates/jacquard-api/src/org_hypercerts/helper/work_scope_tag.rs
+++ b/crates/jacquard-api/src/org_hypercerts/helper/work_scope_tag.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -212,58 +215,58 @@ pub mod work_scope_tag_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Label;
         type Key;
         type CreatedAt;
+        type Label;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Label = Unset;
         type Key = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `label` field to Set
-    pub struct SetLabel<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLabel<S> {}
-    impl<S: State> State for SetLabel<S> {
-        type Label = Set<members::label>;
-        type Key = S::Key;
-        type CreatedAt = S::CreatedAt;
+        type Label = Unset;
     }
     ///State transition - sets the `key` field to Set
     pub struct SetKey<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetKey<S> {}
     impl<S: State> State for SetKey<S> {
-        type Label = S::Label;
         type Key = Set<members::key>;
         type CreatedAt = S::CreatedAt;
+        type Label = S::Label;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Label = S::Label;
         type Key = S::Key;
         type CreatedAt = Set<members::created_at>;
+        type Label = S::Label;
+    }
+    ///State transition - sets the `label` field to Set
+    pub struct SetLabel<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLabel<S> {}
+    impl<S: State> State for SetLabel<S> {
+        type Key = S::Key;
+        type CreatedAt = S::CreatedAt;
+        type Label = Set<members::label>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `label` field
-        pub struct label(());
         ///Marker type for the `key` field
         pub struct key(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `label` field
+        pub struct label(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct WorkScopeTagBuilder<'a, S: work_scope_tag_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<CowStr<'a>>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -273,7 +276,7 @@ pub struct WorkScopeTagBuilder<'a, S: work_scope_tag_state::State> {
         Option<CowStr<'a>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> WorkScopeTag<'a> {
@@ -287,9 +290,9 @@ impl<'a> WorkScopeTagBuilder<'a, work_scope_tag_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WorkScopeTagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -297,12 +300,12 @@ impl<'a> WorkScopeTagBuilder<'a, work_scope_tag_state::Empty> {
 impl<'a, S: work_scope_tag_state::State> WorkScopeTagBuilder<'a, S> {
     /// Set the `aliases` field (optional)
     pub fn aliases(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `aliases` field to an Option value (optional)
     pub fn maybe_aliases(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -317,11 +320,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> WorkScopeTagBuilder<'a, work_scope_tag_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         WorkScopeTagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -329,12 +332,12 @@ where
 impl<'a, S: work_scope_tag_state::State> WorkScopeTagBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -345,7 +348,7 @@ impl<'a, S: work_scope_tag_state::State> WorkScopeTagBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WorkScopeTagExternalReference<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `externalReference` field to an Option value (optional)
@@ -353,7 +356,7 @@ impl<'a, S: work_scope_tag_state::State> WorkScopeTagBuilder<'a, S> {
         mut self,
         value: Option<WorkScopeTagExternalReference<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -368,11 +371,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WorkScopeTagBuilder<'a, work_scope_tag_state::SetKey<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         WorkScopeTagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -380,12 +383,12 @@ where
 impl<'a, S: work_scope_tag_state::State> WorkScopeTagBuilder<'a, S> {
     /// Set the `kind` field (optional)
     pub fn kind(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `kind` field to an Option value (optional)
     pub fn maybe_kind(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -400,11 +403,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WorkScopeTagBuilder<'a, work_scope_tag_state::SetLabel<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         WorkScopeTagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -412,12 +415,12 @@ where
 impl<'a, S: work_scope_tag_state::State> WorkScopeTagBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -425,21 +428,21 @@ impl<'a, S: work_scope_tag_state::State> WorkScopeTagBuilder<'a, S> {
 impl<'a, S> WorkScopeTagBuilder<'a, S>
 where
     S: work_scope_tag_state::State,
-    S::Label: work_scope_tag_state::IsSet,
     S::Key: work_scope_tag_state::IsSet,
     S::CreatedAt: work_scope_tag_state::IsSet,
+    S::Label: work_scope_tag_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> WorkScopeTag<'a> {
         WorkScopeTag {
-            aliases: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            external_reference: self.__unsafe_private_named.3,
-            key: self.__unsafe_private_named.4.unwrap(),
-            kind: self.__unsafe_private_named.5,
-            label: self.__unsafe_private_named.6.unwrap(),
-            parent: self.__unsafe_private_named.7,
+            aliases: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            external_reference: self._fields.3,
+            key: self._fields.4.unwrap(),
+            kind: self._fields.5,
+            label: self._fields.6.unwrap(),
+            parent: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -452,14 +455,14 @@ where
         >,
     ) -> WorkScopeTag<'a> {
         WorkScopeTag {
-            aliases: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            external_reference: self.__unsafe_private_named.3,
-            key: self.__unsafe_private_named.4.unwrap(),
-            kind: self.__unsafe_private_named.5,
-            label: self.__unsafe_private_named.6.unwrap(),
-            parent: self.__unsafe_private_named.7,
+            aliases: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            external_reference: self._fields.3,
+            key: self._fields.4.unwrap(),
+            kind: self._fields.5,
+            label: self._fields.6.unwrap(),
+            parent: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_hypercerts/workscope/cel.rs b/crates/jacquard-api/src/org_hypercerts/workscope/cel.rs
index 7327de27..e2802c0a 100644
--- a/crates/jacquard-api/src/org_hypercerts/workscope/cel.rs
+++ b/crates/jacquard-api/src/org_hypercerts/workscope/cel.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -195,80 +198,80 @@ pub mod cel_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type UsedTags;
+        type Version;
         type Expression;
         type CreatedAt;
-        type Version;
+        type UsedTags;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type UsedTags = Unset;
+        type Version = Unset;
         type Expression = Unset;
         type CreatedAt = Unset;
-        type Version = Unset;
+        type UsedTags = Unset;
     }
-    ///State transition - sets the `used_tags` field to Set
-    pub struct SetUsedTags<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUsedTags<S> {}
-    impl<S: State> State for SetUsedTags<S> {
-        type UsedTags = Set<members::used_tags>;
+    ///State transition - sets the `version` field to Set
+    pub struct SetVersion<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetVersion<S> {}
+    impl<S: State> State for SetVersion<S> {
+        type Version = Set<members::version>;
         type Expression = S::Expression;
         type CreatedAt = S::CreatedAt;
-        type Version = S::Version;
+        type UsedTags = S::UsedTags;
     }
     ///State transition - sets the `expression` field to Set
     pub struct SetExpression<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetExpression<S> {}
     impl<S: State> State for SetExpression<S> {
-        type UsedTags = S::UsedTags;
+        type Version = S::Version;
         type Expression = Set<members::expression>;
         type CreatedAt = S::CreatedAt;
-        type Version = S::Version;
+        type UsedTags = S::UsedTags;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type UsedTags = S::UsedTags;
+        type Version = S::Version;
         type Expression = S::Expression;
         type CreatedAt = Set<members::created_at>;
-        type Version = S::Version;
-    }
-    ///State transition - sets the `version` field to Set
-    pub struct SetVersion<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetVersion<S> {}
-    impl<S: State> State for SetVersion<S> {
         type UsedTags = S::UsedTags;
+    }
+    ///State transition - sets the `used_tags` field to Set
+    pub struct SetUsedTags<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUsedTags<S> {}
+    impl<S: State> State for SetUsedTags<S> {
+        type Version = S::Version;
         type Expression = S::Expression;
         type CreatedAt = S::CreatedAt;
-        type Version = Set<members::version>;
+        type UsedTags = Set<members::used_tags>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `used_tags` field
-        pub struct used_tags(());
+        ///Marker type for the `version` field
+        pub struct version(());
         ///Marker type for the `expression` field
         pub struct expression(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `version` field
-        pub struct version(());
+        ///Marker type for the `used_tags` field
+        pub struct used_tags(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CelBuilder<'a, S: cel_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Vec<StrongRef<'a>>>,
         Option<CelVersion<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Cel<'a> {
@@ -282,9 +285,9 @@ impl<'a> CelBuilder<'a, cel_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -299,11 +302,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CelBuilder<'a, cel_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -318,11 +321,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CelBuilder<'a, cel_state::SetExpression<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -337,11 +340,11 @@ where
         mut self,
         value: impl Into<Vec<StrongRef<'a>>>,
     ) -> CelBuilder<'a, cel_state::SetUsedTags<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -356,11 +359,11 @@ where
         mut self,
         value: impl Into<CelVersion<'a>>,
     ) -> CelBuilder<'a, cel_state::SetVersion<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -368,18 +371,18 @@ where
 impl<'a, S> CelBuilder<'a, S>
 where
     S: cel_state::State,
-    S::UsedTags: cel_state::IsSet,
+    S::Version: cel_state::IsSet,
     S::Expression: cel_state::IsSet,
     S::CreatedAt: cel_state::IsSet,
-    S::Version: cel_state::IsSet,
+    S::UsedTags: cel_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Cel<'a> {
         Cel {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            expression: self.__unsafe_private_named.1.unwrap(),
-            used_tags: self.__unsafe_private_named.2.unwrap(),
-            version: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            expression: self._fields.1.unwrap(),
+            used_tags: self._fields.2.unwrap(),
+            version: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -392,10 +395,10 @@ where
         >,
     ) -> Cel<'a> {
         Cel {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            expression: self.__unsafe_private_named.1.unwrap(),
-            used_tags: self.__unsafe_private_named.2.unwrap(),
-            version: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            expression: self._fields.1.unwrap(),
+            used_tags: self._fields.2.unwrap(),
+            version: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_hypercerts/workscope/tag.rs b/crates/jacquard-api/src/org_hypercerts/workscope/tag.rs
index 2a479eaa..78b4d6a4 100644
--- a/crates/jacquard-api/src/org_hypercerts/workscope/tag.rs
+++ b/crates/jacquard-api/src/org_hypercerts/workscope/tag.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -439,58 +442,58 @@ pub mod tag_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Name;
         type CreatedAt;
         type Key;
-        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Name = Unset;
         type CreatedAt = Unset;
         type Key = Unset;
-        type Name = Unset;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Name = Set<members::name>;
+        type CreatedAt = S::CreatedAt;
+        type Key = S::Key;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Name = S::Name;
         type CreatedAt = Set<members::created_at>;
         type Key = S::Key;
-        type Name = S::Name;
     }
     ///State transition - sets the `key` field to Set
     pub struct SetKey<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetKey<S> {}
     impl<S: State> State for SetKey<S> {
-        type CreatedAt = S::CreatedAt;
-        type Key = Set<members::key>;
         type Name = S::Name;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
         type CreatedAt = S::CreatedAt;
-        type Key = S::Key;
-        type Name = Set<members::name>;
+        type Key = Set<members::key>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `name` field
+        pub struct name(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `key` field
         pub struct key(());
-        ///Marker type for the `name` field
-        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TagBuilder<'a, S: tag_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<CowStr<'a>>>,
         Option<TagCategory<'a>>,
         Option<Datetime>,
@@ -503,7 +506,7 @@ pub struct TagBuilder<'a, S: tag_state::State> {
         Option<TagStatus<'a>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Tag<'a> {
@@ -517,21 +520,9 @@ impl<'a> TagBuilder<'a, tag_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -539,12 +530,12 @@ impl<'a> TagBuilder<'a, tag_state::Empty> {
 impl<'a, S: tag_state::State> TagBuilder<'a, S> {
     /// Set the `aliases` field (optional)
     pub fn aliases(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `aliases` field to an Option value (optional)
     pub fn maybe_aliases(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -552,12 +543,12 @@ impl<'a, S: tag_state::State> TagBuilder<'a, S> {
 impl<'a, S: tag_state::State> TagBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<TagCategory<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<TagCategory<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -572,11 +563,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TagBuilder<'a, tag_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -584,12 +575,12 @@ where
 impl<'a, S: tag_state::State> TagBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -604,11 +595,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TagBuilder<'a, tag_state::SetKey<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -623,11 +614,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TagBuilder<'a, tag_state::SetName<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -635,12 +626,12 @@ where
 impl<'a, S: tag_state::State> TagBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -651,7 +642,7 @@ impl<'a, S: tag_state::State> TagBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TagReferenceDocument<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `referenceDocument` field to an Option value (optional)
@@ -659,7 +650,7 @@ impl<'a, S: tag_state::State> TagBuilder<'a, S> {
         mut self,
         value: Option<TagReferenceDocument<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -667,12 +658,12 @@ impl<'a, S: tag_state::State> TagBuilder<'a, S> {
 impl<'a, S: tag_state::State> TagBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<Vec<UriValue<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<Vec<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -680,12 +671,12 @@ impl<'a, S: tag_state::State> TagBuilder<'a, S> {
 impl<'a, S: tag_state::State> TagBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<TagStatus<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<TagStatus<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -693,12 +684,12 @@ impl<'a, S: tag_state::State> TagBuilder<'a, S> {
 impl<'a, S: tag_state::State> TagBuilder<'a, S> {
     /// Set the `supersededBy` field (optional)
     pub fn superseded_by(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `supersededBy` field to an Option value (optional)
     pub fn maybe_superseded_by(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -706,24 +697,24 @@ impl<'a, S: tag_state::State> TagBuilder<'a, S> {
 impl<'a, S> TagBuilder<'a, S>
 where
     S: tag_state::State,
+    S::Name: tag_state::IsSet,
     S::CreatedAt: tag_state::IsSet,
     S::Key: tag_state::IsSet,
-    S::Name: tag_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Tag<'a> {
         Tag {
-            aliases: self.__unsafe_private_named.0,
-            category: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            key: self.__unsafe_private_named.4.unwrap(),
-            name: self.__unsafe_private_named.5.unwrap(),
-            parent: self.__unsafe_private_named.6,
-            reference_document: self.__unsafe_private_named.7,
-            same_as: self.__unsafe_private_named.8,
-            status: self.__unsafe_private_named.9,
-            superseded_by: self.__unsafe_private_named.10,
+            aliases: self._fields.0,
+            category: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            key: self._fields.4.unwrap(),
+            name: self._fields.5.unwrap(),
+            parent: self._fields.6,
+            reference_document: self._fields.7,
+            same_as: self._fields.8,
+            status: self._fields.9,
+            superseded_by: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -736,17 +727,17 @@ where
         >,
     ) -> Tag<'a> {
         Tag {
-            aliases: self.__unsafe_private_named.0,
-            category: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            key: self.__unsafe_private_named.4.unwrap(),
-            name: self.__unsafe_private_named.5.unwrap(),
-            parent: self.__unsafe_private_named.6,
-            reference_document: self.__unsafe_private_named.7,
-            same_as: self.__unsafe_private_named.8,
-            status: self.__unsafe_private_named.9,
-            superseded_by: self.__unsafe_private_named.10,
+            aliases: self._fields.0,
+            category: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            key: self._fields.4.unwrap(),
+            name: self._fields.5.unwrap(),
+            parent: self._fields.6,
+            reference_document: self._fields.7,
+            same_as: self._fields.8,
+            status: self._fields.9,
+            superseded_by: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_impactindexer/link/attestation.rs b/crates/jacquard-api/src/org_impactindexer/link/attestation.rs
index c67d4ead..8add7541 100644
--- a/crates/jacquard-api/src/org_impactindexer/link/attestation.rs
+++ b/crates/jacquard-api/src/org_impactindexer/link/attestation.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -580,112 +583,112 @@ pub mod attestation_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ChainId;
-        type Message;
         type Address;
+        type ChainId;
+        type Signature;
         type SignatureType;
         type CreatedAt;
-        type Signature;
+        type Message;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ChainId = Unset;
-        type Message = Unset;
         type Address = Unset;
+        type ChainId = Unset;
+        type Signature = Unset;
         type SignatureType = Unset;
         type CreatedAt = Unset;
-        type Signature = Unset;
+        type Message = Unset;
+    }
+    ///State transition - sets the `address` field to Set
+    pub struct SetAddress<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAddress<S> {}
+    impl<S: State> State for SetAddress<S> {
+        type Address = Set<members::address>;
+        type ChainId = S::ChainId;
+        type Signature = S::Signature;
+        type SignatureType = S::SignatureType;
+        type CreatedAt = S::CreatedAt;
+        type Message = S::Message;
     }
     ///State transition - sets the `chain_id` field to Set
     pub struct SetChainId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetChainId<S> {}
     impl<S: State> State for SetChainId<S> {
-        type ChainId = Set<members::chain_id>;
-        type Message = S::Message;
         type Address = S::Address;
-        type SignatureType = S::SignatureType;
-        type CreatedAt = S::CreatedAt;
+        type ChainId = Set<members::chain_id>;
         type Signature = S::Signature;
-    }
-    ///State transition - sets the `message` field to Set
-    pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMessage<S> {}
-    impl<S: State> State for SetMessage<S> {
-        type ChainId = S::ChainId;
-        type Message = Set<members::message>;
-        type Address = S::Address;
         type SignatureType = S::SignatureType;
         type CreatedAt = S::CreatedAt;
-        type Signature = S::Signature;
+        type Message = S::Message;
     }
-    ///State transition - sets the `address` field to Set
-    pub struct SetAddress<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAddress<S> {}
-    impl<S: State> State for SetAddress<S> {
+    ///State transition - sets the `signature` field to Set
+    pub struct SetSignature<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSignature<S> {}
+    impl<S: State> State for SetSignature<S> {
+        type Address = S::Address;
         type ChainId = S::ChainId;
-        type Message = S::Message;
-        type Address = Set<members::address>;
+        type Signature = Set<members::signature>;
         type SignatureType = S::SignatureType;
         type CreatedAt = S::CreatedAt;
-        type Signature = S::Signature;
+        type Message = S::Message;
     }
     ///State transition - sets the `signature_type` field to Set
     pub struct SetSignatureType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSignatureType<S> {}
     impl<S: State> State for SetSignatureType<S> {
-        type ChainId = S::ChainId;
-        type Message = S::Message;
         type Address = S::Address;
+        type ChainId = S::ChainId;
+        type Signature = S::Signature;
         type SignatureType = Set<members::signature_type>;
         type CreatedAt = S::CreatedAt;
-        type Signature = S::Signature;
+        type Message = S::Message;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type ChainId = S::ChainId;
-        type Message = S::Message;
         type Address = S::Address;
+        type ChainId = S::ChainId;
+        type Signature = S::Signature;
         type SignatureType = S::SignatureType;
         type CreatedAt = Set<members::created_at>;
-        type Signature = S::Signature;
-    }
-    ///State transition - sets the `signature` field to Set
-    pub struct SetSignature<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSignature<S> {}
-    impl<S: State> State for SetSignature<S> {
-        type ChainId = S::ChainId;
         type Message = S::Message;
+    }
+    ///State transition - sets the `message` field to Set
+    pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMessage<S> {}
+    impl<S: State> State for SetMessage<S> {
         type Address = S::Address;
+        type ChainId = S::ChainId;
+        type Signature = S::Signature;
         type SignatureType = S::SignatureType;
         type CreatedAt = S::CreatedAt;
-        type Signature = Set<members::signature>;
+        type Message = Set<members::message>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `chain_id` field
-        pub struct chain_id(());
-        ///Marker type for the `message` field
-        pub struct message(());
         ///Marker type for the `address` field
         pub struct address(());
+        ///Marker type for the `chain_id` field
+        pub struct chain_id(());
+        ///Marker type for the `signature` field
+        pub struct signature(());
         ///Marker type for the `signature_type` field
         pub struct signature_type(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `signature` field
-        pub struct signature(());
+        ///Marker type for the `message` field
+        pub struct message(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AttestationBuilder<'a, S: attestation_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<i64>,
         Option<Datetime>,
@@ -693,7 +696,7 @@ pub struct AttestationBuilder<'a, S: attestation_state::State> {
         Option<CowStr<'a>>,
         Option<AttestationSignatureType<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Attestation<'a> {
@@ -707,9 +710,9 @@ impl<'a> AttestationBuilder<'a, attestation_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AttestationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -724,11 +727,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AttestationBuilder<'a, attestation_state::SetAddress<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AttestationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -743,11 +746,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AttestationBuilder<'a, attestation_state::SetChainId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AttestationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -762,11 +765,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AttestationBuilder<'a, attestation_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AttestationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -781,11 +784,11 @@ where
         mut self,
         value: impl Into<attestation::Eip712Message<'a>>,
     ) -> AttestationBuilder<'a, attestation_state::SetMessage<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         AttestationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -800,11 +803,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AttestationBuilder<'a, attestation_state::SetSignature<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         AttestationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -819,11 +822,11 @@ where
         mut self,
         value: impl Into<AttestationSignatureType<'a>>,
     ) -> AttestationBuilder<'a, attestation_state::SetSignatureType<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         AttestationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -831,22 +834,22 @@ where
 impl<'a, S> AttestationBuilder<'a, S>
 where
     S: attestation_state::State,
-    S::ChainId: attestation_state::IsSet,
-    S::Message: attestation_state::IsSet,
     S::Address: attestation_state::IsSet,
+    S::ChainId: attestation_state::IsSet,
+    S::Signature: attestation_state::IsSet,
     S::SignatureType: attestation_state::IsSet,
     S::CreatedAt: attestation_state::IsSet,
-    S::Signature: attestation_state::IsSet,
+    S::Message: attestation_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Attestation<'a> {
         Attestation {
-            address: self.__unsafe_private_named.0.unwrap(),
-            chain_id: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            message: self.__unsafe_private_named.3.unwrap(),
-            signature: self.__unsafe_private_named.4.unwrap(),
-            signature_type: self.__unsafe_private_named.5.unwrap(),
+            address: self._fields.0.unwrap(),
+            chain_id: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            message: self._fields.3.unwrap(),
+            signature: self._fields.4.unwrap(),
+            signature_type: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -859,12 +862,12 @@ where
         >,
     ) -> Attestation<'a> {
         Attestation {
-            address: self.__unsafe_private_named.0.unwrap(),
-            chain_id: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            message: self.__unsafe_private_named.3.unwrap(),
-            signature: self.__unsafe_private_named.4.unwrap(),
-            signature_type: self.__unsafe_private_named.5.unwrap(),
+            address: self._fields.0.unwrap(),
+            chain_id: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            message: self._fields.3.unwrap(),
+            signature: self._fields.4.unwrap(),
+            signature_type: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_impactindexer/review.rs b/crates/jacquard-api/src/org_impactindexer/review.rs
index 46e77ed3..fa51ae1c 100644
--- a/crates/jacquard-api/src/org_impactindexer/review.rs
+++ b/crates/jacquard-api/src/org_impactindexer/review.rs
@@ -8,7 +8,11 @@
 pub mod comment;
 pub mod like;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -180,49 +184,45 @@ pub mod subject_ref_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type Type;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type Type = Unset;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Type = S::Type;
+        type Uri = Unset;
     }
     ///State transition - sets the `type` field to Set
     pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetType<S> {}
     impl<S: State> State for SetType<S> {
-        type Uri = S::Uri;
         type Type = Set<members::r#type>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Type = S::Type;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `type` field
         pub struct r#type(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SubjectRefBuilder<'a, S: subject_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<review::SubjectType<'a>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<review::SubjectType<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SubjectRef<'a> {
@@ -236,9 +236,9 @@ impl<'a> SubjectRefBuilder<'a, subject_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubjectRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,12 +246,12 @@ impl<'a> SubjectRefBuilder<'a, subject_ref_state::Empty> {
 impl<'a, S: subject_ref_state::State> SubjectRefBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -266,11 +266,11 @@ where
         mut self,
         value: impl Into<review::SubjectType<'a>>,
     ) -> SubjectRefBuilder<'a, subject_ref_state::SetType<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SubjectRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -285,11 +285,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SubjectRefBuilder<'a, subject_ref_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SubjectRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -297,15 +297,15 @@ where
 impl<'a, S> SubjectRefBuilder<'a, S>
 where
     S: subject_ref_state::State,
-    S::Uri: subject_ref_state::IsSet,
     S::Type: subject_ref_state::IsSet,
+    S::Uri: subject_ref_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SubjectRef<'a> {
         SubjectRef {
-            cid: self.__unsafe_private_named.0,
-            r#type: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            cid: self._fields.0,
+            r#type: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -318,9 +318,9 @@ where
         >,
     ) -> SubjectRef<'a> {
         SubjectRef {
-            cid: self.__unsafe_private_named.0,
-            r#type: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            cid: self._fields.0,
+            r#type: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_impactindexer/review/comment.rs b/crates/jacquard-api/src/org_impactindexer/review/comment.rs
index 9e658256..efb89309 100644
--- a/crates/jacquard-api/src/org_impactindexer/review/comment.rs
+++ b/crates/jacquard-api/src/org_impactindexer/review/comment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -192,14 +195,14 @@ pub mod comment_state {
 
 /// Builder for constructing an instance of this type
 pub struct CommentBuilder<'a, S: comment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<AtUri<'a>>,
         Option<SubjectRef<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Comment<'a> {
@@ -213,9 +216,9 @@ impl<'a> CommentBuilder<'a, comment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -230,11 +233,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CommentBuilder<'a, comment_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -242,12 +245,12 @@ where
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `replyTo` field (optional)
     pub fn reply_to(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `replyTo` field to an Option value (optional)
     pub fn maybe_reply_to(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -262,11 +265,11 @@ where
         mut self,
         value: impl Into<SubjectRef<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -281,11 +284,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetText<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -300,10 +303,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Comment<'a> {
         Comment {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            reply_to: self.__unsafe_private_named.1,
-            subject: self.__unsafe_private_named.2.unwrap(),
-            text: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            reply_to: self._fields.1,
+            subject: self._fields.2.unwrap(),
+            text: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -316,10 +319,10 @@ where
         >,
     ) -> Comment<'a> {
         Comment {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            reply_to: self.__unsafe_private_named.1,
-            subject: self.__unsafe_private_named.2.unwrap(),
-            text: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            reply_to: self._fields.1,
+            subject: self._fields.2.unwrap(),
+            text: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_impactindexer/review/like.rs b/crates/jacquard-api/src/org_impactindexer/review/like.rs
index 09e969ff..2df0d019 100644
--- a/crates/jacquard-api/src/org_impactindexer/review/like.rs
+++ b/crates/jacquard-api/src/org_impactindexer/review/like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -147,9 +150,9 @@ pub mod like_state {
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<SubjectRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<SubjectRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -163,9 +166,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,11 +183,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -199,11 +202,11 @@ where
         mut self,
         value: impl Into<SubjectRef<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -217,8 +220,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -231,8 +234,8 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_okazu_diary/actor/profile.rs b/crates/jacquard-api/src/org_okazu_diary/actor/profile.rs
index f99ae062..1305d3db 100644
--- a/crates/jacquard-api/src/org_okazu_diary/actor/profile.rs
+++ b/crates/jacquard-api/src/org_okazu_diary/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -222,8 +225,8 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -231,7 +234,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<SelfLabels<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -245,9 +248,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -255,12 +258,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -268,12 +271,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -281,12 +284,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -294,12 +297,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -307,12 +310,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -320,12 +323,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `website` field (optional)
     pub fn website(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `website` field to an Option value (optional)
     pub fn maybe_website(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -337,12 +340,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3,
-            labels: self.__unsafe_private_named.4,
-            website: self.__unsafe_private_named.5,
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            description: self._fields.2,
+            display_name: self._fields.3,
+            labels: self._fields.4,
+            website: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -355,12 +358,12 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3,
-            labels: self.__unsafe_private_named.4,
-            website: self.__unsafe_private_named.5,
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            description: self._fields.2,
+            display_name: self._fields.3,
+            labels: self._fields.4,
+            website: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_okazu_diary/embed/external.rs b/crates/jacquard-api/src/org_okazu_diary/embed/external.rs
index 2cbfc206..a97ab61c 100644
--- a/crates/jacquard-api/src/org_okazu_diary/embed/external.rs
+++ b/crates/jacquard-api/src/org_okazu_diary/embed/external.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -113,14 +116,14 @@ pub mod external_state {
 
 /// Builder for constructing an instance of this type
 pub struct ExternalBuilder<'a, S: external_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<external::Thumb<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> External<'a> {
@@ -134,9 +137,9 @@ impl<'a> ExternalBuilder<'a, external_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -144,12 +147,12 @@ impl<'a> ExternalBuilder<'a, external_state::Empty> {
 impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -157,12 +160,12 @@ impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
 impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
     /// Set the `thumb` field (optional)
     pub fn thumb(mut self, value: impl Into<Option<external::Thumb<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `thumb` field to an Option value (optional)
     pub fn maybe_thumb(mut self, value: Option<external::Thumb<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -170,12 +173,12 @@ impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
 impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -190,11 +193,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ExternalBuilder<'a, external_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -207,10 +210,10 @@ where
     /// Build the final struct
     pub fn build(self) -> External<'a> {
         External {
-            description: self.__unsafe_private_named.0,
-            thumb: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0,
+            thumb: self._fields.1,
+            title: self._fields.2,
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -223,10 +226,10 @@ where
         >,
     ) -> External<'a> {
         External {
-            description: self.__unsafe_private_named.0,
-            thumb: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0,
+            thumb: self._fields.1,
+            title: self._fields.2,
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -356,9 +359,9 @@ pub mod thumb_state {
 
 /// Builder for constructing an instance of this type
 pub struct ThumbBuilder<'a, S: thumb_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Thumb<'a> {
@@ -372,9 +375,9 @@ impl<'a> ThumbBuilder<'a, thumb_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ThumbBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -389,11 +392,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> ThumbBuilder<'a, thumb_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ThumbBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -408,11 +411,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ThumbBuilder<'a, thumb_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ThumbBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -426,8 +429,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Thumb<'a> {
         Thumb {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -440,8 +443,8 @@ where
         >,
     ) -> Thumb<'a> {
         Thumb {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_okazu_diary/embed/record.rs b/crates/jacquard-api/src/org_okazu_diary/embed/record.rs
index 981c2f2f..fadb682c 100644
--- a/crates/jacquard-api/src/org_okazu_diary/embed/record.rs
+++ b/crates/jacquard-api/src/org_okazu_diary/embed/record.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -76,9 +79,9 @@ pub mod record_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordBuilder<'a, S: record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Record<'a> {
@@ -92,9 +95,9 @@ impl<'a> RecordBuilder<'a, record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -109,11 +112,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> RecordBuilder<'a, record_state::SetRecord<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -126,7 +129,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Record<'a> {
         Record {
-            record: self.__unsafe_private_named.0.unwrap(),
+            record: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -139,7 +142,7 @@ where
         >,
     ) -> Record<'a> {
         Record {
-            record: self.__unsafe_private_named.0.unwrap(),
+            record: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_okazu_diary/feed.rs b/crates/jacquard-api/src/org_okazu_diary/feed.rs
index afe39e69..79f6d0f6 100644
--- a/crates/jacquard-api/src/org_okazu_diary/feed.rs
+++ b/crates/jacquard-api/src/org_okazu_diary/feed.rs
@@ -10,7 +10,11 @@ pub mod collection_item;
 pub mod entry;
 pub mod like;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -147,9 +151,9 @@ pub mod subject_state {
 
 /// Builder for constructing an instance of this type
 pub struct SubjectBuilder<'a, S: subject_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<SelfLabels<'a>>, Option<SubjectValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<SelfLabels<'a>>, Option<SubjectValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Subject<'a> {
@@ -163,9 +167,9 @@ impl<'a> SubjectBuilder<'a, subject_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -173,12 +177,12 @@ impl<'a> SubjectBuilder<'a, subject_state::Empty> {
 impl<'a, S: subject_state::State> SubjectBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -193,11 +197,11 @@ where
         mut self,
         value: impl Into<SubjectValue<'a>>,
     ) -> SubjectBuilder<'a, subject_state::SetValue<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,8 +214,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Subject<'a> {
         Subject {
-            labels: self.__unsafe_private_named.0,
-            value: self.__unsafe_private_named.1.unwrap(),
+            labels: self._fields.0,
+            value: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -224,8 +228,8 @@ where
         >,
     ) -> Subject<'a> {
         Subject {
-            labels: self.__unsafe_private_named.0,
-            value: self.__unsafe_private_named.1.unwrap(),
+            labels: self._fields.0,
+            value: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_okazu_diary/feed/collection.rs b/crates/jacquard-api/src/org_okazu_diary/feed/collection.rs
index 9e9c2658..5ea2c6ba 100644
--- a/crates/jacquard-api/src/org_okazu_diary/feed/collection.rs
+++ b/crates/jacquard-api/src/org_okazu_diary/feed/collection.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -184,14 +187,14 @@ pub mod collection_state {
 
 /// Builder for constructing an instance of this type
 pub struct CollectionBuilder<'a, S: collection_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<SelfLabels<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Collection<'a> {
@@ -205,9 +208,9 @@ impl<'a> CollectionBuilder<'a, collection_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -222,11 +225,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionBuilder<'a, collection_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,12 +237,12 @@ where
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -247,12 +250,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -260,12 +263,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -278,10 +281,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Collection<'a> {
         Collection {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            labels: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            labels: self._fields.2,
+            name: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -294,10 +297,10 @@ where
         >,
     ) -> Collection<'a> {
         Collection {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            labels: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            labels: self._fields.2,
+            name: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_okazu_diary/feed/collection_item.rs b/crates/jacquard-api/src/org_okazu_diary/feed/collection_item.rs
index f8a59853..100e7fbf 100644
--- a/crates/jacquard-api/src/org_okazu_diary/feed/collection_item.rs
+++ b/crates/jacquard-api/src/org_okazu_diary/feed/collection_item.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -160,49 +163,49 @@ pub mod collection_item_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Collection;
+        type CreatedAt;
         type Subjects;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Collection = Unset;
+        type CreatedAt = Unset;
         type Subjects = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Collection = S::Collection;
-        type Subjects = S::Subjects;
-    }
     ///State transition - sets the `collection` field to Set
     pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCollection<S> {}
     impl<S: State> State for SetCollection<S> {
-        type CreatedAt = S::CreatedAt;
         type Collection = Set<members::collection>;
+        type CreatedAt = S::CreatedAt;
+        type Subjects = S::Subjects;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Collection = S::Collection;
+        type CreatedAt = Set<members::created_at>;
         type Subjects = S::Subjects;
     }
     ///State transition - sets the `subjects` field to Set
     pub struct SetSubjects<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubjects<S> {}
     impl<S: State> State for SetSubjects<S> {
-        type CreatedAt = S::CreatedAt;
         type Collection = S::Collection;
+        type CreatedAt = S::CreatedAt;
         type Subjects = Set<members::subjects>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `collection` field
         pub struct collection(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `subjects` field
         pub struct subjects(());
     }
@@ -210,8 +213,8 @@ pub mod collection_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct CollectionItemBuilder<'a, S: collection_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<Datetime>,
         Option<SelfLabels<'a>>,
@@ -219,7 +222,7 @@ pub struct CollectionItemBuilder<'a, S: collection_item_state::State> {
         Option<Vec<Tag<'a>>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CollectionItem<'a> {
@@ -233,9 +236,9 @@ impl<'a> CollectionItemBuilder<'a, collection_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -250,11 +253,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CollectionItemBuilder<'a, collection_item_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -269,11 +272,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionItemBuilder<'a, collection_item_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -281,12 +284,12 @@ where
 impl<'a, S: collection_item_state::State> CollectionItemBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -301,11 +304,11 @@ where
         mut self,
         value: impl Into<Vec<Subject<'a>>>,
     ) -> CollectionItemBuilder<'a, collection_item_state::SetSubjects<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -313,12 +316,12 @@ where
 impl<'a, S: collection_item_state::State> CollectionItemBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<Tag<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<Tag<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -326,12 +329,12 @@ impl<'a, S: collection_item_state::State> CollectionItemBuilder<'a, S> {
 impl<'a, S: collection_item_state::State> CollectionItemBuilder<'a, S> {
     /// Set the `via` field (optional)
     pub fn via(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `via` field to an Option value (optional)
     pub fn maybe_via(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -339,19 +342,19 @@ impl<'a, S: collection_item_state::State> CollectionItemBuilder<'a, S> {
 impl<'a, S> CollectionItemBuilder<'a, S>
 where
     S: collection_item_state::State,
-    S::CreatedAt: collection_item_state::IsSet,
     S::Collection: collection_item_state::IsSet,
+    S::CreatedAt: collection_item_state::IsSet,
     S::Subjects: collection_item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CollectionItem<'a> {
         CollectionItem {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            labels: self.__unsafe_private_named.2,
-            subjects: self.__unsafe_private_named.3.unwrap(),
-            tags: self.__unsafe_private_named.4,
-            via: self.__unsafe_private_named.5,
+            collection: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            labels: self._fields.2,
+            subjects: self._fields.3.unwrap(),
+            tags: self._fields.4,
+            via: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -364,12 +367,12 @@ where
         >,
     ) -> CollectionItem<'a> {
         CollectionItem {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            labels: self.__unsafe_private_named.2,
-            subjects: self.__unsafe_private_named.3.unwrap(),
-            tags: self.__unsafe_private_named.4,
-            via: self.__unsafe_private_named.5,
+            collection: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            labels: self._fields.2,
+            subjects: self._fields.3.unwrap(),
+            tags: self._fields.4,
+            via: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_okazu_diary/feed/entry.rs b/crates/jacquard-api/src/org_okazu_diary/feed/entry.rs
index 9811d3b1..734c1adf 100644
--- a/crates/jacquard-api/src/org_okazu_diary/feed/entry.rs
+++ b/crates/jacquard-api/src/org_okazu_diary/feed/entry.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -299,8 +302,8 @@ pub mod entry_state {
 
 /// Builder for constructing an instance of this type
 pub struct EntryBuilder<'a, S: entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<bool>,
         Option<SelfLabels<'a>>,
@@ -310,7 +313,7 @@ pub struct EntryBuilder<'a, S: entry_state::State> {
         Option<StrongRef<'a>>,
         Option<EntryVisibility<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Entry<'a> {
@@ -324,9 +327,9 @@ impl<'a> EntryBuilder<'a, entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -341,11 +344,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EntryBuilder<'a, entry_state::SetDatetime<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -353,12 +356,12 @@ where
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `hadHiatus` field (optional)
     pub fn had_hiatus(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `hadHiatus` field to an Option value (optional)
     pub fn maybe_had_hiatus(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -366,12 +369,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -379,12 +382,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -392,12 +395,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `subjects` field (optional)
     pub fn subjects(mut self, value: impl Into<Option<Vec<StrongRef<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `subjects` field to an Option value (optional)
     pub fn maybe_subjects(mut self, value: Option<Vec<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -405,12 +408,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<Tag<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<Tag<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -418,12 +421,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `via` field (optional)
     pub fn via(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `via` field to an Option value (optional)
     pub fn maybe_via(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -431,12 +434,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `visibility` field (optional)
     pub fn visibility(mut self, value: impl Into<Option<EntryVisibility<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `visibility` field to an Option value (optional)
     pub fn maybe_visibility(mut self, value: Option<EntryVisibility<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -449,14 +452,14 @@ where
     /// Build the final struct
     pub fn build(self) -> Entry<'a> {
         Entry {
-            datetime: self.__unsafe_private_named.0.unwrap(),
-            had_hiatus: self.__unsafe_private_named.1.or_else(|| Some(false)),
-            labels: self.__unsafe_private_named.2,
-            note: self.__unsafe_private_named.3,
-            subjects: self.__unsafe_private_named.4,
-            tags: self.__unsafe_private_named.5,
-            via: self.__unsafe_private_named.6,
-            visibility: self.__unsafe_private_named.7,
+            datetime: self._fields.0.unwrap(),
+            had_hiatus: self._fields.1.or_else(|| Some(false)),
+            labels: self._fields.2,
+            note: self._fields.3,
+            subjects: self._fields.4,
+            tags: self._fields.5,
+            via: self._fields.6,
+            visibility: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -469,14 +472,14 @@ where
         >,
     ) -> Entry<'a> {
         Entry {
-            datetime: self.__unsafe_private_named.0.unwrap(),
-            had_hiatus: self.__unsafe_private_named.1.or_else(|| Some(false)),
-            labels: self.__unsafe_private_named.2,
-            note: self.__unsafe_private_named.3,
-            subjects: self.__unsafe_private_named.4,
-            tags: self.__unsafe_private_named.5,
-            via: self.__unsafe_private_named.6,
-            visibility: self.__unsafe_private_named.7,
+            datetime: self._fields.0.unwrap(),
+            had_hiatus: self._fields.1.or_else(|| Some(false)),
+            labels: self._fields.2,
+            note: self._fields.3,
+            subjects: self._fields.4,
+            tags: self._fields.5,
+            via: self._fields.6,
+            visibility: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_okazu_diary/feed/like.rs b/crates/jacquard-api/src/org_okazu_diary/feed/like.rs
index 61583bbb..071c9a59 100644
--- a/crates/jacquard-api/src/org_okazu_diary/feed/like.rs
+++ b/crates/jacquard-api/src/org_okazu_diary/feed/like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -148,13 +151,9 @@ pub mod like_state {
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<StrongRef<'a>>,
-        Option<StrongRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -168,9 +167,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -185,11 +184,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,11 +203,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,12 +215,12 @@ where
 impl<'a, S: like_state::State> LikeBuilder<'a, S> {
     /// Set the `via` field (optional)
     pub fn via(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `via` field to an Option value (optional)
     pub fn maybe_via(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -235,9 +234,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            via: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            via: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -250,9 +249,9 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            via: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            via: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_okazu_diary/material/collection.rs b/crates/jacquard-api/src/org_okazu_diary/material/collection.rs
index f56f6d82..ddee40de 100644
--- a/crates/jacquard-api/src/org_okazu_diary/material/collection.rs
+++ b/crates/jacquard-api/src/org_okazu_diary/material/collection.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -184,14 +187,14 @@ pub mod collection_state {
 
 /// Builder for constructing an instance of this type
 pub struct CollectionBuilder<'a, S: collection_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<SelfLabels<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Collection<'a> {
@@ -205,9 +208,9 @@ impl<'a> CollectionBuilder<'a, collection_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -222,11 +225,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionBuilder<'a, collection_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,12 +237,12 @@ where
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -247,12 +250,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -260,12 +263,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -278,10 +281,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Collection<'a> {
         Collection {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            labels: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            labels: self._fields.2,
+            name: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -294,10 +297,10 @@ where
         >,
     ) -> Collection<'a> {
         Collection {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            labels: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            labels: self._fields.2,
+            name: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_okazu_diary/material/collection_item.rs b/crates/jacquard-api/src/org_okazu_diary/material/collection_item.rs
index 753d87b9..2c67b104 100644
--- a/crates/jacquard-api/src/org_okazu_diary/material/collection_item.rs
+++ b/crates/jacquard-api/src/org_okazu_diary/material/collection_item.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -165,65 +168,65 @@ pub mod collection_item_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subjects;
         type Collection;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subjects = Unset;
         type Collection = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subjects = S::Subjects;
-        type Collection = S::Collection;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subjects` field to Set
     pub struct SetSubjects<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubjects<S> {}
     impl<S: State> State for SetSubjects<S> {
-        type CreatedAt = S::CreatedAt;
         type Subjects = Set<members::subjects>;
         type Collection = S::Collection;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `collection` field to Set
     pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCollection<S> {}
     impl<S: State> State for SetCollection<S> {
-        type CreatedAt = S::CreatedAt;
         type Subjects = S::Subjects;
         type Collection = Set<members::collection>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subjects = S::Subjects;
+        type Collection = S::Collection;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subjects` field
         pub struct subjects(());
         ///Marker type for the `collection` field
         pub struct collection(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CollectionItemBuilder<'a, S: collection_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Vec<AtUri<'a>>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CollectionItem<'a> {
@@ -237,9 +240,9 @@ impl<'a> CollectionItemBuilder<'a, collection_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -254,11 +257,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CollectionItemBuilder<'a, collection_item_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -273,11 +276,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionItemBuilder<'a, collection_item_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -285,12 +288,12 @@ where
 impl<'a, S: collection_item_state::State> CollectionItemBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -305,11 +308,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> CollectionItemBuilder<'a, collection_item_state::SetSubjects<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -317,12 +320,12 @@ where
 impl<'a, S: collection_item_state::State> CollectionItemBuilder<'a, S> {
     /// Set the `via` field (optional)
     pub fn via(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `via` field to an Option value (optional)
     pub fn maybe_via(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -330,18 +333,18 @@ impl<'a, S: collection_item_state::State> CollectionItemBuilder<'a, S> {
 impl<'a, S> CollectionItemBuilder<'a, S>
 where
     S: collection_item_state::State,
-    S::CreatedAt: collection_item_state::IsSet,
     S::Subjects: collection_item_state::IsSet,
     S::Collection: collection_item_state::IsSet,
+    S::CreatedAt: collection_item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CollectionItem<'a> {
         CollectionItem {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            note: self.__unsafe_private_named.2,
-            subjects: self.__unsafe_private_named.3.unwrap(),
-            via: self.__unsafe_private_named.4,
+            collection: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            note: self._fields.2,
+            subjects: self._fields.3.unwrap(),
+            via: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -354,11 +357,11 @@ where
         >,
     ) -> CollectionItem<'a> {
         CollectionItem {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            note: self.__unsafe_private_named.2,
-            subjects: self.__unsafe_private_named.3.unwrap(),
-            via: self.__unsafe_private_named.4,
+            collection: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            note: self._fields.2,
+            subjects: self._fields.3.unwrap(),
+            via: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_okazu_diary/material/external.rs b/crates/jacquard-api/src/org_okazu_diary/material/external.rs
index abcf305b..cf005884 100644
--- a/crates/jacquard-api/src/org_okazu_diary/material/external.rs
+++ b/crates/jacquard-api/src/org_okazu_diary/material/external.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -193,8 +196,8 @@ pub mod external_state {
 
 /// Builder for constructing an instance of this type
 pub struct ExternalBuilder<'a, S: external_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<SelfLabels<'a>>,
         Option<SelfLabels<'a>>,
@@ -205,7 +208,7 @@ pub struct ExternalBuilder<'a, S: external_state::State> {
         Option<UriValue<'a>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> External<'a> {
@@ -219,19 +222,9 @@ impl<'a> ExternalBuilder<'a, external_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,12 +232,12 @@ impl<'a> ExternalBuilder<'a, external_state::Empty> {
 impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -252,12 +245,12 @@ impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
 impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
     /// Set the `genericLabels` field (optional)
     pub fn generic_labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `genericLabels` field to an Option value (optional)
     pub fn maybe_generic_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -265,12 +258,12 @@ impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
 impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -278,12 +271,12 @@ impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
 impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
     /// Set the `record` field (optional)
     pub fn record(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `record` field to an Option value (optional)
     pub fn maybe_record(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -291,12 +284,12 @@ impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
 impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<Tag<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<Tag<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -304,12 +297,12 @@ impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
 impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
     /// Set the `thumb` field (optional)
     pub fn thumb(mut self, value: impl Into<Option<external::Thumb<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `thumb` field to an Option value (optional)
     pub fn maybe_thumb(mut self, value: Option<external::Thumb<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -317,12 +310,12 @@ impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
 impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -330,12 +323,12 @@ impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
 impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
     /// Set the `uri` field (optional)
     pub fn uri(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `uri` field to an Option value (optional)
     pub fn maybe_uri(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -343,12 +336,12 @@ impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
 impl<'a, S: external_state::State> ExternalBuilder<'a, S> {
     /// Set the `via` field (optional)
     pub fn via(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `via` field to an Option value (optional)
     pub fn maybe_via(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -360,15 +353,15 @@ where
     /// Build the final struct
     pub fn build(self) -> External<'a> {
         External {
-            description: self.__unsafe_private_named.0,
-            generic_labels: self.__unsafe_private_named.1,
-            labels: self.__unsafe_private_named.2,
-            record: self.__unsafe_private_named.3,
-            tags: self.__unsafe_private_named.4,
-            thumb: self.__unsafe_private_named.5,
-            title: self.__unsafe_private_named.6,
-            uri: self.__unsafe_private_named.7,
-            via: self.__unsafe_private_named.8,
+            description: self._fields.0,
+            generic_labels: self._fields.1,
+            labels: self._fields.2,
+            record: self._fields.3,
+            tags: self._fields.4,
+            thumb: self._fields.5,
+            title: self._fields.6,
+            uri: self._fields.7,
+            via: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -381,15 +374,15 @@ where
         >,
     ) -> External<'a> {
         External {
-            description: self.__unsafe_private_named.0,
-            generic_labels: self.__unsafe_private_named.1,
-            labels: self.__unsafe_private_named.2,
-            record: self.__unsafe_private_named.3,
-            tags: self.__unsafe_private_named.4,
-            thumb: self.__unsafe_private_named.5,
-            title: self.__unsafe_private_named.6,
-            uri: self.__unsafe_private_named.7,
-            via: self.__unsafe_private_named.8,
+            description: self._fields.0,
+            generic_labels: self._fields.1,
+            labels: self._fields.2,
+            record: self._fields.3,
+            tags: self._fields.4,
+            thumb: self._fields.5,
+            title: self._fields.6,
+            uri: self._fields.7,
+            via: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
@@ -588,9 +581,9 @@ pub mod thumb_state {
 
 /// Builder for constructing an instance of this type
 pub struct ThumbBuilder<'a, S: thumb_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Thumb<'a> {
@@ -604,9 +597,9 @@ impl<'a> ThumbBuilder<'a, thumb_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ThumbBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -614,12 +607,12 @@ impl<'a> ThumbBuilder<'a, thumb_state::Empty> {
 impl<'a, S: thumb_state::State> ThumbBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -634,11 +627,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ThumbBuilder<'a, thumb_state::SetUrl<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ThumbBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -651,8 +644,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Thumb<'a> {
         Thumb {
-            cid: self.__unsafe_private_named.0,
-            url: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0,
+            url: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -665,8 +658,8 @@ where
         >,
     ) -> Thumb<'a> {
         Thumb {
-            cid: self.__unsafe_private_named.0,
-            url: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0,
+            url: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_passingreads.rs b/crates/jacquard-api/src/org_passingreads.rs
index 105b2f5e..63af983e 100644
--- a/crates/jacquard-api/src/org_passingreads.rs
+++ b/crates/jacquard-api/src/org_passingreads.rs
@@ -8,7 +8,11 @@
 pub mod actor;
 pub mod book;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -193,9 +197,9 @@ pub mod actor_state {
 
 /// Builder for constructing an instance of this type
 pub struct ActorBuilder<'a, S: actor_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<CowStr<'a>>, Option<Handle<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<CowStr<'a>>, Option<Handle<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Actor<'a> {
@@ -209,9 +213,9 @@ impl<'a> ActorBuilder<'a, actor_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -226,11 +230,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ActorBuilder<'a, actor_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -238,12 +242,12 @@ where
 impl<'a, S: actor_state::State> ActorBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -251,12 +255,12 @@ impl<'a, S: actor_state::State> ActorBuilder<'a, S> {
 impl<'a, S: actor_state::State> ActorBuilder<'a, S> {
     /// Set the `handle` field (optional)
     pub fn handle(mut self, value: impl Into<Option<Handle<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `handle` field to an Option value (optional)
     pub fn maybe_handle(mut self, value: Option<Handle<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -269,9 +273,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Actor<'a> {
         Actor {
-            did: self.__unsafe_private_named.0.unwrap(),
-            display_name: self.__unsafe_private_named.1,
-            handle: self.__unsafe_private_named.2,
+            did: self._fields.0.unwrap(),
+            display_name: self._fields.1,
+            handle: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -284,9 +288,9 @@ where
         >,
     ) -> Actor<'a> {
         Actor {
-            did: self.__unsafe_private_named.0.unwrap(),
-            display_name: self.__unsafe_private_named.1,
-            handle: self.__unsafe_private_named.2,
+            did: self._fields.0.unwrap(),
+            display_name: self._fields.1,
+            handle: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -469,9 +473,9 @@ pub mod aspect_ratio_state {
 
 /// Builder for constructing an instance of this type
 pub struct AspectRatioBuilder<'a, S: aspect_ratio_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AspectRatio<'a> {
@@ -485,9 +489,9 @@ impl<'a> AspectRatioBuilder<'a, aspect_ratio_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -502,11 +506,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -521,11 +525,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetWidth<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -539,8 +543,8 @@ where
     /// Build the final struct
     pub fn build(self) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -553,8 +557,8 @@ where
         >,
     ) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -570,45 +574,45 @@ pub mod location_entry_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type BookCount;
         type H3;
+        type BookCount;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type BookCount = Unset;
         type H3 = Unset;
-    }
-    ///State transition - sets the `book_count` field to Set
-    pub struct SetBookCount<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBookCount<S> {}
-    impl<S: State> State for SetBookCount<S> {
-        type BookCount = Set<members::book_count>;
-        type H3 = S::H3;
+        type BookCount = Unset;
     }
     ///State transition - sets the `h3` field to Set
     pub struct SetH3<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetH3<S> {}
     impl<S: State> State for SetH3<S> {
-        type BookCount = S::BookCount;
         type H3 = Set<members::h3>;
+        type BookCount = S::BookCount;
+    }
+    ///State transition - sets the `book_count` field to Set
+    pub struct SetBookCount<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBookCount<S> {}
+    impl<S: State> State for SetBookCount<S> {
+        type H3 = S::H3;
+        type BookCount = Set<members::book_count>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `book_count` field
-        pub struct book_count(());
         ///Marker type for the `h3` field
         pub struct h3(());
+        ///Marker type for the `book_count` field
+        pub struct book_count(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LocationEntryBuilder<'a, S: location_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LocationEntry<'a> {
@@ -622,9 +626,9 @@ impl<'a> LocationEntryBuilder<'a, location_entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LocationEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -639,11 +643,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> LocationEntryBuilder<'a, location_entry_state::SetBookCount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LocationEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -658,11 +662,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LocationEntryBuilder<'a, location_entry_state::SetH3<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LocationEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -670,14 +674,14 @@ where
 impl<'a, S> LocationEntryBuilder<'a, S>
 where
     S: location_entry_state::State,
-    S::BookCount: location_entry_state::IsSet,
     S::H3: location_entry_state::IsSet,
+    S::BookCount: location_entry_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LocationEntry<'a> {
         LocationEntry {
-            book_count: self.__unsafe_private_named.0.unwrap(),
-            h3: self.__unsafe_private_named.1.unwrap(),
+            book_count: self._fields.0.unwrap(),
+            h3: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -690,8 +694,8 @@ where
         >,
     ) -> LocationEntry<'a> {
         LocationEntry {
-            book_count: self.__unsafe_private_named.0.unwrap(),
-            h3: self.__unsafe_private_named.1.unwrap(),
+            book_count: self._fields.0.unwrap(),
+            h3: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_passingreads/actor.rs b/crates/jacquard-api/src/org_passingreads/actor.rs
index 025c3dce..91d82022 100644
--- a/crates/jacquard-api/src/org_passingreads/actor.rs
+++ b/crates/jacquard-api/src/org_passingreads/actor.rs
@@ -9,7 +9,11 @@ pub mod get_profile;
 pub mod list_profiles;
 pub mod profile;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -145,8 +149,8 @@ pub mod profile_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileViewBuilder<'a, S: profile_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
@@ -155,7 +159,7 @@ pub struct ProfileViewBuilder<'a, S: profile_view_state::State> {
         Option<CowStr<'a>>,
         Option<Handle<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileView<'a> {
@@ -169,9 +173,9 @@ impl<'a> ProfileViewBuilder<'a, profile_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,12 +183,12 @@ impl<'a> ProfileViewBuilder<'a, profile_view_state::Empty> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `avatarAlt` field (optional)
     pub fn avatar_alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatarAlt` field to an Option value (optional)
     pub fn maybe_avatar_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -192,12 +196,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `avatarUrl` field (optional)
     pub fn avatar_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `avatarUrl` field to an Option value (optional)
     pub fn maybe_avatar_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -205,12 +209,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -221,12 +225,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `descriptionFacets` field to an Option value (optional)
     pub fn maybe_description_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -241,11 +245,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ProfileViewBuilder<'a, profile_view_state::SetDid<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,12 +257,12 @@ where
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -273,11 +277,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> ProfileViewBuilder<'a, profile_view_state::SetHandle<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -291,13 +295,13 @@ where
     /// Build the final struct
     pub fn build(self) -> ProfileView<'a> {
         ProfileView {
-            avatar_alt: self.__unsafe_private_named.0,
-            avatar_url: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            description_facets: self.__unsafe_private_named.3,
-            did: self.__unsafe_private_named.4.unwrap(),
-            display_name: self.__unsafe_private_named.5,
-            handle: self.__unsafe_private_named.6.unwrap(),
+            avatar_alt: self._fields.0,
+            avatar_url: self._fields.1,
+            description: self._fields.2,
+            description_facets: self._fields.3,
+            did: self._fields.4.unwrap(),
+            display_name: self._fields.5,
+            handle: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -310,13 +314,13 @@ where
         >,
     ) -> ProfileView<'a> {
         ProfileView {
-            avatar_alt: self.__unsafe_private_named.0,
-            avatar_url: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            description_facets: self.__unsafe_private_named.3,
-            did: self.__unsafe_private_named.4.unwrap(),
-            display_name: self.__unsafe_private_named.5,
-            handle: self.__unsafe_private_named.6.unwrap(),
+            avatar_alt: self._fields.0,
+            avatar_url: self._fields.1,
+            description: self._fields.2,
+            description_facets: self._fields.3,
+            did: self._fields.4.unwrap(),
+            display_name: self._fields.5,
+            handle: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_passingreads/actor/get_profile.rs b/crates/jacquard-api/src/org_passingreads/actor/get_profile.rs
index d9de77c9..b74f3382 100644
--- a/crates/jacquard-api/src/org_passingreads/actor/get_profile.rs
+++ b/crates/jacquard-api/src/org_passingreads/actor/get_profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -87,9 +90,9 @@ pub mod get_profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetProfileBuilder<'a, S: get_profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetProfile<'a> {
@@ -103,9 +106,9 @@ impl<'a> GetProfileBuilder<'a, get_profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,11 +123,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetProfileBuilder<'a, get_profile_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,7 +140,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetProfile<'a> {
         GetProfile {
-            actor: self.__unsafe_private_named.0.unwrap(),
+            actor: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/org_passingreads/actor/list_profiles.rs b/crates/jacquard-api/src/org_passingreads/actor/list_profiles.rs
index 2065e4de..cef5362e 100644
--- a/crates/jacquard-api/src/org_passingreads/actor/list_profiles.rs
+++ b/crates/jacquard-api/src/org_passingreads/actor/list_profiles.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/org_passingreads/actor/profile.rs b/crates/jacquard-api/src/org_passingreads/actor/profile.rs
index d1e47062..bf55c1cf 100644
--- a/crates/jacquard-api/src/org_passingreads/actor/profile.rs
+++ b/crates/jacquard-api/src/org_passingreads/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -241,15 +244,15 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Vec<Facet<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -263,9 +266,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -273,12 +276,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -286,12 +289,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatarAlt` field (optional)
     pub fn avatar_alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `avatarAlt` field to an Option value (optional)
     pub fn maybe_avatar_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -299,12 +302,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -315,12 +318,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `descriptionFacets` field to an Option value (optional)
     pub fn maybe_description_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -328,12 +331,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -345,11 +348,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            avatar_alt: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            description_facets: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4,
+            avatar: self._fields.0,
+            avatar_alt: self._fields.1,
+            description: self._fields.2,
+            description_facets: self._fields.3,
+            display_name: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -362,11 +365,11 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            avatar_alt: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            description_facets: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4,
+            avatar: self._fields.0,
+            avatar_alt: self._fields.1,
+            description: self._fields.2,
+            description_facets: self._fields.3,
+            display_name: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_passingreads/book.rs b/crates/jacquard-api/src/org_passingreads/book.rs
index 441a6cf7..d1df21a3 100644
--- a/crates/jacquard-api/src/org_passingreads/book.rs
+++ b/crates/jacquard-api/src/org_passingreads/book.rs
@@ -17,7 +17,11 @@ pub mod list_book_ids;
 pub mod list_dropped_books;
 pub mod registration;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -386,99 +390,99 @@ pub mod confirmed_event_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Event;
+        type Actor;
+        type Uri;
         type Location;
         type OccurredAt;
-        type Uri;
-        type Actor;
-        type Event;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Event = Unset;
+        type Actor = Unset;
+        type Uri = Unset;
         type Location = Unset;
         type OccurredAt = Unset;
-        type Uri = Unset;
-        type Actor = Unset;
-        type Event = Unset;
     }
-    ///State transition - sets the `location` field to Set
-    pub struct SetLocation<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLocation<S> {}
-    impl<S: State> State for SetLocation<S> {
-        type Location = Set<members::location>;
-        type OccurredAt = S::OccurredAt;
-        type Uri = S::Uri;
+    ///State transition - sets the `event` field to Set
+    pub struct SetEvent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetEvent<S> {}
+    impl<S: State> State for SetEvent<S> {
+        type Event = Set<members::event>;
         type Actor = S::Actor;
-        type Event = S::Event;
-    }
-    ///State transition - sets the `occurred_at` field to Set
-    pub struct SetOccurredAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetOccurredAt<S> {}
-    impl<S: State> State for SetOccurredAt<S> {
-        type Location = S::Location;
-        type OccurredAt = Set<members::occurred_at>;
         type Uri = S::Uri;
-        type Actor = S::Actor;
-        type Event = S::Event;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
         type Location = S::Location;
         type OccurredAt = S::OccurredAt;
-        type Uri = Set<members::uri>;
-        type Actor = S::Actor;
-        type Event = S::Event;
     }
     ///State transition - sets the `actor` field to Set
     pub struct SetActor<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetActor<S> {}
     impl<S: State> State for SetActor<S> {
+        type Event = S::Event;
+        type Actor = Set<members::actor>;
+        type Uri = S::Uri;
         type Location = S::Location;
         type OccurredAt = S::OccurredAt;
-        type Uri = S::Uri;
-        type Actor = Set<members::actor>;
-        type Event = S::Event;
     }
-    ///State transition - sets the `event` field to Set
-    pub struct SetEvent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetEvent<S> {}
-    impl<S: State> State for SetEvent<S> {
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Event = S::Event;
+        type Actor = S::Actor;
+        type Uri = Set<members::uri>;
         type Location = S::Location;
         type OccurredAt = S::OccurredAt;
+    }
+    ///State transition - sets the `location` field to Set
+    pub struct SetLocation<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLocation<S> {}
+    impl<S: State> State for SetLocation<S> {
+        type Event = S::Event;
+        type Actor = S::Actor;
         type Uri = S::Uri;
+        type Location = Set<members::location>;
+        type OccurredAt = S::OccurredAt;
+    }
+    ///State transition - sets the `occurred_at` field to Set
+    pub struct SetOccurredAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetOccurredAt<S> {}
+    impl<S: State> State for SetOccurredAt<S> {
+        type Event = S::Event;
         type Actor = S::Actor;
-        type Event = Set<members::event>;
+        type Uri = S::Uri;
+        type Location = S::Location;
+        type OccurredAt = Set<members::occurred_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `event` field
+        pub struct event(());
+        ///Marker type for the `actor` field
+        pub struct actor(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
         ///Marker type for the `location` field
         pub struct location(());
         ///Marker type for the `occurred_at` field
         pub struct occurred_at(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
-        ///Marker type for the `actor` field
-        pub struct actor(());
-        ///Marker type for the `event` field
-        pub struct event(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ConfirmedEventBuilder<'a, S: confirmed_event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Actor<'a>>,
         Option<ConfirmedEventEvent<'a>>,
         Option<Hthree<'a>>,
         Option<Datetime>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ConfirmedEvent<'a> {
@@ -492,9 +496,9 @@ impl<'a> ConfirmedEventBuilder<'a, confirmed_event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ConfirmedEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -509,11 +513,11 @@ where
         mut self,
         value: impl Into<Actor<'a>>,
     ) -> ConfirmedEventBuilder<'a, confirmed_event_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ConfirmedEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -528,11 +532,11 @@ where
         mut self,
         value: impl Into<ConfirmedEventEvent<'a>>,
     ) -> ConfirmedEventBuilder<'a, confirmed_event_state::SetEvent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ConfirmedEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -547,11 +551,11 @@ where
         mut self,
         value: impl Into<Hthree<'a>>,
     ) -> ConfirmedEventBuilder<'a, confirmed_event_state::SetLocation<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ConfirmedEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -566,11 +570,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ConfirmedEventBuilder<'a, confirmed_event_state::SetOccurredAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ConfirmedEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -585,11 +589,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ConfirmedEventBuilder<'a, confirmed_event_state::SetUri<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ConfirmedEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -597,20 +601,20 @@ where
 impl<'a, S> ConfirmedEventBuilder<'a, S>
 where
     S: confirmed_event_state::State,
+    S::Event: confirmed_event_state::IsSet,
+    S::Actor: confirmed_event_state::IsSet,
+    S::Uri: confirmed_event_state::IsSet,
     S::Location: confirmed_event_state::IsSet,
     S::OccurredAt: confirmed_event_state::IsSet,
-    S::Uri: confirmed_event_state::IsSet,
-    S::Actor: confirmed_event_state::IsSet,
-    S::Event: confirmed_event_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ConfirmedEvent<'a> {
         ConfirmedEvent {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            event: self.__unsafe_private_named.1.unwrap(),
-            location: self.__unsafe_private_named.2.unwrap(),
-            occurred_at: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            actor: self._fields.0.unwrap(),
+            event: self._fields.1.unwrap(),
+            location: self._fields.2.unwrap(),
+            occurred_at: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -623,11 +627,11 @@ where
         >,
     ) -> ConfirmedEvent<'a> {
         ConfirmedEvent {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            event: self.__unsafe_private_named.1.unwrap(),
-            location: self.__unsafe_private_named.2.unwrap(),
-            occurred_at: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            actor: self._fields.0.unwrap(),
+            event: self._fields.1.unwrap(),
+            location: self._fields.2.unwrap(),
+            occurred_at: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -934,92 +938,92 @@ pub mod registration_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type OccurredAt;
         type Title;
+        type OccurredAt;
+        type Authors;
         type RegisteredBy;
         type BookId;
-        type Authors;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type OccurredAt = Unset;
         type Title = Unset;
+        type OccurredAt = Unset;
+        type Authors = Unset;
         type RegisteredBy = Unset;
         type BookId = Unset;
-        type Authors = Unset;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type Title = Set<members::title>;
+        type OccurredAt = S::OccurredAt;
+        type Authors = S::Authors;
+        type RegisteredBy = S::RegisteredBy;
+        type BookId = S::BookId;
     }
     ///State transition - sets the `occurred_at` field to Set
     pub struct SetOccurredAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetOccurredAt<S> {}
     impl<S: State> State for SetOccurredAt<S> {
-        type OccurredAt = Set<members::occurred_at>;
         type Title = S::Title;
+        type OccurredAt = Set<members::occurred_at>;
+        type Authors = S::Authors;
         type RegisteredBy = S::RegisteredBy;
         type BookId = S::BookId;
-        type Authors = S::Authors;
     }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
+    ///State transition - sets the `authors` field to Set
+    pub struct SetAuthors<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAuthors<S> {}
+    impl<S: State> State for SetAuthors<S> {
+        type Title = S::Title;
         type OccurredAt = S::OccurredAt;
-        type Title = Set<members::title>;
+        type Authors = Set<members::authors>;
         type RegisteredBy = S::RegisteredBy;
         type BookId = S::BookId;
-        type Authors = S::Authors;
     }
     ///State transition - sets the `registered_by` field to Set
     pub struct SetRegisteredBy<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRegisteredBy<S> {}
     impl<S: State> State for SetRegisteredBy<S> {
-        type OccurredAt = S::OccurredAt;
         type Title = S::Title;
+        type OccurredAt = S::OccurredAt;
+        type Authors = S::Authors;
         type RegisteredBy = Set<members::registered_by>;
         type BookId = S::BookId;
-        type Authors = S::Authors;
     }
     ///State transition - sets the `book_id` field to Set
     pub struct SetBookId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBookId<S> {}
     impl<S: State> State for SetBookId<S> {
-        type OccurredAt = S::OccurredAt;
         type Title = S::Title;
-        type RegisteredBy = S::RegisteredBy;
-        type BookId = Set<members::book_id>;
-        type Authors = S::Authors;
-    }
-    ///State transition - sets the `authors` field to Set
-    pub struct SetAuthors<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAuthors<S> {}
-    impl<S: State> State for SetAuthors<S> {
         type OccurredAt = S::OccurredAt;
-        type Title = S::Title;
+        type Authors = S::Authors;
         type RegisteredBy = S::RegisteredBy;
-        type BookId = S::BookId;
-        type Authors = Set<members::authors>;
+        type BookId = Set<members::book_id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `occurred_at` field
-        pub struct occurred_at(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `occurred_at` field
+        pub struct occurred_at(());
+        ///Marker type for the `authors` field
+        pub struct authors(());
         ///Marker type for the `registered_by` field
         pub struct registered_by(());
         ///Marker type for the `book_id` field
         pub struct book_id(());
-        ///Marker type for the `authors` field
-        pub struct authors(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RegistrationViewBuilder<'a, S: registration_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -1027,7 +1031,7 @@ pub struct RegistrationViewBuilder<'a, S: registration_view_state::State> {
         Option<Actor<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RegistrationView<'a> {
@@ -1041,9 +1045,9 @@ impl<'a> RegistrationViewBuilder<'a, registration_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RegistrationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1058,11 +1062,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> RegistrationViewBuilder<'a, registration_view_state::SetAuthors<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RegistrationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1077,11 +1081,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RegistrationViewBuilder<'a, registration_view_state::SetBookId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RegistrationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1096,11 +1100,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RegistrationViewBuilder<'a, registration_view_state::SetOccurredAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RegistrationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1108,12 +1112,12 @@ where
 impl<'a, S: registration_view_state::State> RegistrationViewBuilder<'a, S> {
     /// Set the `publicationId` field (optional)
     pub fn publication_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `publicationId` field to an Option value (optional)
     pub fn maybe_publication_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1128,11 +1132,11 @@ where
         mut self,
         value: impl Into<Actor<'a>>,
     ) -> RegistrationViewBuilder<'a, registration_view_state::SetRegisteredBy<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RegistrationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1147,11 +1151,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RegistrationViewBuilder<'a, registration_view_state::SetTitle<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         RegistrationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1159,21 +1163,21 @@ where
 impl<'a, S> RegistrationViewBuilder<'a, S>
 where
     S: registration_view_state::State,
-    S::OccurredAt: registration_view_state::IsSet,
     S::Title: registration_view_state::IsSet,
+    S::OccurredAt: registration_view_state::IsSet,
+    S::Authors: registration_view_state::IsSet,
     S::RegisteredBy: registration_view_state::IsSet,
     S::BookId: registration_view_state::IsSet,
-    S::Authors: registration_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RegistrationView<'a> {
         RegistrationView {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            book_id: self.__unsafe_private_named.1.unwrap(),
-            occurred_at: self.__unsafe_private_named.2.unwrap(),
-            publication_id: self.__unsafe_private_named.3,
-            registered_by: self.__unsafe_private_named.4.unwrap(),
-            title: self.__unsafe_private_named.5.unwrap(),
+            authors: self._fields.0.unwrap(),
+            book_id: self._fields.1.unwrap(),
+            occurred_at: self._fields.2.unwrap(),
+            publication_id: self._fields.3,
+            registered_by: self._fields.4.unwrap(),
+            title: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1186,12 +1190,12 @@ where
         >,
     ) -> RegistrationView<'a> {
         RegistrationView {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            book_id: self.__unsafe_private_named.1.unwrap(),
-            occurred_at: self.__unsafe_private_named.2.unwrap(),
-            publication_id: self.__unsafe_private_named.3,
-            registered_by: self.__unsafe_private_named.4.unwrap(),
-            title: self.__unsafe_private_named.5.unwrap(),
+            authors: self._fields.0.unwrap(),
+            book_id: self._fields.1.unwrap(),
+            occurred_at: self._fields.2.unwrap(),
+            publication_id: self._fields.3,
+            registered_by: self._fields.4.unwrap(),
+            title: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1207,83 +1211,83 @@ pub mod stateful_book_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
-        type Registration;
         type State;
+        type Registration;
         type CurrentHolder;
+        type Uri;
         type Cid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
-        type Registration = Unset;
         type State = Unset;
+        type Registration = Unset;
         type CurrentHolder = Unset;
+        type Uri = Unset;
         type Cid = Unset;
     }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
+    ///State transition - sets the `state` field to Set
+    pub struct SetState<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetState<S> {}
+    impl<S: State> State for SetState<S> {
+        type State = Set<members::state>;
         type Registration = S::Registration;
-        type State = S::State;
         type CurrentHolder = S::CurrentHolder;
+        type Uri = S::Uri;
         type Cid = S::Cid;
     }
     ///State transition - sets the `registration` field to Set
     pub struct SetRegistration<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRegistration<S> {}
     impl<S: State> State for SetRegistration<S> {
-        type Uri = S::Uri;
-        type Registration = Set<members::registration>;
         type State = S::State;
+        type Registration = Set<members::registration>;
         type CurrentHolder = S::CurrentHolder;
-        type Cid = S::Cid;
-    }
-    ///State transition - sets the `state` field to Set
-    pub struct SetState<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetState<S> {}
-    impl<S: State> State for SetState<S> {
         type Uri = S::Uri;
-        type Registration = S::Registration;
-        type State = Set<members::state>;
-        type CurrentHolder = S::CurrentHolder;
         type Cid = S::Cid;
     }
     ///State transition - sets the `current_holder` field to Set
     pub struct SetCurrentHolder<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCurrentHolder<S> {}
     impl<S: State> State for SetCurrentHolder<S> {
-        type Uri = S::Uri;
-        type Registration = S::Registration;
         type State = S::State;
+        type Registration = S::Registration;
         type CurrentHolder = Set<members::current_holder>;
+        type Uri = S::Uri;
+        type Cid = S::Cid;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type State = S::State;
+        type Registration = S::Registration;
+        type CurrentHolder = S::CurrentHolder;
+        type Uri = Set<members::uri>;
         type Cid = S::Cid;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type Uri = S::Uri;
-        type Registration = S::Registration;
         type State = S::State;
+        type Registration = S::Registration;
         type CurrentHolder = S::CurrentHolder;
+        type Uri = S::Uri;
         type Cid = Set<members::cid>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
-        ///Marker type for the `registration` field
-        pub struct registration(());
         ///Marker type for the `state` field
         pub struct state(());
+        ///Marker type for the `registration` field
+        pub struct registration(());
         ///Marker type for the `current_holder` field
         pub struct current_holder(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
         ///Marker type for the `cid` field
         pub struct cid(());
     }
@@ -1291,8 +1295,8 @@ pub mod stateful_book_state {
 
 /// Builder for constructing an instance of this type
 pub struct StatefulBookBuilder<'a, S: stateful_book_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AspectRatio<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
@@ -1303,7 +1307,7 @@ pub struct StatefulBookBuilder<'a, S: stateful_book_state::State> {
         Option<StatefulBookState<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> StatefulBook<'a> {
@@ -1317,19 +1321,9 @@ impl<'a> StatefulBookBuilder<'a, stateful_book_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StatefulBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1337,12 +1331,12 @@ impl<'a> StatefulBookBuilder<'a, stateful_book_state::Empty> {
 impl<'a, S: stateful_book_state::State> StatefulBookBuilder<'a, S> {
     /// Set the `aspectRatio` field (optional)
     pub fn aspect_ratio(mut self, value: impl Into<Option<AspectRatio<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
     pub fn maybe_aspect_ratio(mut self, value: Option<AspectRatio<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1357,11 +1351,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> StatefulBookBuilder<'a, stateful_book_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StatefulBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1369,12 +1363,12 @@ where
 impl<'a, S: stateful_book_state::State> StatefulBookBuilder<'a, S> {
     /// Set the `coverUrl` field (optional)
     pub fn cover_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `coverUrl` field to an Option value (optional)
     pub fn maybe_cover_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1389,11 +1383,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> StatefulBookBuilder<'a, stateful_book_state::SetCurrentHolder<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         StatefulBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1401,12 +1395,12 @@ where
 impl<'a, S: stateful_book_state::State> StatefulBookBuilder<'a, S> {
     /// Set the `currentLocation` field (optional)
     pub fn current_location(mut self, value: impl Into<Option<Hthree<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `currentLocation` field to an Option value (optional)
     pub fn maybe_current_location(mut self, value: Option<Hthree<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1417,12 +1411,12 @@ impl<'a, S: stateful_book_state::State> StatefulBookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<book::ConfirmedEvent<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `events` field to an Option value (optional)
     pub fn maybe_events(mut self, value: Option<Vec<book::ConfirmedEvent<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1437,11 +1431,11 @@ where
         mut self,
         value: impl Into<book::RegistrationView<'a>>,
     ) -> StatefulBookBuilder<'a, stateful_book_state::SetRegistration<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         StatefulBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1456,11 +1450,11 @@ where
         mut self,
         value: impl Into<StatefulBookState<'a>>,
     ) -> StatefulBookBuilder<'a, stateful_book_state::SetState<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         StatefulBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1475,11 +1469,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> StatefulBookBuilder<'a, stateful_book_state::SetUri<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         StatefulBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1487,24 +1481,24 @@ where
 impl<'a, S> StatefulBookBuilder<'a, S>
 where
     S: stateful_book_state::State,
-    S::Uri: stateful_book_state::IsSet,
-    S::Registration: stateful_book_state::IsSet,
     S::State: stateful_book_state::IsSet,
+    S::Registration: stateful_book_state::IsSet,
     S::CurrentHolder: stateful_book_state::IsSet,
+    S::Uri: stateful_book_state::IsSet,
     S::Cid: stateful_book_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> StatefulBook<'a> {
         StatefulBook {
-            aspect_ratio: self.__unsafe_private_named.0,
-            cid: self.__unsafe_private_named.1.unwrap(),
-            cover_url: self.__unsafe_private_named.2,
-            current_holder: self.__unsafe_private_named.3.unwrap(),
-            current_location: self.__unsafe_private_named.4,
-            events: self.__unsafe_private_named.5,
-            registration: self.__unsafe_private_named.6.unwrap(),
-            state: self.__unsafe_private_named.7.unwrap(),
-            uri: self.__unsafe_private_named.8.unwrap(),
+            aspect_ratio: self._fields.0,
+            cid: self._fields.1.unwrap(),
+            cover_url: self._fields.2,
+            current_holder: self._fields.3.unwrap(),
+            current_location: self._fields.4,
+            events: self._fields.5,
+            registration: self._fields.6.unwrap(),
+            state: self._fields.7.unwrap(),
+            uri: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1517,15 +1511,15 @@ where
         >,
     ) -> StatefulBook<'a> {
         StatefulBook {
-            aspect_ratio: self.__unsafe_private_named.0,
-            cid: self.__unsafe_private_named.1.unwrap(),
-            cover_url: self.__unsafe_private_named.2,
-            current_holder: self.__unsafe_private_named.3.unwrap(),
-            current_location: self.__unsafe_private_named.4,
-            events: self.__unsafe_private_named.5,
-            registration: self.__unsafe_private_named.6.unwrap(),
-            state: self.__unsafe_private_named.7.unwrap(),
-            uri: self.__unsafe_private_named.8.unwrap(),
+            aspect_ratio: self._fields.0,
+            cid: self._fields.1.unwrap(),
+            cover_url: self._fields.2,
+            current_holder: self._fields.3.unwrap(),
+            current_location: self._fields.4,
+            events: self._fields.5,
+            registration: self._fields.6.unwrap(),
+            state: self._fields.7.unwrap(),
+            uri: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_passingreads/book/event.rs b/crates/jacquard-api/src/org_passingreads/book/event.rs
index 26990c8c..6a0dacff 100644
--- a/crates/jacquard-api/src/org_passingreads/book/event.rs
+++ b/crates/jacquard-api/src/org_passingreads/book/event.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -277,103 +280,103 @@ pub mod event_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Did;
         type OccurredAt;
+        type Did;
         type Location;
-        type Book;
         type BookPub;
+        type Book;
         type BookSig;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Did = Unset;
         type OccurredAt = Unset;
+        type Did = Unset;
         type Location = Unset;
-        type Book = Unset;
         type BookPub = Unset;
+        type Book = Unset;
         type BookSig = Unset;
     }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Did = Set<members::did>;
-        type OccurredAt = S::OccurredAt;
-        type Location = S::Location;
-        type Book = S::Book;
-        type BookPub = S::BookPub;
-        type BookSig = S::BookSig;
-    }
     ///State transition - sets the `occurred_at` field to Set
     pub struct SetOccurredAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetOccurredAt<S> {}
     impl<S: State> State for SetOccurredAt<S> {
-        type Did = S::Did;
         type OccurredAt = Set<members::occurred_at>;
+        type Did = S::Did;
         type Location = S::Location;
+        type BookPub = S::BookPub;
         type Book = S::Book;
+        type BookSig = S::BookSig;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type OccurredAt = S::OccurredAt;
+        type Did = Set<members::did>;
+        type Location = S::Location;
         type BookPub = S::BookPub;
+        type Book = S::Book;
         type BookSig = S::BookSig;
     }
     ///State transition - sets the `location` field to Set
     pub struct SetLocation<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLocation<S> {}
     impl<S: State> State for SetLocation<S> {
-        type Did = S::Did;
         type OccurredAt = S::OccurredAt;
-        type Location = Set<members::location>;
-        type Book = S::Book;
-        type BookPub = S::BookPub;
-        type BookSig = S::BookSig;
-    }
-    ///State transition - sets the `book` field to Set
-    pub struct SetBook<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBook<S> {}
-    impl<S: State> State for SetBook<S> {
         type Did = S::Did;
-        type OccurredAt = S::OccurredAt;
-        type Location = S::Location;
-        type Book = Set<members::book>;
+        type Location = Set<members::location>;
         type BookPub = S::BookPub;
+        type Book = S::Book;
         type BookSig = S::BookSig;
     }
     ///State transition - sets the `book_pub` field to Set
     pub struct SetBookPub<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBookPub<S> {}
     impl<S: State> State for SetBookPub<S> {
-        type Did = S::Did;
         type OccurredAt = S::OccurredAt;
+        type Did = S::Did;
         type Location = S::Location;
-        type Book = S::Book;
         type BookPub = Set<members::book_pub>;
+        type Book = S::Book;
+        type BookSig = S::BookSig;
+    }
+    ///State transition - sets the `book` field to Set
+    pub struct SetBook<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBook<S> {}
+    impl<S: State> State for SetBook<S> {
+        type OccurredAt = S::OccurredAt;
+        type Did = S::Did;
+        type Location = S::Location;
+        type BookPub = S::BookPub;
+        type Book = Set<members::book>;
         type BookSig = S::BookSig;
     }
     ///State transition - sets the `book_sig` field to Set
     pub struct SetBookSig<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBookSig<S> {}
     impl<S: State> State for SetBookSig<S> {
-        type Did = S::Did;
         type OccurredAt = S::OccurredAt;
+        type Did = S::Did;
         type Location = S::Location;
-        type Book = S::Book;
         type BookPub = S::BookPub;
+        type Book = S::Book;
         type BookSig = Set<members::book_sig>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `occurred_at` field
         pub struct occurred_at(());
+        ///Marker type for the `did` field
+        pub struct did(());
         ///Marker type for the `location` field
         pub struct location(());
-        ///Marker type for the `book` field
-        pub struct book(());
         ///Marker type for the `book_pub` field
         pub struct book_pub(());
+        ///Marker type for the `book` field
+        pub struct book(());
         ///Marker type for the `book_sig` field
         pub struct book_sig(());
     }
@@ -381,8 +384,8 @@ pub mod event_state {
 
 /// Builder for constructing an instance of this type
 pub struct EventBuilder<'a, S: event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<StrongRef<'a>>,
         Option<Bytes>,
         Option<Bytes>,
@@ -391,7 +394,7 @@ pub struct EventBuilder<'a, S: event_state::State> {
         Option<EventLocation<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Event<'a> {
@@ -405,9 +408,9 @@ impl<'a> EventBuilder<'a, event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -422,11 +425,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> EventBuilder<'a, event_state::SetBook<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -441,11 +444,11 @@ where
         mut self,
         value: impl Into<Bytes>,
     ) -> EventBuilder<'a, event_state::SetBookPub<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -460,11 +463,11 @@ where
         mut self,
         value: impl Into<Bytes>,
     ) -> EventBuilder<'a, event_state::SetBookSig<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -479,11 +482,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> EventBuilder<'a, event_state::SetDid<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -491,12 +494,12 @@ where
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `event` field (optional)
     pub fn event(mut self, value: impl Into<Option<EventEvent<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `event` field to an Option value (optional)
     pub fn maybe_event(mut self, value: Option<EventEvent<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -511,11 +514,11 @@ where
         mut self,
         value: impl Into<EventLocation<'a>>,
     ) -> EventBuilder<'a, event_state::SetLocation<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -530,11 +533,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EventBuilder<'a, event_state::SetOccurredAt<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -542,23 +545,23 @@ where
 impl<'a, S> EventBuilder<'a, S>
 where
     S: event_state::State,
-    S::Did: event_state::IsSet,
     S::OccurredAt: event_state::IsSet,
+    S::Did: event_state::IsSet,
     S::Location: event_state::IsSet,
-    S::Book: event_state::IsSet,
     S::BookPub: event_state::IsSet,
+    S::Book: event_state::IsSet,
     S::BookSig: event_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Event<'a> {
         Event {
-            book: self.__unsafe_private_named.0.unwrap(),
-            book_pub: self.__unsafe_private_named.1.unwrap(),
-            book_sig: self.__unsafe_private_named.2.unwrap(),
-            did: self.__unsafe_private_named.3.unwrap(),
-            event: self.__unsafe_private_named.4,
-            location: self.__unsafe_private_named.5.unwrap(),
-            occurred_at: self.__unsafe_private_named.6.unwrap(),
+            book: self._fields.0.unwrap(),
+            book_pub: self._fields.1.unwrap(),
+            book_sig: self._fields.2.unwrap(),
+            did: self._fields.3.unwrap(),
+            event: self._fields.4,
+            location: self._fields.5.unwrap(),
+            occurred_at: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -571,13 +574,13 @@ where
         >,
     ) -> Event<'a> {
         Event {
-            book: self.__unsafe_private_named.0.unwrap(),
-            book_pub: self.__unsafe_private_named.1.unwrap(),
-            book_sig: self.__unsafe_private_named.2.unwrap(),
-            did: self.__unsafe_private_named.3.unwrap(),
-            event: self.__unsafe_private_named.4,
-            location: self.__unsafe_private_named.5.unwrap(),
-            occurred_at: self.__unsafe_private_named.6.unwrap(),
+            book: self._fields.0.unwrap(),
+            book_pub: self._fields.1.unwrap(),
+            book_sig: self._fields.2.unwrap(),
+            did: self._fields.3.unwrap(),
+            event: self._fields.4,
+            location: self._fields.5.unwrap(),
+            occurred_at: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_passingreads/book/get_book.rs b/crates/jacquard-api/src/org_passingreads/book/get_book.rs
index 9a16cd59..9239a3a0 100644
--- a/crates/jacquard-api/src/org_passingreads/book/get_book.rs
+++ b/crates/jacquard-api/src/org_passingreads/book/get_book.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -87,9 +90,9 @@ pub mod get_book_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetBookBuilder<'a, S: get_book_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetBook<'a> {
@@ -103,9 +106,9 @@ impl<'a> GetBookBuilder<'a, get_book_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,11 +123,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetBookBuilder<'a, get_book_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetBookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,7 +140,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetBook<'a> {
         GetBook {
-            id: self.__unsafe_private_named.0.unwrap(),
+            id: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/org_passingreads/book/get_books.rs b/crates/jacquard-api/src/org_passingreads/book/get_books.rs
index 410e5f27..19bd1fa0 100644
--- a/crates/jacquard-api/src/org_passingreads/book/get_books.rs
+++ b/crates/jacquard-api/src/org_passingreads/book/get_books.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -87,9 +90,9 @@ pub mod get_books_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetBooksBuilder<'a, S: get_books_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetBooks<'a> {
@@ -103,9 +106,9 @@ impl<'a> GetBooksBuilder<'a, get_books_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetBooksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,11 +123,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetBooksBuilder<'a, get_books_state::SetIds<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetBooksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,7 +140,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetBooks<'a> {
         GetBooks {
-            ids: self.__unsafe_private_named.0.unwrap(),
+            ids: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/org_passingreads/book/get_library.rs b/crates/jacquard-api/src/org_passingreads/book/get_library.rs
index ff18ab85..846274d6 100644
--- a/crates/jacquard-api/src/org_passingreads/book/get_library.rs
+++ b/crates/jacquard-api/src/org_passingreads/book/get_library.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_library_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetLibraryBuilder<'a, S: get_library_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetLibrary<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetLibraryBuilder<'a, get_library_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetLibraryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetLibraryBuilder<'a, get_library_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetLibraryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetLibrary<'a> {
         GetLibrary {
-            actor: self.__unsafe_private_named.0.unwrap(),
+            actor: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/org_passingreads/book/get_location_books.rs b/crates/jacquard-api/src/org_passingreads/book/get_location_books.rs
index 7529e001..cf9c65df 100644
--- a/crates/jacquard-api/src/org_passingreads/book/get_location_books.rs
+++ b/crates/jacquard-api/src/org_passingreads/book/get_location_books.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -90,9 +93,9 @@ pub mod get_location_books_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetLocationBooksBuilder<'a, S: get_location_books_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetLocationBooks<'a> {
@@ -106,9 +109,9 @@ impl<'a> GetLocationBooksBuilder<'a, get_location_books_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetLocationBooksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -123,11 +126,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetLocationBooksBuilder<'a, get_location_books_state::SetH3<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetLocationBooksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -140,7 +143,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetLocationBooks<'a> {
         GetLocationBooks {
-            h3: self.__unsafe_private_named.0.unwrap(),
+            h3: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/org_passingreads/book/list_book_ids.rs b/crates/jacquard-api/src/org_passingreads/book/list_book_ids.rs
index bcea7407..a3bf54dd 100644
--- a/crates/jacquard-api/src/org_passingreads/book/list_book_ids.rs
+++ b/crates/jacquard-api/src/org_passingreads/book/list_book_ids.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/org_passingreads/book/list_dropped_books.rs b/crates/jacquard-api/src/org_passingreads/book/list_dropped_books.rs
index 9cacbcbd..bf94a122 100644
--- a/crates/jacquard-api/src/org_passingreads/book/list_dropped_books.rs
+++ b/crates/jacquard-api/src/org_passingreads/book/list_dropped_books.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/org_passingreads/book/registration.rs b/crates/jacquard-api/src/org_passingreads/book/registration.rs
index bba7b67e..9de0bcaf 100644
--- a/crates/jacquard-api/src/org_passingreads/book/registration.rs
+++ b/crates/jacquard-api/src/org_passingreads/book/registration.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -200,158 +203,158 @@ pub mod registration_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type OccurredAt;
-        type Title;
         type BookPub;
-        type BookSig;
         type Did;
-        type PublicationId;
         type BookId;
         type Authors;
+        type Title;
+        type PublicationId;
+        type OccurredAt;
+        type BookSig;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type OccurredAt = Unset;
-        type Title = Unset;
         type BookPub = Unset;
-        type BookSig = Unset;
         type Did = Unset;
-        type PublicationId = Unset;
         type BookId = Unset;
         type Authors = Unset;
-    }
-    ///State transition - sets the `occurred_at` field to Set
-    pub struct SetOccurredAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetOccurredAt<S> {}
-    impl<S: State> State for SetOccurredAt<S> {
-        type OccurredAt = Set<members::occurred_at>;
-        type Title = S::Title;
-        type BookPub = S::BookPub;
-        type BookSig = S::BookSig;
-        type Did = S::Did;
-        type PublicationId = S::PublicationId;
-        type BookId = S::BookId;
-        type Authors = S::Authors;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type OccurredAt = S::OccurredAt;
-        type Title = Set<members::title>;
-        type BookPub = S::BookPub;
-        type BookSig = S::BookSig;
-        type Did = S::Did;
-        type PublicationId = S::PublicationId;
-        type BookId = S::BookId;
-        type Authors = S::Authors;
+        type Title = Unset;
+        type PublicationId = Unset;
+        type OccurredAt = Unset;
+        type BookSig = Unset;
     }
     ///State transition - sets the `book_pub` field to Set
     pub struct SetBookPub<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBookPub<S> {}
     impl<S: State> State for SetBookPub<S> {
-        type OccurredAt = S::OccurredAt;
-        type Title = S::Title;
         type BookPub = Set<members::book_pub>;
-        type BookSig = S::BookSig;
         type Did = S::Did;
-        type PublicationId = S::PublicationId;
         type BookId = S::BookId;
         type Authors = S::Authors;
-    }
-    ///State transition - sets the `book_sig` field to Set
-    pub struct SetBookSig<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBookSig<S> {}
-    impl<S: State> State for SetBookSig<S> {
-        type OccurredAt = S::OccurredAt;
         type Title = S::Title;
-        type BookPub = S::BookPub;
-        type BookSig = Set<members::book_sig>;
-        type Did = S::Did;
         type PublicationId = S::PublicationId;
-        type BookId = S::BookId;
-        type Authors = S::Authors;
+        type OccurredAt = S::OccurredAt;
+        type BookSig = S::BookSig;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type OccurredAt = S::OccurredAt;
-        type Title = S::Title;
         type BookPub = S::BookPub;
-        type BookSig = S::BookSig;
         type Did = Set<members::did>;
-        type PublicationId = S::PublicationId;
         type BookId = S::BookId;
         type Authors = S::Authors;
-    }
-    ///State transition - sets the `publication_id` field to Set
-    pub struct SetPublicationId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPublicationId<S> {}
-    impl<S: State> State for SetPublicationId<S> {
-        type OccurredAt = S::OccurredAt;
         type Title = S::Title;
-        type BookPub = S::BookPub;
+        type PublicationId = S::PublicationId;
+        type OccurredAt = S::OccurredAt;
         type BookSig = S::BookSig;
-        type Did = S::Did;
-        type PublicationId = Set<members::publication_id>;
-        type BookId = S::BookId;
-        type Authors = S::Authors;
     }
     ///State transition - sets the `book_id` field to Set
     pub struct SetBookId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBookId<S> {}
     impl<S: State> State for SetBookId<S> {
-        type OccurredAt = S::OccurredAt;
-        type Title = S::Title;
         type BookPub = S::BookPub;
-        type BookSig = S::BookSig;
         type Did = S::Did;
-        type PublicationId = S::PublicationId;
         type BookId = Set<members::book_id>;
         type Authors = S::Authors;
+        type Title = S::Title;
+        type PublicationId = S::PublicationId;
+        type OccurredAt = S::OccurredAt;
+        type BookSig = S::BookSig;
     }
     ///State transition - sets the `authors` field to Set
     pub struct SetAuthors<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthors<S> {}
     impl<S: State> State for SetAuthors<S> {
-        type OccurredAt = S::OccurredAt;
+        type BookPub = S::BookPub;
+        type Did = S::Did;
+        type BookId = S::BookId;
+        type Authors = Set<members::authors>;
         type Title = S::Title;
+        type PublicationId = S::PublicationId;
+        type OccurredAt = S::OccurredAt;
+        type BookSig = S::BookSig;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type BookPub = S::BookPub;
+        type Did = S::Did;
+        type BookId = S::BookId;
+        type Authors = S::Authors;
+        type Title = Set<members::title>;
+        type PublicationId = S::PublicationId;
+        type OccurredAt = S::OccurredAt;
+        type BookSig = S::BookSig;
+    }
+    ///State transition - sets the `publication_id` field to Set
+    pub struct SetPublicationId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPublicationId<S> {}
+    impl<S: State> State for SetPublicationId<S> {
         type BookPub = S::BookPub;
+        type Did = S::Did;
+        type BookId = S::BookId;
+        type Authors = S::Authors;
+        type Title = S::Title;
+        type PublicationId = Set<members::publication_id>;
+        type OccurredAt = S::OccurredAt;
         type BookSig = S::BookSig;
+    }
+    ///State transition - sets the `occurred_at` field to Set
+    pub struct SetOccurredAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetOccurredAt<S> {}
+    impl<S: State> State for SetOccurredAt<S> {
+        type BookPub = S::BookPub;
         type Did = S::Did;
+        type BookId = S::BookId;
+        type Authors = S::Authors;
+        type Title = S::Title;
         type PublicationId = S::PublicationId;
+        type OccurredAt = Set<members::occurred_at>;
+        type BookSig = S::BookSig;
+    }
+    ///State transition - sets the `book_sig` field to Set
+    pub struct SetBookSig<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBookSig<S> {}
+    impl<S: State> State for SetBookSig<S> {
+        type BookPub = S::BookPub;
+        type Did = S::Did;
         type BookId = S::BookId;
-        type Authors = Set<members::authors>;
+        type Authors = S::Authors;
+        type Title = S::Title;
+        type PublicationId = S::PublicationId;
+        type OccurredAt = S::OccurredAt;
+        type BookSig = Set<members::book_sig>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `occurred_at` field
-        pub struct occurred_at(());
-        ///Marker type for the `title` field
-        pub struct title(());
         ///Marker type for the `book_pub` field
         pub struct book_pub(());
-        ///Marker type for the `book_sig` field
-        pub struct book_sig(());
         ///Marker type for the `did` field
         pub struct did(());
-        ///Marker type for the `publication_id` field
-        pub struct publication_id(());
         ///Marker type for the `book_id` field
         pub struct book_id(());
         ///Marker type for the `authors` field
         pub struct authors(());
+        ///Marker type for the `title` field
+        pub struct title(());
+        ///Marker type for the `publication_id` field
+        pub struct publication_id(());
+        ///Marker type for the `occurred_at` field
+        pub struct occurred_at(());
+        ///Marker type for the `book_sig` field
+        pub struct book_sig(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RegistrationBuilder<'a, S: registration_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AspectRatio<'a>>,
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
@@ -363,7 +366,7 @@ pub struct RegistrationBuilder<'a, S: registration_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Registration<'a> {
@@ -377,20 +380,9 @@ impl<'a> RegistrationBuilder<'a, registration_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RegistrationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -398,12 +390,12 @@ impl<'a> RegistrationBuilder<'a, registration_state::Empty> {
 impl<'a, S: registration_state::State> RegistrationBuilder<'a, S> {
     /// Set the `aspectRatio` field (optional)
     pub fn aspect_ratio(mut self, value: impl Into<Option<AspectRatio<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
     pub fn maybe_aspect_ratio(mut self, value: Option<AspectRatio<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -418,11 +410,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> RegistrationBuilder<'a, registration_state::SetAuthors<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RegistrationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -437,11 +429,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RegistrationBuilder<'a, registration_state::SetBookId<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RegistrationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -456,11 +448,11 @@ where
         mut self,
         value: impl Into<Bytes>,
     ) -> RegistrationBuilder<'a, registration_state::SetBookPub<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RegistrationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -475,11 +467,11 @@ where
         mut self,
         value: impl Into<Bytes>,
     ) -> RegistrationBuilder<'a, registration_state::SetBookSig<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RegistrationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -487,12 +479,12 @@ where
 impl<'a, S: registration_state::State> RegistrationBuilder<'a, S> {
     /// Set the `cover` field (optional)
     pub fn cover(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `cover` field to an Option value (optional)
     pub fn maybe_cover(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -507,11 +499,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> RegistrationBuilder<'a, registration_state::SetDid<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         RegistrationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -526,11 +518,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RegistrationBuilder<'a, registration_state::SetOccurredAt<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         RegistrationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -545,11 +537,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RegistrationBuilder<'a, registration_state::SetPublicationId<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         RegistrationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -564,11 +556,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RegistrationBuilder<'a, registration_state::SetTitle<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         RegistrationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -576,28 +568,28 @@ where
 impl<'a, S> RegistrationBuilder<'a, S>
 where
     S: registration_state::State,
-    S::OccurredAt: registration_state::IsSet,
-    S::Title: registration_state::IsSet,
     S::BookPub: registration_state::IsSet,
-    S::BookSig: registration_state::IsSet,
     S::Did: registration_state::IsSet,
-    S::PublicationId: registration_state::IsSet,
     S::BookId: registration_state::IsSet,
     S::Authors: registration_state::IsSet,
+    S::Title: registration_state::IsSet,
+    S::PublicationId: registration_state::IsSet,
+    S::OccurredAt: registration_state::IsSet,
+    S::BookSig: registration_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Registration<'a> {
         Registration {
-            aspect_ratio: self.__unsafe_private_named.0,
-            authors: self.__unsafe_private_named.1.unwrap(),
-            book_id: self.__unsafe_private_named.2.unwrap(),
-            book_pub: self.__unsafe_private_named.3.unwrap(),
-            book_sig: self.__unsafe_private_named.4.unwrap(),
-            cover: self.__unsafe_private_named.5,
-            did: self.__unsafe_private_named.6.unwrap(),
-            occurred_at: self.__unsafe_private_named.7.unwrap(),
-            publication_id: self.__unsafe_private_named.8.unwrap(),
-            title: self.__unsafe_private_named.9.unwrap(),
+            aspect_ratio: self._fields.0,
+            authors: self._fields.1.unwrap(),
+            book_id: self._fields.2.unwrap(),
+            book_pub: self._fields.3.unwrap(),
+            book_sig: self._fields.4.unwrap(),
+            cover: self._fields.5,
+            did: self._fields.6.unwrap(),
+            occurred_at: self._fields.7.unwrap(),
+            publication_id: self._fields.8.unwrap(),
+            title: self._fields.9.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -610,16 +602,16 @@ where
         >,
     ) -> Registration<'a> {
         Registration {
-            aspect_ratio: self.__unsafe_private_named.0,
-            authors: self.__unsafe_private_named.1.unwrap(),
-            book_id: self.__unsafe_private_named.2.unwrap(),
-            book_pub: self.__unsafe_private_named.3.unwrap(),
-            book_sig: self.__unsafe_private_named.4.unwrap(),
-            cover: self.__unsafe_private_named.5,
-            did: self.__unsafe_private_named.6.unwrap(),
-            occurred_at: self.__unsafe_private_named.7.unwrap(),
-            publication_id: self.__unsafe_private_named.8.unwrap(),
-            title: self.__unsafe_private_named.9.unwrap(),
+            aspect_ratio: self._fields.0,
+            authors: self._fields.1.unwrap(),
+            book_id: self._fields.2.unwrap(),
+            book_pub: self._fields.3.unwrap(),
+            book_sig: self._fields.4.unwrap(),
+            cover: self._fields.5,
+            did: self._fields.6.unwrap(),
+            occurred_at: self._fields.7.unwrap(),
+            publication_id: self._fields.8.unwrap(),
+            title: self._fields.9.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_robocracy/demo/fungus.rs b/crates/jacquard-api/src/org_robocracy/demo/fungus.rs
index b4ea0c6b..f8139c53 100644
--- a/crates/jacquard-api/src/org_robocracy/demo/fungus.rs
+++ b/crates/jacquard-api/src/org_robocracy/demo/fungus.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -182,9 +185,9 @@ pub mod fungus_state {
 
 /// Builder for constructing an instance of this type
 pub struct FungusBuilder<'a, S: fungus_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<bool>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<bool>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Fungus<'a> {
@@ -198,9 +201,9 @@ impl<'a> FungusBuilder<'a, fungus_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FungusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> FungusBuilder<'a, fungus_state::SetCommonName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FungusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -227,12 +230,12 @@ where
 impl<'a, S: fungus_state::State> FungusBuilder<'a, S> {
     /// Set the `edible` field (optional)
     pub fn edible(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `edible` field to an Option value (optional)
     pub fn maybe_edible(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -240,12 +243,12 @@ impl<'a, S: fungus_state::State> FungusBuilder<'a, S> {
 impl<'a, S: fungus_state::State> FungusBuilder<'a, S> {
     /// Set the `species` field (optional)
     pub fn species(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `species` field to an Option value (optional)
     pub fn maybe_species(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -258,9 +261,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Fungus<'a> {
         Fungus {
-            common_name: self.__unsafe_private_named.0.unwrap(),
-            edible: self.__unsafe_private_named.1,
-            species: self.__unsafe_private_named.2,
+            common_name: self._fields.0.unwrap(),
+            edible: self._fields.1,
+            species: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -273,9 +276,9 @@ where
         >,
     ) -> Fungus<'a> {
         Fungus {
-            common_name: self.__unsafe_private_named.0.unwrap(),
-            edible: self.__unsafe_private_named.1,
-            species: self.__unsafe_private_named.2,
+            common_name: self._fields.0.unwrap(),
+            edible: self._fields.1,
+            species: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_robocracy/demo/mushies.rs b/crates/jacquard-api/src/org_robocracy/demo/mushies.rs
index c68adfc4..95c81c8e 100644
--- a/crates/jacquard-api/src/org_robocracy/demo/mushies.rs
+++ b/crates/jacquard-api/src/org_robocracy/demo/mushies.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -182,9 +185,9 @@ pub mod mushies_state {
 
 /// Builder for constructing an instance of this type
 pub struct MushiesBuilder<'a, S: mushies_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<bool>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<bool>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Mushies<'a> {
@@ -198,9 +201,9 @@ impl<'a> MushiesBuilder<'a, mushies_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MushiesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MushiesBuilder<'a, mushies_state::SetCommonName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MushiesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -227,12 +230,12 @@ where
 impl<'a, S: mushies_state::State> MushiesBuilder<'a, S> {
     /// Set the `edible` field (optional)
     pub fn edible(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `edible` field to an Option value (optional)
     pub fn maybe_edible(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -240,12 +243,12 @@ impl<'a, S: mushies_state::State> MushiesBuilder<'a, S> {
 impl<'a, S: mushies_state::State> MushiesBuilder<'a, S> {
     /// Set the `species` field (optional)
     pub fn species(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `species` field to an Option value (optional)
     pub fn maybe_species(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -258,9 +261,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Mushies<'a> {
         Mushies {
-            common_name: self.__unsafe_private_named.0.unwrap(),
-            edible: self.__unsafe_private_named.1,
-            species: self.__unsafe_private_named.2,
+            common_name: self._fields.0.unwrap(),
+            edible: self._fields.1,
+            species: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -273,9 +276,9 @@ where
         >,
     ) -> Mushies<'a> {
         Mushies {
-            common_name: self.__unsafe_private_named.0.unwrap(),
-            edible: self.__unsafe_private_named.1,
-            species: self.__unsafe_private_named.2,
+            common_name: self._fields.0.unwrap(),
+            edible: self._fields.1,
+            species: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_simocracy.rs b/crates/jacquard-api/src/org_simocracy.rs
index 146c0327..05606552 100644
--- a/crates/jacquard-api/src/org_simocracy.rs
+++ b/crates/jacquard-api/src/org_simocracy.rs
@@ -14,7 +14,11 @@ pub mod skill;
 pub mod style;
 pub mod vote;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -93,9 +97,9 @@ pub mod sprite_settings_state {
 
 /// Builder for constructing an instance of this type
 pub struct SpriteSettingsBuilder<'a, S: sprite_settings_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Data<'a>>, Option<Data<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Data<'a>>, Option<Data<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SpriteSettings<'a> {
@@ -109,9 +113,9 @@ impl<'a> SpriteSettingsBuilder<'a, sprite_settings_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SpriteSettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,12 +123,12 @@ impl<'a> SpriteSettingsBuilder<'a, sprite_settings_state::Empty> {
 impl<'a, S: sprite_settings_state::State> SpriteSettingsBuilder<'a, S> {
     /// Set the `currentAnimDirection` field (optional)
     pub fn current_anim_direction(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `currentAnimDirection` field to an Option value (optional)
     pub fn maybe_current_anim_direction(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -132,12 +136,12 @@ impl<'a, S: sprite_settings_state::State> SpriteSettingsBuilder<'a, S> {
 impl<'a, S: sprite_settings_state::State> SpriteSettingsBuilder<'a, S> {
     /// Set the `partColorSettings` field (optional)
     pub fn part_color_settings(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `partColorSettings` field to an Option value (optional)
     pub fn maybe_part_color_settings(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -152,11 +156,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> SpriteSettingsBuilder<'a, sprite_settings_state::SetSelectedOptions<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SpriteSettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -169,9 +173,9 @@ where
     /// Build the final struct
     pub fn build(self) -> SpriteSettings<'a> {
         SpriteSettings {
-            current_anim_direction: self.__unsafe_private_named.0,
-            part_color_settings: self.__unsafe_private_named.1,
-            selected_options: self.__unsafe_private_named.2.unwrap(),
+            current_anim_direction: self._fields.0,
+            part_color_settings: self._fields.1,
+            selected_options: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -181,9 +185,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> SpriteSettings<'a> {
         SpriteSettings {
-            current_anim_direction: self.__unsafe_private_named.0,
-            part_color_settings: self.__unsafe_private_named.1,
-            selected_options: self.__unsafe_private_named.2.unwrap(),
+            current_anim_direction: self._fields.0,
+            part_color_settings: self._fields.1,
+            selected_options: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_simocracy/agents.rs b/crates/jacquard-api/src/org_simocracy/agents.rs
index 35e8dbcc..7dc64405 100644
--- a/crates/jacquard-api/src/org_simocracy/agents.rs
+++ b/crates/jacquard-api/src/org_simocracy/agents.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -173,58 +176,58 @@ pub mod agents_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type ShortDescription;
         type Sim;
+        type ShortDescription;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type ShortDescription = Unset;
         type Sim = Unset;
+        type ShortDescription = Unset;
+        type CreatedAt = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
+    ///State transition - sets the `sim` field to Set
+    pub struct SetSim<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSim<S> {}
+    impl<S: State> State for SetSim<S> {
+        type Sim = Set<members::sim>;
         type ShortDescription = S::ShortDescription;
-        type Sim = S::Sim;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `short_description` field to Set
     pub struct SetShortDescription<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetShortDescription<S> {}
     impl<S: State> State for SetShortDescription<S> {
-        type CreatedAt = S::CreatedAt;
-        type ShortDescription = Set<members::short_description>;
         type Sim = S::Sim;
-    }
-    ///State transition - sets the `sim` field to Set
-    pub struct SetSim<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSim<S> {}
-    impl<S: State> State for SetSim<S> {
+        type ShortDescription = Set<members::short_description>;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Sim = S::Sim;
         type ShortDescription = S::ShortDescription;
-        type Sim = Set<members::sim>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `short_description` field
-        pub struct short_description(());
         ///Marker type for the `sim` field
         pub struct sim(());
+        ///Marker type for the `short_description` field
+        pub struct short_description(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AgentsBuilder<'a, S: agents_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Vec<Facet<'a>>>,
@@ -232,7 +235,7 @@ pub struct AgentsBuilder<'a, S: agents_state::State> {
         Option<Vec<Facet<'a>>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Agents<'a> {
@@ -246,9 +249,9 @@ impl<'a> AgentsBuilder<'a, agents_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AgentsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -263,11 +266,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AgentsBuilder<'a, agents_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AgentsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -275,12 +278,12 @@ where
 impl<'a, S: agents_state::State> AgentsBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -291,12 +294,12 @@ impl<'a, S: agents_state::State> AgentsBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `descriptionFacets` field to an Option value (optional)
     pub fn maybe_description_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -311,11 +314,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AgentsBuilder<'a, agents_state::SetShortDescription<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         AgentsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -326,7 +329,7 @@ impl<'a, S: agents_state::State> AgentsBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `shortDescriptionFacets` field to an Option value (optional)
@@ -334,7 +337,7 @@ impl<'a, S: agents_state::State> AgentsBuilder<'a, S> {
         mut self,
         value: Option<Vec<Facet<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -349,11 +352,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> AgentsBuilder<'a, agents_state::SetSim<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         AgentsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -361,19 +364,19 @@ where
 impl<'a, S> AgentsBuilder<'a, S>
 where
     S: agents_state::State,
-    S::CreatedAt: agents_state::IsSet,
-    S::ShortDescription: agents_state::IsSet,
     S::Sim: agents_state::IsSet,
+    S::ShortDescription: agents_state::IsSet,
+    S::CreatedAt: agents_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Agents<'a> {
         Agents {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            description_facets: self.__unsafe_private_named.2,
-            short_description: self.__unsafe_private_named.3.unwrap(),
-            short_description_facets: self.__unsafe_private_named.4,
-            sim: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            description_facets: self._fields.2,
+            short_description: self._fields.3.unwrap(),
+            short_description_facets: self._fields.4,
+            sim: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -386,12 +389,12 @@ where
         >,
     ) -> Agents<'a> {
         Agents {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            description_facets: self.__unsafe_private_named.2,
-            short_description: self.__unsafe_private_named.3.unwrap(),
-            short_description_facets: self.__unsafe_private_named.4,
-            sim: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            description_facets: self._fields.2,
+            short_description: self._fields.3.unwrap(),
+            short_description_facets: self._fields.4,
+            sim: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_simocracy/event.rs b/crates/jacquard-api/src/org_simocracy/event.rs
index 231fceaf..40fff37a 100644
--- a/crates/jacquard-api/src/org_simocracy/event.rs
+++ b/crates/jacquard-api/src/org_simocracy/event.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -191,65 +194,65 @@ pub mod event_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type SimNames;
-        type CreatedAt;
         type ActorDid;
+        type CreatedAt;
+        type SimNames;
         type Type;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type SimNames = Unset;
-        type CreatedAt = Unset;
         type ActorDid = Unset;
+        type CreatedAt = Unset;
+        type SimNames = Unset;
         type Type = Unset;
     }
-    ///State transition - sets the `sim_names` field to Set
-    pub struct SetSimNames<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSimNames<S> {}
-    impl<S: State> State for SetSimNames<S> {
-        type SimNames = Set<members::sim_names>;
+    ///State transition - sets the `actor_did` field to Set
+    pub struct SetActorDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetActorDid<S> {}
+    impl<S: State> State for SetActorDid<S> {
+        type ActorDid = Set<members::actor_did>;
         type CreatedAt = S::CreatedAt;
-        type ActorDid = S::ActorDid;
+        type SimNames = S::SimNames;
         type Type = S::Type;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type SimNames = S::SimNames;
-        type CreatedAt = Set<members::created_at>;
         type ActorDid = S::ActorDid;
+        type CreatedAt = Set<members::created_at>;
+        type SimNames = S::SimNames;
         type Type = S::Type;
     }
-    ///State transition - sets the `actor_did` field to Set
-    pub struct SetActorDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetActorDid<S> {}
-    impl<S: State> State for SetActorDid<S> {
-        type SimNames = S::SimNames;
+    ///State transition - sets the `sim_names` field to Set
+    pub struct SetSimNames<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSimNames<S> {}
+    impl<S: State> State for SetSimNames<S> {
+        type ActorDid = S::ActorDid;
         type CreatedAt = S::CreatedAt;
-        type ActorDid = Set<members::actor_did>;
+        type SimNames = Set<members::sim_names>;
         type Type = S::Type;
     }
     ///State transition - sets the `type` field to Set
     pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetType<S> {}
     impl<S: State> State for SetType<S> {
-        type SimNames = S::SimNames;
-        type CreatedAt = S::CreatedAt;
         type ActorDid = S::ActorDid;
+        type CreatedAt = S::CreatedAt;
+        type SimNames = S::SimNames;
         type Type = Set<members::r#type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `sim_names` field
-        pub struct sim_names(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `actor_did` field
         pub struct actor_did(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `sim_names` field
+        pub struct sim_names(());
         ///Marker type for the `type` field
         pub struct r#type(());
     }
@@ -257,8 +260,8 @@ pub mod event_state {
 
 /// Builder for constructing an instance of this type
 pub struct EventBuilder<'a, S: event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -269,7 +272,7 @@ pub struct EventBuilder<'a, S: event_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Event<'a> {
@@ -283,19 +286,9 @@ impl<'a> EventBuilder<'a, event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -310,11 +303,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EventBuilder<'a, event_state::SetActorDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -322,12 +315,12 @@ where
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `content` field (optional)
     pub fn content(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `content` field to an Option value (optional)
     pub fn maybe_content(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -342,11 +335,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EventBuilder<'a, event_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -354,12 +347,12 @@ where
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `proposalTitle` field (optional)
     pub fn proposal_title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `proposalTitle` field to an Option value (optional)
     pub fn maybe_proposal_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -367,12 +360,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `round` field (optional)
     pub fn round(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `round` field to an Option value (optional)
     pub fn maybe_round(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -387,11 +380,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> EventBuilder<'a, event_state::SetSimNames<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -399,12 +392,12 @@ where
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `simUris` field (optional)
     pub fn sim_uris(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `simUris` field to an Option value (optional)
     pub fn maybe_sim_uris(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -419,11 +412,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EventBuilder<'a, event_state::SetType<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -431,12 +424,12 @@ where
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `userMessage` field (optional)
     pub fn user_message(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `userMessage` field to an Option value (optional)
     pub fn maybe_user_message(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -444,23 +437,23 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S> EventBuilder<'a, S>
 where
     S: event_state::State,
-    S::SimNames: event_state::IsSet,
-    S::CreatedAt: event_state::IsSet,
     S::ActorDid: event_state::IsSet,
+    S::CreatedAt: event_state::IsSet,
+    S::SimNames: event_state::IsSet,
     S::Type: event_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Event<'a> {
         Event {
-            actor_did: self.__unsafe_private_named.0.unwrap(),
-            content: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            proposal_title: self.__unsafe_private_named.3,
-            round: self.__unsafe_private_named.4,
-            sim_names: self.__unsafe_private_named.5.unwrap(),
-            sim_uris: self.__unsafe_private_named.6,
-            r#type: self.__unsafe_private_named.7.unwrap(),
-            user_message: self.__unsafe_private_named.8,
+            actor_did: self._fields.0.unwrap(),
+            content: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            proposal_title: self._fields.3,
+            round: self._fields.4,
+            sim_names: self._fields.5.unwrap(),
+            sim_uris: self._fields.6,
+            r#type: self._fields.7.unwrap(),
+            user_message: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -473,15 +466,15 @@ where
         >,
     ) -> Event<'a> {
         Event {
-            actor_did: self.__unsafe_private_named.0.unwrap(),
-            content: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            proposal_title: self.__unsafe_private_named.3,
-            round: self.__unsafe_private_named.4,
-            sim_names: self.__unsafe_private_named.5.unwrap(),
-            sim_uris: self.__unsafe_private_named.6,
-            r#type: self.__unsafe_private_named.7.unwrap(),
-            user_message: self.__unsafe_private_named.8,
+            actor_did: self._fields.0.unwrap(),
+            content: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            proposal_title: self._fields.3,
+            round: self._fields.4,
+            sim_names: self._fields.5.unwrap(),
+            sim_uris: self._fields.6,
+            r#type: self._fields.7.unwrap(),
+            user_message: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_simocracy/interview.rs b/crates/jacquard-api/src/org_simocracy/interview.rs
index aff682c8..fb707f0f 100644
--- a/crates/jacquard-api/src/org_simocracy/interview.rs
+++ b/crates/jacquard-api/src/org_simocracy/interview.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -221,80 +224,80 @@ pub mod interview_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type OpenAnswers;
         type YesNoAnswers;
+        type CreatedAt;
         type Sim;
+        type OpenAnswers;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type OpenAnswers = Unset;
         type YesNoAnswers = Unset;
+        type CreatedAt = Unset;
         type Sim = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type OpenAnswers = S::OpenAnswers;
-        type YesNoAnswers = S::YesNoAnswers;
-        type Sim = S::Sim;
-    }
-    ///State transition - sets the `open_answers` field to Set
-    pub struct SetOpenAnswers<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetOpenAnswers<S> {}
-    impl<S: State> State for SetOpenAnswers<S> {
-        type CreatedAt = S::CreatedAt;
-        type OpenAnswers = Set<members::open_answers>;
-        type YesNoAnswers = S::YesNoAnswers;
-        type Sim = S::Sim;
+        type OpenAnswers = Unset;
     }
     ///State transition - sets the `yes_no_answers` field to Set
     pub struct SetYesNoAnswers<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetYesNoAnswers<S> {}
     impl<S: State> State for SetYesNoAnswers<S> {
+        type YesNoAnswers = Set<members::yes_no_answers>;
         type CreatedAt = S::CreatedAt;
+        type Sim = S::Sim;
         type OpenAnswers = S::OpenAnswers;
-        type YesNoAnswers = Set<members::yes_no_answers>;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type YesNoAnswers = S::YesNoAnswers;
+        type CreatedAt = Set<members::created_at>;
         type Sim = S::Sim;
+        type OpenAnswers = S::OpenAnswers;
     }
     ///State transition - sets the `sim` field to Set
     pub struct SetSim<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSim<S> {}
     impl<S: State> State for SetSim<S> {
+        type YesNoAnswers = S::YesNoAnswers;
         type CreatedAt = S::CreatedAt;
+        type Sim = Set<members::sim>;
         type OpenAnswers = S::OpenAnswers;
+    }
+    ///State transition - sets the `open_answers` field to Set
+    pub struct SetOpenAnswers<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetOpenAnswers<S> {}
+    impl<S: State> State for SetOpenAnswers<S> {
         type YesNoAnswers = S::YesNoAnswers;
-        type Sim = Set<members::sim>;
+        type CreatedAt = S::CreatedAt;
+        type Sim = S::Sim;
+        type OpenAnswers = Set<members::open_answers>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `open_answers` field
-        pub struct open_answers(());
         ///Marker type for the `yes_no_answers` field
         pub struct yes_no_answers(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `sim` field
         pub struct sim(());
+        ///Marker type for the `open_answers` field
+        pub struct open_answers(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct InterviewBuilder<'a, S: interview_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Vec<interview::OpenAnswer<'a>>>,
         Option<StrongRef<'a>>,
         Option<Vec<interview::ValueResponse<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Interview<'a> {
@@ -308,9 +311,9 @@ impl<'a> InterviewBuilder<'a, interview_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         InterviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -325,11 +328,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> InterviewBuilder<'a, interview_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         InterviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -344,11 +347,11 @@ where
         mut self,
         value: impl Into<Vec<interview::OpenAnswer<'a>>>,
     ) -> InterviewBuilder<'a, interview_state::SetOpenAnswers<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         InterviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -363,11 +366,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> InterviewBuilder<'a, interview_state::SetSim<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         InterviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -382,11 +385,11 @@ where
         mut self,
         value: impl Into<Vec<interview::ValueResponse<'a>>>,
     ) -> InterviewBuilder<'a, interview_state::SetYesNoAnswers<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         InterviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -394,18 +397,18 @@ where
 impl<'a, S> InterviewBuilder<'a, S>
 where
     S: interview_state::State,
-    S::CreatedAt: interview_state::IsSet,
-    S::OpenAnswers: interview_state::IsSet,
     S::YesNoAnswers: interview_state::IsSet,
+    S::CreatedAt: interview_state::IsSet,
     S::Sim: interview_state::IsSet,
+    S::OpenAnswers: interview_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Interview<'a> {
         Interview {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            open_answers: self.__unsafe_private_named.1.unwrap(),
-            sim: self.__unsafe_private_named.2.unwrap(),
-            yes_no_answers: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            open_answers: self._fields.1.unwrap(),
+            sim: self._fields.2.unwrap(),
+            yes_no_answers: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -418,10 +421,10 @@ where
         >,
     ) -> Interview<'a> {
         Interview {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            open_answers: self.__unsafe_private_named.1.unwrap(),
-            sim: self.__unsafe_private_named.2.unwrap(),
-            yes_no_answers: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            open_answers: self._fields.1.unwrap(),
+            sim: self._fields.2.unwrap(),
+            yes_no_answers: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -641,9 +644,9 @@ pub mod value_response_state {
 
 /// Builder for constructing an instance of this type
 pub struct ValueResponseBuilder<'a, S: value_response_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ValueResponse<'a> {
@@ -657,9 +660,9 @@ impl<'a> ValueResponseBuilder<'a, value_response_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ValueResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -674,11 +677,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ValueResponseBuilder<'a, value_response_state::SetAnswer<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ValueResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -693,11 +696,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ValueResponseBuilder<'a, value_response_state::SetStatement<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ValueResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -711,8 +714,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ValueResponse<'a> {
         ValueResponse {
-            answer: self.__unsafe_private_named.0.unwrap(),
-            statement: self.__unsafe_private_named.1.unwrap(),
+            answer: self._fields.0.unwrap(),
+            statement: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -725,8 +728,8 @@ where
         >,
     ) -> ValueResponse<'a> {
         ValueResponse {
-            answer: self.__unsafe_private_named.0.unwrap(),
-            statement: self.__unsafe_private_named.1.unwrap(),
+            answer: self._fields.0.unwrap(),
+            statement: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_simocracy/senate/activity.rs b/crates/jacquard-api/src/org_simocracy/senate/activity.rs
index 020b48b8..49cfb4b6 100644
--- a/crates/jacquard-api/src/org_simocracy/senate/activity.rs
+++ b/crates/jacquard-api/src/org_simocracy/senate/activity.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -409,8 +412,8 @@ pub mod activity_state {
 
 /// Builder for constructing an instance of this type
 pub struct ActivityBuilder<'a, S: activity_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ActivityActivityType<'a>>,
         Option<Vec<StrongRef<'a>>>,
         Option<Datetime>,
@@ -419,7 +422,7 @@ pub struct ActivityBuilder<'a, S: activity_state::State> {
         Option<CowStr<'a>>,
         Option<ActivityStatus<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Activity<'a> {
@@ -433,9 +436,9 @@ impl<'a> ActivityBuilder<'a, activity_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -450,11 +453,11 @@ where
         mut self,
         value: impl Into<ActivityActivityType<'a>>,
     ) -> ActivityBuilder<'a, activity_state::SetActivityType<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -469,11 +472,11 @@ where
         mut self,
         value: impl Into<Vec<StrongRef<'a>>>,
     ) -> ActivityBuilder<'a, activity_state::SetCommitteeSims<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -488,11 +491,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ActivityBuilder<'a, activity_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -500,12 +503,12 @@ where
 impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
     /// Set the `evaluation` field (optional)
     pub fn evaluation(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `evaluation` field to an Option value (optional)
     pub fn maybe_evaluation(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -513,12 +516,12 @@ impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
 impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
     /// Set the `proposalText` field (optional)
     pub fn proposal_text(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `proposalText` field to an Option value (optional)
     pub fn maybe_proposal_text(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -526,12 +529,12 @@ impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
 impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
     /// Set the `resultSummary` field (optional)
     pub fn result_summary(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `resultSummary` field to an Option value (optional)
     pub fn maybe_result_summary(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -539,12 +542,12 @@ impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
 impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<ActivityStatus<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<ActivityStatus<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -559,13 +562,13 @@ where
     /// Build the final struct
     pub fn build(self) -> Activity<'a> {
         Activity {
-            activity_type: self.__unsafe_private_named.0.unwrap(),
-            committee_sims: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            evaluation: self.__unsafe_private_named.3,
-            proposal_text: self.__unsafe_private_named.4,
-            result_summary: self.__unsafe_private_named.5,
-            status: self.__unsafe_private_named.6,
+            activity_type: self._fields.0.unwrap(),
+            committee_sims: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            evaluation: self._fields.3,
+            proposal_text: self._fields.4,
+            result_summary: self._fields.5,
+            status: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -578,13 +581,13 @@ where
         >,
     ) -> Activity<'a> {
         Activity {
-            activity_type: self.__unsafe_private_named.0.unwrap(),
-            committee_sims: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            evaluation: self.__unsafe_private_named.3,
-            proposal_text: self.__unsafe_private_named.4,
-            result_summary: self.__unsafe_private_named.5,
-            status: self.__unsafe_private_named.6,
+            activity_type: self._fields.0.unwrap(),
+            committee_sims: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            evaluation: self._fields.3,
+            proposal_text: self._fields.4,
+            result_summary: self._fields.5,
+            status: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_simocracy/sim.rs b/crates/jacquard-api/src/org_simocracy/sim.rs
index e9d830b2..8dbce404 100644
--- a/crates/jacquard-api/src/org_simocracy/sim.rs
+++ b/crates/jacquard-api/src/org_simocracy/sim.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -159,64 +162,64 @@ pub mod sim_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Settings;
         type Name;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Settings = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Settings = S::Settings;
-        type Name = S::Name;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `settings` field to Set
     pub struct SetSettings<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSettings<S> {}
     impl<S: State> State for SetSettings<S> {
-        type CreatedAt = S::CreatedAt;
         type Settings = Set<members::settings>;
         type Name = S::Name;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type CreatedAt = S::CreatedAt;
         type Settings = S::Settings;
         type Name = Set<members::name>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Settings = S::Settings;
+        type Name = S::Name;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `settings` field
         pub struct settings(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SimBuilder<'a, S: sim_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<SpriteSettings<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Sim<'a> {
@@ -230,9 +233,9 @@ impl<'a> SimBuilder<'a, sim_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -247,11 +250,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SimBuilder<'a, sim_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -259,12 +262,12 @@ where
 impl<'a, S: sim_state::State> SimBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -279,11 +282,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SimBuilder<'a, sim_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -298,11 +301,11 @@ where
         mut self,
         value: impl Into<SpriteSettings<'a>>,
     ) -> SimBuilder<'a, sim_state::SetSettings<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SimBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -310,17 +313,17 @@ where
 impl<'a, S> SimBuilder<'a, S>
 where
     S: sim_state::State,
-    S::CreatedAt: sim_state::IsSet,
     S::Settings: sim_state::IsSet,
     S::Name: sim_state::IsSet,
+    S::CreatedAt: sim_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Sim<'a> {
         Sim {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            image: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
-            settings: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            image: self._fields.1,
+            name: self._fields.2.unwrap(),
+            settings: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -333,10 +336,10 @@ where
         >,
     ) -> Sim<'a> {
         Sim {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            image: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
-            settings: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            image: self._fields.1,
+            name: self._fields.2.unwrap(),
+            settings: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_simocracy/skill.rs b/crates/jacquard-api/src/org_simocracy/skill.rs
index d1597feb..bacb5753 100644
--- a/crates/jacquard-api/src/org_simocracy/skill.rs
+++ b/crates/jacquard-api/src/org_simocracy/skill.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -200,58 +203,58 @@ pub mod skill_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Sim;
         type Name;
         type CreatedAt;
-        type Sim;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Sim = Unset;
         type Name = Unset;
         type CreatedAt = Unset;
-        type Sim = Unset;
+    }
+    ///State transition - sets the `sim` field to Set
+    pub struct SetSim<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSim<S> {}
+    impl<S: State> State for SetSim<S> {
+        type Sim = Set<members::sim>;
+        type Name = S::Name;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
+        type Sim = S::Sim;
         type Name = Set<members::name>;
         type CreatedAt = S::CreatedAt;
-        type Sim = S::Sim;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Name = S::Name;
-        type CreatedAt = Set<members::created_at>;
         type Sim = S::Sim;
-    }
-    ///State transition - sets the `sim` field to Set
-    pub struct SetSim<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSim<S> {}
-    impl<S: State> State for SetSim<S> {
         type Name = S::Name;
-        type CreatedAt = S::CreatedAt;
-        type Sim = Set<members::sim>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `sim` field
+        pub struct sim(());
         ///Marker type for the `name` field
         pub struct name(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `sim` field
-        pub struct sim(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SkillBuilder<'a, S: skill_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Vec<Facet<'a>>>,
@@ -261,7 +264,7 @@ pub struct SkillBuilder<'a, S: skill_state::State> {
         Option<StrongRef<'a>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Skill<'a> {
@@ -275,9 +278,9 @@ impl<'a> SkillBuilder<'a, skill_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SkillBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -292,11 +295,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SkillBuilder<'a, skill_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SkillBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -304,12 +307,12 @@ where
 impl<'a, S: skill_state::State> SkillBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -320,12 +323,12 @@ impl<'a, S: skill_state::State> SkillBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `descriptionFacets` field to an Option value (optional)
     pub fn maybe_description_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -333,12 +336,12 @@ impl<'a, S: skill_state::State> SkillBuilder<'a, S> {
 impl<'a, S: skill_state::State> SkillBuilder<'a, S> {
     /// Set the `instructions` field (optional)
     pub fn instructions(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `instructions` field to an Option value (optional)
     pub fn maybe_instructions(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -349,12 +352,12 @@ impl<'a, S: skill_state::State> SkillBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `instructionsFacets` field to an Option value (optional)
     pub fn maybe_instructions_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -369,11 +372,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SkillBuilder<'a, skill_state::SetName<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         SkillBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -388,11 +391,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> SkillBuilder<'a, skill_state::SetSim<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         SkillBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -400,12 +403,12 @@ where
 impl<'a, S: skill_state::State> SkillBuilder<'a, S> {
     /// Set the `triggers` field (optional)
     pub fn triggers(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `triggers` field to an Option value (optional)
     pub fn maybe_triggers(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -413,21 +416,21 @@ impl<'a, S: skill_state::State> SkillBuilder<'a, S> {
 impl<'a, S> SkillBuilder<'a, S>
 where
     S: skill_state::State,
+    S::Sim: skill_state::IsSet,
     S::Name: skill_state::IsSet,
     S::CreatedAt: skill_state::IsSet,
-    S::Sim: skill_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Skill<'a> {
         Skill {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            description_facets: self.__unsafe_private_named.2,
-            instructions: self.__unsafe_private_named.3,
-            instructions_facets: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            sim: self.__unsafe_private_named.6.unwrap(),
-            triggers: self.__unsafe_private_named.7,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            description_facets: self._fields.2,
+            instructions: self._fields.3,
+            instructions_facets: self._fields.4,
+            name: self._fields.5.unwrap(),
+            sim: self._fields.6.unwrap(),
+            triggers: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -440,14 +443,14 @@ where
         >,
     ) -> Skill<'a> {
         Skill {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            description_facets: self.__unsafe_private_named.2,
-            instructions: self.__unsafe_private_named.3,
-            instructions_facets: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            sim: self.__unsafe_private_named.6.unwrap(),
-            triggers: self.__unsafe_private_named.7,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            description_facets: self._fields.2,
+            instructions: self._fields.3,
+            instructions_facets: self._fields.4,
+            name: self._fields.5.unwrap(),
+            sim: self._fields.6.unwrap(),
+            triggers: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_simocracy/style.rs b/crates/jacquard-api/src/org_simocracy/style.rs
index 992f2179..eb7c556b 100644
--- a/crates/jacquard-api/src/org_simocracy/style.rs
+++ b/crates/jacquard-api/src/org_simocracy/style.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -140,64 +143,64 @@ pub mod style_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type Description;
         type Sim;
+        type Description;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type Description = Unset;
         type Sim = Unset;
+        type Description = Unset;
+        type CreatedAt = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
+    ///State transition - sets the `sim` field to Set
+    pub struct SetSim<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSim<S> {}
+    impl<S: State> State for SetSim<S> {
+        type Sim = Set<members::sim>;
         type Description = S::Description;
-        type Sim = S::Sim;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `description` field to Set
     pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDescription<S> {}
     impl<S: State> State for SetDescription<S> {
-        type CreatedAt = S::CreatedAt;
-        type Description = Set<members::description>;
         type Sim = S::Sim;
-    }
-    ///State transition - sets the `sim` field to Set
-    pub struct SetSim<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSim<S> {}
-    impl<S: State> State for SetSim<S> {
+        type Description = Set<members::description>;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Sim = S::Sim;
         type Description = S::Description;
-        type Sim = Set<members::sim>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `description` field
-        pub struct description(());
         ///Marker type for the `sim` field
         pub struct sim(());
+        ///Marker type for the `description` field
+        pub struct description(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct StyleBuilder<'a, S: style_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Vec<Facet<'a>>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Style<'a> {
@@ -211,9 +214,9 @@ impl<'a> StyleBuilder<'a, style_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StyleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -228,11 +231,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StyleBuilder<'a, style_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StyleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -247,11 +250,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> StyleBuilder<'a, style_state::SetDescription<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StyleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -262,12 +265,12 @@ impl<'a, S: style_state::State> StyleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<Facet<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `descriptionFacets` field to an Option value (optional)
     pub fn maybe_description_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -282,11 +285,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> StyleBuilder<'a, style_state::SetSim<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         StyleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -294,17 +297,17 @@ where
 impl<'a, S> StyleBuilder<'a, S>
 where
     S: style_state::State,
-    S::CreatedAt: style_state::IsSet,
-    S::Description: style_state::IsSet,
     S::Sim: style_state::IsSet,
+    S::Description: style_state::IsSet,
+    S::CreatedAt: style_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Style<'a> {
         Style {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1.unwrap(),
-            description_facets: self.__unsafe_private_named.2,
-            sim: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1.unwrap(),
+            description_facets: self._fields.2,
+            sim: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -317,10 +320,10 @@ where
         >,
     ) -> Style<'a> {
         Style {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1.unwrap(),
-            description_facets: self.__unsafe_private_named.2,
-            sim: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1.unwrap(),
+            description_facets: self._fields.2,
+            sim: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_simocracy/vote.rs b/crates/jacquard-api/src/org_simocracy/vote.rs
index fc850c19..8da60366 100644
--- a/crates/jacquard-api/src/org_simocracy/vote.rs
+++ b/crates/jacquard-api/src/org_simocracy/vote.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -114,58 +117,58 @@ pub mod vote_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Sim;
-        type Votes;
         type CreatedAt;
+        type Votes;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Sim = Unset;
-        type Votes = Unset;
         type CreatedAt = Unset;
+        type Votes = Unset;
     }
     ///State transition - sets the `sim` field to Set
     pub struct SetSim<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSim<S> {}
     impl<S: State> State for SetSim<S> {
         type Sim = Set<members::sim>;
-        type Votes = S::Votes;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `votes` field to Set
-    pub struct SetVotes<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetVotes<S> {}
-    impl<S: State> State for SetVotes<S> {
-        type Sim = S::Sim;
-        type Votes = Set<members::votes>;
         type CreatedAt = S::CreatedAt;
+        type Votes = S::Votes;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type Sim = S::Sim;
-        type Votes = S::Votes;
         type CreatedAt = Set<members::created_at>;
+        type Votes = S::Votes;
+    }
+    ///State transition - sets the `votes` field to Set
+    pub struct SetVotes<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetVotes<S> {}
+    impl<S: State> State for SetVotes<S> {
+        type Sim = S::Sim;
+        type CreatedAt = S::CreatedAt;
+        type Votes = Set<members::votes>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `sim` field
         pub struct sim(());
-        ///Marker type for the `votes` field
-        pub struct votes(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `votes` field
+        pub struct votes(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct VoteBuilder<'a, S: vote_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Vote<'a> {
@@ -179,9 +182,9 @@ impl<'a> VoteBuilder<'a, vote_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> VoteBuilder<'a, vote_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> VoteBuilder<'a, vote_state::SetSim<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> VoteBuilder<'a, vote_state::SetVotes<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -247,15 +250,15 @@ impl<'a, S> VoteBuilder<'a, S>
 where
     S: vote_state::State,
     S::Sim: vote_state::IsSet,
-    S::Votes: vote_state::IsSet,
     S::CreatedAt: vote_state::IsSet,
+    S::Votes: vote_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Vote<'a> {
         Vote {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            sim: self.__unsafe_private_named.1.unwrap(),
-            votes: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            sim: self._fields.1.unwrap(),
+            votes: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -268,9 +271,9 @@ where
         >,
     ) -> Vote<'a> {
         Vote {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            sim: self.__unsafe_private_named.1.unwrap(),
-            votes: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            sim: self._fields.1.unwrap(),
+            votes: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_stormlightlabs/malfestio/deck.rs b/crates/jacquard-api/src/org_stormlightlabs/malfestio/deck.rs
index 2f71b4de..2e1d100b 100644
--- a/crates/jacquard-api/src/org_stormlightlabs/malfestio/deck.rs
+++ b/crates/jacquard-api/src/org_stormlightlabs/malfestio/deck.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -295,44 +298,44 @@ pub mod deck_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Title;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Title = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Title = S::Title;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type CreatedAt = S::CreatedAt;
         type Title = Set<members::title>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Title = S::Title;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DeckBuilder<'a, S: deck_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<AtUri<'a>>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -344,7 +347,7 @@ pub struct DeckBuilder<'a, S: deck_state::State> {
         Option<Datetime>,
         Option<DeckVisibility<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Deck<'a> {
@@ -358,20 +361,9 @@ impl<'a> DeckBuilder<'a, deck_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeckBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -379,12 +371,12 @@ impl<'a> DeckBuilder<'a, deck_state::Empty> {
 impl<'a, S: deck_state::State> DeckBuilder<'a, S> {
     /// Set the `cardRefs` field (optional)
     pub fn card_refs(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cardRefs` field to an Option value (optional)
     pub fn maybe_card_refs(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -399,11 +391,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DeckBuilder<'a, deck_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DeckBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -411,12 +403,12 @@ where
 impl<'a, S: deck_state::State> DeckBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -424,12 +416,12 @@ impl<'a, S: deck_state::State> DeckBuilder<'a, S> {
 impl<'a, S: deck_state::State> DeckBuilder<'a, S> {
     /// Set the `language` field (optional)
     pub fn language(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `language` field to an Option value (optional)
     pub fn maybe_language(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -437,12 +429,12 @@ impl<'a, S: deck_state::State> DeckBuilder<'a, S> {
 impl<'a, S: deck_state::State> DeckBuilder<'a, S> {
     /// Set the `license` field (optional)
     pub fn license(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `license` field to an Option value (optional)
     pub fn maybe_license(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -450,12 +442,12 @@ impl<'a, S: deck_state::State> DeckBuilder<'a, S> {
 impl<'a, S: deck_state::State> DeckBuilder<'a, S> {
     /// Set the `sourceRefs` field (optional)
     pub fn source_refs(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `sourceRefs` field to an Option value (optional)
     pub fn maybe_source_refs(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -463,12 +455,12 @@ impl<'a, S: deck_state::State> DeckBuilder<'a, S> {
 impl<'a, S: deck_state::State> DeckBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -483,11 +475,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DeckBuilder<'a, deck_state::SetTitle<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         DeckBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -495,12 +487,12 @@ where
 impl<'a, S: deck_state::State> DeckBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -508,12 +500,12 @@ impl<'a, S: deck_state::State> DeckBuilder<'a, S> {
 impl<'a, S: deck_state::State> DeckBuilder<'a, S> {
     /// Set the `visibility` field (optional)
     pub fn visibility(mut self, value: impl Into<Option<DeckVisibility<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `visibility` field to an Option value (optional)
     pub fn maybe_visibility(mut self, value: Option<DeckVisibility<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -521,22 +513,22 @@ impl<'a, S: deck_state::State> DeckBuilder<'a, S> {
 impl<'a, S> DeckBuilder<'a, S>
 where
     S: deck_state::State,
-    S::CreatedAt: deck_state::IsSet,
     S::Title: deck_state::IsSet,
+    S::CreatedAt: deck_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Deck<'a> {
         Deck {
-            card_refs: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            language: self.__unsafe_private_named.3,
-            license: self.__unsafe_private_named.4,
-            source_refs: self.__unsafe_private_named.5,
-            tags: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7.unwrap(),
-            updated_at: self.__unsafe_private_named.8,
-            visibility: self.__unsafe_private_named.9,
+            card_refs: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            language: self._fields.3,
+            license: self._fields.4,
+            source_refs: self._fields.5,
+            tags: self._fields.6,
+            title: self._fields.7.unwrap(),
+            updated_at: self._fields.8,
+            visibility: self._fields.9,
             extra_data: Default::default(),
         }
     }
@@ -549,16 +541,16 @@ where
         >,
     ) -> Deck<'a> {
         Deck {
-            card_refs: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            language: self.__unsafe_private_named.3,
-            license: self.__unsafe_private_named.4,
-            source_refs: self.__unsafe_private_named.5,
-            tags: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7.unwrap(),
-            updated_at: self.__unsafe_private_named.8,
-            visibility: self.__unsafe_private_named.9,
+            card_refs: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            language: self._fields.3,
+            license: self._fields.4,
+            source_refs: self._fields.5,
+            tags: self._fields.6,
+            title: self._fields.7.unwrap(),
+            updated_at: self._fields.8,
+            visibility: self._fields.9,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_stormlightlabs/malfestio/thread/comment.rs b/crates/jacquard-api/src/org_stormlightlabs/malfestio/thread/comment.rs
index ecf84651..66a360bd 100644
--- a/crates/jacquard-api/src/org_stormlightlabs/malfestio/thread/comment.rs
+++ b/crates/jacquard-api/src/org_stormlightlabs/malfestio/thread/comment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -127,64 +130,64 @@ pub mod comment_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type CreatedAt;
         type SubjectRef;
         type Body;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type CreatedAt = Unset;
         type SubjectRef = Unset;
         type Body = Unset;
-        type CreatedAt = Unset;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type SubjectRef = S::SubjectRef;
+        type Body = S::Body;
     }
     ///State transition - sets the `subject_ref` field to Set
     pub struct SetSubjectRef<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubjectRef<S> {}
     impl<S: State> State for SetSubjectRef<S> {
+        type CreatedAt = S::CreatedAt;
         type SubjectRef = Set<members::subject_ref>;
         type Body = S::Body;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `body` field to Set
     pub struct SetBody<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBody<S> {}
     impl<S: State> State for SetBody<S> {
-        type SubjectRef = S::SubjectRef;
-        type Body = Set<members::body>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type SubjectRef = S::SubjectRef;
-        type Body = S::Body;
-        type CreatedAt = Set<members::created_at>;
+        type Body = Set<members::body>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `subject_ref` field
         pub struct subject_ref(());
         ///Marker type for the `body` field
         pub struct body(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CommentBuilder<'a, S: comment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<AtUri<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Comment<'a> {
@@ -198,9 +201,9 @@ impl<'a> CommentBuilder<'a, comment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetBody<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CommentBuilder<'a, comment_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,12 +249,12 @@ where
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `replyTo` field (optional)
     pub fn reply_to(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `replyTo` field to an Option value (optional)
     pub fn maybe_reply_to(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -266,11 +269,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetSubjectRef<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -278,17 +281,17 @@ where
 impl<'a, S> CommentBuilder<'a, S>
 where
     S: comment_state::State,
+    S::CreatedAt: comment_state::IsSet,
     S::SubjectRef: comment_state::IsSet,
     S::Body: comment_state::IsSet,
-    S::CreatedAt: comment_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Comment<'a> {
         Comment {
-            body: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            reply_to: self.__unsafe_private_named.2,
-            subject_ref: self.__unsafe_private_named.3.unwrap(),
+            body: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            reply_to: self._fields.2,
+            subject_ref: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -301,10 +304,10 @@ where
         >,
     ) -> Comment<'a> {
         Comment {
-            body: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            reply_to: self.__unsafe_private_named.2,
-            subject_ref: self.__unsafe_private_named.3.unwrap(),
+            body: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            reply_to: self._fields.2,
+            subject_ref: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/org_user_intents/demo/declaration.rs b/crates/jacquard-api/src/org_user_intents/demo/declaration.rs
index 12da4311..605a3e1c 100644
--- a/crates/jacquard-api/src/org_user_intents/demo/declaration.rs
+++ b/crates/jacquard-api/src/org_user_intents/demo/declaration.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -176,9 +179,9 @@ pub mod intent_state {
 
 /// Builder for constructing an instance of this type
 pub struct IntentBuilder<'a, S: intent_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Intent<'a> {
@@ -192,9 +195,9 @@ impl<'a> IntentBuilder<'a, intent_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IntentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -202,12 +205,12 @@ impl<'a> IntentBuilder<'a, intent_state::Empty> {
 impl<'a, S: intent_state::State> IntentBuilder<'a, S> {
     /// Set the `allow` field (optional)
     pub fn allow(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `allow` field to an Option value (optional)
     pub fn maybe_allow(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -222,11 +225,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> IntentBuilder<'a, intent_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         IntentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,8 +242,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Intent<'a> {
         Intent {
-            allow: self.__unsafe_private_named.0,
-            updated_at: self.__unsafe_private_named.1.unwrap(),
+            allow: self._fields.0,
+            updated_at: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -253,8 +256,8 @@ where
         >,
     ) -> Intent<'a> {
         Intent {
-            allow: self.__unsafe_private_named.0,
-            updated_at: self.__unsafe_private_named.1.unwrap(),
+            allow: self._fields.0,
+            updated_at: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -375,15 +378,15 @@ pub mod declaration_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeclarationBuilder<'a, S: declaration_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<declaration::Intent<'a>>,
         Option<declaration::Intent<'a>>,
         Option<declaration::Intent<'a>>,
         Option<declaration::Intent<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Declaration<'a> {
@@ -397,9 +400,9 @@ impl<'a> DeclarationBuilder<'a, declaration_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeclarationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -410,12 +413,12 @@ impl<'a, S: declaration_state::State> DeclarationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<declaration::Intent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `bulkDataset` field to an Option value (optional)
     pub fn maybe_bulk_dataset(mut self, value: Option<declaration::Intent<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -426,7 +429,7 @@ impl<'a, S: declaration_state::State> DeclarationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<declaration::Intent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `protocolBridging` field to an Option value (optional)
@@ -434,7 +437,7 @@ impl<'a, S: declaration_state::State> DeclarationBuilder<'a, S> {
         mut self,
         value: Option<declaration::Intent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -445,7 +448,7 @@ impl<'a, S: declaration_state::State> DeclarationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<declaration::Intent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `publicAccessArchive` field to an Option value (optional)
@@ -453,7 +456,7 @@ impl<'a, S: declaration_state::State> DeclarationBuilder<'a, S> {
         mut self,
         value: Option<declaration::Intent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -464,7 +467,7 @@ impl<'a, S: declaration_state::State> DeclarationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<declaration::Intent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `syntheticContentGeneration` field to an Option value (optional)
@@ -472,7 +475,7 @@ impl<'a, S: declaration_state::State> DeclarationBuilder<'a, S> {
         mut self,
         value: Option<declaration::Intent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -480,12 +483,12 @@ impl<'a, S: declaration_state::State> DeclarationBuilder<'a, S> {
 impl<'a, S: declaration_state::State> DeclarationBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -497,11 +500,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Declaration<'a> {
         Declaration {
-            bulk_dataset: self.__unsafe_private_named.0,
-            protocol_bridging: self.__unsafe_private_named.1,
-            public_access_archive: self.__unsafe_private_named.2,
-            synthetic_content_generation: self.__unsafe_private_named.3,
-            updated_at: self.__unsafe_private_named.4,
+            bulk_dataset: self._fields.0,
+            protocol_bridging: self._fields.1,
+            public_access_archive: self._fields.2,
+            synthetic_content_generation: self._fields.3,
+            updated_at: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -514,11 +517,11 @@ where
         >,
     ) -> Declaration<'a> {
         Declaration {
-            bulk_dataset: self.__unsafe_private_named.0,
-            protocol_bridging: self.__unsafe_private_named.1,
-            public_access_archive: self.__unsafe_private_named.2,
-            synthetic_content_generation: self.__unsafe_private_named.3,
-            updated_at: self.__unsafe_private_named.4,
+            bulk_dataset: self._fields.0,
+            protocol_bridging: self._fields.1,
+            public_access_archive: self._fields.2,
+            synthetic_content_generation: self._fields.3,
+            updated_at: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pink_vase/pod/comment.rs b/crates/jacquard-api/src/pink_vase/pod/comment.rs
index 48d40ad1..84f903fe 100644
--- a/crates/jacquard-api/src/pink_vase/pod/comment.rs
+++ b/crates/jacquard-api/src/pink_vase/pod/comment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -128,63 +131,63 @@ pub mod comment_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Episode;
-        type Text;
         type CreatedAt;
+        type Text;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Episode = Unset;
-        type Text = Unset;
         type CreatedAt = Unset;
+        type Text = Unset;
     }
     ///State transition - sets the `episode` field to Set
     pub struct SetEpisode<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEpisode<S> {}
     impl<S: State> State for SetEpisode<S> {
         type Episode = Set<members::episode>;
-        type Text = S::Text;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `text` field to Set
-    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetText<S> {}
-    impl<S: State> State for SetText<S> {
-        type Episode = S::Episode;
-        type Text = Set<members::text>;
         type CreatedAt = S::CreatedAt;
+        type Text = S::Text;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type Episode = S::Episode;
-        type Text = S::Text;
         type CreatedAt = Set<members::created_at>;
+        type Text = S::Text;
+    }
+    ///State transition - sets the `text` field to Set
+    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetText<S> {}
+    impl<S: State> State for SetText<S> {
+        type Episode = S::Episode;
+        type CreatedAt = S::CreatedAt;
+        type Text = Set<members::text>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `episode` field
         pub struct episode(());
-        ///Marker type for the `text` field
-        pub struct text(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `text` field
+        pub struct text(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CommentBuilder<'a, S: comment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<StrongRef<'a>>,
         Option<StrongRef<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Comment<'a> {
@@ -198,9 +201,9 @@ impl<'a> CommentBuilder<'a, comment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CommentBuilder<'a, comment_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetEpisode<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,12 +249,12 @@ where
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -266,11 +269,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetText<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -279,16 +282,16 @@ impl<'a, S> CommentBuilder<'a, S>
 where
     S: comment_state::State,
     S::Episode: comment_state::IsSet,
-    S::Text: comment_state::IsSet,
     S::CreatedAt: comment_state::IsSet,
+    S::Text: comment_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Comment<'a> {
         Comment {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            episode: self.__unsafe_private_named.1.unwrap(),
-            parent: self.__unsafe_private_named.2,
-            text: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            episode: self._fields.1.unwrap(),
+            parent: self._fields.2,
+            text: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -301,10 +304,10 @@ where
         >,
     ) -> Comment<'a> {
         Comment {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            episode: self.__unsafe_private_named.1.unwrap(),
-            parent: self.__unsafe_private_named.2,
-            text: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            episode: self._fields.1.unwrap(),
+            parent: self._fields.2,
+            text: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pink_vase/pod/episode.rs b/crates/jacquard-api/src/pink_vase/pod/episode.rs
index 24d7fc01..461bd5b4 100644
--- a/crates/jacquard-api/src/pink_vase/pod/episode.rs
+++ b/crates/jacquard-api/src/pink_vase/pod/episode.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -294,73 +297,73 @@ pub mod episode_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Show;
-        type CreatedAt;
-        type AudioUrl;
         type Title;
+        type AudioUrl;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Show = Unset;
-        type CreatedAt = Unset;
-        type AudioUrl = Unset;
         type Title = Unset;
+        type AudioUrl = Unset;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `show` field to Set
     pub struct SetShow<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetShow<S> {}
     impl<S: State> State for SetShow<S> {
         type Show = Set<members::show>;
-        type CreatedAt = S::CreatedAt;
-        type AudioUrl = S::AudioUrl;
         type Title = S::Title;
+        type AudioUrl = S::AudioUrl;
+        type CreatedAt = S::CreatedAt;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
         type Show = S::Show;
-        type CreatedAt = Set<members::created_at>;
+        type Title = Set<members::title>;
         type AudioUrl = S::AudioUrl;
-        type Title = S::Title;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `audio_url` field to Set
     pub struct SetAudioUrl<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAudioUrl<S> {}
     impl<S: State> State for SetAudioUrl<S> {
         type Show = S::Show;
-        type CreatedAt = S::CreatedAt;
-        type AudioUrl = Set<members::audio_url>;
         type Title = S::Title;
+        type AudioUrl = Set<members::audio_url>;
+        type CreatedAt = S::CreatedAt;
     }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
         type Show = S::Show;
-        type CreatedAt = S::CreatedAt;
+        type Title = S::Title;
         type AudioUrl = S::AudioUrl;
-        type Title = Set<members::title>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `show` field
         pub struct show(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `audio_url` field
-        pub struct audio_url(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `audio_url` field
+        pub struct audio_url(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EpisodeBuilder<'a, S: episode_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<UriValue<'a>>,
         Option<BlobRef<'a>>,
         Option<Datetime>,
@@ -373,7 +376,7 @@ pub struct EpisodeBuilder<'a, S: episode_state::State> {
         Option<StrongRef<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Episode<'a> {
@@ -387,21 +390,9 @@ impl<'a> EpisodeBuilder<'a, episode_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -416,11 +407,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> EpisodeBuilder<'a, episode_state::SetAudioUrl<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -428,12 +419,12 @@ where
 impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
     /// Set the `coverArt` field (optional)
     pub fn cover_art(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `coverArt` field to an Option value (optional)
     pub fn maybe_cover_art(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -448,11 +439,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EpisodeBuilder<'a, episode_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -460,12 +451,12 @@ where
 impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -473,12 +464,12 @@ impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
 impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
     /// Set the `durationSeconds` field (optional)
     pub fn duration_seconds(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `durationSeconds` field to an Option value (optional)
     pub fn maybe_duration_seconds(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -486,12 +477,12 @@ impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
 impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
     /// Set the `episodeNumber` field (optional)
     pub fn episode_number(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `episodeNumber` field to an Option value (optional)
     pub fn maybe_episode_number(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -502,12 +493,12 @@ impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EpisodeEpisodeType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `episodeType` field to an Option value (optional)
     pub fn maybe_episode_type(mut self, value: Option<EpisodeEpisodeType<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -515,12 +506,12 @@ impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
 impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
     /// Set the `explicit` field (optional)
     pub fn explicit(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `explicit` field to an Option value (optional)
     pub fn maybe_explicit(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -528,12 +519,12 @@ impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
 impl<'a, S: episode_state::State> EpisodeBuilder<'a, S> {
     /// Set the `seasonNumber` field (optional)
     pub fn season_number(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `seasonNumber` field to an Option value (optional)
     pub fn maybe_season_number(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -548,11 +539,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> EpisodeBuilder<'a, episode_state::SetShow<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         EpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -567,11 +558,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EpisodeBuilder<'a, episode_state::SetTitle<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         EpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -580,24 +571,24 @@ impl<'a, S> EpisodeBuilder<'a, S>
 where
     S: episode_state::State,
     S::Show: episode_state::IsSet,
-    S::CreatedAt: episode_state::IsSet,
-    S::AudioUrl: episode_state::IsSet,
     S::Title: episode_state::IsSet,
+    S::AudioUrl: episode_state::IsSet,
+    S::CreatedAt: episode_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Episode<'a> {
         Episode {
-            audio_url: self.__unsafe_private_named.0.unwrap(),
-            cover_art: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            duration_seconds: self.__unsafe_private_named.4,
-            episode_number: self.__unsafe_private_named.5,
-            episode_type: self.__unsafe_private_named.6,
-            explicit: self.__unsafe_private_named.7,
-            season_number: self.__unsafe_private_named.8,
-            show: self.__unsafe_private_named.9.unwrap(),
-            title: self.__unsafe_private_named.10.unwrap(),
+            audio_url: self._fields.0.unwrap(),
+            cover_art: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            duration_seconds: self._fields.4,
+            episode_number: self._fields.5,
+            episode_type: self._fields.6,
+            explicit: self._fields.7,
+            season_number: self._fields.8,
+            show: self._fields.9.unwrap(),
+            title: self._fields.10.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -610,17 +601,17 @@ where
         >,
     ) -> Episode<'a> {
         Episode {
-            audio_url: self.__unsafe_private_named.0.unwrap(),
-            cover_art: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            duration_seconds: self.__unsafe_private_named.4,
-            episode_number: self.__unsafe_private_named.5,
-            episode_type: self.__unsafe_private_named.6,
-            explicit: self.__unsafe_private_named.7,
-            season_number: self.__unsafe_private_named.8,
-            show: self.__unsafe_private_named.9.unwrap(),
-            title: self.__unsafe_private_named.10.unwrap(),
+            audio_url: self._fields.0.unwrap(),
+            cover_art: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            duration_seconds: self._fields.4,
+            episode_number: self._fields.5,
+            episode_type: self._fields.6,
+            explicit: self._fields.7,
+            season_number: self._fields.8,
+            show: self._fields.9.unwrap(),
+            title: self._fields.10.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pink_vase/pod/follow.rs b/crates/jacquard-api/src/pink_vase/pod/follow.rs
index bd20e243..6d88488b 100644
--- a/crates/jacquard-api/src/pink_vase/pod/follow.rs
+++ b/crates/jacquard-api/src/pink_vase/pod/follow.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -110,45 +113,45 @@ pub mod follow_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Show;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Show = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Show = S::Show;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `show` field to Set
     pub struct SetShow<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetShow<S> {}
     impl<S: State> State for SetShow<S> {
-        type CreatedAt = S::CreatedAt;
         type Show = Set<members::show>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Show = S::Show;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `show` field
         pub struct show(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FollowBuilder<'a, S: follow_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Follow<'a> {
@@ -162,9 +165,9 @@ impl<'a> FollowBuilder<'a, follow_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FollowBuilder<'a, follow_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> FollowBuilder<'a, follow_state::SetShow<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,14 +213,14 @@ where
 impl<'a, S> FollowBuilder<'a, S>
 where
     S: follow_state::State,
-    S::CreatedAt: follow_state::IsSet,
     S::Show: follow_state::IsSet,
+    S::CreatedAt: follow_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            show: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            show: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            show: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            show: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pink_vase/pod/like.rs b/crates/jacquard-api/src/pink_vase/pod/like.rs
index 471a2c6e..7752589e 100644
--- a/crates/jacquard-api/src/pink_vase/pod/like.rs
+++ b/crates/jacquard-api/src/pink_vase/pod/like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,9 +149,9 @@ pub mod like_state {
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -162,9 +165,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,8 +219,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pink_vase/pod/playlist.rs b/crates/jacquard-api/src/pink_vase/pod/playlist.rs
index f4fcd0c1..b64431eb 100644
--- a/crates/jacquard-api/src/pink_vase/pod/playlist.rs
+++ b/crates/jacquard-api/src/pink_vase/pod/playlist.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -243,64 +246,64 @@ pub mod playlist_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Items;
-        type CreatedAt;
         type Name;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Items = Unset;
-        type CreatedAt = Unset;
         type Name = Unset;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `items` field to Set
     pub struct SetItems<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetItems<S> {}
     impl<S: State> State for SetItems<S> {
         type Items = Set<members::items>;
-        type CreatedAt = S::CreatedAt;
-        type Name = S::Name;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type Items = S::Items;
-        type CreatedAt = Set<members::created_at>;
         type Name = S::Name;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
         type Items = S::Items;
-        type CreatedAt = S::CreatedAt;
         type Name = Set<members::name>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Items = S::Items;
+        type Name = S::Name;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `items` field
         pub struct items(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PlaylistBuilder<'a, S: playlist_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Vec<StrongRef<'a>>>,
         Option<CowStr<'a>>,
         Option<PlaylistVisibility<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Playlist<'a> {
@@ -314,9 +317,9 @@ impl<'a> PlaylistBuilder<'a, playlist_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PlaylistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -331,11 +334,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PlaylistBuilder<'a, playlist_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PlaylistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -343,12 +346,12 @@ where
 impl<'a, S: playlist_state::State> PlaylistBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -363,11 +366,11 @@ where
         mut self,
         value: impl Into<Vec<StrongRef<'a>>>,
     ) -> PlaylistBuilder<'a, playlist_state::SetItems<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PlaylistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -382,11 +385,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PlaylistBuilder<'a, playlist_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PlaylistBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -397,12 +400,12 @@ impl<'a, S: playlist_state::State> PlaylistBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PlaylistVisibility<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `visibility` field to an Option value (optional)
     pub fn maybe_visibility(mut self, value: Option<PlaylistVisibility<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -411,17 +414,17 @@ impl<'a, S> PlaylistBuilder<'a, S>
 where
     S: playlist_state::State,
     S::Items: playlist_state::IsSet,
-    S::CreatedAt: playlist_state::IsSet,
     S::Name: playlist_state::IsSet,
+    S::CreatedAt: playlist_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Playlist<'a> {
         Playlist {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            items: self.__unsafe_private_named.2.unwrap(),
-            name: self.__unsafe_private_named.3.unwrap(),
-            visibility: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            items: self._fields.2.unwrap(),
+            name: self._fields.3.unwrap(),
+            visibility: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -434,11 +437,11 @@ where
         >,
     ) -> Playlist<'a> {
         Playlist {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            items: self.__unsafe_private_named.2.unwrap(),
-            name: self.__unsafe_private_named.3.unwrap(),
-            visibility: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            items: self._fields.2.unwrap(),
+            name: self._fields.3.unwrap(),
+            visibility: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pink_vase/pod/show.rs b/crates/jacquard-api/src/pink_vase/pod/show.rs
index 6274f11c..618223cc 100644
--- a/crates/jacquard-api/src/pink_vase/pod/show.rs
+++ b/crates/jacquard-api/src/pink_vase/pod/show.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -202,44 +205,44 @@ pub mod show_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type CreatedAt;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type CreatedAt = S::CreatedAt;
+        type Name = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Name = S::Name;
         type CreatedAt = Set<members::created_at>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type CreatedAt = S::CreatedAt;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ShowBuilder<'a, S: show_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<CowStr<'a>>>,
         Option<BlobRef<'a>>,
         Option<Datetime>,
@@ -249,7 +252,7 @@ pub struct ShowBuilder<'a, S: show_state::State> {
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Show<'a> {
@@ -263,9 +266,9 @@ impl<'a> ShowBuilder<'a, show_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ShowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -273,12 +276,12 @@ impl<'a> ShowBuilder<'a, show_state::Empty> {
 impl<'a, S: show_state::State> ShowBuilder<'a, S> {
     /// Set the `categories` field (optional)
     pub fn categories(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `categories` field to an Option value (optional)
     pub fn maybe_categories(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -286,12 +289,12 @@ impl<'a, S: show_state::State> ShowBuilder<'a, S> {
 impl<'a, S: show_state::State> ShowBuilder<'a, S> {
     /// Set the `coverArt` field (optional)
     pub fn cover_art(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `coverArt` field to an Option value (optional)
     pub fn maybe_cover_art(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -306,11 +309,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ShowBuilder<'a, show_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ShowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -318,12 +321,12 @@ where
 impl<'a, S: show_state::State> ShowBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -331,12 +334,12 @@ impl<'a, S: show_state::State> ShowBuilder<'a, S> {
 impl<'a, S: show_state::State> ShowBuilder<'a, S> {
     /// Set the `explicit` field (optional)
     pub fn explicit(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `explicit` field to an Option value (optional)
     pub fn maybe_explicit(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -344,12 +347,12 @@ impl<'a, S: show_state::State> ShowBuilder<'a, S> {
 impl<'a, S: show_state::State> ShowBuilder<'a, S> {
     /// Set the `language` field (optional)
     pub fn language(mut self, value: impl Into<Option<Language>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `language` field to an Option value (optional)
     pub fn maybe_language(mut self, value: Option<Language>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -364,11 +367,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ShowBuilder<'a, show_state::SetName<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ShowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -376,12 +379,12 @@ where
 impl<'a, S: show_state::State> ShowBuilder<'a, S> {
     /// Set the `websiteUrl` field (optional)
     pub fn website_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `websiteUrl` field to an Option value (optional)
     pub fn maybe_website_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -389,20 +392,20 @@ impl<'a, S: show_state::State> ShowBuilder<'a, S> {
 impl<'a, S> ShowBuilder<'a, S>
 where
     S: show_state::State,
-    S::Name: show_state::IsSet,
     S::CreatedAt: show_state::IsSet,
+    S::Name: show_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Show<'a> {
         Show {
-            categories: self.__unsafe_private_named.0,
-            cover_art: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            explicit: self.__unsafe_private_named.4,
-            language: self.__unsafe_private_named.5,
-            name: self.__unsafe_private_named.6.unwrap(),
-            website_url: self.__unsafe_private_named.7,
+            categories: self._fields.0,
+            cover_art: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            explicit: self._fields.4,
+            language: self._fields.5,
+            name: self._fields.6.unwrap(),
+            website_url: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -415,14 +418,14 @@ where
         >,
     ) -> Show<'a> {
         Show {
-            categories: self.__unsafe_private_named.0,
-            cover_art: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            explicit: self.__unsafe_private_named.4,
-            language: self.__unsafe_private_named.5,
-            name: self.__unsafe_private_named.6.unwrap(),
-            website_url: self.__unsafe_private_named.7,
+            categories: self._fields.0,
+            cover_art: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            explicit: self._fields.4,
+            language: self._fields.5,
+            name: self._fields.6.unwrap(),
+            website_url: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_atwork/endorsement.rs b/crates/jacquard-api/src/place_atwork/endorsement.rs
index 661a46e6..a47bac6f 100644
--- a/crates/jacquard-api/src/place_atwork/endorsement.rs
+++ b/crates/jacquard-api/src/place_atwork/endorsement.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -145,81 +148,81 @@ pub mod endorsement_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Text;
+        type CreatedAt;
         type Receiver;
+        type Text;
         type Giver;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Text = Unset;
+        type CreatedAt = Unset;
         type Receiver = Unset;
+        type Text = Unset;
         type Giver = Unset;
-        type CreatedAt = Unset;
     }
-    ///State transition - sets the `text` field to Set
-    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetText<S> {}
-    impl<S: State> State for SetText<S> {
-        type Text = Set<members::text>;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
         type Receiver = S::Receiver;
+        type Text = S::Text;
         type Giver = S::Giver;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `receiver` field to Set
     pub struct SetReceiver<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetReceiver<S> {}
     impl<S: State> State for SetReceiver<S> {
-        type Text = S::Text;
+        type CreatedAt = S::CreatedAt;
         type Receiver = Set<members::receiver>;
+        type Text = S::Text;
         type Giver = S::Giver;
+    }
+    ///State transition - sets the `text` field to Set
+    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetText<S> {}
+    impl<S: State> State for SetText<S> {
         type CreatedAt = S::CreatedAt;
+        type Receiver = S::Receiver;
+        type Text = Set<members::text>;
+        type Giver = S::Giver;
     }
     ///State transition - sets the `giver` field to Set
     pub struct SetGiver<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetGiver<S> {}
     impl<S: State> State for SetGiver<S> {
-        type Text = S::Text;
-        type Receiver = S::Receiver;
-        type Giver = Set<members::giver>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type Text = S::Text;
         type Receiver = S::Receiver;
-        type Giver = S::Giver;
-        type CreatedAt = Set<members::created_at>;
+        type Text = S::Text;
+        type Giver = Set<members::giver>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `text` field
-        pub struct text(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `receiver` field
         pub struct receiver(());
+        ///Marker type for the `text` field
+        pub struct text(());
         ///Marker type for the `giver` field
         pub struct giver(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EndorsementBuilder<'a, S: endorsement_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Did<'a>>,
         Option<Did<'a>>,
         Option<Vec<StrongRef<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Endorsement<'a> {
@@ -233,9 +236,9 @@ impl<'a> EndorsementBuilder<'a, endorsement_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EndorsementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -250,11 +253,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EndorsementBuilder<'a, endorsement_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EndorsementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -269,11 +272,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> EndorsementBuilder<'a, endorsement_state::SetGiver<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EndorsementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -288,11 +291,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> EndorsementBuilder<'a, endorsement_state::SetReceiver<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EndorsementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -300,12 +303,12 @@ where
 impl<'a, S: endorsement_state::State> EndorsementBuilder<'a, S> {
     /// Set the `signatures` field (optional)
     pub fn signatures(mut self, value: impl Into<Option<Vec<StrongRef<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `signatures` field to an Option value (optional)
     pub fn maybe_signatures(mut self, value: Option<Vec<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -320,11 +323,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EndorsementBuilder<'a, endorsement_state::SetText<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         EndorsementBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -332,19 +335,19 @@ where
 impl<'a, S> EndorsementBuilder<'a, S>
 where
     S: endorsement_state::State,
-    S::Text: endorsement_state::IsSet,
+    S::CreatedAt: endorsement_state::IsSet,
     S::Receiver: endorsement_state::IsSet,
+    S::Text: endorsement_state::IsSet,
     S::Giver: endorsement_state::IsSet,
-    S::CreatedAt: endorsement_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Endorsement<'a> {
         Endorsement {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            giver: self.__unsafe_private_named.1.unwrap(),
-            receiver: self.__unsafe_private_named.2.unwrap(),
-            signatures: self.__unsafe_private_named.3,
-            text: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            giver: self._fields.1.unwrap(),
+            receiver: self._fields.2.unwrap(),
+            signatures: self._fields.3,
+            text: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -357,11 +360,11 @@ where
         >,
     ) -> Endorsement<'a> {
         Endorsement {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            giver: self.__unsafe_private_named.1.unwrap(),
-            receiver: self.__unsafe_private_named.2.unwrap(),
-            signatures: self.__unsafe_private_named.3,
-            text: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            giver: self._fields.1.unwrap(),
+            receiver: self._fields.2.unwrap(),
+            signatures: self._fields.3,
+            text: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_atwork/endorsement_proof.rs b/crates/jacquard-api/src/place_atwork/endorsement_proof.rs
index e54b8608..16520c26 100644
--- a/crates/jacquard-api/src/place_atwork/endorsement_proof.rs
+++ b/crates/jacquard-api/src/place_atwork/endorsement_proof.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -132,9 +135,9 @@ pub mod endorsement_proof_state {
 
 /// Builder for constructing an instance of this type
 pub struct EndorsementProofBuilder<'a, S: endorsement_proof_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> EndorsementProof<'a> {
@@ -148,9 +151,9 @@ impl<'a> EndorsementProofBuilder<'a, endorsement_proof_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EndorsementProofBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -165,11 +168,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> EndorsementProofBuilder<'a, endorsement_proof_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EndorsementProofBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,7 +185,7 @@ where
     /// Build the final struct
     pub fn build(self) -> EndorsementProof<'a> {
         EndorsementProof {
-            cid: self.__unsafe_private_named.0.unwrap(),
+            cid: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -195,7 +198,7 @@ where
         >,
     ) -> EndorsementProof<'a> {
         EndorsementProof {
-            cid: self.__unsafe_private_named.0.unwrap(),
+            cid: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_atwork/get_listing.rs b/crates/jacquard-api/src/place_atwork/get_listing.rs
index 701c9e5b..25c10f4d 100644
--- a/crates/jacquard-api/src/place_atwork/get_listing.rs
+++ b/crates/jacquard-api/src/place_atwork/get_listing.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -167,9 +170,9 @@ pub mod get_listing_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetListingBuilder<'a, S: get_listing_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetListing<'a> {
@@ -183,9 +186,9 @@ impl<'a> GetListingBuilder<'a, get_listing_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetListingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,11 +203,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetListingBuilder<'a, get_listing_state::SetRepo<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetListingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -219,11 +222,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetListingBuilder<'a, get_listing_state::SetRkey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetListingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -237,8 +240,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetListing<'a> {
         GetListing {
-            repo: self.__unsafe_private_named.0.unwrap(),
-            rkey: self.__unsafe_private_named.1.unwrap(),
+            repo: self._fields.0.unwrap(),
+            rkey: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/place_atwork/get_listings.rs b/crates/jacquard-api/src/place_atwork/get_listings.rs
index 6966f586..4733b818 100644
--- a/crates/jacquard-api/src/place_atwork/get_listings.rs
+++ b/crates/jacquard-api/src/place_atwork/get_listings.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -109,45 +112,45 @@ pub mod listing_record_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Cid;
         type Uri;
+        type Cid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Cid = Unset;
         type Uri = Unset;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type Cid = Set<members::cid>;
-        type Uri = S::Uri;
+        type Cid = Unset;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Cid = S::Cid;
         type Uri = Set<members::uri>;
+        type Cid = S::Cid;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Uri = S::Uri;
+        type Cid = Set<members::cid>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ListingRecordBuilder<'a, S: listing_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>, Option<Listing<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>, Option<Listing<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListingRecord<'a> {
@@ -161,9 +164,9 @@ impl<'a> ListingRecordBuilder<'a, listing_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListingRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> ListingRecordBuilder<'a, listing_record_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListingRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListingRecordBuilder<'a, listing_record_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListingRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,12 +212,12 @@ where
 impl<'a, S: listing_record_state::State> ListingRecordBuilder<'a, S> {
     /// Set the `value` field (optional)
     pub fn value(mut self, value: impl Into<Option<Listing<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `value` field to an Option value (optional)
     pub fn maybe_value(mut self, value: Option<Listing<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -222,15 +225,15 @@ impl<'a, S: listing_record_state::State> ListingRecordBuilder<'a, S> {
 impl<'a, S> ListingRecordBuilder<'a, S>
 where
     S: listing_record_state::State,
-    S::Cid: listing_record_state::IsSet,
     S::Uri: listing_record_state::IsSet,
+    S::Cid: listing_record_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ListingRecord<'a> {
         ListingRecord {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2,
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            value: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -243,9 +246,9 @@ where
         >,
     ) -> ListingRecord<'a> {
         ListingRecord {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2,
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            value: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -372,9 +375,9 @@ pub mod get_listings_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetListingsBuilder<'a, S: get_listings_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetListings<'a> {
@@ -388,9 +391,9 @@ impl<'a> GetListingsBuilder<'a, get_listings_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetListingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -398,12 +401,12 @@ impl<'a> GetListingsBuilder<'a, get_listings_state::Empty> {
 impl<'a, S: get_listings_state::State> GetListingsBuilder<'a, S> {
     /// Set the `identity` field (optional)
     pub fn identity(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `identity` field to an Option value (optional)
     pub fn maybe_identity(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -411,12 +414,12 @@ impl<'a, S: get_listings_state::State> GetListingsBuilder<'a, S> {
 impl<'a, S: get_listings_state::State> GetListingsBuilder<'a, S> {
     /// Set the `tag` field (optional)
     pub fn tag(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `tag` field to an Option value (optional)
     pub fn maybe_tag(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -428,8 +431,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetListings<'a> {
         GetListings {
-            identity: self.__unsafe_private_named.0,
-            tag: self.__unsafe_private_named.1,
+            identity: self._fields.0,
+            tag: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/place_atwork/listing.rs b/crates/jacquard-api/src/place_atwork/listing.rs
index 58ac2b98..c8dc3b64 100644
--- a/crates/jacquard-api/src/place_atwork/listing.rs
+++ b/crates/jacquard-api/src/place_atwork/listing.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -209,65 +212,65 @@ pub mod listing_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type NotAfter;
         type NotBefore;
         type Title;
-        type NotAfter;
         type Description;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type NotAfter = Unset;
         type NotBefore = Unset;
         type Title = Unset;
-        type NotAfter = Unset;
         type Description = Unset;
     }
+    ///State transition - sets the `not_after` field to Set
+    pub struct SetNotAfter<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetNotAfter<S> {}
+    impl<S: State> State for SetNotAfter<S> {
+        type NotAfter = Set<members::not_after>;
+        type NotBefore = S::NotBefore;
+        type Title = S::Title;
+        type Description = S::Description;
+    }
     ///State transition - sets the `not_before` field to Set
     pub struct SetNotBefore<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetNotBefore<S> {}
     impl<S: State> State for SetNotBefore<S> {
+        type NotAfter = S::NotAfter;
         type NotBefore = Set<members::not_before>;
         type Title = S::Title;
-        type NotAfter = S::NotAfter;
         type Description = S::Description;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type NotBefore = S::NotBefore;
-        type Title = Set<members::title>;
         type NotAfter = S::NotAfter;
-        type Description = S::Description;
-    }
-    ///State transition - sets the `not_after` field to Set
-    pub struct SetNotAfter<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetNotAfter<S> {}
-    impl<S: State> State for SetNotAfter<S> {
         type NotBefore = S::NotBefore;
-        type Title = S::Title;
-        type NotAfter = Set<members::not_after>;
+        type Title = Set<members::title>;
         type Description = S::Description;
     }
     ///State transition - sets the `description` field to Set
     pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDescription<S> {}
     impl<S: State> State for SetDescription<S> {
+        type NotAfter = S::NotAfter;
         type NotBefore = S::NotBefore;
         type Title = S::Title;
-        type NotAfter = S::NotAfter;
         type Description = Set<members::description>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `not_after` field
+        pub struct not_after(());
         ///Marker type for the `not_before` field
         pub struct not_before(());
         ///Marker type for the `title` field
         pub struct title(());
-        ///Marker type for the `not_after` field
-        pub struct not_after(());
         ///Marker type for the `description` field
         pub struct description(());
     }
@@ -275,8 +278,8 @@ pub mod listing_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListingBuilder<'a, S: listing_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<UriValue<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
@@ -286,7 +289,7 @@ pub struct ListingBuilder<'a, S: listing_state::State> {
         Option<Datetime>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Listing<'a> {
@@ -300,9 +303,9 @@ impl<'a> ListingBuilder<'a, listing_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -310,12 +313,12 @@ impl<'a> ListingBuilder<'a, listing_state::Empty> {
 impl<'a, S: listing_state::State> ListingBuilder<'a, S> {
     /// Set the `applyLink` field (optional)
     pub fn apply_link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `applyLink` field to an Option value (optional)
     pub fn maybe_apply_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -323,12 +326,12 @@ impl<'a, S: listing_state::State> ListingBuilder<'a, S> {
 impl<'a, S: listing_state::State> ListingBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -343,11 +346,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ListingBuilder<'a, listing_state::SetDescription<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ListingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -355,12 +358,12 @@ where
 impl<'a, S: listing_state::State> ListingBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -368,12 +371,12 @@ impl<'a, S: listing_state::State> ListingBuilder<'a, S> {
 impl<'a, S: listing_state::State> ListingBuilder<'a, S> {
     /// Set the `locations` field (optional)
     pub fn locations(mut self, value: impl Into<Option<Vec<Hthree<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `locations` field to an Option value (optional)
     pub fn maybe_locations(mut self, value: Option<Vec<Hthree<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -388,11 +391,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListingBuilder<'a, listing_state::SetNotAfter<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ListingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -407,11 +410,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListingBuilder<'a, listing_state::SetNotBefore<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ListingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -426,11 +429,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ListingBuilder<'a, listing_state::SetTitle<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ListingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -438,22 +441,22 @@ where
 impl<'a, S> ListingBuilder<'a, S>
 where
     S: listing_state::State,
+    S::NotAfter: listing_state::IsSet,
     S::NotBefore: listing_state::IsSet,
     S::Title: listing_state::IsSet,
-    S::NotAfter: listing_state::IsSet,
     S::Description: listing_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Listing<'a> {
         Listing {
-            apply_link: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2.unwrap(),
-            facets: self.__unsafe_private_named.3,
-            locations: self.__unsafe_private_named.4,
-            not_after: self.__unsafe_private_named.5.unwrap(),
-            not_before: self.__unsafe_private_named.6.unwrap(),
-            title: self.__unsafe_private_named.7.unwrap(),
+            apply_link: self._fields.0,
+            banner: self._fields.1,
+            description: self._fields.2.unwrap(),
+            facets: self._fields.3,
+            locations: self._fields.4,
+            not_after: self._fields.5.unwrap(),
+            not_before: self._fields.6.unwrap(),
+            title: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -466,14 +469,14 @@ where
         >,
     ) -> Listing<'a> {
         Listing {
-            apply_link: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2.unwrap(),
-            facets: self.__unsafe_private_named.3,
-            locations: self.__unsafe_private_named.4,
-            not_after: self.__unsafe_private_named.5.unwrap(),
-            not_before: self.__unsafe_private_named.6.unwrap(),
-            title: self.__unsafe_private_named.7.unwrap(),
+            apply_link: self._fields.0,
+            banner: self._fields.1,
+            description: self._fields.2.unwrap(),
+            facets: self._fields.3,
+            locations: self._fields.4,
+            not_after: self._fields.5.unwrap(),
+            not_before: self._fields.6.unwrap(),
+            title: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_atwork/profile.rs b/crates/jacquard-api/src/place_atwork/profile.rs
index 500fdfdb..569474d8 100644
--- a/crates/jacquard-api/src/place_atwork/profile.rs
+++ b/crates/jacquard-api/src/place_atwork/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -516,8 +519,8 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
@@ -527,7 +530,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<BlobRef<'a>>,
         Option<ProfileStatus<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -541,9 +544,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -551,12 +554,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -564,12 +567,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -577,12 +580,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -590,12 +593,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -603,12 +606,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -619,12 +622,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProfileProfileHost<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `profile_host` field to an Option value (optional)
     pub fn maybe_profile_host(mut self, value: Option<ProfileProfileHost<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -632,12 +635,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `resume` field (optional)
     pub fn resume(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `resume` field to an Option value (optional)
     pub fn maybe_resume(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -645,12 +648,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<ProfileStatus<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<ProfileStatus<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -662,14 +665,14 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3,
-            facets: self.__unsafe_private_named.4,
-            profile_host: self.__unsafe_private_named.5,
-            resume: self.__unsafe_private_named.6,
-            status: self.__unsafe_private_named.7,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            description: self._fields.2,
+            display_name: self._fields.3,
+            facets: self._fields.4,
+            profile_host: self._fields.5,
+            resume: self._fields.6,
+            status: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -682,14 +685,14 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3,
-            facets: self.__unsafe_private_named.4,
-            profile_host: self.__unsafe_private_named.5,
-            resume: self.__unsafe_private_named.6,
-            status: self.__unsafe_private_named.7,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            description: self._fields.2,
+            display_name: self._fields.3,
+            facets: self._fields.4,
+            profile_host: self._fields.5,
+            resume: self._fields.6,
+            status: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_atwork/search_listings.rs b/crates/jacquard-api/src/place_atwork/search_listings.rs
index 7be2c597..682923fc 100644
--- a/crates/jacquard-api/src/place_atwork/search_listings.rs
+++ b/crates/jacquard-api/src/place_atwork/search_listings.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -178,9 +181,9 @@ pub mod listing_record_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListingRecordBuilder<'a, S: listing_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>, Option<Listing<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>, Option<Listing<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListingRecord<'a> {
@@ -194,9 +197,9 @@ impl<'a> ListingRecordBuilder<'a, listing_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListingRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -211,11 +214,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> ListingRecordBuilder<'a, listing_record_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListingRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -230,11 +233,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListingRecordBuilder<'a, listing_record_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListingRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -242,12 +245,12 @@ where
 impl<'a, S: listing_record_state::State> ListingRecordBuilder<'a, S> {
     /// Set the `value` field (optional)
     pub fn value(mut self, value: impl Into<Option<Listing<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `value` field to an Option value (optional)
     pub fn maybe_value(mut self, value: Option<Listing<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -261,9 +264,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ListingRecord<'a> {
         ListingRecord {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2,
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            value: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -276,9 +279,9 @@ where
         >,
     ) -> ListingRecord<'a> {
         ListingRecord {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2,
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            value: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -410,9 +413,9 @@ pub mod search_listings_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchListingsBuilder<'a, S: search_listings_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchListings<'a> {
@@ -426,9 +429,9 @@ impl<'a> SearchListingsBuilder<'a, search_listings_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchListingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -443,11 +446,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SearchListingsBuilder<'a, search_listings_state::SetQuery<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SearchListingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -460,7 +463,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchListings<'a> {
         SearchListings {
-            query: self.__unsafe_private_named.0.unwrap(),
+            query: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/place_stream.rs b/crates/jacquard-api/src/place_stream.rs
index c76b1ac9..2e92eadd 100644
--- a/crates/jacquard-api/src/place_stream.rs
+++ b/crates/jacquard-api/src/place_stream.rs
@@ -22,7 +22,11 @@ pub mod richtext;
 pub mod segment;
 pub mod server;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -129,98 +133,98 @@ pub mod block_view_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Blocker;
-        type Uri;
+        type IndexedAt;
         type Cid;
         type Record;
-        type IndexedAt;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Blocker = Unset;
-        type Uri = Unset;
+        type IndexedAt = Unset;
         type Cid = Unset;
         type Record = Unset;
-        type IndexedAt = Unset;
+        type Uri = Unset;
     }
     ///State transition - sets the `blocker` field to Set
     pub struct SetBlocker<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBlocker<S> {}
     impl<S: State> State for SetBlocker<S> {
         type Blocker = Set<members::blocker>;
-        type Uri = S::Uri;
+        type IndexedAt = S::IndexedAt;
         type Cid = S::Cid;
         type Record = S::Record;
-        type IndexedAt = S::IndexedAt;
+        type Uri = S::Uri;
     }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
         type Blocker = S::Blocker;
-        type Uri = Set<members::uri>;
+        type IndexedAt = Set<members::indexed_at>;
         type Cid = S::Cid;
         type Record = S::Record;
-        type IndexedAt = S::IndexedAt;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
         type Blocker = S::Blocker;
-        type Uri = S::Uri;
+        type IndexedAt = S::IndexedAt;
         type Cid = Set<members::cid>;
         type Record = S::Record;
-        type IndexedAt = S::IndexedAt;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `record` field to Set
     pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecord<S> {}
     impl<S: State> State for SetRecord<S> {
         type Blocker = S::Blocker;
-        type Uri = S::Uri;
+        type IndexedAt = S::IndexedAt;
         type Cid = S::Cid;
         type Record = Set<members::record>;
-        type IndexedAt = S::IndexedAt;
+        type Uri = S::Uri;
     }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
         type Blocker = S::Blocker;
-        type Uri = S::Uri;
+        type IndexedAt = S::IndexedAt;
         type Cid = S::Cid;
         type Record = S::Record;
-        type IndexedAt = Set<members::indexed_at>;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `blocker` field
         pub struct blocker(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
+        ///Marker type for the `indexed_at` field
+        pub struct indexed_at(());
         ///Marker type for the `cid` field
         pub struct cid(());
         ///Marker type for the `record` field
         pub struct record(());
-        ///Marker type for the `indexed_at` field
-        pub struct indexed_at(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BlockViewBuilder<'a, S: block_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<Cid<'a>>,
         Option<Datetime>,
         Option<Block<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BlockView<'a> {
@@ -234,9 +238,9 @@ impl<'a> BlockViewBuilder<'a, block_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlockViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -251,11 +255,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> BlockViewBuilder<'a, block_view_state::SetBlocker<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlockViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -270,11 +274,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> BlockViewBuilder<'a, block_view_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BlockViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -289,11 +293,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BlockViewBuilder<'a, block_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BlockViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -308,11 +312,11 @@ where
         mut self,
         value: impl Into<Block<'a>>,
     ) -> BlockViewBuilder<'a, block_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BlockViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -327,11 +331,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> BlockViewBuilder<'a, block_view_state::SetUri<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         BlockViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -340,19 +344,19 @@ impl<'a, S> BlockViewBuilder<'a, S>
 where
     S: block_view_state::State,
     S::Blocker: block_view_state::IsSet,
-    S::Uri: block_view_state::IsSet,
+    S::IndexedAt: block_view_state::IsSet,
     S::Cid: block_view_state::IsSet,
     S::Record: block_view_state::IsSet,
-    S::IndexedAt: block_view_state::IsSet,
+    S::Uri: block_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> BlockView<'a> {
         BlockView {
-            blocker: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            record: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            blocker: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            record: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -365,11 +369,11 @@ where
         >,
     ) -> BlockView<'a> {
         BlockView {
-            blocker: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            record: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            blocker: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            record: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -519,9 +523,9 @@ pub mod renditions_state {
 
 /// Builder for constructing an instance of this type
 pub struct RenditionsBuilder<'a, S: renditions_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<place_stream::Rendition<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<place_stream::Rendition<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Renditions<'a> {
@@ -535,9 +539,9 @@ impl<'a> RenditionsBuilder<'a, renditions_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RenditionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -552,11 +556,11 @@ where
         mut self,
         value: impl Into<Vec<place_stream::Rendition<'a>>>,
     ) -> RenditionsBuilder<'a, renditions_state::SetRenditions<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RenditionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -569,7 +573,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Renditions<'a> {
         Renditions {
-            renditions: self.__unsafe_private_named.0.unwrap(),
+            renditions: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -582,7 +586,7 @@ where
         >,
     ) -> Renditions<'a> {
         Renditions {
-            renditions: self.__unsafe_private_named.0.unwrap(),
+            renditions: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/badge.rs b/crates/jacquard-api/src/place_stream/badge.rs
index 30ba053e..3c9314e1 100644
--- a/crates/jacquard-api/src/place_stream/badge.rs
+++ b/crates/jacquard-api/src/place_stream/badge.rs
@@ -7,7 +7,11 @@
 
 pub mod get_valid_badges;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -235,14 +239,14 @@ pub mod badge_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct BadgeViewBuilder<'a, S: badge_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BadgeViewBadgeType<'a>>,
         Option<Did<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BadgeView<'a> {
@@ -256,9 +260,9 @@ impl<'a> BadgeViewBuilder<'a, badge_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BadgeViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -273,11 +277,11 @@ where
         mut self,
         value: impl Into<BadgeViewBadgeType<'a>>,
     ) -> BadgeViewBuilder<'a, badge_view_state::SetBadgeType<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BadgeViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -292,11 +296,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> BadgeViewBuilder<'a, badge_view_state::SetIssuer<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BadgeViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -311,11 +315,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> BadgeViewBuilder<'a, badge_view_state::SetRecipient<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BadgeViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -323,12 +327,12 @@ where
 impl<'a, S: badge_view_state::State> BadgeViewBuilder<'a, S> {
     /// Set the `signature` field (optional)
     pub fn signature(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `signature` field to an Option value (optional)
     pub fn maybe_signature(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -343,10 +347,10 @@ where
     /// Build the final struct
     pub fn build(self) -> BadgeView<'a> {
         BadgeView {
-            badge_type: self.__unsafe_private_named.0.unwrap(),
-            issuer: self.__unsafe_private_named.1.unwrap(),
-            recipient: self.__unsafe_private_named.2.unwrap(),
-            signature: self.__unsafe_private_named.3,
+            badge_type: self._fields.0.unwrap(),
+            issuer: self._fields.1.unwrap(),
+            recipient: self._fields.2.unwrap(),
+            signature: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -359,10 +363,10 @@ where
         >,
     ) -> BadgeView<'a> {
         BadgeView {
-            badge_type: self.__unsafe_private_named.0.unwrap(),
-            issuer: self.__unsafe_private_named.1.unwrap(),
-            recipient: self.__unsafe_private_named.2.unwrap(),
-            signature: self.__unsafe_private_named.3,
+            badge_type: self._fields.0.unwrap(),
+            issuer: self._fields.1.unwrap(),
+            recipient: self._fields.2.unwrap(),
+            signature: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/badge/get_valid_badges.rs b/crates/jacquard-api/src/place_stream/badge/get_valid_badges.rs
index cdf1f552..81b0a1cd 100644
--- a/crates/jacquard-api/src/place_stream/badge/get_valid_badges.rs
+++ b/crates/jacquard-api/src/place_stream/badge/get_valid_badges.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -74,9 +77,9 @@ pub mod get_valid_badges_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetValidBadgesBuilder<'a, S: get_valid_badges_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetValidBadges<'a> {
@@ -90,9 +93,9 @@ impl<'a> GetValidBadgesBuilder<'a, get_valid_badges_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetValidBadgesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -100,12 +103,12 @@ impl<'a> GetValidBadgesBuilder<'a, get_valid_badges_state::Empty> {
 impl<'a, S: get_valid_badges_state::State> GetValidBadgesBuilder<'a, S> {
     /// Set the `streamer` field (optional)
     pub fn streamer(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `streamer` field to an Option value (optional)
     pub fn maybe_streamer(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -117,7 +120,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetValidBadges<'a> {
         GetValidBadges {
-            streamer: self.__unsafe_private_named.0,
+            streamer: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/place_stream/branding/delete_blob.rs b/crates/jacquard-api/src/place_stream/branding/delete_blob.rs
index 44e3f193..88476065 100644
--- a/crates/jacquard-api/src/place_stream/branding/delete_blob.rs
+++ b/crates/jacquard-api/src/place_stream/branding/delete_blob.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
diff --git a/crates/jacquard-api/src/place_stream/branding/get_blob.rs b/crates/jacquard-api/src/place_stream/branding/get_blob.rs
index f3331ba8..37cf57cd 100644
--- a/crates/jacquard-api/src/place_stream/branding/get_blob.rs
+++ b/crates/jacquard-api/src/place_stream/branding/get_blob.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -140,9 +141,9 @@ pub mod get_blob_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetBlobBuilder<'a, S: get_blob_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetBlob<'a> {
@@ -156,9 +157,9 @@ impl<'a> GetBlobBuilder<'a, get_blob_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetBlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -166,12 +167,12 @@ impl<'a> GetBlobBuilder<'a, get_blob_state::Empty> {
 impl<'a, S: get_blob_state::State> GetBlobBuilder<'a, S> {
     /// Set the `broadcaster` field (optional)
     pub fn broadcaster(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `broadcaster` field to an Option value (optional)
     pub fn maybe_broadcaster(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -186,11 +187,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetBlobBuilder<'a, get_blob_state::SetKey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetBlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,8 +204,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetBlob<'a> {
         GetBlob {
-            broadcaster: self.__unsafe_private_named.0,
-            key: self.__unsafe_private_named.1.unwrap(),
+            broadcaster: self._fields.0,
+            key: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/place_stream/branding/get_branding.rs b/crates/jacquard-api/src/place_stream/branding/get_branding.rs
index 6483ec5f..e40910a3 100644
--- a/crates/jacquard-api/src/place_stream/branding/get_branding.rs
+++ b/crates/jacquard-api/src/place_stream/branding/get_branding.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -260,9 +263,9 @@ pub mod get_branding_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetBrandingBuilder<'a, S: get_branding_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetBranding<'a> {
@@ -276,9 +279,9 @@ impl<'a> GetBrandingBuilder<'a, get_branding_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetBrandingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -286,12 +289,12 @@ impl<'a> GetBrandingBuilder<'a, get_branding_state::Empty> {
 impl<'a, S: get_branding_state::State> GetBrandingBuilder<'a, S> {
     /// Set the `broadcaster` field (optional)
     pub fn broadcaster(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `broadcaster` field to an Option value (optional)
     pub fn maybe_broadcaster(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -303,7 +306,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetBranding<'a> {
         GetBranding {
-            broadcaster: self.__unsafe_private_named.0,
+            broadcaster: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/place_stream/branding/update_blob.rs b/crates/jacquard-api/src/place_stream/branding/update_blob.rs
index 4b8b3bc9..3bf3f5f7 100644
--- a/crates/jacquard-api/src/place_stream/branding/update_blob.rs
+++ b/crates/jacquard-api/src/place_stream/branding/update_blob.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
diff --git a/crates/jacquard-api/src/place_stream/broadcast.rs b/crates/jacquard-api/src/place_stream/broadcast.rs
index a31a9fdf..fe8e0de0 100644
--- a/crates/jacquard-api/src/place_stream/broadcast.rs
+++ b/crates/jacquard-api/src/place_stream/broadcast.rs
@@ -9,7 +9,11 @@ pub mod get_broadcaster;
 pub mod origin;
 pub mod syndication;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -64,80 +68,80 @@ pub mod broadcast_origin_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Author;
+        type Uri;
         type Cid;
+        type Author;
         type Record;
-        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Author = Unset;
+        type Uri = Unset;
         type Cid = Unset;
+        type Author = Unset;
         type Record = Unset;
-        type Uri = Unset;
     }
-    ///State transition - sets the `author` field to Set
-    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAuthor<S> {}
-    impl<S: State> State for SetAuthor<S> {
-        type Author = Set<members::author>;
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Uri = Set<members::uri>;
         type Cid = S::Cid;
+        type Author = S::Author;
         type Record = S::Record;
-        type Uri = S::Uri;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type Author = S::Author;
+        type Uri = S::Uri;
         type Cid = Set<members::cid>;
+        type Author = S::Author;
         type Record = S::Record;
+    }
+    ///State transition - sets the `author` field to Set
+    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAuthor<S> {}
+    impl<S: State> State for SetAuthor<S> {
         type Uri = S::Uri;
+        type Cid = S::Cid;
+        type Author = Set<members::author>;
+        type Record = S::Record;
     }
     ///State transition - sets the `record` field to Set
     pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecord<S> {}
     impl<S: State> State for SetRecord<S> {
-        type Author = S::Author;
-        type Cid = S::Cid;
-        type Record = Set<members::record>;
         type Uri = S::Uri;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Author = S::Author;
         type Cid = S::Cid;
-        type Record = S::Record;
-        type Uri = Set<members::uri>;
+        type Author = S::Author;
+        type Record = Set<members::record>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `author` field
-        pub struct author(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
         ///Marker type for the `cid` field
         pub struct cid(());
+        ///Marker type for the `author` field
+        pub struct author(());
         ///Marker type for the `record` field
         pub struct record(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BroadcastOriginViewBuilder<'a, S: broadcast_origin_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<Cid<'a>>,
         Option<Data<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BroadcastOriginView<'a> {
@@ -151,9 +155,9 @@ impl<'a> BroadcastOriginViewBuilder<'a, broadcast_origin_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BroadcastOriginViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -168,11 +172,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> BroadcastOriginViewBuilder<'a, broadcast_origin_view_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BroadcastOriginViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -187,11 +191,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> BroadcastOriginViewBuilder<'a, broadcast_origin_view_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BroadcastOriginViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -206,11 +210,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> BroadcastOriginViewBuilder<'a, broadcast_origin_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BroadcastOriginViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -225,11 +229,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> BroadcastOriginViewBuilder<'a, broadcast_origin_view_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BroadcastOriginViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -237,18 +241,18 @@ where
 impl<'a, S> BroadcastOriginViewBuilder<'a, S>
 where
     S: broadcast_origin_view_state::State,
-    S::Author: broadcast_origin_view_state::IsSet,
+    S::Uri: broadcast_origin_view_state::IsSet,
     S::Cid: broadcast_origin_view_state::IsSet,
+    S::Author: broadcast_origin_view_state::IsSet,
     S::Record: broadcast_origin_view_state::IsSet,
-    S::Uri: broadcast_origin_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> BroadcastOriginView<'a> {
         BroadcastOriginView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            record: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            record: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -258,10 +262,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> BroadcastOriginView<'a> {
         BroadcastOriginView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            record: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            record: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/broadcast/get_broadcaster.rs b/crates/jacquard-api/src/place_stream/broadcast/get_broadcaster.rs
index 762c4b8f..6fe46f5d 100644
--- a/crates/jacquard-api/src/place_stream/broadcast/get_broadcaster.rs
+++ b/crates/jacquard-api/src/place_stream/broadcast/get_broadcaster.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/place_stream/broadcast/origin.rs b/crates/jacquard-api/src/place_stream/broadcast/origin.rs
index 7cfc7666..d9e55abb 100644
--- a/crates/jacquard-api/src/place_stream/broadcast/origin.rs
+++ b/crates/jacquard-api/src/place_stream/broadcast/origin.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -135,49 +138,49 @@ pub mod origin_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type UpdatedAt;
         type Streamer;
+        type UpdatedAt;
         type Server;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type UpdatedAt = Unset;
         type Streamer = Unset;
+        type UpdatedAt = Unset;
         type Server = Unset;
     }
-    ///State transition - sets the `updated_at` field to Set
-    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
-    impl<S: State> State for SetUpdatedAt<S> {
-        type UpdatedAt = Set<members::updated_at>;
-        type Streamer = S::Streamer;
-        type Server = S::Server;
-    }
     ///State transition - sets the `streamer` field to Set
     pub struct SetStreamer<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStreamer<S> {}
     impl<S: State> State for SetStreamer<S> {
-        type UpdatedAt = S::UpdatedAt;
         type Streamer = Set<members::streamer>;
+        type UpdatedAt = S::UpdatedAt;
+        type Server = S::Server;
+    }
+    ///State transition - sets the `updated_at` field to Set
+    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
+    impl<S: State> State for SetUpdatedAt<S> {
+        type Streamer = S::Streamer;
+        type UpdatedAt = Set<members::updated_at>;
         type Server = S::Server;
     }
     ///State transition - sets the `server` field to Set
     pub struct SetServer<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetServer<S> {}
     impl<S: State> State for SetServer<S> {
-        type UpdatedAt = S::UpdatedAt;
         type Streamer = S::Streamer;
+        type UpdatedAt = S::UpdatedAt;
         type Server = Set<members::server>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `updated_at` field
-        pub struct updated_at(());
         ///Marker type for the `streamer` field
         pub struct streamer(());
+        ///Marker type for the `updated_at` field
+        pub struct updated_at(());
         ///Marker type for the `server` field
         pub struct server(());
     }
@@ -185,8 +188,8 @@ pub mod origin_state {
 
 /// Builder for constructing an instance of this type
 pub struct OriginBuilder<'a, S: origin_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Did<'a>>,
         Option<CowStr<'a>>,
         Option<Did<'a>>,
@@ -194,7 +197,7 @@ pub struct OriginBuilder<'a, S: origin_state::State> {
         Option<Datetime>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Origin<'a> {
@@ -208,9 +211,9 @@ impl<'a> OriginBuilder<'a, origin_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OriginBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -218,12 +221,12 @@ impl<'a> OriginBuilder<'a, origin_state::Empty> {
 impl<'a, S: origin_state::State> OriginBuilder<'a, S> {
     /// Set the `broadcaster` field (optional)
     pub fn broadcaster(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `broadcaster` field to an Option value (optional)
     pub fn maybe_broadcaster(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -231,12 +234,12 @@ impl<'a, S: origin_state::State> OriginBuilder<'a, S> {
 impl<'a, S: origin_state::State> OriginBuilder<'a, S> {
     /// Set the `irohTicket` field (optional)
     pub fn iroh_ticket(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `irohTicket` field to an Option value (optional)
     pub fn maybe_iroh_ticket(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -251,11 +254,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> OriginBuilder<'a, origin_state::SetServer<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         OriginBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -270,11 +273,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> OriginBuilder<'a, origin_state::SetStreamer<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         OriginBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -289,11 +292,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> OriginBuilder<'a, origin_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         OriginBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -301,12 +304,12 @@ where
 impl<'a, S: origin_state::State> OriginBuilder<'a, S> {
     /// Set the `websocketURL` field (optional)
     pub fn websocket_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `websocketURL` field to an Option value (optional)
     pub fn maybe_websocket_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -314,19 +317,19 @@ impl<'a, S: origin_state::State> OriginBuilder<'a, S> {
 impl<'a, S> OriginBuilder<'a, S>
 where
     S: origin_state::State,
-    S::UpdatedAt: origin_state::IsSet,
     S::Streamer: origin_state::IsSet,
+    S::UpdatedAt: origin_state::IsSet,
     S::Server: origin_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Origin<'a> {
         Origin {
-            broadcaster: self.__unsafe_private_named.0,
-            iroh_ticket: self.__unsafe_private_named.1,
-            server: self.__unsafe_private_named.2.unwrap(),
-            streamer: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4.unwrap(),
-            websocket_url: self.__unsafe_private_named.5,
+            broadcaster: self._fields.0,
+            iroh_ticket: self._fields.1,
+            server: self._fields.2.unwrap(),
+            streamer: self._fields.3.unwrap(),
+            updated_at: self._fields.4.unwrap(),
+            websocket_url: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -339,12 +342,12 @@ where
         >,
     ) -> Origin<'a> {
         Origin {
-            broadcaster: self.__unsafe_private_named.0,
-            iroh_ticket: self.__unsafe_private_named.1,
-            server: self.__unsafe_private_named.2.unwrap(),
-            streamer: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4.unwrap(),
-            websocket_url: self.__unsafe_private_named.5,
+            broadcaster: self._fields.0,
+            iroh_ticket: self._fields.1,
+            server: self._fields.2.unwrap(),
+            streamer: self._fields.3.unwrap(),
+            updated_at: self._fields.4.unwrap(),
+            websocket_url: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/broadcast/syndication.rs b/crates/jacquard-api/src/place_stream/broadcast/syndication.rs
index c0a97324..41db8090 100644
--- a/crates/jacquard-api/src/place_stream/broadcast/syndication.rs
+++ b/crates/jacquard-api/src/place_stream/broadcast/syndication.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -113,59 +116,59 @@ pub mod syndication_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Streamer;
         type Broadcaster;
         type CreatedAt;
-        type Streamer;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Streamer = Unset;
         type Broadcaster = Unset;
         type CreatedAt = Unset;
-        type Streamer = Unset;
+    }
+    ///State transition - sets the `streamer` field to Set
+    pub struct SetStreamer<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStreamer<S> {}
+    impl<S: State> State for SetStreamer<S> {
+        type Streamer = Set<members::streamer>;
+        type Broadcaster = S::Broadcaster;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `broadcaster` field to Set
     pub struct SetBroadcaster<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBroadcaster<S> {}
     impl<S: State> State for SetBroadcaster<S> {
+        type Streamer = S::Streamer;
         type Broadcaster = Set<members::broadcaster>;
         type CreatedAt = S::CreatedAt;
-        type Streamer = S::Streamer;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Broadcaster = S::Broadcaster;
-        type CreatedAt = Set<members::created_at>;
         type Streamer = S::Streamer;
-    }
-    ///State transition - sets the `streamer` field to Set
-    pub struct SetStreamer<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStreamer<S> {}
-    impl<S: State> State for SetStreamer<S> {
         type Broadcaster = S::Broadcaster;
-        type CreatedAt = S::CreatedAt;
-        type Streamer = Set<members::streamer>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `streamer` field
+        pub struct streamer(());
         ///Marker type for the `broadcaster` field
         pub struct broadcaster(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `streamer` field
-        pub struct streamer(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SyndicationBuilder<'a, S: syndication_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Datetime>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Datetime>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Syndication<'a> {
@@ -179,9 +182,9 @@ impl<'a> SyndicationBuilder<'a, syndication_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SyndicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> SyndicationBuilder<'a, syndication_state::SetBroadcaster<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SyndicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SyndicationBuilder<'a, syndication_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SyndicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> SyndicationBuilder<'a, syndication_state::SetStreamer<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SyndicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,16 +249,16 @@ where
 impl<'a, S> SyndicationBuilder<'a, S>
 where
     S: syndication_state::State,
+    S::Streamer: syndication_state::IsSet,
     S::Broadcaster: syndication_state::IsSet,
     S::CreatedAt: syndication_state::IsSet,
-    S::Streamer: syndication_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Syndication<'a> {
         Syndication {
-            broadcaster: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            streamer: self.__unsafe_private_named.2.unwrap(),
+            broadcaster: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            streamer: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -268,9 +271,9 @@ where
         >,
     ) -> Syndication<'a> {
         Syndication {
-            broadcaster: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            streamer: self.__unsafe_private_named.2.unwrap(),
+            broadcaster: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            streamer: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/chat.rs b/crates/jacquard-api/src/place_stream/chat.rs
index ced8aa35..4bafcc7e 100644
--- a/crates/jacquard-api/src/place_stream/chat.rs
+++ b/crates/jacquard-api/src/place_stream/chat.rs
@@ -9,7 +9,11 @@ pub mod gate;
 pub mod message;
 pub mod profile;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -87,91 +91,91 @@ pub mod message_view_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Cid;
-        type Author;
-        type IndexedAt;
-        type Record;
         type Uri;
+        type Record;
+        type IndexedAt;
+        type Author;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Cid = Unset;
-        type Author = Unset;
-        type IndexedAt = Unset;
-        type Record = Unset;
         type Uri = Unset;
+        type Record = Unset;
+        type IndexedAt = Unset;
+        type Author = Unset;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
         type Cid = Set<members::cid>;
-        type Author = S::Author;
-        type IndexedAt = S::IndexedAt;
-        type Record = S::Record;
         type Uri = S::Uri;
-    }
-    ///State transition - sets the `author` field to Set
-    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAuthor<S> {}
-    impl<S: State> State for SetAuthor<S> {
-        type Cid = S::Cid;
-        type Author = Set<members::author>;
-        type IndexedAt = S::IndexedAt;
         type Record = S::Record;
-        type Uri = S::Uri;
+        type IndexedAt = S::IndexedAt;
+        type Author = S::Author;
     }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
         type Cid = S::Cid;
-        type Author = S::Author;
-        type IndexedAt = Set<members::indexed_at>;
+        type Uri = Set<members::uri>;
         type Record = S::Record;
-        type Uri = S::Uri;
+        type IndexedAt = S::IndexedAt;
+        type Author = S::Author;
     }
     ///State transition - sets the `record` field to Set
     pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecord<S> {}
     impl<S: State> State for SetRecord<S> {
         type Cid = S::Cid;
-        type Author = S::Author;
-        type IndexedAt = S::IndexedAt;
-        type Record = Set<members::record>;
         type Uri = S::Uri;
+        type Record = Set<members::record>;
+        type IndexedAt = S::IndexedAt;
+        type Author = S::Author;
     }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
         type Cid = S::Cid;
+        type Uri = S::Uri;
+        type Record = S::Record;
+        type IndexedAt = Set<members::indexed_at>;
         type Author = S::Author;
-        type IndexedAt = S::IndexedAt;
+    }
+    ///State transition - sets the `author` field to Set
+    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAuthor<S> {}
+    impl<S: State> State for SetAuthor<S> {
+        type Cid = S::Cid;
+        type Uri = S::Uri;
         type Record = S::Record;
-        type Uri = Set<members::uri>;
+        type IndexedAt = S::IndexedAt;
+        type Author = Set<members::author>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `cid` field
         pub struct cid(());
-        ///Marker type for the `author` field
-        pub struct author(());
-        ///Marker type for the `indexed_at` field
-        pub struct indexed_at(());
-        ///Marker type for the `record` field
-        pub struct record(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `record` field
+        pub struct record(());
+        ///Marker type for the `indexed_at` field
+        pub struct indexed_at(());
+        ///Marker type for the `author` field
+        pub struct author(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MessageViewBuilder<'a, S: message_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<Profile<'a>>,
         Option<Cid<'a>>,
@@ -181,7 +185,7 @@ pub struct MessageViewBuilder<'a, S: message_view_state::State> {
         Option<MessageViewReplyTo<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MessageView<'a> {
@@ -195,9 +199,9 @@ impl<'a> MessageViewBuilder<'a, message_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MessageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,11 +216,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> MessageViewBuilder<'a, message_view_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MessageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -224,12 +228,12 @@ where
 impl<'a, S: message_view_state::State> MessageViewBuilder<'a, S> {
     /// Set the `chatProfile` field (optional)
     pub fn chat_profile(mut self, value: impl Into<Option<Profile<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `chatProfile` field to an Option value (optional)
     pub fn maybe_chat_profile(mut self, value: Option<Profile<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -244,11 +248,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> MessageViewBuilder<'a, message_view_state::SetCid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         MessageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -256,12 +260,12 @@ where
 impl<'a, S: message_view_state::State> MessageViewBuilder<'a, S> {
     /// Set the `deleted` field (optional)
     pub fn deleted(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `deleted` field to an Option value (optional)
     pub fn maybe_deleted(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -276,11 +280,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MessageViewBuilder<'a, message_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         MessageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -295,11 +299,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> MessageViewBuilder<'a, message_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         MessageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -307,12 +311,12 @@ where
 impl<'a, S: message_view_state::State> MessageViewBuilder<'a, S> {
     /// Set the `replyTo` field (optional)
     pub fn reply_to(mut self, value: impl Into<Option<MessageViewReplyTo<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `replyTo` field to an Option value (optional)
     pub fn maybe_reply_to(mut self, value: Option<MessageViewReplyTo<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -327,11 +331,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> MessageViewBuilder<'a, message_view_state::SetUri<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         MessageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -340,22 +344,22 @@ impl<'a, S> MessageViewBuilder<'a, S>
 where
     S: message_view_state::State,
     S::Cid: message_view_state::IsSet,
-    S::Author: message_view_state::IsSet,
-    S::IndexedAt: message_view_state::IsSet,
-    S::Record: message_view_state::IsSet,
     S::Uri: message_view_state::IsSet,
+    S::Record: message_view_state::IsSet,
+    S::IndexedAt: message_view_state::IsSet,
+    S::Author: message_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> MessageView<'a> {
         MessageView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            chat_profile: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            deleted: self.__unsafe_private_named.3,
-            indexed_at: self.__unsafe_private_named.4.unwrap(),
-            record: self.__unsafe_private_named.5.unwrap(),
-            reply_to: self.__unsafe_private_named.6,
-            uri: self.__unsafe_private_named.7.unwrap(),
+            author: self._fields.0.unwrap(),
+            chat_profile: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            deleted: self._fields.3,
+            indexed_at: self._fields.4.unwrap(),
+            record: self._fields.5.unwrap(),
+            reply_to: self._fields.6,
+            uri: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -365,14 +369,14 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> MessageView<'a> {
         MessageView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            chat_profile: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            deleted: self.__unsafe_private_named.3,
-            indexed_at: self.__unsafe_private_named.4.unwrap(),
-            record: self.__unsafe_private_named.5.unwrap(),
-            reply_to: self.__unsafe_private_named.6,
-            uri: self.__unsafe_private_named.7.unwrap(),
+            author: self._fields.0.unwrap(),
+            chat_profile: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            deleted: self._fields.3,
+            indexed_at: self._fields.4.unwrap(),
+            record: self._fields.5.unwrap(),
+            reply_to: self._fields.6,
+            uri: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/chat/gate.rs b/crates/jacquard-api/src/place_stream/chat/gate.rs
index 82d8b57b..475ab6ec 100644
--- a/crates/jacquard-api/src/place_stream/chat/gate.rs
+++ b/crates/jacquard-api/src/place_stream/chat/gate.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -132,9 +135,9 @@ pub mod gate_state {
 
 /// Builder for constructing an instance of this type
 pub struct GateBuilder<'a, S: gate_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Gate<'a> {
@@ -148,9 +151,9 @@ impl<'a> GateBuilder<'a, gate_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -165,11 +168,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GateBuilder<'a, gate_state::SetHiddenMessage<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,7 +185,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Gate<'a> {
         Gate {
-            hidden_message: self.__unsafe_private_named.0.unwrap(),
+            hidden_message: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -195,7 +198,7 @@ where
         >,
     ) -> Gate<'a> {
         Gate {
-            hidden_message: self.__unsafe_private_named.0.unwrap(),
+            hidden_message: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/chat/message.rs b/crates/jacquard-api/src/place_stream/chat/message.rs
index 7e9b8b16..942af55d 100644
--- a/crates/jacquard-api/src/place_stream/chat/message.rs
+++ b/crates/jacquard-api/src/place_stream/chat/message.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -223,15 +226,15 @@ pub mod message_state {
 
 /// Builder for constructing an instance of this type
 pub struct MessageBuilder<'a, S: message_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Vec<Facet<'a>>>,
         Option<message::ReplyRef<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Message<'a> {
@@ -245,9 +248,9 @@ impl<'a> MessageBuilder<'a, message_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -262,11 +265,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MessageBuilder<'a, message_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -274,12 +277,12 @@ where
 impl<'a, S: message_state::State> MessageBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -287,12 +290,12 @@ impl<'a, S: message_state::State> MessageBuilder<'a, S> {
 impl<'a, S: message_state::State> MessageBuilder<'a, S> {
     /// Set the `reply` field (optional)
     pub fn reply(mut self, value: impl Into<Option<message::ReplyRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `reply` field to an Option value (optional)
     pub fn maybe_reply(mut self, value: Option<message::ReplyRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -307,11 +310,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MessageBuilder<'a, message_state::SetStreamer<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         MessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -326,11 +329,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MessageBuilder<'a, message_state::SetText<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         MessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -345,11 +348,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Message<'a> {
         Message {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            facets: self.__unsafe_private_named.1,
-            reply: self.__unsafe_private_named.2,
-            streamer: self.__unsafe_private_named.3.unwrap(),
-            text: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            facets: self._fields.1,
+            reply: self._fields.2,
+            streamer: self._fields.3.unwrap(),
+            text: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -362,11 +365,11 @@ where
         >,
     ) -> Message<'a> {
         Message {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            facets: self.__unsafe_private_named.1,
-            reply: self.__unsafe_private_named.2,
-            streamer: self.__unsafe_private_named.3.unwrap(),
-            text: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            facets: self._fields.1,
+            reply: self._fields.2,
+            streamer: self._fields.3.unwrap(),
+            text: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -548,9 +551,9 @@ pub mod reply_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReplyRefBuilder<'a, S: reply_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReplyRef<'a> {
@@ -564,9 +567,9 @@ impl<'a> ReplyRefBuilder<'a, reply_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -581,11 +584,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ReplyRefBuilder<'a, reply_ref_state::SetParent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -600,11 +603,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ReplyRefBuilder<'a, reply_ref_state::SetRoot<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -618,8 +621,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ReplyRef<'a> {
         ReplyRef {
-            parent: self.__unsafe_private_named.0.unwrap(),
-            root: self.__unsafe_private_named.1.unwrap(),
+            parent: self._fields.0.unwrap(),
+            root: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -632,8 +635,8 @@ where
         >,
     ) -> ReplyRef<'a> {
         ReplyRef {
-            parent: self.__unsafe_private_named.0.unwrap(),
-            root: self.__unsafe_private_named.1.unwrap(),
+            parent: self._fields.0.unwrap(),
+            root: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/chat/profile.rs b/crates/jacquard-api/src/place_stream/chat/profile.rs
index fb6fdfc2..73fb5e3c 100644
--- a/crates/jacquard-api/src/place_stream/chat/profile.rs
+++ b/crates/jacquard-api/src/place_stream/chat/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -195,59 +198,59 @@ pub mod color_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Blue;
         type Red;
         type Green;
-        type Blue;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Blue = Unset;
         type Red = Unset;
         type Green = Unset;
-        type Blue = Unset;
+    }
+    ///State transition - sets the `blue` field to Set
+    pub struct SetBlue<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBlue<S> {}
+    impl<S: State> State for SetBlue<S> {
+        type Blue = Set<members::blue>;
+        type Red = S::Red;
+        type Green = S::Green;
     }
     ///State transition - sets the `red` field to Set
     pub struct SetRed<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRed<S> {}
     impl<S: State> State for SetRed<S> {
+        type Blue = S::Blue;
         type Red = Set<members::red>;
         type Green = S::Green;
-        type Blue = S::Blue;
     }
     ///State transition - sets the `green` field to Set
     pub struct SetGreen<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetGreen<S> {}
     impl<S: State> State for SetGreen<S> {
-        type Red = S::Red;
-        type Green = Set<members::green>;
         type Blue = S::Blue;
-    }
-    ///State transition - sets the `blue` field to Set
-    pub struct SetBlue<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBlue<S> {}
-    impl<S: State> State for SetBlue<S> {
         type Red = S::Red;
-        type Green = S::Green;
-        type Blue = Set<members::blue>;
+        type Green = Set<members::green>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `blue` field
+        pub struct blue(());
         ///Marker type for the `red` field
         pub struct red(());
         ///Marker type for the `green` field
         pub struct green(());
-        ///Marker type for the `blue` field
-        pub struct blue(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ColorBuilder<'a, S: color_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Color<'a> {
@@ -261,9 +264,9 @@ impl<'a> ColorBuilder<'a, color_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ColorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -278,11 +281,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ColorBuilder<'a, color_state::SetBlue<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ColorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -297,11 +300,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ColorBuilder<'a, color_state::SetGreen<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ColorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -316,11 +319,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ColorBuilder<'a, color_state::SetRed<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ColorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -328,16 +331,16 @@ where
 impl<'a, S> ColorBuilder<'a, S>
 where
     S: color_state::State,
+    S::Blue: color_state::IsSet,
     S::Red: color_state::IsSet,
     S::Green: color_state::IsSet,
-    S::Blue: color_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Color<'a> {
         Color {
-            blue: self.__unsafe_private_named.0.unwrap(),
-            green: self.__unsafe_private_named.1.unwrap(),
-            red: self.__unsafe_private_named.2.unwrap(),
+            blue: self._fields.0.unwrap(),
+            green: self._fields.1.unwrap(),
+            red: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -350,9 +353,9 @@ where
         >,
     ) -> Color<'a> {
         Color {
-            blue: self.__unsafe_private_named.0.unwrap(),
-            green: self.__unsafe_private_named.1.unwrap(),
-            red: self.__unsafe_private_named.2.unwrap(),
+            blue: self._fields.0.unwrap(),
+            green: self._fields.1.unwrap(),
+            red: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -468,9 +471,9 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<profile::Color<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<profile::Color<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -484,9 +487,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -494,12 +497,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `color` field (optional)
     pub fn color(mut self, value: impl Into<Option<profile::Color<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `color` field to an Option value (optional)
     pub fn maybe_color(mut self, value: Option<profile::Color<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -511,7 +514,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            color: self.__unsafe_private_named.0,
+            color: self._fields.0,
             extra_data: Default::default(),
         }
     }
@@ -524,7 +527,7 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            color: self.__unsafe_private_named.0,
+            color: self._fields.0,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/graph/get_following_user.rs b/crates/jacquard-api/src/place_stream/graph/get_following_user.rs
index 37ceec8d..6f90246b 100644
--- a/crates/jacquard-api/src/place_stream/graph/get_following_user.rs
+++ b/crates/jacquard-api/src/place_stream/graph/get_following_user.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -101,9 +104,9 @@ pub mod get_following_user_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFollowingUserBuilder<'a, S: get_following_user_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFollowingUser<'a> {
@@ -117,9 +120,9 @@ impl<'a> GetFollowingUserBuilder<'a, get_following_user_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFollowingUserBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -134,11 +137,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetFollowingUserBuilder<'a, get_following_user_state::SetSubjectDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetFollowingUserBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -153,11 +156,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetFollowingUserBuilder<'a, get_following_user_state::SetUserDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetFollowingUserBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -171,8 +174,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFollowingUser<'a> {
         GetFollowingUser {
-            subject_did: self.__unsafe_private_named.0.unwrap(),
-            user_did: self.__unsafe_private_named.1.unwrap(),
+            subject_did: self._fields.0.unwrap(),
+            user_did: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/place_stream/ingest.rs b/crates/jacquard-api/src/place_stream/ingest.rs
index 76bcc399..04caa18a 100644
--- a/crates/jacquard-api/src/place_stream/ingest.rs
+++ b/crates/jacquard-api/src/place_stream/ingest.rs
@@ -7,7 +7,11 @@
 
 pub mod get_ingest_urls;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -60,45 +64,45 @@ pub mod ingest_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Url;
         type Type;
+        type Url;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Url = Unset;
         type Type = Unset;
-    }
-    ///State transition - sets the `url` field to Set
-    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUrl<S> {}
-    impl<S: State> State for SetUrl<S> {
-        type Url = Set<members::url>;
-        type Type = S::Type;
+        type Url = Unset;
     }
     ///State transition - sets the `type` field to Set
     pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetType<S> {}
     impl<S: State> State for SetType<S> {
-        type Url = S::Url;
         type Type = Set<members::r#type>;
+        type Url = S::Url;
+    }
+    ///State transition - sets the `url` field to Set
+    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUrl<S> {}
+    impl<S: State> State for SetUrl<S> {
+        type Type = S::Type;
+        type Url = Set<members::url>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `url` field
-        pub struct url(());
         ///Marker type for the `type` field
         pub struct r#type(());
+        ///Marker type for the `url` field
+        pub struct url(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct IngestBuilder<'a, S: ingest_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Ingest<'a> {
@@ -112,9 +116,9 @@ impl<'a> IngestBuilder<'a, ingest_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IngestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -129,11 +133,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> IngestBuilder<'a, ingest_state::SetType<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         IngestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,11 +152,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> IngestBuilder<'a, ingest_state::SetUrl<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         IngestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -160,14 +164,14 @@ where
 impl<'a, S> IngestBuilder<'a, S>
 where
     S: ingest_state::State,
-    S::Url: ingest_state::IsSet,
     S::Type: ingest_state::IsSet,
+    S::Url: ingest_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Ingest<'a> {
         Ingest {
-            r#type: self.__unsafe_private_named.0.unwrap(),
-            url: self.__unsafe_private_named.1.unwrap(),
+            r#type: self._fields.0.unwrap(),
+            url: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -180,8 +184,8 @@ where
         >,
     ) -> Ingest<'a> {
         Ingest {
-            r#type: self.__unsafe_private_named.0.unwrap(),
-            url: self.__unsafe_private_named.1.unwrap(),
+            r#type: self._fields.0.unwrap(),
+            url: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/ingest/get_ingest_urls.rs b/crates/jacquard-api/src/place_stream/ingest/get_ingest_urls.rs
index 4f9ca772..edea48e3 100644
--- a/crates/jacquard-api/src/place_stream/ingest/get_ingest_urls.rs
+++ b/crates/jacquard-api/src/place_stream/ingest/get_ingest_urls.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/place_stream/key.rs b/crates/jacquard-api/src/place_stream/key.rs
index dcbb0e8b..8bbdf03b 100644
--- a/crates/jacquard-api/src/place_stream/key.rs
+++ b/crates/jacquard-api/src/place_stream/key.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -172,9 +175,9 @@ pub mod key_state {
 
 /// Builder for constructing an instance of this type
 pub struct KeyBuilder<'a, S: key_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Key<'a> {
@@ -188,9 +191,9 @@ impl<'a> KeyBuilder<'a, key_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         KeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -205,11 +208,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> KeyBuilder<'a, key_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         KeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -217,12 +220,12 @@ where
 impl<'a, S: key_state::State> KeyBuilder<'a, S> {
     /// Set the `createdBy` field (optional)
     pub fn created_by(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdBy` field to an Option value (optional)
     pub fn maybe_created_by(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -237,11 +240,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> KeyBuilder<'a, key_state::SetSigningKey<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         KeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -255,9 +258,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Key<'a> {
         Key {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            created_by: self.__unsafe_private_named.1,
-            signing_key: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            created_by: self._fields.1,
+            signing_key: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -270,9 +273,9 @@ where
         >,
     ) -> Key<'a> {
         Key {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            created_by: self.__unsafe_private_named.1,
-            signing_key: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            created_by: self._fields.1,
+            signing_key: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/live/deny_teleport.rs b/crates/jacquard-api/src/place_stream/live/deny_teleport.rs
index 5e2f78cd..d2cfdf0a 100644
--- a/crates/jacquard-api/src/place_stream/live/deny_teleport.rs
+++ b/crates/jacquard-api/src/place_stream/live/deny_teleport.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -139,9 +142,9 @@ pub mod deny_teleport_state {
 
 /// Builder for constructing an instance of this type
 pub struct DenyTeleportBuilder<'a, S: deny_teleport_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DenyTeleport<'a> {
@@ -155,9 +158,9 @@ impl<'a> DenyTeleportBuilder<'a, deny_teleport_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DenyTeleportBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -172,11 +175,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> DenyTeleportBuilder<'a, deny_teleport_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DenyTeleportBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -189,7 +192,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DenyTeleport<'a> {
         DenyTeleport {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -202,7 +205,7 @@ where
         >,
     ) -> DenyTeleport<'a> {
         DenyTeleport {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/live/get_live_users.rs b/crates/jacquard-api/src/place_stream/live/get_live_users.rs
index 33d9a530..d5116c77 100644
--- a/crates/jacquard-api/src/place_stream/live/get_live_users.rs
+++ b/crates/jacquard-api/src/place_stream/live/get_live_users.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Datetime;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -82,8 +85,8 @@ pub mod get_live_users_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetLiveUsersBuilder<S: get_live_users_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<i64>),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<i64>),
 }
 
 impl GetLiveUsers {
@@ -97,8 +100,8 @@ impl GetLiveUsersBuilder<get_live_users_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetLiveUsersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
+            _state: PhantomData,
+            _fields: (None, None),
         }
     }
 }
@@ -106,12 +109,12 @@ impl GetLiveUsersBuilder<get_live_users_state::Empty> {
 impl<S: get_live_users_state::State> GetLiveUsersBuilder<S> {
     /// Set the `before` field (optional)
     pub fn before(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `before` field to an Option value (optional)
     pub fn maybe_before(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -119,12 +122,12 @@ impl<S: get_live_users_state::State> GetLiveUsersBuilder<S> {
 impl<S: get_live_users_state::State> GetLiveUsersBuilder<S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -136,8 +139,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetLiveUsers {
         GetLiveUsers {
-            before: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            before: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/place_stream/live/get_profile_card.rs b/crates/jacquard-api/src/place_stream/live/get_profile_card.rs
index 5ab03948..971070f4 100644
--- a/crates/jacquard-api/src/place_stream/live/get_profile_card.rs
+++ b/crates/jacquard-api/src/place_stream/live/get_profile_card.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -134,9 +135,9 @@ pub mod get_profile_card_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetProfileCardBuilder<'a, S: get_profile_card_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetProfileCard<'a> {
@@ -150,9 +151,9 @@ impl<'a> GetProfileCardBuilder<'a, get_profile_card_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetProfileCardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -167,11 +168,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetProfileCardBuilder<'a, get_profile_card_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetProfileCardBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -184,7 +185,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetProfileCard<'a> {
         GetProfileCard {
-            id: self.__unsafe_private_named.0.unwrap(),
+            id: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/place_stream/live/get_recommendations.rs b/crates/jacquard-api/src/place_stream/live/get_recommendations.rs
index dba88227..61736b56 100644
--- a/crates/jacquard-api/src/place_stream/live/get_recommendations.rs
+++ b/crates/jacquard-api/src/place_stream/live/get_recommendations.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -104,37 +107,37 @@ pub mod livestream_recommendation_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Source;
         type Did;
+        type Source;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Source = Unset;
         type Did = Unset;
-    }
-    ///State transition - sets the `source` field to Set
-    pub struct SetSource<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSource<S> {}
-    impl<S: State> State for SetSource<S> {
-        type Source = Set<members::source>;
-        type Did = S::Did;
+        type Source = Unset;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type Source = S::Source;
         type Did = Set<members::did>;
+        type Source = S::Source;
+    }
+    ///State transition - sets the `source` field to Set
+    pub struct SetSource<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSource<S> {}
+    impl<S: State> State for SetSource<S> {
+        type Did = S::Did;
+        type Source = Set<members::source>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `source` field
-        pub struct source(());
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `source` field
+        pub struct source(());
     }
 }
 
@@ -143,9 +146,9 @@ pub struct LivestreamRecommendationBuilder<
     'a,
     S: livestream_recommendation_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LivestreamRecommendation<'a> {
@@ -162,9 +165,9 @@ impl<'a> LivestreamRecommendationBuilder<'a, livestream_recommendation_state::Em
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LivestreamRecommendationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,11 +185,11 @@ where
         'a,
         livestream_recommendation_state::SetDid<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LivestreamRecommendationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,11 +207,11 @@ where
         'a,
         livestream_recommendation_state::SetSource<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LivestreamRecommendationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,14 +219,14 @@ where
 impl<'a, S> LivestreamRecommendationBuilder<'a, S>
 where
     S: livestream_recommendation_state::State,
-    S::Source: livestream_recommendation_state::IsSet,
     S::Did: livestream_recommendation_state::IsSet,
+    S::Source: livestream_recommendation_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LivestreamRecommendation<'a> {
         LivestreamRecommendation {
-            did: self.__unsafe_private_named.0.unwrap(),
-            source: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            source: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -236,8 +239,8 @@ where
         >,
     ) -> LivestreamRecommendation<'a> {
         LivestreamRecommendation {
-            did: self.__unsafe_private_named.0.unwrap(),
-            source: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            source: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -355,9 +358,9 @@ pub mod get_recommendations_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetRecommendationsBuilder<'a, S: get_recommendations_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetRecommendations<'a> {
@@ -371,9 +374,9 @@ impl<'a> GetRecommendationsBuilder<'a, get_recommendations_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetRecommendationsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -388,11 +391,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetRecommendationsBuilder<'a, get_recommendations_state::SetUserDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetRecommendationsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -405,7 +408,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetRecommendations<'a> {
         GetRecommendations {
-            user_did: self.__unsafe_private_named.0.unwrap(),
+            user_did: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/place_stream/live/get_segments.rs b/crates/jacquard-api/src/place_stream/live/get_segments.rs
index f0792621..b0466e01 100644
--- a/crates/jacquard-api/src/place_stream/live/get_segments.rs
+++ b/crates/jacquard-api/src/place_stream/live/get_segments.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::{Did, Datetime};
 use jacquard_derive::{IntoStatic, lexicon};
@@ -97,9 +100,9 @@ pub mod get_segments_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSegmentsBuilder<'a, S: get_segments_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<i64>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<i64>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSegments<'a> {
@@ -113,9 +116,9 @@ impl<'a> GetSegmentsBuilder<'a, get_segments_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSegmentsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -123,12 +126,12 @@ impl<'a> GetSegmentsBuilder<'a, get_segments_state::Empty> {
 impl<'a, S: get_segments_state::State> GetSegmentsBuilder<'a, S> {
     /// Set the `before` field (optional)
     pub fn before(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `before` field to an Option value (optional)
     pub fn maybe_before(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -136,12 +139,12 @@ impl<'a, S: get_segments_state::State> GetSegmentsBuilder<'a, S> {
 impl<'a, S: get_segments_state::State> GetSegmentsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -156,11 +159,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetSegmentsBuilder<'a, get_segments_state::SetUserDid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetSegmentsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -173,9 +176,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSegments<'a> {
         GetSegments {
-            before: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            user_did: self.__unsafe_private_named.2.unwrap(),
+            before: self._fields.0,
+            limit: self._fields.1,
+            user_did: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/place_stream/live/recommendations.rs b/crates/jacquard-api/src/place_stream/live/recommendations.rs
index fda4cf6e..c826f48e 100644
--- a/crates/jacquard-api/src/place_stream/live/recommendations.rs
+++ b/crates/jacquard-api/src/place_stream/live/recommendations.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -168,9 +171,9 @@ pub mod recommendations_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecommendationsBuilder<'a, S: recommendations_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Vec<Did<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Vec<Did<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Recommendations<'a> {
@@ -184,9 +187,9 @@ impl<'a> RecommendationsBuilder<'a, recommendations_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecommendationsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -201,11 +204,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RecommendationsBuilder<'a, recommendations_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecommendationsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -220,11 +223,11 @@ where
         mut self,
         value: impl Into<Vec<Did<'a>>>,
     ) -> RecommendationsBuilder<'a, recommendations_state::SetStreamers<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RecommendationsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -238,8 +241,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Recommendations<'a> {
         Recommendations {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            streamers: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            streamers: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -252,8 +255,8 @@ where
         >,
     ) -> Recommendations<'a> {
         Recommendations {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            streamers: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            streamers: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/live/search_actors_typeahead.rs b/crates/jacquard-api/src/place_stream/live/search_actors_typeahead.rs
index ec8cff55..aec1a695 100644
--- a/crates/jacquard-api/src/place_stream/live/search_actors_typeahead.rs
+++ b/crates/jacquard-api/src/place_stream/live/search_actors_typeahead.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -104,45 +107,45 @@ pub mod actor_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Handle;
         type Did;
+        type Handle;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Handle = Unset;
         type Did = Unset;
-    }
-    ///State transition - sets the `handle` field to Set
-    pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHandle<S> {}
-    impl<S: State> State for SetHandle<S> {
-        type Handle = Set<members::handle>;
-        type Did = S::Did;
+        type Handle = Unset;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type Handle = S::Handle;
         type Did = Set<members::did>;
+        type Handle = S::Handle;
+    }
+    ///State transition - sets the `handle` field to Set
+    pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHandle<S> {}
+    impl<S: State> State for SetHandle<S> {
+        type Did = S::Did;
+        type Handle = Set<members::handle>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `handle` field
-        pub struct handle(());
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `handle` field
+        pub struct handle(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ActorBuilder<'a, S: actor_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Handle<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Handle<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Actor<'a> {
@@ -156,9 +159,9 @@ impl<'a> ActorBuilder<'a, actor_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -173,11 +176,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ActorBuilder<'a, actor_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -192,11 +195,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> ActorBuilder<'a, actor_state::SetHandle<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ActorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,14 +207,14 @@ where
 impl<'a, S> ActorBuilder<'a, S>
 where
     S: actor_state::State,
-    S::Handle: actor_state::IsSet,
     S::Did: actor_state::IsSet,
+    S::Handle: actor_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Actor<'a> {
         Actor {
-            did: self.__unsafe_private_named.0.unwrap(),
-            handle: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            handle: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -224,8 +227,8 @@ where
         >,
     ) -> Actor<'a> {
         Actor {
-            did: self.__unsafe_private_named.0.unwrap(),
-            handle: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            handle: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -335,9 +338,9 @@ pub mod search_actors_typeahead_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchActorsTypeaheadBuilder<'a, S: search_actors_typeahead_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchActorsTypeahead<'a> {
@@ -354,9 +357,9 @@ impl<'a> SearchActorsTypeaheadBuilder<'a, search_actors_typeahead_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchActorsTypeaheadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -364,12 +367,12 @@ impl<'a> SearchActorsTypeaheadBuilder<'a, search_actors_typeahead_state::Empty>
 impl<'a, S: search_actors_typeahead_state::State> SearchActorsTypeaheadBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -377,12 +380,12 @@ impl<'a, S: search_actors_typeahead_state::State> SearchActorsTypeaheadBuilder<'
 impl<'a, S: search_actors_typeahead_state::State> SearchActorsTypeaheadBuilder<'a, S> {
     /// Set the `q` field (optional)
     pub fn q(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `q` field to an Option value (optional)
     pub fn maybe_q(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -394,8 +397,8 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchActorsTypeahead<'a> {
         SearchActorsTypeahead {
-            limit: self.__unsafe_private_named.0,
-            q: self.__unsafe_private_named.1,
+            limit: self._fields.0,
+            q: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/place_stream/live/start_livestream.rs b/crates/jacquard-api/src/place_stream/live/start_livestream.rs
index 8416669b..82667edb 100644
--- a/crates/jacquard-api/src/place_stream/live/start_livestream.rs
+++ b/crates/jacquard-api/src/place_stream/live/start_livestream.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::{Did, Cid, UriValue};
 use jacquard_derive::{IntoStatic, lexicon};
@@ -77,45 +80,45 @@ pub mod start_livestream_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Streamer;
         type Livestream;
+        type Streamer;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Streamer = Unset;
         type Livestream = Unset;
-    }
-    ///State transition - sets the `streamer` field to Set
-    pub struct SetStreamer<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStreamer<S> {}
-    impl<S: State> State for SetStreamer<S> {
-        type Streamer = Set<members::streamer>;
-        type Livestream = S::Livestream;
+        type Streamer = Unset;
     }
     ///State transition - sets the `livestream` field to Set
     pub struct SetLivestream<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLivestream<S> {}
     impl<S: State> State for SetLivestream<S> {
-        type Streamer = S::Streamer;
         type Livestream = Set<members::livestream>;
+        type Streamer = S::Streamer;
+    }
+    ///State transition - sets the `streamer` field to Set
+    pub struct SetStreamer<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStreamer<S> {}
+    impl<S: State> State for SetStreamer<S> {
+        type Livestream = S::Livestream;
+        type Streamer = Set<members::streamer>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `streamer` field
-        pub struct streamer(());
         ///Marker type for the `livestream` field
         pub struct livestream(());
+        ///Marker type for the `streamer` field
+        pub struct streamer(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct StartLivestreamBuilder<'a, S: start_livestream_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<Livestream<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<Livestream<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> StartLivestream<'a> {
@@ -129,9 +132,9 @@ impl<'a> StartLivestreamBuilder<'a, start_livestream_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StartLivestreamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -139,12 +142,12 @@ impl<'a> StartLivestreamBuilder<'a, start_livestream_state::Empty> {
 impl<'a, S: start_livestream_state::State> StartLivestreamBuilder<'a, S> {
     /// Set the `createBlueskyPost` field (optional)
     pub fn create_bluesky_post(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createBlueskyPost` field to an Option value (optional)
     pub fn maybe_create_bluesky_post(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -159,11 +162,11 @@ where
         mut self,
         value: impl Into<Livestream<'a>>,
     ) -> StartLivestreamBuilder<'a, start_livestream_state::SetLivestream<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StartLivestreamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> StartLivestreamBuilder<'a, start_livestream_state::SetStreamer<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         StartLivestreamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -190,15 +193,15 @@ where
 impl<'a, S> StartLivestreamBuilder<'a, S>
 where
     S: start_livestream_state::State,
-    S::Streamer: start_livestream_state::IsSet,
     S::Livestream: start_livestream_state::IsSet,
+    S::Streamer: start_livestream_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> StartLivestream<'a> {
         StartLivestream {
-            create_bluesky_post: self.__unsafe_private_named.0,
-            livestream: self.__unsafe_private_named.1.unwrap(),
-            streamer: self.__unsafe_private_named.2.unwrap(),
+            create_bluesky_post: self._fields.0,
+            livestream: self._fields.1.unwrap(),
+            streamer: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -211,9 +214,9 @@ where
         >,
     ) -> StartLivestream<'a> {
         StartLivestream {
-            create_bluesky_post: self.__unsafe_private_named.0,
-            livestream: self.__unsafe_private_named.1.unwrap(),
-            streamer: self.__unsafe_private_named.2.unwrap(),
+            create_bluesky_post: self._fields.0,
+            livestream: self._fields.1.unwrap(),
+            streamer: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/live/stop_livestream.rs b/crates/jacquard-api/src/place_stream/live/stop_livestream.rs
index 2bf88602..d2b0f370 100644
--- a/crates/jacquard-api/src/place_stream/live/stop_livestream.rs
+++ b/crates/jacquard-api/src/place_stream/live/stop_livestream.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::{Cid, UriValue};
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/place_stream/live/subscribe_segments.rs b/crates/jacquard-api/src/place_stream/live/subscribe_segments.rs
index d0147dbf..e55aabb1 100644
--- a/crates/jacquard-api/src/place_stream/live/subscribe_segments.rs
+++ b/crates/jacquard-api/src/place_stream/live/subscribe_segments.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -112,9 +113,9 @@ pub mod subscribe_segments_state {
 
 /// Builder for constructing an instance of this type
 pub struct SubscribeSegmentsBuilder<'a, S: subscribe_segments_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SubscribeSegments<'a> {
@@ -128,9 +129,9 @@ impl<'a> SubscribeSegmentsBuilder<'a, subscribe_segments_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubscribeSegmentsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -145,11 +146,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SubscribeSegmentsBuilder<'a, subscribe_segments_state::SetStreamer<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SubscribeSegmentsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -162,7 +163,7 @@ where
     /// Build the final struct
     pub fn build(self) -> SubscribeSegments<'a> {
         SubscribeSegments {
-            streamer: self.__unsafe_private_named.0.unwrap(),
+            streamer: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/place_stream/live/teleport.rs b/crates/jacquard-api/src/place_stream/live/teleport.rs
index 072b3397..2ca45f1c 100644
--- a/crates/jacquard-api/src/place_stream/live/teleport.rs
+++ b/crates/jacquard-api/src/place_stream/live/teleport.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -131,45 +134,45 @@ pub mod teleport_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type StartsAt;
         type Streamer;
+        type StartsAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type StartsAt = Unset;
         type Streamer = Unset;
-    }
-    ///State transition - sets the `starts_at` field to Set
-    pub struct SetStartsAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStartsAt<S> {}
-    impl<S: State> State for SetStartsAt<S> {
-        type StartsAt = Set<members::starts_at>;
-        type Streamer = S::Streamer;
+        type StartsAt = Unset;
     }
     ///State transition - sets the `streamer` field to Set
     pub struct SetStreamer<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStreamer<S> {}
     impl<S: State> State for SetStreamer<S> {
-        type StartsAt = S::StartsAt;
         type Streamer = Set<members::streamer>;
+        type StartsAt = S::StartsAt;
+    }
+    ///State transition - sets the `starts_at` field to Set
+    pub struct SetStartsAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStartsAt<S> {}
+    impl<S: State> State for SetStartsAt<S> {
+        type Streamer = S::Streamer;
+        type StartsAt = Set<members::starts_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `starts_at` field
-        pub struct starts_at(());
         ///Marker type for the `streamer` field
         pub struct streamer(());
+        ///Marker type for the `starts_at` field
+        pub struct starts_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TeleportBuilder<'a, S: teleport_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Datetime>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Datetime>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Teleport<'a> {
@@ -183,9 +186,9 @@ impl<'a> TeleportBuilder<'a, teleport_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TeleportBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -193,12 +196,12 @@ impl<'a> TeleportBuilder<'a, teleport_state::Empty> {
 impl<'a, S: teleport_state::State> TeleportBuilder<'a, S> {
     /// Set the `durationSeconds` field (optional)
     pub fn duration_seconds(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `durationSeconds` field to an Option value (optional)
     pub fn maybe_duration_seconds(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -213,11 +216,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TeleportBuilder<'a, teleport_state::SetStartsAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TeleportBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,11 +235,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> TeleportBuilder<'a, teleport_state::SetStreamer<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TeleportBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,15 +247,15 @@ where
 impl<'a, S> TeleportBuilder<'a, S>
 where
     S: teleport_state::State,
-    S::StartsAt: teleport_state::IsSet,
     S::Streamer: teleport_state::IsSet,
+    S::StartsAt: teleport_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Teleport<'a> {
         Teleport {
-            duration_seconds: self.__unsafe_private_named.0,
-            starts_at: self.__unsafe_private_named.1.unwrap(),
-            streamer: self.__unsafe_private_named.2.unwrap(),
+            duration_seconds: self._fields.0,
+            starts_at: self._fields.1.unwrap(),
+            streamer: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -265,9 +268,9 @@ where
         >,
     ) -> Teleport<'a> {
         Teleport {
-            duration_seconds: self.__unsafe_private_named.0,
-            starts_at: self.__unsafe_private_named.1.unwrap(),
-            streamer: self.__unsafe_private_named.2.unwrap(),
+            duration_seconds: self._fields.0,
+            starts_at: self._fields.1.unwrap(),
+            streamer: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/livestream.rs b/crates/jacquard-api/src/place_stream/livestream.rs
index 4d40f813..7f5524ad 100644
--- a/crates/jacquard-api/src/place_stream/livestream.rs
+++ b/crates/jacquard-api/src/place_stream/livestream.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -408,9 +411,9 @@ pub mod livestream_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Record;
         type Uri;
         type Cid;
-        type Record;
         type Author;
         type IndexedAt;
     }
@@ -418,19 +421,29 @@ pub mod livestream_view_state {
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Record = Unset;
         type Uri = Unset;
         type Cid = Unset;
-        type Record = Unset;
         type Author = Unset;
         type IndexedAt = Unset;
     }
+    ///State transition - sets the `record` field to Set
+    pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRecord<S> {}
+    impl<S: State> State for SetRecord<S> {
+        type Record = Set<members::record>;
+        type Uri = S::Uri;
+        type Cid = S::Cid;
+        type Author = S::Author;
+        type IndexedAt = S::IndexedAt;
+    }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
+        type Record = S::Record;
         type Uri = Set<members::uri>;
         type Cid = S::Cid;
-        type Record = S::Record;
         type Author = S::Author;
         type IndexedAt = S::IndexedAt;
     }
@@ -438,19 +451,9 @@ pub mod livestream_view_state {
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type Uri = S::Uri;
-        type Cid = Set<members::cid>;
         type Record = S::Record;
-        type Author = S::Author;
-        type IndexedAt = S::IndexedAt;
-    }
-    ///State transition - sets the `record` field to Set
-    pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRecord<S> {}
-    impl<S: State> State for SetRecord<S> {
         type Uri = S::Uri;
-        type Cid = S::Cid;
-        type Record = Set<members::record>;
+        type Cid = Set<members::cid>;
         type Author = S::Author;
         type IndexedAt = S::IndexedAt;
     }
@@ -458,9 +461,9 @@ pub mod livestream_view_state {
     pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthor<S> {}
     impl<S: State> State for SetAuthor<S> {
+        type Record = S::Record;
         type Uri = S::Uri;
         type Cid = S::Cid;
-        type Record = S::Record;
         type Author = Set<members::author>;
         type IndexedAt = S::IndexedAt;
     }
@@ -468,21 +471,21 @@ pub mod livestream_view_state {
     pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
     impl<S: State> State for SetIndexedAt<S> {
+        type Record = S::Record;
         type Uri = S::Uri;
         type Cid = S::Cid;
-        type Record = S::Record;
         type Author = S::Author;
         type IndexedAt = Set<members::indexed_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `record` field
+        pub struct record(());
         ///Marker type for the `uri` field
         pub struct uri(());
         ///Marker type for the `cid` field
         pub struct cid(());
-        ///Marker type for the `record` field
-        pub struct record(());
         ///Marker type for the `author` field
         pub struct author(());
         ///Marker type for the `indexed_at` field
@@ -492,8 +495,8 @@ pub mod livestream_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct LivestreamViewBuilder<'a, S: livestream_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<Cid<'a>>,
         Option<Datetime>,
@@ -501,7 +504,7 @@ pub struct LivestreamViewBuilder<'a, S: livestream_view_state::State> {
         Option<AtUri<'a>>,
         Option<livestream::ViewerCount<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LivestreamView<'a> {
@@ -515,9 +518,9 @@ impl<'a> LivestreamViewBuilder<'a, livestream_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LivestreamViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -532,11 +535,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> LivestreamViewBuilder<'a, livestream_view_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LivestreamViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -551,11 +554,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> LivestreamViewBuilder<'a, livestream_view_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LivestreamViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -570,11 +573,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LivestreamViewBuilder<'a, livestream_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LivestreamViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -589,11 +592,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> LivestreamViewBuilder<'a, livestream_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LivestreamViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -608,11 +611,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> LivestreamViewBuilder<'a, livestream_view_state::SetUri<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         LivestreamViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -623,7 +626,7 @@ impl<'a, S: livestream_view_state::State> LivestreamViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<livestream::ViewerCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `viewerCount` field to an Option value (optional)
@@ -631,7 +634,7 @@ impl<'a, S: livestream_view_state::State> LivestreamViewBuilder<'a, S> {
         mut self,
         value: Option<livestream::ViewerCount<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -639,21 +642,21 @@ impl<'a, S: livestream_view_state::State> LivestreamViewBuilder<'a, S> {
 impl<'a, S> LivestreamViewBuilder<'a, S>
 where
     S: livestream_view_state::State,
+    S::Record: livestream_view_state::IsSet,
     S::Uri: livestream_view_state::IsSet,
     S::Cid: livestream_view_state::IsSet,
-    S::Record: livestream_view_state::IsSet,
     S::Author: livestream_view_state::IsSet,
     S::IndexedAt: livestream_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LivestreamView<'a> {
         LivestreamView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            record: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
-            viewer_count: self.__unsafe_private_named.5,
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            record: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
+            viewer_count: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -663,12 +666,12 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> LivestreamView<'a> {
         LivestreamView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            record: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
-            viewer_count: self.__unsafe_private_named.5,
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            record: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
+            viewer_count: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
@@ -1058,44 +1061,44 @@ pub mod livestream_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Title;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Title = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Title = S::Title;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type CreatedAt = S::CreatedAt;
         type Title = Set<members::title>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Title = S::Title;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LivestreamBuilder<'a, S: livestream_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<Datetime>,
@@ -1108,7 +1111,7 @@ pub struct LivestreamBuilder<'a, S: livestream_state::State> {
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Livestream<'a> {
@@ -1122,21 +1125,9 @@ impl<'a> LivestreamBuilder<'a, livestream_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LivestreamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1144,12 +1135,12 @@ impl<'a> LivestreamBuilder<'a, livestream_state::Empty> {
 impl<'a, S: livestream_state::State> LivestreamBuilder<'a, S> {
     /// Set the `agent` field (optional)
     pub fn agent(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `agent` field to an Option value (optional)
     pub fn maybe_agent(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1157,12 +1148,12 @@ impl<'a, S: livestream_state::State> LivestreamBuilder<'a, S> {
 impl<'a, S: livestream_state::State> LivestreamBuilder<'a, S> {
     /// Set the `canonicalUrl` field (optional)
     pub fn canonical_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `canonicalUrl` field to an Option value (optional)
     pub fn maybe_canonical_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1177,11 +1168,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LivestreamBuilder<'a, livestream_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LivestreamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1189,12 +1180,12 @@ where
 impl<'a, S: livestream_state::State> LivestreamBuilder<'a, S> {
     /// Set the `endedAt` field (optional)
     pub fn ended_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `endedAt` field to an Option value (optional)
     pub fn maybe_ended_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1202,12 +1193,12 @@ impl<'a, S: livestream_state::State> LivestreamBuilder<'a, S> {
 impl<'a, S: livestream_state::State> LivestreamBuilder<'a, S> {
     /// Set the `idleTimeoutSeconds` field (optional)
     pub fn idle_timeout_seconds(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `idleTimeoutSeconds` field to an Option value (optional)
     pub fn maybe_idle_timeout_seconds(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1215,12 +1206,12 @@ impl<'a, S: livestream_state::State> LivestreamBuilder<'a, S> {
 impl<'a, S: livestream_state::State> LivestreamBuilder<'a, S> {
     /// Set the `lastSeenAt` field (optional)
     pub fn last_seen_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `lastSeenAt` field to an Option value (optional)
     pub fn maybe_last_seen_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1231,7 +1222,7 @@ impl<'a, S: livestream_state::State> LivestreamBuilder<'a, S> {
         mut self,
         value: impl Into<Option<livestream::NotificationSettings<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `notificationSettings` field to an Option value (optional)
@@ -1239,7 +1230,7 @@ impl<'a, S: livestream_state::State> LivestreamBuilder<'a, S> {
         mut self,
         value: Option<livestream::NotificationSettings<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1247,12 +1238,12 @@ impl<'a, S: livestream_state::State> LivestreamBuilder<'a, S> {
 impl<'a, S: livestream_state::State> LivestreamBuilder<'a, S> {
     /// Set the `post` field (optional)
     pub fn post(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `post` field to an Option value (optional)
     pub fn maybe_post(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -1260,12 +1251,12 @@ impl<'a, S: livestream_state::State> LivestreamBuilder<'a, S> {
 impl<'a, S: livestream_state::State> LivestreamBuilder<'a, S> {
     /// Set the `thumb` field (optional)
     pub fn thumb(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `thumb` field to an Option value (optional)
     pub fn maybe_thumb(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -1280,11 +1271,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LivestreamBuilder<'a, livestream_state::SetTitle<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         LivestreamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1292,12 +1283,12 @@ where
 impl<'a, S: livestream_state::State> LivestreamBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -1305,23 +1296,23 @@ impl<'a, S: livestream_state::State> LivestreamBuilder<'a, S> {
 impl<'a, S> LivestreamBuilder<'a, S>
 where
     S: livestream_state::State,
-    S::CreatedAt: livestream_state::IsSet,
     S::Title: livestream_state::IsSet,
+    S::CreatedAt: livestream_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Livestream<'a> {
         Livestream {
-            agent: self.__unsafe_private_named.0,
-            canonical_url: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            ended_at: self.__unsafe_private_named.3,
-            idle_timeout_seconds: self.__unsafe_private_named.4,
-            last_seen_at: self.__unsafe_private_named.5,
-            notification_settings: self.__unsafe_private_named.6,
-            post: self.__unsafe_private_named.7,
-            thumb: self.__unsafe_private_named.8,
-            title: self.__unsafe_private_named.9.unwrap(),
-            url: self.__unsafe_private_named.10,
+            agent: self._fields.0,
+            canonical_url: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            ended_at: self._fields.3,
+            idle_timeout_seconds: self._fields.4,
+            last_seen_at: self._fields.5,
+            notification_settings: self._fields.6,
+            post: self._fields.7,
+            thumb: self._fields.8,
+            title: self._fields.9.unwrap(),
+            url: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -1331,17 +1322,17 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Livestream<'a> {
         Livestream {
-            agent: self.__unsafe_private_named.0,
-            canonical_url: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            ended_at: self.__unsafe_private_named.3,
-            idle_timeout_seconds: self.__unsafe_private_named.4,
-            last_seen_at: self.__unsafe_private_named.5,
-            notification_settings: self.__unsafe_private_named.6,
-            post: self.__unsafe_private_named.7,
-            thumb: self.__unsafe_private_named.8,
-            title: self.__unsafe_private_named.9.unwrap(),
-            url: self.__unsafe_private_named.10,
+            agent: self._fields.0,
+            canonical_url: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            ended_at: self._fields.3,
+            idle_timeout_seconds: self._fields.4,
+            last_seen_at: self._fields.5,
+            notification_settings: self._fields.6,
+            post: self._fields.7,
+            thumb: self._fields.8,
+            title: self._fields.9.unwrap(),
+            url: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
@@ -1381,9 +1372,9 @@ pub mod streamplace_anything_state {
 
 /// Builder for constructing an instance of this type
 pub struct StreamplaceAnythingBuilder<'a, S: streamplace_anything_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StreamplaceAnythingLivestream<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StreamplaceAnythingLivestream<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> StreamplaceAnything<'a> {
@@ -1397,9 +1388,9 @@ impl<'a> StreamplaceAnythingBuilder<'a, streamplace_anything_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StreamplaceAnythingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1414,11 +1405,11 @@ where
         mut self,
         value: impl Into<StreamplaceAnythingLivestream<'a>>,
     ) -> StreamplaceAnythingBuilder<'a, streamplace_anything_state::SetLivestream<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StreamplaceAnythingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1431,7 +1422,7 @@ where
     /// Build the final struct
     pub fn build(self) -> StreamplaceAnything<'a> {
         StreamplaceAnything {
-            livestream: self.__unsafe_private_named.0.unwrap(),
+            livestream: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1441,7 +1432,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> StreamplaceAnything<'a> {
         StreamplaceAnything {
-            livestream: self.__unsafe_private_named.0.unwrap(),
+            livestream: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1457,81 +1448,81 @@ pub mod teleport_arrival_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type ViewerCount;
         type Source;
         type TeleportUri;
         type StartsAt;
-        type ViewerCount;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type ViewerCount = Unset;
         type Source = Unset;
         type TeleportUri = Unset;
         type StartsAt = Unset;
-        type ViewerCount = Unset;
+    }
+    ///State transition - sets the `viewer_count` field to Set
+    pub struct SetViewerCount<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetViewerCount<S> {}
+    impl<S: State> State for SetViewerCount<S> {
+        type ViewerCount = Set<members::viewer_count>;
+        type Source = S::Source;
+        type TeleportUri = S::TeleportUri;
+        type StartsAt = S::StartsAt;
     }
     ///State transition - sets the `source` field to Set
     pub struct SetSource<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSource<S> {}
     impl<S: State> State for SetSource<S> {
+        type ViewerCount = S::ViewerCount;
         type Source = Set<members::source>;
         type TeleportUri = S::TeleportUri;
         type StartsAt = S::StartsAt;
-        type ViewerCount = S::ViewerCount;
     }
     ///State transition - sets the `teleport_uri` field to Set
     pub struct SetTeleportUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTeleportUri<S> {}
     impl<S: State> State for SetTeleportUri<S> {
+        type ViewerCount = S::ViewerCount;
         type Source = S::Source;
         type TeleportUri = Set<members::teleport_uri>;
         type StartsAt = S::StartsAt;
-        type ViewerCount = S::ViewerCount;
     }
     ///State transition - sets the `starts_at` field to Set
     pub struct SetStartsAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStartsAt<S> {}
     impl<S: State> State for SetStartsAt<S> {
-        type Source = S::Source;
-        type TeleportUri = S::TeleportUri;
-        type StartsAt = Set<members::starts_at>;
         type ViewerCount = S::ViewerCount;
-    }
-    ///State transition - sets the `viewer_count` field to Set
-    pub struct SetViewerCount<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetViewerCount<S> {}
-    impl<S: State> State for SetViewerCount<S> {
         type Source = S::Source;
         type TeleportUri = S::TeleportUri;
-        type StartsAt = S::StartsAt;
-        type ViewerCount = Set<members::viewer_count>;
+        type StartsAt = Set<members::starts_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `viewer_count` field
+        pub struct viewer_count(());
         ///Marker type for the `source` field
         pub struct source(());
         ///Marker type for the `teleport_uri` field
         pub struct teleport_uri(());
         ///Marker type for the `starts_at` field
         pub struct starts_at(());
-        ///Marker type for the `viewer_count` field
-        pub struct viewer_count(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TeleportArrivalBuilder<'a, S: teleport_arrival_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Profile<'a>>,
         Option<ProfileViewBasic<'a>>,
         Option<Datetime>,
         Option<AtUri<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TeleportArrival<'a> {
@@ -1545,9 +1536,9 @@ impl<'a> TeleportArrivalBuilder<'a, teleport_arrival_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TeleportArrivalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1555,12 +1546,12 @@ impl<'a> TeleportArrivalBuilder<'a, teleport_arrival_state::Empty> {
 impl<'a, S: teleport_arrival_state::State> TeleportArrivalBuilder<'a, S> {
     /// Set the `chatProfile` field (optional)
     pub fn chat_profile(mut self, value: impl Into<Option<Profile<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `chatProfile` field to an Option value (optional)
     pub fn maybe_chat_profile(mut self, value: Option<Profile<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1575,11 +1566,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> TeleportArrivalBuilder<'a, teleport_arrival_state::SetSource<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TeleportArrivalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1594,11 +1585,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TeleportArrivalBuilder<'a, teleport_arrival_state::SetStartsAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TeleportArrivalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1613,11 +1604,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> TeleportArrivalBuilder<'a, teleport_arrival_state::SetTeleportUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TeleportArrivalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1632,11 +1623,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> TeleportArrivalBuilder<'a, teleport_arrival_state::SetViewerCount<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         TeleportArrivalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1644,19 +1635,19 @@ where
 impl<'a, S> TeleportArrivalBuilder<'a, S>
 where
     S: teleport_arrival_state::State,
+    S::ViewerCount: teleport_arrival_state::IsSet,
     S::Source: teleport_arrival_state::IsSet,
     S::TeleportUri: teleport_arrival_state::IsSet,
     S::StartsAt: teleport_arrival_state::IsSet,
-    S::ViewerCount: teleport_arrival_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TeleportArrival<'a> {
         TeleportArrival {
-            chat_profile: self.__unsafe_private_named.0,
-            source: self.__unsafe_private_named.1.unwrap(),
-            starts_at: self.__unsafe_private_named.2.unwrap(),
-            teleport_uri: self.__unsafe_private_named.3.unwrap(),
-            viewer_count: self.__unsafe_private_named.4.unwrap(),
+            chat_profile: self._fields.0,
+            source: self._fields.1.unwrap(),
+            starts_at: self._fields.2.unwrap(),
+            teleport_uri: self._fields.3.unwrap(),
+            viewer_count: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1666,11 +1657,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> TeleportArrival<'a> {
         TeleportArrival {
-            chat_profile: self.__unsafe_private_named.0,
-            source: self.__unsafe_private_named.1.unwrap(),
-            starts_at: self.__unsafe_private_named.2.unwrap(),
-            teleport_uri: self.__unsafe_private_named.3.unwrap(),
-            viewer_count: self.__unsafe_private_named.4.unwrap(),
+            chat_profile: self._fields.0,
+            source: self._fields.1.unwrap(),
+            starts_at: self._fields.2.unwrap(),
+            teleport_uri: self._fields.3.unwrap(),
+            viewer_count: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1722,9 +1713,9 @@ pub mod teleport_canceled_state {
 
 /// Builder for constructing an instance of this type
 pub struct TeleportCanceledBuilder<'a, S: teleport_canceled_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TeleportCanceled<'a> {
@@ -1738,9 +1729,9 @@ impl<'a> TeleportCanceledBuilder<'a, teleport_canceled_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TeleportCanceledBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1755,11 +1746,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TeleportCanceledBuilder<'a, teleport_canceled_state::SetReason<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TeleportCanceledBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1774,11 +1765,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> TeleportCanceledBuilder<'a, teleport_canceled_state::SetTeleportUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TeleportCanceledBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1792,8 +1783,8 @@ where
     /// Build the final struct
     pub fn build(self) -> TeleportCanceled<'a> {
         TeleportCanceled {
-            reason: self.__unsafe_private_named.0.unwrap(),
-            teleport_uri: self.__unsafe_private_named.1.unwrap(),
+            reason: self._fields.0.unwrap(),
+            teleport_uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1803,8 +1794,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> TeleportCanceled<'a> {
         TeleportCanceled {
-            reason: self.__unsafe_private_named.0.unwrap(),
-            teleport_uri: self.__unsafe_private_named.1.unwrap(),
+            reason: self._fields.0.unwrap(),
+            teleport_uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1844,9 +1835,9 @@ pub mod viewer_count_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewerCountBuilder<'a, S: viewer_count_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ViewerCount<'a> {
@@ -1860,9 +1851,9 @@ impl<'a> ViewerCountBuilder<'a, viewer_count_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewerCountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1877,11 +1868,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ViewerCountBuilder<'a, viewer_count_state::SetCount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewerCountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1894,7 +1885,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ViewerCount<'a> {
         ViewerCount {
-            count: self.__unsafe_private_named.0.unwrap(),
+            count: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1904,7 +1895,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ViewerCount<'a> {
         ViewerCount {
-            count: self.__unsafe_private_named.0.unwrap(),
+            count: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/metadata/configuration.rs b/crates/jacquard-api/src/place_stream/metadata/configuration.rs
index b3d89a4c..be721efc 100644
--- a/crates/jacquard-api/src/place_stream/metadata/configuration.rs
+++ b/crates/jacquard-api/src/place_stream/metadata/configuration.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -128,13 +131,13 @@ pub mod configuration_state {
 
 /// Builder for constructing an instance of this type
 pub struct ConfigurationBuilder<'a, S: configuration_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ContentRights<'a>>,
         Option<ContentWarnings<'a>>,
         Option<DistributionPolicy<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Configuration<'a> {
@@ -148,9 +151,9 @@ impl<'a> ConfigurationBuilder<'a, configuration_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ConfigurationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -161,12 +164,12 @@ impl<'a, S: configuration_state::State> ConfigurationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ContentRights<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `contentRights` field to an Option value (optional)
     pub fn maybe_content_rights(mut self, value: Option<ContentRights<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -177,12 +180,12 @@ impl<'a, S: configuration_state::State> ConfigurationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ContentWarnings<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `contentWarnings` field to an Option value (optional)
     pub fn maybe_content_warnings(mut self, value: Option<ContentWarnings<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -193,7 +196,7 @@ impl<'a, S: configuration_state::State> ConfigurationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<DistributionPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `distributionPolicy` field to an Option value (optional)
@@ -201,7 +204,7 @@ impl<'a, S: configuration_state::State> ConfigurationBuilder<'a, S> {
         mut self,
         value: Option<DistributionPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -213,9 +216,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Configuration<'a> {
         Configuration {
-            content_rights: self.__unsafe_private_named.0,
-            content_warnings: self.__unsafe_private_named.1,
-            distribution_policy: self.__unsafe_private_named.2,
+            content_rights: self._fields.0,
+            content_warnings: self._fields.1,
+            distribution_policy: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -228,9 +231,9 @@ where
         >,
     ) -> Configuration<'a> {
         Configuration {
-            content_rights: self.__unsafe_private_named.0,
-            content_warnings: self.__unsafe_private_named.1,
-            distribution_policy: self.__unsafe_private_named.2,
+            content_rights: self._fields.0,
+            content_warnings: self._fields.1,
+            distribution_policy: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/moderation.rs b/crates/jacquard-api/src/place_stream/moderation.rs
index cabecfa9..543970ef 100644
--- a/crates/jacquard-api/src/place_stream/moderation.rs
+++ b/crates/jacquard-api/src/place_stream/moderation.rs
@@ -12,7 +12,11 @@ pub mod delete_gate;
 pub mod permission;
 pub mod update_livestream;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -137,14 +141,14 @@ pub mod permission_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct PermissionViewBuilder<'a, S: permission_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<Cid<'a>>,
         Option<Data<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PermissionView<'a> {
@@ -158,9 +162,9 @@ impl<'a> PermissionViewBuilder<'a, permission_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PermissionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -175,11 +179,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> PermissionViewBuilder<'a, permission_view_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PermissionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -194,11 +198,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> PermissionViewBuilder<'a, permission_view_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PermissionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,11 +217,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> PermissionViewBuilder<'a, permission_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PermissionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,11 +236,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PermissionViewBuilder<'a, permission_view_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PermissionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -252,10 +256,10 @@ where
     /// Build the final struct
     pub fn build(self) -> PermissionView<'a> {
         PermissionView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            record: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            record: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -265,10 +269,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> PermissionView<'a> {
         PermissionView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            record: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            record: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/moderation/create_block.rs b/crates/jacquard-api/src/place_stream/moderation/create_block.rs
index 1b46c148..0644561b 100644
--- a/crates/jacquard-api/src/place_stream/moderation/create_block.rs
+++ b/crates/jacquard-api/src/place_stream/moderation/create_block.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, AtUri, Cid};
@@ -136,45 +139,45 @@ pub mod create_block_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type Streamer;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type Streamer = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type Streamer = S::Streamer;
+        type Subject = Unset;
     }
     ///State transition - sets the `streamer` field to Set
     pub struct SetStreamer<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStreamer<S> {}
     impl<S: State> State for SetStreamer<S> {
-        type Subject = S::Subject;
         type Streamer = Set<members::streamer>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type Streamer = S::Streamer;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `streamer` field
         pub struct streamer(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CreateBlockBuilder<'a, S: create_block_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Did<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Did<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CreateBlock<'a> {
@@ -188,9 +191,9 @@ impl<'a> CreateBlockBuilder<'a, create_block_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreateBlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,12 +201,12 @@ impl<'a> CreateBlockBuilder<'a, create_block_state::Empty> {
 impl<'a, S: create_block_state::State> CreateBlockBuilder<'a, S> {
     /// Set the `reason` field (optional)
     pub fn reason(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `reason` field to an Option value (optional)
     pub fn maybe_reason(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -218,11 +221,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> CreateBlockBuilder<'a, create_block_state::SetStreamer<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CreateBlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -237,11 +240,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> CreateBlockBuilder<'a, create_block_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CreateBlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,15 +252,15 @@ where
 impl<'a, S> CreateBlockBuilder<'a, S>
 where
     S: create_block_state::State,
-    S::Subject: create_block_state::IsSet,
     S::Streamer: create_block_state::IsSet,
+    S::Subject: create_block_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CreateBlock<'a> {
         CreateBlock {
-            reason: self.__unsafe_private_named.0,
-            streamer: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            reason: self._fields.0,
+            streamer: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -270,9 +273,9 @@ where
         >,
     ) -> CreateBlock<'a> {
         CreateBlock {
-            reason: self.__unsafe_private_named.0,
-            streamer: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            reason: self._fields.0,
+            streamer: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/moderation/create_gate.rs b/crates/jacquard-api/src/place_stream/moderation/create_gate.rs
index f44035a8..6d4949ca 100644
--- a/crates/jacquard-api/src/place_stream/moderation/create_gate.rs
+++ b/crates/jacquard-api/src/place_stream/moderation/create_gate.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, AtUri, Cid};
@@ -168,9 +171,9 @@ pub mod create_gate_state {
 
 /// Builder for constructing an instance of this type
 pub struct CreateGateBuilder<'a, S: create_gate_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CreateGate<'a> {
@@ -184,9 +187,9 @@ impl<'a> CreateGateBuilder<'a, create_gate_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreateGateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -201,11 +204,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CreateGateBuilder<'a, create_gate_state::SetMessageUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CreateGateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -220,11 +223,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> CreateGateBuilder<'a, create_gate_state::SetStreamer<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CreateGateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -238,8 +241,8 @@ where
     /// Build the final struct
     pub fn build(self) -> CreateGate<'a> {
         CreateGate {
-            message_uri: self.__unsafe_private_named.0.unwrap(),
-            streamer: self.__unsafe_private_named.1.unwrap(),
+            message_uri: self._fields.0.unwrap(),
+            streamer: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -252,8 +255,8 @@ where
         >,
     ) -> CreateGate<'a> {
         CreateGate {
-            message_uri: self.__unsafe_private_named.0.unwrap(),
-            streamer: self.__unsafe_private_named.1.unwrap(),
+            message_uri: self._fields.0.unwrap(),
+            streamer: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/moderation/delete_block.rs b/crates/jacquard-api/src/place_stream/moderation/delete_block.rs
index 7f0761fd..8d5f171d 100644
--- a/crates/jacquard-api/src/place_stream/moderation/delete_block.rs
+++ b/crates/jacquard-api/src/place_stream/moderation/delete_block.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, AtUri};
@@ -124,45 +127,45 @@ pub mod delete_block_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type BlockUri;
         type Streamer;
+        type BlockUri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type BlockUri = Unset;
         type Streamer = Unset;
-    }
-    ///State transition - sets the `block_uri` field to Set
-    pub struct SetBlockUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBlockUri<S> {}
-    impl<S: State> State for SetBlockUri<S> {
-        type BlockUri = Set<members::block_uri>;
-        type Streamer = S::Streamer;
+        type BlockUri = Unset;
     }
     ///State transition - sets the `streamer` field to Set
     pub struct SetStreamer<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStreamer<S> {}
     impl<S: State> State for SetStreamer<S> {
-        type BlockUri = S::BlockUri;
         type Streamer = Set<members::streamer>;
+        type BlockUri = S::BlockUri;
+    }
+    ///State transition - sets the `block_uri` field to Set
+    pub struct SetBlockUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBlockUri<S> {}
+    impl<S: State> State for SetBlockUri<S> {
+        type Streamer = S::Streamer;
+        type BlockUri = Set<members::block_uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `block_uri` field
-        pub struct block_uri(());
         ///Marker type for the `streamer` field
         pub struct streamer(());
+        ///Marker type for the `block_uri` field
+        pub struct block_uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DeleteBlockBuilder<'a, S: delete_block_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeleteBlock<'a> {
@@ -176,9 +179,9 @@ impl<'a> DeleteBlockBuilder<'a, delete_block_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteBlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -193,11 +196,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> DeleteBlockBuilder<'a, delete_block_state::SetBlockUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeleteBlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,11 +215,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> DeleteBlockBuilder<'a, delete_block_state::SetStreamer<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DeleteBlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -224,14 +227,14 @@ where
 impl<'a, S> DeleteBlockBuilder<'a, S>
 where
     S: delete_block_state::State,
-    S::BlockUri: delete_block_state::IsSet,
     S::Streamer: delete_block_state::IsSet,
+    S::BlockUri: delete_block_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DeleteBlock<'a> {
         DeleteBlock {
-            block_uri: self.__unsafe_private_named.0.unwrap(),
-            streamer: self.__unsafe_private_named.1.unwrap(),
+            block_uri: self._fields.0.unwrap(),
+            streamer: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -244,8 +247,8 @@ where
         >,
     ) -> DeleteBlock<'a> {
         DeleteBlock {
-            block_uri: self.__unsafe_private_named.0.unwrap(),
-            streamer: self.__unsafe_private_named.1.unwrap(),
+            block_uri: self._fields.0.unwrap(),
+            streamer: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/moderation/delete_gate.rs b/crates/jacquard-api/src/place_stream/moderation/delete_gate.rs
index aa94068b..663d23c2 100644
--- a/crates/jacquard-api/src/place_stream/moderation/delete_gate.rs
+++ b/crates/jacquard-api/src/place_stream/moderation/delete_gate.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, AtUri};
@@ -124,45 +127,45 @@ pub mod delete_gate_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Streamer;
         type GateUri;
+        type Streamer;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Streamer = Unset;
         type GateUri = Unset;
-    }
-    ///State transition - sets the `streamer` field to Set
-    pub struct SetStreamer<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStreamer<S> {}
-    impl<S: State> State for SetStreamer<S> {
-        type Streamer = Set<members::streamer>;
-        type GateUri = S::GateUri;
+        type Streamer = Unset;
     }
     ///State transition - sets the `gate_uri` field to Set
     pub struct SetGateUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetGateUri<S> {}
     impl<S: State> State for SetGateUri<S> {
-        type Streamer = S::Streamer;
         type GateUri = Set<members::gate_uri>;
+        type Streamer = S::Streamer;
+    }
+    ///State transition - sets the `streamer` field to Set
+    pub struct SetStreamer<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStreamer<S> {}
+    impl<S: State> State for SetStreamer<S> {
+        type GateUri = S::GateUri;
+        type Streamer = Set<members::streamer>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `streamer` field
-        pub struct streamer(());
         ///Marker type for the `gate_uri` field
         pub struct gate_uri(());
+        ///Marker type for the `streamer` field
+        pub struct streamer(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DeleteGateBuilder<'a, S: delete_gate_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeleteGate<'a> {
@@ -176,9 +179,9 @@ impl<'a> DeleteGateBuilder<'a, delete_gate_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteGateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -193,11 +196,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> DeleteGateBuilder<'a, delete_gate_state::SetGateUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeleteGateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,11 +215,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> DeleteGateBuilder<'a, delete_gate_state::SetStreamer<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DeleteGateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -224,14 +227,14 @@ where
 impl<'a, S> DeleteGateBuilder<'a, S>
 where
     S: delete_gate_state::State,
-    S::Streamer: delete_gate_state::IsSet,
     S::GateUri: delete_gate_state::IsSet,
+    S::Streamer: delete_gate_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DeleteGate<'a> {
         DeleteGate {
-            gate_uri: self.__unsafe_private_named.0.unwrap(),
-            streamer: self.__unsafe_private_named.1.unwrap(),
+            gate_uri: self._fields.0.unwrap(),
+            streamer: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -244,8 +247,8 @@ where
         >,
     ) -> DeleteGate<'a> {
         DeleteGate {
-            gate_uri: self.__unsafe_private_named.0.unwrap(),
-            streamer: self.__unsafe_private_named.1.unwrap(),
+            gate_uri: self._fields.0.unwrap(),
+            streamer: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/moderation/permission.rs b/crates/jacquard-api/src/place_stream/moderation/permission.rs
index 35744f13..6e95466f 100644
--- a/crates/jacquard-api/src/place_stream/moderation/permission.rs
+++ b/crates/jacquard-api/src/place_stream/moderation/permission.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -116,64 +119,64 @@ pub mod permission_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Moderator;
         type Permissions;
         type CreatedAt;
+        type Moderator;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Moderator = Unset;
         type Permissions = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `moderator` field to Set
-    pub struct SetModerator<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetModerator<S> {}
-    impl<S: State> State for SetModerator<S> {
-        type Moderator = Set<members::moderator>;
-        type Permissions = S::Permissions;
-        type CreatedAt = S::CreatedAt;
+        type Moderator = Unset;
     }
     ///State transition - sets the `permissions` field to Set
     pub struct SetPermissions<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPermissions<S> {}
     impl<S: State> State for SetPermissions<S> {
-        type Moderator = S::Moderator;
         type Permissions = Set<members::permissions>;
         type CreatedAt = S::CreatedAt;
+        type Moderator = S::Moderator;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Moderator = S::Moderator;
         type Permissions = S::Permissions;
         type CreatedAt = Set<members::created_at>;
+        type Moderator = S::Moderator;
+    }
+    ///State transition - sets the `moderator` field to Set
+    pub struct SetModerator<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetModerator<S> {}
+    impl<S: State> State for SetModerator<S> {
+        type Permissions = S::Permissions;
+        type CreatedAt = S::CreatedAt;
+        type Moderator = Set<members::moderator>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `moderator` field
-        pub struct moderator(());
         ///Marker type for the `permissions` field
         pub struct permissions(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `moderator` field
+        pub struct moderator(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PermissionBuilder<'a, S: permission_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<Did<'a>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Permission<'a> {
@@ -187,9 +190,9 @@ impl<'a> PermissionBuilder<'a, permission_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PermissionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,11 +207,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PermissionBuilder<'a, permission_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PermissionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,12 +219,12 @@ where
 impl<'a, S: permission_state::State> PermissionBuilder<'a, S> {
     /// Set the `expirationTime` field (optional)
     pub fn expiration_time(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `expirationTime` field to an Option value (optional)
     pub fn maybe_expiration_time(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -236,11 +239,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> PermissionBuilder<'a, permission_state::SetModerator<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PermissionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -255,11 +258,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> PermissionBuilder<'a, permission_state::SetPermissions<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PermissionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -267,17 +270,17 @@ where
 impl<'a, S> PermissionBuilder<'a, S>
 where
     S: permission_state::State,
-    S::Moderator: permission_state::IsSet,
     S::Permissions: permission_state::IsSet,
     S::CreatedAt: permission_state::IsSet,
+    S::Moderator: permission_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Permission<'a> {
         Permission {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            expiration_time: self.__unsafe_private_named.1,
-            moderator: self.__unsafe_private_named.2.unwrap(),
-            permissions: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            expiration_time: self._fields.1,
+            moderator: self._fields.2.unwrap(),
+            permissions: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -290,10 +293,10 @@ where
         >,
     ) -> Permission<'a> {
         Permission {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            expiration_time: self.__unsafe_private_named.1,
-            moderator: self.__unsafe_private_named.2.unwrap(),
-            permissions: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            expiration_time: self._fields.1,
+            moderator: self._fields.2.unwrap(),
+            permissions: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/moderation/update_livestream.rs b/crates/jacquard-api/src/place_stream/moderation/update_livestream.rs
index 8582138a..adab7a2f 100644
--- a/crates/jacquard-api/src/place_stream/moderation/update_livestream.rs
+++ b/crates/jacquard-api/src/place_stream/moderation/update_livestream.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, AtUri, Cid};
@@ -146,45 +149,45 @@ pub mod update_livestream_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type LivestreamUri;
         type Streamer;
+        type LivestreamUri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type LivestreamUri = Unset;
         type Streamer = Unset;
-    }
-    ///State transition - sets the `livestream_uri` field to Set
-    pub struct SetLivestreamUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLivestreamUri<S> {}
-    impl<S: State> State for SetLivestreamUri<S> {
-        type LivestreamUri = Set<members::livestream_uri>;
-        type Streamer = S::Streamer;
+        type LivestreamUri = Unset;
     }
     ///State transition - sets the `streamer` field to Set
     pub struct SetStreamer<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStreamer<S> {}
     impl<S: State> State for SetStreamer<S> {
-        type LivestreamUri = S::LivestreamUri;
         type Streamer = Set<members::streamer>;
+        type LivestreamUri = S::LivestreamUri;
+    }
+    ///State transition - sets the `livestream_uri` field to Set
+    pub struct SetLivestreamUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLivestreamUri<S> {}
+    impl<S: State> State for SetLivestreamUri<S> {
+        type Streamer = S::Streamer;
+        type LivestreamUri = Set<members::livestream_uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `livestream_uri` field
-        pub struct livestream_uri(());
         ///Marker type for the `streamer` field
         pub struct streamer(());
+        ///Marker type for the `livestream_uri` field
+        pub struct livestream_uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct UpdateLivestreamBuilder<'a, S: update_livestream_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<Did<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<Did<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateLivestream<'a> {
@@ -198,9 +201,9 @@ impl<'a> UpdateLivestreamBuilder<'a, update_livestream_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateLivestreamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> UpdateLivestreamBuilder<'a, update_livestream_state::SetLivestreamUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UpdateLivestreamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> UpdateLivestreamBuilder<'a, update_livestream_state::SetStreamer<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UpdateLivestreamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,12 +249,12 @@ where
 impl<'a, S: update_livestream_state::State> UpdateLivestreamBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -259,15 +262,15 @@ impl<'a, S: update_livestream_state::State> UpdateLivestreamBuilder<'a, S> {
 impl<'a, S> UpdateLivestreamBuilder<'a, S>
 where
     S: update_livestream_state::State,
-    S::LivestreamUri: update_livestream_state::IsSet,
     S::Streamer: update_livestream_state::IsSet,
+    S::LivestreamUri: update_livestream_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> UpdateLivestream<'a> {
         UpdateLivestream {
-            livestream_uri: self.__unsafe_private_named.0.unwrap(),
-            streamer: self.__unsafe_private_named.1.unwrap(),
-            title: self.__unsafe_private_named.2,
+            livestream_uri: self._fields.0.unwrap(),
+            streamer: self._fields.1.unwrap(),
+            title: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -280,9 +283,9 @@ where
         >,
     ) -> UpdateLivestream<'a> {
         UpdateLivestream {
-            livestream_uri: self.__unsafe_private_named.0.unwrap(),
-            streamer: self.__unsafe_private_named.1.unwrap(),
-            title: self.__unsafe_private_named.2,
+            livestream_uri: self._fields.0.unwrap(),
+            streamer: self._fields.1.unwrap(),
+            title: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/multistream.rs b/crates/jacquard-api/src/place_stream/multistream.rs
index b8d17cf2..43ef3660 100644
--- a/crates/jacquard-api/src/place_stream/multistream.rs
+++ b/crates/jacquard-api/src/place_stream/multistream.rs
@@ -11,7 +11,11 @@ pub mod list_targets;
 pub mod put_target;
 pub mod target;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -145,9 +149,9 @@ pub mod event_state {
 
 /// Builder for constructing an instance of this type
 pub struct EventBuilder<'a, S: event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Event<'a> {
@@ -161,9 +165,9 @@ impl<'a> EventBuilder<'a, event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EventBuilder<'a, event_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +201,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EventBuilder<'a, event_state::SetMessage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,11 +220,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EventBuilder<'a, event_state::SetStatus<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -235,9 +239,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Event<'a> {
         Event {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            status: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            status: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -247,9 +251,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Event<'a> {
         Event {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1.unwrap(),
-            status: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            message: self._fields.1.unwrap(),
+            status: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -360,49 +364,49 @@ pub mod target_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Cid;
         type Uri;
+        type Cid;
         type Record;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Cid = Unset;
         type Uri = Unset;
+        type Cid = Unset;
         type Record = Unset;
     }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type Cid = Set<members::cid>;
-        type Uri = S::Uri;
-        type Record = S::Record;
-    }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Cid = S::Cid;
         type Uri = Set<members::uri>;
+        type Cid = S::Cid;
+        type Record = S::Record;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Uri = S::Uri;
+        type Cid = Set<members::cid>;
         type Record = S::Record;
     }
     ///State transition - sets the `record` field to Set
     pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecord<S> {}
     impl<S: State> State for SetRecord<S> {
-        type Cid = S::Cid;
         type Uri = S::Uri;
+        type Cid = S::Cid;
         type Record = Set<members::record>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
         ///Marker type for the `record` field
         pub struct record(());
     }
@@ -410,14 +414,14 @@ pub mod target_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct TargetViewBuilder<'a, S: target_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<multistream::Event<'a>>,
         Option<Data<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TargetView<'a> {
@@ -431,9 +435,9 @@ impl<'a> TargetViewBuilder<'a, target_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TargetViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -448,11 +452,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> TargetViewBuilder<'a, target_view_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TargetViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -463,12 +467,12 @@ impl<'a, S: target_view_state::State> TargetViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<multistream::Event<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `latestEvent` field to an Option value (optional)
     pub fn maybe_latest_event(mut self, value: Option<multistream::Event<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -483,11 +487,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> TargetViewBuilder<'a, target_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TargetViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -502,11 +506,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> TargetViewBuilder<'a, target_view_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TargetViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -514,17 +518,17 @@ where
 impl<'a, S> TargetViewBuilder<'a, S>
 where
     S: target_view_state::State,
-    S::Cid: target_view_state::IsSet,
     S::Uri: target_view_state::IsSet,
+    S::Cid: target_view_state::IsSet,
     S::Record: target_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TargetView<'a> {
         TargetView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            latest_event: self.__unsafe_private_named.1,
-            record: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            cid: self._fields.0.unwrap(),
+            latest_event: self._fields.1,
+            record: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -534,10 +538,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> TargetView<'a> {
         TargetView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            latest_event: self.__unsafe_private_named.1,
-            record: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            cid: self._fields.0.unwrap(),
+            latest_event: self._fields.1,
+            record: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/multistream/create_target.rs b/crates/jacquard-api/src/place_stream/multistream/create_target.rs
index f2ad2d4f..6481d51b 100644
--- a/crates/jacquard-api/src/place_stream/multistream/create_target.rs
+++ b/crates/jacquard-api/src/place_stream/multistream/create_target.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -130,9 +133,9 @@ pub mod create_target_state {
 
 /// Builder for constructing an instance of this type
 pub struct CreateTargetBuilder<'a, S: create_target_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Target<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Target<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CreateTarget<'a> {
@@ -146,9 +149,9 @@ impl<'a> CreateTargetBuilder<'a, create_target_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreateTargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -163,11 +166,11 @@ where
         mut self,
         value: impl Into<Target<'a>>,
     ) -> CreateTargetBuilder<'a, create_target_state::SetMultistreamTarget<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CreateTargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,7 +183,7 @@ where
     /// Build the final struct
     pub fn build(self) -> CreateTarget<'a> {
         CreateTarget {
-            multistream_target: self.__unsafe_private_named.0.unwrap(),
+            multistream_target: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -193,7 +196,7 @@ where
         >,
     ) -> CreateTarget<'a> {
         CreateTarget {
-            multistream_target: self.__unsafe_private_named.0.unwrap(),
+            multistream_target: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/multistream/delete_target.rs b/crates/jacquard-api/src/place_stream/multistream/delete_target.rs
index 0d84f83d..18465533 100644
--- a/crates/jacquard-api/src/place_stream/multistream/delete_target.rs
+++ b/crates/jacquard-api/src/place_stream/multistream/delete_target.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::{RecordKey, Rkey};
 use jacquard_derive::{IntoStatic, lexicon};
@@ -112,9 +115,9 @@ pub mod delete_target_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeleteTargetBuilder<'a, S: delete_target_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<RecordKey<Rkey<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<RecordKey<Rkey<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeleteTarget<'a> {
@@ -128,9 +131,9 @@ impl<'a> DeleteTargetBuilder<'a, delete_target_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteTargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -145,11 +148,11 @@ where
         mut self,
         value: impl Into<RecordKey<Rkey<'a>>>,
     ) -> DeleteTargetBuilder<'a, delete_target_state::SetRkey<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeleteTargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -162,7 +165,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DeleteTarget<'a> {
         DeleteTarget {
-            rkey: self.__unsafe_private_named.0.unwrap(),
+            rkey: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -175,7 +178,7 @@ where
         >,
     ) -> DeleteTarget<'a> {
         DeleteTarget {
-            rkey: self.__unsafe_private_named.0.unwrap(),
+            rkey: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/multistream/list_targets.rs b/crates/jacquard-api/src/place_stream/multistream/list_targets.rs
index f34d099d..218d890f 100644
--- a/crates/jacquard-api/src/place_stream/multistream/list_targets.rs
+++ b/crates/jacquard-api/src/place_stream/multistream/list_targets.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -123,9 +126,9 @@ pub mod list_targets_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListTargetsBuilder<'a, S: list_targets_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListTargets<'a> {
@@ -139,9 +142,9 @@ impl<'a> ListTargetsBuilder<'a, list_targets_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListTargetsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,12 +152,12 @@ impl<'a> ListTargetsBuilder<'a, list_targets_state::Empty> {
 impl<'a, S: list_targets_state::State> ListTargetsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -162,12 +165,12 @@ impl<'a, S: list_targets_state::State> ListTargetsBuilder<'a, S> {
 impl<'a, S: list_targets_state::State> ListTargetsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -179,8 +182,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ListTargets<'a> {
         ListTargets {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
@@ -245,9 +248,9 @@ pub mod record_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordBuilder<'a, S: record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>, Option<Data<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>, Option<Data<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Record<'a> {
@@ -261,9 +264,9 @@ impl<'a> RecordBuilder<'a, record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -278,11 +281,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> RecordBuilder<'a, record_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -297,11 +300,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RecordBuilder<'a, record_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -316,11 +319,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> RecordBuilder<'a, record_state::SetValue<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -335,9 +338,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Record<'a> {
         Record {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -347,9 +350,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Record<'a> {
         Record {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/multistream/put_target.rs b/crates/jacquard-api/src/place_stream/multistream/put_target.rs
index eeb282c2..ca8a7e87 100644
--- a/crates/jacquard-api/src/place_stream/multistream/put_target.rs
+++ b/crates/jacquard-api/src/place_stream/multistream/put_target.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{RecordKey, Rkey};
@@ -135,9 +138,9 @@ pub mod put_target_state {
 
 /// Builder for constructing an instance of this type
 pub struct PutTargetBuilder<'a, S: put_target_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Target<'a>>, Option<RecordKey<Rkey<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Target<'a>>, Option<RecordKey<Rkey<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PutTarget<'a> {
@@ -151,9 +154,9 @@ impl<'a> PutTargetBuilder<'a, put_target_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PutTargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -168,11 +171,11 @@ where
         mut self,
         value: impl Into<Target<'a>>,
     ) -> PutTargetBuilder<'a, put_target_state::SetMultistreamTarget<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PutTargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,12 +183,12 @@ where
 impl<'a, S: put_target_state::State> PutTargetBuilder<'a, S> {
     /// Set the `rkey` field (optional)
     pub fn rkey(mut self, value: impl Into<Option<RecordKey<Rkey<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `rkey` field to an Option value (optional)
     pub fn maybe_rkey(mut self, value: Option<RecordKey<Rkey<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -198,8 +201,8 @@ where
     /// Build the final struct
     pub fn build(self) -> PutTarget<'a> {
         PutTarget {
-            multistream_target: self.__unsafe_private_named.0.unwrap(),
-            rkey: self.__unsafe_private_named.1,
+            multistream_target: self._fields.0.unwrap(),
+            rkey: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -212,8 +215,8 @@ where
         >,
     ) -> PutTarget<'a> {
         PutTarget {
-            multistream_target: self.__unsafe_private_named.0.unwrap(),
-            rkey: self.__unsafe_private_named.1,
+            multistream_target: self._fields.0.unwrap(),
+            rkey: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/multistream/target.rs b/crates/jacquard-api/src/place_stream/multistream/target.rs
index 6180fbf0..8bb49ddb 100644
--- a/crates/jacquard-api/src/place_stream/multistream/target.rs
+++ b/crates/jacquard-api/src/place_stream/multistream/target.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -126,64 +129,59 @@ pub mod target_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type Url;
         type Active;
+        type Url;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type Url = Unset;
         type Active = Unset;
+        type Url = Unset;
+        type CreatedAt = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
+    ///State transition - sets the `active` field to Set
+    pub struct SetActive<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetActive<S> {}
+    impl<S: State> State for SetActive<S> {
+        type Active = Set<members::active>;
         type Url = S::Url;
-        type Active = S::Active;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `url` field to Set
     pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUrl<S> {}
     impl<S: State> State for SetUrl<S> {
-        type CreatedAt = S::CreatedAt;
-        type Url = Set<members::url>;
         type Active = S::Active;
-    }
-    ///State transition - sets the `active` field to Set
-    pub struct SetActive<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetActive<S> {}
-    impl<S: State> State for SetActive<S> {
+        type Url = Set<members::url>;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Active = S::Active;
         type Url = S::Url;
-        type Active = Set<members::active>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `url` field
-        pub struct url(());
         ///Marker type for the `active` field
         pub struct active(());
+        ///Marker type for the `url` field
+        pub struct url(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TargetBuilder<'a, S: target_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<bool>,
-        Option<Datetime>,
-        Option<CowStr<'a>>,
-        Option<UriValue<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<Datetime>, Option<CowStr<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Target<'a> {
@@ -197,9 +195,9 @@ impl<'a> TargetBuilder<'a, target_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -214,11 +212,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> TargetBuilder<'a, target_state::SetActive<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -233,11 +231,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TargetBuilder<'a, target_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -245,12 +243,12 @@ where
 impl<'a, S: target_state::State> TargetBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -265,11 +263,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> TargetBuilder<'a, target_state::SetUrl<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -277,17 +275,17 @@ where
 impl<'a, S> TargetBuilder<'a, S>
 where
     S: target_state::State,
-    S::CreatedAt: target_state::IsSet,
-    S::Url: target_state::IsSet,
     S::Active: target_state::IsSet,
+    S::Url: target_state::IsSet,
+    S::CreatedAt: target_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Target<'a> {
         Target {
-            active: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2,
-            url: self.__unsafe_private_named.3.unwrap(),
+            active: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            name: self._fields.2,
+            url: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -300,10 +298,10 @@ where
         >,
     ) -> Target<'a> {
         Target {
-            active: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2,
-            url: self.__unsafe_private_named.3.unwrap(),
+            active: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            name: self._fields.2,
+            url: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/playback/whep.rs b/crates/jacquard-api/src/place_stream/playback/whep.rs
index 0bd23497..77678144 100644
--- a/crates/jacquard-api/src/place_stream/playback/whep.rs
+++ b/crates/jacquard-api/src/place_stream/playback/whep.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -175,9 +176,9 @@ pub mod whep_params_state {
 
 /// Builder for constructing an instance of this type
 pub struct WhepParamsBuilder<'a, S: whep_params_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> WhepParams<'a> {
@@ -191,9 +192,9 @@ impl<'a> WhepParamsBuilder<'a, whep_params_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WhepParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -208,11 +209,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WhepParamsBuilder<'a, whep_params_state::SetRendition<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         WhepParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -227,11 +228,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WhepParamsBuilder<'a, whep_params_state::SetStreamer<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         WhepParamsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -245,8 +246,8 @@ where
     /// Build the final struct
     pub fn build(self) -> WhepParams<'a> {
         WhepParams {
-            rendition: self.__unsafe_private_named.0.unwrap(),
-            streamer: self.__unsafe_private_named.1.unwrap(),
+            rendition: self._fields.0.unwrap(),
+            streamer: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/place_stream/richtext/facet.rs b/crates/jacquard-api/src/place_stream/richtext/facet.rs
index ec29b7c5..e2ceeb05 100644
--- a/crates/jacquard-api/src/place_stream/richtext/facet.rs
+++ b/crates/jacquard-api/src/place_stream/richtext/facet.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -69,45 +72,45 @@ pub mod facet_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Index;
         type Features;
+        type Index;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Index = Unset;
         type Features = Unset;
-    }
-    ///State transition - sets the `index` field to Set
-    pub struct SetIndex<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndex<S> {}
-    impl<S: State> State for SetIndex<S> {
-        type Index = Set<members::index>;
-        type Features = S::Features;
+        type Index = Unset;
     }
     ///State transition - sets the `features` field to Set
     pub struct SetFeatures<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetFeatures<S> {}
     impl<S: State> State for SetFeatures<S> {
-        type Index = S::Index;
         type Features = Set<members::features>;
+        type Index = S::Index;
+    }
+    ///State transition - sets the `index` field to Set
+    pub struct SetIndex<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndex<S> {}
+    impl<S: State> State for SetIndex<S> {
+        type Features = S::Features;
+        type Index = Set<members::index>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `index` field
-        pub struct index(());
         ///Marker type for the `features` field
         pub struct features(());
+        ///Marker type for the `index` field
+        pub struct index(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FacetBuilder<'a, S: facet_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<FacetFeaturesItem<'a>>>, Option<ByteSlice<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<FacetFeaturesItem<'a>>>, Option<ByteSlice<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Facet<'a> {
@@ -121,9 +124,9 @@ impl<'a> FacetBuilder<'a, facet_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -138,11 +141,11 @@ where
         mut self,
         value: impl Into<Vec<FacetFeaturesItem<'a>>>,
     ) -> FacetBuilder<'a, facet_state::SetFeatures<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -157,11 +160,11 @@ where
         mut self,
         value: impl Into<ByteSlice<'a>>,
     ) -> FacetBuilder<'a, facet_state::SetIndex<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -169,14 +172,14 @@ where
 impl<'a, S> FacetBuilder<'a, S>
 where
     S: facet_state::State,
-    S::Index: facet_state::IsSet,
     S::Features: facet_state::IsSet,
+    S::Index: facet_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -189,8 +192,8 @@ where
         >,
     ) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/segment.rs b/crates/jacquard-api/src/place_stream/segment.rs
index 2dfa1047..e513acea 100644
--- a/crates/jacquard-api/src/place_stream/segment.rs
+++ b/crates/jacquard-api/src/place_stream/segment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -248,59 +251,59 @@ pub mod audio_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Codec;
         type Rate;
         type Channels;
+        type Codec;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Codec = Unset;
         type Rate = Unset;
         type Channels = Unset;
-    }
-    ///State transition - sets the `codec` field to Set
-    pub struct SetCodec<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCodec<S> {}
-    impl<S: State> State for SetCodec<S> {
-        type Codec = Set<members::codec>;
-        type Rate = S::Rate;
-        type Channels = S::Channels;
+        type Codec = Unset;
     }
     ///State transition - sets the `rate` field to Set
     pub struct SetRate<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRate<S> {}
     impl<S: State> State for SetRate<S> {
-        type Codec = S::Codec;
         type Rate = Set<members::rate>;
         type Channels = S::Channels;
+        type Codec = S::Codec;
     }
     ///State transition - sets the `channels` field to Set
     pub struct SetChannels<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetChannels<S> {}
     impl<S: State> State for SetChannels<S> {
-        type Codec = S::Codec;
         type Rate = S::Rate;
         type Channels = Set<members::channels>;
+        type Codec = S::Codec;
+    }
+    ///State transition - sets the `codec` field to Set
+    pub struct SetCodec<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCodec<S> {}
+    impl<S: State> State for SetCodec<S> {
+        type Rate = S::Rate;
+        type Channels = S::Channels;
+        type Codec = Set<members::codec>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `codec` field
-        pub struct codec(());
         ///Marker type for the `rate` field
         pub struct rate(());
         ///Marker type for the `channels` field
         pub struct channels(());
+        ///Marker type for the `codec` field
+        pub struct codec(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AudioBuilder<'a, S: audio_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Audio<'a> {
@@ -314,9 +317,9 @@ impl<'a> AudioBuilder<'a, audio_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AudioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -331,11 +334,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AudioBuilder<'a, audio_state::SetChannels<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AudioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -350,11 +353,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AudioBuilder<'a, audio_state::SetCodec<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AudioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -369,11 +372,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AudioBuilder<'a, audio_state::SetRate<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AudioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -381,16 +384,16 @@ where
 impl<'a, S> AudioBuilder<'a, S>
 where
     S: audio_state::State,
-    S::Codec: audio_state::IsSet,
     S::Rate: audio_state::IsSet,
     S::Channels: audio_state::IsSet,
+    S::Codec: audio_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Audio<'a> {
         Audio {
-            channels: self.__unsafe_private_named.0.unwrap(),
-            codec: self.__unsafe_private_named.1.unwrap(),
-            rate: self.__unsafe_private_named.2.unwrap(),
+            channels: self._fields.0.unwrap(),
+            codec: self._fields.1.unwrap(),
+            rate: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -400,9 +403,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Audio<'a> {
         Audio {
-            channels: self.__unsafe_private_named.0.unwrap(),
-            codec: self.__unsafe_private_named.1.unwrap(),
-            rate: self.__unsafe_private_named.2.unwrap(),
+            channels: self._fields.0.unwrap(),
+            codec: self._fields.1.unwrap(),
+            rate: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -726,9 +729,9 @@ pub mod framerate_state {
 
 /// Builder for constructing an instance of this type
 pub struct FramerateBuilder<'a, S: framerate_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Framerate<'a> {
@@ -742,9 +745,9 @@ impl<'a> FramerateBuilder<'a, framerate_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FramerateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -759,11 +762,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> FramerateBuilder<'a, framerate_state::SetDen<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FramerateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -778,11 +781,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> FramerateBuilder<'a, framerate_state::SetNum<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FramerateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -796,8 +799,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Framerate<'a> {
         Framerate {
-            den: self.__unsafe_private_named.0.unwrap(),
-            num: self.__unsafe_private_named.1.unwrap(),
+            den: self._fields.0.unwrap(),
+            num: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -807,8 +810,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Framerate<'a> {
         Framerate {
-            den: self.__unsafe_private_named.0.unwrap(),
-            num: self.__unsafe_private_named.1.unwrap(),
+            den: self._fields.0.unwrap(),
+            num: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -826,8 +829,8 @@ pub mod segment_state {
     pub trait State: sealed::Sealed {
         type SigningKey;
         type StartTime;
-        type Creator;
         type Id;
+        type Creator;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
@@ -835,8 +838,8 @@ pub mod segment_state {
     impl State for Empty {
         type SigningKey = Unset;
         type StartTime = Unset;
-        type Creator = Unset;
         type Id = Unset;
+        type Creator = Unset;
     }
     ///State transition - sets the `signing_key` field to Set
     pub struct SetSigningKey<S: State = Empty>(PhantomData<fn() -> S>);
@@ -844,8 +847,8 @@ pub mod segment_state {
     impl<S: State> State for SetSigningKey<S> {
         type SigningKey = Set<members::signing_key>;
         type StartTime = S::StartTime;
-        type Creator = S::Creator;
         type Id = S::Id;
+        type Creator = S::Creator;
     }
     ///State transition - sets the `start_time` field to Set
     pub struct SetStartTime<S: State = Empty>(PhantomData<fn() -> S>);
@@ -853,17 +856,8 @@ pub mod segment_state {
     impl<S: State> State for SetStartTime<S> {
         type SigningKey = S::SigningKey;
         type StartTime = Set<members::start_time>;
-        type Creator = S::Creator;
-        type Id = S::Id;
-    }
-    ///State transition - sets the `creator` field to Set
-    pub struct SetCreator<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreator<S> {}
-    impl<S: State> State for SetCreator<S> {
-        type SigningKey = S::SigningKey;
-        type StartTime = S::StartTime;
-        type Creator = Set<members::creator>;
         type Id = S::Id;
+        type Creator = S::Creator;
     }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
@@ -871,8 +865,17 @@ pub mod segment_state {
     impl<S: State> State for SetId<S> {
         type SigningKey = S::SigningKey;
         type StartTime = S::StartTime;
-        type Creator = S::Creator;
         type Id = Set<members::id>;
+        type Creator = S::Creator;
+    }
+    ///State transition - sets the `creator` field to Set
+    pub struct SetCreator<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreator<S> {}
+    impl<S: State> State for SetCreator<S> {
+        type SigningKey = S::SigningKey;
+        type StartTime = S::StartTime;
+        type Id = S::Id;
+        type Creator = Set<members::creator>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
@@ -881,17 +884,17 @@ pub mod segment_state {
         pub struct signing_key(());
         ///Marker type for the `start_time` field
         pub struct start_time(());
-        ///Marker type for the `creator` field
-        pub struct creator(());
         ///Marker type for the `id` field
         pub struct id(());
+        ///Marker type for the `creator` field
+        pub struct creator(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SegmentBuilder<'a, S: segment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<segment::Audio<'a>>>,
         Option<ContentRights<'a>>,
         Option<ContentWarnings<'a>>,
@@ -904,7 +907,7 @@ pub struct SegmentBuilder<'a, S: segment_state::State> {
         Option<Datetime>,
         Option<Vec<segment::Video<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Segment<'a> {
@@ -918,21 +921,9 @@ impl<'a> SegmentBuilder<'a, segment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SegmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -940,12 +931,12 @@ impl<'a> SegmentBuilder<'a, segment_state::Empty> {
 impl<'a, S: segment_state::State> SegmentBuilder<'a, S> {
     /// Set the `audio` field (optional)
     pub fn audio(mut self, value: impl Into<Option<Vec<segment::Audio<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `audio` field to an Option value (optional)
     pub fn maybe_audio(mut self, value: Option<Vec<segment::Audio<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -956,12 +947,12 @@ impl<'a, S: segment_state::State> SegmentBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ContentRights<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `contentRights` field to an Option value (optional)
     pub fn maybe_content_rights(mut self, value: Option<ContentRights<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -972,12 +963,12 @@ impl<'a, S: segment_state::State> SegmentBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ContentWarnings<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `contentWarnings` field to an Option value (optional)
     pub fn maybe_content_warnings(mut self, value: Option<ContentWarnings<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -992,11 +983,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> SegmentBuilder<'a, segment_state::SetCreator<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SegmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1007,7 +998,7 @@ impl<'a, S: segment_state::State> SegmentBuilder<'a, S> {
         mut self,
         value: impl Into<Option<DistributionPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `distributionPolicy` field to an Option value (optional)
@@ -1015,7 +1006,7 @@ impl<'a, S: segment_state::State> SegmentBuilder<'a, S> {
         mut self,
         value: Option<DistributionPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1023,12 +1014,12 @@ impl<'a, S: segment_state::State> SegmentBuilder<'a, S> {
 impl<'a, S: segment_state::State> SegmentBuilder<'a, S> {
     /// Set the `duration` field (optional)
     pub fn duration(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `duration` field to an Option value (optional)
     pub fn maybe_duration(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1043,11 +1034,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SegmentBuilder<'a, segment_state::SetId<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         SegmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1062,11 +1053,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SegmentBuilder<'a, segment_state::SetSigningKey<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         SegmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1074,12 +1065,12 @@ where
 impl<'a, S: segment_state::State> SegmentBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -1094,11 +1085,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SegmentBuilder<'a, segment_state::SetStartTime<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         SegmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1106,12 +1097,12 @@ where
 impl<'a, S: segment_state::State> SegmentBuilder<'a, S> {
     /// Set the `video` field (optional)
     pub fn video(mut self, value: impl Into<Option<Vec<segment::Video<'a>>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `video` field to an Option value (optional)
     pub fn maybe_video(mut self, value: Option<Vec<segment::Video<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -1121,23 +1112,23 @@ where
     S: segment_state::State,
     S::SigningKey: segment_state::IsSet,
     S::StartTime: segment_state::IsSet,
-    S::Creator: segment_state::IsSet,
     S::Id: segment_state::IsSet,
+    S::Creator: segment_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Segment<'a> {
         Segment {
-            audio: self.__unsafe_private_named.0,
-            content_rights: self.__unsafe_private_named.1,
-            content_warnings: self.__unsafe_private_named.2,
-            creator: self.__unsafe_private_named.3.unwrap(),
-            distribution_policy: self.__unsafe_private_named.4,
-            duration: self.__unsafe_private_named.5,
-            id: self.__unsafe_private_named.6.unwrap(),
-            signing_key: self.__unsafe_private_named.7.unwrap(),
-            size: self.__unsafe_private_named.8,
-            start_time: self.__unsafe_private_named.9.unwrap(),
-            video: self.__unsafe_private_named.10,
+            audio: self._fields.0,
+            content_rights: self._fields.1,
+            content_warnings: self._fields.2,
+            creator: self._fields.3.unwrap(),
+            distribution_policy: self._fields.4,
+            duration: self._fields.5,
+            id: self._fields.6.unwrap(),
+            signing_key: self._fields.7.unwrap(),
+            size: self._fields.8,
+            start_time: self._fields.9.unwrap(),
+            video: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -1147,17 +1138,17 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Segment<'a> {
         Segment {
-            audio: self.__unsafe_private_named.0,
-            content_rights: self.__unsafe_private_named.1,
-            content_warnings: self.__unsafe_private_named.2,
-            creator: self.__unsafe_private_named.3.unwrap(),
-            distribution_policy: self.__unsafe_private_named.4,
-            duration: self.__unsafe_private_named.5,
-            id: self.__unsafe_private_named.6.unwrap(),
-            signing_key: self.__unsafe_private_named.7.unwrap(),
-            size: self.__unsafe_private_named.8,
-            start_time: self.__unsafe_private_named.9.unwrap(),
-            video: self.__unsafe_private_named.10,
+            audio: self._fields.0,
+            content_rights: self._fields.1,
+            content_warnings: self._fields.2,
+            creator: self._fields.3.unwrap(),
+            distribution_policy: self._fields.4,
+            duration: self._fields.5,
+            id: self._fields.6.unwrap(),
+            signing_key: self._fields.7.unwrap(),
+            size: self._fields.8,
+            start_time: self._fields.9.unwrap(),
+            video: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
@@ -1209,9 +1200,9 @@ pub mod segment_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct SegmentViewBuilder<'a, S: segment_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<Data<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<Data<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SegmentView<'a> {
@@ -1225,9 +1216,9 @@ impl<'a> SegmentViewBuilder<'a, segment_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SegmentViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1242,11 +1233,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> SegmentViewBuilder<'a, segment_view_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SegmentViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1261,11 +1252,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> SegmentViewBuilder<'a, segment_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SegmentViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1279,8 +1270,8 @@ where
     /// Build the final struct
     pub fn build(self) -> SegmentView<'a> {
         SegmentView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            record: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            record: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1290,8 +1281,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> SegmentView<'a> {
         SegmentView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            record: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            record: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1308,64 +1299,64 @@ pub mod video_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Width;
-        type Height;
         type Codec;
+        type Height;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Width = Unset;
-        type Height = Unset;
         type Codec = Unset;
+        type Height = Unset;
     }
     ///State transition - sets the `width` field to Set
     pub struct SetWidth<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWidth<S> {}
     impl<S: State> State for SetWidth<S> {
         type Width = Set<members::width>;
-        type Height = S::Height;
-        type Codec = S::Codec;
-    }
-    ///State transition - sets the `height` field to Set
-    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHeight<S> {}
-    impl<S: State> State for SetHeight<S> {
-        type Width = S::Width;
-        type Height = Set<members::height>;
         type Codec = S::Codec;
+        type Height = S::Height;
     }
     ///State transition - sets the `codec` field to Set
     pub struct SetCodec<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCodec<S> {}
     impl<S: State> State for SetCodec<S> {
         type Width = S::Width;
-        type Height = S::Height;
         type Codec = Set<members::codec>;
+        type Height = S::Height;
+    }
+    ///State transition - sets the `height` field to Set
+    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHeight<S> {}
+    impl<S: State> State for SetHeight<S> {
+        type Width = S::Width;
+        type Codec = S::Codec;
+        type Height = Set<members::height>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `width` field
         pub struct width(());
-        ///Marker type for the `height` field
-        pub struct height(());
         ///Marker type for the `codec` field
         pub struct codec(());
+        ///Marker type for the `height` field
+        pub struct height(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct VideoBuilder<'a, S: video_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<CowStr<'a>>,
         Option<segment::Framerate<'a>>,
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Video<'a> {
@@ -1379,9 +1370,9 @@ impl<'a> VideoBuilder<'a, video_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VideoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1389,12 +1380,12 @@ impl<'a> VideoBuilder<'a, video_state::Empty> {
 impl<'a, S: video_state::State> VideoBuilder<'a, S> {
     /// Set the `bframes` field (optional)
     pub fn bframes(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `bframes` field to an Option value (optional)
     pub fn maybe_bframes(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1409,11 +1400,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> VideoBuilder<'a, video_state::SetCodec<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VideoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1424,12 +1415,12 @@ impl<'a, S: video_state::State> VideoBuilder<'a, S> {
         mut self,
         value: impl Into<Option<segment::Framerate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `framerate` field to an Option value (optional)
     pub fn maybe_framerate(mut self, value: Option<segment::Framerate<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1444,11 +1435,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> VideoBuilder<'a, video_state::SetHeight<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         VideoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1463,11 +1454,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> VideoBuilder<'a, video_state::SetWidth<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         VideoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1476,17 +1467,17 @@ impl<'a, S> VideoBuilder<'a, S>
 where
     S: video_state::State,
     S::Width: video_state::IsSet,
-    S::Height: video_state::IsSet,
     S::Codec: video_state::IsSet,
+    S::Height: video_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Video<'a> {
         Video {
-            bframes: self.__unsafe_private_named.0,
-            codec: self.__unsafe_private_named.1.unwrap(),
-            framerate: self.__unsafe_private_named.2,
-            height: self.__unsafe_private_named.3.unwrap(),
-            width: self.__unsafe_private_named.4.unwrap(),
+            bframes: self._fields.0,
+            codec: self._fields.1.unwrap(),
+            framerate: self._fields.2,
+            height: self._fields.3.unwrap(),
+            width: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1496,11 +1487,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Video<'a> {
         Video {
-            bframes: self.__unsafe_private_named.0,
-            codec: self.__unsafe_private_named.1.unwrap(),
-            framerate: self.__unsafe_private_named.2,
-            height: self.__unsafe_private_named.3.unwrap(),
-            width: self.__unsafe_private_named.4.unwrap(),
+            bframes: self._fields.0,
+            codec: self._fields.1.unwrap(),
+            framerate: self._fields.2,
+            height: self._fields.3.unwrap(),
+            width: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/server.rs b/crates/jacquard-api/src/place_stream/server.rs
index 3184fd74..65b8bd1e 100644
--- a/crates/jacquard-api/src/place_stream/server.rs
+++ b/crates/jacquard-api/src/place_stream/server.rs
@@ -13,7 +13,11 @@ pub mod list_webhooks;
 pub mod settings;
 pub mod update_webhook;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -432,91 +436,91 @@ pub mod webhook_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Id;
+        type Events;
         type CreatedAt;
         type Active;
         type Url;
-        type Events;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Id = Unset;
+        type Events = Unset;
         type CreatedAt = Unset;
         type Active = Unset;
         type Url = Unset;
-        type Events = Unset;
     }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetId<S> {}
     impl<S: State> State for SetId<S> {
         type Id = Set<members::id>;
+        type Events = S::Events;
+        type CreatedAt = S::CreatedAt;
+        type Active = S::Active;
+        type Url = S::Url;
+    }
+    ///State transition - sets the `events` field to Set
+    pub struct SetEvents<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetEvents<S> {}
+    impl<S: State> State for SetEvents<S> {
+        type Id = S::Id;
+        type Events = Set<members::events>;
         type CreatedAt = S::CreatedAt;
         type Active = S::Active;
         type Url = S::Url;
-        type Events = S::Events;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type Id = S::Id;
+        type Events = S::Events;
         type CreatedAt = Set<members::created_at>;
         type Active = S::Active;
         type Url = S::Url;
-        type Events = S::Events;
     }
     ///State transition - sets the `active` field to Set
     pub struct SetActive<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetActive<S> {}
     impl<S: State> State for SetActive<S> {
         type Id = S::Id;
+        type Events = S::Events;
         type CreatedAt = S::CreatedAt;
         type Active = Set<members::active>;
         type Url = S::Url;
-        type Events = S::Events;
     }
     ///State transition - sets the `url` field to Set
     pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUrl<S> {}
     impl<S: State> State for SetUrl<S> {
         type Id = S::Id;
-        type CreatedAt = S::CreatedAt;
-        type Active = S::Active;
-        type Url = Set<members::url>;
         type Events = S::Events;
-    }
-    ///State transition - sets the `events` field to Set
-    pub struct SetEvents<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetEvents<S> {}
-    impl<S: State> State for SetEvents<S> {
-        type Id = S::Id;
         type CreatedAt = S::CreatedAt;
         type Active = S::Active;
-        type Url = S::Url;
-        type Events = Set<members::events>;
+        type Url = Set<members::url>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `id` field
         pub struct id(());
+        ///Marker type for the `events` field
+        pub struct events(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `active` field
         pub struct active(());
         ///Marker type for the `url` field
         pub struct url(());
-        ///Marker type for the `events` field
-        pub struct events(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct WebhookBuilder<'a, S: webhook_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -532,7 +536,7 @@ pub struct WebhookBuilder<'a, S: webhook_state::State> {
         Option<Datetime>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Webhook<'a> {
@@ -546,8 +550,8 @@ impl<'a> WebhookBuilder<'a, webhook_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WebhookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -563,7 +567,7 @@ impl<'a> WebhookBuilder<'a, webhook_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -578,11 +582,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> WebhookBuilder<'a, webhook_state::SetActive<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         WebhookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -597,11 +601,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> WebhookBuilder<'a, webhook_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         WebhookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -609,12 +613,12 @@ where
 impl<'a, S: webhook_state::State> WebhookBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -622,12 +626,12 @@ impl<'a, S: webhook_state::State> WebhookBuilder<'a, S> {
 impl<'a, S: webhook_state::State> WebhookBuilder<'a, S> {
     /// Set the `errorCount` field (optional)
     pub fn error_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `errorCount` field to an Option value (optional)
     pub fn maybe_error_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -642,11 +646,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> WebhookBuilder<'a, webhook_state::SetEvents<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         WebhookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -661,11 +665,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WebhookBuilder<'a, webhook_state::SetId<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         WebhookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -673,12 +677,12 @@ where
 impl<'a, S: webhook_state::State> WebhookBuilder<'a, S> {
     /// Set the `lastTriggered` field (optional)
     pub fn last_triggered(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `lastTriggered` field to an Option value (optional)
     pub fn maybe_last_triggered(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -686,12 +690,12 @@ impl<'a, S: webhook_state::State> WebhookBuilder<'a, S> {
 impl<'a, S: webhook_state::State> WebhookBuilder<'a, S> {
     /// Set the `muteWords` field (optional)
     pub fn mute_words(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `muteWords` field to an Option value (optional)
     pub fn maybe_mute_words(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -699,12 +703,12 @@ impl<'a, S: webhook_state::State> WebhookBuilder<'a, S> {
 impl<'a, S: webhook_state::State> WebhookBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -712,12 +716,12 @@ impl<'a, S: webhook_state::State> WebhookBuilder<'a, S> {
 impl<'a, S: webhook_state::State> WebhookBuilder<'a, S> {
     /// Set the `prefix` field (optional)
     pub fn prefix(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `prefix` field to an Option value (optional)
     pub fn maybe_prefix(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -728,12 +732,12 @@ impl<'a, S: webhook_state::State> WebhookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<server::RewriteRule<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `rewrite` field to an Option value (optional)
     pub fn maybe_rewrite(mut self, value: Option<Vec<server::RewriteRule<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -741,12 +745,12 @@ impl<'a, S: webhook_state::State> WebhookBuilder<'a, S> {
 impl<'a, S: webhook_state::State> WebhookBuilder<'a, S> {
     /// Set the `suffix` field (optional)
     pub fn suffix(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `suffix` field to an Option value (optional)
     pub fn maybe_suffix(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -754,12 +758,12 @@ impl<'a, S: webhook_state::State> WebhookBuilder<'a, S> {
 impl<'a, S: webhook_state::State> WebhookBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -774,11 +778,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> WebhookBuilder<'a, webhook_state::SetUrl<S>> {
-        self.__unsafe_private_named.13 = Option::Some(value.into());
+        self._fields.13 = Option::Some(value.into());
         WebhookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -787,28 +791,28 @@ impl<'a, S> WebhookBuilder<'a, S>
 where
     S: webhook_state::State,
     S::Id: webhook_state::IsSet,
+    S::Events: webhook_state::IsSet,
     S::CreatedAt: webhook_state::IsSet,
     S::Active: webhook_state::IsSet,
     S::Url: webhook_state::IsSet,
-    S::Events: webhook_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Webhook<'a> {
         Webhook {
-            active: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            error_count: self.__unsafe_private_named.3,
-            events: self.__unsafe_private_named.4.unwrap(),
-            id: self.__unsafe_private_named.5.unwrap(),
-            last_triggered: self.__unsafe_private_named.6,
-            mute_words: self.__unsafe_private_named.7,
-            name: self.__unsafe_private_named.8,
-            prefix: self.__unsafe_private_named.9,
-            rewrite: self.__unsafe_private_named.10,
-            suffix: self.__unsafe_private_named.11,
-            updated_at: self.__unsafe_private_named.12,
-            url: self.__unsafe_private_named.13.unwrap(),
+            active: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            error_count: self._fields.3,
+            events: self._fields.4.unwrap(),
+            id: self._fields.5.unwrap(),
+            last_triggered: self._fields.6,
+            mute_words: self._fields.7,
+            name: self._fields.8,
+            prefix: self._fields.9,
+            rewrite: self._fields.10,
+            suffix: self._fields.11,
+            updated_at: self._fields.12,
+            url: self._fields.13.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -821,20 +825,20 @@ where
         >,
     ) -> Webhook<'a> {
         Webhook {
-            active: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            error_count: self.__unsafe_private_named.3,
-            events: self.__unsafe_private_named.4.unwrap(),
-            id: self.__unsafe_private_named.5.unwrap(),
-            last_triggered: self.__unsafe_private_named.6,
-            mute_words: self.__unsafe_private_named.7,
-            name: self.__unsafe_private_named.8,
-            prefix: self.__unsafe_private_named.9,
-            rewrite: self.__unsafe_private_named.10,
-            suffix: self.__unsafe_private_named.11,
-            updated_at: self.__unsafe_private_named.12,
-            url: self.__unsafe_private_named.13.unwrap(),
+            active: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            error_count: self._fields.3,
+            events: self._fields.4.unwrap(),
+            id: self._fields.5.unwrap(),
+            last_triggered: self._fields.6,
+            mute_words: self._fields.7,
+            name: self._fields.8,
+            prefix: self._fields.9,
+            rewrite: self._fields.10,
+            suffix: self._fields.11,
+            updated_at: self._fields.12,
+            url: self._fields.13.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/server/create_webhook.rs b/crates/jacquard-api/src/place_stream/server/create_webhook.rs
index a34de36e..41e67445 100644
--- a/crates/jacquard-api/src/place_stream/server/create_webhook.rs
+++ b/crates/jacquard-api/src/place_stream/server/create_webhook.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::UriValue;
@@ -162,44 +165,44 @@ pub mod create_webhook_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Url;
         type Events;
+        type Url;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Url = Unset;
         type Events = Unset;
-    }
-    ///State transition - sets the `url` field to Set
-    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUrl<S> {}
-    impl<S: State> State for SetUrl<S> {
-        type Url = Set<members::url>;
-        type Events = S::Events;
+        type Url = Unset;
     }
     ///State transition - sets the `events` field to Set
     pub struct SetEvents<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEvents<S> {}
     impl<S: State> State for SetEvents<S> {
-        type Url = S::Url;
         type Events = Set<members::events>;
+        type Url = S::Url;
+    }
+    ///State transition - sets the `url` field to Set
+    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUrl<S> {}
+    impl<S: State> State for SetUrl<S> {
+        type Events = S::Events;
+        type Url = Set<members::url>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `url` field
-        pub struct url(());
         ///Marker type for the `events` field
         pub struct events(());
+        ///Marker type for the `url` field
+        pub struct url(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CreateWebhookBuilder<'a, S: create_webhook_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<CowStr<'a>>,
         Option<Vec<CowStr<'a>>>,
@@ -210,7 +213,7 @@ pub struct CreateWebhookBuilder<'a, S: create_webhook_state::State> {
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CreateWebhook<'a> {
@@ -224,19 +227,9 @@ impl<'a> CreateWebhookBuilder<'a, create_webhook_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreateWebhookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,12 +237,12 @@ impl<'a> CreateWebhookBuilder<'a, create_webhook_state::Empty> {
 impl<'a, S: create_webhook_state::State> CreateWebhookBuilder<'a, S> {
     /// Set the `active` field (optional)
     pub fn active(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `active` field to an Option value (optional)
     pub fn maybe_active(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -257,12 +250,12 @@ impl<'a, S: create_webhook_state::State> CreateWebhookBuilder<'a, S> {
 impl<'a, S: create_webhook_state::State> CreateWebhookBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -277,11 +270,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> CreateWebhookBuilder<'a, create_webhook_state::SetEvents<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CreateWebhookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -289,12 +282,12 @@ where
 impl<'a, S: create_webhook_state::State> CreateWebhookBuilder<'a, S> {
     /// Set the `muteWords` field (optional)
     pub fn mute_words(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `muteWords` field to an Option value (optional)
     pub fn maybe_mute_words(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -302,12 +295,12 @@ impl<'a, S: create_webhook_state::State> CreateWebhookBuilder<'a, S> {
 impl<'a, S: create_webhook_state::State> CreateWebhookBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -315,12 +308,12 @@ impl<'a, S: create_webhook_state::State> CreateWebhookBuilder<'a, S> {
 impl<'a, S: create_webhook_state::State> CreateWebhookBuilder<'a, S> {
     /// Set the `prefix` field (optional)
     pub fn prefix(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `prefix` field to an Option value (optional)
     pub fn maybe_prefix(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -328,12 +321,12 @@ impl<'a, S: create_webhook_state::State> CreateWebhookBuilder<'a, S> {
 impl<'a, S: create_webhook_state::State> CreateWebhookBuilder<'a, S> {
     /// Set the `rewrite` field (optional)
     pub fn rewrite(mut self, value: impl Into<Option<Vec<RewriteRule<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `rewrite` field to an Option value (optional)
     pub fn maybe_rewrite(mut self, value: Option<Vec<RewriteRule<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -341,12 +334,12 @@ impl<'a, S: create_webhook_state::State> CreateWebhookBuilder<'a, S> {
 impl<'a, S: create_webhook_state::State> CreateWebhookBuilder<'a, S> {
     /// Set the `suffix` field (optional)
     pub fn suffix(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `suffix` field to an Option value (optional)
     pub fn maybe_suffix(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -361,11 +354,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> CreateWebhookBuilder<'a, create_webhook_state::SetUrl<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         CreateWebhookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -373,21 +366,21 @@ where
 impl<'a, S> CreateWebhookBuilder<'a, S>
 where
     S: create_webhook_state::State,
-    S::Url: create_webhook_state::IsSet,
     S::Events: create_webhook_state::IsSet,
+    S::Url: create_webhook_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CreateWebhook<'a> {
         CreateWebhook {
-            active: self.__unsafe_private_named.0.or_else(|| Some(false)),
-            description: self.__unsafe_private_named.1,
-            events: self.__unsafe_private_named.2.unwrap(),
-            mute_words: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4,
-            prefix: self.__unsafe_private_named.5,
-            rewrite: self.__unsafe_private_named.6,
-            suffix: self.__unsafe_private_named.7,
-            url: self.__unsafe_private_named.8.unwrap(),
+            active: self._fields.0.or_else(|| Some(false)),
+            description: self._fields.1,
+            events: self._fields.2.unwrap(),
+            mute_words: self._fields.3,
+            name: self._fields.4,
+            prefix: self._fields.5,
+            rewrite: self._fields.6,
+            suffix: self._fields.7,
+            url: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -400,15 +393,15 @@ where
         >,
     ) -> CreateWebhook<'a> {
         CreateWebhook {
-            active: self.__unsafe_private_named.0.or_else(|| Some(false)),
-            description: self.__unsafe_private_named.1,
-            events: self.__unsafe_private_named.2.unwrap(),
-            mute_words: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4,
-            prefix: self.__unsafe_private_named.5,
-            rewrite: self.__unsafe_private_named.6,
-            suffix: self.__unsafe_private_named.7,
-            url: self.__unsafe_private_named.8.unwrap(),
+            active: self._fields.0.or_else(|| Some(false)),
+            description: self._fields.1,
+            events: self._fields.2.unwrap(),
+            mute_words: self._fields.3,
+            name: self._fields.4,
+            prefix: self._fields.5,
+            rewrite: self._fields.6,
+            suffix: self._fields.7,
+            url: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/server/delete_webhook.rs b/crates/jacquard-api/src/place_stream/server/delete_webhook.rs
index 5410a50e..417d9565 100644
--- a/crates/jacquard-api/src/place_stream/server/delete_webhook.rs
+++ b/crates/jacquard-api/src/place_stream/server/delete_webhook.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/place_stream/server/get_server_time.rs b/crates/jacquard-api/src/place_stream/server/get_server_time.rs
index b0524e53..a26063f4 100644
--- a/crates/jacquard-api/src/place_stream/server/get_server_time.rs
+++ b/crates/jacquard-api/src/place_stream/server/get_server_time.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Datetime;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/place_stream/server/get_webhook.rs b/crates/jacquard-api/src/place_stream/server/get_webhook.rs
index 9b380f69..c984598d 100644
--- a/crates/jacquard-api/src/place_stream/server/get_webhook.rs
+++ b/crates/jacquard-api/src/place_stream/server/get_webhook.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -133,9 +136,9 @@ pub mod get_webhook_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetWebhookBuilder<'a, S: get_webhook_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetWebhook<'a> {
@@ -149,9 +152,9 @@ impl<'a> GetWebhookBuilder<'a, get_webhook_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetWebhookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -166,11 +169,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetWebhookBuilder<'a, get_webhook_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetWebhookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,7 +186,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetWebhook<'a> {
         GetWebhook {
-            id: self.__unsafe_private_named.0.unwrap(),
+            id: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/place_stream/server/list_webhooks.rs b/crates/jacquard-api/src/place_stream/server/list_webhooks.rs
index 9ef82361..5b9ef6e7 100644
--- a/crates/jacquard-api/src/place_stream/server/list_webhooks.rs
+++ b/crates/jacquard-api/src/place_stream/server/list_webhooks.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -128,14 +131,9 @@ pub mod list_webhooks_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListWebhooksBuilder<'a, S: list_webhooks_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<bool>,
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<CowStr<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListWebhooks<'a> {
@@ -149,9 +147,9 @@ impl<'a> ListWebhooksBuilder<'a, list_webhooks_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListWebhooksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -159,12 +157,12 @@ impl<'a> ListWebhooksBuilder<'a, list_webhooks_state::Empty> {
 impl<'a, S: list_webhooks_state::State> ListWebhooksBuilder<'a, S> {
     /// Set the `active` field (optional)
     pub fn active(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `active` field to an Option value (optional)
     pub fn maybe_active(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -172,12 +170,12 @@ impl<'a, S: list_webhooks_state::State> ListWebhooksBuilder<'a, S> {
 impl<'a, S: list_webhooks_state::State> ListWebhooksBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -185,12 +183,12 @@ impl<'a, S: list_webhooks_state::State> ListWebhooksBuilder<'a, S> {
 impl<'a, S: list_webhooks_state::State> ListWebhooksBuilder<'a, S> {
     /// Set the `event` field (optional)
     pub fn event(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `event` field to an Option value (optional)
     pub fn maybe_event(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -198,12 +196,12 @@ impl<'a, S: list_webhooks_state::State> ListWebhooksBuilder<'a, S> {
 impl<'a, S: list_webhooks_state::State> ListWebhooksBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -215,10 +213,10 @@ where
     /// Build the final struct
     pub fn build(self) -> ListWebhooks<'a> {
         ListWebhooks {
-            active: self.__unsafe_private_named.0,
-            cursor: self.__unsafe_private_named.1,
-            event: self.__unsafe_private_named.2,
-            limit: self.__unsafe_private_named.3,
+            active: self._fields.0,
+            cursor: self._fields.1,
+            event: self._fields.2,
+            limit: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/place_stream/server/settings.rs b/crates/jacquard-api/src/place_stream/server/settings.rs
index d920ed88..04f2cebd 100644
--- a/crates/jacquard-api/src/place_stream/server/settings.rs
+++ b/crates/jacquard-api/src/place_stream/server/settings.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -119,9 +122,9 @@ pub mod settings_state {
 
 /// Builder for constructing an instance of this type
 pub struct SettingsBuilder<'a, S: settings_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Settings<'a> {
@@ -135,9 +138,9 @@ impl<'a> SettingsBuilder<'a, settings_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -145,12 +148,12 @@ impl<'a> SettingsBuilder<'a, settings_state::Empty> {
 impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
     /// Set the `debugRecording` field (optional)
     pub fn debug_recording(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `debugRecording` field to an Option value (optional)
     pub fn maybe_debug_recording(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -162,7 +165,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Settings<'a> {
         Settings {
-            debug_recording: self.__unsafe_private_named.0,
+            debug_recording: self._fields.0,
             extra_data: Default::default(),
         }
     }
@@ -175,7 +178,7 @@ where
         >,
     ) -> Settings<'a> {
         Settings {
-            debug_recording: self.__unsafe_private_named.0,
+            debug_recording: self._fields.0,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_stream/server/update_webhook.rs b/crates/jacquard-api/src/place_stream/server/update_webhook.rs
index 5b4a52b9..dcbc72e0 100644
--- a/crates/jacquard-api/src/place_stream/server/update_webhook.rs
+++ b/crates/jacquard-api/src/place_stream/server/update_webhook.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::UriValue;
diff --git a/crates/jacquard-api/src/place_wisp/fs.rs b/crates/jacquard-api/src/place_wisp/fs.rs
index 00bd10e1..a253f145 100644
--- a/crates/jacquard-api/src/place_wisp/fs.rs
+++ b/crates/jacquard-api/src/place_wisp/fs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -326,45 +329,45 @@ pub mod directory_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Entries;
         type Type;
+        type Entries;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Entries = Unset;
         type Type = Unset;
-    }
-    ///State transition - sets the `entries` field to Set
-    pub struct SetEntries<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetEntries<S> {}
-    impl<S: State> State for SetEntries<S> {
-        type Entries = Set<members::entries>;
-        type Type = S::Type;
+        type Entries = Unset;
     }
     ///State transition - sets the `type` field to Set
     pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetType<S> {}
     impl<S: State> State for SetType<S> {
-        type Entries = S::Entries;
         type Type = Set<members::r#type>;
+        type Entries = S::Entries;
+    }
+    ///State transition - sets the `entries` field to Set
+    pub struct SetEntries<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetEntries<S> {}
+    impl<S: State> State for SetEntries<S> {
+        type Type = S::Type;
+        type Entries = Set<members::entries>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `entries` field
-        pub struct entries(());
         ///Marker type for the `type` field
         pub struct r#type(());
+        ///Marker type for the `entries` field
+        pub struct entries(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DirectoryBuilder<'a, S: directory_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<fs::Entry<'a>>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<fs::Entry<'a>>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Directory<'a> {
@@ -378,9 +381,9 @@ impl<'a> DirectoryBuilder<'a, directory_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DirectoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -395,11 +398,11 @@ where
         mut self,
         value: impl Into<Vec<fs::Entry<'a>>>,
     ) -> DirectoryBuilder<'a, directory_state::SetEntries<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DirectoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -414,11 +417,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DirectoryBuilder<'a, directory_state::SetType<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DirectoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -426,14 +429,14 @@ where
 impl<'a, S> DirectoryBuilder<'a, S>
 where
     S: directory_state::State,
-    S::Entries: directory_state::IsSet,
     S::Type: directory_state::IsSet,
+    S::Entries: directory_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Directory<'a> {
         Directory {
-            entries: self.__unsafe_private_named.0.unwrap(),
-            r#type: self.__unsafe_private_named.1.unwrap(),
+            entries: self._fields.0.unwrap(),
+            r#type: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -446,8 +449,8 @@ where
         >,
     ) -> Directory<'a> {
         Directory {
-            entries: self.__unsafe_private_named.0.unwrap(),
-            r#type: self.__unsafe_private_named.1.unwrap(),
+            entries: self._fields.0.unwrap(),
+            r#type: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -675,45 +678,45 @@ pub mod entry_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Node;
         type Name;
+        type Node;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Node = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `node` field to Set
-    pub struct SetNode<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetNode<S> {}
-    impl<S: State> State for SetNode<S> {
-        type Node = Set<members::node>;
-        type Name = S::Name;
+        type Node = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Node = S::Node;
         type Name = Set<members::name>;
+        type Node = S::Node;
+    }
+    ///State transition - sets the `node` field to Set
+    pub struct SetNode<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetNode<S> {}
+    impl<S: State> State for SetNode<S> {
+        type Name = S::Name;
+        type Node = Set<members::node>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `node` field
-        pub struct node(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `node` field
+        pub struct node(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EntryBuilder<'a, S: entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<EntryNode<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<EntryNode<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Entry<'a> {
@@ -727,9 +730,9 @@ impl<'a> EntryBuilder<'a, entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -744,11 +747,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EntryBuilder<'a, entry_state::SetName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -763,11 +766,11 @@ where
         mut self,
         value: impl Into<EntryNode<'a>>,
     ) -> EntryBuilder<'a, entry_state::SetNode<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -775,14 +778,14 @@ where
 impl<'a, S> EntryBuilder<'a, S>
 where
     S: entry_state::State,
-    S::Node: entry_state::IsSet,
     S::Name: entry_state::IsSet,
+    S::Node: entry_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Entry<'a> {
         Entry {
-            name: self.__unsafe_private_named.0.unwrap(),
-            node: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0.unwrap(),
+            node: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -795,8 +798,8 @@ where
         >,
     ) -> Entry<'a> {
         Entry {
-            name: self.__unsafe_private_named.0.unwrap(),
-            node: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0.unwrap(),
+            node: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -848,15 +851,15 @@ pub mod file_state {
 
 /// Builder for constructing an instance of this type
 pub struct FileBuilder<'a, S: file_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> File<'a> {
@@ -870,9 +873,9 @@ impl<'a> FileBuilder<'a, file_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -880,12 +883,12 @@ impl<'a> FileBuilder<'a, file_state::Empty> {
 impl<'a, S: file_state::State> FileBuilder<'a, S> {
     /// Set the `base64` field (optional)
     pub fn base64(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `base64` field to an Option value (optional)
     pub fn maybe_base64(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -900,11 +903,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> FileBuilder<'a, file_state::SetBlob<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -912,12 +915,12 @@ where
 impl<'a, S: file_state::State> FileBuilder<'a, S> {
     /// Set the `encoding` field (optional)
     pub fn encoding(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `encoding` field to an Option value (optional)
     pub fn maybe_encoding(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -925,12 +928,12 @@ impl<'a, S: file_state::State> FileBuilder<'a, S> {
 impl<'a, S: file_state::State> FileBuilder<'a, S> {
     /// Set the `mimeType` field (optional)
     pub fn mime_type(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `mimeType` field to an Option value (optional)
     pub fn maybe_mime_type(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -945,11 +948,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> FileBuilder<'a, file_state::SetType<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         FileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -963,11 +966,11 @@ where
     /// Build the final struct
     pub fn build(self) -> File<'a> {
         File {
-            base64: self.__unsafe_private_named.0,
-            blob: self.__unsafe_private_named.1.unwrap(),
-            encoding: self.__unsafe_private_named.2,
-            mime_type: self.__unsafe_private_named.3,
-            r#type: self.__unsafe_private_named.4.unwrap(),
+            base64: self._fields.0,
+            blob: self._fields.1.unwrap(),
+            encoding: self._fields.2,
+            mime_type: self._fields.3,
+            r#type: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -980,11 +983,11 @@ where
         >,
     ) -> File<'a> {
         File {
-            base64: self.__unsafe_private_named.0,
-            blob: self.__unsafe_private_named.1.unwrap(),
-            encoding: self.__unsafe_private_named.2,
-            mime_type: self.__unsafe_private_named.3,
-            r#type: self.__unsafe_private_named.4.unwrap(),
+            base64: self._fields.0,
+            blob: self._fields.1.unwrap(),
+            encoding: self._fields.2,
+            mime_type: self._fields.3,
+            r#type: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1000,64 +1003,64 @@ pub mod fs_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Root;
         type Site;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Root = Unset;
         type Site = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Root = S::Root;
-        type Site = S::Site;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `root` field to Set
     pub struct SetRoot<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRoot<S> {}
     impl<S: State> State for SetRoot<S> {
-        type CreatedAt = S::CreatedAt;
         type Root = Set<members::root>;
         type Site = S::Site;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `site` field to Set
     pub struct SetSite<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSite<S> {}
     impl<S: State> State for SetSite<S> {
-        type CreatedAt = S::CreatedAt;
         type Root = S::Root;
         type Site = Set<members::site>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Root = S::Root;
+        type Site = S::Site;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `root` field
         pub struct root(());
         ///Marker type for the `site` field
         pub struct site(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FsBuilder<'a, S: fs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<i64>,
         Option<fs::Directory<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Fs<'a> {
@@ -1071,9 +1074,9 @@ impl<'a> FsBuilder<'a, fs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1088,11 +1091,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FsBuilder<'a, fs_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1100,12 +1103,12 @@ where
 impl<'a, S: fs_state::State> FsBuilder<'a, S> {
     /// Set the `fileCount` field (optional)
     pub fn file_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `fileCount` field to an Option value (optional)
     pub fn maybe_file_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1120,11 +1123,11 @@ where
         mut self,
         value: impl Into<fs::Directory<'a>>,
     ) -> FsBuilder<'a, fs_state::SetRoot<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         FsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1139,11 +1142,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> FsBuilder<'a, fs_state::SetSite<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         FsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1151,17 +1154,17 @@ where
 impl<'a, S> FsBuilder<'a, S>
 where
     S: fs_state::State,
-    S::CreatedAt: fs_state::IsSet,
     S::Root: fs_state::IsSet,
     S::Site: fs_state::IsSet,
+    S::CreatedAt: fs_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Fs<'a> {
         Fs {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            file_count: self.__unsafe_private_named.1,
-            root: self.__unsafe_private_named.2.unwrap(),
-            site: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            file_count: self._fields.1,
+            root: self._fields.2.unwrap(),
+            site: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1174,10 +1177,10 @@ where
         >,
     ) -> Fs<'a> {
         Fs {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            file_count: self.__unsafe_private_named.1,
-            root: self.__unsafe_private_named.2.unwrap(),
-            site: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            file_count: self._fields.1,
+            root: self._fields.2.unwrap(),
+            site: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1229,9 +1232,9 @@ pub mod subfs_state {
 
 /// Builder for constructing an instance of this type
 pub struct SubfsBuilder<'a, S: subfs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<AtUri<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<AtUri<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Subfs<'a> {
@@ -1245,9 +1248,9 @@ impl<'a> SubfsBuilder<'a, subfs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubfsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1255,12 +1258,12 @@ impl<'a> SubfsBuilder<'a, subfs_state::Empty> {
 impl<'a, S: subfs_state::State> SubfsBuilder<'a, S> {
     /// Set the `flat` field (optional)
     pub fn flat(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `flat` field to an Option value (optional)
     pub fn maybe_flat(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1275,11 +1278,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SubfsBuilder<'a, subfs_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SubfsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1294,11 +1297,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SubfsBuilder<'a, subfs_state::SetType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SubfsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1312,9 +1315,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Subfs<'a> {
         Subfs {
-            flat: self.__unsafe_private_named.0,
-            subject: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
+            flat: self._fields.0,
+            subject: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1327,9 +1330,9 @@ where
         >,
     ) -> Subfs<'a> {
         Subfs {
-            flat: self.__unsafe_private_named.0,
-            subject: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
+            flat: self._fields.0,
+            subject: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/place_wisp/settings.rs b/crates/jacquard-api/src/place_wisp/settings.rs
index 0793b745..b9af58a4 100644
--- a/crates/jacquard-api/src/place_wisp/settings.rs
+++ b/crates/jacquard-api/src/place_wisp/settings.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -421,8 +424,8 @@ pub mod settings_state {
 
 /// Builder for constructing an instance of this type
 pub struct SettingsBuilder<'a, S: settings_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<CowStr<'a>>,
         Option<bool>,
@@ -430,7 +433,7 @@ pub struct SettingsBuilder<'a, S: settings_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Settings<'a> {
@@ -444,9 +447,9 @@ impl<'a> SettingsBuilder<'a, settings_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -454,12 +457,12 @@ impl<'a> SettingsBuilder<'a, settings_state::Empty> {
 impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
     /// Set the `cleanUrls` field (optional)
     pub fn clean_urls(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cleanUrls` field to an Option value (optional)
     pub fn maybe_clean_urls(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -467,12 +470,12 @@ impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
 impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
     /// Set the `custom404` field (optional)
     pub fn custom404(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `custom404` field to an Option value (optional)
     pub fn maybe_custom404(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -480,12 +483,12 @@ impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
 impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
     /// Set the `directoryListing` field (optional)
     pub fn directory_listing(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `directoryListing` field to an Option value (optional)
     pub fn maybe_directory_listing(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -496,7 +499,7 @@ impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<settings::CustomHeader<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `headers` field to an Option value (optional)
@@ -504,7 +507,7 @@ impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
         mut self,
         value: Option<Vec<settings::CustomHeader<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -512,12 +515,12 @@ impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
 impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
     /// Set the `indexFiles` field (optional)
     pub fn index_files(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `indexFiles` field to an Option value (optional)
     pub fn maybe_index_files(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -525,12 +528,12 @@ impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
 impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
     /// Set the `spaMode` field (optional)
     pub fn spa_mode(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `spaMode` field to an Option value (optional)
     pub fn maybe_spa_mode(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -542,12 +545,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Settings<'a> {
         Settings {
-            clean_urls: self.__unsafe_private_named.0.or_else(|| Some(false)),
-            custom404: self.__unsafe_private_named.1,
-            directory_listing: self.__unsafe_private_named.2.or_else(|| Some(false)),
-            headers: self.__unsafe_private_named.3,
-            index_files: self.__unsafe_private_named.4,
-            spa_mode: self.__unsafe_private_named.5,
+            clean_urls: self._fields.0.or_else(|| Some(false)),
+            custom404: self._fields.1,
+            directory_listing: self._fields.2.or_else(|| Some(false)),
+            headers: self._fields.3,
+            index_files: self._fields.4,
+            spa_mode: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -560,12 +563,12 @@ where
         >,
     ) -> Settings<'a> {
         Settings {
-            clean_urls: self.__unsafe_private_named.0.or_else(|| Some(false)),
-            custom404: self.__unsafe_private_named.1,
-            directory_listing: self.__unsafe_private_named.2.or_else(|| Some(false)),
-            headers: self.__unsafe_private_named.3,
-            index_files: self.__unsafe_private_named.4,
-            spa_mode: self.__unsafe_private_named.5,
+            clean_urls: self._fields.0.or_else(|| Some(false)),
+            custom404: self._fields.1,
+            directory_listing: self._fields.2.or_else(|| Some(false)),
+            headers: self._fields.3,
+            index_files: self._fields.4,
+            spa_mode: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/bsky_post.rs b/crates/jacquard-api/src/pub_leaflet/blocks/bsky_post.rs
index 103fde41..3439d583 100644
--- a/crates/jacquard-api/src/pub_leaflet/blocks/bsky_post.rs
+++ b/crates/jacquard-api/src/pub_leaflet/blocks/bsky_post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -80,9 +83,9 @@ pub mod bsky_post_state {
 
 /// Builder for constructing an instance of this type
 pub struct BskyPostBuilder<'a, S: bsky_post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BskyPost<'a> {
@@ -96,9 +99,9 @@ impl<'a> BskyPostBuilder<'a, bsky_post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BskyPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -106,12 +109,12 @@ impl<'a> BskyPostBuilder<'a, bsky_post_state::Empty> {
 impl<'a, S: bsky_post_state::State> BskyPostBuilder<'a, S> {
     /// Set the `clientHost` field (optional)
     pub fn client_host(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `clientHost` field to an Option value (optional)
     pub fn maybe_client_host(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -126,11 +129,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> BskyPostBuilder<'a, bsky_post_state::SetPostRef<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BskyPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -143,8 +146,8 @@ where
     /// Build the final struct
     pub fn build(self) -> BskyPost<'a> {
         BskyPost {
-            client_host: self.__unsafe_private_named.0,
-            post_ref: self.__unsafe_private_named.1.unwrap(),
+            client_host: self._fields.0,
+            post_ref: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -157,8 +160,8 @@ where
         >,
     ) -> BskyPost<'a> {
         BskyPost {
-            client_host: self.__unsafe_private_named.0,
-            post_ref: self.__unsafe_private_named.1.unwrap(),
+            client_host: self._fields.0,
+            post_ref: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/button.rs b/crates/jacquard-api/src/pub_leaflet/blocks/button.rs
index 349601f7..f1599ced 100644
--- a/crates/jacquard-api/src/pub_leaflet/blocks/button.rs
+++ b/crates/jacquard-api/src/pub_leaflet/blocks/button.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -55,45 +58,45 @@ pub mod button_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Url;
         type Text;
+        type Url;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Url = Unset;
         type Text = Unset;
-    }
-    ///State transition - sets the `url` field to Set
-    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUrl<S> {}
-    impl<S: State> State for SetUrl<S> {
-        type Url = Set<members::url>;
-        type Text = S::Text;
+        type Url = Unset;
     }
     ///State transition - sets the `text` field to Set
     pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetText<S> {}
     impl<S: State> State for SetText<S> {
-        type Url = S::Url;
         type Text = Set<members::text>;
+        type Url = S::Url;
+    }
+    ///State transition - sets the `url` field to Set
+    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUrl<S> {}
+    impl<S: State> State for SetUrl<S> {
+        type Text = S::Text;
+        type Url = Set<members::url>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `url` field
-        pub struct url(());
         ///Marker type for the `text` field
         pub struct text(());
+        ///Marker type for the `url` field
+        pub struct url(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ButtonBuilder<'a, S: button_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Button<'a> {
@@ -107,9 +110,9 @@ impl<'a> ButtonBuilder<'a, button_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ButtonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -124,11 +127,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ButtonBuilder<'a, button_state::SetText<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ButtonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -143,11 +146,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ButtonBuilder<'a, button_state::SetUrl<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ButtonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -155,14 +158,14 @@ where
 impl<'a, S> ButtonBuilder<'a, S>
 where
     S: button_state::State,
-    S::Url: button_state::IsSet,
     S::Text: button_state::IsSet,
+    S::Url: button_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Button<'a> {
         Button {
-            text: self.__unsafe_private_named.0.unwrap(),
-            url: self.__unsafe_private_named.1.unwrap(),
+            text: self._fields.0.unwrap(),
+            url: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -175,8 +178,8 @@ where
         >,
     ) -> Button<'a> {
         Button {
-            text: self.__unsafe_private_named.0.unwrap(),
-            url: self.__unsafe_private_named.1.unwrap(),
+            text: self._fields.0.unwrap(),
+            url: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/iframe.rs b/crates/jacquard-api/src/pub_leaflet/blocks/iframe.rs
index b9d246cb..77ce2904 100644
--- a/crates/jacquard-api/src/pub_leaflet/blocks/iframe.rs
+++ b/crates/jacquard-api/src/pub_leaflet/blocks/iframe.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -96,9 +99,9 @@ pub mod iframe_state {
 
 /// Builder for constructing an instance of this type
 pub struct IframeBuilder<'a, S: iframe_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Iframe<'a> {
@@ -112,9 +115,9 @@ impl<'a> IframeBuilder<'a, iframe_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IframeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -122,12 +125,12 @@ impl<'a> IframeBuilder<'a, iframe_state::Empty> {
 impl<'a, S: iframe_state::State> IframeBuilder<'a, S> {
     /// Set the `height` field (optional)
     pub fn height(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `height` field to an Option value (optional)
     pub fn maybe_height(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -142,11 +145,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> IframeBuilder<'a, iframe_state::SetUrl<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         IframeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -159,8 +162,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Iframe<'a> {
         Iframe {
-            height: self.__unsafe_private_named.0,
-            url: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0,
+            url: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -173,8 +176,8 @@ where
         >,
     ) -> Iframe<'a> {
         Iframe {
-            height: self.__unsafe_private_named.0,
-            url: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0,
+            url: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/image.rs b/crates/jacquard-api/src/pub_leaflet/blocks/image.rs
index a9ad7ea7..a5a50f82 100644
--- a/crates/jacquard-api/src/pub_leaflet/blocks/image.rs
+++ b/crates/jacquard-api/src/pub_leaflet/blocks/image.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -124,45 +127,45 @@ pub mod aspect_ratio_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Height;
         type Width;
+        type Height;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Height = Unset;
         type Width = Unset;
-    }
-    ///State transition - sets the `height` field to Set
-    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHeight<S> {}
-    impl<S: State> State for SetHeight<S> {
-        type Height = Set<members::height>;
-        type Width = S::Width;
+        type Height = Unset;
     }
     ///State transition - sets the `width` field to Set
     pub struct SetWidth<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWidth<S> {}
     impl<S: State> State for SetWidth<S> {
-        type Height = S::Height;
         type Width = Set<members::width>;
+        type Height = S::Height;
+    }
+    ///State transition - sets the `height` field to Set
+    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHeight<S> {}
+    impl<S: State> State for SetHeight<S> {
+        type Width = S::Width;
+        type Height = Set<members::height>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `height` field
-        pub struct height(());
         ///Marker type for the `width` field
         pub struct width(());
+        ///Marker type for the `height` field
+        pub struct height(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AspectRatioBuilder<'a, S: aspect_ratio_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AspectRatio<'a> {
@@ -176,9 +179,9 @@ impl<'a> AspectRatioBuilder<'a, aspect_ratio_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -193,11 +196,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,11 +215,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetWidth<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -224,14 +227,14 @@ where
 impl<'a, S> AspectRatioBuilder<'a, S>
 where
     S: aspect_ratio_state::State,
-    S::Height: aspect_ratio_state::IsSet,
     S::Width: aspect_ratio_state::IsSet,
+    S::Height: aspect_ratio_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -244,8 +247,8 @@ where
         >,
     ) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -378,13 +381,9 @@ pub mod image_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImageBuilder<'a, S: image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<image::AspectRatio<'a>>,
-        Option<BlobRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<image::AspectRatio<'a>>, Option<BlobRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Image<'a> {
@@ -398,9 +397,9 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -408,12 +407,12 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -428,11 +427,11 @@ where
         mut self,
         value: impl Into<image::AspectRatio<'a>>,
     ) -> ImageBuilder<'a, image_state::SetAspectRatio<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -447,11 +446,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ImageBuilder<'a, image_state::SetImage<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -465,9 +464,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0,
-            aspect_ratio: self.__unsafe_private_named.1.unwrap(),
-            image: self.__unsafe_private_named.2.unwrap(),
+            alt: self._fields.0,
+            aspect_ratio: self._fields.1.unwrap(),
+            image: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -480,9 +479,9 @@ where
         >,
     ) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0,
-            aspect_ratio: self.__unsafe_private_named.1.unwrap(),
-            image: self.__unsafe_private_named.2.unwrap(),
+            alt: self._fields.0,
+            aspect_ratio: self._fields.1.unwrap(),
+            image: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/ordered_list.rs b/crates/jacquard-api/src/pub_leaflet/blocks/ordered_list.rs
index 34016ea2..1d361bc6 100644
--- a/crates/jacquard-api/src/pub_leaflet/blocks/ordered_list.rs
+++ b/crates/jacquard-api/src/pub_leaflet/blocks/ordered_list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -129,13 +132,13 @@ pub mod list_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListItemBuilder<'a, S: list_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<ordered_list::ListItem<'a>>>,
         Option<ListItemContent<'a>>,
         Option<UnorderedList<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListItem<'a> {
@@ -149,9 +152,9 @@ impl<'a> ListItemBuilder<'a, list_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -162,7 +165,7 @@ impl<'a, S: list_item_state::State> ListItemBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<ordered_list::ListItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `children` field to an Option value (optional)
@@ -170,7 +173,7 @@ impl<'a, S: list_item_state::State> ListItemBuilder<'a, S> {
         mut self,
         value: Option<Vec<ordered_list::ListItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -185,11 +188,11 @@ where
         mut self,
         value: impl Into<ListItemContent<'a>>,
     ) -> ListItemBuilder<'a, list_item_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,7 +203,7 @@ impl<'a, S: list_item_state::State> ListItemBuilder<'a, S> {
         mut self,
         value: impl Into<Option<UnorderedList<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `unorderedListChildren` field to an Option value (optional)
@@ -208,7 +211,7 @@ impl<'a, S: list_item_state::State> ListItemBuilder<'a, S> {
         mut self,
         value: Option<UnorderedList<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -221,9 +224,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ListItem<'a> {
         ListItem {
-            children: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            unordered_list_children: self.__unsafe_private_named.2,
+            children: self._fields.0,
+            content: self._fields.1.unwrap(),
+            unordered_list_children: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -236,9 +239,9 @@ where
         >,
     ) -> ListItem<'a> {
         ListItem {
-            children: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            unordered_list_children: self.__unsafe_private_named.2,
+            children: self._fields.0,
+            content: self._fields.1.unwrap(),
+            unordered_list_children: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -369,9 +372,9 @@ pub mod ordered_list_state {
 
 /// Builder for constructing an instance of this type
 pub struct OrderedListBuilder<'a, S: ordered_list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<ordered_list::ListItem<'a>>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<ordered_list::ListItem<'a>>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> OrderedList<'a> {
@@ -385,9 +388,9 @@ impl<'a> OrderedListBuilder<'a, ordered_list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OrderedListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -402,11 +405,11 @@ where
         mut self,
         value: impl Into<Vec<ordered_list::ListItem<'a>>>,
     ) -> OrderedListBuilder<'a, ordered_list_state::SetChildren<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         OrderedListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -414,12 +417,12 @@ where
 impl<'a, S: ordered_list_state::State> OrderedListBuilder<'a, S> {
     /// Set the `startIndex` field (optional)
     pub fn start_index(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `startIndex` field to an Option value (optional)
     pub fn maybe_start_index(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -432,8 +435,8 @@ where
     /// Build the final struct
     pub fn build(self) -> OrderedList<'a> {
         OrderedList {
-            children: self.__unsafe_private_named.0.unwrap(),
-            start_index: self.__unsafe_private_named.1,
+            children: self._fields.0.unwrap(),
+            start_index: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -446,8 +449,8 @@ where
         >,
     ) -> OrderedList<'a> {
         OrderedList {
-            children: self.__unsafe_private_named.0.unwrap(),
-            start_index: self.__unsafe_private_named.1,
+            children: self._fields.0.unwrap(),
+            start_index: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/poll.rs b/crates/jacquard-api/src/pub_leaflet/blocks/poll.rs
index 6aeda1a4..948402a0 100644
--- a/crates/jacquard-api/src/pub_leaflet/blocks/poll.rs
+++ b/crates/jacquard-api/src/pub_leaflet/blocks/poll.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -76,9 +79,9 @@ pub mod poll_state {
 
 /// Builder for constructing an instance of this type
 pub struct PollBuilder<'a, S: poll_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Poll<'a> {
@@ -92,9 +95,9 @@ impl<'a> PollBuilder<'a, poll_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PollBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -109,11 +112,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> PollBuilder<'a, poll_state::SetPollRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PollBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -126,7 +129,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Poll<'a> {
         Poll {
-            poll_ref: self.__unsafe_private_named.0.unwrap(),
+            poll_ref: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -139,7 +142,7 @@ where
         >,
     ) -> Poll<'a> {
         Poll {
-            poll_ref: self.__unsafe_private_named.0.unwrap(),
+            poll_ref: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/unordered_list.rs b/crates/jacquard-api/src/pub_leaflet/blocks/unordered_list.rs
index d6ecb7c6..8bfa6e36 100644
--- a/crates/jacquard-api/src/pub_leaflet/blocks/unordered_list.rs
+++ b/crates/jacquard-api/src/pub_leaflet/blocks/unordered_list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -126,13 +129,13 @@ pub mod list_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListItemBuilder<'a, S: list_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<unordered_list::ListItem<'a>>>,
         Option<ListItemContent<'a>>,
         Option<OrderedList<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListItem<'a> {
@@ -146,9 +149,9 @@ impl<'a> ListItemBuilder<'a, list_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -159,7 +162,7 @@ impl<'a, S: list_item_state::State> ListItemBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<unordered_list::ListItem<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `children` field to an Option value (optional)
@@ -167,7 +170,7 @@ impl<'a, S: list_item_state::State> ListItemBuilder<'a, S> {
         mut self,
         value: Option<Vec<unordered_list::ListItem<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -182,11 +185,11 @@ where
         mut self,
         value: impl Into<ListItemContent<'a>>,
     ) -> ListItemBuilder<'a, list_item_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,7 +200,7 @@ impl<'a, S: list_item_state::State> ListItemBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrderedList<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `orderedListChildren` field to an Option value (optional)
@@ -205,7 +208,7 @@ impl<'a, S: list_item_state::State> ListItemBuilder<'a, S> {
         mut self,
         value: Option<OrderedList<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -218,9 +221,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ListItem<'a> {
         ListItem {
-            children: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            ordered_list_children: self.__unsafe_private_named.2,
+            children: self._fields.0,
+            content: self._fields.1.unwrap(),
+            ordered_list_children: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -233,9 +236,9 @@ where
         >,
     ) -> ListItem<'a> {
         ListItem {
-            children: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            ordered_list_children: self.__unsafe_private_named.2,
+            children: self._fields.0,
+            content: self._fields.1.unwrap(),
+            ordered_list_children: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -358,9 +361,9 @@ pub mod unordered_list_state {
 
 /// Builder for constructing an instance of this type
 pub struct UnorderedListBuilder<'a, S: unordered_list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<unordered_list::ListItem<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<unordered_list::ListItem<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UnorderedList<'a> {
@@ -374,9 +377,9 @@ impl<'a> UnorderedListBuilder<'a, unordered_list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UnorderedListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -391,11 +394,11 @@ where
         mut self,
         value: impl Into<Vec<unordered_list::ListItem<'a>>>,
     ) -> UnorderedListBuilder<'a, unordered_list_state::SetChildren<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UnorderedListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -408,7 +411,7 @@ where
     /// Build the final struct
     pub fn build(self) -> UnorderedList<'a> {
         UnorderedList {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -421,7 +424,7 @@ where
         >,
     ) -> UnorderedList<'a> {
         UnorderedList {
-            children: self.__unsafe_private_named.0.unwrap(),
+            children: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/website.rs b/crates/jacquard-api/src/pub_leaflet/blocks/website.rs
index c6e7e1c5..525c10af 100644
--- a/crates/jacquard-api/src/pub_leaflet/blocks/website.rs
+++ b/crates/jacquard-api/src/pub_leaflet/blocks/website.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -125,14 +128,14 @@ pub mod website_state {
 
 /// Builder for constructing an instance of this type
 pub struct WebsiteBuilder<'a, S: website_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Website<'a> {
@@ -146,9 +149,9 @@ impl<'a> WebsiteBuilder<'a, website_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WebsiteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -156,12 +159,12 @@ impl<'a> WebsiteBuilder<'a, website_state::Empty> {
 impl<'a, S: website_state::State> WebsiteBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -169,12 +172,12 @@ impl<'a, S: website_state::State> WebsiteBuilder<'a, S> {
 impl<'a, S: website_state::State> WebsiteBuilder<'a, S> {
     /// Set the `previewImage` field (optional)
     pub fn preview_image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `previewImage` field to an Option value (optional)
     pub fn maybe_preview_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -189,11 +192,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> WebsiteBuilder<'a, website_state::SetSrc<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         WebsiteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -201,12 +204,12 @@ where
 impl<'a, S: website_state::State> WebsiteBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -219,10 +222,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Website<'a> {
         Website {
-            description: self.__unsafe_private_named.0,
-            preview_image: self.__unsafe_private_named.1,
-            src: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3,
+            description: self._fields.0,
+            preview_image: self._fields.1,
+            src: self._fields.2.unwrap(),
+            title: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -235,10 +238,10 @@ where
         >,
     ) -> Website<'a> {
         Website {
-            description: self.__unsafe_private_named.0,
-            preview_image: self.__unsafe_private_named.1,
-            src: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3,
+            description: self._fields.0,
+            preview_image: self._fields.1,
+            src: self._fields.2.unwrap(),
+            title: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/comment.rs b/crates/jacquard-api/src/pub_leaflet/comment.rs
index 10c92496..5b56d163 100644
--- a/crates/jacquard-api/src/pub_leaflet/comment.rs
+++ b/crates/jacquard-api/src/pub_leaflet/comment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -175,45 +178,45 @@ pub mod linear_document_quote_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Quote;
         type Document;
+        type Quote;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Quote = Unset;
         type Document = Unset;
-    }
-    ///State transition - sets the `quote` field to Set
-    pub struct SetQuote<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetQuote<S> {}
-    impl<S: State> State for SetQuote<S> {
-        type Quote = Set<members::quote>;
-        type Document = S::Document;
+        type Quote = Unset;
     }
     ///State transition - sets the `document` field to Set
     pub struct SetDocument<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDocument<S> {}
     impl<S: State> State for SetDocument<S> {
-        type Quote = S::Quote;
         type Document = Set<members::document>;
+        type Quote = S::Quote;
+    }
+    ///State transition - sets the `quote` field to Set
+    pub struct SetQuote<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetQuote<S> {}
+    impl<S: State> State for SetQuote<S> {
+        type Document = S::Document;
+        type Quote = Set<members::quote>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `quote` field
-        pub struct quote(());
         ///Marker type for the `document` field
         pub struct document(());
+        ///Marker type for the `quote` field
+        pub struct quote(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LinearDocumentQuoteBuilder<'a, S: linear_document_quote_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<Quote<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<Quote<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LinearDocumentQuote<'a> {
@@ -227,9 +230,9 @@ impl<'a> LinearDocumentQuoteBuilder<'a, linear_document_quote_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinearDocumentQuoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,11 +247,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> LinearDocumentQuoteBuilder<'a, linear_document_quote_state::SetDocument<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LinearDocumentQuoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -263,11 +266,11 @@ where
         mut self,
         value: impl Into<Quote<'a>>,
     ) -> LinearDocumentQuoteBuilder<'a, linear_document_quote_state::SetQuote<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LinearDocumentQuoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -275,14 +278,14 @@ where
 impl<'a, S> LinearDocumentQuoteBuilder<'a, S>
 where
     S: linear_document_quote_state::State,
-    S::Quote: linear_document_quote_state::IsSet,
     S::Document: linear_document_quote_state::IsSet,
+    S::Quote: linear_document_quote_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LinearDocumentQuote<'a> {
         LinearDocumentQuote {
-            document: self.__unsafe_private_named.0.unwrap(),
-            quote: self.__unsafe_private_named.1.unwrap(),
+            document: self._fields.0.unwrap(),
+            quote: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -295,8 +298,8 @@ where
         >,
     ) -> LinearDocumentQuote<'a> {
         LinearDocumentQuote {
-            document: self.__unsafe_private_named.0.unwrap(),
-            quote: self.__unsafe_private_named.1.unwrap(),
+            document: self._fields.0.unwrap(),
+            quote: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -452,49 +455,49 @@ pub mod comment_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type Plaintext;
+        type Subject;
         type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type Plaintext = Unset;
+        type Subject = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type Plaintext = S::Plaintext;
-        type CreatedAt = S::CreatedAt;
-    }
     ///State transition - sets the `plaintext` field to Set
     pub struct SetPlaintext<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPlaintext<S> {}
     impl<S: State> State for SetPlaintext<S> {
-        type Subject = S::Subject;
         type Plaintext = Set<members::plaintext>;
+        type Subject = S::Subject;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type Plaintext = S::Plaintext;
+        type Subject = Set<members::subject>;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type Plaintext = S::Plaintext;
+        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `plaintext` field
         pub struct plaintext(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
     }
@@ -502,8 +505,8 @@ pub mod comment_state {
 
 /// Builder for constructing an instance of this type
 pub struct CommentBuilder<'a, S: comment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<comment::LinearDocumentQuote<'a>>,
         Option<Datetime>,
         Option<Vec<Facet<'a>>>,
@@ -512,7 +515,7 @@ pub struct CommentBuilder<'a, S: comment_state::State> {
         Option<comment::ReplyRef<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Comment<'a> {
@@ -526,9 +529,9 @@ impl<'a> CommentBuilder<'a, comment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -539,7 +542,7 @@ impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
         mut self,
         value: impl Into<Option<comment::LinearDocumentQuote<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `attachment` field to an Option value (optional)
@@ -547,7 +550,7 @@ impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
         mut self,
         value: Option<comment::LinearDocumentQuote<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -562,11 +565,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CommentBuilder<'a, comment_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -574,12 +577,12 @@ where
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -587,12 +590,12 @@ impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `onPage` field (optional)
     pub fn on_page(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `onPage` field to an Option value (optional)
     pub fn maybe_on_page(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -607,11 +610,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetPlaintext<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -619,12 +622,12 @@ where
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `reply` field (optional)
     pub fn reply(mut self, value: impl Into<Option<comment::ReplyRef<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `reply` field to an Option value (optional)
     pub fn maybe_reply(mut self, value: Option<comment::ReplyRef<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -639,11 +642,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetSubject<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -651,20 +654,20 @@ where
 impl<'a, S> CommentBuilder<'a, S>
 where
     S: comment_state::State,
-    S::Subject: comment_state::IsSet,
     S::Plaintext: comment_state::IsSet,
+    S::Subject: comment_state::IsSet,
     S::CreatedAt: comment_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Comment<'a> {
         Comment {
-            attachment: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            facets: self.__unsafe_private_named.2,
-            on_page: self.__unsafe_private_named.3,
-            plaintext: self.__unsafe_private_named.4.unwrap(),
-            reply: self.__unsafe_private_named.5,
-            subject: self.__unsafe_private_named.6.unwrap(),
+            attachment: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            facets: self._fields.2,
+            on_page: self._fields.3,
+            plaintext: self._fields.4.unwrap(),
+            reply: self._fields.5,
+            subject: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -677,13 +680,13 @@ where
         >,
     ) -> Comment<'a> {
         Comment {
-            attachment: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            facets: self.__unsafe_private_named.2,
-            on_page: self.__unsafe_private_named.3,
-            plaintext: self.__unsafe_private_named.4.unwrap(),
-            reply: self.__unsafe_private_named.5,
-            subject: self.__unsafe_private_named.6.unwrap(),
+            attachment: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            facets: self._fields.2,
+            on_page: self._fields.3,
+            plaintext: self._fields.4.unwrap(),
+            reply: self._fields.5,
+            subject: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -723,9 +726,9 @@ pub mod reply_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReplyRefBuilder<'a, S: reply_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReplyRef<'a> {
@@ -739,9 +742,9 @@ impl<'a> ReplyRefBuilder<'a, reply_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -756,11 +759,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ReplyRefBuilder<'a, reply_ref_state::SetParent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -773,7 +776,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ReplyRef<'a> {
         ReplyRef {
-            parent: self.__unsafe_private_named.0.unwrap(),
+            parent: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -786,7 +789,7 @@ where
         >,
     ) -> ReplyRef<'a> {
         ReplyRef {
-            parent: self.__unsafe_private_named.0.unwrap(),
+            parent: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/content.rs b/crates/jacquard-api/src/pub_leaflet/content.rs
index 9115ba4f..09f23a50 100644
--- a/crates/jacquard-api/src/pub_leaflet/content.rs
+++ b/crates/jacquard-api/src/pub_leaflet/content.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -90,9 +93,9 @@ pub mod content_state {
 
 /// Builder for constructing an instance of this type
 pub struct ContentBuilder<'a, S: content_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<ContentPagesItem<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<ContentPagesItem<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Content<'a> {
@@ -106,9 +109,9 @@ impl<'a> ContentBuilder<'a, content_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ContentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -123,11 +126,11 @@ where
         mut self,
         value: impl Into<Vec<ContentPagesItem<'a>>>,
     ) -> ContentBuilder<'a, content_state::SetPages<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ContentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -140,7 +143,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Content<'a> {
         Content {
-            pages: self.__unsafe_private_named.0.unwrap(),
+            pages: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -153,7 +156,7 @@ where
         >,
     ) -> Content<'a> {
         Content {
-            pages: self.__unsafe_private_named.0.unwrap(),
+            pages: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/document.rs b/crates/jacquard-api/src/pub_leaflet/document.rs
index f374324a..f7d8078a 100644
--- a/crates/jacquard-api/src/pub_leaflet/document.rs
+++ b/crates/jacquard-api/src/pub_leaflet/document.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -241,57 +244,57 @@ pub mod document_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Title;
-        type Pages;
         type Author;
+        type Pages;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Title = Unset;
-        type Pages = Unset;
         type Author = Unset;
+        type Pages = Unset;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
         type Title = Set<members::title>;
-        type Pages = S::Pages;
-        type Author = S::Author;
-    }
-    ///State transition - sets the `pages` field to Set
-    pub struct SetPages<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPages<S> {}
-    impl<S: State> State for SetPages<S> {
-        type Title = S::Title;
-        type Pages = Set<members::pages>;
         type Author = S::Author;
+        type Pages = S::Pages;
     }
     ///State transition - sets the `author` field to Set
     pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthor<S> {}
     impl<S: State> State for SetAuthor<S> {
         type Title = S::Title;
-        type Pages = S::Pages;
         type Author = Set<members::author>;
+        type Pages = S::Pages;
+    }
+    ///State transition - sets the `pages` field to Set
+    pub struct SetPages<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPages<S> {}
+    impl<S: State> State for SetPages<S> {
+        type Title = S::Title;
+        type Author = S::Author;
+        type Pages = Set<members::pages>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `title` field
         pub struct title(());
-        ///Marker type for the `pages` field
-        pub struct pages(());
         ///Marker type for the `author` field
         pub struct author(());
+        ///Marker type for the `pages` field
+        pub struct pages(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DocumentBuilder<'a, S: document_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
@@ -304,7 +307,7 @@ pub struct DocumentBuilder<'a, S: document_state::State> {
         Option<Theme<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Document<'a> {
@@ -318,21 +321,9 @@ impl<'a> DocumentBuilder<'a, document_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -347,11 +338,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> DocumentBuilder<'a, document_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -359,12 +350,12 @@ where
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `coverImage` field (optional)
     pub fn cover_image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `coverImage` field to an Option value (optional)
     pub fn maybe_cover_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -372,12 +363,12 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -392,11 +383,11 @@ where
         mut self,
         value: impl Into<Vec<DocumentPagesItem<'a>>>,
     ) -> DocumentBuilder<'a, document_state::SetPages<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -404,12 +395,12 @@ where
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `postRef` field (optional)
     pub fn post_ref(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `postRef` field to an Option value (optional)
     pub fn maybe_post_ref(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -417,12 +408,12 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `preferences` field (optional)
     pub fn preferences(mut self, value: impl Into<Option<Preferences<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `preferences` field to an Option value (optional)
     pub fn maybe_preferences(mut self, value: Option<Preferences<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -430,12 +421,12 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `publication` field (optional)
     pub fn publication(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `publication` field to an Option value (optional)
     pub fn maybe_publication(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -443,12 +434,12 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `publishedAt` field (optional)
     pub fn published_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `publishedAt` field to an Option value (optional)
     pub fn maybe_published_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -456,12 +447,12 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -469,12 +460,12 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `theme` field (optional)
     pub fn theme(mut self, value: impl Into<Option<Theme<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `theme` field to an Option value (optional)
     pub fn maybe_theme(mut self, value: Option<Theme<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -489,11 +480,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DocumentBuilder<'a, document_state::SetTitle<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -502,23 +493,23 @@ impl<'a, S> DocumentBuilder<'a, S>
 where
     S: document_state::State,
     S::Title: document_state::IsSet,
-    S::Pages: document_state::IsSet,
     S::Author: document_state::IsSet,
+    S::Pages: document_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Document<'a> {
         Document {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cover_image: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            pages: self.__unsafe_private_named.3.unwrap(),
-            post_ref: self.__unsafe_private_named.4,
-            preferences: self.__unsafe_private_named.5,
-            publication: self.__unsafe_private_named.6,
-            published_at: self.__unsafe_private_named.7,
-            tags: self.__unsafe_private_named.8,
-            theme: self.__unsafe_private_named.9,
-            title: self.__unsafe_private_named.10.unwrap(),
+            author: self._fields.0.unwrap(),
+            cover_image: self._fields.1,
+            description: self._fields.2,
+            pages: self._fields.3.unwrap(),
+            post_ref: self._fields.4,
+            preferences: self._fields.5,
+            publication: self._fields.6,
+            published_at: self._fields.7,
+            tags: self._fields.8,
+            theme: self._fields.9,
+            title: self._fields.10.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -531,17 +522,17 @@ where
         >,
     ) -> Document<'a> {
         Document {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cover_image: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            pages: self.__unsafe_private_named.3.unwrap(),
-            post_ref: self.__unsafe_private_named.4,
-            preferences: self.__unsafe_private_named.5,
-            publication: self.__unsafe_private_named.6,
-            published_at: self.__unsafe_private_named.7,
-            tags: self.__unsafe_private_named.8,
-            theme: self.__unsafe_private_named.9,
-            title: self.__unsafe_private_named.10.unwrap(),
+            author: self._fields.0.unwrap(),
+            cover_image: self._fields.1,
+            description: self._fields.2,
+            pages: self._fields.3.unwrap(),
+            post_ref: self._fields.4,
+            preferences: self._fields.5,
+            publication: self._fields.6,
+            published_at: self._fields.7,
+            tags: self._fields.8,
+            theme: self._fields.9,
+            title: self._fields.10.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/graph/subscription.rs b/crates/jacquard-api/src/pub_leaflet/graph/subscription.rs
index f0712827..47229ba2 100644
--- a/crates/jacquard-api/src/pub_leaflet/graph/subscription.rs
+++ b/crates/jacquard-api/src/pub_leaflet/graph/subscription.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -131,9 +134,9 @@ pub mod subscription_state {
 
 /// Builder for constructing an instance of this type
 pub struct SubscriptionBuilder<'a, S: subscription_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Subscription<'a> {
@@ -147,9 +150,9 @@ impl<'a> SubscriptionBuilder<'a, subscription_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,11 +167,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SubscriptionBuilder<'a, subscription_state::SetPublication<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,7 +184,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Subscription<'a> {
         Subscription {
-            publication: self.__unsafe_private_named.0.unwrap(),
+            publication: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -194,7 +197,7 @@ where
         >,
     ) -> Subscription<'a> {
         Subscription {
-            publication: self.__unsafe_private_named.0.unwrap(),
+            publication: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/interactions/recommend.rs b/crates/jacquard-api/src/pub_leaflet/interactions/recommend.rs
index 4e6f0971..3f944a61 100644
--- a/crates/jacquard-api/src/pub_leaflet/interactions/recommend.rs
+++ b/crates/jacquard-api/src/pub_leaflet/interactions/recommend.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -144,9 +147,9 @@ pub mod recommend_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecommendBuilder<'a, S: recommend_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Recommend<'a> {
@@ -160,9 +163,9 @@ impl<'a> RecommendBuilder<'a, recommend_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecommendBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -177,11 +180,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RecommendBuilder<'a, recommend_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecommendBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RecommendBuilder<'a, recommend_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RecommendBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -214,8 +217,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Recommend<'a> {
         Recommend {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -228,8 +231,8 @@ where
         >,
     ) -> Recommend<'a> {
         Recommend {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/pages/canvas.rs b/crates/jacquard-api/src/pub_leaflet/pages/canvas.rs
index e9735ed5..0f32fb87 100644
--- a/crates/jacquard-api/src/pub_leaflet/pages/canvas.rs
+++ b/crates/jacquard-api/src/pub_leaflet/pages/canvas.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -218,74 +221,74 @@ pub mod block_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Block;
+        type Width;
         type Y;
         type X;
-        type Width;
-        type Block;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Block = Unset;
+        type Width = Unset;
         type Y = Unset;
         type X = Unset;
-        type Width = Unset;
-        type Block = Unset;
+    }
+    ///State transition - sets the `block` field to Set
+    pub struct SetBlock<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBlock<S> {}
+    impl<S: State> State for SetBlock<S> {
+        type Block = Set<members::block>;
+        type Width = S::Width;
+        type Y = S::Y;
+        type X = S::X;
+    }
+    ///State transition - sets the `width` field to Set
+    pub struct SetWidth<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetWidth<S> {}
+    impl<S: State> State for SetWidth<S> {
+        type Block = S::Block;
+        type Width = Set<members::width>;
+        type Y = S::Y;
+        type X = S::X;
     }
     ///State transition - sets the `y` field to Set
     pub struct SetY<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetY<S> {}
     impl<S: State> State for SetY<S> {
+        type Block = S::Block;
+        type Width = S::Width;
         type Y = Set<members::y>;
         type X = S::X;
-        type Width = S::Width;
-        type Block = S::Block;
     }
     ///State transition - sets the `x` field to Set
     pub struct SetX<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetX<S> {}
     impl<S: State> State for SetX<S> {
-        type Y = S::Y;
-        type X = Set<members::x>;
-        type Width = S::Width;
         type Block = S::Block;
-    }
-    ///State transition - sets the `width` field to Set
-    pub struct SetWidth<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetWidth<S> {}
-    impl<S: State> State for SetWidth<S> {
-        type Y = S::Y;
-        type X = S::X;
-        type Width = Set<members::width>;
-        type Block = S::Block;
-    }
-    ///State transition - sets the `block` field to Set
-    pub struct SetBlock<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBlock<S> {}
-    impl<S: State> State for SetBlock<S> {
-        type Y = S::Y;
-        type X = S::X;
         type Width = S::Width;
-        type Block = Set<members::block>;
+        type Y = S::Y;
+        type X = Set<members::x>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `block` field
+        pub struct block(());
+        ///Marker type for the `width` field
+        pub struct width(());
         ///Marker type for the `y` field
         pub struct y(());
         ///Marker type for the `x` field
         pub struct x(());
-        ///Marker type for the `width` field
-        pub struct width(());
-        ///Marker type for the `block` field
-        pub struct block(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BlockBuilder<'a, S: block_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlockBlock<'a>>,
         Option<i64>,
         Option<i64>,
@@ -293,7 +296,7 @@ pub struct BlockBuilder<'a, S: block_state::State> {
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Block<'a> {
@@ -307,9 +310,9 @@ impl<'a> BlockBuilder<'a, block_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -324,11 +327,11 @@ where
         mut self,
         value: impl Into<BlockBlock<'a>>,
     ) -> BlockBuilder<'a, block_state::SetBlock<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -336,12 +339,12 @@ where
 impl<'a, S: block_state::State> BlockBuilder<'a, S> {
     /// Set the `height` field (optional)
     pub fn height(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `height` field to an Option value (optional)
     pub fn maybe_height(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -349,12 +352,12 @@ impl<'a, S: block_state::State> BlockBuilder<'a, S> {
 impl<'a, S: block_state::State> BlockBuilder<'a, S> {
     /// Set the `rotation` field (optional)
     pub fn rotation(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `rotation` field to an Option value (optional)
     pub fn maybe_rotation(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -369,11 +372,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> BlockBuilder<'a, block_state::SetWidth<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -385,11 +388,11 @@ where
 {
     /// Set the `x` field (required)
     pub fn x(mut self, value: impl Into<i64>) -> BlockBuilder<'a, block_state::SetX<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -401,11 +404,11 @@ where
 {
     /// Set the `y` field (required)
     pub fn y(mut self, value: impl Into<i64>) -> BlockBuilder<'a, block_state::SetY<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -413,20 +416,20 @@ where
 impl<'a, S> BlockBuilder<'a, S>
 where
     S: block_state::State,
+    S::Block: block_state::IsSet,
+    S::Width: block_state::IsSet,
     S::Y: block_state::IsSet,
     S::X: block_state::IsSet,
-    S::Width: block_state::IsSet,
-    S::Block: block_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Block<'a> {
         Block {
-            block: self.__unsafe_private_named.0.unwrap(),
-            height: self.__unsafe_private_named.1,
-            rotation: self.__unsafe_private_named.2,
-            width: self.__unsafe_private_named.3.unwrap(),
-            x: self.__unsafe_private_named.4.unwrap(),
-            y: self.__unsafe_private_named.5.unwrap(),
+            block: self._fields.0.unwrap(),
+            height: self._fields.1,
+            rotation: self._fields.2,
+            width: self._fields.3.unwrap(),
+            x: self._fields.4.unwrap(),
+            y: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -439,12 +442,12 @@ where
         >,
     ) -> Block<'a> {
         Block {
-            block: self.__unsafe_private_named.0.unwrap(),
-            height: self.__unsafe_private_named.1,
-            rotation: self.__unsafe_private_named.2,
-            width: self.__unsafe_private_named.3.unwrap(),
-            x: self.__unsafe_private_named.4.unwrap(),
-            y: self.__unsafe_private_named.5.unwrap(),
+            block: self._fields.0.unwrap(),
+            height: self._fields.1,
+            rotation: self._fields.2,
+            width: self._fields.3.unwrap(),
+            x: self._fields.4.unwrap(),
+            y: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -665,9 +668,9 @@ pub mod canvas_state {
 
 /// Builder for constructing an instance of this type
 pub struct CanvasBuilder<'a, S: canvas_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<canvas::Block<'a>>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<canvas::Block<'a>>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Canvas<'a> {
@@ -681,9 +684,9 @@ impl<'a> CanvasBuilder<'a, canvas_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CanvasBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -698,11 +701,11 @@ where
         mut self,
         value: impl Into<Vec<canvas::Block<'a>>>,
     ) -> CanvasBuilder<'a, canvas_state::SetBlocks<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CanvasBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -710,12 +713,12 @@ where
 impl<'a, S: canvas_state::State> CanvasBuilder<'a, S> {
     /// Set the `id` field (optional)
     pub fn id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `id` field to an Option value (optional)
     pub fn maybe_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -728,8 +731,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Canvas<'a> {
         Canvas {
-            blocks: self.__unsafe_private_named.0.unwrap(),
-            id: self.__unsafe_private_named.1,
+            blocks: self._fields.0.unwrap(),
+            id: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -742,8 +745,8 @@ where
         >,
     ) -> Canvas<'a> {
         Canvas {
-            blocks: self.__unsafe_private_named.0.unwrap(),
-            id: self.__unsafe_private_named.1,
+            blocks: self._fields.0.unwrap(),
+            id: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
@@ -759,45 +762,45 @@ pub mod position_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Block;
         type Offset;
+        type Block;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Block = Unset;
         type Offset = Unset;
-    }
-    ///State transition - sets the `block` field to Set
-    pub struct SetBlock<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBlock<S> {}
-    impl<S: State> State for SetBlock<S> {
-        type Block = Set<members::block>;
-        type Offset = S::Offset;
+        type Block = Unset;
     }
     ///State transition - sets the `offset` field to Set
     pub struct SetOffset<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetOffset<S> {}
     impl<S: State> State for SetOffset<S> {
-        type Block = S::Block;
         type Offset = Set<members::offset>;
+        type Block = S::Block;
+    }
+    ///State transition - sets the `block` field to Set
+    pub struct SetBlock<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBlock<S> {}
+    impl<S: State> State for SetBlock<S> {
+        type Offset = S::Offset;
+        type Block = Set<members::block>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `block` field
-        pub struct block(());
         ///Marker type for the `offset` field
         pub struct offset(());
+        ///Marker type for the `block` field
+        pub struct block(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PositionBuilder<'a, S: position_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<i64>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<i64>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Position<'a> {
@@ -811,9 +814,9 @@ impl<'a> PositionBuilder<'a, position_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PositionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -828,11 +831,11 @@ where
         mut self,
         value: impl Into<Vec<i64>>,
     ) -> PositionBuilder<'a, position_state::SetBlock<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PositionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -847,11 +850,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PositionBuilder<'a, position_state::SetOffset<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PositionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -859,14 +862,14 @@ where
 impl<'a, S> PositionBuilder<'a, S>
 where
     S: position_state::State,
-    S::Block: position_state::IsSet,
     S::Offset: position_state::IsSet,
+    S::Block: position_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Position<'a> {
         Position {
-            block: self.__unsafe_private_named.0.unwrap(),
-            offset: self.__unsafe_private_named.1.unwrap(),
+            block: self._fields.0.unwrap(),
+            offset: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -879,8 +882,8 @@ where
         >,
     ) -> Position<'a> {
         Position {
-            block: self.__unsafe_private_named.0.unwrap(),
-            offset: self.__unsafe_private_named.1.unwrap(),
+            block: self._fields.0.unwrap(),
+            offset: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -932,9 +935,9 @@ pub mod quote_state {
 
 /// Builder for constructing an instance of this type
 pub struct QuoteBuilder<'a, S: quote_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<canvas::Position<'a>>, Option<canvas::Position<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<canvas::Position<'a>>, Option<canvas::Position<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Quote<'a> {
@@ -948,9 +951,9 @@ impl<'a> QuoteBuilder<'a, quote_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         QuoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -965,11 +968,11 @@ where
         mut self,
         value: impl Into<canvas::Position<'a>>,
     ) -> QuoteBuilder<'a, quote_state::SetEnd<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         QuoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -984,11 +987,11 @@ where
         mut self,
         value: impl Into<canvas::Position<'a>>,
     ) -> QuoteBuilder<'a, quote_state::SetStart<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         QuoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1002,8 +1005,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Quote<'a> {
         Quote {
-            end: self.__unsafe_private_named.0.unwrap(),
-            start: self.__unsafe_private_named.1.unwrap(),
+            end: self._fields.0.unwrap(),
+            start: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1016,8 +1019,8 @@ where
         >,
     ) -> Quote<'a> {
         Quote {
-            end: self.__unsafe_private_named.0.unwrap(),
-            start: self.__unsafe_private_named.1.unwrap(),
+            end: self._fields.0.unwrap(),
+            start: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs b/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs
index 7891453e..2d9af293 100644
--- a/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs
+++ b/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -345,9 +348,9 @@ pub mod block_state {
 
 /// Builder for constructing an instance of this type
 pub struct BlockBuilder<'a, S: block_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlockAlignment<'a>>, Option<BlockBlock<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlockAlignment<'a>>, Option<BlockBlock<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Block<'a> {
@@ -361,9 +364,9 @@ impl<'a> BlockBuilder<'a, block_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -371,12 +374,12 @@ impl<'a> BlockBuilder<'a, block_state::Empty> {
 impl<'a, S: block_state::State> BlockBuilder<'a, S> {
     /// Set the `alignment` field (optional)
     pub fn alignment(mut self, value: impl Into<Option<BlockAlignment<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alignment` field to an Option value (optional)
     pub fn maybe_alignment(mut self, value: Option<BlockAlignment<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -391,11 +394,11 @@ where
         mut self,
         value: impl Into<BlockBlock<'a>>,
     ) -> BlockBuilder<'a, block_state::SetBlock<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -408,8 +411,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Block<'a> {
         Block {
-            alignment: self.__unsafe_private_named.0,
-            block: self.__unsafe_private_named.1.unwrap(),
+            alignment: self._fields.0,
+            block: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -422,8 +425,8 @@ where
         >,
     ) -> Block<'a> {
         Block {
-            alignment: self.__unsafe_private_named.0,
-            block: self.__unsafe_private_named.1.unwrap(),
+            alignment: self._fields.0,
+            block: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -617,12 +620,9 @@ pub mod linear_document_state {
 
 /// Builder for constructing an instance of this type
 pub struct LinearDocumentBuilder<'a, S: linear_document_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<linear_document::Block<'a>>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<linear_document::Block<'a>>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LinearDocument<'a> {
@@ -636,9 +636,9 @@ impl<'a> LinearDocumentBuilder<'a, linear_document_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinearDocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -653,11 +653,11 @@ where
         mut self,
         value: impl Into<Vec<linear_document::Block<'a>>>,
     ) -> LinearDocumentBuilder<'a, linear_document_state::SetBlocks<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LinearDocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -665,12 +665,12 @@ where
 impl<'a, S: linear_document_state::State> LinearDocumentBuilder<'a, S> {
     /// Set the `id` field (optional)
     pub fn id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `id` field to an Option value (optional)
     pub fn maybe_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -683,8 +683,8 @@ where
     /// Build the final struct
     pub fn build(self) -> LinearDocument<'a> {
         LinearDocument {
-            blocks: self.__unsafe_private_named.0.unwrap(),
-            id: self.__unsafe_private_named.1,
+            blocks: self._fields.0.unwrap(),
+            id: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -697,8 +697,8 @@ where
         >,
     ) -> LinearDocument<'a> {
         LinearDocument {
-            blocks: self.__unsafe_private_named.0.unwrap(),
-            id: self.__unsafe_private_named.1,
+            blocks: self._fields.0.unwrap(),
+            id: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
@@ -750,9 +750,9 @@ pub mod position_state {
 
 /// Builder for constructing an instance of this type
 pub struct PositionBuilder<'a, S: position_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<i64>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<i64>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Position<'a> {
@@ -766,9 +766,9 @@ impl<'a> PositionBuilder<'a, position_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PositionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -783,11 +783,11 @@ where
         mut self,
         value: impl Into<Vec<i64>>,
     ) -> PositionBuilder<'a, position_state::SetBlock<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PositionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -802,11 +802,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PositionBuilder<'a, position_state::SetOffset<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PositionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -820,8 +820,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Position<'a> {
         Position {
-            block: self.__unsafe_private_named.0.unwrap(),
-            offset: self.__unsafe_private_named.1.unwrap(),
+            block: self._fields.0.unwrap(),
+            offset: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -834,8 +834,8 @@ where
         >,
     ) -> Position<'a> {
         Position {
-            block: self.__unsafe_private_named.0.unwrap(),
-            offset: self.__unsafe_private_named.1.unwrap(),
+            block: self._fields.0.unwrap(),
+            offset: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -851,48 +851,48 @@ pub mod quote_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Start;
         type End;
+        type Start;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Start = Unset;
         type End = Unset;
-    }
-    ///State transition - sets the `start` field to Set
-    pub struct SetStart<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStart<S> {}
-    impl<S: State> State for SetStart<S> {
-        type Start = Set<members::start>;
-        type End = S::End;
+        type Start = Unset;
     }
     ///State transition - sets the `end` field to Set
     pub struct SetEnd<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEnd<S> {}
     impl<S: State> State for SetEnd<S> {
-        type Start = S::Start;
         type End = Set<members::end>;
+        type Start = S::Start;
+    }
+    ///State transition - sets the `start` field to Set
+    pub struct SetStart<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStart<S> {}
+    impl<S: State> State for SetStart<S> {
+        type End = S::End;
+        type Start = Set<members::start>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `start` field
-        pub struct start(());
         ///Marker type for the `end` field
         pub struct end(());
+        ///Marker type for the `start` field
+        pub struct start(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct QuoteBuilder<'a, S: quote_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<linear_document::Position<'a>>,
         Option<linear_document::Position<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Quote<'a> {
@@ -906,9 +906,9 @@ impl<'a> QuoteBuilder<'a, quote_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         QuoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -923,11 +923,11 @@ where
         mut self,
         value: impl Into<linear_document::Position<'a>>,
     ) -> QuoteBuilder<'a, quote_state::SetEnd<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         QuoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -942,11 +942,11 @@ where
         mut self,
         value: impl Into<linear_document::Position<'a>>,
     ) -> QuoteBuilder<'a, quote_state::SetStart<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         QuoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -954,14 +954,14 @@ where
 impl<'a, S> QuoteBuilder<'a, S>
 where
     S: quote_state::State,
-    S::Start: quote_state::IsSet,
     S::End: quote_state::IsSet,
+    S::Start: quote_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Quote<'a> {
         Quote {
-            end: self.__unsafe_private_named.0.unwrap(),
-            start: self.__unsafe_private_named.1.unwrap(),
+            end: self._fields.0.unwrap(),
+            start: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -974,8 +974,8 @@ where
         >,
     ) -> Quote<'a> {
         Quote {
-            end: self.__unsafe_private_named.0.unwrap(),
-            start: self.__unsafe_private_named.1.unwrap(),
+            end: self._fields.0.unwrap(),
+            start: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/poll/definition.rs b/crates/jacquard-api/src/pub_leaflet/poll/definition.rs
index 8f3130b9..e7dac757 100644
--- a/crates/jacquard-api/src/pub_leaflet/poll/definition.rs
+++ b/crates/jacquard-api/src/pub_leaflet/poll/definition.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -183,49 +186,49 @@ pub mod definition_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type Options;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type Options = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Options = S::Options;
+        type Name = Unset;
     }
     ///State transition - sets the `options` field to Set
     pub struct SetOptions<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetOptions<S> {}
     impl<S: State> State for SetOptions<S> {
-        type Name = S::Name;
         type Options = Set<members::options>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Options = S::Options;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `options` field
         pub struct options(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DefinitionBuilder<'a, S: definition_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Vec<definition::DefinitionOption<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Definition<'a> {
@@ -239,9 +242,9 @@ impl<'a> DefinitionBuilder<'a, definition_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,12 +252,12 @@ impl<'a> DefinitionBuilder<'a, definition_state::Empty> {
 impl<'a, S: definition_state::State> DefinitionBuilder<'a, S> {
     /// Set the `endDate` field (optional)
     pub fn end_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `endDate` field to an Option value (optional)
     pub fn maybe_end_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -269,11 +272,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DefinitionBuilder<'a, definition_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -288,11 +291,11 @@ where
         mut self,
         value: impl Into<Vec<definition::DefinitionOption<'a>>>,
     ) -> DefinitionBuilder<'a, definition_state::SetOptions<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         DefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -300,15 +303,15 @@ where
 impl<'a, S> DefinitionBuilder<'a, S>
 where
     S: definition_state::State,
-    S::Name: definition_state::IsSet,
     S::Options: definition_state::IsSet,
+    S::Name: definition_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Definition<'a> {
         Definition {
-            end_date: self.__unsafe_private_named.0,
-            name: self.__unsafe_private_named.1.unwrap(),
-            options: self.__unsafe_private_named.2.unwrap(),
+            end_date: self._fields.0,
+            name: self._fields.1.unwrap(),
+            options: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -321,9 +324,9 @@ where
         >,
     ) -> Definition<'a> {
         Definition {
-            end_date: self.__unsafe_private_named.0,
-            name: self.__unsafe_private_named.1.unwrap(),
-            options: self.__unsafe_private_named.2.unwrap(),
+            end_date: self._fields.0,
+            name: self._fields.1.unwrap(),
+            options: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/poll/vote.rs b/crates/jacquard-api/src/pub_leaflet/poll/vote.rs
index c9596bea..89fd378b 100644
--- a/crates/jacquard-api/src/pub_leaflet/poll/vote.rs
+++ b/crates/jacquard-api/src/pub_leaflet/poll/vote.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,9 +149,9 @@ pub mod vote_state {
 
 /// Builder for constructing an instance of this type
 pub struct VoteBuilder<'a, S: vote_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<CowStr<'a>>>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<CowStr<'a>>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Vote<'a> {
@@ -162,9 +165,9 @@ impl<'a> VoteBuilder<'a, vote_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> VoteBuilder<'a, vote_state::SetOption<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> VoteBuilder<'a, vote_state::SetPoll<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,8 +219,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Vote<'a> {
         Vote {
-            option: self.__unsafe_private_named.0.unwrap(),
-            poll: self.__unsafe_private_named.1.unwrap(),
+            option: self._fields.0.unwrap(),
+            poll: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Vote<'a> {
         Vote {
-            option: self.__unsafe_private_named.0.unwrap(),
-            poll: self.__unsafe_private_named.1.unwrap(),
+            option: self._fields.0.unwrap(),
+            poll: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/publication.rs b/crates/jacquard-api/src/pub_leaflet/publication.rs
index 1b818433..2b26ca17 100644
--- a/crates/jacquard-api/src/pub_leaflet/publication.rs
+++ b/crates/jacquard-api/src/pub_leaflet/publication.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -402,8 +405,8 @@ pub mod publication_state {
 
 /// Builder for constructing an instance of this type
 pub struct PublicationBuilder<'a, S: publication_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
@@ -411,7 +414,7 @@ pub struct PublicationBuilder<'a, S: publication_state::State> {
         Option<publication::Preferences<'a>>,
         Option<publication::Theme<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Publication<'a> {
@@ -425,9 +428,9 @@ impl<'a> PublicationBuilder<'a, publication_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -435,12 +438,12 @@ impl<'a> PublicationBuilder<'a, publication_state::Empty> {
 impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
     /// Set the `base_path` field (optional)
     pub fn base_path(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `base_path` field to an Option value (optional)
     pub fn maybe_base_path(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -448,12 +451,12 @@ impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
 impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -461,12 +464,12 @@ impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
 impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
     /// Set the `icon` field (optional)
     pub fn icon(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `icon` field to an Option value (optional)
     pub fn maybe_icon(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -481,11 +484,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PublicationBuilder<'a, publication_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -496,7 +499,7 @@ impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<publication::Preferences<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `preferences` field to an Option value (optional)
@@ -504,7 +507,7 @@ impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
         mut self,
         value: Option<publication::Preferences<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -512,12 +515,12 @@ impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
 impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
     /// Set the `theme` field (optional)
     pub fn theme(mut self, value: impl Into<Option<publication::Theme<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `theme` field to an Option value (optional)
     pub fn maybe_theme(mut self, value: Option<publication::Theme<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -530,12 +533,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Publication<'a> {
         Publication {
-            base_path: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            icon: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            preferences: self.__unsafe_private_named.4,
-            theme: self.__unsafe_private_named.5,
+            base_path: self._fields.0,
+            description: self._fields.1,
+            icon: self._fields.2,
+            name: self._fields.3.unwrap(),
+            preferences: self._fields.4,
+            theme: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -548,12 +551,12 @@ where
         >,
     ) -> Publication<'a> {
         Publication {
-            base_path: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            icon: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            preferences: self.__unsafe_private_named.4,
-            theme: self.__unsafe_private_named.5,
+            base_path: self._fields.0,
+            description: self._fields.1,
+            icon: self._fields.2,
+            name: self._fields.3.unwrap(),
+            preferences: self._fields.4,
+            theme: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/richtext/facet.rs b/crates/jacquard-api/src/pub_leaflet/richtext/facet.rs
index 309d2e22..170bef15 100644
--- a/crates/jacquard-api/src/pub_leaflet/richtext/facet.rs
+++ b/crates/jacquard-api/src/pub_leaflet/richtext/facet.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -413,9 +416,9 @@ pub mod at_mention_state {
 
 /// Builder for constructing an instance of this type
 pub struct AtMentionBuilder<'a, S: at_mention_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AtMention<'a> {
@@ -429,9 +432,9 @@ impl<'a> AtMentionBuilder<'a, at_mention_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AtMentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -446,11 +449,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> AtMentionBuilder<'a, at_mention_state::SetAtUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AtMentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -463,7 +466,7 @@ where
     /// Build the final struct
     pub fn build(self) -> AtMention<'a> {
         AtMention {
-            at_uri: self.__unsafe_private_named.0.unwrap(),
+            at_uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -476,7 +479,7 @@ where
         >,
     ) -> AtMention<'a> {
         AtMention {
-            at_uri: self.__unsafe_private_named.0.unwrap(),
+            at_uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -841,9 +844,9 @@ pub mod byte_slice_state {
 
 /// Builder for constructing an instance of this type
 pub struct ByteSliceBuilder<'a, S: byte_slice_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ByteSlice<'a> {
@@ -857,9 +860,9 @@ impl<'a> ByteSliceBuilder<'a, byte_slice_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -874,11 +877,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteEnd<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -893,11 +896,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteStart<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -911,8 +914,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -925,8 +928,8 @@ where
         >,
     ) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -966,9 +969,9 @@ pub mod did_mention_state {
 
 /// Builder for constructing an instance of this type
 pub struct DidMentionBuilder<'a, S: did_mention_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DidMention<'a> {
@@ -982,9 +985,9 @@ impl<'a> DidMentionBuilder<'a, did_mention_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DidMentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -999,11 +1002,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> DidMentionBuilder<'a, did_mention_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DidMentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1016,7 +1019,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DidMention<'a> {
         DidMention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1029,7 +1032,7 @@ where
         >,
     ) -> DidMention<'a> {
         DidMention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1081,12 +1084,9 @@ pub mod facet_state {
 
 /// Builder for constructing an instance of this type
 pub struct FacetBuilder<'a, S: facet_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<FacetFeaturesItem<'a>>>,
-        Option<facet::ByteSlice<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<FacetFeaturesItem<'a>>>, Option<facet::ByteSlice<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Facet<'a> {
@@ -1100,9 +1100,9 @@ impl<'a> FacetBuilder<'a, facet_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1117,11 +1117,11 @@ where
         mut self,
         value: impl Into<Vec<FacetFeaturesItem<'a>>>,
     ) -> FacetBuilder<'a, facet_state::SetFeatures<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1136,11 +1136,11 @@ where
         mut self,
         value: impl Into<facet::ByteSlice<'a>>,
     ) -> FacetBuilder<'a, facet_state::SetIndex<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1154,8 +1154,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1168,8 +1168,8 @@ where
         >,
     ) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/theme/background_image.rs b/crates/jacquard-api/src/pub_leaflet/theme/background_image.rs
index a88e9ed6..b8f38fe7 100644
--- a/crates/jacquard-api/src/pub_leaflet/theme/background_image.rs
+++ b/crates/jacquard-api/src/pub_leaflet/theme/background_image.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -120,9 +123,9 @@ pub mod background_image_state {
 
 /// Builder for constructing an instance of this type
 pub struct BackgroundImageBuilder<'a, S: background_image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>, Option<bool>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>, Option<bool>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BackgroundImage<'a> {
@@ -136,9 +139,9 @@ impl<'a> BackgroundImageBuilder<'a, background_image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BackgroundImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -153,11 +156,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> BackgroundImageBuilder<'a, background_image_state::SetImage<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BackgroundImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -165,12 +168,12 @@ where
 impl<'a, S: background_image_state::State> BackgroundImageBuilder<'a, S> {
     /// Set the `repeat` field (optional)
     pub fn repeat(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `repeat` field to an Option value (optional)
     pub fn maybe_repeat(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -178,12 +181,12 @@ impl<'a, S: background_image_state::State> BackgroundImageBuilder<'a, S> {
 impl<'a, S: background_image_state::State> BackgroundImageBuilder<'a, S> {
     /// Set the `width` field (optional)
     pub fn width(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `width` field to an Option value (optional)
     pub fn maybe_width(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -196,9 +199,9 @@ where
     /// Build the final struct
     pub fn build(self) -> BackgroundImage<'a> {
         BackgroundImage {
-            image: self.__unsafe_private_named.0.unwrap(),
-            repeat: self.__unsafe_private_named.1,
-            width: self.__unsafe_private_named.2,
+            image: self._fields.0.unwrap(),
+            repeat: self._fields.1,
+            width: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -211,9 +214,9 @@ where
         >,
     ) -> BackgroundImage<'a> {
         BackgroundImage {
-            image: self.__unsafe_private_named.0.unwrap(),
-            repeat: self.__unsafe_private_named.1,
-            width: self.__unsafe_private_named.2,
+            image: self._fields.0.unwrap(),
+            repeat: self._fields.1,
+            width: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_leaflet/theme/color.rs b/crates/jacquard-api/src/pub_leaflet/theme/color.rs
index 3b2aa76d..7ca33842 100644
--- a/crates/jacquard-api/src/pub_leaflet/theme/color.rs
+++ b/crates/jacquard-api/src/pub_leaflet/theme/color.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -219,58 +222,58 @@ pub mod rgb_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type R;
-        type G;
         type B;
+        type G;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type R = Unset;
-        type G = Unset;
         type B = Unset;
+        type G = Unset;
     }
     ///State transition - sets the `r` field to Set
     pub struct SetR<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetR<S> {}
     impl<S: State> State for SetR<S> {
         type R = Set<members::r>;
-        type G = S::G;
-        type B = S::B;
-    }
-    ///State transition - sets the `g` field to Set
-    pub struct SetG<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetG<S> {}
-    impl<S: State> State for SetG<S> {
-        type R = S::R;
-        type G = Set<members::g>;
         type B = S::B;
+        type G = S::G;
     }
     ///State transition - sets the `b` field to Set
     pub struct SetB<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetB<S> {}
     impl<S: State> State for SetB<S> {
         type R = S::R;
-        type G = S::G;
         type B = Set<members::b>;
+        type G = S::G;
+    }
+    ///State transition - sets the `g` field to Set
+    pub struct SetG<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetG<S> {}
+    impl<S: State> State for SetG<S> {
+        type R = S::R;
+        type B = S::B;
+        type G = Set<members::g>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `r` field
         pub struct r(());
-        ///Marker type for the `g` field
-        pub struct g(());
         ///Marker type for the `b` field
         pub struct b(());
+        ///Marker type for the `g` field
+        pub struct g(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RgbBuilder<'a, S: rgb_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Rgb<'a> {
@@ -284,9 +287,9 @@ impl<'a> RgbBuilder<'a, rgb_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RgbBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -298,11 +301,11 @@ where
 {
     /// Set the `b` field (required)
     pub fn b(mut self, value: impl Into<i64>) -> RgbBuilder<'a, rgb_state::SetB<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RgbBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -314,11 +317,11 @@ where
 {
     /// Set the `g` field (required)
     pub fn g(mut self, value: impl Into<i64>) -> RgbBuilder<'a, rgb_state::SetG<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RgbBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -330,11 +333,11 @@ where
 {
     /// Set the `r` field (required)
     pub fn r(mut self, value: impl Into<i64>) -> RgbBuilder<'a, rgb_state::SetR<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RgbBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -343,15 +346,15 @@ impl<'a, S> RgbBuilder<'a, S>
 where
     S: rgb_state::State,
     S::R: rgb_state::IsSet,
-    S::G: rgb_state::IsSet,
     S::B: rgb_state::IsSet,
+    S::G: rgb_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Rgb<'a> {
         Rgb {
-            b: self.__unsafe_private_named.0.unwrap(),
-            g: self.__unsafe_private_named.1.unwrap(),
-            r: self.__unsafe_private_named.2.unwrap(),
+            b: self._fields.0.unwrap(),
+            g: self._fields.1.unwrap(),
+            r: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -364,9 +367,9 @@ where
         >,
     ) -> Rgb<'a> {
         Rgb {
-            b: self.__unsafe_private_named.0.unwrap(),
-            g: self.__unsafe_private_named.1.unwrap(),
-            r: self.__unsafe_private_named.2.unwrap(),
+            b: self._fields.0.unwrap(),
+            g: self._fields.1.unwrap(),
+            r: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -488,65 +491,65 @@ pub mod rgba_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type R;
         type A;
         type G;
+        type R;
         type B;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type R = Unset;
         type A = Unset;
         type G = Unset;
+        type R = Unset;
         type B = Unset;
     }
-    ///State transition - sets the `r` field to Set
-    pub struct SetR<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetR<S> {}
-    impl<S: State> State for SetR<S> {
-        type R = Set<members::r>;
-        type A = S::A;
-        type G = S::G;
-        type B = S::B;
-    }
     ///State transition - sets the `a` field to Set
     pub struct SetA<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetA<S> {}
     impl<S: State> State for SetA<S> {
-        type R = S::R;
         type A = Set<members::a>;
         type G = S::G;
+        type R = S::R;
         type B = S::B;
     }
     ///State transition - sets the `g` field to Set
     pub struct SetG<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetG<S> {}
     impl<S: State> State for SetG<S> {
-        type R = S::R;
         type A = S::A;
         type G = Set<members::g>;
+        type R = S::R;
+        type B = S::B;
+    }
+    ///State transition - sets the `r` field to Set
+    pub struct SetR<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetR<S> {}
+    impl<S: State> State for SetR<S> {
+        type A = S::A;
+        type G = S::G;
+        type R = Set<members::r>;
         type B = S::B;
     }
     ///State transition - sets the `b` field to Set
     pub struct SetB<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetB<S> {}
     impl<S: State> State for SetB<S> {
-        type R = S::R;
         type A = S::A;
         type G = S::G;
+        type R = S::R;
         type B = Set<members::b>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `r` field
-        pub struct r(());
         ///Marker type for the `a` field
         pub struct a(());
         ///Marker type for the `g` field
         pub struct g(());
+        ///Marker type for the `r` field
+        pub struct r(());
         ///Marker type for the `b` field
         pub struct b(());
     }
@@ -554,9 +557,9 @@ pub mod rgba_state {
 
 /// Builder for constructing an instance of this type
 pub struct RgbaBuilder<'a, S: rgba_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Rgba<'a> {
@@ -570,9 +573,9 @@ impl<'a> RgbaBuilder<'a, rgba_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RgbaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -584,11 +587,11 @@ where
 {
     /// Set the `a` field (required)
     pub fn a(mut self, value: impl Into<i64>) -> RgbaBuilder<'a, rgba_state::SetA<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RgbaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -600,11 +603,11 @@ where
 {
     /// Set the `b` field (required)
     pub fn b(mut self, value: impl Into<i64>) -> RgbaBuilder<'a, rgba_state::SetB<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RgbaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -616,11 +619,11 @@ where
 {
     /// Set the `g` field (required)
     pub fn g(mut self, value: impl Into<i64>) -> RgbaBuilder<'a, rgba_state::SetG<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RgbaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -632,11 +635,11 @@ where
 {
     /// Set the `r` field (required)
     pub fn r(mut self, value: impl Into<i64>) -> RgbaBuilder<'a, rgba_state::SetR<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RgbaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -644,18 +647,18 @@ where
 impl<'a, S> RgbaBuilder<'a, S>
 where
     S: rgba_state::State,
-    S::R: rgba_state::IsSet,
     S::A: rgba_state::IsSet,
     S::G: rgba_state::IsSet,
+    S::R: rgba_state::IsSet,
     S::B: rgba_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Rgba<'a> {
         Rgba {
-            a: self.__unsafe_private_named.0.unwrap(),
-            b: self.__unsafe_private_named.1.unwrap(),
-            g: self.__unsafe_private_named.2.unwrap(),
-            r: self.__unsafe_private_named.3.unwrap(),
+            a: self._fields.0.unwrap(),
+            b: self._fields.1.unwrap(),
+            g: self._fields.2.unwrap(),
+            r: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -668,10 +671,10 @@ where
         >,
     ) -> Rgba<'a> {
         Rgba {
-            a: self.__unsafe_private_named.0.unwrap(),
-            b: self.__unsafe_private_named.1.unwrap(),
-            g: self.__unsafe_private_named.2.unwrap(),
-            r: self.__unsafe_private_named.3.unwrap(),
+            a: self._fields.0.unwrap(),
+            b: self._fields.1.unwrap(),
+            g: self._fields.2.unwrap(),
+            r: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_quizzy/answer.rs b/crates/jacquard-api/src/pub_quizzy/answer.rs
index a0399f58..32d555eb 100644
--- a/crates/jacquard-api/src/pub_quizzy/answer.rs
+++ b/crates/jacquard-api/src/pub_quizzy/answer.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -241,80 +244,80 @@ pub mod answer_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Text;
-        type Timestamp;
         type Question;
         type Certainty;
+        type Text;
+        type Timestamp;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Text = Unset;
-        type Timestamp = Unset;
         type Question = Unset;
         type Certainty = Unset;
-    }
-    ///State transition - sets the `text` field to Set
-    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetText<S> {}
-    impl<S: State> State for SetText<S> {
-        type Text = Set<members::text>;
-        type Timestamp = S::Timestamp;
-        type Question = S::Question;
-        type Certainty = S::Certainty;
-    }
-    ///State transition - sets the `timestamp` field to Set
-    pub struct SetTimestamp<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTimestamp<S> {}
-    impl<S: State> State for SetTimestamp<S> {
-        type Text = S::Text;
-        type Timestamp = Set<members::timestamp>;
-        type Question = S::Question;
-        type Certainty = S::Certainty;
+        type Text = Unset;
+        type Timestamp = Unset;
     }
     ///State transition - sets the `question` field to Set
     pub struct SetQuestion<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetQuestion<S> {}
     impl<S: State> State for SetQuestion<S> {
-        type Text = S::Text;
-        type Timestamp = S::Timestamp;
         type Question = Set<members::question>;
         type Certainty = S::Certainty;
+        type Text = S::Text;
+        type Timestamp = S::Timestamp;
     }
     ///State transition - sets the `certainty` field to Set
     pub struct SetCertainty<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCertainty<S> {}
     impl<S: State> State for SetCertainty<S> {
+        type Question = S::Question;
+        type Certainty = Set<members::certainty>;
         type Text = S::Text;
         type Timestamp = S::Timestamp;
+    }
+    ///State transition - sets the `text` field to Set
+    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetText<S> {}
+    impl<S: State> State for SetText<S> {
         type Question = S::Question;
-        type Certainty = Set<members::certainty>;
+        type Certainty = S::Certainty;
+        type Text = Set<members::text>;
+        type Timestamp = S::Timestamp;
+    }
+    ///State transition - sets the `timestamp` field to Set
+    pub struct SetTimestamp<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTimestamp<S> {}
+    impl<S: State> State for SetTimestamp<S> {
+        type Question = S::Question;
+        type Certainty = S::Certainty;
+        type Text = S::Text;
+        type Timestamp = Set<members::timestamp>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `text` field
-        pub struct text(());
-        ///Marker type for the `timestamp` field
-        pub struct timestamp(());
         ///Marker type for the `question` field
         pub struct question(());
         ///Marker type for the `certainty` field
         pub struct certainty(());
+        ///Marker type for the `text` field
+        pub struct text(());
+        ///Marker type for the `timestamp` field
+        pub struct timestamp(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AnswerBuilder<'a, S: answer_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AnswerCertainty<'a>>,
         Option<StrongRef<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Answer<'a> {
@@ -328,9 +331,9 @@ impl<'a> AnswerBuilder<'a, answer_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AnswerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -345,11 +348,11 @@ where
         mut self,
         value: impl Into<AnswerCertainty<'a>>,
     ) -> AnswerBuilder<'a, answer_state::SetCertainty<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AnswerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -364,11 +367,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> AnswerBuilder<'a, answer_state::SetQuestion<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AnswerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -383,11 +386,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AnswerBuilder<'a, answer_state::SetText<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AnswerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -402,11 +405,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AnswerBuilder<'a, answer_state::SetTimestamp<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         AnswerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -414,18 +417,18 @@ where
 impl<'a, S> AnswerBuilder<'a, S>
 where
     S: answer_state::State,
-    S::Text: answer_state::IsSet,
-    S::Timestamp: answer_state::IsSet,
     S::Question: answer_state::IsSet,
     S::Certainty: answer_state::IsSet,
+    S::Text: answer_state::IsSet,
+    S::Timestamp: answer_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Answer<'a> {
         Answer {
-            certainty: self.__unsafe_private_named.0.unwrap(),
-            question: self.__unsafe_private_named.1.unwrap(),
-            text: self.__unsafe_private_named.2.unwrap(),
-            timestamp: self.__unsafe_private_named.3.unwrap(),
+            certainty: self._fields.0.unwrap(),
+            question: self._fields.1.unwrap(),
+            text: self._fields.2.unwrap(),
+            timestamp: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -438,10 +441,10 @@ where
         >,
     ) -> Answer<'a> {
         Answer {
-            certainty: self.__unsafe_private_named.0.unwrap(),
-            question: self.__unsafe_private_named.1.unwrap(),
-            text: self.__unsafe_private_named.2.unwrap(),
-            timestamp: self.__unsafe_private_named.3.unwrap(),
+            certainty: self._fields.0.unwrap(),
+            question: self._fields.1.unwrap(),
+            text: self._fields.2.unwrap(),
+            timestamp: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_quizzy/league.rs b/crates/jacquard-api/src/pub_quizzy/league.rs
index e6e36872..4c650e1a 100644
--- a/crates/jacquard-api/src/pub_quizzy/league.rs
+++ b/crates/jacquard-api/src/pub_quizzy/league.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -222,13 +225,9 @@ pub mod league_state {
 
 /// Builder for constructing an instance of this type
 pub struct LeagueBuilder<'a, S: league_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<Vec<Did<'a>>>,
-        Option<Vec<StrongRef<'a>>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Vec<Did<'a>>>, Option<Vec<StrongRef<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> League<'a> {
@@ -242,9 +241,9 @@ impl<'a> LeagueBuilder<'a, league_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LeagueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -259,11 +258,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LeagueBuilder<'a, league_state::SetName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LeagueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -278,11 +277,11 @@ where
         mut self,
         value: impl Into<Vec<Did<'a>>>,
     ) -> LeagueBuilder<'a, league_state::SetQuizMasters<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LeagueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -297,11 +296,11 @@ where
         mut self,
         value: impl Into<Vec<StrongRef<'a>>>,
     ) -> LeagueBuilder<'a, league_state::SetTeams<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LeagueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -316,9 +315,9 @@ where
     /// Build the final struct
     pub fn build(self) -> League<'a> {
         League {
-            name: self.__unsafe_private_named.0.unwrap(),
-            quiz_masters: self.__unsafe_private_named.1.unwrap(),
-            teams: self.__unsafe_private_named.2.unwrap(),
+            name: self._fields.0.unwrap(),
+            quiz_masters: self._fields.1.unwrap(),
+            teams: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -331,9 +330,9 @@ where
         >,
     ) -> League<'a> {
         League {
-            name: self.__unsafe_private_named.0.unwrap(),
-            quiz_masters: self.__unsafe_private_named.1.unwrap(),
-            teams: self.__unsafe_private_named.2.unwrap(),
+            name: self._fields.0.unwrap(),
+            quiz_masters: self._fields.1.unwrap(),
+            teams: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_quizzy/profile.rs b/crates/jacquard-api/src/pub_quizzy/profile.rs
index df5e2a5c..0507885f 100644
--- a/crates/jacquard-api/src/pub_quizzy/profile.rs
+++ b/crates/jacquard-api/src/pub_quizzy/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -237,14 +240,14 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -258,9 +261,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -268,12 +271,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -281,12 +284,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatarAlt` field (optional)
     pub fn avatar_alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `avatarAlt` field to an Option value (optional)
     pub fn maybe_avatar_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -294,12 +297,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -307,12 +310,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -324,10 +327,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            avatar_alt: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3,
+            avatar: self._fields.0,
+            avatar_alt: self._fields.1,
+            description: self._fields.2,
+            display_name: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -340,10 +343,10 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            avatar_alt: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3,
+            avatar: self._fields.0,
+            avatar_alt: self._fields.1,
+            description: self._fields.2,
+            display_name: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_quizzy/quiz.rs b/crates/jacquard-api/src/pub_quizzy/quiz.rs
index 048f1f07..d59b0993 100644
--- a/crates/jacquard-api/src/pub_quizzy/quiz.rs
+++ b/crates/jacquard-api/src/pub_quizzy/quiz.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -345,65 +348,65 @@ pub mod quiz_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Timestamp;
-        type Title;
         type Locales;
+        type Title;
+        type Timestamp;
         type Rounds;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Timestamp = Unset;
-        type Title = Unset;
         type Locales = Unset;
+        type Title = Unset;
+        type Timestamp = Unset;
         type Rounds = Unset;
     }
-    ///State transition - sets the `timestamp` field to Set
-    pub struct SetTimestamp<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTimestamp<S> {}
-    impl<S: State> State for SetTimestamp<S> {
-        type Timestamp = Set<members::timestamp>;
+    ///State transition - sets the `locales` field to Set
+    pub struct SetLocales<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLocales<S> {}
+    impl<S: State> State for SetLocales<S> {
+        type Locales = Set<members::locales>;
         type Title = S::Title;
-        type Locales = S::Locales;
+        type Timestamp = S::Timestamp;
         type Rounds = S::Rounds;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Timestamp = S::Timestamp;
-        type Title = Set<members::title>;
         type Locales = S::Locales;
+        type Title = Set<members::title>;
+        type Timestamp = S::Timestamp;
         type Rounds = S::Rounds;
     }
-    ///State transition - sets the `locales` field to Set
-    pub struct SetLocales<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLocales<S> {}
-    impl<S: State> State for SetLocales<S> {
-        type Timestamp = S::Timestamp;
+    ///State transition - sets the `timestamp` field to Set
+    pub struct SetTimestamp<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTimestamp<S> {}
+    impl<S: State> State for SetTimestamp<S> {
+        type Locales = S::Locales;
         type Title = S::Title;
-        type Locales = Set<members::locales>;
+        type Timestamp = Set<members::timestamp>;
         type Rounds = S::Rounds;
     }
     ///State transition - sets the `rounds` field to Set
     pub struct SetRounds<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRounds<S> {}
     impl<S: State> State for SetRounds<S> {
-        type Timestamp = S::Timestamp;
-        type Title = S::Title;
         type Locales = S::Locales;
+        type Title = S::Title;
+        type Timestamp = S::Timestamp;
         type Rounds = Set<members::rounds>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `timestamp` field
-        pub struct timestamp(());
-        ///Marker type for the `title` field
-        pub struct title(());
         ///Marker type for the `locales` field
         pub struct locales(());
+        ///Marker type for the `title` field
+        pub struct title(());
+        ///Marker type for the `timestamp` field
+        pub struct timestamp(());
         ///Marker type for the `rounds` field
         pub struct rounds(());
     }
@@ -411,8 +414,8 @@ pub mod quiz_state {
 
 /// Builder for constructing an instance of this type
 pub struct QuizBuilder<'a, S: quiz_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<bool>,
         Option<bool>,
@@ -422,7 +425,7 @@ pub struct QuizBuilder<'a, S: quiz_state::State> {
         Option<Datetime>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Quiz<'a> {
@@ -436,9 +439,9 @@ impl<'a> QuizBuilder<'a, quiz_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         QuizBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -446,12 +449,12 @@ impl<'a> QuizBuilder<'a, quiz_state::Empty> {
 impl<'a, S: quiz_state::State> QuizBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -459,12 +462,12 @@ impl<'a, S: quiz_state::State> QuizBuilder<'a, S> {
 impl<'a, S: quiz_state::State> QuizBuilder<'a, S> {
     /// Set the `hasAudio` field (optional)
     pub fn has_audio(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `hasAudio` field to an Option value (optional)
     pub fn maybe_has_audio(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -472,12 +475,12 @@ impl<'a, S: quiz_state::State> QuizBuilder<'a, S> {
 impl<'a, S: quiz_state::State> QuizBuilder<'a, S> {
     /// Set the `hasVisuals` field (optional)
     pub fn has_visuals(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `hasVisuals` field to an Option value (optional)
     pub fn maybe_has_visuals(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -492,11 +495,11 @@ where
         mut self,
         value: impl Into<Vec<Language>>,
     ) -> QuizBuilder<'a, quiz_state::SetLocales<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         QuizBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -504,12 +507,12 @@ where
 impl<'a, S: quiz_state::State> QuizBuilder<'a, S> {
     /// Set the `revisionOf` field (optional)
     pub fn revision_of(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `revisionOf` field to an Option value (optional)
     pub fn maybe_revision_of(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -524,11 +527,11 @@ where
         mut self,
         value: impl Into<Vec<quiz::Round<'a>>>,
     ) -> QuizBuilder<'a, quiz_state::SetRounds<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         QuizBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -543,11 +546,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> QuizBuilder<'a, quiz_state::SetTimestamp<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         QuizBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -562,11 +565,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> QuizBuilder<'a, quiz_state::SetTitle<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         QuizBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -574,22 +577,22 @@ where
 impl<'a, S> QuizBuilder<'a, S>
 where
     S: quiz_state::State,
-    S::Timestamp: quiz_state::IsSet,
-    S::Title: quiz_state::IsSet,
     S::Locales: quiz_state::IsSet,
+    S::Title: quiz_state::IsSet,
+    S::Timestamp: quiz_state::IsSet,
     S::Rounds: quiz_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Quiz<'a> {
         Quiz {
-            description: self.__unsafe_private_named.0,
-            has_audio: self.__unsafe_private_named.1.or_else(|| Some(false)),
-            has_visuals: self.__unsafe_private_named.2.or_else(|| Some(false)),
-            locales: self.__unsafe_private_named.3.unwrap(),
-            revision_of: self.__unsafe_private_named.4,
-            rounds: self.__unsafe_private_named.5.unwrap(),
-            timestamp: self.__unsafe_private_named.6.unwrap(),
-            title: self.__unsafe_private_named.7.unwrap(),
+            description: self._fields.0,
+            has_audio: self._fields.1.or_else(|| Some(false)),
+            has_visuals: self._fields.2.or_else(|| Some(false)),
+            locales: self._fields.3.unwrap(),
+            revision_of: self._fields.4,
+            rounds: self._fields.5.unwrap(),
+            timestamp: self._fields.6.unwrap(),
+            title: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -602,14 +605,14 @@ where
         >,
     ) -> Quiz<'a> {
         Quiz {
-            description: self.__unsafe_private_named.0,
-            has_audio: self.__unsafe_private_named.1.or_else(|| Some(false)),
-            has_visuals: self.__unsafe_private_named.2.or_else(|| Some(false)),
-            locales: self.__unsafe_private_named.3.unwrap(),
-            revision_of: self.__unsafe_private_named.4,
-            rounds: self.__unsafe_private_named.5.unwrap(),
-            timestamp: self.__unsafe_private_named.6.unwrap(),
-            title: self.__unsafe_private_named.7.unwrap(),
+            description: self._fields.0,
+            has_audio: self._fields.1.or_else(|| Some(false)),
+            has_visuals: self._fields.2.or_else(|| Some(false)),
+            locales: self._fields.3.unwrap(),
+            revision_of: self._fields.4,
+            rounds: self._fields.5.unwrap(),
+            timestamp: self._fields.6.unwrap(),
+            title: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -864,9 +867,9 @@ pub mod question_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct QuestionRefBuilder<'a, S: question_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> QuestionRef<'a> {
@@ -880,9 +883,9 @@ impl<'a> QuestionRefBuilder<'a, question_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         QuestionRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -890,12 +893,12 @@ impl<'a> QuestionRefBuilder<'a, question_ref_state::Empty> {
 impl<'a, S: question_ref_state::State> QuestionRefBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -903,12 +906,12 @@ impl<'a, S: question_ref_state::State> QuestionRefBuilder<'a, S> {
 impl<'a, S: question_ref_state::State> QuestionRefBuilder<'a, S> {
     /// Set the `points` field (optional)
     pub fn points(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `points` field to an Option value (optional)
     pub fn maybe_points(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -923,11 +926,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> QuestionRefBuilder<'a, question_ref_state::SetQuestion<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         QuestionRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -940,9 +943,9 @@ where
     /// Build the final struct
     pub fn build(self) -> QuestionRef<'a> {
         QuestionRef {
-            name: self.__unsafe_private_named.0,
-            points: self.__unsafe_private_named.1.or_else(|| Some(1i64)),
-            question: self.__unsafe_private_named.2.unwrap(),
+            name: self._fields.0,
+            points: self._fields.1.or_else(|| Some(1i64)),
+            question: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -955,9 +958,9 @@ where
         >,
     ) -> QuestionRef<'a> {
         QuestionRef {
-            name: self.__unsafe_private_named.0,
-            points: self.__unsafe_private_named.1.or_else(|| Some(1i64)),
-            question: self.__unsafe_private_named.2.unwrap(),
+            name: self._fields.0,
+            points: self._fields.1.or_else(|| Some(1i64)),
+            question: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -997,9 +1000,9 @@ pub mod round_state {
 
 /// Builder for constructing an instance of this type
 pub struct RoundBuilder<'a, S: round_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<quiz::QuestionRef<'a>>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<quiz::QuestionRef<'a>>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Round<'a> {
@@ -1013,9 +1016,9 @@ impl<'a> RoundBuilder<'a, round_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RoundBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1030,11 +1033,11 @@ where
         mut self,
         value: impl Into<Vec<quiz::QuestionRef<'a>>>,
     ) -> RoundBuilder<'a, round_state::SetQuestions<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RoundBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1042,12 +1045,12 @@ where
 impl<'a, S: round_state::State> RoundBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1060,8 +1063,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Round<'a> {
         Round {
-            questions: self.__unsafe_private_named.0.unwrap(),
-            title: self.__unsafe_private_named.1,
+            questions: self._fields.0.unwrap(),
+            title: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -1074,8 +1077,8 @@ where
         >,
     ) -> Round<'a> {
         Round {
-            questions: self.__unsafe_private_named.0.unwrap(),
-            title: self.__unsafe_private_named.1,
+            questions: self._fields.0.unwrap(),
+            title: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_quizzy/quiz_begin.rs b/crates/jacquard-api/src/pub_quizzy/quiz_begin.rs
index 7b3a885e..fd354c41 100644
--- a/crates/jacquard-api/src/pub_quizzy/quiz_begin.rs
+++ b/crates/jacquard-api/src/pub_quizzy/quiz_begin.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -116,80 +119,80 @@ pub mod quiz_begin_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Quiz;
+        type EndsAt;
         type League;
+        type Quiz;
         type StartedAt;
-        type EndsAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Quiz = Unset;
+        type EndsAt = Unset;
         type League = Unset;
+        type Quiz = Unset;
         type StartedAt = Unset;
-        type EndsAt = Unset;
     }
-    ///State transition - sets the `quiz` field to Set
-    pub struct SetQuiz<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetQuiz<S> {}
-    impl<S: State> State for SetQuiz<S> {
-        type Quiz = Set<members::quiz>;
+    ///State transition - sets the `ends_at` field to Set
+    pub struct SetEndsAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetEndsAt<S> {}
+    impl<S: State> State for SetEndsAt<S> {
+        type EndsAt = Set<members::ends_at>;
         type League = S::League;
+        type Quiz = S::Quiz;
         type StartedAt = S::StartedAt;
-        type EndsAt = S::EndsAt;
     }
     ///State transition - sets the `league` field to Set
     pub struct SetLeague<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLeague<S> {}
     impl<S: State> State for SetLeague<S> {
-        type Quiz = S::Quiz;
+        type EndsAt = S::EndsAt;
         type League = Set<members::league>;
+        type Quiz = S::Quiz;
         type StartedAt = S::StartedAt;
+    }
+    ///State transition - sets the `quiz` field to Set
+    pub struct SetQuiz<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetQuiz<S> {}
+    impl<S: State> State for SetQuiz<S> {
         type EndsAt = S::EndsAt;
+        type League = S::League;
+        type Quiz = Set<members::quiz>;
+        type StartedAt = S::StartedAt;
     }
     ///State transition - sets the `started_at` field to Set
     pub struct SetStartedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStartedAt<S> {}
     impl<S: State> State for SetStartedAt<S> {
-        type Quiz = S::Quiz;
-        type League = S::League;
-        type StartedAt = Set<members::started_at>;
         type EndsAt = S::EndsAt;
-    }
-    ///State transition - sets the `ends_at` field to Set
-    pub struct SetEndsAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetEndsAt<S> {}
-    impl<S: State> State for SetEndsAt<S> {
-        type Quiz = S::Quiz;
         type League = S::League;
-        type StartedAt = S::StartedAt;
-        type EndsAt = Set<members::ends_at>;
+        type Quiz = S::Quiz;
+        type StartedAt = Set<members::started_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `quiz` field
-        pub struct quiz(());
+        ///Marker type for the `ends_at` field
+        pub struct ends_at(());
         ///Marker type for the `league` field
         pub struct league(());
+        ///Marker type for the `quiz` field
+        pub struct quiz(());
         ///Marker type for the `started_at` field
         pub struct started_at(());
-        ///Marker type for the `ends_at` field
-        pub struct ends_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct QuizBeginBuilder<'a, S: quiz_begin_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<StrongRef<'a>>,
         Option<StrongRef<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> QuizBegin<'a> {
@@ -203,9 +206,9 @@ impl<'a> QuizBeginBuilder<'a, quiz_begin_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         QuizBeginBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -220,11 +223,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> QuizBeginBuilder<'a, quiz_begin_state::SetEndsAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         QuizBeginBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,11 +242,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> QuizBeginBuilder<'a, quiz_begin_state::SetLeague<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         QuizBeginBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -258,11 +261,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> QuizBeginBuilder<'a, quiz_begin_state::SetQuiz<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         QuizBeginBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -277,11 +280,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> QuizBeginBuilder<'a, quiz_begin_state::SetStartedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         QuizBeginBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -289,18 +292,18 @@ where
 impl<'a, S> QuizBeginBuilder<'a, S>
 where
     S: quiz_begin_state::State,
-    S::Quiz: quiz_begin_state::IsSet,
+    S::EndsAt: quiz_begin_state::IsSet,
     S::League: quiz_begin_state::IsSet,
+    S::Quiz: quiz_begin_state::IsSet,
     S::StartedAt: quiz_begin_state::IsSet,
-    S::EndsAt: quiz_begin_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> QuizBegin<'a> {
         QuizBegin {
-            ends_at: self.__unsafe_private_named.0.unwrap(),
-            league: self.__unsafe_private_named.1.unwrap(),
-            quiz: self.__unsafe_private_named.2.unwrap(),
-            started_at: self.__unsafe_private_named.3.unwrap(),
+            ends_at: self._fields.0.unwrap(),
+            league: self._fields.1.unwrap(),
+            quiz: self._fields.2.unwrap(),
+            started_at: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -313,10 +316,10 @@ where
         >,
     ) -> QuizBegin<'a> {
         QuizBegin {
-            ends_at: self.__unsafe_private_named.0.unwrap(),
-            league: self.__unsafe_private_named.1.unwrap(),
-            quiz: self.__unsafe_private_named.2.unwrap(),
-            started_at: self.__unsafe_private_named.3.unwrap(),
+            ends_at: self._fields.0.unwrap(),
+            league: self._fields.1.unwrap(),
+            quiz: self._fields.2.unwrap(),
+            started_at: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_quizzy/quiz_done.rs b/crates/jacquard-api/src/pub_quizzy/quiz_done.rs
index 8555b4a6..d67aecd7 100644
--- a/crates/jacquard-api/src/pub_quizzy/quiz_done.rs
+++ b/crates/jacquard-api/src/pub_quizzy/quiz_done.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -147,9 +150,9 @@ pub mod quiz_done_state {
 
 /// Builder for constructing an instance of this type
 pub struct QuizDoneBuilder<'a, S: quiz_done_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> QuizDone<'a> {
@@ -163,9 +166,9 @@ impl<'a> QuizDoneBuilder<'a, quiz_done_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         QuizDoneBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,11 +183,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> QuizDoneBuilder<'a, quiz_done_state::SetQuizBegin<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         QuizDoneBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -199,11 +202,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> QuizDoneBuilder<'a, quiz_done_state::SetTimestamp<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         QuizDoneBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -217,8 +220,8 @@ where
     /// Build the final struct
     pub fn build(self) -> QuizDone<'a> {
         QuizDone {
-            quiz_begin: self.__unsafe_private_named.0.unwrap(),
-            timestamp: self.__unsafe_private_named.1.unwrap(),
+            quiz_begin: self._fields.0.unwrap(),
+            timestamp: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -231,8 +234,8 @@ where
         >,
     ) -> QuizDone<'a> {
         QuizDone {
-            quiz_begin: self.__unsafe_private_named.0.unwrap(),
-            timestamp: self.__unsafe_private_named.1.unwrap(),
+            quiz_begin: self._fields.0.unwrap(),
+            timestamp: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_quizzy/quiz_score.rs b/crates/jacquard-api/src/pub_quizzy/quiz_score.rs
index ae072300..99ab7702 100644
--- a/crates/jacquard-api/src/pub_quizzy/quiz_score.rs
+++ b/crates/jacquard-api/src/pub_quizzy/quiz_score.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -173,48 +176,45 @@ pub mod quiz_score_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type QuizBegin;
         type Results;
+        type QuizBegin;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type QuizBegin = Unset;
         type Results = Unset;
-    }
-    ///State transition - sets the `quiz_begin` field to Set
-    pub struct SetQuizBegin<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetQuizBegin<S> {}
-    impl<S: State> State for SetQuizBegin<S> {
-        type QuizBegin = Set<members::quiz_begin>;
-        type Results = S::Results;
+        type QuizBegin = Unset;
     }
     ///State transition - sets the `results` field to Set
     pub struct SetResults<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetResults<S> {}
     impl<S: State> State for SetResults<S> {
-        type QuizBegin = S::QuizBegin;
         type Results = Set<members::results>;
+        type QuizBegin = S::QuizBegin;
+    }
+    ///State transition - sets the `quiz_begin` field to Set
+    pub struct SetQuizBegin<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetQuizBegin<S> {}
+    impl<S: State> State for SetQuizBegin<S> {
+        type Results = S::Results;
+        type QuizBegin = Set<members::quiz_begin>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `quiz_begin` field
-        pub struct quiz_begin(());
         ///Marker type for the `results` field
         pub struct results(());
+        ///Marker type for the `quiz_begin` field
+        pub struct quiz_begin(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct QuizScoreBuilder<'a, S: quiz_score_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<StrongRef<'a>>,
-        Option<Vec<quiz_score::TeamResult<'a>>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>, Option<Vec<quiz_score::TeamResult<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> QuizScore<'a> {
@@ -228,9 +228,9 @@ impl<'a> QuizScoreBuilder<'a, quiz_score_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         QuizScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -245,11 +245,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> QuizScoreBuilder<'a, quiz_score_state::SetQuizBegin<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         QuizScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -264,11 +264,11 @@ where
         mut self,
         value: impl Into<Vec<quiz_score::TeamResult<'a>>>,
     ) -> QuizScoreBuilder<'a, quiz_score_state::SetResults<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         QuizScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -276,14 +276,14 @@ where
 impl<'a, S> QuizScoreBuilder<'a, S>
 where
     S: quiz_score_state::State,
-    S::QuizBegin: quiz_score_state::IsSet,
     S::Results: quiz_score_state::IsSet,
+    S::QuizBegin: quiz_score_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> QuizScore<'a> {
         QuizScore {
-            quiz_begin: self.__unsafe_private_named.0.unwrap(),
-            results: self.__unsafe_private_named.1.unwrap(),
+            quiz_begin: self._fields.0.unwrap(),
+            results: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -296,8 +296,8 @@ where
         >,
     ) -> QuizScore<'a> {
         QuizScore {
-            quiz_begin: self.__unsafe_private_named.0.unwrap(),
-            results: self.__unsafe_private_named.1.unwrap(),
+            quiz_begin: self._fields.0.unwrap(),
+            results: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -409,45 +409,45 @@ pub mod team_result_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type TotalScore;
         type TeamScore;
+        type TotalScore;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type TotalScore = Unset;
         type TeamScore = Unset;
-    }
-    ///State transition - sets the `total_score` field to Set
-    pub struct SetTotalScore<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTotalScore<S> {}
-    impl<S: State> State for SetTotalScore<S> {
-        type TotalScore = Set<members::total_score>;
-        type TeamScore = S::TeamScore;
+        type TotalScore = Unset;
     }
     ///State transition - sets the `team_score` field to Set
     pub struct SetTeamScore<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTeamScore<S> {}
     impl<S: State> State for SetTeamScore<S> {
-        type TotalScore = S::TotalScore;
         type TeamScore = Set<members::team_score>;
+        type TotalScore = S::TotalScore;
+    }
+    ///State transition - sets the `total_score` field to Set
+    pub struct SetTotalScore<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTotalScore<S> {}
+    impl<S: State> State for SetTotalScore<S> {
+        type TeamScore = S::TeamScore;
+        type TotalScore = Set<members::total_score>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `total_score` field
-        pub struct total_score(());
         ///Marker type for the `team_score` field
         pub struct team_score(());
+        ///Marker type for the `total_score` field
+        pub struct total_score(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TeamResultBuilder<'a, S: team_result_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TeamResult<'a> {
@@ -461,9 +461,9 @@ impl<'a> TeamResultBuilder<'a, team_result_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TeamResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -478,11 +478,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> TeamResultBuilder<'a, team_result_state::SetTeamScore<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TeamResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -497,11 +497,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> TeamResultBuilder<'a, team_result_state::SetTotalScore<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TeamResultBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -509,14 +509,14 @@ where
 impl<'a, S> TeamResultBuilder<'a, S>
 where
     S: team_result_state::State,
-    S::TotalScore: team_result_state::IsSet,
     S::TeamScore: team_result_state::IsSet,
+    S::TotalScore: team_result_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TeamResult<'a> {
         TeamResult {
-            team_score: self.__unsafe_private_named.0.unwrap(),
-            total_score: self.__unsafe_private_named.1.unwrap(),
+            team_score: self._fields.0.unwrap(),
+            total_score: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -529,8 +529,8 @@ where
         >,
     ) -> TeamResult<'a> {
         TeamResult {
-            team_score: self.__unsafe_private_named.0.unwrap(),
-            total_score: self.__unsafe_private_named.1.unwrap(),
+            team_score: self._fields.0.unwrap(),
+            total_score: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_quizzy/team.rs b/crates/jacquard-api/src/pub_quizzy/team.rs
index 3268f1c0..dd75a1b6 100644
--- a/crates/jacquard-api/src/pub_quizzy/team.rs
+++ b/crates/jacquard-api/src/pub_quizzy/team.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -227,50 +230,50 @@ pub mod team_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type Members;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type Members = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Members = S::Members;
+        type Name = Unset;
     }
     ///State transition - sets the `members` field to Set
     pub struct SetMembers<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMembers<S> {}
     impl<S: State> State for SetMembers<S> {
-        type Name = S::Name;
         type Members = Set<members::members>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Members = S::Members;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `members` field
         pub struct members(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TeamBuilder<'a, S: team_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<Vec<Did<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Team<'a> {
@@ -284,9 +287,9 @@ impl<'a> TeamBuilder<'a, team_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TeamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -294,12 +297,12 @@ impl<'a> TeamBuilder<'a, team_state::Empty> {
 impl<'a, S: team_state::State> TeamBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -307,12 +310,12 @@ impl<'a, S: team_state::State> TeamBuilder<'a, S> {
 impl<'a, S: team_state::State> TeamBuilder<'a, S> {
     /// Set the `avatarAlt` field (optional)
     pub fn avatar_alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `avatarAlt` field to an Option value (optional)
     pub fn maybe_avatar_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -327,11 +330,11 @@ where
         mut self,
         value: impl Into<Vec<Did<'a>>>,
     ) -> TeamBuilder<'a, team_state::SetMembers<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TeamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -346,11 +349,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TeamBuilder<'a, team_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TeamBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -358,16 +361,16 @@ where
 impl<'a, S> TeamBuilder<'a, S>
 where
     S: team_state::State,
-    S::Name: team_state::IsSet,
     S::Members: team_state::IsSet,
+    S::Name: team_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Team<'a> {
         Team {
-            avatar: self.__unsafe_private_named.0,
-            avatar_alt: self.__unsafe_private_named.1,
-            members: self.__unsafe_private_named.2.unwrap(),
-            name: self.__unsafe_private_named.3.unwrap(),
+            avatar: self._fields.0,
+            avatar_alt: self._fields.1,
+            members: self._fields.2.unwrap(),
+            name: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -380,10 +383,10 @@ where
         >,
     ) -> Team<'a> {
         Team {
-            avatar: self.__unsafe_private_named.0,
-            avatar_alt: self.__unsafe_private_named.1,
-            members: self.__unsafe_private_named.2.unwrap(),
-            name: self.__unsafe_private_named.3.unwrap(),
+            avatar: self._fields.0,
+            avatar_alt: self._fields.1,
+            members: self._fields.2.unwrap(),
+            name: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/pub_quizzy/team_score.rs b/crates/jacquard-api/src/pub_quizzy/team_score.rs
index 2a26d5a2..70f60896 100644
--- a/crates/jacquard-api/src/pub_quizzy/team_score.rs
+++ b/crates/jacquard-api/src/pub_quizzy/team_score.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -203,63 +206,63 @@ pub mod team_score_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Answers;
-        type QuizBegin;
         type Team;
+        type QuizBegin;
+        type Answers;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Answers = Unset;
-        type QuizBegin = Unset;
         type Team = Unset;
+        type QuizBegin = Unset;
+        type Answers = Unset;
     }
-    ///State transition - sets the `answers` field to Set
-    pub struct SetAnswers<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAnswers<S> {}
-    impl<S: State> State for SetAnswers<S> {
-        type Answers = Set<members::answers>;
+    ///State transition - sets the `team` field to Set
+    pub struct SetTeam<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTeam<S> {}
+    impl<S: State> State for SetTeam<S> {
+        type Team = Set<members::team>;
         type QuizBegin = S::QuizBegin;
-        type Team = S::Team;
+        type Answers = S::Answers;
     }
     ///State transition - sets the `quiz_begin` field to Set
     pub struct SetQuizBegin<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetQuizBegin<S> {}
     impl<S: State> State for SetQuizBegin<S> {
-        type Answers = S::Answers;
-        type QuizBegin = Set<members::quiz_begin>;
         type Team = S::Team;
-    }
-    ///State transition - sets the `team` field to Set
-    pub struct SetTeam<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTeam<S> {}
-    impl<S: State> State for SetTeam<S> {
+        type QuizBegin = Set<members::quiz_begin>;
         type Answers = S::Answers;
+    }
+    ///State transition - sets the `answers` field to Set
+    pub struct SetAnswers<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAnswers<S> {}
+    impl<S: State> State for SetAnswers<S> {
+        type Team = S::Team;
         type QuizBegin = S::QuizBegin;
-        type Team = Set<members::team>;
+        type Answers = Set<members::answers>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `answers` field
-        pub struct answers(());
-        ///Marker type for the `quiz_begin` field
-        pub struct quiz_begin(());
         ///Marker type for the `team` field
         pub struct team(());
+        ///Marker type for the `quiz_begin` field
+        pub struct quiz_begin(());
+        ///Marker type for the `answers` field
+        pub struct answers(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TeamScoreBuilder<'a, S: team_score_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<team_score::ScoredAnswer<'a>>>,
         Option<StrongRef<'a>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TeamScore<'a> {
@@ -273,9 +276,9 @@ impl<'a> TeamScoreBuilder<'a, team_score_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TeamScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -290,11 +293,11 @@ where
         mut self,
         value: impl Into<Vec<team_score::ScoredAnswer<'a>>>,
     ) -> TeamScoreBuilder<'a, team_score_state::SetAnswers<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TeamScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -309,11 +312,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> TeamScoreBuilder<'a, team_score_state::SetQuizBegin<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TeamScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -328,11 +331,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> TeamScoreBuilder<'a, team_score_state::SetTeam<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TeamScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -340,16 +343,16 @@ where
 impl<'a, S> TeamScoreBuilder<'a, S>
 where
     S: team_score_state::State,
-    S::Answers: team_score_state::IsSet,
-    S::QuizBegin: team_score_state::IsSet,
     S::Team: team_score_state::IsSet,
+    S::QuizBegin: team_score_state::IsSet,
+    S::Answers: team_score_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TeamScore<'a> {
         TeamScore {
-            answers: self.__unsafe_private_named.0.unwrap(),
-            quiz_begin: self.__unsafe_private_named.1.unwrap(),
-            team: self.__unsafe_private_named.2.unwrap(),
+            answers: self._fields.0.unwrap(),
+            quiz_begin: self._fields.1.unwrap(),
+            team: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -362,9 +365,9 @@ where
         >,
     ) -> TeamScore<'a> {
         TeamScore {
-            answers: self.__unsafe_private_named.0.unwrap(),
-            quiz_begin: self.__unsafe_private_named.1.unwrap(),
-            team: self.__unsafe_private_named.2.unwrap(),
+            answers: self._fields.0.unwrap(),
+            quiz_begin: self._fields.1.unwrap(),
+            team: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -505,49 +508,45 @@ pub mod scored_answer_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Answer;
         type Scores;
+        type Answer;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Answer = Unset;
         type Scores = Unset;
-    }
-    ///State transition - sets the `answer` field to Set
-    pub struct SetAnswer<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAnswer<S> {}
-    impl<S: State> State for SetAnswer<S> {
-        type Answer = Set<members::answer>;
-        type Scores = S::Scores;
+        type Answer = Unset;
     }
     ///State transition - sets the `scores` field to Set
     pub struct SetScores<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetScores<S> {}
     impl<S: State> State for SetScores<S> {
-        type Answer = S::Answer;
         type Scores = Set<members::scores>;
+        type Answer = S::Answer;
+    }
+    ///State transition - sets the `answer` field to Set
+    pub struct SetAnswer<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAnswer<S> {}
+    impl<S: State> State for SetAnswer<S> {
+        type Scores = S::Scores;
+        type Answer = Set<members::answer>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `answer` field
-        pub struct answer(());
         ///Marker type for the `scores` field
         pub struct scores(());
+        ///Marker type for the `answer` field
+        pub struct answer(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ScoredAnswerBuilder<'a, S: scored_answer_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<StrongRef<'a>>,
-        Option<CowStr<'a>>,
-        Option<Vec<i64>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>, Option<CowStr<'a>>, Option<Vec<i64>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ScoredAnswer<'a> {
@@ -561,9 +560,9 @@ impl<'a> ScoredAnswerBuilder<'a, scored_answer_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ScoredAnswerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -578,11 +577,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ScoredAnswerBuilder<'a, scored_answer_state::SetAnswer<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ScoredAnswerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -590,12 +589,12 @@ where
 impl<'a, S: scored_answer_state::State> ScoredAnswerBuilder<'a, S> {
     /// Set the `commentary` field (optional)
     pub fn commentary(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `commentary` field to an Option value (optional)
     pub fn maybe_commentary(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -610,11 +609,11 @@ where
         mut self,
         value: impl Into<Vec<i64>>,
     ) -> ScoredAnswerBuilder<'a, scored_answer_state::SetScores<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ScoredAnswerBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -622,15 +621,15 @@ where
 impl<'a, S> ScoredAnswerBuilder<'a, S>
 where
     S: scored_answer_state::State,
-    S::Answer: scored_answer_state::IsSet,
     S::Scores: scored_answer_state::IsSet,
+    S::Answer: scored_answer_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ScoredAnswer<'a> {
         ScoredAnswer {
-            answer: self.__unsafe_private_named.0.unwrap(),
-            commentary: self.__unsafe_private_named.1,
-            scores: self.__unsafe_private_named.2.unwrap(),
+            answer: self._fields.0.unwrap(),
+            commentary: self._fields.1,
+            scores: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -643,9 +642,9 @@ where
         >,
     ) -> ScoredAnswer<'a> {
         ScoredAnswer {
-            answer: self.__unsafe_private_named.0.unwrap(),
-            commentary: self.__unsafe_private_named.1,
-            scores: self.__unsafe_private_named.2.unwrap(),
+            answer: self._fields.0.unwrap(),
+            commentary: self._fields.1,
+            scores: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/science_alt/dataset/entry.rs b/crates/jacquard-api/src/science_alt/dataset/entry.rs
index 3441f1f2..49ccd71a 100644
--- a/crates/jacquard-api/src/science_alt/dataset/entry.rs
+++ b/crates/jacquard-api/src/science_alt/dataset/entry.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -583,65 +586,65 @@ pub mod entry_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type SchemaRef;
         type CreatedAt;
+        type Name;
         type Storage;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type SchemaRef = Unset;
         type CreatedAt = Unset;
+        type Name = Unset;
         type Storage = Unset;
     }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type SchemaRef = S::SchemaRef;
-        type CreatedAt = S::CreatedAt;
-        type Storage = S::Storage;
-    }
     ///State transition - sets the `schema_ref` field to Set
     pub struct SetSchemaRef<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSchemaRef<S> {}
     impl<S: State> State for SetSchemaRef<S> {
-        type Name = S::Name;
         type SchemaRef = Set<members::schema_ref>;
         type CreatedAt = S::CreatedAt;
+        type Name = S::Name;
         type Storage = S::Storage;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Name = S::Name;
         type SchemaRef = S::SchemaRef;
         type CreatedAt = Set<members::created_at>;
+        type Name = S::Name;
+        type Storage = S::Storage;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type SchemaRef = S::SchemaRef;
+        type CreatedAt = S::CreatedAt;
+        type Name = Set<members::name>;
         type Storage = S::Storage;
     }
     ///State transition - sets the `storage` field to Set
     pub struct SetStorage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStorage<S> {}
     impl<S: State> State for SetStorage<S> {
-        type Name = S::Name;
         type SchemaRef = S::SchemaRef;
         type CreatedAt = S::CreatedAt;
+        type Name = S::Name;
         type Storage = Set<members::storage>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `schema_ref` field
         pub struct schema_ref(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `name` field
+        pub struct name(());
         ///Marker type for the `storage` field
         pub struct storage(());
     }
@@ -649,8 +652,8 @@ pub mod entry_state {
 
 /// Builder for constructing an instance of this type
 pub struct EntryBuilder<'a, S: entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Data<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -663,7 +666,7 @@ pub struct EntryBuilder<'a, S: entry_state::State> {
         Option<EntryStorage<'a>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Entry<'a> {
@@ -677,21 +680,9 @@ impl<'a> EntryBuilder<'a, entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -699,12 +690,12 @@ impl<'a> EntryBuilder<'a, entry_state::Empty> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `contentMetadata` field (optional)
     pub fn content_metadata(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `contentMetadata` field to an Option value (optional)
     pub fn maybe_content_metadata(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -719,11 +710,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EntryBuilder<'a, entry_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -731,12 +722,12 @@ where
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -744,12 +735,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `license` field (optional)
     pub fn license(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `license` field to an Option value (optional)
     pub fn maybe_license(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -757,12 +748,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `metadata` field (optional)
     pub fn metadata(mut self, value: impl Into<Option<Bytes>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `metadata` field to an Option value (optional)
     pub fn maybe_metadata(mut self, value: Option<Bytes>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -770,12 +761,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `metadataSchemaRef` field (optional)
     pub fn metadata_schema_ref(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `metadataSchemaRef` field to an Option value (optional)
     pub fn maybe_metadata_schema_ref(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -790,11 +781,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EntryBuilder<'a, entry_state::SetName<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -809,11 +800,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> EntryBuilder<'a, entry_state::SetSchemaRef<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -821,12 +812,12 @@ where
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<entry::DatasetSize<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<entry::DatasetSize<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -841,11 +832,11 @@ where
         mut self,
         value: impl Into<EntryStorage<'a>>,
     ) -> EntryBuilder<'a, entry_state::SetStorage<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -853,12 +844,12 @@ where
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -866,25 +857,25 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S> EntryBuilder<'a, S>
 where
     S: entry_state::State,
-    S::Name: entry_state::IsSet,
     S::SchemaRef: entry_state::IsSet,
     S::CreatedAt: entry_state::IsSet,
+    S::Name: entry_state::IsSet,
     S::Storage: entry_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Entry<'a> {
         Entry {
-            content_metadata: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            license: self.__unsafe_private_named.3,
-            metadata: self.__unsafe_private_named.4,
-            metadata_schema_ref: self.__unsafe_private_named.5,
-            name: self.__unsafe_private_named.6.unwrap(),
-            schema_ref: self.__unsafe_private_named.7.unwrap(),
-            size: self.__unsafe_private_named.8,
-            storage: self.__unsafe_private_named.9.unwrap(),
-            tags: self.__unsafe_private_named.10,
+            content_metadata: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            license: self._fields.3,
+            metadata: self._fields.4,
+            metadata_schema_ref: self._fields.5,
+            name: self._fields.6.unwrap(),
+            schema_ref: self._fields.7.unwrap(),
+            size: self._fields.8,
+            storage: self._fields.9.unwrap(),
+            tags: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -894,17 +885,17 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Entry<'a> {
         Entry {
-            content_metadata: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            license: self.__unsafe_private_named.3,
-            metadata: self.__unsafe_private_named.4,
-            metadata_schema_ref: self.__unsafe_private_named.5,
-            name: self.__unsafe_private_named.6.unwrap(),
-            schema_ref: self.__unsafe_private_named.7.unwrap(),
-            size: self.__unsafe_private_named.8,
-            storage: self.__unsafe_private_named.9.unwrap(),
-            tags: self.__unsafe_private_named.10,
+            content_metadata: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            license: self._fields.3,
+            metadata: self._fields.4,
+            metadata_schema_ref: self._fields.5,
+            name: self._fields.6.unwrap(),
+            schema_ref: self._fields.7.unwrap(),
+            size: self._fields.8,
+            storage: self._fields.9.unwrap(),
+            tags: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/science_alt/dataset/label.rs b/crates/jacquard-api/src/science_alt/dataset/label.rs
index fd928be6..95e2a8c6 100644
--- a/crates/jacquard-api/src/science_alt/dataset/label.rs
+++ b/crates/jacquard-api/src/science_alt/dataset/label.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -163,65 +166,65 @@ pub mod label_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Name;
         type DatasetUri;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Name = Unset;
         type DatasetUri = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Name = S::Name;
-        type DatasetUri = S::DatasetUri;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type CreatedAt = S::CreatedAt;
         type Name = Set<members::name>;
         type DatasetUri = S::DatasetUri;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `dataset_uri` field to Set
     pub struct SetDatasetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDatasetUri<S> {}
     impl<S: State> State for SetDatasetUri<S> {
-        type CreatedAt = S::CreatedAt;
         type Name = S::Name;
         type DatasetUri = Set<members::dataset_uri>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Name = S::Name;
+        type DatasetUri = S::DatasetUri;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `name` field
         pub struct name(());
         ///Marker type for the `dataset_uri` field
         pub struct dataset_uri(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LabelBuilder<'a, S: label_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Label<'a> {
@@ -235,9 +238,9 @@ impl<'a> LabelBuilder<'a, label_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LabelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -252,11 +255,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LabelBuilder<'a, label_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LabelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -271,11 +274,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> LabelBuilder<'a, label_state::SetDatasetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LabelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -283,12 +286,12 @@ where
 impl<'a, S: label_state::State> LabelBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -303,11 +306,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LabelBuilder<'a, label_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LabelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -315,12 +318,12 @@ where
 impl<'a, S: label_state::State> LabelBuilder<'a, S> {
     /// Set the `version` field (optional)
     pub fn version(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `version` field to an Option value (optional)
     pub fn maybe_version(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -328,18 +331,18 @@ impl<'a, S: label_state::State> LabelBuilder<'a, S> {
 impl<'a, S> LabelBuilder<'a, S>
 where
     S: label_state::State,
-    S::CreatedAt: label_state::IsSet,
     S::Name: label_state::IsSet,
     S::DatasetUri: label_state::IsSet,
+    S::CreatedAt: label_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Label<'a> {
         Label {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            dataset_uri: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            version: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            dataset_uri: self._fields.1.unwrap(),
+            description: self._fields.2,
+            name: self._fields.3.unwrap(),
+            version: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -352,11 +355,11 @@ where
         >,
     ) -> Label<'a> {
         Label {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            dataset_uri: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            version: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            dataset_uri: self._fields.1.unwrap(),
+            description: self._fields.2,
+            name: self._fields.3.unwrap(),
+            version: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/science_alt/dataset/lens.rs b/crates/jacquard-api/src/science_alt/dataset/lens.rs
index 950eb582..786ad00f 100644
--- a/crates/jacquard-api/src/science_alt/dataset/lens.rs
+++ b/crates/jacquard-api/src/science_alt/dataset/lens.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -570,9 +573,9 @@ pub mod lens_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Name;
-        type SourceSchema;
-        type TargetSchema;
         type GetterCode;
+        type TargetSchema;
+        type SourceSchema;
         type PutterCode;
         type CreatedAt;
     }
@@ -581,9 +584,9 @@ pub mod lens_state {
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Name = Unset;
-        type SourceSchema = Unset;
-        type TargetSchema = Unset;
         type GetterCode = Unset;
+        type TargetSchema = Unset;
+        type SourceSchema = Unset;
         type PutterCode = Unset;
         type CreatedAt = Unset;
     }
@@ -592,20 +595,20 @@ pub mod lens_state {
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
         type Name = Set<members::name>;
-        type SourceSchema = S::SourceSchema;
-        type TargetSchema = S::TargetSchema;
         type GetterCode = S::GetterCode;
+        type TargetSchema = S::TargetSchema;
+        type SourceSchema = S::SourceSchema;
         type PutterCode = S::PutterCode;
         type CreatedAt = S::CreatedAt;
     }
-    ///State transition - sets the `source_schema` field to Set
-    pub struct SetSourceSchema<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSourceSchema<S> {}
-    impl<S: State> State for SetSourceSchema<S> {
+    ///State transition - sets the `getter_code` field to Set
+    pub struct SetGetterCode<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetGetterCode<S> {}
+    impl<S: State> State for SetGetterCode<S> {
         type Name = S::Name;
-        type SourceSchema = Set<members::source_schema>;
+        type GetterCode = Set<members::getter_code>;
         type TargetSchema = S::TargetSchema;
-        type GetterCode = S::GetterCode;
+        type SourceSchema = S::SourceSchema;
         type PutterCode = S::PutterCode;
         type CreatedAt = S::CreatedAt;
     }
@@ -614,20 +617,20 @@ pub mod lens_state {
     impl<S: State> sealed::Sealed for SetTargetSchema<S> {}
     impl<S: State> State for SetTargetSchema<S> {
         type Name = S::Name;
-        type SourceSchema = S::SourceSchema;
-        type TargetSchema = Set<members::target_schema>;
         type GetterCode = S::GetterCode;
+        type TargetSchema = Set<members::target_schema>;
+        type SourceSchema = S::SourceSchema;
         type PutterCode = S::PutterCode;
         type CreatedAt = S::CreatedAt;
     }
-    ///State transition - sets the `getter_code` field to Set
-    pub struct SetGetterCode<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetGetterCode<S> {}
-    impl<S: State> State for SetGetterCode<S> {
+    ///State transition - sets the `source_schema` field to Set
+    pub struct SetSourceSchema<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSourceSchema<S> {}
+    impl<S: State> State for SetSourceSchema<S> {
         type Name = S::Name;
-        type SourceSchema = S::SourceSchema;
+        type GetterCode = S::GetterCode;
         type TargetSchema = S::TargetSchema;
-        type GetterCode = Set<members::getter_code>;
+        type SourceSchema = Set<members::source_schema>;
         type PutterCode = S::PutterCode;
         type CreatedAt = S::CreatedAt;
     }
@@ -636,9 +639,9 @@ pub mod lens_state {
     impl<S: State> sealed::Sealed for SetPutterCode<S> {}
     impl<S: State> State for SetPutterCode<S> {
         type Name = S::Name;
-        type SourceSchema = S::SourceSchema;
-        type TargetSchema = S::TargetSchema;
         type GetterCode = S::GetterCode;
+        type TargetSchema = S::TargetSchema;
+        type SourceSchema = S::SourceSchema;
         type PutterCode = Set<members::putter_code>;
         type CreatedAt = S::CreatedAt;
     }
@@ -647,9 +650,9 @@ pub mod lens_state {
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type Name = S::Name;
-        type SourceSchema = S::SourceSchema;
-        type TargetSchema = S::TargetSchema;
         type GetterCode = S::GetterCode;
+        type TargetSchema = S::TargetSchema;
+        type SourceSchema = S::SourceSchema;
         type PutterCode = S::PutterCode;
         type CreatedAt = Set<members::created_at>;
     }
@@ -658,12 +661,12 @@ pub mod lens_state {
     pub mod members {
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `source_schema` field
-        pub struct source_schema(());
-        ///Marker type for the `target_schema` field
-        pub struct target_schema(());
         ///Marker type for the `getter_code` field
         pub struct getter_code(());
+        ///Marker type for the `target_schema` field
+        pub struct target_schema(());
+        ///Marker type for the `source_schema` field
+        pub struct source_schema(());
         ///Marker type for the `putter_code` field
         pub struct putter_code(());
         ///Marker type for the `created_at` field
@@ -673,8 +676,8 @@ pub mod lens_state {
 
 /// Builder for constructing an instance of this type
 pub struct LensBuilder<'a, S: lens_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<lens::CodeReference<'a>>,
@@ -687,7 +690,7 @@ pub struct LensBuilder<'a, S: lens_state::State> {
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Lens<'a> {
@@ -701,21 +704,9 @@ impl<'a> LensBuilder<'a, lens_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LensBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -730,11 +721,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LensBuilder<'a, lens_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LensBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -742,12 +733,12 @@ where
 impl<'a, S: lens_state::State> LensBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -762,11 +753,11 @@ where
         mut self,
         value: impl Into<lens::CodeReference<'a>>,
     ) -> LensBuilder<'a, lens_state::SetGetterCode<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LensBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -774,12 +765,12 @@ where
 impl<'a, S: lens_state::State> LensBuilder<'a, S> {
     /// Set the `language` field (optional)
     pub fn language(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `language` field to an Option value (optional)
     pub fn maybe_language(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -787,12 +778,12 @@ impl<'a, S: lens_state::State> LensBuilder<'a, S> {
 impl<'a, S: lens_state::State> LensBuilder<'a, S> {
     /// Set the `metadata` field (optional)
     pub fn metadata(mut self, value: impl Into<Option<lens::LensMetadata<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `metadata` field to an Option value (optional)
     pub fn maybe_metadata(mut self, value: Option<lens::LensMetadata<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -807,11 +798,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LensBuilder<'a, lens_state::SetName<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         LensBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -826,11 +817,11 @@ where
         mut self,
         value: impl Into<lens::CodeReference<'a>>,
     ) -> LensBuilder<'a, lens_state::SetPutterCode<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         LensBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -845,11 +836,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> LensBuilder<'a, lens_state::SetSourceSchema<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         LensBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -860,12 +851,12 @@ impl<'a, S: lens_state::State> LensBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `sourceSchemaVersion` field to an Option value (optional)
     pub fn maybe_source_schema_version(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -880,11 +871,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> LensBuilder<'a, lens_state::SetTargetSchema<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         LensBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -895,12 +886,12 @@ impl<'a, S: lens_state::State> LensBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `targetSchemaVersion` field to an Option value (optional)
     pub fn maybe_target_schema_version(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -909,26 +900,26 @@ impl<'a, S> LensBuilder<'a, S>
 where
     S: lens_state::State,
     S::Name: lens_state::IsSet,
-    S::SourceSchema: lens_state::IsSet,
-    S::TargetSchema: lens_state::IsSet,
     S::GetterCode: lens_state::IsSet,
+    S::TargetSchema: lens_state::IsSet,
+    S::SourceSchema: lens_state::IsSet,
     S::PutterCode: lens_state::IsSet,
     S::CreatedAt: lens_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Lens<'a> {
         Lens {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            getter_code: self.__unsafe_private_named.2.unwrap(),
-            language: self.__unsafe_private_named.3,
-            metadata: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            putter_code: self.__unsafe_private_named.6.unwrap(),
-            source_schema: self.__unsafe_private_named.7.unwrap(),
-            source_schema_version: self.__unsafe_private_named.8,
-            target_schema: self.__unsafe_private_named.9.unwrap(),
-            target_schema_version: self.__unsafe_private_named.10,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            getter_code: self._fields.2.unwrap(),
+            language: self._fields.3,
+            metadata: self._fields.4,
+            name: self._fields.5.unwrap(),
+            putter_code: self._fields.6.unwrap(),
+            source_schema: self._fields.7.unwrap(),
+            source_schema_version: self._fields.8,
+            target_schema: self._fields.9.unwrap(),
+            target_schema_version: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -941,17 +932,17 @@ where
         >,
     ) -> Lens<'a> {
         Lens {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            getter_code: self.__unsafe_private_named.2.unwrap(),
-            language: self.__unsafe_private_named.3,
-            metadata: self.__unsafe_private_named.4,
-            name: self.__unsafe_private_named.5.unwrap(),
-            putter_code: self.__unsafe_private_named.6.unwrap(),
-            source_schema: self.__unsafe_private_named.7.unwrap(),
-            source_schema_version: self.__unsafe_private_named.8,
-            target_schema: self.__unsafe_private_named.9.unwrap(),
-            target_schema_version: self.__unsafe_private_named.10,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            getter_code: self._fields.2.unwrap(),
+            language: self._fields.3,
+            metadata: self._fields.4,
+            name: self._fields.5.unwrap(),
+            putter_code: self._fields.6.unwrap(),
+            source_schema: self._fields.7.unwrap(),
+            source_schema_version: self._fields.8,
+            target_schema: self._fields.9.unwrap(),
+            target_schema_version: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/science_alt/dataset/lens_verification.rs b/crates/jacquard-api/src/science_alt/dataset/lens_verification.rs
index 13831bb7..481a28d3 100644
--- a/crates/jacquard-api/src/science_alt/dataset/lens_verification.rs
+++ b/crates/jacquard-api/src/science_alt/dataset/lens_verification.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -376,74 +379,74 @@ pub mod lens_verification_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Lens;
         type VerificationMethod;
-        type LensCommit;
         type CreatedAt;
+        type Lens;
+        type LensCommit;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Lens = Unset;
         type VerificationMethod = Unset;
-        type LensCommit = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `lens` field to Set
-    pub struct SetLens<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLens<S> {}
-    impl<S: State> State for SetLens<S> {
-        type Lens = Set<members::lens>;
-        type VerificationMethod = S::VerificationMethod;
-        type LensCommit = S::LensCommit;
-        type CreatedAt = S::CreatedAt;
+        type Lens = Unset;
+        type LensCommit = Unset;
     }
     ///State transition - sets the `verification_method` field to Set
     pub struct SetVerificationMethod<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetVerificationMethod<S> {}
     impl<S: State> State for SetVerificationMethod<S> {
-        type Lens = S::Lens;
         type VerificationMethod = Set<members::verification_method>;
-        type LensCommit = S::LensCommit;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `lens_commit` field to Set
-    pub struct SetLensCommit<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLensCommit<S> {}
-    impl<S: State> State for SetLensCommit<S> {
         type Lens = S::Lens;
-        type VerificationMethod = S::VerificationMethod;
-        type LensCommit = Set<members::lens_commit>;
-        type CreatedAt = S::CreatedAt;
+        type LensCommit = S::LensCommit;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type VerificationMethod = S::VerificationMethod;
+        type CreatedAt = Set<members::created_at>;
         type Lens = S::Lens;
+        type LensCommit = S::LensCommit;
+    }
+    ///State transition - sets the `lens` field to Set
+    pub struct SetLens<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLens<S> {}
+    impl<S: State> State for SetLens<S> {
         type VerificationMethod = S::VerificationMethod;
+        type CreatedAt = S::CreatedAt;
+        type Lens = Set<members::lens>;
         type LensCommit = S::LensCommit;
-        type CreatedAt = Set<members::created_at>;
+    }
+    ///State transition - sets the `lens_commit` field to Set
+    pub struct SetLensCommit<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLensCommit<S> {}
+    impl<S: State> State for SetLensCommit<S> {
+        type VerificationMethod = S::VerificationMethod;
+        type CreatedAt = S::CreatedAt;
+        type Lens = S::Lens;
+        type LensCommit = Set<members::lens_commit>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `lens` field
-        pub struct lens(());
         ///Marker type for the `verification_method` field
         pub struct verification_method(());
-        ///Marker type for the `lens_commit` field
-        pub struct lens_commit(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `lens` field
+        pub struct lens(());
+        ///Marker type for the `lens_commit` field
+        pub struct lens_commit(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LensVerificationBuilder<'a, S: lens_verification_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<lens_verification::CodeHash<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -452,7 +455,7 @@ pub struct LensVerificationBuilder<'a, S: lens_verification_state::State> {
         Option<CodeReference<'a>>,
         Option<VerificationMethod<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LensVerification<'a> {
@@ -466,9 +469,9 @@ impl<'a> LensVerificationBuilder<'a, lens_verification_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LensVerificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -479,7 +482,7 @@ impl<'a, S: lens_verification_state::State> LensVerificationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<lens_verification::CodeHash<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `codeHash` field to an Option value (optional)
@@ -487,7 +490,7 @@ impl<'a, S: lens_verification_state::State> LensVerificationBuilder<'a, S> {
         mut self,
         value: Option<lens_verification::CodeHash<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -502,11 +505,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LensVerificationBuilder<'a, lens_verification_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LensVerificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -514,12 +517,12 @@ where
 impl<'a, S: lens_verification_state::State> LensVerificationBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -534,11 +537,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> LensVerificationBuilder<'a, lens_verification_state::SetLens<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LensVerificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -553,11 +556,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LensVerificationBuilder<'a, lens_verification_state::SetLensCommit<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         LensVerificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -565,12 +568,12 @@ where
 impl<'a, S: lens_verification_state::State> LensVerificationBuilder<'a, S> {
     /// Set the `proofRef` field (optional)
     pub fn proof_ref(mut self, value: impl Into<Option<CodeReference<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `proofRef` field to an Option value (optional)
     pub fn maybe_proof_ref(mut self, value: Option<CodeReference<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -585,11 +588,11 @@ where
         mut self,
         value: impl Into<VerificationMethod<'a>>,
     ) -> LensVerificationBuilder<'a, lens_verification_state::SetVerificationMethod<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         LensVerificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -597,21 +600,21 @@ where
 impl<'a, S> LensVerificationBuilder<'a, S>
 where
     S: lens_verification_state::State,
-    S::Lens: lens_verification_state::IsSet,
     S::VerificationMethod: lens_verification_state::IsSet,
-    S::LensCommit: lens_verification_state::IsSet,
     S::CreatedAt: lens_verification_state::IsSet,
+    S::Lens: lens_verification_state::IsSet,
+    S::LensCommit: lens_verification_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LensVerification<'a> {
         LensVerification {
-            code_hash: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            lens: self.__unsafe_private_named.3.unwrap(),
-            lens_commit: self.__unsafe_private_named.4.unwrap(),
-            proof_ref: self.__unsafe_private_named.5,
-            verification_method: self.__unsafe_private_named.6.unwrap(),
+            code_hash: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            lens: self._fields.3.unwrap(),
+            lens_commit: self._fields.4.unwrap(),
+            proof_ref: self._fields.5,
+            verification_method: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -624,13 +627,13 @@ where
         >,
     ) -> LensVerification<'a> {
         LensVerification {
-            code_hash: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            lens: self.__unsafe_private_named.3.unwrap(),
-            lens_commit: self.__unsafe_private_named.4.unwrap(),
-            proof_ref: self.__unsafe_private_named.5,
-            verification_method: self.__unsafe_private_named.6.unwrap(),
+            code_hash: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            lens: self._fields.3.unwrap(),
+            lens_commit: self._fields.4.unwrap(),
+            proof_ref: self._fields.5,
+            verification_method: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/science_alt/dataset/resolve_label.rs b/crates/jacquard-api/src/science_alt/dataset/resolve_label.rs
index baeef621..68f8e7d3 100644
--- a/crates/jacquard-api/src/science_alt/dataset/resolve_label.rs
+++ b/crates/jacquard-api/src/science_alt/dataset/resolve_label.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -149,9 +152,9 @@ pub mod resolve_label_state {
 
 /// Builder for constructing an instance of this type
 pub struct ResolveLabelBuilder<'a, S: resolve_label_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ResolveLabel<'a> {
@@ -165,9 +168,9 @@ impl<'a> ResolveLabelBuilder<'a, resolve_label_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ResolveLabelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,11 +185,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ResolveLabelBuilder<'a, resolve_label_state::SetHandle<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ResolveLabelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -201,11 +204,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ResolveLabelBuilder<'a, resolve_label_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ResolveLabelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,12 +216,12 @@ where
 impl<'a, S: resolve_label_state::State> ResolveLabelBuilder<'a, S> {
     /// Set the `version` field (optional)
     pub fn version(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `version` field to an Option value (optional)
     pub fn maybe_version(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -232,9 +235,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ResolveLabel<'a> {
         ResolveLabel {
-            handle: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            version: self.__unsafe_private_named.2,
+            handle: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            version: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/science_alt/dataset/resolve_schema.rs b/crates/jacquard-api/src/science_alt/dataset/resolve_schema.rs
index bc2817c1..3e2dfb1c 100644
--- a/crates/jacquard-api/src/science_alt/dataset/resolve_schema.rs
+++ b/crates/jacquard-api/src/science_alt/dataset/resolve_schema.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -149,9 +152,9 @@ pub mod resolve_schema_state {
 
 /// Builder for constructing an instance of this type
 pub struct ResolveSchemaBuilder<'a, S: resolve_schema_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ResolveSchema<'a> {
@@ -165,9 +168,9 @@ impl<'a> ResolveSchemaBuilder<'a, resolve_schema_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ResolveSchemaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,11 +185,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ResolveSchemaBuilder<'a, resolve_schema_state::SetHandle<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ResolveSchemaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -201,11 +204,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ResolveSchemaBuilder<'a, resolve_schema_state::SetSchemaId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ResolveSchemaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,12 +216,12 @@ where
 impl<'a, S: resolve_schema_state::State> ResolveSchemaBuilder<'a, S> {
     /// Set the `version` field (optional)
     pub fn version(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `version` field to an Option value (optional)
     pub fn maybe_version(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -232,9 +235,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ResolveSchema<'a> {
         ResolveSchema {
-            handle: self.__unsafe_private_named.0.unwrap(),
-            schema_id: self.__unsafe_private_named.1.unwrap(),
-            version: self.__unsafe_private_named.2,
+            handle: self._fields.0.unwrap(),
+            schema_id: self._fields.1.unwrap(),
+            version: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/science_alt/dataset/storage_blobs.rs b/crates/jacquard-api/src/science_alt/dataset/storage_blobs.rs
index 750fa4bc..c05ee7bf 100644
--- a/crates/jacquard-api/src/science_alt/dataset/storage_blobs.rs
+++ b/crates/jacquard-api/src/science_alt/dataset/storage_blobs.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -161,9 +164,9 @@ pub mod blob_entry_state {
 
 /// Builder for constructing an instance of this type
 pub struct BlobEntryBuilder<'a, S: blob_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>, Option<ShardChecksum<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>, Option<ShardChecksum<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BlobEntry<'a> {
@@ -177,9 +180,9 @@ impl<'a> BlobEntryBuilder<'a, blob_entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlobEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -194,11 +197,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> BlobEntryBuilder<'a, blob_entry_state::SetBlob<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlobEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -206,12 +209,12 @@ where
 impl<'a, S: blob_entry_state::State> BlobEntryBuilder<'a, S> {
     /// Set the `checksum` field (optional)
     pub fn checksum(mut self, value: impl Into<Option<ShardChecksum<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `checksum` field to an Option value (optional)
     pub fn maybe_checksum(mut self, value: Option<ShardChecksum<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -224,8 +227,8 @@ where
     /// Build the final struct
     pub fn build(self) -> BlobEntry<'a> {
         BlobEntry {
-            blob: self.__unsafe_private_named.0.unwrap(),
-            checksum: self.__unsafe_private_named.1,
+            blob: self._fields.0.unwrap(),
+            checksum: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -238,8 +241,8 @@ where
         >,
     ) -> BlobEntry<'a> {
         BlobEntry {
-            blob: self.__unsafe_private_named.0.unwrap(),
-            checksum: self.__unsafe_private_named.1,
+            blob: self._fields.0.unwrap(),
+            checksum: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
@@ -358,9 +361,9 @@ pub mod storage_blobs_state {
 
 /// Builder for constructing an instance of this type
 pub struct StorageBlobsBuilder<'a, S: storage_blobs_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<storage_blobs::BlobEntry<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<storage_blobs::BlobEntry<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> StorageBlobs<'a> {
@@ -374,9 +377,9 @@ impl<'a> StorageBlobsBuilder<'a, storage_blobs_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StorageBlobsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -391,11 +394,11 @@ where
         mut self,
         value: impl Into<Vec<storage_blobs::BlobEntry<'a>>>,
     ) -> StorageBlobsBuilder<'a, storage_blobs_state::SetBlobs<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StorageBlobsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -408,7 +411,7 @@ where
     /// Build the final struct
     pub fn build(self) -> StorageBlobs<'a> {
         StorageBlobs {
-            blobs: self.__unsafe_private_named.0.unwrap(),
+            blobs: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -421,7 +424,7 @@ where
         >,
     ) -> StorageBlobs<'a> {
         StorageBlobs {
-            blobs: self.__unsafe_private_named.0.unwrap(),
+            blobs: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/science_alt/dataset/storage_external.rs b/crates/jacquard-api/src/science_alt/dataset/storage_external.rs
index d75b9052..29ec4333 100644
--- a/crates/jacquard-api/src/science_alt/dataset/storage_external.rs
+++ b/crates/jacquard-api/src/science_alt/dataset/storage_external.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -89,9 +92,9 @@ pub mod storage_external_state {
 
 /// Builder for constructing an instance of this type
 pub struct StorageExternalBuilder<'a, S: storage_external_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<UriValue<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<UriValue<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> StorageExternal<'a> {
@@ -105,9 +108,9 @@ impl<'a> StorageExternalBuilder<'a, storage_external_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StorageExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -122,11 +125,11 @@ where
         mut self,
         value: impl Into<Vec<UriValue<'a>>>,
     ) -> StorageExternalBuilder<'a, storage_external_state::SetUrls<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StorageExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -139,7 +142,7 @@ where
     /// Build the final struct
     pub fn build(self) -> StorageExternal<'a> {
         StorageExternal {
-            urls: self.__unsafe_private_named.0.unwrap(),
+            urls: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -152,7 +155,7 @@ where
         >,
     ) -> StorageExternal<'a> {
         StorageExternal {
-            urls: self.__unsafe_private_named.0.unwrap(),
+            urls: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/science_alt/dataset/storage_http.rs b/crates/jacquard-api/src/science_alt/dataset/storage_http.rs
index 5c11a3c2..3a4229fb 100644
--- a/crates/jacquard-api/src/science_alt/dataset/storage_http.rs
+++ b/crates/jacquard-api/src/science_alt/dataset/storage_http.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -131,9 +134,9 @@ pub mod storage_http_state {
 
 /// Builder for constructing an instance of this type
 pub struct StorageHttpBuilder<'a, S: storage_http_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<storage_http::ShardEntry<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<storage_http::ShardEntry<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> StorageHttp<'a> {
@@ -147,9 +150,9 @@ impl<'a> StorageHttpBuilder<'a, storage_http_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StorageHttpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,11 +167,11 @@ where
         mut self,
         value: impl Into<Vec<storage_http::ShardEntry<'a>>>,
     ) -> StorageHttpBuilder<'a, storage_http_state::SetShards<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StorageHttpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,7 +184,7 @@ where
     /// Build the final struct
     pub fn build(self) -> StorageHttp<'a> {
         StorageHttp {
-            shards: self.__unsafe_private_named.0.unwrap(),
+            shards: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -194,7 +197,7 @@ where
         >,
     ) -> StorageHttp<'a> {
         StorageHttp {
-            shards: self.__unsafe_private_named.0.unwrap(),
+            shards: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -300,45 +303,45 @@ pub mod shard_entry_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Url;
         type Checksum;
+        type Url;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Url = Unset;
         type Checksum = Unset;
-    }
-    ///State transition - sets the `url` field to Set
-    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUrl<S> {}
-    impl<S: State> State for SetUrl<S> {
-        type Url = Set<members::url>;
-        type Checksum = S::Checksum;
+        type Url = Unset;
     }
     ///State transition - sets the `checksum` field to Set
     pub struct SetChecksum<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetChecksum<S> {}
     impl<S: State> State for SetChecksum<S> {
-        type Url = S::Url;
         type Checksum = Set<members::checksum>;
+        type Url = S::Url;
+    }
+    ///State transition - sets the `url` field to Set
+    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUrl<S> {}
+    impl<S: State> State for SetUrl<S> {
+        type Checksum = S::Checksum;
+        type Url = Set<members::url>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `url` field
-        pub struct url(());
         ///Marker type for the `checksum` field
         pub struct checksum(());
+        ///Marker type for the `url` field
+        pub struct url(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ShardEntryBuilder<'a, S: shard_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ShardChecksum<'a>>, Option<UriValue<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ShardChecksum<'a>>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ShardEntry<'a> {
@@ -352,9 +355,9 @@ impl<'a> ShardEntryBuilder<'a, shard_entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ShardEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -369,11 +372,11 @@ where
         mut self,
         value: impl Into<ShardChecksum<'a>>,
     ) -> ShardEntryBuilder<'a, shard_entry_state::SetChecksum<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ShardEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -388,11 +391,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ShardEntryBuilder<'a, shard_entry_state::SetUrl<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ShardEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -400,14 +403,14 @@ where
 impl<'a, S> ShardEntryBuilder<'a, S>
 where
     S: shard_entry_state::State,
-    S::Url: shard_entry_state::IsSet,
     S::Checksum: shard_entry_state::IsSet,
+    S::Url: shard_entry_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ShardEntry<'a> {
         ShardEntry {
-            checksum: self.__unsafe_private_named.0.unwrap(),
-            url: self.__unsafe_private_named.1.unwrap(),
+            checksum: self._fields.0.unwrap(),
+            url: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -420,8 +423,8 @@ where
         >,
     ) -> ShardEntry<'a> {
         ShardEntry {
-            checksum: self.__unsafe_private_named.0.unwrap(),
-            url: self.__unsafe_private_named.1.unwrap(),
+            checksum: self._fields.0.unwrap(),
+            url: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/science_alt/dataset/storage_s3.rs b/crates/jacquard-api/src/science_alt/dataset/storage_s3.rs
index 9921d9f2..630298ba 100644
--- a/crates/jacquard-api/src/science_alt/dataset/storage_s3.rs
+++ b/crates/jacquard-api/src/science_alt/dataset/storage_s3.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -150,50 +153,50 @@ pub mod storage_s3_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Bucket;
         type Shards;
+        type Bucket;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Bucket = Unset;
         type Shards = Unset;
-    }
-    ///State transition - sets the `bucket` field to Set
-    pub struct SetBucket<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBucket<S> {}
-    impl<S: State> State for SetBucket<S> {
-        type Bucket = Set<members::bucket>;
-        type Shards = S::Shards;
+        type Bucket = Unset;
     }
     ///State transition - sets the `shards` field to Set
     pub struct SetShards<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetShards<S> {}
     impl<S: State> State for SetShards<S> {
-        type Bucket = S::Bucket;
         type Shards = Set<members::shards>;
+        type Bucket = S::Bucket;
+    }
+    ///State transition - sets the `bucket` field to Set
+    pub struct SetBucket<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBucket<S> {}
+    impl<S: State> State for SetBucket<S> {
+        type Shards = S::Shards;
+        type Bucket = Set<members::bucket>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `bucket` field
-        pub struct bucket(());
         ///Marker type for the `shards` field
         pub struct shards(());
+        ///Marker type for the `bucket` field
+        pub struct bucket(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct StorageS3Builder<'a, S: storage_s3_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
         Option<Vec<storage_s3::ShardEntry<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> StorageS3<'a> {
@@ -207,9 +210,9 @@ impl<'a> StorageS3Builder<'a, storage_s3_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StorageS3Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -224,11 +227,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> StorageS3Builder<'a, storage_s3_state::SetBucket<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StorageS3Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -236,12 +239,12 @@ where
 impl<'a, S: storage_s3_state::State> StorageS3Builder<'a, S> {
     /// Set the `endpoint` field (optional)
     pub fn endpoint(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `endpoint` field to an Option value (optional)
     pub fn maybe_endpoint(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -249,12 +252,12 @@ impl<'a, S: storage_s3_state::State> StorageS3Builder<'a, S> {
 impl<'a, S: storage_s3_state::State> StorageS3Builder<'a, S> {
     /// Set the `region` field (optional)
     pub fn region(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `region` field to an Option value (optional)
     pub fn maybe_region(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -269,11 +272,11 @@ where
         mut self,
         value: impl Into<Vec<storage_s3::ShardEntry<'a>>>,
     ) -> StorageS3Builder<'a, storage_s3_state::SetShards<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         StorageS3Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -281,16 +284,16 @@ where
 impl<'a, S> StorageS3Builder<'a, S>
 where
     S: storage_s3_state::State,
-    S::Bucket: storage_s3_state::IsSet,
     S::Shards: storage_s3_state::IsSet,
+    S::Bucket: storage_s3_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> StorageS3<'a> {
         StorageS3 {
-            bucket: self.__unsafe_private_named.0.unwrap(),
-            endpoint: self.__unsafe_private_named.1,
-            region: self.__unsafe_private_named.2,
-            shards: self.__unsafe_private_named.3.unwrap(),
+            bucket: self._fields.0.unwrap(),
+            endpoint: self._fields.1,
+            region: self._fields.2,
+            shards: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -303,10 +306,10 @@ where
         >,
     ) -> StorageS3<'a> {
         StorageS3 {
-            bucket: self.__unsafe_private_named.0.unwrap(),
-            endpoint: self.__unsafe_private_named.1,
-            region: self.__unsafe_private_named.2,
-            shards: self.__unsafe_private_named.3.unwrap(),
+            bucket: self._fields.0.unwrap(),
+            endpoint: self._fields.1,
+            region: self._fields.2,
+            shards: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -484,9 +487,9 @@ pub mod shard_entry_state {
 
 /// Builder for constructing an instance of this type
 pub struct ShardEntryBuilder<'a, S: shard_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ShardChecksum<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ShardChecksum<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ShardEntry<'a> {
@@ -500,9 +503,9 @@ impl<'a> ShardEntryBuilder<'a, shard_entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ShardEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -517,11 +520,11 @@ where
         mut self,
         value: impl Into<ShardChecksum<'a>>,
     ) -> ShardEntryBuilder<'a, shard_entry_state::SetChecksum<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ShardEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -536,11 +539,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ShardEntryBuilder<'a, shard_entry_state::SetKey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ShardEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -554,8 +557,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ShardEntry<'a> {
         ShardEntry {
-            checksum: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1.unwrap(),
+            checksum: self._fields.0.unwrap(),
+            key: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -568,8 +571,8 @@ where
         >,
     ) -> ShardEntry<'a> {
         ShardEntry {
-            checksum: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1.unwrap(),
+            checksum: self._fields.0.unwrap(),
+            key: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/scot_comhairle/testing_polis_poll_v1.rs b/crates/jacquard-api/src/scot_comhairle/testing_polis_poll_v1.rs
index 98966284..33d5bfd2 100644
--- a/crates/jacquard-api/src/scot_comhairle/testing_polis_poll_v1.rs
+++ b/crates/jacquard-api/src/scot_comhairle/testing_polis_poll_v1.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -138,50 +141,50 @@ pub mod testing_polis_poll_v1_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Topic;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Topic = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Topic = S::Topic;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `topic` field to Set
     pub struct SetTopic<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTopic<S> {}
     impl<S: State> State for SetTopic<S> {
-        type CreatedAt = S::CreatedAt;
         type Topic = Set<members::topic>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Topic = S::Topic;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `topic` field
         pub struct topic(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TestingPolisPollV1Builder<'a, S: testing_polis_poll_v1_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TestingPolisPollV1<'a> {
@@ -195,9 +198,9 @@ impl<'a> TestingPolisPollV1Builder<'a, testing_polis_poll_v1_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TestingPolisPollV1Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -205,12 +208,12 @@ impl<'a> TestingPolisPollV1Builder<'a, testing_polis_poll_v1_state::Empty> {
 impl<'a, S: testing_polis_poll_v1_state::State> TestingPolisPollV1Builder<'a, S> {
     /// Set the `closedAt` field (optional)
     pub fn closed_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `closedAt` field to an Option value (optional)
     pub fn maybe_closed_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -225,11 +228,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TestingPolisPollV1Builder<'a, testing_polis_poll_v1_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TestingPolisPollV1Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -237,12 +240,12 @@ where
 impl<'a, S: testing_polis_poll_v1_state::State> TestingPolisPollV1Builder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -257,11 +260,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TestingPolisPollV1Builder<'a, testing_polis_poll_v1_state::SetTopic<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TestingPolisPollV1Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -269,16 +272,16 @@ where
 impl<'a, S> TestingPolisPollV1Builder<'a, S>
 where
     S: testing_polis_poll_v1_state::State,
-    S::CreatedAt: testing_polis_poll_v1_state::IsSet,
     S::Topic: testing_polis_poll_v1_state::IsSet,
+    S::CreatedAt: testing_polis_poll_v1_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TestingPolisPollV1<'a> {
         TestingPolisPollV1 {
-            closed_at: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            topic: self.__unsafe_private_named.3.unwrap(),
+            closed_at: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            topic: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -291,10 +294,10 @@ where
         >,
     ) -> TestingPolisPollV1<'a> {
         TestingPolisPollV1 {
-            closed_at: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            topic: self.__unsafe_private_named.3.unwrap(),
+            closed_at: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            topic: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/scot_comhairle/testing_polis_statement_v1.rs b/crates/jacquard-api/src/scot_comhairle/testing_polis_statement_v1.rs
index c64f051a..8513cabd 100644
--- a/crates/jacquard-api/src/scot_comhairle/testing_polis_statement_v1.rs
+++ b/crates/jacquard-api/src/scot_comhairle/testing_polis_statement_v1.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -154,51 +157,51 @@ pub mod testing_polis_statement_v1_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type CreatedAt;
         type Poll;
         type Text;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type CreatedAt = Unset;
         type Poll = Unset;
         type Text = Unset;
-        type CreatedAt = Unset;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type Poll = S::Poll;
+        type Text = S::Text;
     }
     ///State transition - sets the `poll` field to Set
     pub struct SetPoll<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPoll<S> {}
     impl<S: State> State for SetPoll<S> {
+        type CreatedAt = S::CreatedAt;
         type Poll = Set<members::poll>;
         type Text = S::Text;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `text` field to Set
     pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetText<S> {}
     impl<S: State> State for SetText<S> {
-        type Poll = S::Poll;
-        type Text = Set<members::text>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type Poll = S::Poll;
-        type Text = S::Text;
-        type CreatedAt = Set<members::created_at>;
+        type Text = Set<members::text>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `poll` field
         pub struct poll(());
         ///Marker type for the `text` field
         pub struct text(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
@@ -207,13 +210,13 @@ pub struct TestingPolisStatementV1Builder<
     'a,
     S: testing_polis_statement_v1_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<testing_polis_statement_v1::PollRef<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TestingPolisStatementV1<'a> {
@@ -230,9 +233,9 @@ impl<'a> TestingPolisStatementV1Builder<'a, testing_polis_statement_v1_state::Em
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TestingPolisStatementV1Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -250,11 +253,11 @@ where
         'a,
         testing_polis_statement_v1_state::SetCreatedAt<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TestingPolisStatementV1Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -272,11 +275,11 @@ where
         'a,
         testing_polis_statement_v1_state::SetPoll<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TestingPolisStatementV1Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -294,11 +297,11 @@ where
         'a,
         testing_polis_statement_v1_state::SetText<S>,
     > {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TestingPolisStatementV1Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -306,16 +309,16 @@ where
 impl<'a, S> TestingPolisStatementV1Builder<'a, S>
 where
     S: testing_polis_statement_v1_state::State,
+    S::CreatedAt: testing_polis_statement_v1_state::IsSet,
     S::Poll: testing_polis_statement_v1_state::IsSet,
     S::Text: testing_polis_statement_v1_state::IsSet,
-    S::CreatedAt: testing_polis_statement_v1_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TestingPolisStatementV1<'a> {
         TestingPolisStatementV1 {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            poll: self.__unsafe_private_named.1.unwrap(),
-            text: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            poll: self._fields.1.unwrap(),
+            text: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -328,9 +331,9 @@ where
         >,
     ) -> TestingPolisStatementV1<'a> {
         TestingPolisStatementV1 {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            poll: self.__unsafe_private_named.1.unwrap(),
-            text: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            poll: self._fields.1.unwrap(),
+            text: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -452,45 +455,45 @@ pub mod poll_ref_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Cid;
         type Uri;
+        type Cid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Cid = Unset;
         type Uri = Unset;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type Cid = Set<members::cid>;
-        type Uri = S::Uri;
+        type Cid = Unset;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Cid = S::Cid;
         type Uri = Set<members::uri>;
+        type Cid = S::Cid;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Uri = S::Uri;
+        type Cid = Set<members::cid>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PollRefBuilder<'a, S: poll_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PollRef<'a> {
@@ -504,9 +507,9 @@ impl<'a> PollRefBuilder<'a, poll_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PollRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -521,11 +524,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> PollRefBuilder<'a, poll_ref_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PollRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -540,11 +543,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PollRefBuilder<'a, poll_ref_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PollRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -552,14 +555,14 @@ where
 impl<'a, S> PollRefBuilder<'a, S>
 where
     S: poll_ref_state::State,
-    S::Cid: poll_ref_state::IsSet,
     S::Uri: poll_ref_state::IsSet,
+    S::Cid: poll_ref_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PollRef<'a> {
         PollRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -572,8 +575,8 @@ where
         >,
     ) -> PollRef<'a> {
         PollRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/scot_comhairle/testing_polis_vote_v1.rs b/crates/jacquard-api/src/scot_comhairle/testing_polis_vote_v1.rs
index b4dc2470..f6438f50 100644
--- a/crates/jacquard-api/src/scot_comhairle/testing_polis_vote_v1.rs
+++ b/crates/jacquard-api/src/scot_comhairle/testing_polis_vote_v1.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -175,80 +178,80 @@ pub mod testing_polis_vote_v1_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Poll;
         type CreatedAt;
-        type Subject;
         type Value;
+        type Subject;
+        type Poll;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Poll = Unset;
         type CreatedAt = Unset;
-        type Subject = Unset;
         type Value = Unset;
-    }
-    ///State transition - sets the `poll` field to Set
-    pub struct SetPoll<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPoll<S> {}
-    impl<S: State> State for SetPoll<S> {
-        type Poll = Set<members::poll>;
-        type CreatedAt = S::CreatedAt;
-        type Subject = S::Subject;
-        type Value = S::Value;
+        type Subject = Unset;
+        type Poll = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Poll = S::Poll;
         type CreatedAt = Set<members::created_at>;
-        type Subject = S::Subject;
         type Value = S::Value;
+        type Subject = S::Subject;
+        type Poll = S::Poll;
+    }
+    ///State transition - sets the `value` field to Set
+    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetValue<S> {}
+    impl<S: State> State for SetValue<S> {
+        type CreatedAt = S::CreatedAt;
+        type Value = Set<members::value>;
+        type Subject = S::Subject;
+        type Poll = S::Poll;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type Poll = S::Poll;
         type CreatedAt = S::CreatedAt;
-        type Subject = Set<members::subject>;
         type Value = S::Value;
-    }
-    ///State transition - sets the `value` field to Set
-    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetValue<S> {}
-    impl<S: State> State for SetValue<S> {
+        type Subject = Set<members::subject>;
         type Poll = S::Poll;
+    }
+    ///State transition - sets the `poll` field to Set
+    pub struct SetPoll<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPoll<S> {}
+    impl<S: State> State for SetPoll<S> {
         type CreatedAt = S::CreatedAt;
+        type Value = S::Value;
         type Subject = S::Subject;
-        type Value = Set<members::value>;
+        type Poll = Set<members::poll>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `poll` field
-        pub struct poll(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `value` field
         pub struct value(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
+        ///Marker type for the `poll` field
+        pub struct poll(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TestingPolisVoteV1Builder<'a, S: testing_polis_vote_v1_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<testing_polis_vote_v1::PollRef<'a>>,
         Option<testing_polis_vote_v1::StatementRef<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TestingPolisVoteV1<'a> {
@@ -262,9 +265,9 @@ impl<'a> TestingPolisVoteV1Builder<'a, testing_polis_vote_v1_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TestingPolisVoteV1Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -279,11 +282,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TestingPolisVoteV1Builder<'a, testing_polis_vote_v1_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TestingPolisVoteV1Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -298,11 +301,11 @@ where
         mut self,
         value: impl Into<testing_polis_vote_v1::PollRef<'a>>,
     ) -> TestingPolisVoteV1Builder<'a, testing_polis_vote_v1_state::SetPoll<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TestingPolisVoteV1Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -317,11 +320,11 @@ where
         mut self,
         value: impl Into<testing_polis_vote_v1::StatementRef<'a>>,
     ) -> TestingPolisVoteV1Builder<'a, testing_polis_vote_v1_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TestingPolisVoteV1Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -336,11 +339,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TestingPolisVoteV1Builder<'a, testing_polis_vote_v1_state::SetValue<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TestingPolisVoteV1Builder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -348,18 +351,18 @@ where
 impl<'a, S> TestingPolisVoteV1Builder<'a, S>
 where
     S: testing_polis_vote_v1_state::State,
-    S::Poll: testing_polis_vote_v1_state::IsSet,
     S::CreatedAt: testing_polis_vote_v1_state::IsSet,
-    S::Subject: testing_polis_vote_v1_state::IsSet,
     S::Value: testing_polis_vote_v1_state::IsSet,
+    S::Subject: testing_polis_vote_v1_state::IsSet,
+    S::Poll: testing_polis_vote_v1_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TestingPolisVoteV1<'a> {
         TestingPolisVoteV1 {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            poll: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
-            value: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            poll: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
+            value: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -372,10 +375,10 @@ where
         >,
     ) -> TestingPolisVoteV1<'a> {
         TestingPolisVoteV1 {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            poll: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
-            value: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            poll: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
+            value: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -575,9 +578,9 @@ pub mod poll_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct PollRefBuilder<'a, S: poll_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PollRef<'a> {
@@ -591,9 +594,9 @@ impl<'a> PollRefBuilder<'a, poll_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PollRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -608,11 +611,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> PollRefBuilder<'a, poll_ref_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PollRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -627,11 +630,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PollRefBuilder<'a, poll_ref_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PollRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -645,8 +648,8 @@ where
     /// Build the final struct
     pub fn build(self) -> PollRef<'a> {
         PollRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -659,8 +662,8 @@ where
         >,
     ) -> PollRef<'a> {
         PollRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -712,9 +715,9 @@ pub mod statement_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct StatementRefBuilder<'a, S: statement_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> StatementRef<'a> {
@@ -728,9 +731,9 @@ impl<'a> StatementRefBuilder<'a, statement_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StatementRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -745,11 +748,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> StatementRefBuilder<'a, statement_ref_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StatementRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -764,11 +767,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> StatementRefBuilder<'a, statement_ref_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StatementRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -782,8 +785,8 @@ where
     /// Build the final struct
     pub fn build(self) -> StatementRef<'a> {
         StatementRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -796,8 +799,8 @@ where
         >,
     ) -> StatementRef<'a> {
         StatementRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/actor/profile.rs b/crates/jacquard-api/src/sh_tangled/actor/profile.rs
index 01be3668..44223dea 100644
--- a/crates/jacquard-api/src/sh_tangled/actor/profile.rs
+++ b/crates/jacquard-api/src/sh_tangled/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -312,8 +315,8 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<bool>,
         Option<CowStr<'a>>,
@@ -323,7 +326,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<CowStr<'a>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -337,9 +340,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -347,12 +350,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -367,11 +370,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ProfileBuilder<'a, profile_state::SetBluesky<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -379,12 +382,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -392,12 +395,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `links` field (optional)
     pub fn links(mut self, value: impl Into<Option<Vec<UriValue<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `links` field to an Option value (optional)
     pub fn maybe_links(mut self, value: Option<Vec<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -405,12 +408,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -421,12 +424,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<AtUri<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `pinnedRepositories` field to an Option value (optional)
     pub fn maybe_pinned_repositories(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -434,12 +437,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `pronouns` field (optional)
     pub fn pronouns(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `pronouns` field to an Option value (optional)
     pub fn maybe_pronouns(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -447,12 +450,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `stats` field (optional)
     pub fn stats(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `stats` field to an Option value (optional)
     pub fn maybe_stats(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -465,14 +468,14 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            bluesky: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            links: self.__unsafe_private_named.3,
-            location: self.__unsafe_private_named.4,
-            pinned_repositories: self.__unsafe_private_named.5,
-            pronouns: self.__unsafe_private_named.6,
-            stats: self.__unsafe_private_named.7,
+            avatar: self._fields.0,
+            bluesky: self._fields.1.unwrap(),
+            description: self._fields.2,
+            links: self._fields.3,
+            location: self._fields.4,
+            pinned_repositories: self._fields.5,
+            pronouns: self._fields.6,
+            stats: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -485,14 +488,14 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            bluesky: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            links: self.__unsafe_private_named.3,
-            location: self.__unsafe_private_named.4,
-            pinned_repositories: self.__unsafe_private_named.5,
-            pronouns: self.__unsafe_private_named.6,
-            stats: self.__unsafe_private_named.7,
+            avatar: self._fields.0,
+            bluesky: self._fields.1.unwrap(),
+            description: self._fields.2,
+            links: self._fields.3,
+            location: self._fields.4,
+            pinned_repositories: self._fields.5,
+            pronouns: self._fields.6,
+            stats: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/feed/reaction.rs b/crates/jacquard-api/src/sh_tangled/feed/reaction.rs
index fd9a0d83..daf23b20 100644
--- a/crates/jacquard-api/src/sh_tangled/feed/reaction.rs
+++ b/crates/jacquard-api/src/sh_tangled/feed/reaction.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -109,49 +112,49 @@ pub mod reaction_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type CreatedAt;
+        type Subject;
         type Reaction;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type CreatedAt = Unset;
+        type Subject = Unset;
         type Reaction = Unset;
     }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
-        type Reaction = S::Reaction;
-    }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+        type Reaction = S::Reaction;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
         type Reaction = S::Reaction;
     }
     ///State transition - sets the `reaction` field to Set
     pub struct SetReaction<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetReaction<S> {}
     impl<S: State> State for SetReaction<S> {
-        type Subject = S::Subject;
         type CreatedAt = S::CreatedAt;
+        type Subject = S::Subject;
         type Reaction = Set<members::reaction>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
         ///Marker type for the `reaction` field
         pub struct reaction(());
     }
@@ -159,9 +162,9 @@ pub mod reaction_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReactionBuilder<'a, S: reaction_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Reaction<'a> {
@@ -175,9 +178,9 @@ impl<'a> ReactionBuilder<'a, reaction_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -192,11 +195,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReactionBuilder<'a, reaction_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -211,11 +214,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReactionBuilder<'a, reaction_state::SetReaction<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -230,11 +233,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ReactionBuilder<'a, reaction_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -242,16 +245,16 @@ where
 impl<'a, S> ReactionBuilder<'a, S>
 where
     S: reaction_state::State,
-    S::Subject: reaction_state::IsSet,
     S::CreatedAt: reaction_state::IsSet,
+    S::Subject: reaction_state::IsSet,
     S::Reaction: reaction_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Reaction<'a> {
         Reaction {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            reaction: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            reaction: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -264,9 +267,9 @@ where
         >,
     ) -> Reaction<'a> {
         Reaction {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            reaction: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            reaction: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/feed/star.rs b/crates/jacquard-api/src/sh_tangled/feed/star.rs
index 19955ba9..57608044 100644
--- a/crates/jacquard-api/src/sh_tangled/feed/star.rs
+++ b/crates/jacquard-api/src/sh_tangled/feed/star.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -143,9 +146,9 @@ pub mod star_state {
 
 /// Builder for constructing an instance of this type
 pub struct StarBuilder<'a, S: star_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Star<'a> {
@@ -159,9 +162,9 @@ impl<'a> StarBuilder<'a, star_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StarBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -176,11 +179,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StarBuilder<'a, star_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StarBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -195,11 +198,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> StarBuilder<'a, star_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StarBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,8 +216,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Star<'a> {
         Star {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -227,8 +230,8 @@ where
         >,
     ) -> Star<'a> {
         Star {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/git/ref_update.rs b/crates/jacquard-api/src/sh_tangled/git/ref_update.rs
index 398cca86..ef119728 100644
--- a/crates/jacquard-api/src/sh_tangled/git/ref_update.rs
+++ b/crates/jacquard-api/src/sh_tangled/git/ref_update.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -602,9 +605,9 @@ pub struct IndividualEmailCommitCountBuilder<
     'a,
     S: individual_email_commit_count_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> IndividualEmailCommitCount<'a> {
@@ -623,9 +626,9 @@ impl<
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IndividualEmailCommitCountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -643,11 +646,11 @@ where
         'a,
         individual_email_commit_count_state::SetCount<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         IndividualEmailCommitCountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -665,11 +668,11 @@ where
         'a,
         individual_email_commit_count_state::SetEmail<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         IndividualEmailCommitCountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -683,8 +686,8 @@ where
     /// Build the final struct
     pub fn build(self) -> IndividualEmailCommitCount<'a> {
         IndividualEmailCommitCount {
-            count: self.__unsafe_private_named.0.unwrap(),
-            email: self.__unsafe_private_named.1.unwrap(),
+            count: self._fields.0.unwrap(),
+            email: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -697,8 +700,8 @@ where
         >,
     ) -> IndividualEmailCommitCount<'a> {
         IndividualEmailCommitCount {
-            count: self.__unsafe_private_named.0.unwrap(),
-            email: self.__unsafe_private_named.1.unwrap(),
+            count: self._fields.0.unwrap(),
+            email: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -750,9 +753,9 @@ pub mod individual_language_size_state {
 
 /// Builder for constructing an instance of this type
 pub struct IndividualLanguageSizeBuilder<'a, S: individual_language_size_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> IndividualLanguageSize<'a> {
@@ -769,9 +772,9 @@ impl<'a> IndividualLanguageSizeBuilder<'a, individual_language_size_state::Empty
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IndividualLanguageSizeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -786,11 +789,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> IndividualLanguageSizeBuilder<'a, individual_language_size_state::SetLang<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         IndividualLanguageSizeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -805,11 +808,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> IndividualLanguageSizeBuilder<'a, individual_language_size_state::SetSize<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         IndividualLanguageSizeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -823,8 +826,8 @@ where
     /// Build the final struct
     pub fn build(self) -> IndividualLanguageSize<'a> {
         IndividualLanguageSize {
-            lang: self.__unsafe_private_named.0.unwrap(),
-            size: self.__unsafe_private_named.1.unwrap(),
+            lang: self._fields.0.unwrap(),
+            size: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -837,8 +840,8 @@ where
         >,
     ) -> IndividualLanguageSize<'a> {
         IndividualLanguageSize {
-            lang: self.__unsafe_private_named.0.unwrap(),
-            size: self.__unsafe_private_named.1.unwrap(),
+            lang: self._fields.0.unwrap(),
+            size: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -854,134 +857,134 @@ pub mod ref_update_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type RepoName;
+        type NewSha;
         type CommitterDid;
+        type RepoDid;
+        type RepoName;
         type Meta;
         type Ref;
-        type RepoDid;
         type OldSha;
-        type NewSha;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type RepoName = Unset;
+        type NewSha = Unset;
         type CommitterDid = Unset;
+        type RepoDid = Unset;
+        type RepoName = Unset;
         type Meta = Unset;
         type Ref = Unset;
-        type RepoDid = Unset;
         type OldSha = Unset;
-        type NewSha = Unset;
     }
-    ///State transition - sets the `repo_name` field to Set
-    pub struct SetRepoName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepoName<S> {}
-    impl<S: State> State for SetRepoName<S> {
-        type RepoName = Set<members::repo_name>;
+    ///State transition - sets the `new_sha` field to Set
+    pub struct SetNewSha<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetNewSha<S> {}
+    impl<S: State> State for SetNewSha<S> {
+        type NewSha = Set<members::new_sha>;
         type CommitterDid = S::CommitterDid;
+        type RepoDid = S::RepoDid;
+        type RepoName = S::RepoName;
         type Meta = S::Meta;
         type Ref = S::Ref;
-        type RepoDid = S::RepoDid;
         type OldSha = S::OldSha;
-        type NewSha = S::NewSha;
     }
     ///State transition - sets the `committer_did` field to Set
     pub struct SetCommitterDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCommitterDid<S> {}
     impl<S: State> State for SetCommitterDid<S> {
-        type RepoName = S::RepoName;
+        type NewSha = S::NewSha;
         type CommitterDid = Set<members::committer_did>;
+        type RepoDid = S::RepoDid;
+        type RepoName = S::RepoName;
+        type Meta = S::Meta;
+        type Ref = S::Ref;
+        type OldSha = S::OldSha;
+    }
+    ///State transition - sets the `repo_did` field to Set
+    pub struct SetRepoDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepoDid<S> {}
+    impl<S: State> State for SetRepoDid<S> {
+        type NewSha = S::NewSha;
+        type CommitterDid = S::CommitterDid;
+        type RepoDid = Set<members::repo_did>;
+        type RepoName = S::RepoName;
         type Meta = S::Meta;
         type Ref = S::Ref;
-        type RepoDid = S::RepoDid;
         type OldSha = S::OldSha;
+    }
+    ///State transition - sets the `repo_name` field to Set
+    pub struct SetRepoName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepoName<S> {}
+    impl<S: State> State for SetRepoName<S> {
         type NewSha = S::NewSha;
+        type CommitterDid = S::CommitterDid;
+        type RepoDid = S::RepoDid;
+        type RepoName = Set<members::repo_name>;
+        type Meta = S::Meta;
+        type Ref = S::Ref;
+        type OldSha = S::OldSha;
     }
     ///State transition - sets the `meta` field to Set
     pub struct SetMeta<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMeta<S> {}
     impl<S: State> State for SetMeta<S> {
-        type RepoName = S::RepoName;
+        type NewSha = S::NewSha;
         type CommitterDid = S::CommitterDid;
+        type RepoDid = S::RepoDid;
+        type RepoName = S::RepoName;
         type Meta = Set<members::meta>;
         type Ref = S::Ref;
-        type RepoDid = S::RepoDid;
         type OldSha = S::OldSha;
-        type NewSha = S::NewSha;
     }
     ///State transition - sets the `ref` field to Set
     pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRef<S> {}
     impl<S: State> State for SetRef<S> {
-        type RepoName = S::RepoName;
+        type NewSha = S::NewSha;
         type CommitterDid = S::CommitterDid;
-        type Meta = S::Meta;
-        type Ref = Set<members::r#ref>;
         type RepoDid = S::RepoDid;
-        type OldSha = S::OldSha;
-        type NewSha = S::NewSha;
-    }
-    ///State transition - sets the `repo_did` field to Set
-    pub struct SetRepoDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepoDid<S> {}
-    impl<S: State> State for SetRepoDid<S> {
         type RepoName = S::RepoName;
-        type CommitterDid = S::CommitterDid;
         type Meta = S::Meta;
-        type Ref = S::Ref;
-        type RepoDid = Set<members::repo_did>;
+        type Ref = Set<members::r#ref>;
         type OldSha = S::OldSha;
-        type NewSha = S::NewSha;
     }
     ///State transition - sets the `old_sha` field to Set
     pub struct SetOldSha<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetOldSha<S> {}
     impl<S: State> State for SetOldSha<S> {
-        type RepoName = S::RepoName;
+        type NewSha = S::NewSha;
         type CommitterDid = S::CommitterDid;
-        type Meta = S::Meta;
-        type Ref = S::Ref;
         type RepoDid = S::RepoDid;
-        type OldSha = Set<members::old_sha>;
-        type NewSha = S::NewSha;
-    }
-    ///State transition - sets the `new_sha` field to Set
-    pub struct SetNewSha<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetNewSha<S> {}
-    impl<S: State> State for SetNewSha<S> {
         type RepoName = S::RepoName;
-        type CommitterDid = S::CommitterDid;
         type Meta = S::Meta;
         type Ref = S::Ref;
-        type RepoDid = S::RepoDid;
-        type OldSha = S::OldSha;
-        type NewSha = Set<members::new_sha>;
+        type OldSha = Set<members::old_sha>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `repo_name` field
-        pub struct repo_name(());
+        ///Marker type for the `new_sha` field
+        pub struct new_sha(());
         ///Marker type for the `committer_did` field
         pub struct committer_did(());
+        ///Marker type for the `repo_did` field
+        pub struct repo_did(());
+        ///Marker type for the `repo_name` field
+        pub struct repo_name(());
         ///Marker type for the `meta` field
         pub struct meta(());
         ///Marker type for the `ref` field
         pub struct r#ref(());
-        ///Marker type for the `repo_did` field
-        pub struct repo_did(());
         ///Marker type for the `old_sha` field
         pub struct old_sha(());
-        ///Marker type for the `new_sha` field
-        pub struct new_sha(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RefUpdateBuilder<'a, S: ref_update_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Did<'a>>,
         Option<ref_update::Meta<'a>>,
         Option<CowStr<'a>>,
@@ -990,7 +993,7 @@ pub struct RefUpdateBuilder<'a, S: ref_update_state::State> {
         Option<Did<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RefUpdate<'a> {
@@ -1004,9 +1007,9 @@ impl<'a> RefUpdateBuilder<'a, ref_update_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RefUpdateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1021,11 +1024,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> RefUpdateBuilder<'a, ref_update_state::SetCommitterDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RefUpdateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1040,11 +1043,11 @@ where
         mut self,
         value: impl Into<ref_update::Meta<'a>>,
     ) -> RefUpdateBuilder<'a, ref_update_state::SetMeta<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RefUpdateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1059,11 +1062,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RefUpdateBuilder<'a, ref_update_state::SetNewSha<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RefUpdateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1078,11 +1081,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RefUpdateBuilder<'a, ref_update_state::SetOldSha<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RefUpdateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1097,11 +1100,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RefUpdateBuilder<'a, ref_update_state::SetRef<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RefUpdateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1116,11 +1119,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> RefUpdateBuilder<'a, ref_update_state::SetRepoDid<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         RefUpdateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1135,11 +1138,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RefUpdateBuilder<'a, ref_update_state::SetRepoName<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         RefUpdateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1147,24 +1150,24 @@ where
 impl<'a, S> RefUpdateBuilder<'a, S>
 where
     S: ref_update_state::State,
-    S::RepoName: ref_update_state::IsSet,
+    S::NewSha: ref_update_state::IsSet,
     S::CommitterDid: ref_update_state::IsSet,
+    S::RepoDid: ref_update_state::IsSet,
+    S::RepoName: ref_update_state::IsSet,
     S::Meta: ref_update_state::IsSet,
     S::Ref: ref_update_state::IsSet,
-    S::RepoDid: ref_update_state::IsSet,
     S::OldSha: ref_update_state::IsSet,
-    S::NewSha: ref_update_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RefUpdate<'a> {
         RefUpdate {
-            committer_did: self.__unsafe_private_named.0.unwrap(),
-            meta: self.__unsafe_private_named.1.unwrap(),
-            new_sha: self.__unsafe_private_named.2.unwrap(),
-            old_sha: self.__unsafe_private_named.3.unwrap(),
-            r#ref: self.__unsafe_private_named.4.unwrap(),
-            repo_did: self.__unsafe_private_named.5.unwrap(),
-            repo_name: self.__unsafe_private_named.6.unwrap(),
+            committer_did: self._fields.0.unwrap(),
+            meta: self._fields.1.unwrap(),
+            new_sha: self._fields.2.unwrap(),
+            old_sha: self._fields.3.unwrap(),
+            r#ref: self._fields.4.unwrap(),
+            repo_did: self._fields.5.unwrap(),
+            repo_name: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1177,13 +1180,13 @@ where
         >,
     ) -> RefUpdate<'a> {
         RefUpdate {
-            committer_did: self.__unsafe_private_named.0.unwrap(),
-            meta: self.__unsafe_private_named.1.unwrap(),
-            new_sha: self.__unsafe_private_named.2.unwrap(),
-            old_sha: self.__unsafe_private_named.3.unwrap(),
-            r#ref: self.__unsafe_private_named.4.unwrap(),
-            repo_did: self.__unsafe_private_named.5.unwrap(),
-            repo_name: self.__unsafe_private_named.6.unwrap(),
+            committer_did: self._fields.0.unwrap(),
+            meta: self._fields.1.unwrap(),
+            new_sha: self._fields.2.unwrap(),
+            old_sha: self._fields.3.unwrap(),
+            r#ref: self._fields.4.unwrap(),
+            repo_did: self._fields.5.unwrap(),
+            repo_name: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1203,49 +1206,49 @@ pub mod meta_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CommitCount;
         type IsDefaultRef;
+        type CommitCount;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CommitCount = Unset;
         type IsDefaultRef = Unset;
-    }
-    ///State transition - sets the `commit_count` field to Set
-    pub struct SetCommitCount<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCommitCount<S> {}
-    impl<S: State> State for SetCommitCount<S> {
-        type CommitCount = Set<members::commit_count>;
-        type IsDefaultRef = S::IsDefaultRef;
+        type CommitCount = Unset;
     }
     ///State transition - sets the `is_default_ref` field to Set
     pub struct SetIsDefaultRef<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIsDefaultRef<S> {}
     impl<S: State> State for SetIsDefaultRef<S> {
-        type CommitCount = S::CommitCount;
         type IsDefaultRef = Set<members::is_default_ref>;
+        type CommitCount = S::CommitCount;
+    }
+    ///State transition - sets the `commit_count` field to Set
+    pub struct SetCommitCount<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCommitCount<S> {}
+    impl<S: State> State for SetCommitCount<S> {
+        type IsDefaultRef = S::IsDefaultRef;
+        type CommitCount = Set<members::commit_count>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `commit_count` field
-        pub struct commit_count(());
         ///Marker type for the `is_default_ref` field
         pub struct is_default_ref(());
+        ///Marker type for the `commit_count` field
+        pub struct commit_count(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MetaBuilder<'a, S: meta_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ref_update::CommitCountBreakdown<'a>>,
         Option<bool>,
         Option<ref_update::LangBreakdown<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Meta<'a> {
@@ -1259,9 +1262,9 @@ impl<'a> MetaBuilder<'a, meta_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MetaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1276,11 +1279,11 @@ where
         mut self,
         value: impl Into<ref_update::CommitCountBreakdown<'a>>,
     ) -> MetaBuilder<'a, meta_state::SetCommitCount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MetaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1295,11 +1298,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> MetaBuilder<'a, meta_state::SetIsDefaultRef<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MetaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1310,7 +1313,7 @@ impl<'a, S: meta_state::State> MetaBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ref_update::LangBreakdown<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `langBreakdown` field to an Option value (optional)
@@ -1318,7 +1321,7 @@ impl<'a, S: meta_state::State> MetaBuilder<'a, S> {
         mut self,
         value: Option<ref_update::LangBreakdown<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1326,15 +1329,15 @@ impl<'a, S: meta_state::State> MetaBuilder<'a, S> {
 impl<'a, S> MetaBuilder<'a, S>
 where
     S: meta_state::State,
-    S::CommitCount: meta_state::IsSet,
     S::IsDefaultRef: meta_state::IsSet,
+    S::CommitCount: meta_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Meta<'a> {
         Meta {
-            commit_count: self.__unsafe_private_named.0.unwrap(),
-            is_default_ref: self.__unsafe_private_named.1.unwrap(),
-            lang_breakdown: self.__unsafe_private_named.2,
+            commit_count: self._fields.0.unwrap(),
+            is_default_ref: self._fields.1.unwrap(),
+            lang_breakdown: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -1347,9 +1350,9 @@ where
         >,
     ) -> Meta<'a> {
         Meta {
-            commit_count: self.__unsafe_private_named.0.unwrap(),
-            is_default_ref: self.__unsafe_private_named.1.unwrap(),
-            lang_breakdown: self.__unsafe_private_named.2,
+            commit_count: self._fields.0.unwrap(),
+            is_default_ref: self._fields.1.unwrap(),
+            lang_breakdown: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/git/temp.rs b/crates/jacquard-api/src/sh_tangled/git/temp.rs
index 66e98542..80343bfd 100644
--- a/crates/jacquard-api/src/sh_tangled/git/temp.rs
+++ b/crates/jacquard-api/src/sh_tangled/git/temp.rs
@@ -20,7 +20,11 @@ pub mod list_commits;
 pub mod list_languages;
 pub mod list_tags;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -237,81 +241,81 @@ pub mod blob_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Mode;
-        type Size;
-        type LastCommit;
         type Name;
+        type LastCommit;
+        type Size;
+        type Mode;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Mode = Unset;
-        type Size = Unset;
-        type LastCommit = Unset;
         type Name = Unset;
+        type LastCommit = Unset;
+        type Size = Unset;
+        type Mode = Unset;
     }
-    ///State transition - sets the `mode` field to Set
-    pub struct SetMode<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMode<S> {}
-    impl<S: State> State for SetMode<S> {
-        type Mode = Set<members::mode>;
-        type Size = S::Size;
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Name = Set<members::name>;
         type LastCommit = S::LastCommit;
-        type Name = S::Name;
-    }
-    ///State transition - sets the `size` field to Set
-    pub struct SetSize<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSize<S> {}
-    impl<S: State> State for SetSize<S> {
+        type Size = S::Size;
         type Mode = S::Mode;
-        type Size = Set<members::size>;
-        type LastCommit = S::LastCommit;
-        type Name = S::Name;
     }
     ///State transition - sets the `last_commit` field to Set
     pub struct SetLastCommit<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLastCommit<S> {}
     impl<S: State> State for SetLastCommit<S> {
-        type Mode = S::Mode;
-        type Size = S::Size;
-        type LastCommit = Set<members::last_commit>;
         type Name = S::Name;
+        type LastCommit = Set<members::last_commit>;
+        type Size = S::Size;
+        type Mode = S::Mode;
     }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
+    ///State transition - sets the `size` field to Set
+    pub struct SetSize<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSize<S> {}
+    impl<S: State> State for SetSize<S> {
+        type Name = S::Name;
+        type LastCommit = S::LastCommit;
+        type Size = Set<members::size>;
         type Mode = S::Mode;
-        type Size = S::Size;
+    }
+    ///State transition - sets the `mode` field to Set
+    pub struct SetMode<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMode<S> {}
+    impl<S: State> State for SetMode<S> {
+        type Name = S::Name;
         type LastCommit = S::LastCommit;
-        type Name = Set<members::name>;
+        type Size = S::Size;
+        type Mode = Set<members::mode>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `mode` field
-        pub struct mode(());
-        ///Marker type for the `size` field
-        pub struct size(());
-        ///Marker type for the `last_commit` field
-        pub struct last_commit(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `last_commit` field
+        pub struct last_commit(());
+        ///Marker type for the `size` field
+        pub struct size(());
+        ///Marker type for the `mode` field
+        pub struct mode(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BlobBuilder<'a, S: blob_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<temp::Commit<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<temp::Submodule<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Blob<'a> {
@@ -325,9 +329,9 @@ impl<'a> BlobBuilder<'a, blob_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -342,11 +346,11 @@ where
         mut self,
         value: impl Into<temp::Commit<'a>>,
     ) -> BlobBuilder<'a, blob_state::SetLastCommit<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -361,11 +365,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BlobBuilder<'a, blob_state::SetMode<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -380,11 +384,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BlobBuilder<'a, blob_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -399,11 +403,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> BlobBuilder<'a, blob_state::SetSize<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -411,12 +415,12 @@ where
 impl<'a, S: blob_state::State> BlobBuilder<'a, S> {
     /// Set the `submodule` field (optional)
     pub fn submodule(mut self, value: impl Into<Option<temp::Submodule<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `submodule` field to an Option value (optional)
     pub fn maybe_submodule(mut self, value: Option<temp::Submodule<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -424,19 +428,19 @@ impl<'a, S: blob_state::State> BlobBuilder<'a, S> {
 impl<'a, S> BlobBuilder<'a, S>
 where
     S: blob_state::State,
-    S::Mode: blob_state::IsSet,
-    S::Size: blob_state::IsSet,
-    S::LastCommit: blob_state::IsSet,
     S::Name: blob_state::IsSet,
+    S::LastCommit: blob_state::IsSet,
+    S::Size: blob_state::IsSet,
+    S::Mode: blob_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Blob<'a> {
         Blob {
-            last_commit: self.__unsafe_private_named.0.unwrap(),
-            mode: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            size: self.__unsafe_private_named.3.unwrap(),
-            submodule: self.__unsafe_private_named.4,
+            last_commit: self._fields.0.unwrap(),
+            mode: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            size: self._fields.3.unwrap(),
+            submodule: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -446,11 +450,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Blob<'a> {
         Blob {
-            last_commit: self.__unsafe_private_named.0.unwrap(),
-            mode: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            size: self.__unsafe_private_named.3.unwrap(),
-            submodule: self.__unsafe_private_named.4,
+            last_commit: self._fields.0.unwrap(),
+            mode: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            size: self._fields.3.unwrap(),
+            submodule: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
@@ -739,45 +743,45 @@ pub mod branch_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Commit;
         type Name;
+        type Commit;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Commit = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `commit` field to Set
-    pub struct SetCommit<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCommit<S> {}
-    impl<S: State> State for SetCommit<S> {
-        type Commit = Set<members::commit>;
-        type Name = S::Name;
+        type Commit = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Commit = S::Commit;
         type Name = Set<members::name>;
+        type Commit = S::Commit;
+    }
+    ///State transition - sets the `commit` field to Set
+    pub struct SetCommit<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCommit<S> {}
+    impl<S: State> State for SetCommit<S> {
+        type Name = S::Name;
+        type Commit = Set<members::commit>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `commit` field
-        pub struct commit(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `commit` field
+        pub struct commit(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BranchBuilder<'a, S: branch_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<temp::Commit<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<temp::Commit<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Branch<'a> {
@@ -791,9 +795,9 @@ impl<'a> BranchBuilder<'a, branch_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -808,11 +812,11 @@ where
         mut self,
         value: impl Into<temp::Commit<'a>>,
     ) -> BranchBuilder<'a, branch_state::SetCommit<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -827,11 +831,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BranchBuilder<'a, branch_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -839,14 +843,14 @@ where
 impl<'a, S> BranchBuilder<'a, S>
 where
     S: branch_state::State,
-    S::Commit: branch_state::IsSet,
     S::Name: branch_state::IsSet,
+    S::Commit: branch_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Branch<'a> {
         Branch {
-            commit: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
+            commit: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -856,8 +860,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Branch<'a> {
         Branch {
-            commit: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
+            commit: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -873,99 +877,99 @@ pub mod commit_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Hash;
+        type Message;
         type Tree;
-        type Committer;
         type Author;
-        type Message;
-        type Hash;
+        type Committer;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Hash = Unset;
+        type Message = Unset;
         type Tree = Unset;
-        type Committer = Unset;
         type Author = Unset;
-        type Message = Unset;
-        type Hash = Unset;
+        type Committer = Unset;
+    }
+    ///State transition - sets the `hash` field to Set
+    pub struct SetHash<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHash<S> {}
+    impl<S: State> State for SetHash<S> {
+        type Hash = Set<members::hash>;
+        type Message = S::Message;
+        type Tree = S::Tree;
+        type Author = S::Author;
+        type Committer = S::Committer;
+    }
+    ///State transition - sets the `message` field to Set
+    pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMessage<S> {}
+    impl<S: State> State for SetMessage<S> {
+        type Hash = S::Hash;
+        type Message = Set<members::message>;
+        type Tree = S::Tree;
+        type Author = S::Author;
+        type Committer = S::Committer;
     }
     ///State transition - sets the `tree` field to Set
     pub struct SetTree<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTree<S> {}
     impl<S: State> State for SetTree<S> {
-        type Tree = Set<members::tree>;
-        type Committer = S::Committer;
-        type Author = S::Author;
-        type Message = S::Message;
         type Hash = S::Hash;
-    }
-    ///State transition - sets the `committer` field to Set
-    pub struct SetCommitter<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCommitter<S> {}
-    impl<S: State> State for SetCommitter<S> {
-        type Tree = S::Tree;
-        type Committer = Set<members::committer>;
-        type Author = S::Author;
         type Message = S::Message;
-        type Hash = S::Hash;
+        type Tree = Set<members::tree>;
+        type Author = S::Author;
+        type Committer = S::Committer;
     }
     ///State transition - sets the `author` field to Set
     pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthor<S> {}
     impl<S: State> State for SetAuthor<S> {
-        type Tree = S::Tree;
-        type Committer = S::Committer;
-        type Author = Set<members::author>;
-        type Message = S::Message;
         type Hash = S::Hash;
-    }
-    ///State transition - sets the `message` field to Set
-    pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMessage<S> {}
-    impl<S: State> State for SetMessage<S> {
+        type Message = S::Message;
         type Tree = S::Tree;
+        type Author = Set<members::author>;
         type Committer = S::Committer;
-        type Author = S::Author;
-        type Message = Set<members::message>;
-        type Hash = S::Hash;
     }
-    ///State transition - sets the `hash` field to Set
-    pub struct SetHash<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHash<S> {}
-    impl<S: State> State for SetHash<S> {
+    ///State transition - sets the `committer` field to Set
+    pub struct SetCommitter<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCommitter<S> {}
+    impl<S: State> State for SetCommitter<S> {
+        type Hash = S::Hash;
+        type Message = S::Message;
         type Tree = S::Tree;
-        type Committer = S::Committer;
         type Author = S::Author;
-        type Message = S::Message;
-        type Hash = Set<members::hash>;
+        type Committer = Set<members::committer>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `hash` field
+        pub struct hash(());
+        ///Marker type for the `message` field
+        pub struct message(());
         ///Marker type for the `tree` field
         pub struct tree(());
-        ///Marker type for the `committer` field
-        pub struct committer(());
         ///Marker type for the `author` field
         pub struct author(());
-        ///Marker type for the `message` field
-        pub struct message(());
-        ///Marker type for the `hash` field
-        pub struct hash(());
+        ///Marker type for the `committer` field
+        pub struct committer(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CommitBuilder<'a, S: commit_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<temp::Signature<'a>>,
         Option<temp::Signature<'a>>,
         Option<temp::Hash<'a>>,
         Option<CowStr<'a>>,
         Option<temp::Hash<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Commit<'a> {
@@ -979,9 +983,9 @@ impl<'a> CommitBuilder<'a, commit_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -996,11 +1000,11 @@ where
         mut self,
         value: impl Into<temp::Signature<'a>>,
     ) -> CommitBuilder<'a, commit_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1015,11 +1019,11 @@ where
         mut self,
         value: impl Into<temp::Signature<'a>>,
     ) -> CommitBuilder<'a, commit_state::SetCommitter<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1034,11 +1038,11 @@ where
         mut self,
         value: impl Into<temp::Hash<'a>>,
     ) -> CommitBuilder<'a, commit_state::SetHash<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1053,11 +1057,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommitBuilder<'a, commit_state::SetMessage<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1072,11 +1076,11 @@ where
         mut self,
         value: impl Into<temp::Hash<'a>>,
     ) -> CommitBuilder<'a, commit_state::SetTree<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1084,20 +1088,20 @@ where
 impl<'a, S> CommitBuilder<'a, S>
 where
     S: commit_state::State,
+    S::Hash: commit_state::IsSet,
+    S::Message: commit_state::IsSet,
     S::Tree: commit_state::IsSet,
-    S::Committer: commit_state::IsSet,
     S::Author: commit_state::IsSet,
-    S::Message: commit_state::IsSet,
-    S::Hash: commit_state::IsSet,
+    S::Committer: commit_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Commit<'a> {
         Commit {
-            author: self.__unsafe_private_named.0.unwrap(),
-            committer: self.__unsafe_private_named.1.unwrap(),
-            hash: self.__unsafe_private_named.2.unwrap(),
-            message: self.__unsafe_private_named.3.unwrap(),
-            tree: self.__unsafe_private_named.4.unwrap(),
+            author: self._fields.0.unwrap(),
+            committer: self._fields.1.unwrap(),
+            hash: self._fields.2.unwrap(),
+            message: self._fields.3.unwrap(),
+            tree: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1107,11 +1111,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Commit<'a> {
         Commit {
-            author: self.__unsafe_private_named.0.unwrap(),
-            committer: self.__unsafe_private_named.1.unwrap(),
-            hash: self.__unsafe_private_named.2.unwrap(),
-            message: self.__unsafe_private_named.3.unwrap(),
-            tree: self.__unsafe_private_named.4.unwrap(),
+            author: self._fields.0.unwrap(),
+            committer: self._fields.1.unwrap(),
+            hash: self._fields.2.unwrap(),
+            message: self._fields.3.unwrap(),
+            tree: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1127,59 +1131,59 @@ pub mod signature_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type When;
-        type Email;
         type Name;
+        type Email;
+        type When;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type When = Unset;
-        type Email = Unset;
         type Name = Unset;
+        type Email = Unset;
+        type When = Unset;
     }
-    ///State transition - sets the `when` field to Set
-    pub struct SetWhen<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetWhen<S> {}
-    impl<S: State> State for SetWhen<S> {
-        type When = Set<members::when>;
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Name = Set<members::name>;
         type Email = S::Email;
-        type Name = S::Name;
+        type When = S::When;
     }
     ///State transition - sets the `email` field to Set
     pub struct SetEmail<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEmail<S> {}
     impl<S: State> State for SetEmail<S> {
-        type When = S::When;
-        type Email = Set<members::email>;
         type Name = S::Name;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
+        type Email = Set<members::email>;
         type When = S::When;
+    }
+    ///State transition - sets the `when` field to Set
+    pub struct SetWhen<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetWhen<S> {}
+    impl<S: State> State for SetWhen<S> {
+        type Name = S::Name;
         type Email = S::Email;
-        type Name = Set<members::name>;
+        type When = Set<members::when>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `when` field
-        pub struct when(());
-        ///Marker type for the `email` field
-        pub struct email(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `email` field
+        pub struct email(());
+        ///Marker type for the `when` field
+        pub struct when(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SignatureBuilder<'a, S: signature_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Signature<'a> {
@@ -1193,9 +1197,9 @@ impl<'a> SignatureBuilder<'a, signature_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1210,11 +1214,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureBuilder<'a, signature_state::SetEmail<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1229,11 +1233,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureBuilder<'a, signature_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1248,11 +1252,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SignatureBuilder<'a, signature_state::SetWhen<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1260,16 +1264,16 @@ where
 impl<'a, S> SignatureBuilder<'a, S>
 where
     S: signature_state::State,
-    S::When: signature_state::IsSet,
-    S::Email: signature_state::IsSet,
     S::Name: signature_state::IsSet,
+    S::Email: signature_state::IsSet,
+    S::When: signature_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Signature<'a> {
         Signature {
-            email: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            when: self.__unsafe_private_named.2.unwrap(),
+            email: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            when: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1279,9 +1283,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Signature<'a> {
         Signature {
-            email: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            when: self.__unsafe_private_named.2.unwrap(),
+            email: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            when: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1298,63 +1302,63 @@ pub mod tag_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Name;
-        type Tagger;
         type Target;
+        type Tagger;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Name = Unset;
-        type Tagger = Unset;
         type Target = Unset;
+        type Tagger = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
         type Name = Set<members::name>;
-        type Tagger = S::Tagger;
-        type Target = S::Target;
-    }
-    ///State transition - sets the `tagger` field to Set
-    pub struct SetTagger<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTagger<S> {}
-    impl<S: State> State for SetTagger<S> {
-        type Name = S::Name;
-        type Tagger = Set<members::tagger>;
         type Target = S::Target;
+        type Tagger = S::Tagger;
     }
     ///State transition - sets the `target` field to Set
     pub struct SetTarget<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTarget<S> {}
     impl<S: State> State for SetTarget<S> {
         type Name = S::Name;
-        type Tagger = S::Tagger;
         type Target = Set<members::target>;
+        type Tagger = S::Tagger;
+    }
+    ///State transition - sets the `tagger` field to Set
+    pub struct SetTagger<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTagger<S> {}
+    impl<S: State> State for SetTagger<S> {
+        type Name = S::Name;
+        type Target = S::Target;
+        type Tagger = Set<members::tagger>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `tagger` field
-        pub struct tagger(());
         ///Marker type for the `target` field
         pub struct target(());
+        ///Marker type for the `tagger` field
+        pub struct tagger(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TagBuilder<'a, S: tag_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<temp::Signature<'a>>,
         Option<Data<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Tag<'a> {
@@ -1368,9 +1372,9 @@ impl<'a> TagBuilder<'a, tag_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1378,12 +1382,12 @@ impl<'a> TagBuilder<'a, tag_state::Empty> {
 impl<'a, S: tag_state::State> TagBuilder<'a, S> {
     /// Set the `message` field (optional)
     pub fn message(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `message` field to an Option value (optional)
     pub fn maybe_message(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1398,11 +1402,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TagBuilder<'a, tag_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1417,11 +1421,11 @@ where
         mut self,
         value: impl Into<temp::Signature<'a>>,
     ) -> TagBuilder<'a, tag_state::SetTagger<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1436,11 +1440,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> TagBuilder<'a, tag_state::SetTarget<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1449,16 +1453,16 @@ impl<'a, S> TagBuilder<'a, S>
 where
     S: tag_state::State,
     S::Name: tag_state::IsSet,
-    S::Tagger: tag_state::IsSet,
     S::Target: tag_state::IsSet,
+    S::Tagger: tag_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Tag<'a> {
         Tag {
-            message: self.__unsafe_private_named.0,
-            name: self.__unsafe_private_named.1.unwrap(),
-            tagger: self.__unsafe_private_named.2.unwrap(),
-            target: self.__unsafe_private_named.3.unwrap(),
+            message: self._fields.0,
+            name: self._fields.1.unwrap(),
+            tagger: self._fields.2.unwrap(),
+            target: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1468,10 +1472,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Tag<'a> {
         Tag {
-            message: self.__unsafe_private_named.0,
-            name: self.__unsafe_private_named.1.unwrap(),
-            tagger: self.__unsafe_private_named.2.unwrap(),
-            target: self.__unsafe_private_named.3.unwrap(),
+            message: self._fields.0,
+            name: self._fields.1.unwrap(),
+            tagger: self._fields.2.unwrap(),
+            target: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/git/temp/analyze_merge.rs b/crates/jacquard-api/src/sh_tangled/git/temp/analyze_merge.rs
index 0c223438..c6e741df 100644
--- a/crates/jacquard-api/src/sh_tangled/git/temp/analyze_merge.rs
+++ b/crates/jacquard-api/src/sh_tangled/git/temp/analyze_merge.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -260,9 +263,9 @@ pub mod analyze_merge_state {
 
 /// Builder for constructing an instance of this type
 pub struct AnalyzeMergeBuilder<'a, S: analyze_merge_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AnalyzeMerge<'a> {
@@ -276,9 +279,9 @@ impl<'a> AnalyzeMergeBuilder<'a, analyze_merge_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AnalyzeMergeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -293,11 +296,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AnalyzeMergeBuilder<'a, analyze_merge_state::SetBranch<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AnalyzeMergeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -312,11 +315,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AnalyzeMergeBuilder<'a, analyze_merge_state::SetPatch<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AnalyzeMergeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -331,11 +334,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> AnalyzeMergeBuilder<'a, analyze_merge_state::SetRepo<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AnalyzeMergeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -350,9 +353,9 @@ where
     /// Build the final struct
     pub fn build(self) -> AnalyzeMerge<'a> {
         AnalyzeMerge {
-            branch: self.__unsafe_private_named.0.unwrap(),
-            patch: self.__unsafe_private_named.1.unwrap(),
-            repo: self.__unsafe_private_named.2.unwrap(),
+            branch: self._fields.0.unwrap(),
+            patch: self._fields.1.unwrap(),
+            repo: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/git/temp/get_archive.rs b/crates/jacquard-api/src/sh_tangled/git/temp/get_archive.rs
index 6b94b913..16ddca66 100644
--- a/crates/jacquard-api/src/sh_tangled/git/temp/get_archive.rs
+++ b/crates/jacquard-api/src/sh_tangled/git/temp/get_archive.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -157,50 +158,50 @@ pub mod get_archive_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Ref;
         type Repo;
+        type Ref;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Ref = Unset;
         type Repo = Unset;
-    }
-    ///State transition - sets the `ref` field to Set
-    pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRef<S> {}
-    impl<S: State> State for SetRef<S> {
-        type Ref = Set<members::r#ref>;
-        type Repo = S::Repo;
+        type Ref = Unset;
     }
     ///State transition - sets the `repo` field to Set
     pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepo<S> {}
     impl<S: State> State for SetRepo<S> {
-        type Ref = S::Ref;
         type Repo = Set<members::repo>;
+        type Ref = S::Ref;
+    }
+    ///State transition - sets the `ref` field to Set
+    pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRef<S> {}
+    impl<S: State> State for SetRef<S> {
+        type Repo = S::Repo;
+        type Ref = Set<members::r#ref>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `ref` field
-        pub struct r#ref(());
         ///Marker type for the `repo` field
         pub struct repo(());
+        ///Marker type for the `ref` field
+        pub struct r#ref(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GetArchiveBuilder<'a, S: get_archive_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetArchive<'a> {
@@ -214,9 +215,9 @@ impl<'a> GetArchiveBuilder<'a, get_archive_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetArchiveBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -224,12 +225,12 @@ impl<'a> GetArchiveBuilder<'a, get_archive_state::Empty> {
 impl<'a, S: get_archive_state::State> GetArchiveBuilder<'a, S> {
     /// Set the `format` field (optional)
     pub fn format(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `format` field to an Option value (optional)
     pub fn maybe_format(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -237,12 +238,12 @@ impl<'a, S: get_archive_state::State> GetArchiveBuilder<'a, S> {
 impl<'a, S: get_archive_state::State> GetArchiveBuilder<'a, S> {
     /// Set the `prefix` field (optional)
     pub fn prefix(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `prefix` field to an Option value (optional)
     pub fn maybe_prefix(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -257,11 +258,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetArchiveBuilder<'a, get_archive_state::SetRef<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetArchiveBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -276,11 +277,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetArchiveBuilder<'a, get_archive_state::SetRepo<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         GetArchiveBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -288,16 +289,16 @@ where
 impl<'a, S> GetArchiveBuilder<'a, S>
 where
     S: get_archive_state::State,
-    S::Ref: get_archive_state::IsSet,
     S::Repo: get_archive_state::IsSet,
+    S::Ref: get_archive_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GetArchive<'a> {
         GetArchive {
-            format: self.__unsafe_private_named.0,
-            prefix: self.__unsafe_private_named.1,
-            r#ref: self.__unsafe_private_named.2.unwrap(),
-            repo: self.__unsafe_private_named.3.unwrap(),
+            format: self._fields.0,
+            prefix: self._fields.1,
+            r#ref: self._fields.2.unwrap(),
+            repo: self._fields.3.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/git/temp/get_blob.rs b/crates/jacquard-api/src/sh_tangled/git/temp/get_blob.rs
index a5f8f632..19e9392d 100644
--- a/crates/jacquard-api/src/sh_tangled/git/temp/get_blob.rs
+++ b/crates/jacquard-api/src/sh_tangled/git/temp/get_blob.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -144,45 +145,45 @@ pub mod get_blob_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Path;
         type Repo;
+        type Path;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Path = Unset;
         type Repo = Unset;
-    }
-    ///State transition - sets the `path` field to Set
-    pub struct SetPath<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPath<S> {}
-    impl<S: State> State for SetPath<S> {
-        type Path = Set<members::path>;
-        type Repo = S::Repo;
+        type Path = Unset;
     }
     ///State transition - sets the `repo` field to Set
     pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepo<S> {}
     impl<S: State> State for SetRepo<S> {
-        type Path = S::Path;
         type Repo = Set<members::repo>;
+        type Path = S::Path;
+    }
+    ///State transition - sets the `path` field to Set
+    pub struct SetPath<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPath<S> {}
+    impl<S: State> State for SetPath<S> {
+        type Repo = S::Repo;
+        type Path = Set<members::path>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `path` field
-        pub struct path(());
         ///Marker type for the `repo` field
         pub struct repo(());
+        ///Marker type for the `path` field
+        pub struct path(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GetBlobBuilder<'a, S: get_blob_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetBlob<'a> {
@@ -196,9 +197,9 @@ impl<'a> GetBlobBuilder<'a, get_blob_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetBlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,11 +214,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetBlobBuilder<'a, get_blob_state::SetPath<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetBlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -225,12 +226,12 @@ where
 impl<'a, S: get_blob_state::State> GetBlobBuilder<'a, S> {
     /// Set the `ref` field (optional)
     pub fn r#ref(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `ref` field to an Option value (optional)
     pub fn maybe_ref(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -245,11 +246,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetBlobBuilder<'a, get_blob_state::SetRepo<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetBlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -257,15 +258,15 @@ where
 impl<'a, S> GetBlobBuilder<'a, S>
 where
     S: get_blob_state::State,
-    S::Path: get_blob_state::IsSet,
     S::Repo: get_blob_state::IsSet,
+    S::Path: get_blob_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GetBlob<'a> {
         GetBlob {
-            path: self.__unsafe_private_named.0.unwrap(),
-            r#ref: self.__unsafe_private_named.1,
-            repo: self.__unsafe_private_named.2.unwrap(),
+            path: self._fields.0.unwrap(),
+            r#ref: self._fields.1,
+            repo: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/git/temp/get_branch.rs b/crates/jacquard-api/src/sh_tangled/git/temp/get_branch.rs
index 40d959ab..5b3873e2 100644
--- a/crates/jacquard-api/src/sh_tangled/git/temp/get_branch.rs
+++ b/crates/jacquard-api/src/sh_tangled/git/temp/get_branch.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{AtUri, Datetime};
@@ -135,45 +138,45 @@ pub mod get_branch_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Repo;
         type Name;
+        type Repo;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Repo = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `repo` field to Set
-    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepo<S> {}
-    impl<S: State> State for SetRepo<S> {
-        type Repo = Set<members::repo>;
-        type Name = S::Name;
+        type Repo = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Repo = S::Repo;
         type Name = Set<members::name>;
+        type Repo = S::Repo;
+    }
+    ///State transition - sets the `repo` field to Set
+    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepo<S> {}
+    impl<S: State> State for SetRepo<S> {
+        type Name = S::Name;
+        type Repo = Set<members::repo>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `repo` field
-        pub struct repo(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `repo` field
+        pub struct repo(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GetBranchBuilder<'a, S: get_branch_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetBranch<'a> {
@@ -187,9 +190,9 @@ impl<'a> GetBranchBuilder<'a, get_branch_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetBranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,11 +207,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetBranchBuilder<'a, get_branch_state::SetName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetBranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -223,11 +226,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetBranchBuilder<'a, get_branch_state::SetRepo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetBranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -235,14 +238,14 @@ where
 impl<'a, S> GetBranchBuilder<'a, S>
 where
     S: get_branch_state::State,
-    S::Repo: get_branch_state::IsSet,
     S::Name: get_branch_state::IsSet,
+    S::Repo: get_branch_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GetBranch<'a> {
         GetBranch {
-            name: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/git/temp/get_commit.rs b/crates/jacquard-api/src/sh_tangled/git/temp/get_commit.rs
index ca921b08..2b3cba2a 100644
--- a/crates/jacquard-api/src/sh_tangled/git/temp/get_commit.rs
+++ b/crates/jacquard-api/src/sh_tangled/git/temp/get_commit.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -122,45 +123,45 @@ pub mod get_commit_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Repo;
         type Ref;
+        type Repo;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Repo = Unset;
         type Ref = Unset;
-    }
-    ///State transition - sets the `repo` field to Set
-    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepo<S> {}
-    impl<S: State> State for SetRepo<S> {
-        type Repo = Set<members::repo>;
-        type Ref = S::Ref;
+        type Repo = Unset;
     }
     ///State transition - sets the `ref` field to Set
     pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRef<S> {}
     impl<S: State> State for SetRef<S> {
-        type Repo = S::Repo;
         type Ref = Set<members::r#ref>;
+        type Repo = S::Repo;
+    }
+    ///State transition - sets the `repo` field to Set
+    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepo<S> {}
+    impl<S: State> State for SetRepo<S> {
+        type Ref = S::Ref;
+        type Repo = Set<members::repo>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `repo` field
-        pub struct repo(());
         ///Marker type for the `ref` field
         pub struct r#ref(());
+        ///Marker type for the `repo` field
+        pub struct repo(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GetCommitBuilder<'a, S: get_commit_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetCommit<'a> {
@@ -174,9 +175,9 @@ impl<'a> GetCommitBuilder<'a, get_commit_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetCommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -191,11 +192,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetCommitBuilder<'a, get_commit_state::SetRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetCommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,11 +211,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetCommitBuilder<'a, get_commit_state::SetRepo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetCommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -222,14 +223,14 @@ where
 impl<'a, S> GetCommitBuilder<'a, S>
 where
     S: get_commit_state::State,
-    S::Repo: get_commit_state::IsSet,
     S::Ref: get_commit_state::IsSet,
+    S::Repo: get_commit_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GetCommit<'a> {
         GetCommit {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
+            r#ref: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/git/temp/get_diff.rs b/crates/jacquard-api/src/sh_tangled/git/temp/get_diff.rs
index d9954cfb..e3a51da3 100644
--- a/crates/jacquard-api/src/sh_tangled/git/temp/get_diff.rs
+++ b/crates/jacquard-api/src/sh_tangled/git/temp/get_diff.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -197,9 +198,9 @@ pub mod get_diff_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetDiffBuilder<'a, S: get_diff_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetDiff<'a> {
@@ -213,9 +214,9 @@ impl<'a> GetDiffBuilder<'a, get_diff_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetDiffBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -230,11 +231,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetDiffBuilder<'a, get_diff_state::SetRepo<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetDiffBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,11 +250,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetDiffBuilder<'a, get_diff_state::SetRev1<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetDiffBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -268,11 +269,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetDiffBuilder<'a, get_diff_state::SetRev2<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetDiffBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -287,9 +288,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetDiff<'a> {
         GetDiff {
-            repo: self.__unsafe_private_named.0.unwrap(),
-            rev1: self.__unsafe_private_named.1.unwrap(),
-            rev2: self.__unsafe_private_named.2.unwrap(),
+            repo: self._fields.0.unwrap(),
+            rev1: self._fields.1.unwrap(),
+            rev2: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/git/temp/get_entity.rs b/crates/jacquard-api/src/sh_tangled/git/temp/get_entity.rs
index ccf64f68..c7c3ca7a 100644
--- a/crates/jacquard-api/src/sh_tangled/git/temp/get_entity.rs
+++ b/crates/jacquard-api/src/sh_tangled/git/temp/get_entity.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -167,9 +168,9 @@ pub mod get_entity_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetEntityBuilder<'a, S: get_entity_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetEntity<'a> {
@@ -183,9 +184,9 @@ impl<'a> GetEntityBuilder<'a, get_entity_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetEntityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,11 +201,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetEntityBuilder<'a, get_entity_state::SetPath<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetEntityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,12 +213,12 @@ where
 impl<'a, S: get_entity_state::State> GetEntityBuilder<'a, S> {
     /// Set the `ref` field (optional)
     pub fn r#ref(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `ref` field to an Option value (optional)
     pub fn maybe_ref(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -232,11 +233,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetEntityBuilder<'a, get_entity_state::SetRepo<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetEntityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -250,9 +251,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetEntity<'a> {
         GetEntity {
-            path: self.__unsafe_private_named.0.unwrap(),
-            r#ref: self.__unsafe_private_named.1,
-            repo: self.__unsafe_private_named.2.unwrap(),
+            path: self._fields.0.unwrap(),
+            r#ref: self._fields.1,
+            repo: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/git/temp/get_head.rs b/crates/jacquard-api/src/sh_tangled/git/temp/get_head.rs
index c257ee4b..583c735a 100644
--- a/crates/jacquard-api/src/sh_tangled/git/temp/get_head.rs
+++ b/crates/jacquard-api/src/sh_tangled/git/temp/get_head.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -134,9 +135,9 @@ pub mod get_head_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetHeadBuilder<'a, S: get_head_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetHead<'a> {
@@ -150,9 +151,9 @@ impl<'a> GetHeadBuilder<'a, get_head_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetHeadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -167,11 +168,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetHeadBuilder<'a, get_head_state::SetRepo<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetHeadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -184,7 +185,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetHead<'a> {
         GetHead {
-            repo: self.__unsafe_private_named.0.unwrap(),
+            repo: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/git/temp/get_tag.rs b/crates/jacquard-api/src/sh_tangled/git/temp/get_tag.rs
index 07d346e5..c5ebdf82 100644
--- a/crates/jacquard-api/src/sh_tangled/git/temp/get_tag.rs
+++ b/crates/jacquard-api/src/sh_tangled/git/temp/get_tag.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -170,9 +171,9 @@ pub mod get_tag_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTagBuilder<'a, S: get_tag_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetTag<'a> {
@@ -186,9 +187,9 @@ impl<'a> GetTagBuilder<'a, get_tag_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,11 +204,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetTagBuilder<'a, get_tag_state::SetRepo<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetTagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -222,11 +223,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetTagBuilder<'a, get_tag_state::SetTag<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetTagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -240,8 +241,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetTag<'a> {
         GetTag {
-            repo: self.__unsafe_private_named.0.unwrap(),
-            tag: self.__unsafe_private_named.1.unwrap(),
+            repo: self._fields.0.unwrap(),
+            tag: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/git/temp/get_tree.rs b/crates/jacquard-api/src/sh_tangled/git/temp/get_tree.rs
index 191e207a..5d58a970 100644
--- a/crates/jacquard-api/src/sh_tangled/git/temp/get_tree.rs
+++ b/crates/jacquard-api/src/sh_tangled/git/temp/get_tree.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -287,49 +290,49 @@ pub mod last_commit_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type When;
         type Hash;
+        type When;
         type Message;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type When = Unset;
         type Hash = Unset;
+        type When = Unset;
         type Message = Unset;
     }
-    ///State transition - sets the `when` field to Set
-    pub struct SetWhen<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetWhen<S> {}
-    impl<S: State> State for SetWhen<S> {
-        type When = Set<members::when>;
-        type Hash = S::Hash;
-        type Message = S::Message;
-    }
     ///State transition - sets the `hash` field to Set
     pub struct SetHash<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHash<S> {}
     impl<S: State> State for SetHash<S> {
-        type When = S::When;
         type Hash = Set<members::hash>;
+        type When = S::When;
+        type Message = S::Message;
+    }
+    ///State transition - sets the `when` field to Set
+    pub struct SetWhen<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetWhen<S> {}
+    impl<S: State> State for SetWhen<S> {
+        type Hash = S::Hash;
+        type When = Set<members::when>;
         type Message = S::Message;
     }
     ///State transition - sets the `message` field to Set
     pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMessage<S> {}
     impl<S: State> State for SetMessage<S> {
-        type When = S::When;
         type Hash = S::Hash;
+        type When = S::When;
         type Message = Set<members::message>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `when` field
-        pub struct when(());
         ///Marker type for the `hash` field
         pub struct hash(());
+        ///Marker type for the `when` field
+        pub struct when(());
         ///Marker type for the `message` field
         pub struct message(());
     }
@@ -337,14 +340,14 @@ pub mod last_commit_state {
 
 /// Builder for constructing an instance of this type
 pub struct LastCommitBuilder<'a, S: last_commit_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<get_tree::Signature<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LastCommit<'a> {
@@ -358,9 +361,9 @@ impl<'a> LastCommitBuilder<'a, last_commit_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LastCommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -368,12 +371,12 @@ impl<'a> LastCommitBuilder<'a, last_commit_state::Empty> {
 impl<'a, S: last_commit_state::State> LastCommitBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<get_tree::Signature<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<get_tree::Signature<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -388,11 +391,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LastCommitBuilder<'a, last_commit_state::SetHash<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LastCommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -407,11 +410,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LastCommitBuilder<'a, last_commit_state::SetMessage<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LastCommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -426,11 +429,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LastCommitBuilder<'a, last_commit_state::SetWhen<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LastCommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -438,17 +441,17 @@ where
 impl<'a, S> LastCommitBuilder<'a, S>
 where
     S: last_commit_state::State,
-    S::When: last_commit_state::IsSet,
     S::Hash: last_commit_state::IsSet,
+    S::When: last_commit_state::IsSet,
     S::Message: last_commit_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LastCommit<'a> {
         LastCommit {
-            author: self.__unsafe_private_named.0,
-            hash: self.__unsafe_private_named.1.unwrap(),
-            message: self.__unsafe_private_named.2.unwrap(),
-            when: self.__unsafe_private_named.3.unwrap(),
+            author: self._fields.0,
+            hash: self._fields.1.unwrap(),
+            message: self._fields.2.unwrap(),
+            when: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -461,10 +464,10 @@ where
         >,
     ) -> LastCommit<'a> {
         LastCommit {
-            author: self.__unsafe_private_named.0,
-            hash: self.__unsafe_private_named.1.unwrap(),
-            message: self.__unsafe_private_named.2.unwrap(),
-            when: self.__unsafe_private_named.3.unwrap(),
+            author: self._fields.0,
+            hash: self._fields.1.unwrap(),
+            message: self._fields.2.unwrap(),
+            when: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -717,45 +720,45 @@ pub mod get_tree_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Ref;
         type Repo;
+        type Ref;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Ref = Unset;
         type Repo = Unset;
-    }
-    ///State transition - sets the `ref` field to Set
-    pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRef<S> {}
-    impl<S: State> State for SetRef<S> {
-        type Ref = Set<members::r#ref>;
-        type Repo = S::Repo;
+        type Ref = Unset;
     }
     ///State transition - sets the `repo` field to Set
     pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepo<S> {}
     impl<S: State> State for SetRepo<S> {
-        type Ref = S::Ref;
         type Repo = Set<members::repo>;
+        type Ref = S::Ref;
+    }
+    ///State transition - sets the `ref` field to Set
+    pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRef<S> {}
+    impl<S: State> State for SetRef<S> {
+        type Repo = S::Repo;
+        type Ref = Set<members::r#ref>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `ref` field
-        pub struct r#ref(());
         ///Marker type for the `repo` field
         pub struct repo(());
+        ///Marker type for the `ref` field
+        pub struct r#ref(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GetTreeBuilder<'a, S: get_tree_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetTree<'a> {
@@ -769,9 +772,9 @@ impl<'a> GetTreeBuilder<'a, get_tree_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTreeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -779,12 +782,12 @@ impl<'a> GetTreeBuilder<'a, get_tree_state::Empty> {
 impl<'a, S: get_tree_state::State> GetTreeBuilder<'a, S> {
     /// Set the `path` field (optional)
     pub fn path(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `path` field to an Option value (optional)
     pub fn maybe_path(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -799,11 +802,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetTreeBuilder<'a, get_tree_state::SetRef<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetTreeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -818,11 +821,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetTreeBuilder<'a, get_tree_state::SetRepo<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetTreeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -830,15 +833,15 @@ where
 impl<'a, S> GetTreeBuilder<'a, S>
 where
     S: get_tree_state::State,
-    S::Ref: get_tree_state::IsSet,
     S::Repo: get_tree_state::IsSet,
+    S::Ref: get_tree_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GetTree<'a> {
         GetTree {
-            path: self.__unsafe_private_named.0,
-            r#ref: self.__unsafe_private_named.1.unwrap(),
-            repo: self.__unsafe_private_named.2.unwrap(),
+            path: self._fields.0,
+            r#ref: self._fields.1.unwrap(),
+            repo: self._fields.2.unwrap(),
         }
     }
 }
@@ -853,49 +856,49 @@ pub mod signature_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type When;
+        type Name;
         type Email;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type When = Unset;
+        type Name = Unset;
         type Email = Unset;
     }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type When = S::When;
-        type Email = S::Email;
-    }
     ///State transition - sets the `when` field to Set
     pub struct SetWhen<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWhen<S> {}
     impl<S: State> State for SetWhen<S> {
-        type Name = S::Name;
         type When = Set<members::when>;
+        type Name = S::Name;
+        type Email = S::Email;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type When = S::When;
+        type Name = Set<members::name>;
         type Email = S::Email;
     }
     ///State transition - sets the `email` field to Set
     pub struct SetEmail<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEmail<S> {}
     impl<S: State> State for SetEmail<S> {
-        type Name = S::Name;
         type When = S::When;
+        type Name = S::Name;
         type Email = Set<members::email>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `when` field
         pub struct when(());
+        ///Marker type for the `name` field
+        pub struct name(());
         ///Marker type for the `email` field
         pub struct email(());
     }
@@ -903,9 +906,9 @@ pub mod signature_state {
 
 /// Builder for constructing an instance of this type
 pub struct SignatureBuilder<'a, S: signature_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Signature<'a> {
@@ -919,9 +922,9 @@ impl<'a> SignatureBuilder<'a, signature_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -936,11 +939,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureBuilder<'a, signature_state::SetEmail<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -955,11 +958,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureBuilder<'a, signature_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -974,11 +977,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SignatureBuilder<'a, signature_state::SetWhen<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -986,16 +989,16 @@ where
 impl<'a, S> SignatureBuilder<'a, S>
 where
     S: signature_state::State,
-    S::Name: signature_state::IsSet,
     S::When: signature_state::IsSet,
+    S::Name: signature_state::IsSet,
     S::Email: signature_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Signature<'a> {
         Signature {
-            email: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            when: self.__unsafe_private_named.2.unwrap(),
+            email: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            when: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1008,9 +1011,9 @@ where
         >,
     ) -> Signature<'a> {
         Signature {
-            email: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            when: self.__unsafe_private_named.2.unwrap(),
+            email: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            when: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1026,64 +1029,64 @@ pub mod tree_entry_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Mode;
-        type Name;
         type Size;
+        type Name;
+        type Mode;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Mode = Unset;
-        type Name = Unset;
         type Size = Unset;
+        type Name = Unset;
+        type Mode = Unset;
     }
-    ///State transition - sets the `mode` field to Set
-    pub struct SetMode<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMode<S> {}
-    impl<S: State> State for SetMode<S> {
-        type Mode = Set<members::mode>;
+    ///State transition - sets the `size` field to Set
+    pub struct SetSize<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSize<S> {}
+    impl<S: State> State for SetSize<S> {
+        type Size = Set<members::size>;
         type Name = S::Name;
-        type Size = S::Size;
+        type Mode = S::Mode;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Mode = S::Mode;
-        type Name = Set<members::name>;
         type Size = S::Size;
-    }
-    ///State transition - sets the `size` field to Set
-    pub struct SetSize<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSize<S> {}
-    impl<S: State> State for SetSize<S> {
+        type Name = Set<members::name>;
         type Mode = S::Mode;
+    }
+    ///State transition - sets the `mode` field to Set
+    pub struct SetMode<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMode<S> {}
+    impl<S: State> State for SetMode<S> {
+        type Size = S::Size;
         type Name = S::Name;
-        type Size = Set<members::size>;
+        type Mode = Set<members::mode>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `mode` field
-        pub struct mode(());
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `size` field
         pub struct size(());
+        ///Marker type for the `name` field
+        pub struct name(());
+        ///Marker type for the `mode` field
+        pub struct mode(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TreeEntryBuilder<'a, S: tree_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<get_tree::LastCommit<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TreeEntry<'a> {
@@ -1097,9 +1100,9 @@ impl<'a> TreeEntryBuilder<'a, tree_entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TreeEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1110,12 +1113,12 @@ impl<'a, S: tree_entry_state::State> TreeEntryBuilder<'a, S> {
         mut self,
         value: impl Into<Option<get_tree::LastCommit<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `last_commit` field to an Option value (optional)
     pub fn maybe_last_commit(mut self, value: Option<get_tree::LastCommit<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1130,11 +1133,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TreeEntryBuilder<'a, tree_entry_state::SetMode<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TreeEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1149,11 +1152,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TreeEntryBuilder<'a, tree_entry_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TreeEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1168,11 +1171,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> TreeEntryBuilder<'a, tree_entry_state::SetSize<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TreeEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1180,17 +1183,17 @@ where
 impl<'a, S> TreeEntryBuilder<'a, S>
 where
     S: tree_entry_state::State,
-    S::Mode: tree_entry_state::IsSet,
-    S::Name: tree_entry_state::IsSet,
     S::Size: tree_entry_state::IsSet,
+    S::Name: tree_entry_state::IsSet,
+    S::Mode: tree_entry_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TreeEntry<'a> {
         TreeEntry {
-            last_commit: self.__unsafe_private_named.0,
-            mode: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            size: self.__unsafe_private_named.3.unwrap(),
+            last_commit: self._fields.0,
+            mode: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            size: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1203,10 +1206,10 @@ where
         >,
     ) -> TreeEntry<'a> {
         TreeEntry {
-            last_commit: self.__unsafe_private_named.0,
-            mode: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            size: self.__unsafe_private_named.3.unwrap(),
+            last_commit: self._fields.0,
+            mode: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            size: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/git/temp/list_branches.rs b/crates/jacquard-api/src/sh_tangled/git/temp/list_branches.rs
index b860142c..b6c0c542 100644
--- a/crates/jacquard-api/src/sh_tangled/git/temp/list_branches.rs
+++ b/crates/jacquard-api/src/sh_tangled/git/temp/list_branches.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -157,9 +158,9 @@ pub mod list_branches_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListBranchesBuilder<'a, S: list_branches_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListBranches<'a> {
@@ -173,9 +174,9 @@ impl<'a> ListBranchesBuilder<'a, list_branches_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListBranchesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,12 +184,12 @@ impl<'a> ListBranchesBuilder<'a, list_branches_state::Empty> {
 impl<'a, S: list_branches_state::State> ListBranchesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -196,12 +197,12 @@ impl<'a, S: list_branches_state::State> ListBranchesBuilder<'a, S> {
 impl<'a, S: list_branches_state::State> ListBranchesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -216,11 +217,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListBranchesBuilder<'a, list_branches_state::SetRepo<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ListBranchesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -233,9 +234,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ListBranches<'a> {
         ListBranches {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            repo: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            repo: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/git/temp/list_commits.rs b/crates/jacquard-api/src/sh_tangled/git/temp/list_commits.rs
index 40d006ae..13bf60ce 100644
--- a/crates/jacquard-api/src/sh_tangled/git/temp/list_commits.rs
+++ b/crates/jacquard-api/src/sh_tangled/git/temp/list_commits.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -180,14 +181,9 @@ pub mod list_commits_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListCommitsBuilder<'a, S: list_commits_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<i64>,
-        Option<CowStr<'a>>,
-        Option<AtUri<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListCommits<'a> {
@@ -201,9 +197,9 @@ impl<'a> ListCommitsBuilder<'a, list_commits_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListCommitsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -211,12 +207,12 @@ impl<'a> ListCommitsBuilder<'a, list_commits_state::Empty> {
 impl<'a, S: list_commits_state::State> ListCommitsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -224,12 +220,12 @@ impl<'a, S: list_commits_state::State> ListCommitsBuilder<'a, S> {
 impl<'a, S: list_commits_state::State> ListCommitsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -237,12 +233,12 @@ impl<'a, S: list_commits_state::State> ListCommitsBuilder<'a, S> {
 impl<'a, S: list_commits_state::State> ListCommitsBuilder<'a, S> {
     /// Set the `ref` field (optional)
     pub fn r#ref(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `ref` field to an Option value (optional)
     pub fn maybe_ref(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -257,11 +253,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListCommitsBuilder<'a, list_commits_state::SetRepo<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ListCommitsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -274,10 +270,10 @@ where
     /// Build the final struct
     pub fn build(self) -> ListCommits<'a> {
         ListCommits {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            r#ref: self.__unsafe_private_named.2,
-            repo: self.__unsafe_private_named.3.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            r#ref: self._fields.2,
+            repo: self._fields.3.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/git/temp/list_languages.rs b/crates/jacquard-api/src/sh_tangled/git/temp/list_languages.rs
index aca0dfe5..ff17704a 100644
--- a/crates/jacquard-api/src/sh_tangled/git/temp/list_languages.rs
+++ b/crates/jacquard-api/src/sh_tangled/git/temp/list_languages.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -182,49 +185,49 @@ pub mod language_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Percentage;
         type Name;
+        type Percentage;
         type Size;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Percentage = Unset;
         type Name = Unset;
+        type Percentage = Unset;
         type Size = Unset;
     }
-    ///State transition - sets the `percentage` field to Set
-    pub struct SetPercentage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPercentage<S> {}
-    impl<S: State> State for SetPercentage<S> {
-        type Percentage = Set<members::percentage>;
-        type Name = S::Name;
-        type Size = S::Size;
-    }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Percentage = S::Percentage;
         type Name = Set<members::name>;
+        type Percentage = S::Percentage;
+        type Size = S::Size;
+    }
+    ///State transition - sets the `percentage` field to Set
+    pub struct SetPercentage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPercentage<S> {}
+    impl<S: State> State for SetPercentage<S> {
+        type Name = S::Name;
+        type Percentage = Set<members::percentage>;
         type Size = S::Size;
     }
     ///State transition - sets the `size` field to Set
     pub struct SetSize<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSize<S> {}
     impl<S: State> State for SetSize<S> {
-        type Percentage = S::Percentage;
         type Name = S::Name;
+        type Percentage = S::Percentage;
         type Size = Set<members::size>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `percentage` field
-        pub struct percentage(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `percentage` field
+        pub struct percentage(());
         ///Marker type for the `size` field
         pub struct size(());
     }
@@ -232,8 +235,8 @@ pub mod language_state {
 
 /// Builder for constructing an instance of this type
 pub struct LanguageBuilder<'a, S: language_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Vec<CowStr<'a>>>,
         Option<i64>,
@@ -241,7 +244,7 @@ pub struct LanguageBuilder<'a, S: language_state::State> {
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Language<'a> {
@@ -255,9 +258,9 @@ impl<'a> LanguageBuilder<'a, language_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LanguageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -265,12 +268,12 @@ impl<'a> LanguageBuilder<'a, language_state::Empty> {
 impl<'a, S: language_state::State> LanguageBuilder<'a, S> {
     /// Set the `color` field (optional)
     pub fn color(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `color` field to an Option value (optional)
     pub fn maybe_color(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -278,12 +281,12 @@ impl<'a, S: language_state::State> LanguageBuilder<'a, S> {
 impl<'a, S: language_state::State> LanguageBuilder<'a, S> {
     /// Set the `extensions` field (optional)
     pub fn extensions(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `extensions` field to an Option value (optional)
     pub fn maybe_extensions(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -291,12 +294,12 @@ impl<'a, S: language_state::State> LanguageBuilder<'a, S> {
 impl<'a, S: language_state::State> LanguageBuilder<'a, S> {
     /// Set the `fileCount` field (optional)
     pub fn file_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `fileCount` field to an Option value (optional)
     pub fn maybe_file_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -311,11 +314,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LanguageBuilder<'a, language_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LanguageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -330,11 +333,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> LanguageBuilder<'a, language_state::SetPercentage<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         LanguageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -349,11 +352,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> LanguageBuilder<'a, language_state::SetSize<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         LanguageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -361,19 +364,19 @@ where
 impl<'a, S> LanguageBuilder<'a, S>
 where
     S: language_state::State,
-    S::Percentage: language_state::IsSet,
     S::Name: language_state::IsSet,
+    S::Percentage: language_state::IsSet,
     S::Size: language_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Language<'a> {
         Language {
-            color: self.__unsafe_private_named.0,
-            extensions: self.__unsafe_private_named.1,
-            file_count: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            percentage: self.__unsafe_private_named.4.unwrap(),
-            size: self.__unsafe_private_named.5.unwrap(),
+            color: self._fields.0,
+            extensions: self._fields.1,
+            file_count: self._fields.2,
+            name: self._fields.3.unwrap(),
+            percentage: self._fields.4.unwrap(),
+            size: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -386,12 +389,12 @@ where
         >,
     ) -> Language<'a> {
         Language {
-            color: self.__unsafe_private_named.0,
-            extensions: self.__unsafe_private_named.1,
-            file_count: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            percentage: self.__unsafe_private_named.4.unwrap(),
-            size: self.__unsafe_private_named.5.unwrap(),
+            color: self._fields.0,
+            extensions: self._fields.1,
+            file_count: self._fields.2,
+            name: self._fields.3.unwrap(),
+            percentage: self._fields.4.unwrap(),
+            size: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -556,9 +559,9 @@ pub mod list_languages_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListLanguagesBuilder<'a, S: list_languages_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListLanguages<'a> {
@@ -572,9 +575,9 @@ impl<'a> ListLanguagesBuilder<'a, list_languages_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListLanguagesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -582,12 +585,12 @@ impl<'a> ListLanguagesBuilder<'a, list_languages_state::Empty> {
 impl<'a, S: list_languages_state::State> ListLanguagesBuilder<'a, S> {
     /// Set the `ref` field (optional)
     pub fn r#ref(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `ref` field to an Option value (optional)
     pub fn maybe_ref(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -602,11 +605,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListLanguagesBuilder<'a, list_languages_state::SetRepo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListLanguagesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -619,8 +622,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ListLanguages<'a> {
         ListLanguages {
-            r#ref: self.__unsafe_private_named.0,
-            repo: self.__unsafe_private_named.1.unwrap(),
+            r#ref: self._fields.0,
+            repo: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/git/temp/list_tags.rs b/crates/jacquard-api/src/sh_tangled/git/temp/list_tags.rs
index fdd107c2..e0e5e8f3 100644
--- a/crates/jacquard-api/src/sh_tangled/git/temp/list_tags.rs
+++ b/crates/jacquard-api/src/sh_tangled/git/temp/list_tags.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -157,9 +158,9 @@ pub mod list_tags_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListTagsBuilder<'a, S: list_tags_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListTags<'a> {
@@ -173,9 +174,9 @@ impl<'a> ListTagsBuilder<'a, list_tags_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListTagsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,12 +184,12 @@ impl<'a> ListTagsBuilder<'a, list_tags_state::Empty> {
 impl<'a, S: list_tags_state::State> ListTagsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -196,12 +197,12 @@ impl<'a, S: list_tags_state::State> ListTagsBuilder<'a, S> {
 impl<'a, S: list_tags_state::State> ListTagsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -216,11 +217,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListTagsBuilder<'a, list_tags_state::SetRepo<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ListTagsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -233,9 +234,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ListTags<'a> {
         ListTags {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            repo: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            repo: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/graph/follow.rs b/crates/jacquard-api/src/sh_tangled/graph/follow.rs
index 268b8293..fe8ab597 100644
--- a/crates/jacquard-api/src/sh_tangled/graph/follow.rs
+++ b/crates/jacquard-api/src/sh_tangled/graph/follow.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -143,9 +146,9 @@ pub mod follow_state {
 
 /// Builder for constructing an instance of this type
 pub struct FollowBuilder<'a, S: follow_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Follow<'a> {
@@ -159,9 +162,9 @@ impl<'a> FollowBuilder<'a, follow_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -176,11 +179,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FollowBuilder<'a, follow_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -195,11 +198,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> FollowBuilder<'a, follow_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,8 +216,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -227,8 +230,8 @@ where
         >,
     ) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/knot.rs b/crates/jacquard-api/src/sh_tangled/knot.rs
index d7cd5fb1..a046a4af 100644
--- a/crates/jacquard-api/src/sh_tangled/knot.rs
+++ b/crates/jacquard-api/src/sh_tangled/knot.rs
@@ -9,7 +9,11 @@ pub mod list_keys;
 pub mod member;
 pub mod version;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -133,9 +137,9 @@ pub mod knot_state {
 
 /// Builder for constructing an instance of this type
 pub struct KnotBuilder<'a, S: knot_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Knot<'a> {
@@ -149,9 +153,9 @@ impl<'a> KnotBuilder<'a, knot_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         KnotBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -166,11 +170,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> KnotBuilder<'a, knot_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         KnotBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,7 +187,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Knot<'a> {
         Knot {
-            created_at: self.__unsafe_private_named.0.unwrap(),
+            created_at: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -196,7 +200,7 @@ where
         >,
     ) -> Knot<'a> {
         Knot {
-            created_at: self.__unsafe_private_named.0.unwrap(),
+            created_at: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/knot/list_keys.rs b/crates/jacquard-api/src/sh_tangled/knot/list_keys.rs
index bf28aa45..97f57ae4 100644
--- a/crates/jacquard-api/src/sh_tangled/knot/list_keys.rs
+++ b/crates/jacquard-api/src/sh_tangled/knot/list_keys.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -173,9 +176,9 @@ pub mod list_keys_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListKeysBuilder<'a, S: list_keys_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListKeys<'a> {
@@ -189,9 +192,9 @@ impl<'a> ListKeysBuilder<'a, list_keys_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListKeysBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -199,12 +202,12 @@ impl<'a> ListKeysBuilder<'a, list_keys_state::Empty> {
 impl<'a, S: list_keys_state::State> ListKeysBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -212,12 +215,12 @@ impl<'a, S: list_keys_state::State> ListKeysBuilder<'a, S> {
 impl<'a, S: list_keys_state::State> ListKeysBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -229,8 +232,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ListKeys<'a> {
         ListKeys {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
@@ -245,59 +248,59 @@ pub mod public_key_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type CreatedAt;
         type Did;
         type Key;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type CreatedAt = Unset;
         type Did = Unset;
         type Key = Unset;
-        type CreatedAt = Unset;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type Did = S::Did;
+        type Key = S::Key;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
+        type CreatedAt = S::CreatedAt;
         type Did = Set<members::did>;
         type Key = S::Key;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `key` field to Set
     pub struct SetKey<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetKey<S> {}
     impl<S: State> State for SetKey<S> {
-        type Did = S::Did;
-        type Key = Set<members::key>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type Did = S::Did;
-        type Key = S::Key;
-        type CreatedAt = Set<members::created_at>;
+        type Key = Set<members::key>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `did` field
         pub struct did(());
         ///Marker type for the `key` field
         pub struct key(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PublicKeyBuilder<'a, S: public_key_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PublicKey<'a> {
@@ -311,9 +314,9 @@ impl<'a> PublicKeyBuilder<'a, public_key_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PublicKeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -328,11 +331,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PublicKeyBuilder<'a, public_key_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PublicKeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -347,11 +350,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> PublicKeyBuilder<'a, public_key_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PublicKeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -366,11 +369,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PublicKeyBuilder<'a, public_key_state::SetKey<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PublicKeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -378,16 +381,16 @@ where
 impl<'a, S> PublicKeyBuilder<'a, S>
 where
     S: public_key_state::State,
+    S::CreatedAt: public_key_state::IsSet,
     S::Did: public_key_state::IsSet,
     S::Key: public_key_state::IsSet,
-    S::CreatedAt: public_key_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PublicKey<'a> {
         PublicKey {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            key: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            key: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -400,9 +403,9 @@ where
         >,
     ) -> PublicKey<'a> {
         PublicKey {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            key: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            key: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/knot/member.rs b/crates/jacquard-api/src/sh_tangled/knot/member.rs
index ee4f8291..facb44ed 100644
--- a/crates/jacquard-api/src/sh_tangled/knot/member.rs
+++ b/crates/jacquard-api/src/sh_tangled/knot/member.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -111,58 +114,58 @@ pub mod member_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Subject;
-        type Domain;
         type CreatedAt;
+        type Domain;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Subject = Unset;
-        type Domain = Unset;
         type CreatedAt = Unset;
+        type Domain = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
         type Subject = Set<members::subject>;
-        type Domain = S::Domain;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `domain` field to Set
-    pub struct SetDomain<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDomain<S> {}
-    impl<S: State> State for SetDomain<S> {
-        type Subject = S::Subject;
-        type Domain = Set<members::domain>;
         type CreatedAt = S::CreatedAt;
+        type Domain = S::Domain;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type Subject = S::Subject;
-        type Domain = S::Domain;
         type CreatedAt = Set<members::created_at>;
+        type Domain = S::Domain;
+    }
+    ///State transition - sets the `domain` field to Set
+    pub struct SetDomain<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDomain<S> {}
+    impl<S: State> State for SetDomain<S> {
+        type Subject = S::Subject;
+        type CreatedAt = S::CreatedAt;
+        type Domain = Set<members::domain>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `subject` field
         pub struct subject(());
-        ///Marker type for the `domain` field
-        pub struct domain(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `domain` field
+        pub struct domain(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MemberBuilder<'a, S: member_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Member<'a> {
@@ -176,9 +179,9 @@ impl<'a> MemberBuilder<'a, member_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -193,11 +196,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MemberBuilder<'a, member_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,11 +215,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MemberBuilder<'a, member_state::SetDomain<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -231,11 +234,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MemberBuilder<'a, member_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         MemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,15 +247,15 @@ impl<'a, S> MemberBuilder<'a, S>
 where
     S: member_state::State,
     S::Subject: member_state::IsSet,
-    S::Domain: member_state::IsSet,
     S::CreatedAt: member_state::IsSet,
+    S::Domain: member_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Member<'a> {
         Member {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            domain: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            domain: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -265,9 +268,9 @@ where
         >,
     ) -> Member<'a> {
         Member {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            domain: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            domain: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/knot/version.rs b/crates/jacquard-api/src/sh_tangled/knot/version.rs
index 80870027..0982e7d6 100644
--- a/crates/jacquard-api/src/sh_tangled/knot/version.rs
+++ b/crates/jacquard-api/src/sh_tangled/knot/version.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/sh_tangled/label/definition.rs b/crates/jacquard-api/src/sh_tangled/label/definition.rs
index e6845df4..2d504506 100644
--- a/crates/jacquard-api/src/sh_tangled/label/definition.rs
+++ b/crates/jacquard-api/src/sh_tangled/label/definition.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -181,73 +184,73 @@ pub mod definition_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type CreatedAt;
+        type Name;
         type Scope;
         type ValueType;
-        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type CreatedAt = Unset;
+        type Name = Unset;
         type Scope = Unset;
         type ValueType = Unset;
-        type Name = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type CreatedAt = Set<members::created_at>;
+        type Name = S::Name;
+        type Scope = S::Scope;
+        type ValueType = S::ValueType;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type CreatedAt = S::CreatedAt;
+        type Name = Set<members::name>;
         type Scope = S::Scope;
         type ValueType = S::ValueType;
-        type Name = S::Name;
     }
     ///State transition - sets the `scope` field to Set
     pub struct SetScope<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetScope<S> {}
     impl<S: State> State for SetScope<S> {
         type CreatedAt = S::CreatedAt;
+        type Name = S::Name;
         type Scope = Set<members::scope>;
         type ValueType = S::ValueType;
-        type Name = S::Name;
     }
     ///State transition - sets the `value_type` field to Set
     pub struct SetValueType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetValueType<S> {}
     impl<S: State> State for SetValueType<S> {
         type CreatedAt = S::CreatedAt;
-        type Scope = S::Scope;
-        type ValueType = Set<members::value_type>;
         type Name = S::Name;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type CreatedAt = S::CreatedAt;
         type Scope = S::Scope;
-        type ValueType = S::ValueType;
-        type Name = Set<members::name>;
+        type ValueType = Set<members::value_type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `name` field
+        pub struct name(());
         ///Marker type for the `scope` field
         pub struct scope(());
         ///Marker type for the `value_type` field
         pub struct value_type(());
-        ///Marker type for the `name` field
-        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DefinitionBuilder<'a, S: definition_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<bool>,
@@ -255,7 +258,7 @@ pub struct DefinitionBuilder<'a, S: definition_state::State> {
         Option<Vec<Nsid<'a>>>,
         Option<definition::ValueType<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Definition<'a> {
@@ -269,9 +272,9 @@ impl<'a> DefinitionBuilder<'a, definition_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -279,12 +282,12 @@ impl<'a> DefinitionBuilder<'a, definition_state::Empty> {
 impl<'a, S: definition_state::State> DefinitionBuilder<'a, S> {
     /// Set the `color` field (optional)
     pub fn color(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `color` field to an Option value (optional)
     pub fn maybe_color(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -299,11 +302,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DefinitionBuilder<'a, definition_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -311,12 +314,12 @@ where
 impl<'a, S: definition_state::State> DefinitionBuilder<'a, S> {
     /// Set the `multiple` field (optional)
     pub fn multiple(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `multiple` field to an Option value (optional)
     pub fn maybe_multiple(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -331,11 +334,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DefinitionBuilder<'a, definition_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         DefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -350,11 +353,11 @@ where
         mut self,
         value: impl Into<Vec<Nsid<'a>>>,
     ) -> DefinitionBuilder<'a, definition_state::SetScope<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         DefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -369,11 +372,11 @@ where
         mut self,
         value: impl Into<definition::ValueType<'a>>,
     ) -> DefinitionBuilder<'a, definition_state::SetValueType<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         DefinitionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -382,19 +385,19 @@ impl<'a, S> DefinitionBuilder<'a, S>
 where
     S: definition_state::State,
     S::CreatedAt: definition_state::IsSet,
+    S::Name: definition_state::IsSet,
     S::Scope: definition_state::IsSet,
     S::ValueType: definition_state::IsSet,
-    S::Name: definition_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Definition<'a> {
         Definition {
-            color: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            multiple: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            scope: self.__unsafe_private_named.4.unwrap(),
-            value_type: self.__unsafe_private_named.5.unwrap(),
+            color: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            multiple: self._fields.2,
+            name: self._fields.3.unwrap(),
+            scope: self._fields.4.unwrap(),
+            value_type: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -407,12 +410,12 @@ where
         >,
     ) -> Definition<'a> {
         Definition {
-            color: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            multiple: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            scope: self.__unsafe_private_named.4.unwrap(),
-            value_type: self.__unsafe_private_named.5.unwrap(),
+            color: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            multiple: self._fields.2,
+            name: self._fields.3.unwrap(),
+            scope: self._fields.4.unwrap(),
+            value_type: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/label/op.rs b/crates/jacquard-api/src/sh_tangled/label/op.rs
index b86c6c04..04cd1775 100644
--- a/crates/jacquard-api/src/sh_tangled/label/op.rs
+++ b/crates/jacquard-api/src/sh_tangled/label/op.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -139,65 +142,65 @@ pub mod op_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
-        type PerformedAt;
         type Add;
+        type PerformedAt;
+        type Subject;
         type Delete;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
-        type PerformedAt = Unset;
         type Add = Unset;
+        type PerformedAt = Unset;
+        type Subject = Unset;
         type Delete = Unset;
     }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
+    ///State transition - sets the `add` field to Set
+    pub struct SetAdd<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAdd<S> {}
+    impl<S: State> State for SetAdd<S> {
+        type Add = Set<members::add>;
         type PerformedAt = S::PerformedAt;
-        type Add = S::Add;
+        type Subject = S::Subject;
         type Delete = S::Delete;
     }
     ///State transition - sets the `performed_at` field to Set
     pub struct SetPerformedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPerformedAt<S> {}
     impl<S: State> State for SetPerformedAt<S> {
-        type Subject = S::Subject;
-        type PerformedAt = Set<members::performed_at>;
         type Add = S::Add;
+        type PerformedAt = Set<members::performed_at>;
+        type Subject = S::Subject;
         type Delete = S::Delete;
     }
-    ///State transition - sets the `add` field to Set
-    pub struct SetAdd<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAdd<S> {}
-    impl<S: State> State for SetAdd<S> {
-        type Subject = S::Subject;
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type Add = S::Add;
         type PerformedAt = S::PerformedAt;
-        type Add = Set<members::add>;
+        type Subject = Set<members::subject>;
         type Delete = S::Delete;
     }
     ///State transition - sets the `delete` field to Set
     pub struct SetDelete<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDelete<S> {}
     impl<S: State> State for SetDelete<S> {
-        type Subject = S::Subject;
-        type PerformedAt = S::PerformedAt;
         type Add = S::Add;
+        type PerformedAt = S::PerformedAt;
+        type Subject = S::Subject;
         type Delete = Set<members::delete>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
-        ///Marker type for the `performed_at` field
-        pub struct performed_at(());
         ///Marker type for the `add` field
         pub struct add(());
+        ///Marker type for the `performed_at` field
+        pub struct performed_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
         ///Marker type for the `delete` field
         pub struct delete(());
     }
@@ -205,14 +208,14 @@ pub mod op_state {
 
 /// Builder for constructing an instance of this type
 pub struct OpBuilder<'a, S: op_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<op::Operand<'a>>>,
         Option<Vec<op::Operand<'a>>>,
         Option<Datetime>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Op<'a> {
@@ -226,9 +229,9 @@ impl<'a> OpBuilder<'a, op_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -243,11 +246,11 @@ where
         mut self,
         value: impl Into<Vec<op::Operand<'a>>>,
     ) -> OpBuilder<'a, op_state::SetAdd<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         OpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -262,11 +265,11 @@ where
         mut self,
         value: impl Into<Vec<op::Operand<'a>>>,
     ) -> OpBuilder<'a, op_state::SetDelete<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         OpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -281,11 +284,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> OpBuilder<'a, op_state::SetPerformedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         OpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -300,11 +303,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> OpBuilder<'a, op_state::SetSubject<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         OpBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -312,18 +315,18 @@ where
 impl<'a, S> OpBuilder<'a, S>
 where
     S: op_state::State,
-    S::Subject: op_state::IsSet,
-    S::PerformedAt: op_state::IsSet,
     S::Add: op_state::IsSet,
+    S::PerformedAt: op_state::IsSet,
+    S::Subject: op_state::IsSet,
     S::Delete: op_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Op<'a> {
         Op {
-            add: self.__unsafe_private_named.0.unwrap(),
-            delete: self.__unsafe_private_named.1.unwrap(),
-            performed_at: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
+            add: self._fields.0.unwrap(),
+            delete: self._fields.1.unwrap(),
+            performed_at: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -336,10 +339,10 @@ where
         >,
     ) -> Op<'a> {
         Op {
-            add: self.__unsafe_private_named.0.unwrap(),
-            delete: self.__unsafe_private_named.1.unwrap(),
-            performed_at: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
+            add: self._fields.0.unwrap(),
+            delete: self._fields.1.unwrap(),
+            performed_at: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -503,9 +506,9 @@ pub mod operand_state {
 
 /// Builder for constructing an instance of this type
 pub struct OperandBuilder<'a, S: operand_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Operand<'a> {
@@ -519,9 +522,9 @@ impl<'a> OperandBuilder<'a, operand_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OperandBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -536,11 +539,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> OperandBuilder<'a, operand_state::SetKey<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         OperandBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -555,11 +558,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> OperandBuilder<'a, operand_state::SetValue<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         OperandBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -573,8 +576,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Operand<'a> {
         Operand {
-            key: self.__unsafe_private_named.0.unwrap(),
-            value: self.__unsafe_private_named.1.unwrap(),
+            key: self._fields.0.unwrap(),
+            value: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -587,8 +590,8 @@ where
         >,
     ) -> Operand<'a> {
         Operand {
-            key: self.__unsafe_private_named.0.unwrap(),
-            value: self.__unsafe_private_named.1.unwrap(),
+            key: self._fields.0.unwrap(),
+            value: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/owner.rs b/crates/jacquard-api/src/sh_tangled/owner.rs
index 0d08cc4d..6f131d6c 100644
--- a/crates/jacquard-api/src/sh_tangled/owner.rs
+++ b/crates/jacquard-api/src/sh_tangled/owner.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
diff --git a/crates/jacquard-api/src/sh_tangled/pipeline.rs b/crates/jacquard-api/src/sh_tangled/pipeline.rs
index c6e65b59..1071a26d 100644
--- a/crates/jacquard-api/src/sh_tangled/pipeline.rs
+++ b/crates/jacquard-api/src/sh_tangled/pipeline.rs
@@ -8,7 +8,11 @@
 pub mod cancel_pipeline;
 pub mod status;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -407,59 +411,59 @@ pub mod clone_opts_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Skip;
         type Depth;
         type Submodules;
-        type Skip;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Skip = Unset;
         type Depth = Unset;
         type Submodules = Unset;
-        type Skip = Unset;
+    }
+    ///State transition - sets the `skip` field to Set
+    pub struct SetSkip<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSkip<S> {}
+    impl<S: State> State for SetSkip<S> {
+        type Skip = Set<members::skip>;
+        type Depth = S::Depth;
+        type Submodules = S::Submodules;
     }
     ///State transition - sets the `depth` field to Set
     pub struct SetDepth<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDepth<S> {}
     impl<S: State> State for SetDepth<S> {
+        type Skip = S::Skip;
         type Depth = Set<members::depth>;
         type Submodules = S::Submodules;
-        type Skip = S::Skip;
     }
     ///State transition - sets the `submodules` field to Set
     pub struct SetSubmodules<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubmodules<S> {}
     impl<S: State> State for SetSubmodules<S> {
-        type Depth = S::Depth;
-        type Submodules = Set<members::submodules>;
         type Skip = S::Skip;
-    }
-    ///State transition - sets the `skip` field to Set
-    pub struct SetSkip<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSkip<S> {}
-    impl<S: State> State for SetSkip<S> {
         type Depth = S::Depth;
-        type Submodules = S::Submodules;
-        type Skip = Set<members::skip>;
+        type Submodules = Set<members::submodules>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `skip` field
+        pub struct skip(());
         ///Marker type for the `depth` field
         pub struct depth(());
         ///Marker type for the `submodules` field
         pub struct submodules(());
-        ///Marker type for the `skip` field
-        pub struct skip(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CloneOptsBuilder<'a, S: clone_opts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<bool>, Option<bool>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<bool>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CloneOpts<'a> {
@@ -473,9 +477,9 @@ impl<'a> CloneOptsBuilder<'a, clone_opts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CloneOptsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -490,11 +494,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CloneOptsBuilder<'a, clone_opts_state::SetDepth<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CloneOptsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -509,11 +513,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> CloneOptsBuilder<'a, clone_opts_state::SetSkip<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CloneOptsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -528,11 +532,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> CloneOptsBuilder<'a, clone_opts_state::SetSubmodules<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CloneOptsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -540,16 +544,16 @@ where
 impl<'a, S> CloneOptsBuilder<'a, S>
 where
     S: clone_opts_state::State,
+    S::Skip: clone_opts_state::IsSet,
     S::Depth: clone_opts_state::IsSet,
     S::Submodules: clone_opts_state::IsSet,
-    S::Skip: clone_opts_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CloneOpts<'a> {
         CloneOpts {
-            depth: self.__unsafe_private_named.0.unwrap(),
-            skip: self.__unsafe_private_named.1.unwrap(),
-            submodules: self.__unsafe_private_named.2.unwrap(),
+            depth: self._fields.0.unwrap(),
+            skip: self._fields.1.unwrap(),
+            submodules: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -562,9 +566,9 @@ where
         >,
     ) -> CloneOpts<'a> {
         CloneOpts {
-            depth: self.__unsafe_private_named.0.unwrap(),
-            skip: self.__unsafe_private_named.1.unwrap(),
-            submodules: self.__unsafe_private_named.2.unwrap(),
+            depth: self._fields.0.unwrap(),
+            skip: self._fields.1.unwrap(),
+            submodules: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -907,48 +911,48 @@ pub mod pipeline_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type TriggerMetadata;
         type Workflows;
+        type TriggerMetadata;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type TriggerMetadata = Unset;
         type Workflows = Unset;
-    }
-    ///State transition - sets the `trigger_metadata` field to Set
-    pub struct SetTriggerMetadata<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTriggerMetadata<S> {}
-    impl<S: State> State for SetTriggerMetadata<S> {
-        type TriggerMetadata = Set<members::trigger_metadata>;
-        type Workflows = S::Workflows;
+        type TriggerMetadata = Unset;
     }
     ///State transition - sets the `workflows` field to Set
     pub struct SetWorkflows<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWorkflows<S> {}
     impl<S: State> State for SetWorkflows<S> {
-        type TriggerMetadata = S::TriggerMetadata;
         type Workflows = Set<members::workflows>;
+        type TriggerMetadata = S::TriggerMetadata;
+    }
+    ///State transition - sets the `trigger_metadata` field to Set
+    pub struct SetTriggerMetadata<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTriggerMetadata<S> {}
+    impl<S: State> State for SetTriggerMetadata<S> {
+        type Workflows = S::Workflows;
+        type TriggerMetadata = Set<members::trigger_metadata>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `trigger_metadata` field
-        pub struct trigger_metadata(());
         ///Marker type for the `workflows` field
         pub struct workflows(());
+        ///Marker type for the `trigger_metadata` field
+        pub struct trigger_metadata(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PipelineBuilder<'a, S: pipeline_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<pipeline::TriggerMetadata<'a>>,
         Option<Vec<pipeline::Workflow<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Pipeline<'a> {
@@ -962,9 +966,9 @@ impl<'a> PipelineBuilder<'a, pipeline_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PipelineBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -979,11 +983,11 @@ where
         mut self,
         value: impl Into<pipeline::TriggerMetadata<'a>>,
     ) -> PipelineBuilder<'a, pipeline_state::SetTriggerMetadata<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PipelineBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -998,11 +1002,11 @@ where
         mut self,
         value: impl Into<Vec<pipeline::Workflow<'a>>>,
     ) -> PipelineBuilder<'a, pipeline_state::SetWorkflows<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PipelineBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1010,14 +1014,14 @@ where
 impl<'a, S> PipelineBuilder<'a, S>
 where
     S: pipeline_state::State,
-    S::TriggerMetadata: pipeline_state::IsSet,
     S::Workflows: pipeline_state::IsSet,
+    S::TriggerMetadata: pipeline_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Pipeline<'a> {
         Pipeline {
-            trigger_metadata: self.__unsafe_private_named.0.unwrap(),
-            workflows: self.__unsafe_private_named.1.unwrap(),
+            trigger_metadata: self._fields.0.unwrap(),
+            workflows: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1030,8 +1034,8 @@ where
         >,
     ) -> Pipeline<'a> {
         Pipeline {
-            trigger_metadata: self.__unsafe_private_named.0.unwrap(),
-            workflows: self.__unsafe_private_named.1.unwrap(),
+            trigger_metadata: self._fields.0.unwrap(),
+            workflows: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1047,51 +1051,51 @@ pub mod trigger_metadata_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Repo;
         type Kind;
+        type Repo;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Repo = Unset;
         type Kind = Unset;
-    }
-    ///State transition - sets the `repo` field to Set
-    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepo<S> {}
-    impl<S: State> State for SetRepo<S> {
-        type Repo = Set<members::repo>;
-        type Kind = S::Kind;
+        type Repo = Unset;
     }
     ///State transition - sets the `kind` field to Set
     pub struct SetKind<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetKind<S> {}
     impl<S: State> State for SetKind<S> {
-        type Repo = S::Repo;
         type Kind = Set<members::kind>;
+        type Repo = S::Repo;
+    }
+    ///State transition - sets the `repo` field to Set
+    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepo<S> {}
+    impl<S: State> State for SetRepo<S> {
+        type Kind = S::Kind;
+        type Repo = Set<members::repo>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `repo` field
-        pub struct repo(());
         ///Marker type for the `kind` field
         pub struct kind(());
+        ///Marker type for the `repo` field
+        pub struct repo(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TriggerMetadataBuilder<'a, S: trigger_metadata_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<pipeline::ManualTriggerData<'a>>,
         Option<pipeline::PullRequestTriggerData<'a>>,
         Option<pipeline::PushTriggerData<'a>>,
         Option<pipeline::TriggerRepo<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TriggerMetadata<'a> {
@@ -1105,9 +1109,9 @@ impl<'a> TriggerMetadataBuilder<'a, trigger_metadata_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TriggerMetadataBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1122,11 +1126,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TriggerMetadataBuilder<'a, trigger_metadata_state::SetKind<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TriggerMetadataBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1137,7 +1141,7 @@ impl<'a, S: trigger_metadata_state::State> TriggerMetadataBuilder<'a, S> {
         mut self,
         value: impl Into<Option<pipeline::ManualTriggerData<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `manual` field to an Option value (optional)
@@ -1145,7 +1149,7 @@ impl<'a, S: trigger_metadata_state::State> TriggerMetadataBuilder<'a, S> {
         mut self,
         value: Option<pipeline::ManualTriggerData<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1156,7 +1160,7 @@ impl<'a, S: trigger_metadata_state::State> TriggerMetadataBuilder<'a, S> {
         mut self,
         value: impl Into<Option<pipeline::PullRequestTriggerData<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `pullRequest` field to an Option value (optional)
@@ -1164,7 +1168,7 @@ impl<'a, S: trigger_metadata_state::State> TriggerMetadataBuilder<'a, S> {
         mut self,
         value: Option<pipeline::PullRequestTriggerData<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1175,12 +1179,12 @@ impl<'a, S: trigger_metadata_state::State> TriggerMetadataBuilder<'a, S> {
         mut self,
         value: impl Into<Option<pipeline::PushTriggerData<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `push` field to an Option value (optional)
     pub fn maybe_push(mut self, value: Option<pipeline::PushTriggerData<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1195,11 +1199,11 @@ where
         mut self,
         value: impl Into<pipeline::TriggerRepo<'a>>,
     ) -> TriggerMetadataBuilder<'a, trigger_metadata_state::SetRepo<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         TriggerMetadataBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1207,17 +1211,17 @@ where
 impl<'a, S> TriggerMetadataBuilder<'a, S>
 where
     S: trigger_metadata_state::State,
-    S::Repo: trigger_metadata_state::IsSet,
     S::Kind: trigger_metadata_state::IsSet,
+    S::Repo: trigger_metadata_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TriggerMetadata<'a> {
         TriggerMetadata {
-            kind: self.__unsafe_private_named.0.unwrap(),
-            manual: self.__unsafe_private_named.1,
-            pull_request: self.__unsafe_private_named.2,
-            push: self.__unsafe_private_named.3,
-            repo: self.__unsafe_private_named.4.unwrap(),
+            kind: self._fields.0.unwrap(),
+            manual: self._fields.1,
+            pull_request: self._fields.2,
+            push: self._fields.3,
+            repo: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1230,11 +1234,11 @@ where
         >,
     ) -> TriggerMetadata<'a> {
         TriggerMetadata {
-            kind: self.__unsafe_private_named.0.unwrap(),
-            manual: self.__unsafe_private_named.1,
-            pull_request: self.__unsafe_private_named.2,
-            push: self.__unsafe_private_named.3,
-            repo: self.__unsafe_private_named.4.unwrap(),
+            kind: self._fields.0.unwrap(),
+            manual: self._fields.1,
+            pull_request: self._fields.2,
+            push: self._fields.3,
+            repo: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1250,80 +1254,80 @@ pub mod trigger_repo_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Knot;
         type DefaultBranch;
-        type Did;
+        type Knot;
         type Repo;
+        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Knot = Unset;
         type DefaultBranch = Unset;
-        type Did = Unset;
+        type Knot = Unset;
         type Repo = Unset;
-    }
-    ///State transition - sets the `knot` field to Set
-    pub struct SetKnot<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetKnot<S> {}
-    impl<S: State> State for SetKnot<S> {
-        type Knot = Set<members::knot>;
-        type DefaultBranch = S::DefaultBranch;
-        type Did = S::Did;
-        type Repo = S::Repo;
+        type Did = Unset;
     }
     ///State transition - sets the `default_branch` field to Set
     pub struct SetDefaultBranch<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDefaultBranch<S> {}
     impl<S: State> State for SetDefaultBranch<S> {
-        type Knot = S::Knot;
         type DefaultBranch = Set<members::default_branch>;
-        type Did = S::Did;
+        type Knot = S::Knot;
         type Repo = S::Repo;
+        type Did = S::Did;
     }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Knot = S::Knot;
+    ///State transition - sets the `knot` field to Set
+    pub struct SetKnot<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetKnot<S> {}
+    impl<S: State> State for SetKnot<S> {
         type DefaultBranch = S::DefaultBranch;
-        type Did = Set<members::did>;
+        type Knot = Set<members::knot>;
         type Repo = S::Repo;
+        type Did = S::Did;
     }
     ///State transition - sets the `repo` field to Set
     pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepo<S> {}
     impl<S: State> State for SetRepo<S> {
-        type Knot = S::Knot;
         type DefaultBranch = S::DefaultBranch;
-        type Did = S::Did;
+        type Knot = S::Knot;
         type Repo = Set<members::repo>;
+        type Did = S::Did;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type DefaultBranch = S::DefaultBranch;
+        type Knot = S::Knot;
+        type Repo = S::Repo;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `knot` field
-        pub struct knot(());
         ///Marker type for the `default_branch` field
         pub struct default_branch(());
-        ///Marker type for the `did` field
-        pub struct did(());
+        ///Marker type for the `knot` field
+        pub struct knot(());
         ///Marker type for the `repo` field
         pub struct repo(());
+        ///Marker type for the `did` field
+        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TriggerRepoBuilder<'a, S: trigger_repo_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TriggerRepo<'a> {
@@ -1337,9 +1341,9 @@ impl<'a> TriggerRepoBuilder<'a, trigger_repo_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TriggerRepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1354,11 +1358,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TriggerRepoBuilder<'a, trigger_repo_state::SetDefaultBranch<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TriggerRepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1373,11 +1377,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> TriggerRepoBuilder<'a, trigger_repo_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TriggerRepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1392,11 +1396,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TriggerRepoBuilder<'a, trigger_repo_state::SetKnot<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TriggerRepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1411,11 +1415,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TriggerRepoBuilder<'a, trigger_repo_state::SetRepo<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TriggerRepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1423,18 +1427,18 @@ where
 impl<'a, S> TriggerRepoBuilder<'a, S>
 where
     S: trigger_repo_state::State,
-    S::Knot: trigger_repo_state::IsSet,
     S::DefaultBranch: trigger_repo_state::IsSet,
-    S::Did: trigger_repo_state::IsSet,
+    S::Knot: trigger_repo_state::IsSet,
     S::Repo: trigger_repo_state::IsSet,
+    S::Did: trigger_repo_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TriggerRepo<'a> {
         TriggerRepo {
-            default_branch: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            knot: self.__unsafe_private_named.2.unwrap(),
-            repo: self.__unsafe_private_named.3.unwrap(),
+            default_branch: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            knot: self._fields.2.unwrap(),
+            repo: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1447,10 +1451,10 @@ where
         >,
     ) -> TriggerRepo<'a> {
         TriggerRepo {
-            default_branch: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            knot: self.__unsafe_private_named.2.unwrap(),
-            repo: self.__unsafe_private_named.3.unwrap(),
+            default_branch: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            knot: self._fields.2.unwrap(),
+            repo: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1466,80 +1470,80 @@ pub mod workflow_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
+        type Raw;
         type Engine;
         type Clone;
-        type Raw;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
+        type Raw = Unset;
         type Engine = Unset;
         type Clone = Unset;
-        type Raw = Unset;
+        type Name = Unset;
     }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
+    ///State transition - sets the `raw` field to Set
+    pub struct SetRaw<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRaw<S> {}
+    impl<S: State> State for SetRaw<S> {
+        type Raw = Set<members::raw>;
         type Engine = S::Engine;
         type Clone = S::Clone;
-        type Raw = S::Raw;
+        type Name = S::Name;
     }
     ///State transition - sets the `engine` field to Set
     pub struct SetEngine<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEngine<S> {}
     impl<S: State> State for SetEngine<S> {
-        type Name = S::Name;
+        type Raw = S::Raw;
         type Engine = Set<members::engine>;
         type Clone = S::Clone;
-        type Raw = S::Raw;
+        type Name = S::Name;
     }
     ///State transition - sets the `clone` field to Set
     pub struct SetClone<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetClone<S> {}
     impl<S: State> State for SetClone<S> {
-        type Name = S::Name;
+        type Raw = S::Raw;
         type Engine = S::Engine;
         type Clone = Set<members::clone>;
-        type Raw = S::Raw;
-    }
-    ///State transition - sets the `raw` field to Set
-    pub struct SetRaw<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRaw<S> {}
-    impl<S: State> State for SetRaw<S> {
         type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Raw = S::Raw;
         type Engine = S::Engine;
         type Clone = S::Clone;
-        type Raw = Set<members::raw>;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
+        ///Marker type for the `raw` field
+        pub struct raw(());
         ///Marker type for the `engine` field
         pub struct engine(());
         ///Marker type for the `clone` field
         pub struct clone(());
-        ///Marker type for the `raw` field
-        pub struct raw(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct WorkflowBuilder<'a, S: workflow_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<pipeline::CloneOpts<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Workflow<'a> {
@@ -1553,9 +1557,9 @@ impl<'a> WorkflowBuilder<'a, workflow_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WorkflowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1570,11 +1574,11 @@ where
         mut self,
         value: impl Into<pipeline::CloneOpts<'a>>,
     ) -> WorkflowBuilder<'a, workflow_state::SetClone<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         WorkflowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1589,11 +1593,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WorkflowBuilder<'a, workflow_state::SetEngine<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         WorkflowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1608,11 +1612,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WorkflowBuilder<'a, workflow_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         WorkflowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1627,11 +1631,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WorkflowBuilder<'a, workflow_state::SetRaw<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         WorkflowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1639,18 +1643,18 @@ where
 impl<'a, S> WorkflowBuilder<'a, S>
 where
     S: workflow_state::State,
-    S::Name: workflow_state::IsSet,
+    S::Raw: workflow_state::IsSet,
     S::Engine: workflow_state::IsSet,
     S::Clone: workflow_state::IsSet,
-    S::Raw: workflow_state::IsSet,
+    S::Name: workflow_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Workflow<'a> {
         Workflow {
-            clone: self.__unsafe_private_named.0.unwrap(),
-            engine: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            raw: self.__unsafe_private_named.3.unwrap(),
+            clone: self._fields.0.unwrap(),
+            engine: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            raw: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1663,10 +1667,10 @@ where
         >,
     ) -> Workflow<'a> {
         Workflow {
-            clone: self.__unsafe_private_named.0.unwrap(),
-            engine: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            raw: self.__unsafe_private_named.3.unwrap(),
+            clone: self._fields.0.unwrap(),
+            engine: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            raw: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/pipeline/cancel_pipeline.rs b/crates/jacquard-api/src/sh_tangled/pipeline/cancel_pipeline.rs
index ccd6e7aa..8a8bea86 100644
--- a/crates/jacquard-api/src/sh_tangled/pipeline/cancel_pipeline.rs
+++ b/crates/jacquard-api/src/sh_tangled/pipeline/cancel_pipeline.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -115,9 +118,9 @@ pub mod cancel_pipeline_state {
 
 /// Builder for constructing an instance of this type
 pub struct CancelPipelineBuilder<'a, S: cancel_pipeline_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<AtUri<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<AtUri<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CancelPipeline<'a> {
@@ -131,9 +134,9 @@ impl<'a> CancelPipelineBuilder<'a, cancel_pipeline_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CancelPipelineBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,11 +151,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CancelPipelineBuilder<'a, cancel_pipeline_state::SetPipeline<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CancelPipelineBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -167,11 +170,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CancelPipelineBuilder<'a, cancel_pipeline_state::SetRepo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CancelPipelineBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -186,11 +189,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CancelPipelineBuilder<'a, cancel_pipeline_state::SetWorkflow<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CancelPipelineBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -205,9 +208,9 @@ where
     /// Build the final struct
     pub fn build(self) -> CancelPipeline<'a> {
         CancelPipeline {
-            pipeline: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
-            workflow: self.__unsafe_private_named.2.unwrap(),
+            pipeline: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
+            workflow: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -220,9 +223,9 @@ where
         >,
     ) -> CancelPipeline<'a> {
         CancelPipeline {
-            pipeline: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
-            workflow: self.__unsafe_private_named.2.unwrap(),
+            pipeline: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
+            workflow: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/pipeline/status.rs b/crates/jacquard-api/src/sh_tangled/pipeline/status.rs
index 300257c8..c9a97b16 100644
--- a/crates/jacquard-api/src/sh_tangled/pipeline/status.rs
+++ b/crates/jacquard-api/src/sh_tangled/pipeline/status.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -122,65 +125,65 @@ pub mod status_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type Status;
         type Pipeline;
+        type Status;
+        type CreatedAt;
         type Workflow;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type Status = Unset;
         type Pipeline = Unset;
+        type Status = Unset;
+        type CreatedAt = Unset;
         type Workflow = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
+    ///State transition - sets the `pipeline` field to Set
+    pub struct SetPipeline<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPipeline<S> {}
+    impl<S: State> State for SetPipeline<S> {
+        type Pipeline = Set<members::pipeline>;
         type Status = S::Status;
-        type Pipeline = S::Pipeline;
+        type CreatedAt = S::CreatedAt;
         type Workflow = S::Workflow;
     }
     ///State transition - sets the `status` field to Set
     pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStatus<S> {}
     impl<S: State> State for SetStatus<S> {
-        type CreatedAt = S::CreatedAt;
-        type Status = Set<members::status>;
         type Pipeline = S::Pipeline;
+        type Status = Set<members::status>;
+        type CreatedAt = S::CreatedAt;
         type Workflow = S::Workflow;
     }
-    ///State transition - sets the `pipeline` field to Set
-    pub struct SetPipeline<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPipeline<S> {}
-    impl<S: State> State for SetPipeline<S> {
-        type CreatedAt = S::CreatedAt;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Pipeline = S::Pipeline;
         type Status = S::Status;
-        type Pipeline = Set<members::pipeline>;
+        type CreatedAt = Set<members::created_at>;
         type Workflow = S::Workflow;
     }
     ///State transition - sets the `workflow` field to Set
     pub struct SetWorkflow<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWorkflow<S> {}
     impl<S: State> State for SetWorkflow<S> {
-        type CreatedAt = S::CreatedAt;
-        type Status = S::Status;
         type Pipeline = S::Pipeline;
+        type Status = S::Status;
+        type CreatedAt = S::CreatedAt;
         type Workflow = Set<members::workflow>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `status` field
-        pub struct status(());
         ///Marker type for the `pipeline` field
         pub struct pipeline(());
+        ///Marker type for the `status` field
+        pub struct status(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `workflow` field
         pub struct workflow(());
     }
@@ -188,8 +191,8 @@ pub mod status_state {
 
 /// Builder for constructing an instance of this type
 pub struct StatusBuilder<'a, S: status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<i64>,
@@ -197,7 +200,7 @@ pub struct StatusBuilder<'a, S: status_state::State> {
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Status<'a> {
@@ -211,9 +214,9 @@ impl<'a> StatusBuilder<'a, status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -228,11 +231,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StatusBuilder<'a, status_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -240,12 +243,12 @@ where
 impl<'a, S: status_state::State> StatusBuilder<'a, S> {
     /// Set the `error` field (optional)
     pub fn error(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `error` field to an Option value (optional)
     pub fn maybe_error(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -253,12 +256,12 @@ impl<'a, S: status_state::State> StatusBuilder<'a, S> {
 impl<'a, S: status_state::State> StatusBuilder<'a, S> {
     /// Set the `exitCode` field (optional)
     pub fn exit_code(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `exitCode` field to an Option value (optional)
     pub fn maybe_exit_code(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -273,11 +276,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> StatusBuilder<'a, status_state::SetPipeline<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -292,11 +295,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> StatusBuilder<'a, status_state::SetStatus<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -311,11 +314,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> StatusBuilder<'a, status_state::SetWorkflow<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -323,20 +326,20 @@ where
 impl<'a, S> StatusBuilder<'a, S>
 where
     S: status_state::State,
-    S::CreatedAt: status_state::IsSet,
-    S::Status: status_state::IsSet,
     S::Pipeline: status_state::IsSet,
+    S::Status: status_state::IsSet,
+    S::CreatedAt: status_state::IsSet,
     S::Workflow: status_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Status<'a> {
         Status {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            error: self.__unsafe_private_named.1,
-            exit_code: self.__unsafe_private_named.2,
-            pipeline: self.__unsafe_private_named.3.unwrap(),
-            status: self.__unsafe_private_named.4.unwrap(),
-            workflow: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            error: self._fields.1,
+            exit_code: self._fields.2,
+            pipeline: self._fields.3.unwrap(),
+            status: self._fields.4.unwrap(),
+            workflow: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -349,12 +352,12 @@ where
         >,
     ) -> Status<'a> {
         Status {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            error: self.__unsafe_private_named.1,
-            exit_code: self.__unsafe_private_named.2,
-            pipeline: self.__unsafe_private_named.3.unwrap(),
-            status: self.__unsafe_private_named.4.unwrap(),
-            workflow: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            error: self._fields.1,
+            exit_code: self._fields.2,
+            pipeline: self._fields.3.unwrap(),
+            status: self._fields.4.unwrap(),
+            workflow: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/public_key.rs b/crates/jacquard-api/src/sh_tangled/public_key.rs
index 8df64a3e..85110788 100644
--- a/crates/jacquard-api/src/sh_tangled/public_key.rs
+++ b/crates/jacquard-api/src/sh_tangled/public_key.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -123,59 +126,59 @@ pub mod public_key_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Name;
         type CreatedAt;
         type Key;
-        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Name = Unset;
         type CreatedAt = Unset;
         type Key = Unset;
-        type Name = Unset;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Name = Set<members::name>;
+        type CreatedAt = S::CreatedAt;
+        type Key = S::Key;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Name = S::Name;
         type CreatedAt = Set<members::created_at>;
         type Key = S::Key;
-        type Name = S::Name;
     }
     ///State transition - sets the `key` field to Set
     pub struct SetKey<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetKey<S> {}
     impl<S: State> State for SetKey<S> {
-        type CreatedAt = S::CreatedAt;
-        type Key = Set<members::key>;
         type Name = S::Name;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
         type CreatedAt = S::CreatedAt;
-        type Key = S::Key;
-        type Name = Set<members::name>;
+        type Key = Set<members::key>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `name` field
+        pub struct name(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `key` field
         pub struct key(());
-        ///Marker type for the `name` field
-        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PublicKeyBuilder<'a, S: public_key_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PublicKey<'a> {
@@ -189,9 +192,9 @@ impl<'a> PublicKeyBuilder<'a, public_key_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PublicKeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -206,11 +209,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PublicKeyBuilder<'a, public_key_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PublicKeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -225,11 +228,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PublicKeyBuilder<'a, public_key_state::SetKey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PublicKeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,11 +247,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PublicKeyBuilder<'a, public_key_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PublicKeyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -256,16 +259,16 @@ where
 impl<'a, S> PublicKeyBuilder<'a, S>
 where
     S: public_key_state::State,
+    S::Name: public_key_state::IsSet,
     S::CreatedAt: public_key_state::IsSet,
     S::Key: public_key_state::IsSet,
-    S::Name: public_key_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PublicKey<'a> {
         PublicKey {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            key: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -278,9 +281,9 @@ where
         >,
     ) -> PublicKey<'a> {
         PublicKey {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            key: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            key: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo.rs b/crates/jacquard-api/src/sh_tangled/repo.rs
index 4a8fc5d9..1428df0a 100644
--- a/crates/jacquard-api/src/sh_tangled/repo.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo.rs
@@ -34,7 +34,11 @@ pub mod tag;
 pub mod tags;
 pub mod tree;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -197,49 +201,49 @@ pub mod repo_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Knot;
         type CreatedAt;
+        type Knot;
         type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Knot = Unset;
         type CreatedAt = Unset;
+        type Knot = Unset;
         type Name = Unset;
     }
-    ///State transition - sets the `knot` field to Set
-    pub struct SetKnot<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetKnot<S> {}
-    impl<S: State> State for SetKnot<S> {
-        type Knot = Set<members::knot>;
-        type CreatedAt = S::CreatedAt;
-        type Name = S::Name;
-    }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Knot = S::Knot;
         type CreatedAt = Set<members::created_at>;
+        type Knot = S::Knot;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `knot` field to Set
+    pub struct SetKnot<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetKnot<S> {}
+    impl<S: State> State for SetKnot<S> {
+        type CreatedAt = S::CreatedAt;
+        type Knot = Set<members::knot>;
         type Name = S::Name;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Knot = S::Knot;
         type CreatedAt = S::CreatedAt;
+        type Knot = S::Knot;
         type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `knot` field
-        pub struct knot(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `knot` field
+        pub struct knot(());
         ///Marker type for the `name` field
         pub struct name(());
     }
@@ -247,8 +251,8 @@ pub mod repo_state {
 
 /// Builder for constructing an instance of this type
 pub struct RepoBuilder<'a, S: repo_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -259,7 +263,7 @@ pub struct RepoBuilder<'a, S: repo_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Repo<'a> {
@@ -273,19 +277,9 @@ impl<'a> RepoBuilder<'a, repo_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -300,11 +294,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RepoBuilder<'a, repo_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -312,12 +306,12 @@ where
 impl<'a, S: repo_state::State> RepoBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -332,11 +326,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RepoBuilder<'a, repo_state::SetKnot<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -344,12 +338,12 @@ where
 impl<'a, S: repo_state::State> RepoBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -364,11 +358,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RepoBuilder<'a, repo_state::SetName<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -376,12 +370,12 @@ where
 impl<'a, S: repo_state::State> RepoBuilder<'a, S> {
     /// Set the `source` field (optional)
     pub fn source(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `source` field to an Option value (optional)
     pub fn maybe_source(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -389,12 +383,12 @@ impl<'a, S: repo_state::State> RepoBuilder<'a, S> {
 impl<'a, S: repo_state::State> RepoBuilder<'a, S> {
     /// Set the `spindle` field (optional)
     pub fn spindle(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `spindle` field to an Option value (optional)
     pub fn maybe_spindle(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -402,12 +396,12 @@ impl<'a, S: repo_state::State> RepoBuilder<'a, S> {
 impl<'a, S: repo_state::State> RepoBuilder<'a, S> {
     /// Set the `topics` field (optional)
     pub fn topics(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `topics` field to an Option value (optional)
     pub fn maybe_topics(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -415,12 +409,12 @@ impl<'a, S: repo_state::State> RepoBuilder<'a, S> {
 impl<'a, S: repo_state::State> RepoBuilder<'a, S> {
     /// Set the `website` field (optional)
     pub fn website(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `website` field to an Option value (optional)
     pub fn maybe_website(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -428,22 +422,22 @@ impl<'a, S: repo_state::State> RepoBuilder<'a, S> {
 impl<'a, S> RepoBuilder<'a, S>
 where
     S: repo_state::State,
-    S::Knot: repo_state::IsSet,
     S::CreatedAt: repo_state::IsSet,
+    S::Knot: repo_state::IsSet,
     S::Name: repo_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Repo<'a> {
         Repo {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            knot: self.__unsafe_private_named.2.unwrap(),
-            labels: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            source: self.__unsafe_private_named.5,
-            spindle: self.__unsafe_private_named.6,
-            topics: self.__unsafe_private_named.7,
-            website: self.__unsafe_private_named.8,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            knot: self._fields.2.unwrap(),
+            labels: self._fields.3,
+            name: self._fields.4.unwrap(),
+            source: self._fields.5,
+            spindle: self._fields.6,
+            topics: self._fields.7,
+            website: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -456,15 +450,15 @@ where
         >,
     ) -> Repo<'a> {
         Repo {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            knot: self.__unsafe_private_named.2.unwrap(),
-            labels: self.__unsafe_private_named.3,
-            name: self.__unsafe_private_named.4.unwrap(),
-            source: self.__unsafe_private_named.5,
-            spindle: self.__unsafe_private_named.6,
-            topics: self.__unsafe_private_named.7,
-            website: self.__unsafe_private_named.8,
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            knot: self._fields.2.unwrap(),
+            labels: self._fields.3,
+            name: self._fields.4.unwrap(),
+            source: self._fields.5,
+            spindle: self._fields.6,
+            topics: self._fields.7,
+            website: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/add_secret.rs b/crates/jacquard-api/src/sh_tangled/repo/add_secret.rs
index 8c57a418..12bb120a 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/add_secret.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/add_secret.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -62,59 +65,59 @@ pub mod add_secret_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Value;
-        type Repo;
         type Key;
+        type Repo;
+        type Value;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Value = Unset;
-        type Repo = Unset;
         type Key = Unset;
+        type Repo = Unset;
+        type Value = Unset;
     }
-    ///State transition - sets the `value` field to Set
-    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetValue<S> {}
-    impl<S: State> State for SetValue<S> {
-        type Value = Set<members::value>;
+    ///State transition - sets the `key` field to Set
+    pub struct SetKey<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetKey<S> {}
+    impl<S: State> State for SetKey<S> {
+        type Key = Set<members::key>;
         type Repo = S::Repo;
-        type Key = S::Key;
+        type Value = S::Value;
     }
     ///State transition - sets the `repo` field to Set
     pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepo<S> {}
     impl<S: State> State for SetRepo<S> {
-        type Value = S::Value;
-        type Repo = Set<members::repo>;
         type Key = S::Key;
-    }
-    ///State transition - sets the `key` field to Set
-    pub struct SetKey<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetKey<S> {}
-    impl<S: State> State for SetKey<S> {
+        type Repo = Set<members::repo>;
         type Value = S::Value;
+    }
+    ///State transition - sets the `value` field to Set
+    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetValue<S> {}
+    impl<S: State> State for SetValue<S> {
+        type Key = S::Key;
         type Repo = S::Repo;
-        type Key = Set<members::key>;
+        type Value = Set<members::value>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `value` field
-        pub struct value(());
-        ///Marker type for the `repo` field
-        pub struct repo(());
         ///Marker type for the `key` field
         pub struct key(());
+        ///Marker type for the `repo` field
+        pub struct repo(());
+        ///Marker type for the `value` field
+        pub struct value(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AddSecretBuilder<'a, S: add_secret_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AddSecret<'a> {
@@ -128,9 +131,9 @@ impl<'a> AddSecretBuilder<'a, add_secret_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AddSecretBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -145,11 +148,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AddSecretBuilder<'a, add_secret_state::SetKey<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AddSecretBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,11 +167,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> AddSecretBuilder<'a, add_secret_state::SetRepo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AddSecretBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,11 +186,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AddSecretBuilder<'a, add_secret_state::SetValue<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AddSecretBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -195,16 +198,16 @@ where
 impl<'a, S> AddSecretBuilder<'a, S>
 where
     S: add_secret_state::State,
-    S::Value: add_secret_state::IsSet,
-    S::Repo: add_secret_state::IsSet,
     S::Key: add_secret_state::IsSet,
+    S::Repo: add_secret_state::IsSet,
+    S::Value: add_secret_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AddSecret<'a> {
         AddSecret {
-            key: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            key: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -217,9 +220,9 @@ where
         >,
     ) -> AddSecret<'a> {
         AddSecret {
-            key: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            key: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/archive.rs b/crates/jacquard-api/src/sh_tangled/repo/archive.rs
index 56278d46..dec2e87a 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/archive.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/archive.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -156,50 +157,50 @@ pub mod archive_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Repo;
         type Ref;
+        type Repo;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Repo = Unset;
         type Ref = Unset;
-    }
-    ///State transition - sets the `repo` field to Set
-    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepo<S> {}
-    impl<S: State> State for SetRepo<S> {
-        type Repo = Set<members::repo>;
-        type Ref = S::Ref;
+        type Repo = Unset;
     }
     ///State transition - sets the `ref` field to Set
     pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRef<S> {}
     impl<S: State> State for SetRef<S> {
-        type Repo = S::Repo;
         type Ref = Set<members::r#ref>;
+        type Repo = S::Repo;
+    }
+    ///State transition - sets the `repo` field to Set
+    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepo<S> {}
+    impl<S: State> State for SetRepo<S> {
+        type Ref = S::Ref;
+        type Repo = Set<members::repo>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `repo` field
-        pub struct repo(());
         ///Marker type for the `ref` field
         pub struct r#ref(());
+        ///Marker type for the `repo` field
+        pub struct repo(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ArchiveBuilder<'a, S: archive_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Archive<'a> {
@@ -213,9 +214,9 @@ impl<'a> ArchiveBuilder<'a, archive_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ArchiveBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -223,12 +224,12 @@ impl<'a> ArchiveBuilder<'a, archive_state::Empty> {
 impl<'a, S: archive_state::State> ArchiveBuilder<'a, S> {
     /// Set the `format` field (optional)
     pub fn format(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `format` field to an Option value (optional)
     pub fn maybe_format(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -236,12 +237,12 @@ impl<'a, S: archive_state::State> ArchiveBuilder<'a, S> {
 impl<'a, S: archive_state::State> ArchiveBuilder<'a, S> {
     /// Set the `prefix` field (optional)
     pub fn prefix(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `prefix` field to an Option value (optional)
     pub fn maybe_prefix(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -256,11 +257,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ArchiveBuilder<'a, archive_state::SetRef<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ArchiveBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -275,11 +276,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ArchiveBuilder<'a, archive_state::SetRepo<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ArchiveBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -287,16 +288,16 @@ where
 impl<'a, S> ArchiveBuilder<'a, S>
 where
     S: archive_state::State,
-    S::Repo: archive_state::IsSet,
     S::Ref: archive_state::IsSet,
+    S::Repo: archive_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Archive<'a> {
         Archive {
-            format: self.__unsafe_private_named.0,
-            prefix: self.__unsafe_private_named.1,
-            r#ref: self.__unsafe_private_named.2.unwrap(),
-            repo: self.__unsafe_private_named.3.unwrap(),
+            format: self._fields.0,
+            prefix: self._fields.1,
+            r#ref: self._fields.2.unwrap(),
+            repo: self._fields.3.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/repo/artifact.rs b/crates/jacquard-api/src/sh_tangled/repo/artifact.rs
index b0fb62df..b86f3885 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/artifact.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/artifact.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -160,99 +163,99 @@ pub mod artifact_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Tag;
-        type CreatedAt;
-        type Name;
         type Repo;
         type Artifact;
+        type CreatedAt;
+        type Tag;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Tag = Unset;
-        type CreatedAt = Unset;
-        type Name = Unset;
         type Repo = Unset;
         type Artifact = Unset;
+        type CreatedAt = Unset;
+        type Tag = Unset;
+        type Name = Unset;
     }
-    ///State transition - sets the `tag` field to Set
-    pub struct SetTag<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTag<S> {}
-    impl<S: State> State for SetTag<S> {
-        type Tag = Set<members::tag>;
+    ///State transition - sets the `repo` field to Set
+    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepo<S> {}
+    impl<S: State> State for SetRepo<S> {
+        type Repo = Set<members::repo>;
+        type Artifact = S::Artifact;
         type CreatedAt = S::CreatedAt;
+        type Tag = S::Tag;
         type Name = S::Name;
+    }
+    ///State transition - sets the `artifact` field to Set
+    pub struct SetArtifact<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetArtifact<S> {}
+    impl<S: State> State for SetArtifact<S> {
         type Repo = S::Repo;
-        type Artifact = S::Artifact;
+        type Artifact = Set<members::artifact>;
+        type CreatedAt = S::CreatedAt;
+        type Tag = S::Tag;
+        type Name = S::Name;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Tag = S::Tag;
+        type Repo = S::Repo;
+        type Artifact = S::Artifact;
         type CreatedAt = Set<members::created_at>;
+        type Tag = S::Tag;
         type Name = S::Name;
+    }
+    ///State transition - sets the `tag` field to Set
+    pub struct SetTag<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTag<S> {}
+    impl<S: State> State for SetTag<S> {
         type Repo = S::Repo;
         type Artifact = S::Artifact;
+        type CreatedAt = S::CreatedAt;
+        type Tag = Set<members::tag>;
+        type Name = S::Name;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Tag = S::Tag;
-        type CreatedAt = S::CreatedAt;
-        type Name = Set<members::name>;
         type Repo = S::Repo;
         type Artifact = S::Artifact;
-    }
-    ///State transition - sets the `repo` field to Set
-    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepo<S> {}
-    impl<S: State> State for SetRepo<S> {
-        type Tag = S::Tag;
         type CreatedAt = S::CreatedAt;
-        type Name = S::Name;
-        type Repo = Set<members::repo>;
-        type Artifact = S::Artifact;
-    }
-    ///State transition - sets the `artifact` field to Set
-    pub struct SetArtifact<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetArtifact<S> {}
-    impl<S: State> State for SetArtifact<S> {
         type Tag = S::Tag;
-        type CreatedAt = S::CreatedAt;
-        type Name = S::Name;
-        type Repo = S::Repo;
-        type Artifact = Set<members::artifact>;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `tag` field
-        pub struct tag(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `repo` field
         pub struct repo(());
         ///Marker type for the `artifact` field
         pub struct artifact(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `tag` field
+        pub struct tag(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ArtifactBuilder<'a, S: artifact_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
         Option<Bytes>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Artifact<'a> {
@@ -266,9 +269,9 @@ impl<'a> ArtifactBuilder<'a, artifact_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ArtifactBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -283,11 +286,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ArtifactBuilder<'a, artifact_state::SetArtifact<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ArtifactBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -302,11 +305,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ArtifactBuilder<'a, artifact_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ArtifactBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -321,11 +324,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ArtifactBuilder<'a, artifact_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ArtifactBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -340,11 +343,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ArtifactBuilder<'a, artifact_state::SetRepo<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ArtifactBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -359,11 +362,11 @@ where
         mut self,
         value: impl Into<Bytes>,
     ) -> ArtifactBuilder<'a, artifact_state::SetTag<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ArtifactBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -371,20 +374,20 @@ where
 impl<'a, S> ArtifactBuilder<'a, S>
 where
     S: artifact_state::State,
-    S::Tag: artifact_state::IsSet,
-    S::CreatedAt: artifact_state::IsSet,
-    S::Name: artifact_state::IsSet,
     S::Repo: artifact_state::IsSet,
     S::Artifact: artifact_state::IsSet,
+    S::CreatedAt: artifact_state::IsSet,
+    S::Tag: artifact_state::IsSet,
+    S::Name: artifact_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Artifact<'a> {
         Artifact {
-            artifact: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            repo: self.__unsafe_private_named.3.unwrap(),
-            tag: self.__unsafe_private_named.4.unwrap(),
+            artifact: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            repo: self._fields.3.unwrap(),
+            tag: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -397,11 +400,11 @@ where
         >,
     ) -> Artifact<'a> {
         Artifact {
-            artifact: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            repo: self.__unsafe_private_named.3.unwrap(),
-            tag: self.__unsafe_private_named.4.unwrap(),
+            artifact: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            repo: self._fields.3.unwrap(),
+            tag: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/blob.rs b/crates/jacquard-api/src/sh_tangled/repo/blob.rs
index 39a54e9d..bc0f798f 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/blob.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/blob.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -320,14 +323,14 @@ pub mod last_commit_state {
 
 /// Builder for constructing an instance of this type
 pub struct LastCommitBuilder<'a, S: last_commit_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<blob::Signature<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LastCommit<'a> {
@@ -341,9 +344,9 @@ impl<'a> LastCommitBuilder<'a, last_commit_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LastCommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -351,12 +354,12 @@ impl<'a> LastCommitBuilder<'a, last_commit_state::Empty> {
 impl<'a, S: last_commit_state::State> LastCommitBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<blob::Signature<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<blob::Signature<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -371,11 +374,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LastCommitBuilder<'a, last_commit_state::SetHash<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LastCommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -390,11 +393,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LastCommitBuilder<'a, last_commit_state::SetMessage<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LastCommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -409,11 +412,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LastCommitBuilder<'a, last_commit_state::SetWhen<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LastCommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -428,10 +431,10 @@ where
     /// Build the final struct
     pub fn build(self) -> LastCommit<'a> {
         LastCommit {
-            author: self.__unsafe_private_named.0,
-            hash: self.__unsafe_private_named.1.unwrap(),
-            message: self.__unsafe_private_named.2.unwrap(),
-            when: self.__unsafe_private_named.3.unwrap(),
+            author: self._fields.0,
+            hash: self._fields.1.unwrap(),
+            message: self._fields.2.unwrap(),
+            when: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -444,10 +447,10 @@ where
         >,
     ) -> LastCommit<'a> {
         LastCommit {
-            author: self.__unsafe_private_named.0,
-            hash: self.__unsafe_private_named.1.unwrap(),
-            message: self.__unsafe_private_named.2.unwrap(),
-            when: self.__unsafe_private_named.3.unwrap(),
+            author: self._fields.0,
+            hash: self._fields.1.unwrap(),
+            message: self._fields.2.unwrap(),
+            when: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -667,63 +670,58 @@ pub mod blob_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Repo;
-        type Path;
         type Ref;
+        type Path;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Repo = Unset;
-        type Path = Unset;
         type Ref = Unset;
+        type Path = Unset;
     }
     ///State transition - sets the `repo` field to Set
     pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepo<S> {}
     impl<S: State> State for SetRepo<S> {
         type Repo = Set<members::repo>;
-        type Path = S::Path;
-        type Ref = S::Ref;
-    }
-    ///State transition - sets the `path` field to Set
-    pub struct SetPath<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPath<S> {}
-    impl<S: State> State for SetPath<S> {
-        type Repo = S::Repo;
-        type Path = Set<members::path>;
         type Ref = S::Ref;
+        type Path = S::Path;
     }
     ///State transition - sets the `ref` field to Set
     pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRef<S> {}
     impl<S: State> State for SetRef<S> {
         type Repo = S::Repo;
-        type Path = S::Path;
         type Ref = Set<members::r#ref>;
+        type Path = S::Path;
+    }
+    ///State transition - sets the `path` field to Set
+    pub struct SetPath<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPath<S> {}
+    impl<S: State> State for SetPath<S> {
+        type Repo = S::Repo;
+        type Ref = S::Ref;
+        type Path = Set<members::path>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `repo` field
         pub struct repo(());
-        ///Marker type for the `path` field
-        pub struct path(());
         ///Marker type for the `ref` field
         pub struct r#ref(());
+        ///Marker type for the `path` field
+        pub struct path(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BlobBuilder<'a, S: blob_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<bool>,
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<bool>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Blob<'a> {
@@ -737,9 +735,9 @@ impl<'a> BlobBuilder<'a, blob_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -754,11 +752,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BlobBuilder<'a, blob_state::SetPath<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -766,12 +764,12 @@ where
 impl<'a, S: blob_state::State> BlobBuilder<'a, S> {
     /// Set the `raw` field (optional)
     pub fn raw(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `raw` field to an Option value (optional)
     pub fn maybe_raw(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -786,11 +784,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BlobBuilder<'a, blob_state::SetRef<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -805,11 +803,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BlobBuilder<'a, blob_state::SetRepo<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -818,16 +816,16 @@ impl<'a, S> BlobBuilder<'a, S>
 where
     S: blob_state::State,
     S::Repo: blob_state::IsSet,
-    S::Path: blob_state::IsSet,
     S::Ref: blob_state::IsSet,
+    S::Path: blob_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Blob<'a> {
         Blob {
-            path: self.__unsafe_private_named.0.unwrap(),
-            raw: self.__unsafe_private_named.1,
-            r#ref: self.__unsafe_private_named.2.unwrap(),
-            repo: self.__unsafe_private_named.3.unwrap(),
+            path: self._fields.0.unwrap(),
+            raw: self._fields.1,
+            r#ref: self._fields.2.unwrap(),
+            repo: self._fields.3.unwrap(),
         }
     }
 }
@@ -842,59 +840,59 @@ pub mod signature_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type When;
         type Email;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type When = Unset;
         type Email = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type When = S::When;
-        type Email = S::Email;
+        type Name = Unset;
     }
     ///State transition - sets the `when` field to Set
     pub struct SetWhen<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWhen<S> {}
     impl<S: State> State for SetWhen<S> {
-        type Name = S::Name;
         type When = Set<members::when>;
         type Email = S::Email;
+        type Name = S::Name;
     }
     ///State transition - sets the `email` field to Set
     pub struct SetEmail<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEmail<S> {}
     impl<S: State> State for SetEmail<S> {
-        type Name = S::Name;
         type When = S::When;
         type Email = Set<members::email>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type When = S::When;
+        type Email = S::Email;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `when` field
         pub struct when(());
         ///Marker type for the `email` field
         pub struct email(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SignatureBuilder<'a, S: signature_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Signature<'a> {
@@ -908,9 +906,9 @@ impl<'a> SignatureBuilder<'a, signature_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -925,11 +923,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureBuilder<'a, signature_state::SetEmail<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -944,11 +942,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureBuilder<'a, signature_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -963,11 +961,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SignatureBuilder<'a, signature_state::SetWhen<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -975,16 +973,16 @@ where
 impl<'a, S> SignatureBuilder<'a, S>
 where
     S: signature_state::State,
-    S::Name: signature_state::IsSet,
     S::When: signature_state::IsSet,
     S::Email: signature_state::IsSet,
+    S::Name: signature_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Signature<'a> {
         Signature {
-            email: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            when: self.__unsafe_private_named.2.unwrap(),
+            email: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            when: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -997,9 +995,9 @@ where
         >,
     ) -> Signature<'a> {
         Signature {
-            email: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            when: self.__unsafe_private_named.2.unwrap(),
+            email: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            when: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/branch.rs b/crates/jacquard-api/src/sh_tangled/repo/branch.rs
index 9f8ff494..d2e3fc21 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/branch.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/branch.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -180,45 +183,45 @@ pub mod branch_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Repo;
         type Name;
+        type Repo;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Repo = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `repo` field to Set
-    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepo<S> {}
-    impl<S: State> State for SetRepo<S> {
-        type Repo = Set<members::repo>;
-        type Name = S::Name;
+        type Repo = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Repo = S::Repo;
         type Name = Set<members::name>;
+        type Repo = S::Repo;
+    }
+    ///State transition - sets the `repo` field to Set
+    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepo<S> {}
+    impl<S: State> State for SetRepo<S> {
+        type Name = S::Name;
+        type Repo = Set<members::repo>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `repo` field
-        pub struct repo(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `repo` field
+        pub struct repo(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BranchBuilder<'a, S: branch_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Branch<'a> {
@@ -232,9 +235,9 @@ impl<'a> BranchBuilder<'a, branch_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,11 +252,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BranchBuilder<'a, branch_state::SetName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -268,11 +271,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BranchBuilder<'a, branch_state::SetRepo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -280,14 +283,14 @@ where
 impl<'a, S> BranchBuilder<'a, S>
 where
     S: branch_state::State,
-    S::Repo: branch_state::IsSet,
     S::Name: branch_state::IsSet,
+    S::Repo: branch_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Branch<'a> {
         Branch {
-            name: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
         }
     }
 }
@@ -352,9 +355,9 @@ pub mod signature_state {
 
 /// Builder for constructing an instance of this type
 pub struct SignatureBuilder<'a, S: signature_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Signature<'a> {
@@ -368,9 +371,9 @@ impl<'a> SignatureBuilder<'a, signature_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -385,11 +388,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureBuilder<'a, signature_state::SetEmail<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -404,11 +407,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureBuilder<'a, signature_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -423,11 +426,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SignatureBuilder<'a, signature_state::SetWhen<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -442,9 +445,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Signature<'a> {
         Signature {
-            email: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            when: self.__unsafe_private_named.2.unwrap(),
+            email: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            when: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -457,9 +460,9 @@ where
         >,
     ) -> Signature<'a> {
         Signature {
-            email: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            when: self.__unsafe_private_named.2.unwrap(),
+            email: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            when: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/branches.rs b/crates/jacquard-api/src/sh_tangled/repo/branches.rs
index 5669a032..c2ed6aa9 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/branches.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/branches.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -156,9 +157,9 @@ pub mod branches_state {
 
 /// Builder for constructing an instance of this type
 pub struct BranchesBuilder<'a, S: branches_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Branches<'a> {
@@ -172,9 +173,9 @@ impl<'a> BranchesBuilder<'a, branches_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BranchesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,12 +183,12 @@ impl<'a> BranchesBuilder<'a, branches_state::Empty> {
 impl<'a, S: branches_state::State> BranchesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -195,12 +196,12 @@ impl<'a, S: branches_state::State> BranchesBuilder<'a, S> {
 impl<'a, S: branches_state::State> BranchesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -215,11 +216,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BranchesBuilder<'a, branches_state::SetRepo<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BranchesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,9 +233,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Branches<'a> {
         Branches {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            repo: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            repo: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/repo/collaborator.rs b/crates/jacquard-api/src/sh_tangled/repo/collaborator.rs
index 6c81e0b3..1a6ea5d6 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/collaborator.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/collaborator.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -110,59 +113,59 @@ pub mod collaborator_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
-        type Repo;
         type CreatedAt;
+        type Repo;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
-        type Repo = Unset;
         type CreatedAt = Unset;
+        type Repo = Unset;
+        type Subject = Unset;
     }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
         type Repo = S::Repo;
-        type CreatedAt = S::CreatedAt;
+        type Subject = S::Subject;
     }
     ///State transition - sets the `repo` field to Set
     pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepo<S> {}
     impl<S: State> State for SetRepo<S> {
-        type Subject = S::Subject;
-        type Repo = Set<members::repo>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+        type Repo = Set<members::repo>;
         type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
         type Repo = S::Repo;
-        type CreatedAt = Set<members::created_at>;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
-        ///Marker type for the `repo` field
-        pub struct repo(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `repo` field
+        pub struct repo(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CollaboratorBuilder<'a, S: collaborator_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Collaborator<'a> {
@@ -176,9 +179,9 @@ impl<'a> CollaboratorBuilder<'a, collaborator_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollaboratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -193,11 +196,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollaboratorBuilder<'a, collaborator_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollaboratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,11 +215,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CollaboratorBuilder<'a, collaborator_state::SetRepo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CollaboratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -231,11 +234,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> CollaboratorBuilder<'a, collaborator_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CollaboratorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -243,16 +246,16 @@ where
 impl<'a, S> CollaboratorBuilder<'a, S>
 where
     S: collaborator_state::State,
-    S::Subject: collaborator_state::IsSet,
-    S::Repo: collaborator_state::IsSet,
     S::CreatedAt: collaborator_state::IsSet,
+    S::Repo: collaborator_state::IsSet,
+    S::Subject: collaborator_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Collaborator<'a> {
         Collaborator {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -265,9 +268,9 @@ where
         >,
     ) -> Collaborator<'a> {
         Collaborator {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/compare.rs b/crates/jacquard-api/src/sh_tangled/repo/compare.rs
index 31956470..88a10815 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/compare.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/compare.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -196,9 +197,9 @@ pub mod compare_state {
 
 /// Builder for constructing an instance of this type
 pub struct CompareBuilder<'a, S: compare_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Compare<'a> {
@@ -212,9 +213,9 @@ impl<'a> CompareBuilder<'a, compare_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CompareBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -229,11 +230,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CompareBuilder<'a, compare_state::SetRepo<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CompareBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -248,11 +249,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CompareBuilder<'a, compare_state::SetRev1<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CompareBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -267,11 +268,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CompareBuilder<'a, compare_state::SetRev2<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CompareBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -286,9 +287,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Compare<'a> {
         Compare {
-            repo: self.__unsafe_private_named.0.unwrap(),
-            rev1: self.__unsafe_private_named.1.unwrap(),
-            rev2: self.__unsafe_private_named.2.unwrap(),
+            repo: self._fields.0.unwrap(),
+            rev1: self._fields.1.unwrap(),
+            rev2: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/repo/create.rs b/crates/jacquard-api/src/sh_tangled/repo/create.rs
index 6e0d9c02..fe5aa39f 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/create.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/create.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/sh_tangled/repo/delete.rs b/crates/jacquard-api/src/sh_tangled/repo/delete.rs
index 6439392f..cea2734f 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/delete.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/delete.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -115,9 +118,9 @@ pub mod delete_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeleteBuilder<'a, S: delete_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Delete<'a> {
@@ -131,9 +134,9 @@ impl<'a> DeleteBuilder<'a, delete_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,11 +151,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> DeleteBuilder<'a, delete_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeleteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -167,11 +170,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DeleteBuilder<'a, delete_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DeleteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -186,11 +189,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DeleteBuilder<'a, delete_state::SetRkey<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         DeleteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -205,9 +208,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Delete<'a> {
         Delete {
-            did: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            rkey: self.__unsafe_private_named.2.unwrap(),
+            did: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            rkey: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -220,9 +223,9 @@ where
         >,
     ) -> Delete<'a> {
         Delete {
-            did: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            rkey: self.__unsafe_private_named.2.unwrap(),
+            did: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            rkey: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/delete_branch.rs b/crates/jacquard-api/src/sh_tangled/repo/delete_branch.rs
index a36fdd6c..b0ea1439 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/delete_branch.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/delete_branch.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -60,45 +63,45 @@ pub mod delete_branch_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Repo;
         type Branch;
+        type Repo;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Repo = Unset;
         type Branch = Unset;
-    }
-    ///State transition - sets the `repo` field to Set
-    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepo<S> {}
-    impl<S: State> State for SetRepo<S> {
-        type Repo = Set<members::repo>;
-        type Branch = S::Branch;
+        type Repo = Unset;
     }
     ///State transition - sets the `branch` field to Set
     pub struct SetBranch<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBranch<S> {}
     impl<S: State> State for SetBranch<S> {
-        type Repo = S::Repo;
         type Branch = Set<members::branch>;
+        type Repo = S::Repo;
+    }
+    ///State transition - sets the `repo` field to Set
+    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepo<S> {}
+    impl<S: State> State for SetRepo<S> {
+        type Branch = S::Branch;
+        type Repo = Set<members::repo>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `repo` field
-        pub struct repo(());
         ///Marker type for the `branch` field
         pub struct branch(());
+        ///Marker type for the `repo` field
+        pub struct repo(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DeleteBranchBuilder<'a, S: delete_branch_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeleteBranch<'a> {
@@ -112,9 +115,9 @@ impl<'a> DeleteBranchBuilder<'a, delete_branch_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteBranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -129,11 +132,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DeleteBranchBuilder<'a, delete_branch_state::SetBranch<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeleteBranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,11 +151,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> DeleteBranchBuilder<'a, delete_branch_state::SetRepo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DeleteBranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -160,14 +163,14 @@ where
 impl<'a, S> DeleteBranchBuilder<'a, S>
 where
     S: delete_branch_state::State,
-    S::Repo: delete_branch_state::IsSet,
     S::Branch: delete_branch_state::IsSet,
+    S::Repo: delete_branch_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DeleteBranch<'a> {
         DeleteBranch {
-            branch: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
+            branch: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -180,8 +183,8 @@ where
         >,
     ) -> DeleteBranch<'a> {
         DeleteBranch {
-            branch: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
+            branch: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/diff.rs b/crates/jacquard-api/src/sh_tangled/repo/diff.rs
index 0d215ed8..49fa2aaf 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/diff.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/diff.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -169,9 +170,9 @@ pub mod diff_state {
 
 /// Builder for constructing an instance of this type
 pub struct DiffBuilder<'a, S: diff_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Diff<'a> {
@@ -185,9 +186,9 @@ impl<'a> DiffBuilder<'a, diff_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DiffBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -202,11 +203,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DiffBuilder<'a, diff_state::SetRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DiffBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,11 +222,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DiffBuilder<'a, diff_state::SetRepo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DiffBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,8 +240,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Diff<'a> {
         Diff {
-            r#ref: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
+            r#ref: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/repo/fork_status.rs b/crates/jacquard-api/src/sh_tangled/repo/fork_status.rs
index a52aad2a..f7e6d3eb 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/fork_status.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/fork_status.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -80,99 +83,99 @@ pub mod fork_status_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type Did;
         type Source;
-        type HiddenRef;
+        type Name;
         type Branch;
+        type HiddenRef;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type Did = Unset;
         type Source = Unset;
-        type HiddenRef = Unset;
+        type Name = Unset;
         type Branch = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Did = S::Did;
-        type Source = S::Source;
-        type HiddenRef = S::HiddenRef;
-        type Branch = S::Branch;
+        type HiddenRef = Unset;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type Name = S::Name;
         type Did = Set<members::did>;
         type Source = S::Source;
-        type HiddenRef = S::HiddenRef;
+        type Name = S::Name;
         type Branch = S::Branch;
+        type HiddenRef = S::HiddenRef;
     }
     ///State transition - sets the `source` field to Set
     pub struct SetSource<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSource<S> {}
     impl<S: State> State for SetSource<S> {
-        type Name = S::Name;
         type Did = S::Did;
         type Source = Set<members::source>;
-        type HiddenRef = S::HiddenRef;
+        type Name = S::Name;
         type Branch = S::Branch;
+        type HiddenRef = S::HiddenRef;
     }
-    ///State transition - sets the `hidden_ref` field to Set
-    pub struct SetHiddenRef<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHiddenRef<S> {}
-    impl<S: State> State for SetHiddenRef<S> {
-        type Name = S::Name;
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
         type Did = S::Did;
         type Source = S::Source;
-        type HiddenRef = Set<members::hidden_ref>;
+        type Name = Set<members::name>;
         type Branch = S::Branch;
+        type HiddenRef = S::HiddenRef;
     }
     ///State transition - sets the `branch` field to Set
     pub struct SetBranch<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBranch<S> {}
     impl<S: State> State for SetBranch<S> {
-        type Name = S::Name;
         type Did = S::Did;
         type Source = S::Source;
-        type HiddenRef = S::HiddenRef;
+        type Name = S::Name;
         type Branch = Set<members::branch>;
+        type HiddenRef = S::HiddenRef;
+    }
+    ///State transition - sets the `hidden_ref` field to Set
+    pub struct SetHiddenRef<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHiddenRef<S> {}
+    impl<S: State> State for SetHiddenRef<S> {
+        type Did = S::Did;
+        type Source = S::Source;
+        type Name = S::Name;
+        type Branch = S::Branch;
+        type HiddenRef = Set<members::hidden_ref>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `did` field
         pub struct did(());
         ///Marker type for the `source` field
         pub struct source(());
-        ///Marker type for the `hidden_ref` field
-        pub struct hidden_ref(());
+        ///Marker type for the `name` field
+        pub struct name(());
         ///Marker type for the `branch` field
         pub struct branch(());
+        ///Marker type for the `hidden_ref` field
+        pub struct hidden_ref(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ForkStatusBuilder<'a, S: fork_status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ForkStatus<'a> {
@@ -186,9 +189,9 @@ impl<'a> ForkStatusBuilder<'a, fork_status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ForkStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,11 +206,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ForkStatusBuilder<'a, fork_status_state::SetBranch<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ForkStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -222,11 +225,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ForkStatusBuilder<'a, fork_status_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ForkStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -241,11 +244,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ForkStatusBuilder<'a, fork_status_state::SetHiddenRef<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ForkStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -260,11 +263,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ForkStatusBuilder<'a, fork_status_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ForkStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -279,11 +282,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ForkStatusBuilder<'a, fork_status_state::SetSource<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ForkStatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -291,20 +294,20 @@ where
 impl<'a, S> ForkStatusBuilder<'a, S>
 where
     S: fork_status_state::State,
-    S::Name: fork_status_state::IsSet,
     S::Did: fork_status_state::IsSet,
     S::Source: fork_status_state::IsSet,
-    S::HiddenRef: fork_status_state::IsSet,
+    S::Name: fork_status_state::IsSet,
     S::Branch: fork_status_state::IsSet,
+    S::HiddenRef: fork_status_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ForkStatus<'a> {
         ForkStatus {
-            branch: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            hidden_ref: self.__unsafe_private_named.2.unwrap(),
-            name: self.__unsafe_private_named.3.unwrap(),
-            source: self.__unsafe_private_named.4.unwrap(),
+            branch: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            hidden_ref: self._fields.2.unwrap(),
+            name: self._fields.3.unwrap(),
+            source: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -317,11 +320,11 @@ where
         >,
     ) -> ForkStatus<'a> {
         ForkStatus {
-            branch: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            hidden_ref: self.__unsafe_private_named.2.unwrap(),
-            name: self.__unsafe_private_named.3.unwrap(),
-            source: self.__unsafe_private_named.4.unwrap(),
+            branch: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            hidden_ref: self._fields.2.unwrap(),
+            name: self._fields.3.unwrap(),
+            source: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/fork_sync.rs b/crates/jacquard-api/src/sh_tangled/repo/fork_sync.rs
index f3992f18..4c1dd3e3 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/fork_sync.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/fork_sync.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, AtUri};
@@ -69,79 +72,79 @@ pub mod fork_sync_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Source;
-        type Branch;
         type Name;
         type Did;
+        type Branch;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Source = Unset;
-        type Branch = Unset;
         type Name = Unset;
         type Did = Unset;
+        type Branch = Unset;
     }
     ///State transition - sets the `source` field to Set
     pub struct SetSource<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSource<S> {}
     impl<S: State> State for SetSource<S> {
         type Source = Set<members::source>;
-        type Branch = S::Branch;
-        type Name = S::Name;
-        type Did = S::Did;
-    }
-    ///State transition - sets the `branch` field to Set
-    pub struct SetBranch<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBranch<S> {}
-    impl<S: State> State for SetBranch<S> {
-        type Source = S::Source;
-        type Branch = Set<members::branch>;
         type Name = S::Name;
         type Did = S::Did;
+        type Branch = S::Branch;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
         type Source = S::Source;
-        type Branch = S::Branch;
         type Name = Set<members::name>;
         type Did = S::Did;
+        type Branch = S::Branch;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
         type Source = S::Source;
-        type Branch = S::Branch;
         type Name = S::Name;
         type Did = Set<members::did>;
+        type Branch = S::Branch;
+    }
+    ///State transition - sets the `branch` field to Set
+    pub struct SetBranch<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBranch<S> {}
+    impl<S: State> State for SetBranch<S> {
+        type Source = S::Source;
+        type Name = S::Name;
+        type Did = S::Did;
+        type Branch = Set<members::branch>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `source` field
         pub struct source(());
-        ///Marker type for the `branch` field
-        pub struct branch(());
         ///Marker type for the `name` field
         pub struct name(());
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `branch` field
+        pub struct branch(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ForkSyncBuilder<'a, S: fork_sync_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ForkSync<'a> {
@@ -155,9 +158,9 @@ impl<'a> ForkSyncBuilder<'a, fork_sync_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ForkSyncBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -172,11 +175,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ForkSyncBuilder<'a, fork_sync_state::SetBranch<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ForkSyncBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -191,11 +194,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ForkSyncBuilder<'a, fork_sync_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ForkSyncBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,11 +213,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ForkSyncBuilder<'a, fork_sync_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ForkSyncBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -229,11 +232,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ForkSyncBuilder<'a, fork_sync_state::SetSource<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ForkSyncBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -242,17 +245,17 @@ impl<'a, S> ForkSyncBuilder<'a, S>
 where
     S: fork_sync_state::State,
     S::Source: fork_sync_state::IsSet,
-    S::Branch: fork_sync_state::IsSet,
     S::Name: fork_sync_state::IsSet,
     S::Did: fork_sync_state::IsSet,
+    S::Branch: fork_sync_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ForkSync<'a> {
         ForkSync {
-            branch: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            source: self.__unsafe_private_named.3.unwrap(),
+            branch: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            source: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -265,10 +268,10 @@ where
         >,
     ) -> ForkSync<'a> {
         ForkSync {
-            branch: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            source: self.__unsafe_private_named.3.unwrap(),
+            branch: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            source: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/get_default_branch.rs b/crates/jacquard-api/src/sh_tangled/repo/get_default_branch.rs
index 68a50812..a9ea2c17 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/get_default_branch.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/get_default_branch.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -189,9 +192,9 @@ pub mod get_default_branch_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetDefaultBranchBuilder<'a, S: get_default_branch_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetDefaultBranch<'a> {
@@ -205,9 +208,9 @@ impl<'a> GetDefaultBranchBuilder<'a, get_default_branch_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetDefaultBranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -222,11 +225,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetDefaultBranchBuilder<'a, get_default_branch_state::SetRepo<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetDefaultBranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,7 +242,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetDefaultBranch<'a> {
         GetDefaultBranch {
-            repo: self.__unsafe_private_named.0.unwrap(),
+            repo: self._fields.0.unwrap(),
         }
     }
 }
@@ -254,59 +257,59 @@ pub mod signature_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type When;
         type Email;
         type Name;
-        type When;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type When = Unset;
         type Email = Unset;
         type Name = Unset;
-        type When = Unset;
+    }
+    ///State transition - sets the `when` field to Set
+    pub struct SetWhen<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetWhen<S> {}
+    impl<S: State> State for SetWhen<S> {
+        type When = Set<members::when>;
+        type Email = S::Email;
+        type Name = S::Name;
     }
     ///State transition - sets the `email` field to Set
     pub struct SetEmail<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEmail<S> {}
     impl<S: State> State for SetEmail<S> {
+        type When = S::When;
         type Email = Set<members::email>;
         type Name = S::Name;
-        type When = S::When;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Email = S::Email;
-        type Name = Set<members::name>;
         type When = S::When;
-    }
-    ///State transition - sets the `when` field to Set
-    pub struct SetWhen<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetWhen<S> {}
-    impl<S: State> State for SetWhen<S> {
         type Email = S::Email;
-        type Name = S::Name;
-        type When = Set<members::when>;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `when` field
+        pub struct when(());
         ///Marker type for the `email` field
         pub struct email(());
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `when` field
-        pub struct when(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SignatureBuilder<'a, S: signature_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Signature<'a> {
@@ -320,9 +323,9 @@ impl<'a> SignatureBuilder<'a, signature_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -337,11 +340,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureBuilder<'a, signature_state::SetEmail<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -356,11 +359,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureBuilder<'a, signature_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -375,11 +378,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SignatureBuilder<'a, signature_state::SetWhen<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -387,16 +390,16 @@ where
 impl<'a, S> SignatureBuilder<'a, S>
 where
     S: signature_state::State,
+    S::When: signature_state::IsSet,
     S::Email: signature_state::IsSet,
     S::Name: signature_state::IsSet,
-    S::When: signature_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Signature<'a> {
         Signature {
-            email: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            when: self.__unsafe_private_named.2.unwrap(),
+            email: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            when: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -409,9 +412,9 @@ where
         >,
     ) -> Signature<'a> {
         Signature {
-            email: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            when: self.__unsafe_private_named.2.unwrap(),
+            email: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            when: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/hidden_ref.rs b/crates/jacquard-api/src/sh_tangled/repo/hidden_ref.rs
index eed2f356..b7101ecf 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/hidden_ref.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/hidden_ref.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -82,59 +85,59 @@ pub mod hidden_ref_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Repo;
         type ForkRef;
         type RemoteRef;
+        type Repo;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Repo = Unset;
         type ForkRef = Unset;
         type RemoteRef = Unset;
-    }
-    ///State transition - sets the `repo` field to Set
-    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepo<S> {}
-    impl<S: State> State for SetRepo<S> {
-        type Repo = Set<members::repo>;
-        type ForkRef = S::ForkRef;
-        type RemoteRef = S::RemoteRef;
+        type Repo = Unset;
     }
     ///State transition - sets the `fork_ref` field to Set
     pub struct SetForkRef<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetForkRef<S> {}
     impl<S: State> State for SetForkRef<S> {
-        type Repo = S::Repo;
         type ForkRef = Set<members::fork_ref>;
         type RemoteRef = S::RemoteRef;
+        type Repo = S::Repo;
     }
     ///State transition - sets the `remote_ref` field to Set
     pub struct SetRemoteRef<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRemoteRef<S> {}
     impl<S: State> State for SetRemoteRef<S> {
-        type Repo = S::Repo;
         type ForkRef = S::ForkRef;
         type RemoteRef = Set<members::remote_ref>;
+        type Repo = S::Repo;
+    }
+    ///State transition - sets the `repo` field to Set
+    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepo<S> {}
+    impl<S: State> State for SetRepo<S> {
+        type ForkRef = S::ForkRef;
+        type RemoteRef = S::RemoteRef;
+        type Repo = Set<members::repo>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `repo` field
-        pub struct repo(());
         ///Marker type for the `fork_ref` field
         pub struct fork_ref(());
         ///Marker type for the `remote_ref` field
         pub struct remote_ref(());
+        ///Marker type for the `repo` field
+        pub struct repo(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct HiddenRefBuilder<'a, S: hidden_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> HiddenRef<'a> {
@@ -148,9 +151,9 @@ impl<'a> HiddenRefBuilder<'a, hidden_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HiddenRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -165,11 +168,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> HiddenRefBuilder<'a, hidden_ref_state::SetForkRef<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         HiddenRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -184,11 +187,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> HiddenRefBuilder<'a, hidden_ref_state::SetRemoteRef<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         HiddenRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,11 +206,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> HiddenRefBuilder<'a, hidden_ref_state::SetRepo<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         HiddenRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,16 +218,16 @@ where
 impl<'a, S> HiddenRefBuilder<'a, S>
 where
     S: hidden_ref_state::State,
-    S::Repo: hidden_ref_state::IsSet,
     S::ForkRef: hidden_ref_state::IsSet,
     S::RemoteRef: hidden_ref_state::IsSet,
+    S::Repo: hidden_ref_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> HiddenRef<'a> {
         HiddenRef {
-            fork_ref: self.__unsafe_private_named.0.unwrap(),
-            remote_ref: self.__unsafe_private_named.1.unwrap(),
-            repo: self.__unsafe_private_named.2.unwrap(),
+            fork_ref: self._fields.0.unwrap(),
+            remote_ref: self._fields.1.unwrap(),
+            repo: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -237,9 +240,9 @@ where
         >,
     ) -> HiddenRef<'a> {
         HiddenRef {
-            fork_ref: self.__unsafe_private_named.0.unwrap(),
-            remote_ref: self.__unsafe_private_named.1.unwrap(),
-            repo: self.__unsafe_private_named.2.unwrap(),
+            fork_ref: self._fields.0.unwrap(),
+            remote_ref: self._fields.1.unwrap(),
+            repo: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/issue.rs b/crates/jacquard-api/src/sh_tangled/repo/issue.rs
index 9306a7aa..aa353668 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/issue.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/issue.rs
@@ -8,7 +8,11 @@
 pub mod comment;
 pub mod state;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -171,8 +175,8 @@ pub mod issue_state {
 
 /// Builder for constructing an instance of this type
 pub struct IssueBuilder<'a, S: issue_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<Vec<Did<'a>>>,
@@ -180,7 +184,7 @@ pub struct IssueBuilder<'a, S: issue_state::State> {
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Issue<'a> {
@@ -194,9 +198,9 @@ impl<'a> IssueBuilder<'a, issue_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IssueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,12 +208,12 @@ impl<'a> IssueBuilder<'a, issue_state::Empty> {
 impl<'a, S: issue_state::State> IssueBuilder<'a, S> {
     /// Set the `body` field (optional)
     pub fn body(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `body` field to an Option value (optional)
     pub fn maybe_body(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -224,11 +228,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> IssueBuilder<'a, issue_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         IssueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -236,12 +240,12 @@ where
 impl<'a, S: issue_state::State> IssueBuilder<'a, S> {
     /// Set the `mentions` field (optional)
     pub fn mentions(mut self, value: impl Into<Option<Vec<Did<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<Vec<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -249,12 +253,12 @@ impl<'a, S: issue_state::State> IssueBuilder<'a, S> {
 impl<'a, S: issue_state::State> IssueBuilder<'a, S> {
     /// Set the `references` field (optional)
     pub fn references(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `references` field to an Option value (optional)
     pub fn maybe_references(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -269,11 +273,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> IssueBuilder<'a, issue_state::SetRepo<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         IssueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -288,11 +292,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> IssueBuilder<'a, issue_state::SetTitle<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         IssueBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -307,12 +311,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Issue<'a> {
         Issue {
-            body: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            mentions: self.__unsafe_private_named.2,
-            references: self.__unsafe_private_named.3,
-            repo: self.__unsafe_private_named.4.unwrap(),
-            title: self.__unsafe_private_named.5.unwrap(),
+            body: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            mentions: self._fields.2,
+            references: self._fields.3,
+            repo: self._fields.4.unwrap(),
+            title: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -325,12 +329,12 @@ where
         >,
     ) -> Issue<'a> {
         Issue {
-            body: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            mentions: self.__unsafe_private_named.2,
-            references: self.__unsafe_private_named.3,
-            repo: self.__unsafe_private_named.4.unwrap(),
-            title: self.__unsafe_private_named.5.unwrap(),
+            body: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            mentions: self._fields.2,
+            references: self._fields.3,
+            repo: self._fields.4.unwrap(),
+            title: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/issue/comment.rs b/crates/jacquard-api/src/sh_tangled/repo/issue/comment.rs
index 75c6bcdd..87e26518 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/issue/comment.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/issue/comment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -118,58 +121,58 @@ pub mod comment_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type CreatedAt;
         type Issue;
         type Body;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type CreatedAt = Unset;
         type Issue = Unset;
         type Body = Unset;
-        type CreatedAt = Unset;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type Issue = S::Issue;
+        type Body = S::Body;
     }
     ///State transition - sets the `issue` field to Set
     pub struct SetIssue<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIssue<S> {}
     impl<S: State> State for SetIssue<S> {
+        type CreatedAt = S::CreatedAt;
         type Issue = Set<members::issue>;
         type Body = S::Body;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `body` field to Set
     pub struct SetBody<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBody<S> {}
     impl<S: State> State for SetBody<S> {
-        type Issue = S::Issue;
-        type Body = Set<members::body>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type Issue = S::Issue;
-        type Body = S::Body;
-        type CreatedAt = Set<members::created_at>;
+        type Body = Set<members::body>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `issue` field
         pub struct issue(());
         ///Marker type for the `body` field
         pub struct body(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CommentBuilder<'a, S: comment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<AtUri<'a>>,
@@ -177,7 +180,7 @@ pub struct CommentBuilder<'a, S: comment_state::State> {
         Option<Vec<AtUri<'a>>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Comment<'a> {
@@ -191,9 +194,9 @@ impl<'a> CommentBuilder<'a, comment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -208,11 +211,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetBody<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -227,11 +230,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CommentBuilder<'a, comment_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,11 +249,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetIssue<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -258,12 +261,12 @@ where
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `mentions` field (optional)
     pub fn mentions(mut self, value: impl Into<Option<Vec<Did<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<Vec<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -271,12 +274,12 @@ impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `references` field (optional)
     pub fn references(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `references` field to an Option value (optional)
     pub fn maybe_references(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -284,12 +287,12 @@ impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `replyTo` field (optional)
     pub fn reply_to(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `replyTo` field to an Option value (optional)
     pub fn maybe_reply_to(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -297,19 +300,19 @@ impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
 impl<'a, S> CommentBuilder<'a, S>
 where
     S: comment_state::State,
+    S::CreatedAt: comment_state::IsSet,
     S::Issue: comment_state::IsSet,
     S::Body: comment_state::IsSet,
-    S::CreatedAt: comment_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Comment<'a> {
         Comment {
-            body: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            issue: self.__unsafe_private_named.2.unwrap(),
-            mentions: self.__unsafe_private_named.3,
-            references: self.__unsafe_private_named.4,
-            reply_to: self.__unsafe_private_named.5,
+            body: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            issue: self._fields.2.unwrap(),
+            mentions: self._fields.3,
+            references: self._fields.4,
+            reply_to: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -322,12 +325,12 @@ where
         >,
     ) -> Comment<'a> {
         Comment {
-            body: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            issue: self.__unsafe_private_named.2.unwrap(),
-            mentions: self.__unsafe_private_named.3,
-            references: self.__unsafe_private_named.4,
-            reply_to: self.__unsafe_private_named.5,
+            body: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            issue: self._fields.2.unwrap(),
+            mentions: self._fields.3,
+            references: self._fields.4,
+            reply_to: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/issue/state.rs b/crates/jacquard-api/src/sh_tangled/repo/issue/state.rs
index 3d16f60c..a5f1def8 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/issue/state.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/issue/state.rs
@@ -8,7 +8,11 @@
 pub mod closed;
 pub mod open;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -242,9 +246,9 @@ pub mod state_state {
 
 /// Builder for constructing an instance of this type
 pub struct StateBuilder<'a, S: state_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<StateState<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<StateState<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> State<'a> {
@@ -258,9 +262,9 @@ impl<'a> StateBuilder<'a, state_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -275,11 +279,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> StateBuilder<'a, state_state::SetIssue<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -294,11 +298,11 @@ where
         mut self,
         value: impl Into<StateState<'a>>,
     ) -> StateBuilder<'a, state_state::SetState<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -312,8 +316,8 @@ where
     /// Build the final struct
     pub fn build(self) -> State<'a> {
         State {
-            issue: self.__unsafe_private_named.0.unwrap(),
-            state: self.__unsafe_private_named.1.unwrap(),
+            issue: self._fields.0.unwrap(),
+            state: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -326,8 +330,8 @@ where
         >,
     ) -> State<'a> {
         State {
-            issue: self.__unsafe_private_named.0.unwrap(),
-            state: self.__unsafe_private_named.1.unwrap(),
+            issue: self._fields.0.unwrap(),
+            state: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/languages.rs b/crates/jacquard-api/src/sh_tangled/repo/languages.rs
index 3f688ada..4321378c 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/languages.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/languages.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -181,49 +184,49 @@ pub mod language_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type Percentage;
+        type Name;
         type Size;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type Percentage = Unset;
+        type Name = Unset;
         type Size = Unset;
     }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Percentage = S::Percentage;
-        type Size = S::Size;
-    }
     ///State transition - sets the `percentage` field to Set
     pub struct SetPercentage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPercentage<S> {}
     impl<S: State> State for SetPercentage<S> {
-        type Name = S::Name;
         type Percentage = Set<members::percentage>;
+        type Name = S::Name;
+        type Size = S::Size;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Percentage = S::Percentage;
+        type Name = Set<members::name>;
         type Size = S::Size;
     }
     ///State transition - sets the `size` field to Set
     pub struct SetSize<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSize<S> {}
     impl<S: State> State for SetSize<S> {
-        type Name = S::Name;
         type Percentage = S::Percentage;
+        type Name = S::Name;
         type Size = Set<members::size>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `percentage` field
         pub struct percentage(());
+        ///Marker type for the `name` field
+        pub struct name(());
         ///Marker type for the `size` field
         pub struct size(());
     }
@@ -231,8 +234,8 @@ pub mod language_state {
 
 /// Builder for constructing an instance of this type
 pub struct LanguageBuilder<'a, S: language_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Vec<CowStr<'a>>>,
         Option<i64>,
@@ -240,7 +243,7 @@ pub struct LanguageBuilder<'a, S: language_state::State> {
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Language<'a> {
@@ -254,9 +257,9 @@ impl<'a> LanguageBuilder<'a, language_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LanguageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -264,12 +267,12 @@ impl<'a> LanguageBuilder<'a, language_state::Empty> {
 impl<'a, S: language_state::State> LanguageBuilder<'a, S> {
     /// Set the `color` field (optional)
     pub fn color(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `color` field to an Option value (optional)
     pub fn maybe_color(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -277,12 +280,12 @@ impl<'a, S: language_state::State> LanguageBuilder<'a, S> {
 impl<'a, S: language_state::State> LanguageBuilder<'a, S> {
     /// Set the `extensions` field (optional)
     pub fn extensions(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `extensions` field to an Option value (optional)
     pub fn maybe_extensions(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -290,12 +293,12 @@ impl<'a, S: language_state::State> LanguageBuilder<'a, S> {
 impl<'a, S: language_state::State> LanguageBuilder<'a, S> {
     /// Set the `fileCount` field (optional)
     pub fn file_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `fileCount` field to an Option value (optional)
     pub fn maybe_file_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -310,11 +313,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LanguageBuilder<'a, language_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LanguageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -329,11 +332,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> LanguageBuilder<'a, language_state::SetPercentage<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         LanguageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -348,11 +351,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> LanguageBuilder<'a, language_state::SetSize<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         LanguageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -360,19 +363,19 @@ where
 impl<'a, S> LanguageBuilder<'a, S>
 where
     S: language_state::State,
-    S::Name: language_state::IsSet,
     S::Percentage: language_state::IsSet,
+    S::Name: language_state::IsSet,
     S::Size: language_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Language<'a> {
         Language {
-            color: self.__unsafe_private_named.0,
-            extensions: self.__unsafe_private_named.1,
-            file_count: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            percentage: self.__unsafe_private_named.4.unwrap(),
-            size: self.__unsafe_private_named.5.unwrap(),
+            color: self._fields.0,
+            extensions: self._fields.1,
+            file_count: self._fields.2,
+            name: self._fields.3.unwrap(),
+            percentage: self._fields.4.unwrap(),
+            size: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -385,12 +388,12 @@ where
         >,
     ) -> Language<'a> {
         Language {
-            color: self.__unsafe_private_named.0,
-            extensions: self.__unsafe_private_named.1,
-            file_count: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            percentage: self.__unsafe_private_named.4.unwrap(),
-            size: self.__unsafe_private_named.5.unwrap(),
+            color: self._fields.0,
+            extensions: self._fields.1,
+            file_count: self._fields.2,
+            name: self._fields.3.unwrap(),
+            percentage: self._fields.4.unwrap(),
+            size: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -556,9 +559,9 @@ pub mod languages_state {
 
 /// Builder for constructing an instance of this type
 pub struct LanguagesBuilder<'a, S: languages_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Languages<'a> {
@@ -572,9 +575,9 @@ impl<'a> LanguagesBuilder<'a, languages_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LanguagesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -582,12 +585,12 @@ impl<'a> LanguagesBuilder<'a, languages_state::Empty> {
 impl<'a, S: languages_state::State> LanguagesBuilder<'a, S> {
     /// Set the `ref` field (optional)
     pub fn r#ref(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `ref` field to an Option value (optional)
     pub fn maybe_ref(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -602,11 +605,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LanguagesBuilder<'a, languages_state::SetRepo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LanguagesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -619,8 +622,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Languages<'a> {
         Languages {
-            r#ref: self.__unsafe_private_named.0,
-            repo: self.__unsafe_private_named.1.unwrap(),
+            r#ref: self._fields.0,
+            repo: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/repo/list_secrets.rs b/crates/jacquard-api/src/sh_tangled/repo/list_secrets.rs
index c20cba7d..7fed96d5 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/list_secrets.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/list_secrets.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,9 +149,9 @@ pub mod list_secrets_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListSecretsBuilder<'a, S: list_secrets_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListSecrets<'a> {
@@ -162,9 +165,9 @@ impl<'a> ListSecretsBuilder<'a, list_secrets_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListSecretsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListSecretsBuilder<'a, list_secrets_state::SetRepo<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListSecretsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,7 +199,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ListSecrets<'a> {
         ListSecrets {
-            repo: self.__unsafe_private_named.0.unwrap(),
+            repo: self._fields.0.unwrap(),
         }
     }
 }
@@ -211,8 +214,8 @@ pub mod secret_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Repo;
         type CreatedBy;
+        type Repo;
         type CreatedAt;
         type Key;
     }
@@ -220,26 +223,26 @@ pub mod secret_state {
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Repo = Unset;
         type CreatedBy = Unset;
+        type Repo = Unset;
         type CreatedAt = Unset;
         type Key = Unset;
     }
-    ///State transition - sets the `repo` field to Set
-    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepo<S> {}
-    impl<S: State> State for SetRepo<S> {
-        type Repo = Set<members::repo>;
-        type CreatedBy = S::CreatedBy;
-        type CreatedAt = S::CreatedAt;
-        type Key = S::Key;
-    }
     ///State transition - sets the `created_by` field to Set
     pub struct SetCreatedBy<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedBy<S> {}
     impl<S: State> State for SetCreatedBy<S> {
-        type Repo = S::Repo;
         type CreatedBy = Set<members::created_by>;
+        type Repo = S::Repo;
+        type CreatedAt = S::CreatedAt;
+        type Key = S::Key;
+    }
+    ///State transition - sets the `repo` field to Set
+    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepo<S> {}
+    impl<S: State> State for SetRepo<S> {
+        type CreatedBy = S::CreatedBy;
+        type Repo = Set<members::repo>;
         type CreatedAt = S::CreatedAt;
         type Key = S::Key;
     }
@@ -247,8 +250,8 @@ pub mod secret_state {
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Repo = S::Repo;
         type CreatedBy = S::CreatedBy;
+        type Repo = S::Repo;
         type CreatedAt = Set<members::created_at>;
         type Key = S::Key;
     }
@@ -256,18 +259,18 @@ pub mod secret_state {
     pub struct SetKey<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetKey<S> {}
     impl<S: State> State for SetKey<S> {
-        type Repo = S::Repo;
         type CreatedBy = S::CreatedBy;
+        type Repo = S::Repo;
         type CreatedAt = S::CreatedAt;
         type Key = Set<members::key>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `repo` field
-        pub struct repo(());
         ///Marker type for the `created_by` field
         pub struct created_by(());
+        ///Marker type for the `repo` field
+        pub struct repo(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `key` field
@@ -277,14 +280,9 @@ pub mod secret_state {
 
 /// Builder for constructing an instance of this type
 pub struct SecretBuilder<'a, S: secret_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<Did<'a>>,
-        Option<CowStr<'a>>,
-        Option<AtUri<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Secret<'a> {
@@ -298,9 +296,9 @@ impl<'a> SecretBuilder<'a, secret_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SecretBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -315,11 +313,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SecretBuilder<'a, secret_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SecretBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -334,11 +332,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> SecretBuilder<'a, secret_state::SetCreatedBy<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SecretBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -353,11 +351,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SecretBuilder<'a, secret_state::SetKey<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SecretBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -372,11 +370,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SecretBuilder<'a, secret_state::SetRepo<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SecretBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -384,18 +382,18 @@ where
 impl<'a, S> SecretBuilder<'a, S>
 where
     S: secret_state::State,
-    S::Repo: secret_state::IsSet,
     S::CreatedBy: secret_state::IsSet,
+    S::Repo: secret_state::IsSet,
     S::CreatedAt: secret_state::IsSet,
     S::Key: secret_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Secret<'a> {
         Secret {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            created_by: self.__unsafe_private_named.1.unwrap(),
-            key: self.__unsafe_private_named.2.unwrap(),
-            repo: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            created_by: self._fields.1.unwrap(),
+            key: self._fields.2.unwrap(),
+            repo: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -408,10 +406,10 @@ where
         >,
     ) -> Secret<'a> {
         Secret {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            created_by: self.__unsafe_private_named.1.unwrap(),
-            key: self.__unsafe_private_named.2.unwrap(),
-            repo: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            created_by: self._fields.1.unwrap(),
+            key: self._fields.2.unwrap(),
+            repo: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/log.rs b/crates/jacquard-api/src/sh_tangled/repo/log.rs
index 909aa35e..6bced3b7 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/log.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/log.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -199,15 +200,15 @@ pub mod log_state {
 
 /// Builder for constructing an instance of this type
 pub struct LogBuilder<'a, S: log_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<i64>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Log<'a> {
@@ -221,9 +222,9 @@ impl<'a> LogBuilder<'a, log_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -231,12 +232,12 @@ impl<'a> LogBuilder<'a, log_state::Empty> {
 impl<'a, S: log_state::State> LogBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -244,12 +245,12 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
 impl<'a, S: log_state::State> LogBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -257,12 +258,12 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
 impl<'a, S: log_state::State> LogBuilder<'a, S> {
     /// Set the `path` field (optional)
     pub fn path(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `path` field to an Option value (optional)
     pub fn maybe_path(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -277,11 +278,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogBuilder<'a, log_state::SetRef<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -296,11 +297,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LogBuilder<'a, log_state::SetRepo<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         LogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -314,11 +315,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Log<'a> {
         Log {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            path: self.__unsafe_private_named.2,
-            r#ref: self.__unsafe_private_named.3.unwrap(),
-            repo: self.__unsafe_private_named.4.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            path: self._fields.2,
+            r#ref: self._fields.3.unwrap(),
+            repo: self._fields.4.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/repo/merge.rs b/crates/jacquard-api/src/sh_tangled/repo/merge.rs
index 859ed72f..f7688d8e 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/merge.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/merge.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -84,74 +87,74 @@ pub mod merge_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type Did;
         type Patch;
         type Branch;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type Did = Unset;
         type Patch = Unset;
         type Branch = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Did = S::Did;
-        type Patch = S::Patch;
-        type Branch = S::Branch;
+        type Name = Unset;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type Name = S::Name;
         type Did = Set<members::did>;
         type Patch = S::Patch;
         type Branch = S::Branch;
+        type Name = S::Name;
     }
     ///State transition - sets the `patch` field to Set
     pub struct SetPatch<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPatch<S> {}
     impl<S: State> State for SetPatch<S> {
-        type Name = S::Name;
         type Did = S::Did;
         type Patch = Set<members::patch>;
         type Branch = S::Branch;
+        type Name = S::Name;
     }
     ///State transition - sets the `branch` field to Set
     pub struct SetBranch<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBranch<S> {}
     impl<S: State> State for SetBranch<S> {
-        type Name = S::Name;
         type Did = S::Did;
         type Patch = S::Patch;
         type Branch = Set<members::branch>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Did = S::Did;
+        type Patch = S::Patch;
+        type Branch = S::Branch;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `did` field
         pub struct did(());
         ///Marker type for the `patch` field
         pub struct patch(());
         ///Marker type for the `branch` field
         pub struct branch(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MergeBuilder<'a, S: merge_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -161,7 +164,7 @@ pub struct MergeBuilder<'a, S: merge_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Merge<'a> {
@@ -175,9 +178,9 @@ impl<'a> MergeBuilder<'a, merge_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MergeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -185,12 +188,12 @@ impl<'a> MergeBuilder<'a, merge_state::Empty> {
 impl<'a, S: merge_state::State> MergeBuilder<'a, S> {
     /// Set the `authorEmail` field (optional)
     pub fn author_email(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `authorEmail` field to an Option value (optional)
     pub fn maybe_author_email(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -198,12 +201,12 @@ impl<'a, S: merge_state::State> MergeBuilder<'a, S> {
 impl<'a, S: merge_state::State> MergeBuilder<'a, S> {
     /// Set the `authorName` field (optional)
     pub fn author_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `authorName` field to an Option value (optional)
     pub fn maybe_author_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -218,11 +221,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MergeBuilder<'a, merge_state::SetBranch<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         MergeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -230,12 +233,12 @@ where
 impl<'a, S: merge_state::State> MergeBuilder<'a, S> {
     /// Set the `commitBody` field (optional)
     pub fn commit_body(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `commitBody` field to an Option value (optional)
     pub fn maybe_commit_body(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -243,12 +246,12 @@ impl<'a, S: merge_state::State> MergeBuilder<'a, S> {
 impl<'a, S: merge_state::State> MergeBuilder<'a, S> {
     /// Set the `commitMessage` field (optional)
     pub fn commit_message(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `commitMessage` field to an Option value (optional)
     pub fn maybe_commit_message(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -263,11 +266,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MergeBuilder<'a, merge_state::SetDid<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         MergeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -282,11 +285,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MergeBuilder<'a, merge_state::SetName<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         MergeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -301,11 +304,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MergeBuilder<'a, merge_state::SetPatch<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         MergeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -313,22 +316,22 @@ where
 impl<'a, S> MergeBuilder<'a, S>
 where
     S: merge_state::State,
-    S::Name: merge_state::IsSet,
     S::Did: merge_state::IsSet,
     S::Patch: merge_state::IsSet,
     S::Branch: merge_state::IsSet,
+    S::Name: merge_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Merge<'a> {
         Merge {
-            author_email: self.__unsafe_private_named.0,
-            author_name: self.__unsafe_private_named.1,
-            branch: self.__unsafe_private_named.2.unwrap(),
-            commit_body: self.__unsafe_private_named.3,
-            commit_message: self.__unsafe_private_named.4,
-            did: self.__unsafe_private_named.5.unwrap(),
-            name: self.__unsafe_private_named.6.unwrap(),
-            patch: self.__unsafe_private_named.7.unwrap(),
+            author_email: self._fields.0,
+            author_name: self._fields.1,
+            branch: self._fields.2.unwrap(),
+            commit_body: self._fields.3,
+            commit_message: self._fields.4,
+            did: self._fields.5.unwrap(),
+            name: self._fields.6.unwrap(),
+            patch: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -341,14 +344,14 @@ where
         >,
     ) -> Merge<'a> {
         Merge {
-            author_email: self.__unsafe_private_named.0,
-            author_name: self.__unsafe_private_named.1,
-            branch: self.__unsafe_private_named.2.unwrap(),
-            commit_body: self.__unsafe_private_named.3,
-            commit_message: self.__unsafe_private_named.4,
-            did: self.__unsafe_private_named.5.unwrap(),
-            name: self.__unsafe_private_named.6.unwrap(),
-            patch: self.__unsafe_private_named.7.unwrap(),
+            author_email: self._fields.0,
+            author_name: self._fields.1,
+            branch: self._fields.2.unwrap(),
+            commit_body: self._fields.3,
+            commit_message: self._fields.4,
+            did: self._fields.5.unwrap(),
+            name: self._fields.6.unwrap(),
+            patch: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/merge_check.rs b/crates/jacquard-api/src/sh_tangled/repo/merge_check.rs
index 831f9def..4135e410 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/merge_check.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/merge_check.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -308,14 +311,14 @@ pub mod merge_check_state {
 
 /// Builder for constructing an instance of this type
 pub struct MergeCheckBuilder<'a, S: merge_check_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MergeCheck<'a> {
@@ -329,9 +332,9 @@ impl<'a> MergeCheckBuilder<'a, merge_check_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MergeCheckBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -346,11 +349,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MergeCheckBuilder<'a, merge_check_state::SetBranch<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MergeCheckBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -365,11 +368,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MergeCheckBuilder<'a, merge_check_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MergeCheckBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -384,11 +387,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MergeCheckBuilder<'a, merge_check_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         MergeCheckBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -403,11 +406,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MergeCheckBuilder<'a, merge_check_state::SetPatch<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         MergeCheckBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -423,10 +426,10 @@ where
     /// Build the final struct
     pub fn build(self) -> MergeCheck<'a> {
         MergeCheck {
-            branch: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            patch: self.__unsafe_private_named.3.unwrap(),
+            branch: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            patch: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -439,10 +442,10 @@ where
         >,
     ) -> MergeCheck<'a> {
         MergeCheck {
-            branch: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            patch: self.__unsafe_private_named.3.unwrap(),
+            branch: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            patch: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/pull.rs b/crates/jacquard-api/src/sh_tangled/repo/pull.rs
index 8a54567c..9b92f42a 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/pull.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/pull.rs
@@ -8,7 +8,11 @@
 pub mod comment;
 pub mod status;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -237,74 +241,74 @@ pub mod pull_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Target;
         type Title;
-        type CreatedAt;
         type PatchBlob;
+        type Target;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Target = Unset;
         type Title = Unset;
-        type CreatedAt = Unset;
         type PatchBlob = Unset;
-    }
-    ///State transition - sets the `target` field to Set
-    pub struct SetTarget<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTarget<S> {}
-    impl<S: State> State for SetTarget<S> {
-        type Target = Set<members::target>;
-        type Title = S::Title;
-        type CreatedAt = S::CreatedAt;
-        type PatchBlob = S::PatchBlob;
+        type Target = Unset;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Target = S::Target;
         type Title = Set<members::title>;
-        type CreatedAt = S::CreatedAt;
         type PatchBlob = S::PatchBlob;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type Target = S::Target;
-        type Title = S::Title;
-        type CreatedAt = Set<members::created_at>;
-        type PatchBlob = S::PatchBlob;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `patch_blob` field to Set
     pub struct SetPatchBlob<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPatchBlob<S> {}
     impl<S: State> State for SetPatchBlob<S> {
+        type Title = S::Title;
+        type PatchBlob = Set<members::patch_blob>;
         type Target = S::Target;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `target` field to Set
+    pub struct SetTarget<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTarget<S> {}
+    impl<S: State> State for SetTarget<S> {
         type Title = S::Title;
+        type PatchBlob = S::PatchBlob;
+        type Target = Set<members::target>;
         type CreatedAt = S::CreatedAt;
-        type PatchBlob = Set<members::patch_blob>;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Title = S::Title;
+        type PatchBlob = S::PatchBlob;
+        type Target = S::Target;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `target` field
-        pub struct target(());
         ///Marker type for the `title` field
         pub struct title(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `patch_blob` field
         pub struct patch_blob(());
+        ///Marker type for the `target` field
+        pub struct target(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PullBuilder<'a, S: pull_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<Vec<Did<'a>>>,
@@ -315,7 +319,7 @@ pub struct PullBuilder<'a, S: pull_state::State> {
         Option<pull::Target<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Pull<'a> {
@@ -329,19 +333,9 @@ impl<'a> PullBuilder<'a, pull_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PullBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -349,12 +343,12 @@ impl<'a> PullBuilder<'a, pull_state::Empty> {
 impl<'a, S: pull_state::State> PullBuilder<'a, S> {
     /// Set the `body` field (optional)
     pub fn body(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `body` field to an Option value (optional)
     pub fn maybe_body(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -369,11 +363,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PullBuilder<'a, pull_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PullBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -381,12 +375,12 @@ where
 impl<'a, S: pull_state::State> PullBuilder<'a, S> {
     /// Set the `mentions` field (optional)
     pub fn mentions(mut self, value: impl Into<Option<Vec<Did<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<Vec<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -394,12 +388,12 @@ impl<'a, S: pull_state::State> PullBuilder<'a, S> {
 impl<'a, S: pull_state::State> PullBuilder<'a, S> {
     /// Set the `patch` field (optional)
     pub fn patch(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `patch` field to an Option value (optional)
     pub fn maybe_patch(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -414,11 +408,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> PullBuilder<'a, pull_state::SetPatchBlob<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PullBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -426,12 +420,12 @@ where
 impl<'a, S: pull_state::State> PullBuilder<'a, S> {
     /// Set the `references` field (optional)
     pub fn references(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `references` field to an Option value (optional)
     pub fn maybe_references(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -439,12 +433,12 @@ impl<'a, S: pull_state::State> PullBuilder<'a, S> {
 impl<'a, S: pull_state::State> PullBuilder<'a, S> {
     /// Set the `source` field (optional)
     pub fn source(mut self, value: impl Into<Option<pull::Source<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `source` field to an Option value (optional)
     pub fn maybe_source(mut self, value: Option<pull::Source<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -459,11 +453,11 @@ where
         mut self,
         value: impl Into<pull::Target<'a>>,
     ) -> PullBuilder<'a, pull_state::SetTarget<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         PullBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -478,11 +472,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PullBuilder<'a, pull_state::SetTitle<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         PullBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -490,23 +484,23 @@ where
 impl<'a, S> PullBuilder<'a, S>
 where
     S: pull_state::State,
-    S::Target: pull_state::IsSet,
     S::Title: pull_state::IsSet,
-    S::CreatedAt: pull_state::IsSet,
     S::PatchBlob: pull_state::IsSet,
+    S::Target: pull_state::IsSet,
+    S::CreatedAt: pull_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Pull<'a> {
         Pull {
-            body: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            mentions: self.__unsafe_private_named.2,
-            patch: self.__unsafe_private_named.3,
-            patch_blob: self.__unsafe_private_named.4.unwrap(),
-            references: self.__unsafe_private_named.5,
-            source: self.__unsafe_private_named.6,
-            target: self.__unsafe_private_named.7.unwrap(),
-            title: self.__unsafe_private_named.8.unwrap(),
+            body: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            mentions: self._fields.2,
+            patch: self._fields.3,
+            patch_blob: self._fields.4.unwrap(),
+            references: self._fields.5,
+            source: self._fields.6,
+            target: self._fields.7.unwrap(),
+            title: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -519,15 +513,15 @@ where
         >,
     ) -> Pull<'a> {
         Pull {
-            body: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            mentions: self.__unsafe_private_named.2,
-            patch: self.__unsafe_private_named.3,
-            patch_blob: self.__unsafe_private_named.4.unwrap(),
-            references: self.__unsafe_private_named.5,
-            source: self.__unsafe_private_named.6,
-            target: self.__unsafe_private_named.7.unwrap(),
-            title: self.__unsafe_private_named.8.unwrap(),
+            body: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            mentions: self._fields.2,
+            patch: self._fields.3,
+            patch_blob: self._fields.4.unwrap(),
+            references: self._fields.5,
+            source: self._fields.6,
+            target: self._fields.7.unwrap(),
+            title: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -705,45 +699,45 @@ pub mod target_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Branch;
         type Repo;
+        type Branch;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Branch = Unset;
         type Repo = Unset;
-    }
-    ///State transition - sets the `branch` field to Set
-    pub struct SetBranch<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBranch<S> {}
-    impl<S: State> State for SetBranch<S> {
-        type Branch = Set<members::branch>;
-        type Repo = S::Repo;
+        type Branch = Unset;
     }
     ///State transition - sets the `repo` field to Set
     pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepo<S> {}
     impl<S: State> State for SetRepo<S> {
-        type Branch = S::Branch;
         type Repo = Set<members::repo>;
+        type Branch = S::Branch;
+    }
+    ///State transition - sets the `branch` field to Set
+    pub struct SetBranch<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBranch<S> {}
+    impl<S: State> State for SetBranch<S> {
+        type Repo = S::Repo;
+        type Branch = Set<members::branch>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `branch` field
-        pub struct branch(());
         ///Marker type for the `repo` field
         pub struct repo(());
+        ///Marker type for the `branch` field
+        pub struct branch(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TargetBuilder<'a, S: target_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Target<'a> {
@@ -757,9 +751,9 @@ impl<'a> TargetBuilder<'a, target_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -774,11 +768,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TargetBuilder<'a, target_state::SetBranch<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -793,11 +787,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> TargetBuilder<'a, target_state::SetRepo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TargetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -805,14 +799,14 @@ where
 impl<'a, S> TargetBuilder<'a, S>
 where
     S: target_state::State,
-    S::Branch: target_state::IsSet,
     S::Repo: target_state::IsSet,
+    S::Branch: target_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Target<'a> {
         Target {
-            branch: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
+            branch: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -825,8 +819,8 @@ where
         >,
     ) -> Target<'a> {
         Target {
-            branch: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
+            branch: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/pull/comment.rs b/crates/jacquard-api/src/sh_tangled/repo/pull/comment.rs
index f44ec0e0..1d247c8b 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/pull/comment.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/pull/comment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -115,65 +118,65 @@ pub mod comment_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Pull;
         type Body;
         type CreatedAt;
-        type Pull;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Pull = Unset;
         type Body = Unset;
         type CreatedAt = Unset;
-        type Pull = Unset;
+    }
+    ///State transition - sets the `pull` field to Set
+    pub struct SetPull<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPull<S> {}
+    impl<S: State> State for SetPull<S> {
+        type Pull = Set<members::pull>;
+        type Body = S::Body;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `body` field to Set
     pub struct SetBody<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBody<S> {}
     impl<S: State> State for SetBody<S> {
+        type Pull = S::Pull;
         type Body = Set<members::body>;
         type CreatedAt = S::CreatedAt;
-        type Pull = S::Pull;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Body = S::Body;
-        type CreatedAt = Set<members::created_at>;
         type Pull = S::Pull;
-    }
-    ///State transition - sets the `pull` field to Set
-    pub struct SetPull<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPull<S> {}
-    impl<S: State> State for SetPull<S> {
         type Body = S::Body;
-        type CreatedAt = S::CreatedAt;
-        type Pull = Set<members::pull>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `pull` field
+        pub struct pull(());
         ///Marker type for the `body` field
         pub struct body(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `pull` field
-        pub struct pull(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CommentBuilder<'a, S: comment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<Vec<Did<'a>>>,
         Option<AtUri<'a>>,
         Option<Vec<AtUri<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Comment<'a> {
@@ -187,9 +190,9 @@ impl<'a> CommentBuilder<'a, comment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,11 +207,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetBody<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -223,11 +226,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CommentBuilder<'a, comment_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -235,12 +238,12 @@ where
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `mentions` field (optional)
     pub fn mentions(mut self, value: impl Into<Option<Vec<Did<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<Vec<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -255,11 +258,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CommentBuilder<'a, comment_state::SetPull<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CommentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -267,12 +270,12 @@ where
 impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
     /// Set the `references` field (optional)
     pub fn references(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `references` field to an Option value (optional)
     pub fn maybe_references(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -280,18 +283,18 @@ impl<'a, S: comment_state::State> CommentBuilder<'a, S> {
 impl<'a, S> CommentBuilder<'a, S>
 where
     S: comment_state::State,
+    S::Pull: comment_state::IsSet,
     S::Body: comment_state::IsSet,
     S::CreatedAt: comment_state::IsSet,
-    S::Pull: comment_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Comment<'a> {
         Comment {
-            body: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            mentions: self.__unsafe_private_named.2,
-            pull: self.__unsafe_private_named.3.unwrap(),
-            references: self.__unsafe_private_named.4,
+            body: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            mentions: self._fields.2,
+            pull: self._fields.3.unwrap(),
+            references: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -304,11 +307,11 @@ where
         >,
     ) -> Comment<'a> {
         Comment {
-            body: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            mentions: self.__unsafe_private_named.2,
-            pull: self.__unsafe_private_named.3.unwrap(),
-            references: self.__unsafe_private_named.4,
+            body: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            mentions: self._fields.2,
+            pull: self._fields.3.unwrap(),
+            references: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/pull/status.rs b/crates/jacquard-api/src/sh_tangled/repo/pull/status.rs
index 141e9499..98d34eac 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/pull/status.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/pull/status.rs
@@ -9,7 +9,11 @@ pub mod closed;
 pub mod merged;
 pub mod open;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -214,45 +218,45 @@ pub mod status_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Pull;
         type Status;
+        type Pull;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Pull = Unset;
         type Status = Unset;
-    }
-    ///State transition - sets the `pull` field to Set
-    pub struct SetPull<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPull<S> {}
-    impl<S: State> State for SetPull<S> {
-        type Pull = Set<members::pull>;
-        type Status = S::Status;
+        type Pull = Unset;
     }
     ///State transition - sets the `status` field to Set
     pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStatus<S> {}
     impl<S: State> State for SetStatus<S> {
-        type Pull = S::Pull;
         type Status = Set<members::status>;
+        type Pull = S::Pull;
+    }
+    ///State transition - sets the `pull` field to Set
+    pub struct SetPull<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPull<S> {}
+    impl<S: State> State for SetPull<S> {
+        type Status = S::Status;
+        type Pull = Set<members::pull>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `pull` field
-        pub struct pull(());
         ///Marker type for the `status` field
         pub struct status(());
+        ///Marker type for the `pull` field
+        pub struct pull(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct StatusBuilder<'a, S: status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<StatusStatus<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<StatusStatus<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Status<'a> {
@@ -266,9 +270,9 @@ impl<'a> StatusBuilder<'a, status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -283,11 +287,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> StatusBuilder<'a, status_state::SetPull<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -302,11 +306,11 @@ where
         mut self,
         value: impl Into<StatusStatus<'a>>,
     ) -> StatusBuilder<'a, status_state::SetStatus<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -314,14 +318,14 @@ where
 impl<'a, S> StatusBuilder<'a, S>
 where
     S: status_state::State,
-    S::Pull: status_state::IsSet,
     S::Status: status_state::IsSet,
+    S::Pull: status_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Status<'a> {
         Status {
-            pull: self.__unsafe_private_named.0.unwrap(),
-            status: self.__unsafe_private_named.1.unwrap(),
+            pull: self._fields.0.unwrap(),
+            status: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -334,8 +338,8 @@ where
         >,
     ) -> Status<'a> {
         Status {
-            pull: self.__unsafe_private_named.0.unwrap(),
-            status: self.__unsafe_private_named.1.unwrap(),
+            pull: self._fields.0.unwrap(),
+            status: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/remove_secret.rs b/crates/jacquard-api/src/sh_tangled/repo/remove_secret.rs
index 164dde8a..364d42aa 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/remove_secret.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/remove_secret.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -60,45 +63,45 @@ pub mod remove_secret_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Repo;
         type Key;
+        type Repo;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Repo = Unset;
         type Key = Unset;
-    }
-    ///State transition - sets the `repo` field to Set
-    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepo<S> {}
-    impl<S: State> State for SetRepo<S> {
-        type Repo = Set<members::repo>;
-        type Key = S::Key;
+        type Repo = Unset;
     }
     ///State transition - sets the `key` field to Set
     pub struct SetKey<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetKey<S> {}
     impl<S: State> State for SetKey<S> {
-        type Repo = S::Repo;
         type Key = Set<members::key>;
+        type Repo = S::Repo;
+    }
+    ///State transition - sets the `repo` field to Set
+    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepo<S> {}
+    impl<S: State> State for SetRepo<S> {
+        type Key = S::Key;
+        type Repo = Set<members::repo>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `repo` field
-        pub struct repo(());
         ///Marker type for the `key` field
         pub struct key(());
+        ///Marker type for the `repo` field
+        pub struct repo(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RemoveSecretBuilder<'a, S: remove_secret_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RemoveSecret<'a> {
@@ -112,9 +115,9 @@ impl<'a> RemoveSecretBuilder<'a, remove_secret_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RemoveSecretBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -129,11 +132,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RemoveSecretBuilder<'a, remove_secret_state::SetKey<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RemoveSecretBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,11 +151,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RemoveSecretBuilder<'a, remove_secret_state::SetRepo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RemoveSecretBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -160,14 +163,14 @@ where
 impl<'a, S> RemoveSecretBuilder<'a, S>
 where
     S: remove_secret_state::State,
-    S::Repo: remove_secret_state::IsSet,
     S::Key: remove_secret_state::IsSet,
+    S::Repo: remove_secret_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RemoveSecret<'a> {
         RemoveSecret {
-            key: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
+            key: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -180,8 +183,8 @@ where
         >,
     ) -> RemoveSecret<'a> {
         RemoveSecret {
-            key: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
+            key: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/set_default_branch.rs b/crates/jacquard-api/src/sh_tangled/repo/set_default_branch.rs
index ba058d91..bd03e246 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/set_default_branch.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/set_default_branch.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -60,45 +63,45 @@ pub mod set_default_branch_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Repo;
         type DefaultBranch;
+        type Repo;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Repo = Unset;
         type DefaultBranch = Unset;
-    }
-    ///State transition - sets the `repo` field to Set
-    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepo<S> {}
-    impl<S: State> State for SetRepo<S> {
-        type Repo = Set<members::repo>;
-        type DefaultBranch = S::DefaultBranch;
+        type Repo = Unset;
     }
     ///State transition - sets the `default_branch` field to Set
     pub struct SetDefaultBranch<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDefaultBranch<S> {}
     impl<S: State> State for SetDefaultBranch<S> {
-        type Repo = S::Repo;
         type DefaultBranch = Set<members::default_branch>;
+        type Repo = S::Repo;
+    }
+    ///State transition - sets the `repo` field to Set
+    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepo<S> {}
+    impl<S: State> State for SetRepo<S> {
+        type DefaultBranch = S::DefaultBranch;
+        type Repo = Set<members::repo>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `repo` field
-        pub struct repo(());
         ///Marker type for the `default_branch` field
         pub struct default_branch(());
+        ///Marker type for the `repo` field
+        pub struct repo(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SetDefaultBranchBuilder<'a, S: set_default_branch_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SetDefaultBranch<'a> {
@@ -112,9 +115,9 @@ impl<'a> SetDefaultBranchBuilder<'a, set_default_branch_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SetDefaultBranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -129,11 +132,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SetDefaultBranchBuilder<'a, set_default_branch_state::SetDefaultBranch<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SetDefaultBranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,11 +151,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SetDefaultBranchBuilder<'a, set_default_branch_state::SetRepo<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SetDefaultBranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -160,14 +163,14 @@ where
 impl<'a, S> SetDefaultBranchBuilder<'a, S>
 where
     S: set_default_branch_state::State,
-    S::Repo: set_default_branch_state::IsSet,
     S::DefaultBranch: set_default_branch_state::IsSet,
+    S::Repo: set_default_branch_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SetDefaultBranch<'a> {
         SetDefaultBranch {
-            default_branch: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
+            default_branch: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -180,8 +183,8 @@ where
         >,
     ) -> SetDefaultBranch<'a> {
         SetDefaultBranch {
-            default_branch: self.__unsafe_private_named.0.unwrap(),
-            repo: self.__unsafe_private_named.1.unwrap(),
+            default_branch: self._fields.0.unwrap(),
+            repo: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/tag.rs b/crates/jacquard-api/src/sh_tangled/repo/tag.rs
index e1b1bc3d..14f349f7 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/tag.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/tag.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -133,45 +134,45 @@ pub mod tag_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Tag;
         type Repo;
+        type Tag;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Tag = Unset;
         type Repo = Unset;
-    }
-    ///State transition - sets the `tag` field to Set
-    pub struct SetTag<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTag<S> {}
-    impl<S: State> State for SetTag<S> {
-        type Tag = Set<members::tag>;
-        type Repo = S::Repo;
+        type Tag = Unset;
     }
     ///State transition - sets the `repo` field to Set
     pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepo<S> {}
     impl<S: State> State for SetRepo<S> {
-        type Tag = S::Tag;
         type Repo = Set<members::repo>;
+        type Tag = S::Tag;
+    }
+    ///State transition - sets the `tag` field to Set
+    pub struct SetTag<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTag<S> {}
+    impl<S: State> State for SetTag<S> {
+        type Repo = S::Repo;
+        type Tag = Set<members::tag>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `tag` field
-        pub struct tag(());
         ///Marker type for the `repo` field
         pub struct repo(());
+        ///Marker type for the `tag` field
+        pub struct tag(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TagBuilder<'a, S: tag_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Tag<'a> {
@@ -185,9 +186,9 @@ impl<'a> TagBuilder<'a, tag_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -202,11 +203,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TagBuilder<'a, tag_state::SetRepo<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,11 +222,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TagBuilder<'a, tag_state::SetTag<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -233,14 +234,14 @@ where
 impl<'a, S> TagBuilder<'a, S>
 where
     S: tag_state::State,
-    S::Tag: tag_state::IsSet,
     S::Repo: tag_state::IsSet,
+    S::Tag: tag_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Tag<'a> {
         Tag {
-            repo: self.__unsafe_private_named.0.unwrap(),
-            tag: self.__unsafe_private_named.1.unwrap(),
+            repo: self._fields.0.unwrap(),
+            tag: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/repo/tags.rs b/crates/jacquard-api/src/sh_tangled/repo/tags.rs
index 495d6b61..597c31e1 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/tags.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/tags.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -156,9 +157,9 @@ pub mod tags_state {
 
 /// Builder for constructing an instance of this type
 pub struct TagsBuilder<'a, S: tags_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Tags<'a> {
@@ -172,9 +173,9 @@ impl<'a> TagsBuilder<'a, tags_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TagsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,12 +183,12 @@ impl<'a> TagsBuilder<'a, tags_state::Empty> {
 impl<'a, S: tags_state::State> TagsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -195,12 +196,12 @@ impl<'a, S: tags_state::State> TagsBuilder<'a, S> {
 impl<'a, S: tags_state::State> TagsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -215,11 +216,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TagsBuilder<'a, tags_state::SetRepo<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TagsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,9 +233,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Tags<'a> {
         Tags {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            repo: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            repo: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_tangled/repo/tree.rs b/crates/jacquard-api/src/sh_tangled/repo/tree.rs
index 50f927cb..e544fdf4 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/tree.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/tree.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -288,63 +291,63 @@ pub mod last_commit_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Hash;
-        type When;
         type Message;
+        type When;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Hash = Unset;
-        type When = Unset;
         type Message = Unset;
+        type When = Unset;
     }
     ///State transition - sets the `hash` field to Set
     pub struct SetHash<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHash<S> {}
     impl<S: State> State for SetHash<S> {
         type Hash = Set<members::hash>;
-        type When = S::When;
-        type Message = S::Message;
-    }
-    ///State transition - sets the `when` field to Set
-    pub struct SetWhen<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetWhen<S> {}
-    impl<S: State> State for SetWhen<S> {
-        type Hash = S::Hash;
-        type When = Set<members::when>;
         type Message = S::Message;
+        type When = S::When;
     }
     ///State transition - sets the `message` field to Set
     pub struct SetMessage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMessage<S> {}
     impl<S: State> State for SetMessage<S> {
         type Hash = S::Hash;
-        type When = S::When;
         type Message = Set<members::message>;
+        type When = S::When;
+    }
+    ///State transition - sets the `when` field to Set
+    pub struct SetWhen<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetWhen<S> {}
+    impl<S: State> State for SetWhen<S> {
+        type Hash = S::Hash;
+        type Message = S::Message;
+        type When = Set<members::when>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `hash` field
         pub struct hash(());
-        ///Marker type for the `when` field
-        pub struct when(());
         ///Marker type for the `message` field
         pub struct message(());
+        ///Marker type for the `when` field
+        pub struct when(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LastCommitBuilder<'a, S: last_commit_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<tree::Signature<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LastCommit<'a> {
@@ -358,9 +361,9 @@ impl<'a> LastCommitBuilder<'a, last_commit_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LastCommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -368,12 +371,12 @@ impl<'a> LastCommitBuilder<'a, last_commit_state::Empty> {
 impl<'a, S: last_commit_state::State> LastCommitBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<tree::Signature<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<tree::Signature<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -388,11 +391,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LastCommitBuilder<'a, last_commit_state::SetHash<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LastCommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -407,11 +410,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LastCommitBuilder<'a, last_commit_state::SetMessage<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LastCommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -426,11 +429,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LastCommitBuilder<'a, last_commit_state::SetWhen<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LastCommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -439,16 +442,16 @@ impl<'a, S> LastCommitBuilder<'a, S>
 where
     S: last_commit_state::State,
     S::Hash: last_commit_state::IsSet,
-    S::When: last_commit_state::IsSet,
     S::Message: last_commit_state::IsSet,
+    S::When: last_commit_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LastCommit<'a> {
         LastCommit {
-            author: self.__unsafe_private_named.0,
-            hash: self.__unsafe_private_named.1.unwrap(),
-            message: self.__unsafe_private_named.2.unwrap(),
-            when: self.__unsafe_private_named.3.unwrap(),
+            author: self._fields.0,
+            hash: self._fields.1.unwrap(),
+            message: self._fields.2.unwrap(),
+            when: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -461,10 +464,10 @@ where
         >,
     ) -> LastCommit<'a> {
         LastCommit {
-            author: self.__unsafe_private_named.0,
-            hash: self.__unsafe_private_named.1.unwrap(),
-            message: self.__unsafe_private_named.2.unwrap(),
-            when: self.__unsafe_private_named.3.unwrap(),
+            author: self._fields.0,
+            hash: self._fields.1.unwrap(),
+            message: self._fields.2.unwrap(),
+            when: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -718,45 +721,45 @@ pub mod tree_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Ref;
         type Repo;
+        type Ref;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Ref = Unset;
         type Repo = Unset;
-    }
-    ///State transition - sets the `ref` field to Set
-    pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRef<S> {}
-    impl<S: State> State for SetRef<S> {
-        type Ref = Set<members::r#ref>;
-        type Repo = S::Repo;
+        type Ref = Unset;
     }
     ///State transition - sets the `repo` field to Set
     pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepo<S> {}
     impl<S: State> State for SetRepo<S> {
-        type Ref = S::Ref;
         type Repo = Set<members::repo>;
+        type Ref = S::Ref;
+    }
+    ///State transition - sets the `ref` field to Set
+    pub struct SetRef<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRef<S> {}
+    impl<S: State> State for SetRef<S> {
+        type Repo = S::Repo;
+        type Ref = Set<members::r#ref>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `ref` field
-        pub struct r#ref(());
         ///Marker type for the `repo` field
         pub struct repo(());
+        ///Marker type for the `ref` field
+        pub struct r#ref(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TreeBuilder<'a, S: tree_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Tree<'a> {
@@ -770,9 +773,9 @@ impl<'a> TreeBuilder<'a, tree_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TreeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -780,12 +783,12 @@ impl<'a> TreeBuilder<'a, tree_state::Empty> {
 impl<'a, S: tree_state::State> TreeBuilder<'a, S> {
     /// Set the `path` field (optional)
     pub fn path(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `path` field to an Option value (optional)
     pub fn maybe_path(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -800,11 +803,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TreeBuilder<'a, tree_state::SetRef<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TreeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -819,11 +822,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TreeBuilder<'a, tree_state::SetRepo<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TreeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -831,15 +834,15 @@ where
 impl<'a, S> TreeBuilder<'a, S>
 where
     S: tree_state::State,
-    S::Ref: tree_state::IsSet,
     S::Repo: tree_state::IsSet,
+    S::Ref: tree_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Tree<'a> {
         Tree {
-            path: self.__unsafe_private_named.0,
-            r#ref: self.__unsafe_private_named.1.unwrap(),
-            repo: self.__unsafe_private_named.2.unwrap(),
+            path: self._fields.0,
+            r#ref: self._fields.1.unwrap(),
+            repo: self._fields.2.unwrap(),
         }
     }
 }
@@ -854,59 +857,59 @@ pub mod signature_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type Email;
         type When;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type Email = Unset;
         type When = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Email = S::Email;
-        type When = S::When;
+        type Name = Unset;
     }
     ///State transition - sets the `email` field to Set
     pub struct SetEmail<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEmail<S> {}
     impl<S: State> State for SetEmail<S> {
-        type Name = S::Name;
         type Email = Set<members::email>;
         type When = S::When;
+        type Name = S::Name;
     }
     ///State transition - sets the `when` field to Set
     pub struct SetWhen<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWhen<S> {}
     impl<S: State> State for SetWhen<S> {
-        type Name = S::Name;
         type Email = S::Email;
         type When = Set<members::when>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Email = S::Email;
+        type When = S::When;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `email` field
         pub struct email(());
         ///Marker type for the `when` field
         pub struct when(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SignatureBuilder<'a, S: signature_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Signature<'a> {
@@ -920,9 +923,9 @@ impl<'a> SignatureBuilder<'a, signature_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -937,11 +940,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureBuilder<'a, signature_state::SetEmail<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -956,11 +959,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureBuilder<'a, signature_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -975,11 +978,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SignatureBuilder<'a, signature_state::SetWhen<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SignatureBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -987,16 +990,16 @@ where
 impl<'a, S> SignatureBuilder<'a, S>
 where
     S: signature_state::State,
-    S::Name: signature_state::IsSet,
     S::Email: signature_state::IsSet,
     S::When: signature_state::IsSet,
+    S::Name: signature_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Signature<'a> {
         Signature {
-            email: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            when: self.__unsafe_private_named.2.unwrap(),
+            email: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            when: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1009,9 +1012,9 @@ where
         >,
     ) -> Signature<'a> {
         Signature {
-            email: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            when: self.__unsafe_private_named.2.unwrap(),
+            email: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            when: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1027,64 +1030,64 @@ pub mod tree_entry_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Name;
         type Size;
         type Mode;
-        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Name = Unset;
         type Size = Unset;
         type Mode = Unset;
-        type Name = Unset;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Name = Set<members::name>;
+        type Size = S::Size;
+        type Mode = S::Mode;
     }
     ///State transition - sets the `size` field to Set
     pub struct SetSize<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSize<S> {}
     impl<S: State> State for SetSize<S> {
+        type Name = S::Name;
         type Size = Set<members::size>;
         type Mode = S::Mode;
-        type Name = S::Name;
     }
     ///State transition - sets the `mode` field to Set
     pub struct SetMode<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMode<S> {}
     impl<S: State> State for SetMode<S> {
-        type Size = S::Size;
-        type Mode = Set<members::mode>;
         type Name = S::Name;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
         type Size = S::Size;
-        type Mode = S::Mode;
-        type Name = Set<members::name>;
+        type Mode = Set<members::mode>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `name` field
+        pub struct name(());
         ///Marker type for the `size` field
         pub struct size(());
         ///Marker type for the `mode` field
         pub struct mode(());
-        ///Marker type for the `name` field
-        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TreeEntryBuilder<'a, S: tree_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<tree::LastCommit<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TreeEntry<'a> {
@@ -1098,9 +1101,9 @@ impl<'a> TreeEntryBuilder<'a, tree_entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TreeEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1111,12 +1114,12 @@ impl<'a, S: tree_entry_state::State> TreeEntryBuilder<'a, S> {
         mut self,
         value: impl Into<Option<tree::LastCommit<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `last_commit` field to an Option value (optional)
     pub fn maybe_last_commit(mut self, value: Option<tree::LastCommit<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1131,11 +1134,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TreeEntryBuilder<'a, tree_entry_state::SetMode<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TreeEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1150,11 +1153,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TreeEntryBuilder<'a, tree_entry_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TreeEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1169,11 +1172,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> TreeEntryBuilder<'a, tree_entry_state::SetSize<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TreeEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1181,17 +1184,17 @@ where
 impl<'a, S> TreeEntryBuilder<'a, S>
 where
     S: tree_entry_state::State,
+    S::Name: tree_entry_state::IsSet,
     S::Size: tree_entry_state::IsSet,
     S::Mode: tree_entry_state::IsSet,
-    S::Name: tree_entry_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TreeEntry<'a> {
         TreeEntry {
-            last_commit: self.__unsafe_private_named.0,
-            mode: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            size: self.__unsafe_private_named.3.unwrap(),
+            last_commit: self._fields.0,
+            mode: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            size: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1204,10 +1207,10 @@ where
         >,
     ) -> TreeEntry<'a> {
         TreeEntry {
-            last_commit: self.__unsafe_private_named.0,
-            mode: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            size: self.__unsafe_private_named.3.unwrap(),
+            last_commit: self._fields.0,
+            mode: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            size: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/spindle.rs b/crates/jacquard-api/src/sh_tangled/spindle.rs
index 08fca18f..8f8a280a 100644
--- a/crates/jacquard-api/src/sh_tangled/spindle.rs
+++ b/crates/jacquard-api/src/sh_tangled/spindle.rs
@@ -7,7 +7,11 @@
 
 pub mod member;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -131,9 +135,9 @@ pub mod spindle_state {
 
 /// Builder for constructing an instance of this type
 pub struct SpindleBuilder<'a, S: spindle_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Spindle<'a> {
@@ -147,9 +151,9 @@ impl<'a> SpindleBuilder<'a, spindle_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SpindleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,11 +168,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SpindleBuilder<'a, spindle_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SpindleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,7 +185,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Spindle<'a> {
         Spindle {
-            created_at: self.__unsafe_private_named.0.unwrap(),
+            created_at: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -194,7 +198,7 @@ where
         >,
     ) -> Spindle<'a> {
         Spindle {
-            created_at: self.__unsafe_private_named.0.unwrap(),
+            created_at: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/spindle/member.rs b/crates/jacquard-api/src/sh_tangled/spindle/member.rs
index 95417ac0..51b95855 100644
--- a/crates/jacquard-api/src/sh_tangled/spindle/member.rs
+++ b/crates/jacquard-api/src/sh_tangled/spindle/member.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -110,59 +113,59 @@ pub mod member_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type CreatedAt;
         type Instance;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type CreatedAt = Unset;
         type Instance = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
-        type Instance = S::Instance;
+        type Subject = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
         type Instance = S::Instance;
+        type Subject = S::Subject;
     }
     ///State transition - sets the `instance` field to Set
     pub struct SetInstance<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetInstance<S> {}
     impl<S: State> State for SetInstance<S> {
-        type Subject = S::Subject;
         type CreatedAt = S::CreatedAt;
         type Instance = Set<members::instance>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
+        type Instance = S::Instance;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `instance` field
         pub struct instance(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MemberBuilder<'a, S: member_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Member<'a> {
@@ -176,9 +179,9 @@ impl<'a> MemberBuilder<'a, member_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -193,11 +196,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MemberBuilder<'a, member_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,11 +215,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MemberBuilder<'a, member_state::SetInstance<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -231,11 +234,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MemberBuilder<'a, member_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         MemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -243,16 +246,16 @@ where
 impl<'a, S> MemberBuilder<'a, S>
 where
     S: member_state::State,
-    S::Subject: member_state::IsSet,
     S::CreatedAt: member_state::IsSet,
     S::Instance: member_state::IsSet,
+    S::Subject: member_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Member<'a> {
         Member {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            instance: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            instance: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -265,9 +268,9 @@ where
         >,
     ) -> Member<'a> {
         Member {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            instance: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            instance: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_tangled/string.rs b/crates/jacquard-api/src/sh_tangled/string.rs
index 97da1dbd..fd98bb46 100644
--- a/crates/jacquard-api/src/sh_tangled/string.rs
+++ b/crates/jacquard-api/src/sh_tangled/string.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -163,80 +166,80 @@ pub mod tangled_string_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Description;
         type CreatedAt;
-        type Filename;
         type Contents;
+        type Description;
+        type Filename;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Description = Unset;
         type CreatedAt = Unset;
-        type Filename = Unset;
         type Contents = Unset;
-    }
-    ///State transition - sets the `description` field to Set
-    pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDescription<S> {}
-    impl<S: State> State for SetDescription<S> {
-        type Description = Set<members::description>;
-        type CreatedAt = S::CreatedAt;
-        type Filename = S::Filename;
-        type Contents = S::Contents;
+        type Description = Unset;
+        type Filename = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Description = S::Description;
         type CreatedAt = Set<members::created_at>;
-        type Filename = S::Filename;
         type Contents = S::Contents;
-    }
-    ///State transition - sets the `filename` field to Set
-    pub struct SetFilename<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetFilename<S> {}
-    impl<S: State> State for SetFilename<S> {
         type Description = S::Description;
-        type CreatedAt = S::CreatedAt;
-        type Filename = Set<members::filename>;
-        type Contents = S::Contents;
+        type Filename = S::Filename;
     }
     ///State transition - sets the `contents` field to Set
     pub struct SetContents<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContents<S> {}
     impl<S: State> State for SetContents<S> {
+        type CreatedAt = S::CreatedAt;
+        type Contents = Set<members::contents>;
         type Description = S::Description;
+        type Filename = S::Filename;
+    }
+    ///State transition - sets the `description` field to Set
+    pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDescription<S> {}
+    impl<S: State> State for SetDescription<S> {
         type CreatedAt = S::CreatedAt;
+        type Contents = S::Contents;
+        type Description = Set<members::description>;
         type Filename = S::Filename;
-        type Contents = Set<members::contents>;
+    }
+    ///State transition - sets the `filename` field to Set
+    pub struct SetFilename<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetFilename<S> {}
+    impl<S: State> State for SetFilename<S> {
+        type CreatedAt = S::CreatedAt;
+        type Contents = S::Contents;
+        type Description = S::Description;
+        type Filename = Set<members::filename>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `description` field
-        pub struct description(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `filename` field
-        pub struct filename(());
         ///Marker type for the `contents` field
         pub struct contents(());
+        ///Marker type for the `description` field
+        pub struct description(());
+        ///Marker type for the `filename` field
+        pub struct filename(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TangledStringBuilder<'a, S: tangled_string_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TangledString<'a> {
@@ -250,9 +253,9 @@ impl<'a> TangledStringBuilder<'a, tangled_string_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TangledStringBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -267,11 +270,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TangledStringBuilder<'a, tangled_string_state::SetContents<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TangledStringBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -286,11 +289,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TangledStringBuilder<'a, tangled_string_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TangledStringBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -305,11 +308,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TangledStringBuilder<'a, tangled_string_state::SetDescription<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TangledStringBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -324,11 +327,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TangledStringBuilder<'a, tangled_string_state::SetFilename<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TangledStringBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -336,18 +339,18 @@ where
 impl<'a, S> TangledStringBuilder<'a, S>
 where
     S: tangled_string_state::State,
-    S::Description: tangled_string_state::IsSet,
     S::CreatedAt: tangled_string_state::IsSet,
-    S::Filename: tangled_string_state::IsSet,
     S::Contents: tangled_string_state::IsSet,
+    S::Description: tangled_string_state::IsSet,
+    S::Filename: tangled_string_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TangledString<'a> {
         TangledString {
-            contents: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2.unwrap(),
-            filename: self.__unsafe_private_named.3.unwrap(),
+            contents: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2.unwrap(),
+            filename: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -360,10 +363,10 @@ where
         >,
     ) -> TangledString<'a> {
         TangledString {
-            contents: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2.unwrap(),
-            filename: self.__unsafe_private_named.3.unwrap(),
+            contents: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2.unwrap(),
+            filename: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/actor.rs b/crates/jacquard-api/src/sh_weaver/actor.rs
index b49f58b0..b06cb053 100644
--- a/crates/jacquard-api/src/sh_weaver/actor.rs
+++ b/crates/jacquard-api/src/sh_weaver/actor.rs
@@ -13,7 +13,11 @@ pub mod profile;
 pub mod search_actors;
 pub mod search_actors_typeahead;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -689,9 +693,9 @@ pub mod author_state {
 
 /// Builder for constructing an instance of this type
 pub struct AuthorBuilder<'a, S: author_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Bytes>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Bytes>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Author<'a> {
@@ -705,9 +709,9 @@ impl<'a> AuthorBuilder<'a, author_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AuthorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -722,11 +726,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> AuthorBuilder<'a, author_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AuthorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -734,12 +738,12 @@ where
 impl<'a, S: author_state::State> AuthorBuilder<'a, S> {
     /// Set the `signature` field (optional)
     pub fn signature(mut self, value: impl Into<Option<Bytes>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `signature` field to an Option value (optional)
     pub fn maybe_signature(mut self, value: Option<Bytes>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -752,8 +756,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Author<'a> {
         Author {
-            did: self.__unsafe_private_named.0.unwrap(),
-            signature: self.__unsafe_private_named.1,
+            did: self._fields.0.unwrap(),
+            signature: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -766,8 +770,8 @@ where
         >,
     ) -> Author<'a> {
         Author {
-            did: self.__unsafe_private_named.0.unwrap(),
-            signature: self.__unsafe_private_named.1,
+            did: self._fields.0.unwrap(),
+            signature: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
@@ -1482,8 +1486,8 @@ pub mod profile_data_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileDataViewBuilder<'a, S: profile_data_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<i64>,
         Option<i64>,
@@ -1492,7 +1496,7 @@ pub struct ProfileDataViewBuilder<'a, S: profile_data_view_state::State> {
         Option<i64>,
         Option<actor::ViewerState<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileDataView<'a> {
@@ -1506,9 +1510,9 @@ impl<'a> ProfileDataViewBuilder<'a, profile_data_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileDataViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1516,12 +1520,12 @@ impl<'a> ProfileDataViewBuilder<'a, profile_data_view_state::Empty> {
 impl<'a, S: profile_data_view_state::State> ProfileDataViewBuilder<'a, S> {
     /// Set the `collaborationCount` field (optional)
     pub fn collaboration_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `collaborationCount` field to an Option value (optional)
     pub fn maybe_collaboration_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1529,12 +1533,12 @@ impl<'a, S: profile_data_view_state::State> ProfileDataViewBuilder<'a, S> {
 impl<'a, S: profile_data_view_state::State> ProfileDataViewBuilder<'a, S> {
     /// Set the `entryCount` field (optional)
     pub fn entry_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `entryCount` field to an Option value (optional)
     pub fn maybe_entry_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1542,12 +1546,12 @@ impl<'a, S: profile_data_view_state::State> ProfileDataViewBuilder<'a, S> {
 impl<'a, S: profile_data_view_state::State> ProfileDataViewBuilder<'a, S> {
     /// Set the `followerCount` field (optional)
     pub fn follower_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `followerCount` field to an Option value (optional)
     pub fn maybe_follower_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1555,12 +1559,12 @@ impl<'a, S: profile_data_view_state::State> ProfileDataViewBuilder<'a, S> {
 impl<'a, S: profile_data_view_state::State> ProfileDataViewBuilder<'a, S> {
     /// Set the `followingCount` field (optional)
     pub fn following_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `followingCount` field to an Option value (optional)
     pub fn maybe_following_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1575,11 +1579,11 @@ where
         mut self,
         value: impl Into<ProfileDataViewInner<'a>>,
     ) -> ProfileDataViewBuilder<'a, profile_data_view_state::SetInner<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ProfileDataViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1587,12 +1591,12 @@ where
 impl<'a, S: profile_data_view_state::State> ProfileDataViewBuilder<'a, S> {
     /// Set the `notebookCount` field (optional)
     pub fn notebook_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `notebookCount` field to an Option value (optional)
     pub fn maybe_notebook_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1600,12 +1604,12 @@ impl<'a, S: profile_data_view_state::State> ProfileDataViewBuilder<'a, S> {
 impl<'a, S: profile_data_view_state::State> ProfileDataViewBuilder<'a, S> {
     /// Set the `viewer` field (optional)
     pub fn viewer(mut self, value: impl Into<Option<actor::ViewerState<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<actor::ViewerState<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1618,13 +1622,13 @@ where
     /// Build the final struct
     pub fn build(self) -> ProfileDataView<'a> {
         ProfileDataView {
-            collaboration_count: self.__unsafe_private_named.0,
-            entry_count: self.__unsafe_private_named.1,
-            follower_count: self.__unsafe_private_named.2,
-            following_count: self.__unsafe_private_named.3,
-            inner: self.__unsafe_private_named.4.unwrap(),
-            notebook_count: self.__unsafe_private_named.5,
-            viewer: self.__unsafe_private_named.6,
+            collaboration_count: self._fields.0,
+            entry_count: self._fields.1,
+            follower_count: self._fields.2,
+            following_count: self._fields.3,
+            inner: self._fields.4.unwrap(),
+            notebook_count: self._fields.5,
+            viewer: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -1637,13 +1641,13 @@ where
         >,
     ) -> ProfileDataView<'a> {
         ProfileDataView {
-            collaboration_count: self.__unsafe_private_named.0,
-            entry_count: self.__unsafe_private_named.1,
-            follower_count: self.__unsafe_private_named.2,
-            following_count: self.__unsafe_private_named.3,
-            inner: self.__unsafe_private_named.4.unwrap(),
-            notebook_count: self.__unsafe_private_named.5,
-            viewer: self.__unsafe_private_named.6,
+            collaboration_count: self._fields.0,
+            entry_count: self._fields.1,
+            follower_count: self._fields.2,
+            following_count: self._fields.3,
+            inner: self._fields.4.unwrap(),
+            notebook_count: self._fields.5,
+            viewer: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
@@ -1683,14 +1687,14 @@ pub mod profile_data_view_basic_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileDataViewBasicBuilder<'a, S: profile_data_view_basic_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<i64>,
         Option<ProfileDataViewBasicInner<'a>>,
         Option<actor::ViewerStateBasic<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileDataViewBasic<'a> {
@@ -1707,9 +1711,9 @@ impl<'a> ProfileDataViewBasicBuilder<'a, profile_data_view_basic_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileDataViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1717,12 +1721,12 @@ impl<'a> ProfileDataViewBasicBuilder<'a, profile_data_view_basic_state::Empty> {
 impl<'a, S: profile_data_view_basic_state::State> ProfileDataViewBasicBuilder<'a, S> {
     /// Set the `followerCount` field (optional)
     pub fn follower_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `followerCount` field to an Option value (optional)
     pub fn maybe_follower_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1730,12 +1734,12 @@ impl<'a, S: profile_data_view_basic_state::State> ProfileDataViewBasicBuilder<'a
 impl<'a, S: profile_data_view_basic_state::State> ProfileDataViewBasicBuilder<'a, S> {
     /// Set the `followingCount` field (optional)
     pub fn following_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `followingCount` field to an Option value (optional)
     pub fn maybe_following_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1750,11 +1754,11 @@ where
         mut self,
         value: impl Into<ProfileDataViewBasicInner<'a>>,
     ) -> ProfileDataViewBasicBuilder<'a, profile_data_view_basic_state::SetInner<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ProfileDataViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1765,12 +1769,12 @@ impl<'a, S: profile_data_view_basic_state::State> ProfileDataViewBasicBuilder<'a
         mut self,
         value: impl Into<Option<actor::ViewerStateBasic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `viewer` field to an Option value (optional)
     pub fn maybe_viewer(mut self, value: Option<actor::ViewerStateBasic<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1783,10 +1787,10 @@ where
     /// Build the final struct
     pub fn build(self) -> ProfileDataViewBasic<'a> {
         ProfileDataViewBasic {
-            follower_count: self.__unsafe_private_named.0,
-            following_count: self.__unsafe_private_named.1,
-            inner: self.__unsafe_private_named.2.unwrap(),
-            viewer: self.__unsafe_private_named.3,
+            follower_count: self._fields.0,
+            following_count: self._fields.1,
+            inner: self._fields.2.unwrap(),
+            viewer: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -1799,10 +1803,10 @@ where
         >,
     ) -> ProfileDataViewBasic<'a> {
         ProfileDataViewBasic {
-            follower_count: self.__unsafe_private_named.0,
-            following_count: self.__unsafe_private_named.1,
-            inner: self.__unsafe_private_named.2.unwrap(),
-            viewer: self.__unsafe_private_named.3,
+            follower_count: self._fields.0,
+            following_count: self._fields.1,
+            inner: self._fields.2.unwrap(),
+            viewer: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -1818,44 +1822,44 @@ pub mod profile_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Did;
         type Handle;
+        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Did = Unset;
         type Handle = Unset;
-    }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Did = Set<members::did>;
-        type Handle = S::Handle;
+        type Did = Unset;
     }
     ///State transition - sets the `handle` field to Set
     pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHandle<S> {}
     impl<S: State> State for SetHandle<S> {
-        type Did = S::Did;
         type Handle = Set<members::handle>;
+        type Did = S::Did;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Handle = S::Handle;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `handle` field
         pub struct handle(());
+        ///Marker type for the `did` field
+        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ProfileViewBuilder<'a, S: profile_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<UriValue<'a>>,
         Option<UriValue<'a>>,
         Option<bool>,
@@ -1875,7 +1879,7 @@ pub struct ProfileViewBuilder<'a, S: profile_view_state::State> {
         Option<i64>,
         Option<bool>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileView<'a> {
@@ -1889,8 +1893,8 @@ impl<'a> ProfileViewBuilder<'a, profile_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -1910,7 +1914,7 @@ impl<'a> ProfileViewBuilder<'a, profile_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1918,12 +1922,12 @@ impl<'a> ProfileViewBuilder<'a, profile_view_state::Empty> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1931,12 +1935,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1944,12 +1948,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `bluesky` field (optional)
     pub fn bluesky(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `bluesky` field to an Option value (optional)
     pub fn maybe_bluesky(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1957,12 +1961,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1970,12 +1974,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1990,11 +1994,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ProfileViewBuilder<'a, profile_view_state::SetDid<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2002,12 +2006,12 @@ where
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -2022,11 +2026,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> ProfileViewBuilder<'a, profile_view_state::SetHandle<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2034,12 +2038,12 @@ where
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `indexedAt` field (optional)
     pub fn indexed_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `indexedAt` field to an Option value (optional)
     pub fn maybe_indexed_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -2047,12 +2051,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -2060,12 +2064,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `links` field (optional)
     pub fn links(mut self, value: impl Into<Option<Vec<UriValue<'a>>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `links` field to an Option value (optional)
     pub fn maybe_links(mut self, value: Option<Vec<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -2073,12 +2077,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -2086,12 +2090,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `pinned` field (optional)
     pub fn pinned(mut self, value: impl Into<Option<actor::PinnedList<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `pinned` field to an Option value (optional)
     pub fn maybe_pinned(mut self, value: Option<actor::PinnedList<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -2102,12 +2106,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<actor::PronounsList<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `pronouns` field to an Option value (optional)
     pub fn maybe_pronouns(mut self, value: Option<actor::PronounsList<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -2115,12 +2119,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `streamplace` field (optional)
     pub fn streamplace(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `streamplace` field to an Option value (optional)
     pub fn maybe_streamplace(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -2128,12 +2132,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `subscribedCount` field (optional)
     pub fn subscribed_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `subscribedCount` field to an Option value (optional)
     pub fn maybe_subscribed_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -2141,12 +2145,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `subscriberCount` field (optional)
     pub fn subscriber_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `subscriberCount` field to an Option value (optional)
     pub fn maybe_subscriber_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -2154,12 +2158,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `tangled` field (optional)
     pub fn tangled(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `tangled` field to an Option value (optional)
     pub fn maybe_tangled(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -2167,30 +2171,30 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S> ProfileViewBuilder<'a, S>
 where
     S: profile_view_state::State,
-    S::Did: profile_view_state::IsSet,
     S::Handle: profile_view_state::IsSet,
+    S::Did: profile_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ProfileView<'a> {
         ProfileView {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            bluesky: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3,
-            description: self.__unsafe_private_named.4,
-            did: self.__unsafe_private_named.5.unwrap(),
-            display_name: self.__unsafe_private_named.6,
-            handle: self.__unsafe_private_named.7.unwrap(),
-            indexed_at: self.__unsafe_private_named.8,
-            labels: self.__unsafe_private_named.9,
-            links: self.__unsafe_private_named.10,
-            location: self.__unsafe_private_named.11,
-            pinned: self.__unsafe_private_named.12,
-            pronouns: self.__unsafe_private_named.13,
-            streamplace: self.__unsafe_private_named.14,
-            subscribed_count: self.__unsafe_private_named.15,
-            subscriber_count: self.__unsafe_private_named.16,
-            tangled: self.__unsafe_private_named.17,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            bluesky: self._fields.2,
+            created_at: self._fields.3,
+            description: self._fields.4,
+            did: self._fields.5.unwrap(),
+            display_name: self._fields.6,
+            handle: self._fields.7.unwrap(),
+            indexed_at: self._fields.8,
+            labels: self._fields.9,
+            links: self._fields.10,
+            location: self._fields.11,
+            pinned: self._fields.12,
+            pronouns: self._fields.13,
+            streamplace: self._fields.14,
+            subscribed_count: self._fields.15,
+            subscriber_count: self._fields.16,
+            tangled: self._fields.17,
             extra_data: Default::default(),
         }
     }
@@ -2203,24 +2207,24 @@ where
         >,
     ) -> ProfileView<'a> {
         ProfileView {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            bluesky: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3,
-            description: self.__unsafe_private_named.4,
-            did: self.__unsafe_private_named.5.unwrap(),
-            display_name: self.__unsafe_private_named.6,
-            handle: self.__unsafe_private_named.7.unwrap(),
-            indexed_at: self.__unsafe_private_named.8,
-            labels: self.__unsafe_private_named.9,
-            links: self.__unsafe_private_named.10,
-            location: self.__unsafe_private_named.11,
-            pinned: self.__unsafe_private_named.12,
-            pronouns: self.__unsafe_private_named.13,
-            streamplace: self.__unsafe_private_named.14,
-            subscribed_count: self.__unsafe_private_named.15,
-            subscriber_count: self.__unsafe_private_named.16,
-            tangled: self.__unsafe_private_named.17,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            bluesky: self._fields.2,
+            created_at: self._fields.3,
+            description: self._fields.4,
+            did: self._fields.5.unwrap(),
+            display_name: self._fields.6,
+            handle: self._fields.7.unwrap(),
+            indexed_at: self._fields.8,
+            labels: self._fields.9,
+            links: self._fields.10,
+            location: self._fields.11,
+            pinned: self._fields.12,
+            pronouns: self._fields.13,
+            streamplace: self._fields.14,
+            subscribed_count: self._fields.15,
+            subscriber_count: self._fields.16,
+            tangled: self._fields.17,
             extra_data: Some(extra_data),
         }
     }
@@ -2272,8 +2276,8 @@ pub mod profile_view_basic_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileViewBasicBuilder<'a, S: profile_view_basic_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<UriValue<'a>>,
         Option<Datetime>,
         Option<Did<'a>>,
@@ -2283,7 +2287,7 @@ pub struct ProfileViewBasicBuilder<'a, S: profile_view_basic_state::State> {
         Option<Vec<Label<'a>>>,
         Option<actor::PronounsList<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileViewBasic<'a> {
@@ -2297,9 +2301,9 @@ impl<'a> ProfileViewBasicBuilder<'a, profile_view_basic_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2307,12 +2311,12 @@ impl<'a> ProfileViewBasicBuilder<'a, profile_view_basic_state::Empty> {
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -2320,12 +2324,12 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -2340,11 +2344,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ProfileViewBasicBuilder<'a, profile_view_basic_state::SetDid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ProfileViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2352,12 +2356,12 @@ where
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -2372,11 +2376,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> ProfileViewBasicBuilder<'a, profile_view_basic_state::SetHandle<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ProfileViewBasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2384,12 +2388,12 @@ where
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `indexedAt` field (optional)
     pub fn indexed_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `indexedAt` field to an Option value (optional)
     pub fn maybe_indexed_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -2397,12 +2401,12 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
 impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -2413,12 +2417,12 @@ impl<'a, S: profile_view_basic_state::State> ProfileViewBasicBuilder<'a, S> {
         mut self,
         value: impl Into<Option<actor::PronounsList<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `pronouns` field to an Option value (optional)
     pub fn maybe_pronouns(mut self, value: Option<actor::PronounsList<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -2432,14 +2436,14 @@ where
     /// Build the final struct
     pub fn build(self) -> ProfileViewBasic<'a> {
         ProfileViewBasic {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            did: self.__unsafe_private_named.2.unwrap(),
-            display_name: self.__unsafe_private_named.3,
-            handle: self.__unsafe_private_named.4.unwrap(),
-            indexed_at: self.__unsafe_private_named.5,
-            labels: self.__unsafe_private_named.6,
-            pronouns: self.__unsafe_private_named.7,
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            did: self._fields.2.unwrap(),
+            display_name: self._fields.3,
+            handle: self._fields.4.unwrap(),
+            indexed_at: self._fields.5,
+            labels: self._fields.6,
+            pronouns: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -2452,14 +2456,14 @@ where
         >,
     ) -> ProfileViewBasic<'a> {
         ProfileViewBasic {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            did: self.__unsafe_private_named.2.unwrap(),
-            display_name: self.__unsafe_private_named.3,
-            handle: self.__unsafe_private_named.4.unwrap(),
-            indexed_at: self.__unsafe_private_named.5,
-            labels: self.__unsafe_private_named.6,
-            pronouns: self.__unsafe_private_named.7,
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            did: self._fields.2.unwrap(),
+            display_name: self._fields.3,
+            handle: self._fields.4.unwrap(),
+            indexed_at: self._fields.5,
+            labels: self._fields.6,
+            pronouns: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
@@ -2499,9 +2503,9 @@ pub mod subscribed_notebook_state {
 
 /// Builder for constructing an instance of this type
 pub struct SubscribedNotebookBuilder<'a, S: subscribed_notebook_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SubscribedNotebook<'a> {
@@ -2515,9 +2519,9 @@ impl<'a> SubscribedNotebookBuilder<'a, subscribed_notebook_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubscribedNotebookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2525,12 +2529,12 @@ impl<'a> SubscribedNotebookBuilder<'a, subscribed_notebook_state::Empty> {
 impl<'a, S: subscribed_notebook_state::State> SubscribedNotebookBuilder<'a, S> {
     /// Set the `path` field (optional)
     pub fn path(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `path` field to an Option value (optional)
     pub fn maybe_path(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -2538,12 +2542,12 @@ impl<'a, S: subscribed_notebook_state::State> SubscribedNotebookBuilder<'a, S> {
 impl<'a, S: subscribed_notebook_state::State> SubscribedNotebookBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -2558,11 +2562,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SubscribedNotebookBuilder<'a, subscribed_notebook_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SubscribedNotebookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2575,9 +2579,9 @@ where
     /// Build the final struct
     pub fn build(self) -> SubscribedNotebook<'a> {
         SubscribedNotebook {
-            path: self.__unsafe_private_named.0,
-            title: self.__unsafe_private_named.1,
-            uri: self.__unsafe_private_named.2.unwrap(),
+            path: self._fields.0,
+            title: self._fields.1,
+            uri: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2590,9 +2594,9 @@ where
         >,
     ) -> SubscribedNotebook<'a> {
         SubscribedNotebook {
-            path: self.__unsafe_private_named.0,
-            title: self.__unsafe_private_named.1,
-            uri: self.__unsafe_private_named.2.unwrap(),
+            path: self._fields.0,
+            title: self._fields.1,
+            uri: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2608,58 +2612,58 @@ pub mod tangled_profile_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Bluesky;
         type Did;
         type Handle;
+        type Bluesky;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Bluesky = Unset;
         type Did = Unset;
         type Handle = Unset;
-    }
-    ///State transition - sets the `bluesky` field to Set
-    pub struct SetBluesky<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBluesky<S> {}
-    impl<S: State> State for SetBluesky<S> {
-        type Bluesky = Set<members::bluesky>;
-        type Did = S::Did;
-        type Handle = S::Handle;
+        type Bluesky = Unset;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type Bluesky = S::Bluesky;
         type Did = Set<members::did>;
         type Handle = S::Handle;
+        type Bluesky = S::Bluesky;
     }
     ///State transition - sets the `handle` field to Set
     pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHandle<S> {}
     impl<S: State> State for SetHandle<S> {
-        type Bluesky = S::Bluesky;
         type Did = S::Did;
         type Handle = Set<members::handle>;
+        type Bluesky = S::Bluesky;
+    }
+    ///State transition - sets the `bluesky` field to Set
+    pub struct SetBluesky<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBluesky<S> {}
+    impl<S: State> State for SetBluesky<S> {
+        type Did = S::Did;
+        type Handle = S::Handle;
+        type Bluesky = Set<members::bluesky>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `bluesky` field
-        pub struct bluesky(());
         ///Marker type for the `did` field
         pub struct did(());
         ///Marker type for the `handle` field
         pub struct handle(());
+        ///Marker type for the `bluesky` field
+        pub struct bluesky(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TangledProfileViewBuilder<'a, S: tangled_profile_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<CowStr<'a>>,
         Option<Did<'a>>,
@@ -2669,7 +2673,7 @@ pub struct TangledProfileViewBuilder<'a, S: tangled_profile_view_state::State> {
         Option<Vec<AtUri<'a>>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TangledProfileView<'a> {
@@ -2683,9 +2687,9 @@ impl<'a> TangledProfileViewBuilder<'a, tangled_profile_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TangledProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2700,11 +2704,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> TangledProfileViewBuilder<'a, tangled_profile_view_state::SetBluesky<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TangledProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2712,12 +2716,12 @@ where
 impl<'a, S: tangled_profile_view_state::State> TangledProfileViewBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -2732,11 +2736,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> TangledProfileViewBuilder<'a, tangled_profile_view_state::SetDid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TangledProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2751,11 +2755,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> TangledProfileViewBuilder<'a, tangled_profile_view_state::SetHandle<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TangledProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2763,12 +2767,12 @@ where
 impl<'a, S: tangled_profile_view_state::State> TangledProfileViewBuilder<'a, S> {
     /// Set the `links` field (optional)
     pub fn links(mut self, value: impl Into<Option<Vec<UriValue<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `links` field to an Option value (optional)
     pub fn maybe_links(mut self, value: Option<Vec<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -2776,12 +2780,12 @@ impl<'a, S: tangled_profile_view_state::State> TangledProfileViewBuilder<'a, S>
 impl<'a, S: tangled_profile_view_state::State> TangledProfileViewBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -2792,12 +2796,12 @@ impl<'a, S: tangled_profile_view_state::State> TangledProfileViewBuilder<'a, S>
         mut self,
         value: impl Into<Option<Vec<AtUri<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `pinnedRepositories` field to an Option value (optional)
     pub fn maybe_pinned_repositories(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -2805,12 +2809,12 @@ impl<'a, S: tangled_profile_view_state::State> TangledProfileViewBuilder<'a, S>
 impl<'a, S: tangled_profile_view_state::State> TangledProfileViewBuilder<'a, S> {
     /// Set the `stats` field (optional)
     pub fn stats(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `stats` field to an Option value (optional)
     pub fn maybe_stats(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -2818,21 +2822,21 @@ impl<'a, S: tangled_profile_view_state::State> TangledProfileViewBuilder<'a, S>
 impl<'a, S> TangledProfileViewBuilder<'a, S>
 where
     S: tangled_profile_view_state::State,
-    S::Bluesky: tangled_profile_view_state::IsSet,
     S::Did: tangled_profile_view_state::IsSet,
     S::Handle: tangled_profile_view_state::IsSet,
+    S::Bluesky: tangled_profile_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TangledProfileView<'a> {
         TangledProfileView {
-            bluesky: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            did: self.__unsafe_private_named.2.unwrap(),
-            handle: self.__unsafe_private_named.3.unwrap(),
-            links: self.__unsafe_private_named.4,
-            location: self.__unsafe_private_named.5,
-            pinned_repositories: self.__unsafe_private_named.6,
-            stats: self.__unsafe_private_named.7,
+            bluesky: self._fields.0.unwrap(),
+            description: self._fields.1,
+            did: self._fields.2.unwrap(),
+            handle: self._fields.3.unwrap(),
+            links: self._fields.4,
+            location: self._fields.5,
+            pinned_repositories: self._fields.6,
+            stats: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -2845,14 +2849,14 @@ where
         >,
     ) -> TangledProfileView<'a> {
         TangledProfileView {
-            bluesky: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            did: self.__unsafe_private_named.2.unwrap(),
-            handle: self.__unsafe_private_named.3.unwrap(),
-            links: self.__unsafe_private_named.4,
-            location: self.__unsafe_private_named.5,
-            pinned_repositories: self.__unsafe_private_named.6,
-            stats: self.__unsafe_private_named.7,
+            bluesky: self._fields.0.unwrap(),
+            description: self._fields.1,
+            did: self._fields.2.unwrap(),
+            handle: self._fields.3.unwrap(),
+            links: self._fields.4,
+            location: self._fields.5,
+            pinned_repositories: self._fields.6,
+            stats: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/actor/get_actor_entries.rs b/crates/jacquard-api/src/sh_weaver/actor/get_actor_entries.rs
index 1f56a557..661edb52 100644
--- a/crates/jacquard-api/src/sh_weaver/actor/get_actor_entries.rs
+++ b/crates/jacquard-api/src/sh_weaver/actor/get_actor_entries.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -109,14 +112,9 @@ pub mod get_actor_entries_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorEntriesBuilder<'a, S: get_actor_entries_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<AtIdentifier<'a>>,
-        Option<CowStr<'a>>,
-        Option<bool>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<bool>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorEntries<'a> {
@@ -130,9 +128,9 @@ impl<'a> GetActorEntriesBuilder<'a, get_actor_entries_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorEntriesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -147,11 +145,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorEntriesBuilder<'a, get_actor_entries_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorEntriesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -159,12 +157,12 @@ where
 impl<'a, S: get_actor_entries_state::State> GetActorEntriesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -172,12 +170,12 @@ impl<'a, S: get_actor_entries_state::State> GetActorEntriesBuilder<'a, S> {
 impl<'a, S: get_actor_entries_state::State> GetActorEntriesBuilder<'a, S> {
     /// Set the `includeCollaborations` field (optional)
     pub fn include_collaborations(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `includeCollaborations` field to an Option value (optional)
     pub fn maybe_include_collaborations(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -185,12 +183,12 @@ impl<'a, S: get_actor_entries_state::State> GetActorEntriesBuilder<'a, S> {
 impl<'a, S: get_actor_entries_state::State> GetActorEntriesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -203,10 +201,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorEntries<'a> {
         GetActorEntries {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            include_collaborations: self.__unsafe_private_named.2,
-            limit: self.__unsafe_private_named.3,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            include_collaborations: self._fields.2,
+            limit: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/actor/get_actor_notebooks.rs b/crates/jacquard-api/src/sh_weaver/actor/get_actor_notebooks.rs
index f1a69d72..43701741 100644
--- a/crates/jacquard-api/src/sh_weaver/actor/get_actor_notebooks.rs
+++ b/crates/jacquard-api/src/sh_weaver/actor/get_actor_notebooks.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -109,14 +112,9 @@ pub mod get_actor_notebooks_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorNotebooksBuilder<'a, S: get_actor_notebooks_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<AtIdentifier<'a>>,
-        Option<CowStr<'a>>,
-        Option<bool>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<bool>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorNotebooks<'a> {
@@ -130,9 +128,9 @@ impl<'a> GetActorNotebooksBuilder<'a, get_actor_notebooks_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorNotebooksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -147,11 +145,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorNotebooksBuilder<'a, get_actor_notebooks_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorNotebooksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -159,12 +157,12 @@ where
 impl<'a, S: get_actor_notebooks_state::State> GetActorNotebooksBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -172,12 +170,12 @@ impl<'a, S: get_actor_notebooks_state::State> GetActorNotebooksBuilder<'a, S> {
 impl<'a, S: get_actor_notebooks_state::State> GetActorNotebooksBuilder<'a, S> {
     /// Set the `includeCollaborations` field (optional)
     pub fn include_collaborations(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `includeCollaborations` field to an Option value (optional)
     pub fn maybe_include_collaborations(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -185,12 +183,12 @@ impl<'a, S: get_actor_notebooks_state::State> GetActorNotebooksBuilder<'a, S> {
 impl<'a, S: get_actor_notebooks_state::State> GetActorNotebooksBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -203,10 +201,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorNotebooks<'a> {
         GetActorNotebooks {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            include_collaborations: self.__unsafe_private_named.2,
-            limit: self.__unsafe_private_named.3,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            include_collaborations: self._fields.2,
+            limit: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/actor/get_profile.rs b/crates/jacquard-api/src/sh_weaver/actor/get_profile.rs
index 535ce7fb..23ff64a8 100644
--- a/crates/jacquard-api/src/sh_weaver/actor/get_profile.rs
+++ b/crates/jacquard-api/src/sh_weaver/actor/get_profile.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetProfileBuilder<'a, S: get_profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetProfile<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetProfileBuilder<'a, get_profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetProfileBuilder<'a, get_profile_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetProfile<'a> {
         GetProfile {
-            actor: self.__unsafe_private_named.0.unwrap(),
+            actor: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/actor/get_suggested_authors.rs b/crates/jacquard-api/src/sh_weaver/actor/get_suggested_authors.rs
index bf8b2a84..0778b0ad 100644
--- a/crates/jacquard-api/src/sh_weaver/actor/get_suggested_authors.rs
+++ b/crates/jacquard-api/src/sh_weaver/actor/get_suggested_authors.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::value::Data;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -78,8 +81,8 @@ pub mod get_suggested_authors_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSuggestedAuthorsBuilder<S: get_suggested_authors_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
 }
 
 impl GetSuggestedAuthors {
@@ -93,8 +96,8 @@ impl GetSuggestedAuthorsBuilder<get_suggested_authors_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSuggestedAuthorsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -102,12 +105,12 @@ impl GetSuggestedAuthorsBuilder<get_suggested_authors_state::Empty> {
 impl<S: get_suggested_authors_state::State> GetSuggestedAuthorsBuilder<S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -119,7 +122,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSuggestedAuthors {
         GetSuggestedAuthors {
-            limit: self.__unsafe_private_named.0,
+            limit: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/actor/profile.rs b/crates/jacquard-api/src/sh_weaver/actor/profile.rs
index 48e20ff3..8cdbb4e1 100644
--- a/crates/jacquard-api/src/sh_weaver/actor/profile.rs
+++ b/crates/jacquard-api/src/sh_weaver/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -331,8 +334,8 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<BlobRef<'a>>,
         Option<bool>,
@@ -347,7 +350,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<bool>,
         Option<bool>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -361,8 +364,8 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -377,7 +380,7 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -385,12 +388,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -398,12 +401,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -411,12 +414,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `bluesky` field (optional)
     pub fn bluesky(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `bluesky` field to an Option value (optional)
     pub fn maybe_bluesky(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -424,12 +427,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -437,12 +440,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -450,12 +453,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -463,12 +466,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -476,12 +479,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `links` field (optional)
     pub fn links(mut self, value: impl Into<Option<Vec<UriValue<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `links` field to an Option value (optional)
     pub fn maybe_links(mut self, value: Option<Vec<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -489,12 +492,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -502,12 +505,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `pinned` field (optional)
     pub fn pinned(mut self, value: impl Into<Option<PinnedList<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `pinned` field to an Option value (optional)
     pub fn maybe_pinned(mut self, value: Option<PinnedList<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -515,12 +518,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `pronouns` field (optional)
     pub fn pronouns(mut self, value: impl Into<Option<PronounsList<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `pronouns` field to an Option value (optional)
     pub fn maybe_pronouns(mut self, value: Option<PronounsList<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -528,12 +531,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `streamplace` field (optional)
     pub fn streamplace(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `streamplace` field to an Option value (optional)
     pub fn maybe_streamplace(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -541,12 +544,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `tangled` field (optional)
     pub fn tangled(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `tangled` field to an Option value (optional)
     pub fn maybe_tangled(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -558,19 +561,19 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            bluesky: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3,
-            description: self.__unsafe_private_named.4,
-            display_name: self.__unsafe_private_named.5,
-            labels: self.__unsafe_private_named.6,
-            links: self.__unsafe_private_named.7,
-            location: self.__unsafe_private_named.8,
-            pinned: self.__unsafe_private_named.9,
-            pronouns: self.__unsafe_private_named.10,
-            streamplace: self.__unsafe_private_named.11,
-            tangled: self.__unsafe_private_named.12,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            bluesky: self._fields.2,
+            created_at: self._fields.3,
+            description: self._fields.4,
+            display_name: self._fields.5,
+            labels: self._fields.6,
+            links: self._fields.7,
+            location: self._fields.8,
+            pinned: self._fields.9,
+            pronouns: self._fields.10,
+            streamplace: self._fields.11,
+            tangled: self._fields.12,
             extra_data: Default::default(),
         }
     }
@@ -583,19 +586,19 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            bluesky: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3,
-            description: self.__unsafe_private_named.4,
-            display_name: self.__unsafe_private_named.5,
-            labels: self.__unsafe_private_named.6,
-            links: self.__unsafe_private_named.7,
-            location: self.__unsafe_private_named.8,
-            pinned: self.__unsafe_private_named.9,
-            pronouns: self.__unsafe_private_named.10,
-            streamplace: self.__unsafe_private_named.11,
-            tangled: self.__unsafe_private_named.12,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            bluesky: self._fields.2,
+            created_at: self._fields.3,
+            description: self._fields.4,
+            display_name: self._fields.5,
+            labels: self._fields.6,
+            links: self._fields.7,
+            location: self._fields.8,
+            pinned: self._fields.9,
+            pronouns: self._fields.10,
+            streamplace: self._fields.11,
+            tangled: self._fields.12,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/actor/search_actors.rs b/crates/jacquard-api/src/sh_weaver/actor/search_actors.rs
index e2354f96..c3867577 100644
--- a/crates/jacquard-api/src/sh_weaver/actor/search_actors.rs
+++ b/crates/jacquard-api/src/sh_weaver/actor/search_actors.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -100,9 +103,9 @@ pub mod search_actors_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchActorsBuilder<'a, S: search_actors_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchActors<'a> {
@@ -116,9 +119,9 @@ impl<'a> SearchActorsBuilder<'a, search_actors_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchActorsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -126,12 +129,12 @@ impl<'a> SearchActorsBuilder<'a, search_actors_state::Empty> {
 impl<'a, S: search_actors_state::State> SearchActorsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -139,12 +142,12 @@ impl<'a, S: search_actors_state::State> SearchActorsBuilder<'a, S> {
 impl<'a, S: search_actors_state::State> SearchActorsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -159,11 +162,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SearchActorsBuilder<'a, search_actors_state::SetQ<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SearchActorsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -176,9 +179,9 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchActors<'a> {
         SearchActors {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            q: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            q: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/actor/search_actors_typeahead.rs b/crates/jacquard-api/src/sh_weaver/actor/search_actors_typeahead.rs
index 225a8324..e1f2542a 100644
--- a/crates/jacquard-api/src/sh_weaver/actor/search_actors_typeahead.rs
+++ b/crates/jacquard-api/src/sh_weaver/actor/search_actors_typeahead.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -94,9 +97,9 @@ pub mod search_actors_typeahead_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchActorsTypeaheadBuilder<'a, S: search_actors_typeahead_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchActorsTypeahead<'a> {
@@ -113,9 +116,9 @@ impl<'a> SearchActorsTypeaheadBuilder<'a, search_actors_typeahead_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchActorsTypeaheadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -123,12 +126,12 @@ impl<'a> SearchActorsTypeaheadBuilder<'a, search_actors_typeahead_state::Empty>
 impl<'a, S: search_actors_typeahead_state::State> SearchActorsTypeaheadBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -143,11 +146,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SearchActorsTypeaheadBuilder<'a, search_actors_typeahead_state::SetQ<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SearchActorsTypeaheadBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -160,8 +163,8 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchActorsTypeahead<'a> {
         SearchActorsTypeahead {
-            limit: self.__unsafe_private_named.0,
-            q: self.__unsafe_private_named.1.unwrap(),
+            limit: self._fields.0,
+            q: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/collab.rs b/crates/jacquard-api/src/sh_weaver/collab.rs
index 1b8b1046..afd773c6 100644
--- a/crates/jacquard-api/src/sh_weaver/collab.rs
+++ b/crates/jacquard-api/src/sh_weaver/collab.rs
@@ -13,7 +13,11 @@ pub mod get_resource_sessions;
 pub mod invite;
 pub mod session;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -1083,8 +1087,8 @@ pub mod collaboration_state_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct CollaborationStateViewBuilder<'a, S: collaboration_state_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<Datetime>,
         Option<Datetime>,
@@ -1098,7 +1102,7 @@ pub struct CollaborationStateViewBuilder<'a, S: collaboration_state_view_state::
         Option<StrongRef<'a>>,
         Option<CollaborationStateViewStatus<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CollaborationStateView<'a> {
@@ -1115,8 +1119,8 @@ impl<'a> CollaborationStateViewBuilder<'a, collaboration_state_view_state::Empty
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollaborationStateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -1130,7 +1134,7 @@ impl<'a> CollaborationStateViewBuilder<'a, collaboration_state_view_state::Empty
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1138,12 +1142,12 @@ impl<'a> CollaborationStateViewBuilder<'a, collaboration_state_view_state::Empty
 impl<'a, S: collaboration_state_view_state::State> CollaborationStateViewBuilder<'a, S> {
     /// Set the `canonicalUri` field (optional)
     pub fn canonical_uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `canonicalUri` field to an Option value (optional)
     pub fn maybe_canonical_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1151,12 +1155,12 @@ impl<'a, S: collaboration_state_view_state::State> CollaborationStateViewBuilder
 impl<'a, S: collaboration_state_view_state::State> CollaborationStateViewBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1167,12 +1171,12 @@ impl<'a, S: collaboration_state_view_state::State> CollaborationStateViewBuilder
         mut self,
         value: impl Into<Option<Datetime>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `firstCollaboratorAddedAt` field to an Option value (optional)
     pub fn maybe_first_collaborator_added_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1183,7 +1187,7 @@ impl<'a, S: collaboration_state_view_state::State> CollaborationStateViewBuilder
         mut self,
         value: impl Into<Option<Vec<collab::FormerCollaboratorView<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `formerParticipants` field to an Option value (optional)
@@ -1191,7 +1195,7 @@ impl<'a, S: collaboration_state_view_state::State> CollaborationStateViewBuilder
         mut self,
         value: Option<Vec<collab::FormerCollaboratorView<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1199,12 +1203,12 @@ impl<'a, S: collaboration_state_view_state::State> CollaborationStateViewBuilder
 impl<'a, S: collaboration_state_view_state::State> CollaborationStateViewBuilder<'a, S> {
     /// Set the `hasDivergence` field (optional)
     pub fn has_divergence(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `hasDivergence` field to an Option value (optional)
     pub fn maybe_has_divergence(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1212,12 +1216,12 @@ impl<'a, S: collaboration_state_view_state::State> CollaborationStateViewBuilder
 impl<'a, S: collaboration_state_view_state::State> CollaborationStateViewBuilder<'a, S> {
     /// Set the `hasFormerCollaborators` field (optional)
     pub fn has_former_collaborators(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `hasFormerCollaborators` field to an Option value (optional)
     pub fn maybe_has_former_collaborators(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1225,12 +1229,12 @@ impl<'a, S: collaboration_state_view_state::State> CollaborationStateViewBuilder
 impl<'a, S: collaboration_state_view_state::State> CollaborationStateViewBuilder<'a, S> {
     /// Set the `hasOrphanedVersions` field (optional)
     pub fn has_orphaned_versions(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `hasOrphanedVersions` field to an Option value (optional)
     pub fn maybe_has_orphaned_versions(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1238,12 +1242,12 @@ impl<'a, S: collaboration_state_view_state::State> CollaborationStateViewBuilder
 impl<'a, S: collaboration_state_view_state::State> CollaborationStateViewBuilder<'a, S> {
     /// Set the `lastSyncedAt` field (optional)
     pub fn last_synced_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `lastSyncedAt` field to an Option value (optional)
     pub fn maybe_last_synced_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -1261,11 +1265,11 @@ where
         'a,
         collaboration_state_view_state::SetParticipants<S>,
     > {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         CollaborationStateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1276,7 +1280,7 @@ impl<'a, S: collaboration_state_view_state::State> CollaborationStateViewBuilder
         mut self,
         value: impl Into<Option<Vec<PublishedVersionView<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `publishedVersions` field to an Option value (optional)
@@ -1284,7 +1288,7 @@ impl<'a, S: collaboration_state_view_state::State> CollaborationStateViewBuilder
         mut self,
         value: Option<Vec<PublishedVersionView<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -1302,11 +1306,11 @@ where
         'a,
         collaboration_state_view_state::SetResource<S>,
     > {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         CollaborationStateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1324,11 +1328,11 @@ where
         'a,
         collaboration_state_view_state::SetStatus<S>,
     > {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         CollaborationStateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1343,18 +1347,18 @@ where
     /// Build the final struct
     pub fn build(self) -> CollaborationStateView<'a> {
         CollaborationStateView {
-            canonical_uri: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            first_collaborator_added_at: self.__unsafe_private_named.2,
-            former_participants: self.__unsafe_private_named.3,
-            has_divergence: self.__unsafe_private_named.4,
-            has_former_collaborators: self.__unsafe_private_named.5,
-            has_orphaned_versions: self.__unsafe_private_named.6,
-            last_synced_at: self.__unsafe_private_named.7,
-            participants: self.__unsafe_private_named.8.unwrap(),
-            published_versions: self.__unsafe_private_named.9,
-            resource: self.__unsafe_private_named.10.unwrap(),
-            status: self.__unsafe_private_named.11.unwrap(),
+            canonical_uri: self._fields.0,
+            created_at: self._fields.1,
+            first_collaborator_added_at: self._fields.2,
+            former_participants: self._fields.3,
+            has_divergence: self._fields.4,
+            has_former_collaborators: self._fields.5,
+            has_orphaned_versions: self._fields.6,
+            last_synced_at: self._fields.7,
+            participants: self._fields.8.unwrap(),
+            published_versions: self._fields.9,
+            resource: self._fields.10.unwrap(),
+            status: self._fields.11.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1367,18 +1371,18 @@ where
         >,
     ) -> CollaborationStateView<'a> {
         CollaborationStateView {
-            canonical_uri: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            first_collaborator_added_at: self.__unsafe_private_named.2,
-            former_participants: self.__unsafe_private_named.3,
-            has_divergence: self.__unsafe_private_named.4,
-            has_former_collaborators: self.__unsafe_private_named.5,
-            has_orphaned_versions: self.__unsafe_private_named.6,
-            last_synced_at: self.__unsafe_private_named.7,
-            participants: self.__unsafe_private_named.8.unwrap(),
-            published_versions: self.__unsafe_private_named.9,
-            resource: self.__unsafe_private_named.10.unwrap(),
-            status: self.__unsafe_private_named.11.unwrap(),
+            canonical_uri: self._fields.0,
+            created_at: self._fields.1,
+            first_collaborator_added_at: self._fields.2,
+            former_participants: self._fields.3,
+            has_divergence: self._fields.4,
+            has_former_collaborators: self._fields.5,
+            has_orphaned_versions: self._fields.6,
+            last_synced_at: self._fields.7,
+            participants: self._fields.8.unwrap(),
+            published_versions: self._fields.9,
+            resource: self._fields.10.unwrap(),
+            status: self._fields.11.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1919,65 +1923,65 @@ pub mod former_collaborator_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type WasActiveUntil;
-        type User;
         type WasActiveFrom;
+        type User;
+        type WasActiveUntil;
         type EndReason;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type WasActiveUntil = Unset;
-        type User = Unset;
         type WasActiveFrom = Unset;
+        type User = Unset;
+        type WasActiveUntil = Unset;
         type EndReason = Unset;
     }
-    ///State transition - sets the `was_active_until` field to Set
-    pub struct SetWasActiveUntil<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetWasActiveUntil<S> {}
-    impl<S: State> State for SetWasActiveUntil<S> {
-        type WasActiveUntil = Set<members::was_active_until>;
+    ///State transition - sets the `was_active_from` field to Set
+    pub struct SetWasActiveFrom<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetWasActiveFrom<S> {}
+    impl<S: State> State for SetWasActiveFrom<S> {
+        type WasActiveFrom = Set<members::was_active_from>;
         type User = S::User;
-        type WasActiveFrom = S::WasActiveFrom;
+        type WasActiveUntil = S::WasActiveUntil;
         type EndReason = S::EndReason;
     }
     ///State transition - sets the `user` field to Set
     pub struct SetUser<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUser<S> {}
     impl<S: State> State for SetUser<S> {
-        type WasActiveUntil = S::WasActiveUntil;
-        type User = Set<members::user>;
         type WasActiveFrom = S::WasActiveFrom;
+        type User = Set<members::user>;
+        type WasActiveUntil = S::WasActiveUntil;
         type EndReason = S::EndReason;
     }
-    ///State transition - sets the `was_active_from` field to Set
-    pub struct SetWasActiveFrom<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetWasActiveFrom<S> {}
-    impl<S: State> State for SetWasActiveFrom<S> {
-        type WasActiveUntil = S::WasActiveUntil;
+    ///State transition - sets the `was_active_until` field to Set
+    pub struct SetWasActiveUntil<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetWasActiveUntil<S> {}
+    impl<S: State> State for SetWasActiveUntil<S> {
+        type WasActiveFrom = S::WasActiveFrom;
         type User = S::User;
-        type WasActiveFrom = Set<members::was_active_from>;
+        type WasActiveUntil = Set<members::was_active_until>;
         type EndReason = S::EndReason;
     }
     ///State transition - sets the `end_reason` field to Set
     pub struct SetEndReason<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEndReason<S> {}
     impl<S: State> State for SetEndReason<S> {
-        type WasActiveUntil = S::WasActiveUntil;
-        type User = S::User;
         type WasActiveFrom = S::WasActiveFrom;
+        type User = S::User;
+        type WasActiveUntil = S::WasActiveUntil;
         type EndReason = Set<members::end_reason>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `was_active_until` field
-        pub struct was_active_until(());
-        ///Marker type for the `user` field
-        pub struct user(());
         ///Marker type for the `was_active_from` field
         pub struct was_active_from(());
+        ///Marker type for the `user` field
+        pub struct user(());
+        ///Marker type for the `was_active_until` field
+        pub struct was_active_until(());
         ///Marker type for the `end_reason` field
         pub struct end_reason(());
     }
@@ -1985,8 +1989,8 @@ pub mod former_collaborator_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct FormerCollaboratorViewBuilder<'a, S: former_collaborator_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<FormerCollaboratorViewEndReason<'a>>,
         Option<bool>,
@@ -1995,7 +1999,7 @@ pub struct FormerCollaboratorViewBuilder<'a, S: former_collaborator_view_state::
         Option<Datetime>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> FormerCollaboratorView<'a> {
@@ -2012,9 +2016,9 @@ impl<'a> FormerCollaboratorViewBuilder<'a, former_collaborator_view_state::Empty
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FormerCollaboratorViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2022,12 +2026,12 @@ impl<'a> FormerCollaboratorViewBuilder<'a, former_collaborator_view_state::Empty
 impl<'a, S: former_collaborator_view_state::State> FormerCollaboratorViewBuilder<'a, S> {
     /// Set the `contributionCount` field (optional)
     pub fn contribution_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `contributionCount` field to an Option value (optional)
     pub fn maybe_contribution_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -2045,11 +2049,11 @@ where
         'a,
         former_collaborator_view_state::SetEndReason<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FormerCollaboratorViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2057,12 +2061,12 @@ where
 impl<'a, S: former_collaborator_view_state::State> FormerCollaboratorViewBuilder<'a, S> {
     /// Set the `hasPublishedVersion` field (optional)
     pub fn has_published_version(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `hasPublishedVersion` field to an Option value (optional)
     pub fn maybe_has_published_version(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -2070,12 +2074,12 @@ impl<'a, S: former_collaborator_view_state::State> FormerCollaboratorViewBuilder
 impl<'a, S: former_collaborator_view_state::State> FormerCollaboratorViewBuilder<'a, S> {
     /// Set the `publishedVersionUri` field (optional)
     pub fn published_version_uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `publishedVersionUri` field to an Option value (optional)
     pub fn maybe_published_version_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -2090,11 +2094,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> FormerCollaboratorViewBuilder<'a, former_collaborator_view_state::SetUser<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         FormerCollaboratorViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2112,11 +2116,11 @@ where
         'a,
         former_collaborator_view_state::SetWasActiveFrom<S>,
     > {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         FormerCollaboratorViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2134,11 +2138,11 @@ where
         'a,
         former_collaborator_view_state::SetWasActiveUntil<S>,
     > {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         FormerCollaboratorViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2146,21 +2150,21 @@ where
 impl<'a, S> FormerCollaboratorViewBuilder<'a, S>
 where
     S: former_collaborator_view_state::State,
-    S::WasActiveUntil: former_collaborator_view_state::IsSet,
-    S::User: former_collaborator_view_state::IsSet,
     S::WasActiveFrom: former_collaborator_view_state::IsSet,
+    S::User: former_collaborator_view_state::IsSet,
+    S::WasActiveUntil: former_collaborator_view_state::IsSet,
     S::EndReason: former_collaborator_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> FormerCollaboratorView<'a> {
         FormerCollaboratorView {
-            contribution_count: self.__unsafe_private_named.0,
-            end_reason: self.__unsafe_private_named.1.unwrap(),
-            has_published_version: self.__unsafe_private_named.2,
-            published_version_uri: self.__unsafe_private_named.3,
-            user: self.__unsafe_private_named.4.unwrap(),
-            was_active_from: self.__unsafe_private_named.5.unwrap(),
-            was_active_until: self.__unsafe_private_named.6.unwrap(),
+            contribution_count: self._fields.0,
+            end_reason: self._fields.1.unwrap(),
+            has_published_version: self._fields.2,
+            published_version_uri: self._fields.3,
+            user: self._fields.4.unwrap(),
+            was_active_from: self._fields.5.unwrap(),
+            was_active_until: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2173,13 +2177,13 @@ where
         >,
     ) -> FormerCollaboratorView<'a> {
         FormerCollaboratorView {
-            contribution_count: self.__unsafe_private_named.0,
-            end_reason: self.__unsafe_private_named.1.unwrap(),
-            has_published_version: self.__unsafe_private_named.2,
-            published_version_uri: self.__unsafe_private_named.3,
-            user: self.__unsafe_private_named.4.unwrap(),
-            was_active_from: self.__unsafe_private_named.5.unwrap(),
-            was_active_until: self.__unsafe_private_named.6.unwrap(),
+            contribution_count: self._fields.0,
+            end_reason: self._fields.1.unwrap(),
+            has_published_version: self._fields.2,
+            published_version_uri: self._fields.3,
+            user: self._fields.4.unwrap(),
+            was_active_from: self._fields.5.unwrap(),
+            was_active_until: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2195,134 +2199,134 @@ pub mod invite_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Inviter;
+        type Invitee;
         type Resource;
         type Cid;
-        type Invitee;
+        type Status;
         type Uri;
         type CreatedAt;
-        type Status;
+        type Inviter;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Inviter = Unset;
+        type Invitee = Unset;
         type Resource = Unset;
         type Cid = Unset;
-        type Invitee = Unset;
+        type Status = Unset;
         type Uri = Unset;
         type CreatedAt = Unset;
-        type Status = Unset;
+        type Inviter = Unset;
     }
-    ///State transition - sets the `inviter` field to Set
-    pub struct SetInviter<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetInviter<S> {}
-    impl<S: State> State for SetInviter<S> {
-        type Inviter = Set<members::inviter>;
+    ///State transition - sets the `invitee` field to Set
+    pub struct SetInvitee<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetInvitee<S> {}
+    impl<S: State> State for SetInvitee<S> {
+        type Invitee = Set<members::invitee>;
         type Resource = S::Resource;
         type Cid = S::Cid;
-        type Invitee = S::Invitee;
+        type Status = S::Status;
         type Uri = S::Uri;
         type CreatedAt = S::CreatedAt;
-        type Status = S::Status;
+        type Inviter = S::Inviter;
     }
     ///State transition - sets the `resource` field to Set
     pub struct SetResource<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetResource<S> {}
     impl<S: State> State for SetResource<S> {
-        type Inviter = S::Inviter;
+        type Invitee = S::Invitee;
         type Resource = Set<members::resource>;
         type Cid = S::Cid;
-        type Invitee = S::Invitee;
+        type Status = S::Status;
         type Uri = S::Uri;
         type CreatedAt = S::CreatedAt;
-        type Status = S::Status;
+        type Inviter = S::Inviter;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type Inviter = S::Inviter;
+        type Invitee = S::Invitee;
         type Resource = S::Resource;
         type Cid = Set<members::cid>;
-        type Invitee = S::Invitee;
+        type Status = S::Status;
         type Uri = S::Uri;
         type CreatedAt = S::CreatedAt;
-        type Status = S::Status;
-    }
-    ///State transition - sets the `invitee` field to Set
-    pub struct SetInvitee<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetInvitee<S> {}
-    impl<S: State> State for SetInvitee<S> {
         type Inviter = S::Inviter;
+    }
+    ///State transition - sets the `status` field to Set
+    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStatus<S> {}
+    impl<S: State> State for SetStatus<S> {
+        type Invitee = S::Invitee;
         type Resource = S::Resource;
         type Cid = S::Cid;
-        type Invitee = Set<members::invitee>;
+        type Status = Set<members::status>;
         type Uri = S::Uri;
         type CreatedAt = S::CreatedAt;
-        type Status = S::Status;
+        type Inviter = S::Inviter;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Inviter = S::Inviter;
+        type Invitee = S::Invitee;
         type Resource = S::Resource;
         type Cid = S::Cid;
-        type Invitee = S::Invitee;
+        type Status = S::Status;
         type Uri = Set<members::uri>;
         type CreatedAt = S::CreatedAt;
-        type Status = S::Status;
+        type Inviter = S::Inviter;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Inviter = S::Inviter;
+        type Invitee = S::Invitee;
         type Resource = S::Resource;
         type Cid = S::Cid;
-        type Invitee = S::Invitee;
+        type Status = S::Status;
         type Uri = S::Uri;
         type CreatedAt = Set<members::created_at>;
-        type Status = S::Status;
-    }
-    ///State transition - sets the `status` field to Set
-    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStatus<S> {}
-    impl<S: State> State for SetStatus<S> {
         type Inviter = S::Inviter;
+    }
+    ///State transition - sets the `inviter` field to Set
+    pub struct SetInviter<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetInviter<S> {}
+    impl<S: State> State for SetInviter<S> {
+        type Invitee = S::Invitee;
         type Resource = S::Resource;
         type Cid = S::Cid;
-        type Invitee = S::Invitee;
+        type Status = S::Status;
         type Uri = S::Uri;
         type CreatedAt = S::CreatedAt;
-        type Status = Set<members::status>;
+        type Inviter = Set<members::inviter>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `inviter` field
-        pub struct inviter(());
+        ///Marker type for the `invitee` field
+        pub struct invitee(());
         ///Marker type for the `resource` field
         pub struct resource(());
         ///Marker type for the `cid` field
         pub struct cid(());
-        ///Marker type for the `invitee` field
-        pub struct invitee(());
+        ///Marker type for the `status` field
+        pub struct status(());
         ///Marker type for the `uri` field
         pub struct uri(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `status` field
-        pub struct status(());
+        ///Marker type for the `inviter` field
+        pub struct inviter(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct InviteViewBuilder<'a, S: invite_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<Datetime>,
         Option<Cid<'a>>,
@@ -2337,7 +2341,7 @@ pub struct InviteViewBuilder<'a, S: invite_view_state::State> {
         Option<InviteViewStatus<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> InviteView<'a> {
@@ -2351,8 +2355,8 @@ impl<'a> InviteViewBuilder<'a, invite_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         InviteViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -2367,7 +2371,7 @@ impl<'a> InviteViewBuilder<'a, invite_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2375,12 +2379,12 @@ impl<'a> InviteViewBuilder<'a, invite_view_state::Empty> {
 impl<'a, S: invite_view_state::State> InviteViewBuilder<'a, S> {
     /// Set the `acceptUri` field (optional)
     pub fn accept_uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `acceptUri` field to an Option value (optional)
     pub fn maybe_accept_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -2388,12 +2392,12 @@ impl<'a, S: invite_view_state::State> InviteViewBuilder<'a, S> {
 impl<'a, S: invite_view_state::State> InviteViewBuilder<'a, S> {
     /// Set the `acceptedAt` field (optional)
     pub fn accepted_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `acceptedAt` field to an Option value (optional)
     pub fn maybe_accepted_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -2408,11 +2412,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> InviteViewBuilder<'a, invite_view_state::SetCid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         InviteViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2427,11 +2431,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> InviteViewBuilder<'a, invite_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         InviteViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2439,12 +2443,12 @@ where
 impl<'a, S: invite_view_state::State> InviteViewBuilder<'a, S> {
     /// Set the `expiresAt` field (optional)
     pub fn expires_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `expiresAt` field to an Option value (optional)
     pub fn maybe_expires_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -2459,11 +2463,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> InviteViewBuilder<'a, invite_view_state::SetInvitee<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         InviteViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2478,11 +2482,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> InviteViewBuilder<'a, invite_view_state::SetInviter<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         InviteViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2490,12 +2494,12 @@ where
 impl<'a, S: invite_view_state::State> InviteViewBuilder<'a, S> {
     /// Set the `message` field (optional)
     pub fn message(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `message` field to an Option value (optional)
     pub fn maybe_message(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -2510,11 +2514,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> InviteViewBuilder<'a, invite_view_state::SetResource<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         InviteViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2522,12 +2526,12 @@ where
 impl<'a, S: invite_view_state::State> InviteViewBuilder<'a, S> {
     /// Set the `resourceTitle` field (optional)
     pub fn resource_title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `resourceTitle` field to an Option value (optional)
     pub fn maybe_resource_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -2535,12 +2539,12 @@ impl<'a, S: invite_view_state::State> InviteViewBuilder<'a, S> {
 impl<'a, S: invite_view_state::State> InviteViewBuilder<'a, S> {
     /// Set the `scope` field (optional)
     pub fn scope(mut self, value: impl Into<Option<InviteViewScope<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `scope` field to an Option value (optional)
     pub fn maybe_scope(mut self, value: Option<InviteViewScope<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -2555,11 +2559,11 @@ where
         mut self,
         value: impl Into<InviteViewStatus<'a>>,
     ) -> InviteViewBuilder<'a, invite_view_state::SetStatus<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         InviteViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2574,11 +2578,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> InviteViewBuilder<'a, invite_view_state::SetUri<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         InviteViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2586,30 +2590,30 @@ where
 impl<'a, S> InviteViewBuilder<'a, S>
 where
     S: invite_view_state::State,
-    S::Inviter: invite_view_state::IsSet,
+    S::Invitee: invite_view_state::IsSet,
     S::Resource: invite_view_state::IsSet,
     S::Cid: invite_view_state::IsSet,
-    S::Invitee: invite_view_state::IsSet,
+    S::Status: invite_view_state::IsSet,
     S::Uri: invite_view_state::IsSet,
     S::CreatedAt: invite_view_state::IsSet,
-    S::Status: invite_view_state::IsSet,
+    S::Inviter: invite_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> InviteView<'a> {
         InviteView {
-            accept_uri: self.__unsafe_private_named.0,
-            accepted_at: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            expires_at: self.__unsafe_private_named.4,
-            invitee: self.__unsafe_private_named.5.unwrap(),
-            inviter: self.__unsafe_private_named.6.unwrap(),
-            message: self.__unsafe_private_named.7,
-            resource: self.__unsafe_private_named.8.unwrap(),
-            resource_title: self.__unsafe_private_named.9,
-            scope: self.__unsafe_private_named.10,
-            status: self.__unsafe_private_named.11.unwrap(),
-            uri: self.__unsafe_private_named.12.unwrap(),
+            accept_uri: self._fields.0,
+            accepted_at: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            created_at: self._fields.3.unwrap(),
+            expires_at: self._fields.4,
+            invitee: self._fields.5.unwrap(),
+            inviter: self._fields.6.unwrap(),
+            message: self._fields.7,
+            resource: self._fields.8.unwrap(),
+            resource_title: self._fields.9,
+            scope: self._fields.10,
+            status: self._fields.11.unwrap(),
+            uri: self._fields.12.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2622,19 +2626,19 @@ where
         >,
     ) -> InviteView<'a> {
         InviteView {
-            accept_uri: self.__unsafe_private_named.0,
-            accepted_at: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            expires_at: self.__unsafe_private_named.4,
-            invitee: self.__unsafe_private_named.5.unwrap(),
-            inviter: self.__unsafe_private_named.6.unwrap(),
-            message: self.__unsafe_private_named.7,
-            resource: self.__unsafe_private_named.8.unwrap(),
-            resource_title: self.__unsafe_private_named.9,
-            scope: self.__unsafe_private_named.10,
-            status: self.__unsafe_private_named.11.unwrap(),
-            uri: self.__unsafe_private_named.12.unwrap(),
+            accept_uri: self._fields.0,
+            accepted_at: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            created_at: self._fields.3.unwrap(),
+            expires_at: self._fields.4,
+            invitee: self._fields.5.unwrap(),
+            inviter: self._fields.6.unwrap(),
+            message: self._fields.7,
+            resource: self._fields.8.unwrap(),
+            resource_title: self._fields.9,
+            scope: self._fields.10,
+            status: self._fields.11.unwrap(),
+            uri: self._fields.12.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2650,58 +2654,58 @@ pub mod participant_state_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Status;
         type Role;
         type User;
-        type Status;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Status = Unset;
         type Role = Unset;
         type User = Unset;
-        type Status = Unset;
+    }
+    ///State transition - sets the `status` field to Set
+    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStatus<S> {}
+    impl<S: State> State for SetStatus<S> {
+        type Status = Set<members::status>;
+        type Role = S::Role;
+        type User = S::User;
     }
     ///State transition - sets the `role` field to Set
     pub struct SetRole<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRole<S> {}
     impl<S: State> State for SetRole<S> {
+        type Status = S::Status;
         type Role = Set<members::role>;
         type User = S::User;
-        type Status = S::Status;
     }
     ///State transition - sets the `user` field to Set
     pub struct SetUser<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUser<S> {}
     impl<S: State> State for SetUser<S> {
-        type Role = S::Role;
-        type User = Set<members::user>;
         type Status = S::Status;
-    }
-    ///State transition - sets the `status` field to Set
-    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStatus<S> {}
-    impl<S: State> State for SetStatus<S> {
         type Role = S::Role;
-        type User = S::User;
-        type Status = Set<members::status>;
+        type User = Set<members::user>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `status` field
+        pub struct status(());
         ///Marker type for the `role` field
         pub struct role(());
         ///Marker type for the `user` field
         pub struct user(());
-        ///Marker type for the `status` field
-        pub struct status(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ParticipantStateViewBuilder<'a, S: participant_state_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<ParticipantStateViewEndReason<'a>>,
         Option<Datetime>,
@@ -2714,7 +2718,7 @@ pub struct ParticipantStateViewBuilder<'a, S: participant_state_view_state::Stat
         Option<ProfileViewBasic<'a>>,
         Option<bool>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ParticipantStateView<'a> {
@@ -2731,21 +2735,9 @@ impl<'a> ParticipantStateViewBuilder<'a, participant_state_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ParticipantStateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2753,12 +2745,12 @@ impl<'a> ParticipantStateViewBuilder<'a, participant_state_view_state::Empty> {
 impl<'a, S: participant_state_view_state::State> ParticipantStateViewBuilder<'a, S> {
     /// Set the `acceptUri` field (optional)
     pub fn accept_uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `acceptUri` field to an Option value (optional)
     pub fn maybe_accept_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -2769,7 +2761,7 @@ impl<'a, S: participant_state_view_state::State> ParticipantStateViewBuilder<'a,
         mut self,
         value: impl Into<Option<ParticipantStateViewEndReason<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `endReason` field to an Option value (optional)
@@ -2777,7 +2769,7 @@ impl<'a, S: participant_state_view_state::State> ParticipantStateViewBuilder<'a,
         mut self,
         value: Option<ParticipantStateViewEndReason<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -2785,12 +2777,12 @@ impl<'a, S: participant_state_view_state::State> ParticipantStateViewBuilder<'a,
 impl<'a, S: participant_state_view_state::State> ParticipantStateViewBuilder<'a, S> {
     /// Set the `firstEditAt` field (optional)
     pub fn first_edit_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `firstEditAt` field to an Option value (optional)
     pub fn maybe_first_edit_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -2798,12 +2790,12 @@ impl<'a, S: participant_state_view_state::State> ParticipantStateViewBuilder<'a,
 impl<'a, S: participant_state_view_state::State> ParticipantStateViewBuilder<'a, S> {
     /// Set the `inviteUri` field (optional)
     pub fn invite_uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `inviteUri` field to an Option value (optional)
     pub fn maybe_invite_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -2811,12 +2803,12 @@ impl<'a, S: participant_state_view_state::State> ParticipantStateViewBuilder<'a,
 impl<'a, S: participant_state_view_state::State> ParticipantStateViewBuilder<'a, S> {
     /// Set the `lastEditAt` field (optional)
     pub fn last_edit_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `lastEditAt` field to an Option value (optional)
     pub fn maybe_last_edit_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -2824,12 +2816,12 @@ impl<'a, S: participant_state_view_state::State> ParticipantStateViewBuilder<'a,
 impl<'a, S: participant_state_view_state::State> ParticipantStateViewBuilder<'a, S> {
     /// Set the `publishedVersion` field (optional)
     pub fn published_version(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `publishedVersion` field to an Option value (optional)
     pub fn maybe_published_version(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -2837,12 +2829,12 @@ impl<'a, S: participant_state_view_state::State> ParticipantStateViewBuilder<'a,
 impl<'a, S: participant_state_view_state::State> ParticipantStateViewBuilder<'a, S> {
     /// Set the `relationshipEndedAt` field (optional)
     pub fn relationship_ended_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `relationshipEndedAt` field to an Option value (optional)
     pub fn maybe_relationship_ended_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -2857,11 +2849,11 @@ where
         mut self,
         value: impl Into<ParticipantStateViewRole<'a>>,
     ) -> ParticipantStateViewBuilder<'a, participant_state_view_state::SetRole<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ParticipantStateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2876,11 +2868,11 @@ where
         mut self,
         value: impl Into<ParticipantStateViewStatus<'a>>,
     ) -> ParticipantStateViewBuilder<'a, participant_state_view_state::SetStatus<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         ParticipantStateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2895,11 +2887,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> ParticipantStateViewBuilder<'a, participant_state_view_state::SetUser<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ParticipantStateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2907,12 +2899,12 @@ where
 impl<'a, S: participant_state_view_state::State> ParticipantStateViewBuilder<'a, S> {
     /// Set the `wasCollaborator` field (optional)
     pub fn was_collaborator(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `wasCollaborator` field to an Option value (optional)
     pub fn maybe_was_collaborator(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -2920,24 +2912,24 @@ impl<'a, S: participant_state_view_state::State> ParticipantStateViewBuilder<'a,
 impl<'a, S> ParticipantStateViewBuilder<'a, S>
 where
     S: participant_state_view_state::State,
+    S::Status: participant_state_view_state::IsSet,
     S::Role: participant_state_view_state::IsSet,
     S::User: participant_state_view_state::IsSet,
-    S::Status: participant_state_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ParticipantStateView<'a> {
         ParticipantStateView {
-            accept_uri: self.__unsafe_private_named.0,
-            end_reason: self.__unsafe_private_named.1,
-            first_edit_at: self.__unsafe_private_named.2,
-            invite_uri: self.__unsafe_private_named.3,
-            last_edit_at: self.__unsafe_private_named.4,
-            published_version: self.__unsafe_private_named.5,
-            relationship_ended_at: self.__unsafe_private_named.6,
-            role: self.__unsafe_private_named.7.unwrap(),
-            status: self.__unsafe_private_named.8.unwrap(),
-            user: self.__unsafe_private_named.9.unwrap(),
-            was_collaborator: self.__unsafe_private_named.10,
+            accept_uri: self._fields.0,
+            end_reason: self._fields.1,
+            first_edit_at: self._fields.2,
+            invite_uri: self._fields.3,
+            last_edit_at: self._fields.4,
+            published_version: self._fields.5,
+            relationship_ended_at: self._fields.6,
+            role: self._fields.7.unwrap(),
+            status: self._fields.8.unwrap(),
+            user: self._fields.9.unwrap(),
+            was_collaborator: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -2950,17 +2942,17 @@ where
         >,
     ) -> ParticipantStateView<'a> {
         ParticipantStateView {
-            accept_uri: self.__unsafe_private_named.0,
-            end_reason: self.__unsafe_private_named.1,
-            first_edit_at: self.__unsafe_private_named.2,
-            invite_uri: self.__unsafe_private_named.3,
-            last_edit_at: self.__unsafe_private_named.4,
-            published_version: self.__unsafe_private_named.5,
-            relationship_ended_at: self.__unsafe_private_named.6,
-            role: self.__unsafe_private_named.7.unwrap(),
-            status: self.__unsafe_private_named.8.unwrap(),
-            user: self.__unsafe_private_named.9.unwrap(),
-            was_collaborator: self.__unsafe_private_named.10,
+            accept_uri: self._fields.0,
+            end_reason: self._fields.1,
+            first_edit_at: self._fields.2,
+            invite_uri: self._fields.3,
+            last_edit_at: self._fields.4,
+            published_version: self._fields.5,
+            relationship_ended_at: self._fields.6,
+            role: self._fields.7.unwrap(),
+            status: self._fields.8.unwrap(),
+            user: self._fields.9.unwrap(),
+            was_collaborator: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
@@ -2976,92 +2968,92 @@ pub mod session_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type User;
-        type Resource;
         type NodeId;
-        type Uri;
+        type Resource;
+        type User;
         type CreatedAt;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type User = Unset;
-        type Resource = Unset;
         type NodeId = Unset;
-        type Uri = Unset;
+        type Resource = Unset;
+        type User = Unset;
         type CreatedAt = Unset;
+        type Uri = Unset;
     }
-    ///State transition - sets the `user` field to Set
-    pub struct SetUser<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUser<S> {}
-    impl<S: State> State for SetUser<S> {
-        type User = Set<members::user>;
+    ///State transition - sets the `node_id` field to Set
+    pub struct SetNodeId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetNodeId<S> {}
+    impl<S: State> State for SetNodeId<S> {
+        type NodeId = Set<members::node_id>;
         type Resource = S::Resource;
-        type NodeId = S::NodeId;
-        type Uri = S::Uri;
+        type User = S::User;
         type CreatedAt = S::CreatedAt;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `resource` field to Set
     pub struct SetResource<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetResource<S> {}
     impl<S: State> State for SetResource<S> {
-        type User = S::User;
-        type Resource = Set<members::resource>;
         type NodeId = S::NodeId;
-        type Uri = S::Uri;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `node_id` field to Set
-    pub struct SetNodeId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetNodeId<S> {}
-    impl<S: State> State for SetNodeId<S> {
+        type Resource = Set<members::resource>;
         type User = S::User;
-        type Resource = S::Resource;
-        type NodeId = Set<members::node_id>;
-        type Uri = S::Uri;
         type CreatedAt = S::CreatedAt;
+        type Uri = S::Uri;
     }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type User = S::User;
-        type Resource = S::Resource;
+    ///State transition - sets the `user` field to Set
+    pub struct SetUser<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUser<S> {}
+    impl<S: State> State for SetUser<S> {
         type NodeId = S::NodeId;
-        type Uri = Set<members::uri>;
+        type Resource = S::Resource;
+        type User = Set<members::user>;
         type CreatedAt = S::CreatedAt;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type User = S::User;
-        type Resource = S::Resource;
         type NodeId = S::NodeId;
-        type Uri = S::Uri;
+        type Resource = S::Resource;
+        type User = S::User;
         type CreatedAt = Set<members::created_at>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type NodeId = S::NodeId;
+        type Resource = S::Resource;
+        type User = S::User;
+        type CreatedAt = S::CreatedAt;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `user` field
-        pub struct user(());
-        ///Marker type for the `resource` field
-        pub struct resource(());
         ///Marker type for the `node_id` field
         pub struct node_id(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
+        ///Marker type for the `resource` field
+        pub struct resource(());
+        ///Marker type for the `user` field
+        pub struct user(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SessionViewBuilder<'a, S: session_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -3070,7 +3062,7 @@ pub struct SessionViewBuilder<'a, S: session_view_state::State> {
         Option<AtUri<'a>>,
         Option<ProfileViewBasic<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SessionView<'a> {
@@ -3084,9 +3076,9 @@ impl<'a> SessionViewBuilder<'a, session_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SessionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3101,11 +3093,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SessionViewBuilder<'a, session_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SessionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3113,12 +3105,12 @@ where
 impl<'a, S: session_view_state::State> SessionViewBuilder<'a, S> {
     /// Set the `expiresAt` field (optional)
     pub fn expires_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `expiresAt` field to an Option value (optional)
     pub fn maybe_expires_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3133,11 +3125,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SessionViewBuilder<'a, session_view_state::SetNodeId<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SessionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3145,12 +3137,12 @@ where
 impl<'a, S: session_view_state::State> SessionViewBuilder<'a, S> {
     /// Set the `relayUrl` field (optional)
     pub fn relay_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `relayUrl` field to an Option value (optional)
     pub fn maybe_relay_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -3165,11 +3157,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> SessionViewBuilder<'a, session_view_state::SetResource<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         SessionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3184,11 +3176,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SessionViewBuilder<'a, session_view_state::SetUri<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         SessionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3203,11 +3195,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> SessionViewBuilder<'a, session_view_state::SetUser<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         SessionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3215,22 +3207,22 @@ where
 impl<'a, S> SessionViewBuilder<'a, S>
 where
     S: session_view_state::State,
-    S::User: session_view_state::IsSet,
-    S::Resource: session_view_state::IsSet,
     S::NodeId: session_view_state::IsSet,
-    S::Uri: session_view_state::IsSet,
+    S::Resource: session_view_state::IsSet,
+    S::User: session_view_state::IsSet,
     S::CreatedAt: session_view_state::IsSet,
+    S::Uri: session_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SessionView<'a> {
         SessionView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            expires_at: self.__unsafe_private_named.1,
-            node_id: self.__unsafe_private_named.2.unwrap(),
-            relay_url: self.__unsafe_private_named.3,
-            resource: self.__unsafe_private_named.4.unwrap(),
-            uri: self.__unsafe_private_named.5.unwrap(),
-            user: self.__unsafe_private_named.6.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            expires_at: self._fields.1,
+            node_id: self._fields.2.unwrap(),
+            relay_url: self._fields.3,
+            resource: self._fields.4.unwrap(),
+            uri: self._fields.5.unwrap(),
+            user: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3243,13 +3235,13 @@ where
         >,
     ) -> SessionView<'a> {
         SessionView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            expires_at: self.__unsafe_private_named.1,
-            node_id: self.__unsafe_private_named.2.unwrap(),
-            relay_url: self.__unsafe_private_named.3,
-            resource: self.__unsafe_private_named.4.unwrap(),
-            uri: self.__unsafe_private_named.5.unwrap(),
-            user: self.__unsafe_private_named.6.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            expires_at: self._fields.1,
+            node_id: self._fields.2.unwrap(),
+            relay_url: self._fields.3,
+            resource: self._fields.4.unwrap(),
+            uri: self._fields.5.unwrap(),
+            user: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/collab/accept.rs b/crates/jacquard-api/src/sh_weaver/collab/accept.rs
index edff04c5..3ecd7326 100644
--- a/crates/jacquard-api/src/sh_weaver/collab/accept.rs
+++ b/crates/jacquard-api/src/sh_weaver/collab/accept.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -113,49 +116,49 @@ pub mod accept_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Resource;
         type Invite;
+        type Resource;
         type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Resource = Unset;
         type Invite = Unset;
+        type Resource = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `resource` field to Set
-    pub struct SetResource<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetResource<S> {}
-    impl<S: State> State for SetResource<S> {
-        type Resource = Set<members::resource>;
-        type Invite = S::Invite;
-        type CreatedAt = S::CreatedAt;
-    }
     ///State transition - sets the `invite` field to Set
     pub struct SetInvite<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetInvite<S> {}
     impl<S: State> State for SetInvite<S> {
-        type Resource = S::Resource;
         type Invite = Set<members::invite>;
+        type Resource = S::Resource;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `resource` field to Set
+    pub struct SetResource<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetResource<S> {}
+    impl<S: State> State for SetResource<S> {
+        type Invite = S::Invite;
+        type Resource = Set<members::resource>;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Resource = S::Resource;
         type Invite = S::Invite;
+        type Resource = S::Resource;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `resource` field
-        pub struct resource(());
         ///Marker type for the `invite` field
         pub struct invite(());
+        ///Marker type for the `resource` field
+        pub struct resource(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
     }
@@ -163,9 +166,9 @@ pub mod accept_state {
 
 /// Builder for constructing an instance of this type
 pub struct AcceptBuilder<'a, S: accept_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Accept<'a> {
@@ -179,9 +182,9 @@ impl<'a> AcceptBuilder<'a, accept_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AcceptBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AcceptBuilder<'a, accept_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AcceptBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> AcceptBuilder<'a, accept_state::SetInvite<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AcceptBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> AcceptBuilder<'a, accept_state::SetResource<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         AcceptBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,16 +249,16 @@ where
 impl<'a, S> AcceptBuilder<'a, S>
 where
     S: accept_state::State,
-    S::Resource: accept_state::IsSet,
     S::Invite: accept_state::IsSet,
+    S::Resource: accept_state::IsSet,
     S::CreatedAt: accept_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Accept<'a> {
         Accept {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            invite: self.__unsafe_private_named.1.unwrap(),
-            resource: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            invite: self._fields.1.unwrap(),
+            resource: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -268,9 +271,9 @@ where
         >,
     ) -> Accept<'a> {
         Accept {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            invite: self.__unsafe_private_named.1.unwrap(),
-            resource: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            invite: self._fields.1.unwrap(),
+            resource: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/collab/get_collaboration_state.rs b/crates/jacquard-api/src/sh_weaver/collab/get_collaboration_state.rs
index 79a264e9..35843cd8 100644
--- a/crates/jacquard-api/src/sh_weaver/collab/get_collaboration_state.rs
+++ b/crates/jacquard-api/src/sh_weaver/collab/get_collaboration_state.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_collaboration_state_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetCollaborationStateBuilder<'a, S: get_collaboration_state_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetCollaborationState<'a> {
@@ -105,9 +106,9 @@ impl<'a> GetCollaborationStateBuilder<'a, get_collaboration_state_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetCollaborationStateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -125,11 +126,11 @@ where
         'a,
         get_collaboration_state_state::SetResource<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetCollaborationStateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,7 +143,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetCollaborationState<'a> {
         GetCollaborationState {
-            resource: self.__unsafe_private_named.0.unwrap(),
+            resource: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/collab/get_invites.rs b/crates/jacquard-api/src/sh_weaver/collab/get_invites.rs
index 0654f805..e2171e7d 100644
--- a/crates/jacquard-api/src/sh_weaver/collab/get_invites.rs
+++ b/crates/jacquard-api/src/sh_weaver/collab/get_invites.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -119,15 +122,15 @@ pub mod get_invites_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetInvitesBuilder<'a, S: get_invites_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetInvites<'a> {
@@ -141,9 +144,9 @@ impl<'a> GetInvitesBuilder<'a, get_invites_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetInvitesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -158,11 +161,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetInvitesBuilder<'a, get_invites_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetInvitesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -170,12 +173,12 @@ where
 impl<'a, S: get_invites_state::State> GetInvitesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -183,12 +186,12 @@ impl<'a, S: get_invites_state::State> GetInvitesBuilder<'a, S> {
 impl<'a, S: get_invites_state::State> GetInvitesBuilder<'a, S> {
     /// Set the `direction` field (optional)
     pub fn direction(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `direction` field to an Option value (optional)
     pub fn maybe_direction(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -196,12 +199,12 @@ impl<'a, S: get_invites_state::State> GetInvitesBuilder<'a, S> {
 impl<'a, S: get_invites_state::State> GetInvitesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -209,12 +212,12 @@ impl<'a, S: get_invites_state::State> GetInvitesBuilder<'a, S> {
 impl<'a, S: get_invites_state::State> GetInvitesBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -227,11 +230,11 @@ where
     /// Build the final struct
     pub fn build(self) -> GetInvites<'a> {
         GetInvites {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            direction: self.__unsafe_private_named.2,
-            limit: self.__unsafe_private_named.3,
-            status: self.__unsafe_private_named.4,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            direction: self._fields.2,
+            limit: self._fields.3,
+            status: self._fields.4,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/collab/get_resource_participants.rs b/crates/jacquard-api/src/sh_weaver/collab/get_resource_participants.rs
index 0184fe45..913d4af5 100644
--- a/crates/jacquard-api/src/sh_weaver/collab/get_resource_participants.rs
+++ b/crates/jacquard-api/src/sh_weaver/collab/get_resource_participants.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -93,9 +96,9 @@ pub struct GetResourceParticipantsBuilder<
     'a,
     S: get_resource_participants_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetResourceParticipants<'a> {
@@ -112,9 +115,9 @@ impl<'a> GetResourceParticipantsBuilder<'a, get_resource_participants_state::Emp
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetResourceParticipantsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -132,11 +135,11 @@ where
         'a,
         get_resource_participants_state::SetResource<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetResourceParticipantsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,7 +152,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetResourceParticipants<'a> {
         GetResourceParticipants {
-            resource: self.__unsafe_private_named.0.unwrap(),
+            resource: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/collab/get_resource_sessions.rs b/crates/jacquard-api/src/sh_weaver/collab/get_resource_sessions.rs
index 495714fc..115e09d5 100644
--- a/crates/jacquard-api/src/sh_weaver/collab/get_resource_sessions.rs
+++ b/crates/jacquard-api/src/sh_weaver/collab/get_resource_sessions.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_resource_sessions_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetResourceSessionsBuilder<'a, S: get_resource_sessions_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetResourceSessions<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetResourceSessionsBuilder<'a, get_resource_sessions_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetResourceSessionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetResourceSessionsBuilder<'a, get_resource_sessions_state::SetResource<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetResourceSessionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetResourceSessions<'a> {
         GetResourceSessions {
-            resource: self.__unsafe_private_named.0.unwrap(),
+            resource: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/collab/invite.rs b/crates/jacquard-api/src/sh_weaver/collab/invite.rs
index c728467e..38a70b7d 100644
--- a/crates/jacquard-api/src/sh_weaver/collab/invite.rs
+++ b/crates/jacquard-api/src/sh_weaver/collab/invite.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -290,8 +293,8 @@ pub mod invite_state {
 
 /// Builder for constructing an instance of this type
 pub struct InviteBuilder<'a, S: invite_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<Did<'a>>,
@@ -299,7 +302,7 @@ pub struct InviteBuilder<'a, S: invite_state::State> {
         Option<StrongRef<'a>>,
         Option<invite::CollabScope<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Invite<'a> {
@@ -313,9 +316,9 @@ impl<'a> InviteBuilder<'a, invite_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         InviteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -330,11 +333,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> InviteBuilder<'a, invite_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         InviteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -342,12 +345,12 @@ where
 impl<'a, S: invite_state::State> InviteBuilder<'a, S> {
     /// Set the `expiresAt` field (optional)
     pub fn expires_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `expiresAt` field to an Option value (optional)
     pub fn maybe_expires_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -362,11 +365,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> InviteBuilder<'a, invite_state::SetInvitee<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         InviteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -374,12 +377,12 @@ where
 impl<'a, S: invite_state::State> InviteBuilder<'a, S> {
     /// Set the `message` field (optional)
     pub fn message(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `message` field to an Option value (optional)
     pub fn maybe_message(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -394,11 +397,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> InviteBuilder<'a, invite_state::SetResource<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         InviteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -406,12 +409,12 @@ where
 impl<'a, S: invite_state::State> InviteBuilder<'a, S> {
     /// Set the `scope` field (optional)
     pub fn scope(mut self, value: impl Into<Option<invite::CollabScope<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `scope` field to an Option value (optional)
     pub fn maybe_scope(mut self, value: Option<invite::CollabScope<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -426,12 +429,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Invite<'a> {
         Invite {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            expires_at: self.__unsafe_private_named.1,
-            invitee: self.__unsafe_private_named.2.unwrap(),
-            message: self.__unsafe_private_named.3,
-            resource: self.__unsafe_private_named.4.unwrap(),
-            scope: self.__unsafe_private_named.5,
+            created_at: self._fields.0.unwrap(),
+            expires_at: self._fields.1,
+            invitee: self._fields.2.unwrap(),
+            message: self._fields.3,
+            resource: self._fields.4.unwrap(),
+            scope: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -444,12 +447,12 @@ where
         >,
     ) -> Invite<'a> {
         Invite {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            expires_at: self.__unsafe_private_named.1,
-            invitee: self.__unsafe_private_named.2.unwrap(),
-            message: self.__unsafe_private_named.3,
-            resource: self.__unsafe_private_named.4.unwrap(),
-            scope: self.__unsafe_private_named.5,
+            created_at: self._fields.0.unwrap(),
+            expires_at: self._fields.1,
+            invitee: self._fields.2.unwrap(),
+            message: self._fields.3,
+            resource: self._fields.4.unwrap(),
+            scope: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/collab/session.rs b/crates/jacquard-api/src/sh_weaver/collab/session.rs
index 6e7b330f..69442f51 100644
--- a/crates/jacquard-api/src/sh_weaver/collab/session.rs
+++ b/crates/jacquard-api/src/sh_weaver/collab/session.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -170,15 +173,15 @@ pub mod session_state {
 
 /// Builder for constructing an instance of this type
 pub struct SessionBuilder<'a, S: session_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Session<'a> {
@@ -192,9 +195,9 @@ impl<'a> SessionBuilder<'a, session_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SessionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,11 +212,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SessionBuilder<'a, session_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SessionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,12 +224,12 @@ where
 impl<'a, S: session_state::State> SessionBuilder<'a, S> {
     /// Set the `expiresAt` field (optional)
     pub fn expires_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `expiresAt` field to an Option value (optional)
     pub fn maybe_expires_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -241,11 +244,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SessionBuilder<'a, session_state::SetNodeId<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SessionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,12 +256,12 @@ where
 impl<'a, S: session_state::State> SessionBuilder<'a, S> {
     /// Set the `relayUrl` field (optional)
     pub fn relay_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `relayUrl` field to an Option value (optional)
     pub fn maybe_relay_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -273,11 +276,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> SessionBuilder<'a, session_state::SetResource<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         SessionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -292,11 +295,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Session<'a> {
         Session {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            expires_at: self.__unsafe_private_named.1,
-            node_id: self.__unsafe_private_named.2.unwrap(),
-            relay_url: self.__unsafe_private_named.3,
-            resource: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            expires_at: self._fields.1,
+            node_id: self._fields.2.unwrap(),
+            relay_url: self._fields.3,
+            resource: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -309,11 +312,11 @@ where
         >,
     ) -> Session<'a> {
         Session {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            expires_at: self.__unsafe_private_named.1,
-            node_id: self.__unsafe_private_named.2.unwrap(),
-            relay_url: self.__unsafe_private_named.3,
-            resource: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            expires_at: self._fields.1,
+            node_id: self._fields.2.unwrap(),
+            relay_url: self._fields.3,
+            resource: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/edit.rs b/crates/jacquard-api/src/sh_weaver/edit.rs
index d44aba3e..10e23b90 100644
--- a/crates/jacquard-api/src/sh_weaver/edit.rs
+++ b/crates/jacquard-api/src/sh_weaver/edit.rs
@@ -15,7 +15,11 @@ pub mod get_edit_tree;
 pub mod list_drafts;
 pub mod root;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -396,9 +400,9 @@ pub mod doc_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct DocRefBuilder<'a, S: doc_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<DocRefValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<DocRefValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DocRef<'a> {
@@ -412,9 +416,9 @@ impl<'a> DocRefBuilder<'a, doc_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DocRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -429,11 +433,11 @@ where
         mut self,
         value: impl Into<DocRefValue<'a>>,
     ) -> DocRefBuilder<'a, doc_ref_state::SetValue<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DocRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -446,7 +450,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DocRef<'a> {
         DocRef {
-            value: self.__unsafe_private_named.0.unwrap(),
+            value: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -459,7 +463,7 @@ where
         >,
     ) -> DocRef<'a> {
         DocRef {
-            value: self.__unsafe_private_named.0.unwrap(),
+            value: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -792,74 +796,74 @@ pub mod edit_branch_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type LastUpdated;
         type Length;
-        type Head;
         type Author;
+        type LastUpdated;
+        type Head;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type LastUpdated = Unset;
         type Length = Unset;
-        type Head = Unset;
         type Author = Unset;
-    }
-    ///State transition - sets the `last_updated` field to Set
-    pub struct SetLastUpdated<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLastUpdated<S> {}
-    impl<S: State> State for SetLastUpdated<S> {
-        type LastUpdated = Set<members::last_updated>;
-        type Length = S::Length;
-        type Head = S::Head;
-        type Author = S::Author;
+        type LastUpdated = Unset;
+        type Head = Unset;
     }
     ///State transition - sets the `length` field to Set
     pub struct SetLength<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLength<S> {}
     impl<S: State> State for SetLength<S> {
-        type LastUpdated = S::LastUpdated;
         type Length = Set<members::length>;
-        type Head = S::Head;
         type Author = S::Author;
-    }
-    ///State transition - sets the `head` field to Set
-    pub struct SetHead<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHead<S> {}
-    impl<S: State> State for SetHead<S> {
         type LastUpdated = S::LastUpdated;
-        type Length = S::Length;
-        type Head = Set<members::head>;
-        type Author = S::Author;
+        type Head = S::Head;
     }
     ///State transition - sets the `author` field to Set
     pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthor<S> {}
     impl<S: State> State for SetAuthor<S> {
+        type Length = S::Length;
+        type Author = Set<members::author>;
         type LastUpdated = S::LastUpdated;
+        type Head = S::Head;
+    }
+    ///State transition - sets the `last_updated` field to Set
+    pub struct SetLastUpdated<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLastUpdated<S> {}
+    impl<S: State> State for SetLastUpdated<S> {
         type Length = S::Length;
+        type Author = S::Author;
+        type LastUpdated = Set<members::last_updated>;
         type Head = S::Head;
-        type Author = Set<members::author>;
+    }
+    ///State transition - sets the `head` field to Set
+    pub struct SetHead<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHead<S> {}
+    impl<S: State> State for SetHead<S> {
+        type Length = S::Length;
+        type Author = S::Author;
+        type LastUpdated = S::LastUpdated;
+        type Head = Set<members::head>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `last_updated` field
-        pub struct last_updated(());
         ///Marker type for the `length` field
         pub struct length(());
-        ///Marker type for the `head` field
-        pub struct head(());
         ///Marker type for the `author` field
         pub struct author(());
+        ///Marker type for the `last_updated` field
+        pub struct last_updated(());
+        ///Marker type for the `head` field
+        pub struct head(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EditBranchViewBuilder<'a, S: edit_branch_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<StrongRef<'a>>,
         Option<StrongRef<'a>>,
@@ -868,7 +872,7 @@ pub struct EditBranchViewBuilder<'a, S: edit_branch_view_state::State> {
         Option<i64>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> EditBranchView<'a> {
@@ -882,9 +886,9 @@ impl<'a> EditBranchViewBuilder<'a, edit_branch_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EditBranchViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -899,11 +903,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> EditBranchViewBuilder<'a, edit_branch_view_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EditBranchViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -911,12 +915,12 @@ where
 impl<'a, S: edit_branch_view_state::State> EditBranchViewBuilder<'a, S> {
     /// Set the `divergesFrom` field (optional)
     pub fn diverges_from(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `divergesFrom` field to an Option value (optional)
     pub fn maybe_diverges_from(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -931,11 +935,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> EditBranchViewBuilder<'a, edit_branch_view_state::SetHead<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EditBranchViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -943,12 +947,12 @@ where
 impl<'a, S: edit_branch_view_state::State> EditBranchViewBuilder<'a, S> {
     /// Set the `isMerged` field (optional)
     pub fn is_merged(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `isMerged` field to an Option value (optional)
     pub fn maybe_is_merged(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -963,11 +967,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EditBranchViewBuilder<'a, edit_branch_view_state::SetLastUpdated<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         EditBranchViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -982,11 +986,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> EditBranchViewBuilder<'a, edit_branch_view_state::SetLength<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         EditBranchViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -994,12 +998,12 @@ where
 impl<'a, S: edit_branch_view_state::State> EditBranchViewBuilder<'a, S> {
     /// Set the `root` field (optional)
     pub fn root(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `root` field to an Option value (optional)
     pub fn maybe_root(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1007,21 +1011,21 @@ impl<'a, S: edit_branch_view_state::State> EditBranchViewBuilder<'a, S> {
 impl<'a, S> EditBranchViewBuilder<'a, S>
 where
     S: edit_branch_view_state::State,
-    S::LastUpdated: edit_branch_view_state::IsSet,
     S::Length: edit_branch_view_state::IsSet,
-    S::Head: edit_branch_view_state::IsSet,
     S::Author: edit_branch_view_state::IsSet,
+    S::LastUpdated: edit_branch_view_state::IsSet,
+    S::Head: edit_branch_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> EditBranchView<'a> {
         EditBranchView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            diverges_from: self.__unsafe_private_named.1,
-            head: self.__unsafe_private_named.2.unwrap(),
-            is_merged: self.__unsafe_private_named.3,
-            last_updated: self.__unsafe_private_named.4.unwrap(),
-            length: self.__unsafe_private_named.5.unwrap(),
-            root: self.__unsafe_private_named.6,
+            author: self._fields.0.unwrap(),
+            diverges_from: self._fields.1,
+            head: self._fields.2.unwrap(),
+            is_merged: self._fields.3,
+            last_updated: self._fields.4.unwrap(),
+            length: self._fields.5.unwrap(),
+            root: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -1034,13 +1038,13 @@ where
         >,
     ) -> EditBranchView<'a> {
         EditBranchView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            diverges_from: self.__unsafe_private_named.1,
-            head: self.__unsafe_private_named.2.unwrap(),
-            is_merged: self.__unsafe_private_named.3,
-            last_updated: self.__unsafe_private_named.4.unwrap(),
-            length: self.__unsafe_private_named.5.unwrap(),
-            root: self.__unsafe_private_named.6,
+            author: self._fields.0.unwrap(),
+            diverges_from: self._fields.1,
+            head: self._fields.2.unwrap(),
+            is_merged: self._fields.3,
+            last_updated: self._fields.4.unwrap(),
+            length: self._fields.5.unwrap(),
+            root: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
@@ -1056,83 +1060,83 @@ pub mod edit_history_entry_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Cid;
-        type Type;
         type Uri;
+        type CreatedAt;
+        type Type;
         type Author;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Cid = Unset;
-        type Type = Unset;
         type Uri = Unset;
+        type CreatedAt = Unset;
+        type Type = Unset;
         type Author = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Cid = S::Cid;
-        type Type = S::Type;
-        type Uri = S::Uri;
-        type Author = S::Author;
-    }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type CreatedAt = S::CreatedAt;
         type Cid = Set<members::cid>;
-        type Type = S::Type;
         type Uri = S::Uri;
-        type Author = S::Author;
-    }
-    ///State transition - sets the `type` field to Set
-    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetType<S> {}
-    impl<S: State> State for SetType<S> {
         type CreatedAt = S::CreatedAt;
-        type Cid = S::Cid;
-        type Type = Set<members::r#type>;
-        type Uri = S::Uri;
+        type Type = S::Type;
         type Author = S::Author;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
+        type Cid = S::Cid;
+        type Uri = Set<members::uri>;
         type CreatedAt = S::CreatedAt;
+        type Type = S::Type;
+        type Author = S::Author;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
         type Cid = S::Cid;
+        type Uri = S::Uri;
+        type CreatedAt = Set<members::created_at>;
         type Type = S::Type;
-        type Uri = Set<members::uri>;
+        type Author = S::Author;
+    }
+    ///State transition - sets the `type` field to Set
+    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetType<S> {}
+    impl<S: State> State for SetType<S> {
+        type Cid = S::Cid;
+        type Uri = S::Uri;
+        type CreatedAt = S::CreatedAt;
+        type Type = Set<members::r#type>;
         type Author = S::Author;
     }
     ///State transition - sets the `author` field to Set
     pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthor<S> {}
     impl<S: State> State for SetAuthor<S> {
-        type CreatedAt = S::CreatedAt;
         type Cid = S::Cid;
-        type Type = S::Type;
         type Uri = S::Uri;
+        type CreatedAt = S::CreatedAt;
+        type Type = S::Type;
         type Author = Set<members::author>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `cid` field
         pub struct cid(());
-        ///Marker type for the `type` field
-        pub struct r#type(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `type` field
+        pub struct r#type(());
         ///Marker type for the `author` field
         pub struct author(());
     }
@@ -1140,8 +1144,8 @@ pub mod edit_history_entry_state {
 
 /// Builder for constructing an instance of this type
 pub struct EditHistoryEntryBuilder<'a, S: edit_history_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<Cid<'a>>,
         Option<Datetime>,
@@ -1152,7 +1156,7 @@ pub struct EditHistoryEntryBuilder<'a, S: edit_history_entry_state::State> {
         Option<EditHistoryEntryType<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> EditHistoryEntry<'a> {
@@ -1166,19 +1170,9 @@ impl<'a> EditHistoryEntryBuilder<'a, edit_history_entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EditHistoryEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1193,11 +1187,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> EditHistoryEntryBuilder<'a, edit_history_entry_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EditHistoryEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1212,11 +1206,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> EditHistoryEntryBuilder<'a, edit_history_entry_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EditHistoryEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1231,11 +1225,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EditHistoryEntryBuilder<'a, edit_history_entry_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EditHistoryEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1243,12 +1237,12 @@ where
 impl<'a, S: edit_history_entry_state::State> EditHistoryEntryBuilder<'a, S> {
     /// Set the `hasInlineDiff` field (optional)
     pub fn has_inline_diff(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `hasInlineDiff` field to an Option value (optional)
     pub fn maybe_has_inline_diff(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1256,12 +1250,12 @@ impl<'a, S: edit_history_entry_state::State> EditHistoryEntryBuilder<'a, S> {
 impl<'a, S: edit_history_entry_state::State> EditHistoryEntryBuilder<'a, S> {
     /// Set the `prevRef` field (optional)
     pub fn prev_ref(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `prevRef` field to an Option value (optional)
     pub fn maybe_prev_ref(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1269,12 +1263,12 @@ impl<'a, S: edit_history_entry_state::State> EditHistoryEntryBuilder<'a, S> {
 impl<'a, S: edit_history_entry_state::State> EditHistoryEntryBuilder<'a, S> {
     /// Set the `rootRef` field (optional)
     pub fn root_ref(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `rootRef` field to an Option value (optional)
     pub fn maybe_root_ref(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1282,12 +1276,12 @@ impl<'a, S: edit_history_entry_state::State> EditHistoryEntryBuilder<'a, S> {
 impl<'a, S: edit_history_entry_state::State> EditHistoryEntryBuilder<'a, S> {
     /// Set the `snapshotCid` field (optional)
     pub fn snapshot_cid(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `snapshotCid` field to an Option value (optional)
     pub fn maybe_snapshot_cid(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1302,11 +1296,11 @@ where
         mut self,
         value: impl Into<EditHistoryEntryType<'a>>,
     ) -> EditHistoryEntryBuilder<'a, edit_history_entry_state::SetType<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         EditHistoryEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1321,11 +1315,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> EditHistoryEntryBuilder<'a, edit_history_entry_state::SetUri<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         EditHistoryEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1333,24 +1327,24 @@ where
 impl<'a, S> EditHistoryEntryBuilder<'a, S>
 where
     S: edit_history_entry_state::State,
-    S::CreatedAt: edit_history_entry_state::IsSet,
     S::Cid: edit_history_entry_state::IsSet,
-    S::Type: edit_history_entry_state::IsSet,
     S::Uri: edit_history_entry_state::IsSet,
+    S::CreatedAt: edit_history_entry_state::IsSet,
+    S::Type: edit_history_entry_state::IsSet,
     S::Author: edit_history_entry_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> EditHistoryEntry<'a> {
         EditHistoryEntry {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            has_inline_diff: self.__unsafe_private_named.3,
-            prev_ref: self.__unsafe_private_named.4,
-            root_ref: self.__unsafe_private_named.5,
-            snapshot_cid: self.__unsafe_private_named.6,
-            r#type: self.__unsafe_private_named.7.unwrap(),
-            uri: self.__unsafe_private_named.8.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            has_inline_diff: self._fields.3,
+            prev_ref: self._fields.4,
+            root_ref: self._fields.5,
+            snapshot_cid: self._fields.6,
+            r#type: self._fields.7.unwrap(),
+            uri: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1363,15 +1357,15 @@ where
         >,
     ) -> EditHistoryEntry<'a> {
         EditHistoryEntry {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            has_inline_diff: self.__unsafe_private_named.3,
-            prev_ref: self.__unsafe_private_named.4,
-            root_ref: self.__unsafe_private_named.5,
-            snapshot_cid: self.__unsafe_private_named.6,
-            r#type: self.__unsafe_private_named.7.unwrap(),
-            uri: self.__unsafe_private_named.8.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            has_inline_diff: self._fields.3,
+            prev_ref: self._fields.4,
+            root_ref: self._fields.5,
+            snapshot_cid: self._fields.6,
+            r#type: self._fields.7.unwrap(),
+            uri: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1387,51 +1381,51 @@ pub mod edit_tree_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Branches;
         type Resource;
+        type Branches;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Branches = Unset;
         type Resource = Unset;
-    }
-    ///State transition - sets the `branches` field to Set
-    pub struct SetBranches<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBranches<S> {}
-    impl<S: State> State for SetBranches<S> {
-        type Branches = Set<members::branches>;
-        type Resource = S::Resource;
+        type Branches = Unset;
     }
     ///State transition - sets the `resource` field to Set
     pub struct SetResource<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetResource<S> {}
     impl<S: State> State for SetResource<S> {
-        type Branches = S::Branches;
         type Resource = Set<members::resource>;
+        type Branches = S::Branches;
+    }
+    ///State transition - sets the `branches` field to Set
+    pub struct SetBranches<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBranches<S> {}
+    impl<S: State> State for SetBranches<S> {
+        type Resource = S::Resource;
+        type Branches = Set<members::branches>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `branches` field
-        pub struct branches(());
         ///Marker type for the `resource` field
         pub struct resource(());
+        ///Marker type for the `branches` field
+        pub struct branches(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EditTreeViewBuilder<'a, S: edit_tree_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<edit::EditBranchView<'a>>>,
         Option<Vec<StrongRef<'a>>>,
         Option<bool>,
         Option<edit::EditBranchView<'a>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> EditTreeView<'a> {
@@ -1445,9 +1439,9 @@ impl<'a> EditTreeViewBuilder<'a, edit_tree_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EditTreeViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1462,11 +1456,11 @@ where
         mut self,
         value: impl Into<Vec<edit::EditBranchView<'a>>>,
     ) -> EditTreeViewBuilder<'a, edit_tree_view_state::SetBranches<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EditTreeViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1477,12 +1471,12 @@ impl<'a, S: edit_tree_view_state::State> EditTreeViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<StrongRef<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `conflictPoints` field to an Option value (optional)
     pub fn maybe_conflict_points(mut self, value: Option<Vec<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1490,12 +1484,12 @@ impl<'a, S: edit_tree_view_state::State> EditTreeViewBuilder<'a, S> {
 impl<'a, S: edit_tree_view_state::State> EditTreeViewBuilder<'a, S> {
     /// Set the `hasConflicts` field (optional)
     pub fn has_conflicts(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `hasConflicts` field to an Option value (optional)
     pub fn maybe_has_conflicts(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1506,12 +1500,12 @@ impl<'a, S: edit_tree_view_state::State> EditTreeViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<edit::EditBranchView<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `mainBranch` field to an Option value (optional)
     pub fn maybe_main_branch(mut self, value: Option<edit::EditBranchView<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1526,11 +1520,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> EditTreeViewBuilder<'a, edit_tree_view_state::SetResource<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         EditTreeViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1538,17 +1532,17 @@ where
 impl<'a, S> EditTreeViewBuilder<'a, S>
 where
     S: edit_tree_view_state::State,
-    S::Branches: edit_tree_view_state::IsSet,
     S::Resource: edit_tree_view_state::IsSet,
+    S::Branches: edit_tree_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> EditTreeView<'a> {
         EditTreeView {
-            branches: self.__unsafe_private_named.0.unwrap(),
-            conflict_points: self.__unsafe_private_named.1,
-            has_conflicts: self.__unsafe_private_named.2,
-            main_branch: self.__unsafe_private_named.3,
-            resource: self.__unsafe_private_named.4.unwrap(),
+            branches: self._fields.0.unwrap(),
+            conflict_points: self._fields.1,
+            has_conflicts: self._fields.2,
+            main_branch: self._fields.3,
+            resource: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1561,11 +1555,11 @@ where
         >,
     ) -> EditTreeView<'a> {
         EditTreeView {
-            branches: self.__unsafe_private_named.0.unwrap(),
-            conflict_points: self.__unsafe_private_named.1,
-            has_conflicts: self.__unsafe_private_named.2,
-            main_branch: self.__unsafe_private_named.3,
-            resource: self.__unsafe_private_named.4.unwrap(),
+            branches: self._fields.0.unwrap(),
+            conflict_points: self._fields.1,
+            has_conflicts: self._fields.2,
+            main_branch: self._fields.3,
+            resource: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1605,9 +1599,9 @@ pub mod entry_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct EntryRefBuilder<'a, S: entry_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> EntryRef<'a> {
@@ -1621,9 +1615,9 @@ impl<'a> EntryRefBuilder<'a, entry_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EntryRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1638,11 +1632,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> EntryRefBuilder<'a, entry_ref_state::SetEntry<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EntryRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1655,7 +1649,7 @@ where
     /// Build the final struct
     pub fn build(self) -> EntryRef<'a> {
         EntryRef {
-            entry: self.__unsafe_private_named.0.unwrap(),
+            entry: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1668,7 +1662,7 @@ where
         >,
     ) -> EntryRef<'a> {
         EntryRef {
-            entry: self.__unsafe_private_named.0.unwrap(),
+            entry: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1708,9 +1702,9 @@ pub mod notebook_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct NotebookRefBuilder<'a, S: notebook_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> NotebookRef<'a> {
@@ -1724,9 +1718,9 @@ impl<'a> NotebookRefBuilder<'a, notebook_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NotebookRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1741,11 +1735,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> NotebookRefBuilder<'a, notebook_ref_state::SetNotebook<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NotebookRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1758,7 +1752,7 @@ where
     /// Build the final struct
     pub fn build(self) -> NotebookRef<'a> {
         NotebookRef {
-            notebook: self.__unsafe_private_named.0.unwrap(),
+            notebook: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1771,7 +1765,7 @@ where
         >,
     ) -> NotebookRef<'a> {
         NotebookRef {
-            notebook: self.__unsafe_private_named.0.unwrap(),
+            notebook: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/edit/cursor.rs b/crates/jacquard-api/src/sh_weaver/edit/cursor.rs
index 9de45cac..aa349d78 100644
--- a/crates/jacquard-api/src/sh_weaver/edit/cursor.rs
+++ b/crates/jacquard-api/src/sh_weaver/edit/cursor.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -273,9 +276,9 @@ pub mod container_id_state {
 
 /// Builder for constructing an instance of this type
 pub struct ContainerIdBuilder<'a, S: container_id_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ContainerIdValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ContainerIdValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ContainerId<'a> {
@@ -289,9 +292,9 @@ impl<'a> ContainerIdBuilder<'a, container_id_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ContainerIdBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -306,11 +309,11 @@ where
         mut self,
         value: impl Into<ContainerIdValue<'a>>,
     ) -> ContainerIdBuilder<'a, container_id_state::SetValue<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ContainerIdBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -323,7 +326,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ContainerId<'a> {
         ContainerId {
-            value: self.__unsafe_private_named.0.unwrap(),
+            value: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -336,7 +339,7 @@ where
         >,
     ) -> ContainerId<'a> {
         ContainerId {
-            value: self.__unsafe_private_named.0.unwrap(),
+            value: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -560,9 +563,9 @@ pub mod cursor_side_state {
 
 /// Builder for constructing an instance of this type
 pub struct CursorSideBuilder<'a, S: cursor_side_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CursorSide<'a> {
@@ -576,9 +579,9 @@ impl<'a> CursorSideBuilder<'a, cursor_side_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CursorSideBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -593,11 +596,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CursorSideBuilder<'a, cursor_side_state::SetValue<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CursorSideBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -610,7 +613,7 @@ where
     /// Build the final struct
     pub fn build(self) -> CursorSide<'a> {
         CursorSide {
-            value: self.__unsafe_private_named.0.unwrap(),
+            value: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -623,7 +626,7 @@ where
         >,
     ) -> CursorSide<'a> {
         CursorSide {
-            value: self.__unsafe_private_named.0.unwrap(),
+            value: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -639,45 +642,45 @@ pub mod id_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Peer;
         type Counter;
+        type Peer;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Peer = Unset;
         type Counter = Unset;
-    }
-    ///State transition - sets the `peer` field to Set
-    pub struct SetPeer<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPeer<S> {}
-    impl<S: State> State for SetPeer<S> {
-        type Peer = Set<members::peer>;
-        type Counter = S::Counter;
+        type Peer = Unset;
     }
     ///State transition - sets the `counter` field to Set
     pub struct SetCounter<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCounter<S> {}
     impl<S: State> State for SetCounter<S> {
-        type Peer = S::Peer;
         type Counter = Set<members::counter>;
+        type Peer = S::Peer;
+    }
+    ///State transition - sets the `peer` field to Set
+    pub struct SetPeer<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPeer<S> {}
+    impl<S: State> State for SetPeer<S> {
+        type Counter = S::Counter;
+        type Peer = Set<members::peer>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `peer` field
-        pub struct peer(());
         ///Marker type for the `counter` field
         pub struct counter(());
+        ///Marker type for the `peer` field
+        pub struct peer(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct IdBuilder<'a, S: id_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Id<'a> {
@@ -691,9 +694,9 @@ impl<'a> IdBuilder<'a, id_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IdBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -708,11 +711,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> IdBuilder<'a, id_state::SetCounter<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         IdBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -724,11 +727,11 @@ where
 {
     /// Set the `peer` field (required)
     pub fn peer(mut self, value: impl Into<i64>) -> IdBuilder<'a, id_state::SetPeer<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         IdBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -736,14 +739,14 @@ where
 impl<'a, S> IdBuilder<'a, S>
 where
     S: id_state::State,
-    S::Peer: id_state::IsSet,
     S::Counter: id_state::IsSet,
+    S::Peer: id_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Id<'a> {
         Id {
-            counter: self.__unsafe_private_named.0.unwrap(),
-            peer: self.__unsafe_private_named.1.unwrap(),
+            counter: self._fields.0.unwrap(),
+            peer: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -756,8 +759,8 @@ where
         >,
     ) -> Id<'a> {
         Id {
-            counter: self.__unsafe_private_named.0.unwrap(),
-            peer: self.__unsafe_private_named.1.unwrap(),
+            counter: self._fields.0.unwrap(),
+            peer: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -809,13 +812,13 @@ pub mod cursor_state {
 
 /// Builder for constructing an instance of this type
 pub struct CursorBuilder<'a, S: cursor_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<cursor::ContainerId<'a>>,
         Option<cursor::Id<'a>>,
         Option<cursor::CursorSide<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Cursor<'a> {
@@ -829,9 +832,9 @@ impl<'a> CursorBuilder<'a, cursor_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CursorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -846,11 +849,11 @@ where
         mut self,
         value: impl Into<cursor::ContainerId<'a>>,
     ) -> CursorBuilder<'a, cursor_state::SetContainer<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CursorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -865,11 +868,11 @@ where
         mut self,
         value: impl Into<cursor::Id<'a>>,
     ) -> CursorBuilder<'a, cursor_state::SetId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CursorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -877,12 +880,12 @@ where
 impl<'a, S: cursor_state::State> CursorBuilder<'a, S> {
     /// Set the `side` field (optional)
     pub fn side(mut self, value: impl Into<Option<cursor::CursorSide<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `side` field to an Option value (optional)
     pub fn maybe_side(mut self, value: Option<cursor::CursorSide<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -896,9 +899,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Cursor<'a> {
         Cursor {
-            container: self.__unsafe_private_named.0.unwrap(),
-            id: self.__unsafe_private_named.1.unwrap(),
-            side: self.__unsafe_private_named.2,
+            container: self._fields.0.unwrap(),
+            id: self._fields.1.unwrap(),
+            side: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -911,9 +914,9 @@ where
         >,
     ) -> Cursor<'a> {
         Cursor {
-            container: self.__unsafe_private_named.0.unwrap(),
-            id: self.__unsafe_private_named.1.unwrap(),
-            side: self.__unsafe_private_named.2,
+            container: self._fields.0.unwrap(),
+            id: self._fields.1.unwrap(),
+            side: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -979,9 +982,9 @@ pub mod normal_container_id_state {
 
 /// Builder for constructing an instance of this type
 pub struct NormalContainerIdBuilder<'a, S: normal_container_id_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> NormalContainerId<'a> {
@@ -995,9 +998,9 @@ impl<'a> NormalContainerIdBuilder<'a, normal_container_id_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NormalContainerIdBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1012,11 +1015,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> NormalContainerIdBuilder<'a, normal_container_id_state::SetContainerType<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NormalContainerIdBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1031,11 +1034,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> NormalContainerIdBuilder<'a, normal_container_id_state::SetCounter<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         NormalContainerIdBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1050,11 +1053,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> NormalContainerIdBuilder<'a, normal_container_id_state::SetPeer<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         NormalContainerIdBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1069,9 +1072,9 @@ where
     /// Build the final struct
     pub fn build(self) -> NormalContainerId<'a> {
         NormalContainerId {
-            container_type: self.__unsafe_private_named.0.unwrap(),
-            counter: self.__unsafe_private_named.1.unwrap(),
-            peer: self.__unsafe_private_named.2.unwrap(),
+            container_type: self._fields.0.unwrap(),
+            counter: self._fields.1.unwrap(),
+            peer: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1084,9 +1087,9 @@ where
         >,
     ) -> NormalContainerId<'a> {
         NormalContainerId {
-            container_type: self.__unsafe_private_named.0.unwrap(),
-            counter: self.__unsafe_private_named.1.unwrap(),
-            peer: self.__unsafe_private_named.2.unwrap(),
+            container_type: self._fields.0.unwrap(),
+            counter: self._fields.1.unwrap(),
+            peer: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/edit/diff.rs b/crates/jacquard-api/src/sh_weaver/edit/diff.rs
index 22926e33..d428566c 100644
--- a/crates/jacquard-api/src/sh_weaver/edit/diff.rs
+++ b/crates/jacquard-api/src/sh_weaver/edit/diff.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -164,44 +167,44 @@ pub mod diff_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Root;
         type Doc;
+        type Root;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Root = Unset;
         type Doc = Unset;
-    }
-    ///State transition - sets the `root` field to Set
-    pub struct SetRoot<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRoot<S> {}
-    impl<S: State> State for SetRoot<S> {
-        type Root = Set<members::root>;
-        type Doc = S::Doc;
+        type Root = Unset;
     }
     ///State transition - sets the `doc` field to Set
     pub struct SetDoc<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDoc<S> {}
     impl<S: State> State for SetDoc<S> {
-        type Root = S::Root;
         type Doc = Set<members::doc>;
+        type Root = S::Root;
+    }
+    ///State transition - sets the `root` field to Set
+    pub struct SetRoot<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRoot<S> {}
+    impl<S: State> State for SetRoot<S> {
+        type Doc = S::Doc;
+        type Root = Set<members::root>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `root` field
-        pub struct root(());
         ///Marker type for the `doc` field
         pub struct doc(());
+        ///Marker type for the `root` field
+        pub struct root(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DiffBuilder<'a, S: diff_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<DocRef<'a>>,
         Option<Bytes>,
@@ -209,7 +212,7 @@ pub struct DiffBuilder<'a, S: diff_state::State> {
         Option<StrongRef<'a>>,
         Option<BlobRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Diff<'a> {
@@ -223,9 +226,9 @@ impl<'a> DiffBuilder<'a, diff_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DiffBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -233,12 +236,12 @@ impl<'a> DiffBuilder<'a, diff_state::Empty> {
 impl<'a, S: diff_state::State> DiffBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -253,11 +256,11 @@ where
         mut self,
         value: impl Into<DocRef<'a>>,
     ) -> DiffBuilder<'a, diff_state::SetDoc<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DiffBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -265,12 +268,12 @@ where
 impl<'a, S: diff_state::State> DiffBuilder<'a, S> {
     /// Set the `inlineDiff` field (optional)
     pub fn inline_diff(mut self, value: impl Into<Option<Bytes>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `inlineDiff` field to an Option value (optional)
     pub fn maybe_inline_diff(mut self, value: Option<Bytes>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -278,12 +281,12 @@ impl<'a, S: diff_state::State> DiffBuilder<'a, S> {
 impl<'a, S: diff_state::State> DiffBuilder<'a, S> {
     /// Set the `prev` field (optional)
     pub fn prev(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `prev` field to an Option value (optional)
     pub fn maybe_prev(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -298,11 +301,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> DiffBuilder<'a, diff_state::SetRoot<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         DiffBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -310,12 +313,12 @@ where
 impl<'a, S: diff_state::State> DiffBuilder<'a, S> {
     /// Set the `snapshot` field (optional)
     pub fn snapshot(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `snapshot` field to an Option value (optional)
     pub fn maybe_snapshot(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -323,18 +326,18 @@ impl<'a, S: diff_state::State> DiffBuilder<'a, S> {
 impl<'a, S> DiffBuilder<'a, S>
 where
     S: diff_state::State,
-    S::Root: diff_state::IsSet,
     S::Doc: diff_state::IsSet,
+    S::Root: diff_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Diff<'a> {
         Diff {
-            created_at: self.__unsafe_private_named.0,
-            doc: self.__unsafe_private_named.1.unwrap(),
-            inline_diff: self.__unsafe_private_named.2,
-            prev: self.__unsafe_private_named.3,
-            root: self.__unsafe_private_named.4.unwrap(),
-            snapshot: self.__unsafe_private_named.5,
+            created_at: self._fields.0,
+            doc: self._fields.1.unwrap(),
+            inline_diff: self._fields.2,
+            prev: self._fields.3,
+            root: self._fields.4.unwrap(),
+            snapshot: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -347,12 +350,12 @@ where
         >,
     ) -> Diff<'a> {
         Diff {
-            created_at: self.__unsafe_private_named.0,
-            doc: self.__unsafe_private_named.1.unwrap(),
-            inline_diff: self.__unsafe_private_named.2,
-            prev: self.__unsafe_private_named.3,
-            root: self.__unsafe_private_named.4.unwrap(),
-            snapshot: self.__unsafe_private_named.5,
+            created_at: self._fields.0,
+            doc: self._fields.1.unwrap(),
+            inline_diff: self._fields.2,
+            prev: self._fields.3,
+            root: self._fields.4.unwrap(),
+            snapshot: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/edit/draft.rs b/crates/jacquard-api/src/sh_weaver/edit/draft.rs
index 830cb2ae..ee48aa73 100644
--- a/crates/jacquard-api/src/sh_weaver/edit/draft.rs
+++ b/crates/jacquard-api/src/sh_weaver/edit/draft.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -130,9 +133,9 @@ pub mod draft_state {
 
 /// Builder for constructing an instance of this type
 pub struct DraftBuilder<'a, S: draft_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Draft<'a> {
@@ -146,9 +149,9 @@ impl<'a> DraftBuilder<'a, draft_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DraftBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -163,11 +166,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DraftBuilder<'a, draft_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DraftBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,7 +183,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Draft<'a> {
         Draft {
-            created_at: self.__unsafe_private_named.0.unwrap(),
+            created_at: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -193,7 +196,7 @@ where
         >,
     ) -> Draft<'a> {
         Draft {
-            created_at: self.__unsafe_private_named.0.unwrap(),
+            created_at: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/edit/get_branch.rs b/crates/jacquard-api/src/sh_weaver/edit/get_branch.rs
index bfa4d73c..21aac4dc 100644
--- a/crates/jacquard-api/src/sh_weaver/edit/get_branch.rs
+++ b/crates/jacquard-api/src/sh_weaver/edit/get_branch.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -107,14 +110,9 @@ pub mod get_branch_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetBranchBuilder<'a, S: get_branch_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-        Option<AtUri<'a>>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetBranch<'a> {
@@ -128,9 +126,9 @@ impl<'a> GetBranchBuilder<'a, get_branch_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetBranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -138,12 +136,12 @@ impl<'a> GetBranchBuilder<'a, get_branch_state::Empty> {
 impl<'a, S: get_branch_state::State> GetBranchBuilder<'a, S> {
     /// Set the `afterRkey` field (optional)
     pub fn after_rkey(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `afterRkey` field to an Option value (optional)
     pub fn maybe_after_rkey(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -151,12 +149,12 @@ impl<'a, S: get_branch_state::State> GetBranchBuilder<'a, S> {
 impl<'a, S: get_branch_state::State> GetBranchBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -171,11 +169,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetBranchBuilder<'a, get_branch_state::SetHead<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetBranchBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,12 +181,12 @@ where
 impl<'a, S: get_branch_state::State> GetBranchBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -201,10 +199,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetBranch<'a> {
         GetBranch {
-            after_rkey: self.__unsafe_private_named.0,
-            cursor: self.__unsafe_private_named.1,
-            head: self.__unsafe_private_named.2.unwrap(),
-            limit: self.__unsafe_private_named.3,
+            after_rkey: self._fields.0,
+            cursor: self._fields.1,
+            head: self._fields.2.unwrap(),
+            limit: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/edit/get_contributors.rs b/crates/jacquard-api/src/sh_weaver/edit/get_contributors.rs
index b8e3fdcc..f1391ed7 100644
--- a/crates/jacquard-api/src/sh_weaver/edit/get_contributors.rs
+++ b/crates/jacquard-api/src/sh_weaver/edit/get_contributors.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -94,9 +97,9 @@ pub mod get_contributors_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetContributorsBuilder<'a, S: get_contributors_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetContributors<'a> {
@@ -110,9 +113,9 @@ impl<'a> GetContributorsBuilder<'a, get_contributors_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetContributorsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,12 +123,12 @@ impl<'a> GetContributorsBuilder<'a, get_contributors_state::Empty> {
 impl<'a, S: get_contributors_state::State> GetContributorsBuilder<'a, S> {
     /// Set the `includeCascaded` field (optional)
     pub fn include_cascaded(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `includeCascaded` field to an Option value (optional)
     pub fn maybe_include_cascaded(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -140,11 +143,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetContributorsBuilder<'a, get_contributors_state::SetResource<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetContributorsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -157,8 +160,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetContributors<'a> {
         GetContributors {
-            include_cascaded: self.__unsafe_private_named.0,
-            resource: self.__unsafe_private_named.1.unwrap(),
+            include_cascaded: self._fields.0,
+            resource: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/edit/get_edit_history.rs b/crates/jacquard-api/src/sh_weaver/edit/get_edit_history.rs
index 6d4b2333..fbef04b3 100644
--- a/crates/jacquard-api/src/sh_weaver/edit/get_edit_history.rs
+++ b/crates/jacquard-api/src/sh_weaver/edit/get_edit_history.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -106,14 +109,9 @@ pub mod get_edit_history_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetEditHistoryBuilder<'a, S: get_edit_history_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-        Option<i64>,
-        Option<AtUri<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetEditHistory<'a> {
@@ -127,9 +125,9 @@ impl<'a> GetEditHistoryBuilder<'a, get_edit_history_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetEditHistoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,12 +135,12 @@ impl<'a> GetEditHistoryBuilder<'a, get_edit_history_state::Empty> {
 impl<'a, S: get_edit_history_state::State> GetEditHistoryBuilder<'a, S> {
     /// Set the `afterRkey` field (optional)
     pub fn after_rkey(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `afterRkey` field to an Option value (optional)
     pub fn maybe_after_rkey(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -150,12 +148,12 @@ impl<'a, S: get_edit_history_state::State> GetEditHistoryBuilder<'a, S> {
 impl<'a, S: get_edit_history_state::State> GetEditHistoryBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -163,12 +161,12 @@ impl<'a, S: get_edit_history_state::State> GetEditHistoryBuilder<'a, S> {
 impl<'a, S: get_edit_history_state::State> GetEditHistoryBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -183,11 +181,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetEditHistoryBuilder<'a, get_edit_history_state::SetResource<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         GetEditHistoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,10 +198,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetEditHistory<'a> {
         GetEditHistory {
-            after_rkey: self.__unsafe_private_named.0,
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            resource: self.__unsafe_private_named.3.unwrap(),
+            after_rkey: self._fields.0,
+            cursor: self._fields.1,
+            limit: self._fields.2,
+            resource: self._fields.3.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/edit/get_edit_tree.rs b/crates/jacquard-api/src/sh_weaver/edit/get_edit_tree.rs
index e0c7b9f1..ccae3b1e 100644
--- a/crates/jacquard-api/src/sh_weaver/edit/get_edit_tree.rs
+++ b/crates/jacquard-api/src/sh_weaver/edit/get_edit_tree.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_edit_tree_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetEditTreeBuilder<'a, S: get_edit_tree_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetEditTree<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetEditTreeBuilder<'a, get_edit_tree_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetEditTreeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetEditTreeBuilder<'a, get_edit_tree_state::SetResource<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetEditTreeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetEditTree<'a> {
         GetEditTree {
-            resource: self.__unsafe_private_named.0.unwrap(),
+            resource: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/edit/list_drafts.rs b/crates/jacquard-api/src/sh_weaver/edit/list_drafts.rs
index fbfe572d..bff596d6 100644
--- a/crates/jacquard-api/src/sh_weaver/edit/list_drafts.rs
+++ b/crates/jacquard-api/src/sh_weaver/edit/list_drafts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -121,58 +124,58 @@ pub mod draft_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Cid;
         type CreatedAt;
         type Uri;
-        type Cid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Cid = Unset;
         type CreatedAt = Unset;
         type Uri = Unset;
-        type Cid = Unset;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Cid = Set<members::cid>;
+        type CreatedAt = S::CreatedAt;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Cid = S::Cid;
         type CreatedAt = Set<members::created_at>;
         type Uri = S::Uri;
-        type Cid = S::Cid;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type CreatedAt = S::CreatedAt;
-        type Uri = Set<members::uri>;
         type Cid = S::Cid;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
         type CreatedAt = S::CreatedAt;
-        type Uri = S::Uri;
-        type Cid = Set<members::cid>;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `cid` field
+        pub struct cid(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DraftViewBuilder<'a, S: draft_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<Datetime>,
         Option<StrongRef<'a>>,
@@ -180,7 +183,7 @@ pub struct DraftViewBuilder<'a, S: draft_view_state::State> {
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DraftView<'a> {
@@ -194,9 +197,9 @@ impl<'a> DraftViewBuilder<'a, draft_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DraftViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -211,11 +214,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> DraftViewBuilder<'a, draft_view_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DraftViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -230,11 +233,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DraftViewBuilder<'a, draft_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DraftViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -242,12 +245,12 @@ where
 impl<'a, S: draft_view_state::State> DraftViewBuilder<'a, S> {
     /// Set the `editRoot` field (optional)
     pub fn edit_root(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `editRoot` field to an Option value (optional)
     pub fn maybe_edit_root(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -255,12 +258,12 @@ impl<'a, S: draft_view_state::State> DraftViewBuilder<'a, S> {
 impl<'a, S: draft_view_state::State> DraftViewBuilder<'a, S> {
     /// Set the `lastEditAt` field (optional)
     pub fn last_edit_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `lastEditAt` field to an Option value (optional)
     pub fn maybe_last_edit_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -268,12 +271,12 @@ impl<'a, S: draft_view_state::State> DraftViewBuilder<'a, S> {
 impl<'a, S: draft_view_state::State> DraftViewBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -288,11 +291,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> DraftViewBuilder<'a, draft_view_state::SetUri<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         DraftViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -300,19 +303,19 @@ where
 impl<'a, S> DraftViewBuilder<'a, S>
 where
     S: draft_view_state::State,
+    S::Cid: draft_view_state::IsSet,
     S::CreatedAt: draft_view_state::IsSet,
     S::Uri: draft_view_state::IsSet,
-    S::Cid: draft_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DraftView<'a> {
         DraftView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            edit_root: self.__unsafe_private_named.2,
-            last_edit_at: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4,
-            uri: self.__unsafe_private_named.5.unwrap(),
+            cid: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            edit_root: self._fields.2,
+            last_edit_at: self._fields.3,
+            title: self._fields.4,
+            uri: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -325,12 +328,12 @@ where
         >,
     ) -> DraftView<'a> {
         DraftView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            edit_root: self.__unsafe_private_named.2,
-            last_edit_at: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4,
-            uri: self.__unsafe_private_named.5.unwrap(),
+            cid: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            edit_root: self._fields.2,
+            last_edit_at: self._fields.3,
+            title: self._fields.4,
+            uri: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -495,9 +498,9 @@ pub mod list_drafts_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListDraftsBuilder<'a, S: list_drafts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListDrafts<'a> {
@@ -511,9 +514,9 @@ impl<'a> ListDraftsBuilder<'a, list_drafts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListDraftsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -528,11 +531,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> ListDraftsBuilder<'a, list_drafts_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListDraftsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -540,12 +543,12 @@ where
 impl<'a, S: list_drafts_state::State> ListDraftsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -553,12 +556,12 @@ impl<'a, S: list_drafts_state::State> ListDraftsBuilder<'a, S> {
 impl<'a, S: list_drafts_state::State> ListDraftsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -571,9 +574,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ListDrafts<'a> {
         ListDrafts {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/edit/root.rs b/crates/jacquard-api/src/sh_weaver/edit/root.rs
index 76c95011..1fb8c389 100644
--- a/crates/jacquard-api/src/sh_weaver/edit/root.rs
+++ b/crates/jacquard-api/src/sh_weaver/edit/root.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -187,9 +190,9 @@ pub mod root_state {
 
 /// Builder for constructing an instance of this type
 pub struct RootBuilder<'a, S: root_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<DocRef<'a>>, Option<BlobRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<DocRef<'a>>, Option<BlobRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Root<'a> {
@@ -203,9 +206,9 @@ impl<'a> RootBuilder<'a, root_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RootBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -220,11 +223,11 @@ where
         mut self,
         value: impl Into<DocRef<'a>>,
     ) -> RootBuilder<'a, root_state::SetDoc<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RootBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,11 +242,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> RootBuilder<'a, root_state::SetSnapshot<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RootBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -257,8 +260,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Root<'a> {
         Root {
-            doc: self.__unsafe_private_named.0.unwrap(),
-            snapshot: self.__unsafe_private_named.1.unwrap(),
+            doc: self._fields.0.unwrap(),
+            snapshot: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -271,8 +274,8 @@ where
         >,
     ) -> Root<'a> {
         Root {
-            doc: self.__unsafe_private_named.0.unwrap(),
-            snapshot: self.__unsafe_private_named.1.unwrap(),
+            doc: self._fields.0.unwrap(),
+            snapshot: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/embed.rs b/crates/jacquard-api/src/sh_weaver/embed.rs
index d63b5ca0..a9f27626 100644
--- a/crates/jacquard-api/src/sh_weaver/embed.rs
+++ b/crates/jacquard-api/src/sh_weaver/embed.rs
@@ -11,7 +11,11 @@ pub mod record_with_media;
 pub mod records;
 pub mod video;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -119,9 +123,9 @@ pub mod percent_size_state {
 
 /// Builder for constructing an instance of this type
 pub struct PercentSizeBuilder<'a, S: percent_size_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PercentSize<'a> {
@@ -135,9 +139,9 @@ impl<'a> PercentSizeBuilder<'a, percent_size_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PercentSizeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -152,11 +156,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PercentSizeBuilder<'a, percent_size_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PercentSizeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -171,11 +175,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PercentSizeBuilder<'a, percent_size_state::SetWidth<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PercentSizeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -189,8 +193,8 @@ where
     /// Build the final struct
     pub fn build(self) -> PercentSize<'a> {
         PercentSize {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -203,8 +207,8 @@ where
         >,
     ) -> PercentSize<'a> {
         PercentSize {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -298,45 +302,45 @@ pub mod pixel_size_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Height;
         type Width;
+        type Height;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Height = Unset;
         type Width = Unset;
-    }
-    ///State transition - sets the `height` field to Set
-    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHeight<S> {}
-    impl<S: State> State for SetHeight<S> {
-        type Height = Set<members::height>;
-        type Width = S::Width;
+        type Height = Unset;
     }
     ///State transition - sets the `width` field to Set
     pub struct SetWidth<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWidth<S> {}
     impl<S: State> State for SetWidth<S> {
-        type Height = S::Height;
         type Width = Set<members::width>;
+        type Height = S::Height;
+    }
+    ///State transition - sets the `height` field to Set
+    pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHeight<S> {}
+    impl<S: State> State for SetHeight<S> {
+        type Width = S::Width;
+        type Height = Set<members::height>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `height` field
-        pub struct height(());
         ///Marker type for the `width` field
         pub struct width(());
+        ///Marker type for the `height` field
+        pub struct height(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PixelSizeBuilder<'a, S: pixel_size_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PixelSize<'a> {
@@ -350,9 +354,9 @@ impl<'a> PixelSizeBuilder<'a, pixel_size_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PixelSizeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -367,11 +371,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PixelSizeBuilder<'a, pixel_size_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PixelSizeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -386,11 +390,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> PixelSizeBuilder<'a, pixel_size_state::SetWidth<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PixelSizeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -398,14 +402,14 @@ where
 impl<'a, S> PixelSizeBuilder<'a, S>
 where
     S: pixel_size_state::State,
-    S::Height: pixel_size_state::IsSet,
     S::Width: pixel_size_state::IsSet,
+    S::Height: pixel_size_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PixelSize<'a> {
         PixelSize {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -418,8 +422,8 @@ where
         >,
     ) -> PixelSize<'a> {
         PixelSize {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/embed/external.rs b/crates/jacquard-api/src/sh_weaver/embed/external.rs
index f6904a1a..0075e9ce 100644
--- a/crates/jacquard-api/src/sh_weaver/embed/external.rs
+++ b/crates/jacquard-api/src/sh_weaver/embed/external.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -201,64 +204,64 @@ pub mod external_embed_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Uri;
         type Title;
         type Description;
-        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Uri = Unset;
         type Title = Unset;
         type Description = Unset;
-        type Uri = Unset;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Uri = Set<members::uri>;
+        type Title = S::Title;
+        type Description = S::Description;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
+        type Uri = S::Uri;
         type Title = Set<members::title>;
         type Description = S::Description;
-        type Uri = S::Uri;
     }
     ///State transition - sets the `description` field to Set
     pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDescription<S> {}
     impl<S: State> State for SetDescription<S> {
-        type Title = S::Title;
-        type Description = Set<members::description>;
         type Uri = S::Uri;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
         type Title = S::Title;
-        type Description = S::Description;
-        type Uri = Set<members::uri>;
+        type Description = Set<members::description>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `uri` field
+        pub struct uri(());
         ///Marker type for the `title` field
         pub struct title(());
         ///Marker type for the `description` field
         pub struct description(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ExternalEmbedBuilder<'a, S: external_embed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ExternalEmbed<'a> {
@@ -272,9 +275,9 @@ impl<'a> ExternalEmbedBuilder<'a, external_embed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExternalEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -289,11 +292,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ExternalEmbedBuilder<'a, external_embed_state::SetDescription<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ExternalEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -301,12 +304,12 @@ where
 impl<'a, S: external_embed_state::State> ExternalEmbedBuilder<'a, S> {
     /// Set the `thumb` field (optional)
     pub fn thumb(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `thumb` field to an Option value (optional)
     pub fn maybe_thumb(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -321,11 +324,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ExternalEmbedBuilder<'a, external_embed_state::SetTitle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ExternalEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -340,11 +343,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ExternalEmbedBuilder<'a, external_embed_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ExternalEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -352,17 +355,17 @@ where
 impl<'a, S> ExternalEmbedBuilder<'a, S>
 where
     S: external_embed_state::State,
+    S::Uri: external_embed_state::IsSet,
     S::Title: external_embed_state::IsSet,
     S::Description: external_embed_state::IsSet,
-    S::Uri: external_embed_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ExternalEmbed<'a> {
         ExternalEmbed {
-            description: self.__unsafe_private_named.0.unwrap(),
-            thumb: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0.unwrap(),
+            thumb: self._fields.1,
+            title: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -375,10 +378,10 @@ where
         >,
     ) -> ExternalEmbed<'a> {
         ExternalEmbed {
-            description: self.__unsafe_private_named.0.unwrap(),
-            thumb: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0.unwrap(),
+            thumb: self._fields.1,
+            title: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -555,9 +558,9 @@ pub mod external_state {
 
 /// Builder for constructing an instance of this type
 pub struct ExternalBuilder<'a, S: external_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<external::ExternalEmbed<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<external::ExternalEmbed<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> External<'a> {
@@ -571,9 +574,9 @@ impl<'a> ExternalBuilder<'a, external_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -588,11 +591,11 @@ where
         mut self,
         value: impl Into<Vec<external::ExternalEmbed<'a>>>,
     ) -> ExternalBuilder<'a, external_state::SetEmbeds<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -605,7 +608,7 @@ where
     /// Build the final struct
     pub fn build(self) -> External<'a> {
         External {
-            embeds: self.__unsafe_private_named.0.unwrap(),
+            embeds: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -618,7 +621,7 @@ where
         >,
     ) -> External<'a> {
         External {
-            embeds: self.__unsafe_private_named.0.unwrap(),
+            embeds: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -658,9 +661,9 @@ pub mod view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewBuilder<'a, S: view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<external::ViewExternal<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<external::ViewExternal<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> View<'a> {
@@ -674,9 +677,9 @@ impl<'a> ViewBuilder<'a, view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -691,11 +694,11 @@ where
         mut self,
         value: impl Into<Vec<external::ViewExternal<'a>>>,
     ) -> ViewBuilder<'a, view_state::SetExternal<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -708,7 +711,7 @@ where
     /// Build the final struct
     pub fn build(self) -> View<'a> {
         View {
-            external: self.__unsafe_private_named.0.unwrap(),
+            external: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -721,7 +724,7 @@ where
         >,
     ) -> View<'a> {
         View {
-            external: self.__unsafe_private_named.0.unwrap(),
+            external: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -737,64 +740,64 @@ pub mod view_external_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type Description;
         type Title;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type Description = Unset;
         type Title = Unset;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Description = S::Description;
-        type Title = S::Title;
+        type Uri = Unset;
     }
     ///State transition - sets the `description` field to Set
     pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDescription<S> {}
     impl<S: State> State for SetDescription<S> {
-        type Uri = S::Uri;
         type Description = Set<members::description>;
         type Title = S::Title;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Uri = S::Uri;
         type Description = S::Description;
         type Title = Set<members::title>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Description = S::Description;
+        type Title = S::Title;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `description` field
         pub struct description(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ViewExternalBuilder<'a, S: view_external_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ViewExternal<'a> {
@@ -808,9 +811,9 @@ impl<'a> ViewExternalBuilder<'a, view_external_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -825,11 +828,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ViewExternalBuilder<'a, view_external_state::SetDescription<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -837,12 +840,12 @@ where
 impl<'a, S: view_external_state::State> ViewExternalBuilder<'a, S> {
     /// Set the `thumb` field (optional)
     pub fn thumb(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `thumb` field to an Option value (optional)
     pub fn maybe_thumb(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -857,11 +860,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ViewExternalBuilder<'a, view_external_state::SetTitle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ViewExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -876,11 +879,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ViewExternalBuilder<'a, view_external_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ViewExternalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -888,17 +891,17 @@ where
 impl<'a, S> ViewExternalBuilder<'a, S>
 where
     S: view_external_state::State,
-    S::Uri: view_external_state::IsSet,
     S::Description: view_external_state::IsSet,
     S::Title: view_external_state::IsSet,
+    S::Uri: view_external_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ViewExternal<'a> {
         ViewExternal {
-            description: self.__unsafe_private_named.0.unwrap(),
-            thumb: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0.unwrap(),
+            thumb: self._fields.1,
+            title: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -911,10 +914,10 @@ where
         >,
     ) -> ViewExternal<'a> {
         ViewExternal {
-            description: self.__unsafe_private_named.0.unwrap(),
-            thumb: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0.unwrap(),
+            thumb: self._fields.1,
+            title: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/embed/images.rs b/crates/jacquard-api/src/sh_weaver/embed/images.rs
index fa00238f..2478a842 100644
--- a/crates/jacquard-api/src/sh_weaver/embed/images.rs
+++ b/crates/jacquard-api/src/sh_weaver/embed/images.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -276,51 +279,51 @@ pub mod image_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Alt;
         type Image;
+        type Alt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Alt = Unset;
         type Image = Unset;
-    }
-    ///State transition - sets the `alt` field to Set
-    pub struct SetAlt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAlt<S> {}
-    impl<S: State> State for SetAlt<S> {
-        type Alt = Set<members::alt>;
-        type Image = S::Image;
+        type Alt = Unset;
     }
     ///State transition - sets the `image` field to Set
     pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetImage<S> {}
     impl<S: State> State for SetImage<S> {
-        type Alt = S::Alt;
         type Image = Set<members::image>;
+        type Alt = S::Alt;
+    }
+    ///State transition - sets the `alt` field to Set
+    pub struct SetAlt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAlt<S> {}
+    impl<S: State> State for SetAlt<S> {
+        type Image = S::Image;
+        type Alt = Set<members::alt>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `alt` field
-        pub struct alt(());
         ///Marker type for the `image` field
         pub struct image(());
+        ///Marker type for the `alt` field
+        pub struct alt(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ImageBuilder<'a, S: image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<ImageDimensions<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Image<'a> {
@@ -334,9 +337,9 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -351,11 +354,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ImageBuilder<'a, image_state::SetAlt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -363,12 +366,12 @@ where
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `blurhash` field (optional)
     pub fn blurhash(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `blurhash` field to an Option value (optional)
     pub fn maybe_blurhash(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -376,12 +379,12 @@ impl<'a, S: image_state::State> ImageBuilder<'a, S> {
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `dimensions` field (optional)
     pub fn dimensions(mut self, value: impl Into<Option<ImageDimensions<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `dimensions` field to an Option value (optional)
     pub fn maybe_dimensions(mut self, value: Option<ImageDimensions<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -396,11 +399,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ImageBuilder<'a, image_state::SetImage<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -408,12 +411,12 @@ where
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -421,17 +424,17 @@ impl<'a, S: image_state::State> ImageBuilder<'a, S> {
 impl<'a, S> ImageBuilder<'a, S>
 where
     S: image_state::State,
-    S::Alt: image_state::IsSet,
     S::Image: image_state::IsSet,
+    S::Alt: image_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            blurhash: self.__unsafe_private_named.1,
-            dimensions: self.__unsafe_private_named.2,
-            image: self.__unsafe_private_named.3.unwrap(),
-            name: self.__unsafe_private_named.4,
+            alt: self._fields.0.unwrap(),
+            blurhash: self._fields.1,
+            dimensions: self._fields.2,
+            image: self._fields.3.unwrap(),
+            name: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -444,11 +447,11 @@ where
         >,
     ) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            blurhash: self.__unsafe_private_named.1,
-            dimensions: self.__unsafe_private_named.2,
-            image: self.__unsafe_private_named.3.unwrap(),
-            name: self.__unsafe_private_named.4,
+            alt: self._fields.0.unwrap(),
+            blurhash: self._fields.1,
+            dimensions: self._fields.2,
+            image: self._fields.3.unwrap(),
+            name: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
@@ -677,9 +680,9 @@ pub mod images_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImagesBuilder<'a, S: images_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<images::Image<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<images::Image<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Images<'a> {
@@ -693,9 +696,9 @@ impl<'a> ImagesBuilder<'a, images_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImagesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -710,11 +713,11 @@ where
         mut self,
         value: impl Into<Vec<images::Image<'a>>>,
     ) -> ImagesBuilder<'a, images_state::SetImages<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ImagesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -727,7 +730,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Images<'a> {
         Images {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -740,7 +743,7 @@ where
         >,
     ) -> Images<'a> {
         Images {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -780,9 +783,9 @@ pub mod view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewBuilder<'a, S: view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<images::ViewImage<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<images::ViewImage<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> View<'a> {
@@ -796,9 +799,9 @@ impl<'a> ViewBuilder<'a, view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -813,11 +816,11 @@ where
         mut self,
         value: impl Into<Vec<images::ViewImage<'a>>>,
     ) -> ViewBuilder<'a, view_state::SetImages<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -830,7 +833,7 @@ where
     /// Build the final struct
     pub fn build(self) -> View<'a> {
         View {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -843,7 +846,7 @@ where
         >,
     ) -> View<'a> {
         View {
-            images: self.__unsafe_private_named.0.unwrap(),
+            images: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -859,49 +862,49 @@ pub mod view_image_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Alt;
         type Thumb;
+        type Alt;
         type Fullsize;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Alt = Unset;
         type Thumb = Unset;
+        type Alt = Unset;
         type Fullsize = Unset;
     }
-    ///State transition - sets the `alt` field to Set
-    pub struct SetAlt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAlt<S> {}
-    impl<S: State> State for SetAlt<S> {
-        type Alt = Set<members::alt>;
-        type Thumb = S::Thumb;
-        type Fullsize = S::Fullsize;
-    }
     ///State transition - sets the `thumb` field to Set
     pub struct SetThumb<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetThumb<S> {}
     impl<S: State> State for SetThumb<S> {
-        type Alt = S::Alt;
         type Thumb = Set<members::thumb>;
+        type Alt = S::Alt;
+        type Fullsize = S::Fullsize;
+    }
+    ///State transition - sets the `alt` field to Set
+    pub struct SetAlt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAlt<S> {}
+    impl<S: State> State for SetAlt<S> {
+        type Thumb = S::Thumb;
+        type Alt = Set<members::alt>;
         type Fullsize = S::Fullsize;
     }
     ///State transition - sets the `fullsize` field to Set
     pub struct SetFullsize<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetFullsize<S> {}
     impl<S: State> State for SetFullsize<S> {
-        type Alt = S::Alt;
         type Thumb = S::Thumb;
+        type Alt = S::Alt;
         type Fullsize = Set<members::fullsize>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `alt` field
-        pub struct alt(());
         ///Marker type for the `thumb` field
         pub struct thumb(());
+        ///Marker type for the `alt` field
+        pub struct alt(());
         ///Marker type for the `fullsize` field
         pub struct fullsize(());
     }
@@ -909,15 +912,15 @@ pub mod view_image_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewImageBuilder<'a, S: view_image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<ViewImageDimensions<'a>>,
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ViewImage<'a> {
@@ -931,9 +934,9 @@ impl<'a> ViewImageBuilder<'a, view_image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -948,11 +951,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ViewImageBuilder<'a, view_image_state::SetAlt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -963,12 +966,12 @@ impl<'a, S: view_image_state::State> ViewImageBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ViewImageDimensions<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `dimensions` field to an Option value (optional)
     pub fn maybe_dimensions(mut self, value: Option<ViewImageDimensions<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -983,11 +986,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ViewImageBuilder<'a, view_image_state::SetFullsize<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ViewImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -995,12 +998,12 @@ where
 impl<'a, S: view_image_state::State> ViewImageBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1015,11 +1018,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ViewImageBuilder<'a, view_image_state::SetThumb<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ViewImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1027,18 +1030,18 @@ where
 impl<'a, S> ViewImageBuilder<'a, S>
 where
     S: view_image_state::State,
-    S::Alt: view_image_state::IsSet,
     S::Thumb: view_image_state::IsSet,
+    S::Alt: view_image_state::IsSet,
     S::Fullsize: view_image_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ViewImage<'a> {
         ViewImage {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            dimensions: self.__unsafe_private_named.1,
-            fullsize: self.__unsafe_private_named.2.unwrap(),
-            name: self.__unsafe_private_named.3,
-            thumb: self.__unsafe_private_named.4.unwrap(),
+            alt: self._fields.0.unwrap(),
+            dimensions: self._fields.1,
+            fullsize: self._fields.2.unwrap(),
+            name: self._fields.3,
+            thumb: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1051,11 +1054,11 @@ where
         >,
     ) -> ViewImage<'a> {
         ViewImage {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            dimensions: self.__unsafe_private_named.1,
-            fullsize: self.__unsafe_private_named.2.unwrap(),
-            name: self.__unsafe_private_named.3,
-            thumb: self.__unsafe_private_named.4.unwrap(),
+            alt: self._fields.0.unwrap(),
+            dimensions: self._fields.1,
+            fullsize: self._fields.2.unwrap(),
+            name: self._fields.3,
+            thumb: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/embed/record_with_media.rs b/crates/jacquard-api/src/sh_weaver/embed/record_with_media.rs
index d15d35d7..2b910c33 100644
--- a/crates/jacquard-api/src/sh_weaver/embed/record_with_media.rs
+++ b/crates/jacquard-api/src/sh_weaver/embed/record_with_media.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -152,9 +155,9 @@ pub mod record_with_media_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordWithMediaBuilder<'a, S: record_with_media_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<RecordWithMediaMedia<'a>>, Option<Records<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<RecordWithMediaMedia<'a>>, Option<Records<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RecordWithMedia<'a> {
@@ -168,9 +171,9 @@ impl<'a> RecordWithMediaBuilder<'a, record_with_media_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordWithMediaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -185,11 +188,11 @@ where
         mut self,
         value: impl Into<RecordWithMediaMedia<'a>>,
     ) -> RecordWithMediaBuilder<'a, record_with_media_state::SetMedia<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordWithMediaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,11 +207,11 @@ where
         mut self,
         value: impl Into<Records<'a>>,
     ) -> RecordWithMediaBuilder<'a, record_with_media_state::SetRecords<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RecordWithMediaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -222,8 +225,8 @@ where
     /// Build the final struct
     pub fn build(self) -> RecordWithMedia<'a> {
         RecordWithMedia {
-            media: self.__unsafe_private_named.0.unwrap(),
-            records: self.__unsafe_private_named.1.unwrap(),
+            media: self._fields.0.unwrap(),
+            records: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -236,8 +239,8 @@ where
         >,
     ) -> RecordWithMedia<'a> {
         RecordWithMedia {
-            media: self.__unsafe_private_named.0.unwrap(),
-            records: self.__unsafe_private_named.1.unwrap(),
+            media: self._fields.0.unwrap(),
+            records: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -371,9 +374,9 @@ pub mod view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewBuilder<'a, S: view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ViewMedia<'a>>, Option<records::View<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ViewMedia<'a>>, Option<records::View<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> View<'a> {
@@ -387,9 +390,9 @@ impl<'a> ViewBuilder<'a, view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -404,11 +407,11 @@ where
         mut self,
         value: impl Into<ViewMedia<'a>>,
     ) -> ViewBuilder<'a, view_state::SetMedia<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -416,12 +419,12 @@ where
 impl<'a, S: view_state::State> ViewBuilder<'a, S> {
     /// Set the `records` field (optional)
     pub fn records(mut self, value: impl Into<Option<records::View<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `records` field to an Option value (optional)
     pub fn maybe_records(mut self, value: Option<records::View<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -435,8 +438,8 @@ where
     /// Build the final struct
     pub fn build(self) -> View<'a> {
         View {
-            media: self.__unsafe_private_named.0.unwrap(),
-            records: self.__unsafe_private_named.1,
+            media: self._fields.0.unwrap(),
+            records: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -449,8 +452,8 @@ where
         >,
     ) -> View<'a> {
         View {
-            media: self.__unsafe_private_named.0.unwrap(),
-            records: self.__unsafe_private_named.1,
+            media: self._fields.0.unwrap(),
+            records: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/embed/records.rs b/crates/jacquard-api/src/sh_weaver/embed/records.rs
index 8bcbe6e5..aec11c18 100644
--- a/crates/jacquard-api/src/sh_weaver/embed/records.rs
+++ b/crates/jacquard-api/src/sh_weaver/embed/records.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -362,9 +365,9 @@ pub mod records_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordsBuilder<'a, S: records_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<records::RecordEmbed<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<records::RecordEmbed<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Records<'a> {
@@ -378,9 +381,9 @@ impl<'a> RecordsBuilder<'a, records_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -395,11 +398,11 @@ where
         mut self,
         value: impl Into<Vec<records::RecordEmbed<'a>>>,
     ) -> RecordsBuilder<'a, records_state::SetRecords<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -412,7 +415,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Records<'a> {
         Records {
-            records: self.__unsafe_private_named.0.unwrap(),
+            records: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -422,7 +425,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Records<'a> {
         Records {
-            records: self.__unsafe_private_named.0.unwrap(),
+            records: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -777,9 +780,9 @@ pub mod record_embed_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordEmbedBuilder<'a, S: record_embed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RecordEmbed<'a> {
@@ -793,9 +796,9 @@ impl<'a> RecordEmbedBuilder<'a, record_embed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -803,12 +806,12 @@ impl<'a> RecordEmbedBuilder<'a, record_embed_state::Empty> {
 impl<'a, S: record_embed_state::State> RecordEmbedBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -823,11 +826,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> RecordEmbedBuilder<'a, record_embed_state::SetRecord<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RecordEmbedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -840,8 +843,8 @@ where
     /// Build the final struct
     pub fn build(self) -> RecordEmbed<'a> {
         RecordEmbed {
-            name: self.__unsafe_private_named.0,
-            record: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0,
+            record: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -851,8 +854,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> RecordEmbed<'a> {
         RecordEmbed {
-            name: self.__unsafe_private_named.0,
-            record: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0,
+            record: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -892,9 +895,9 @@ pub mod record_embed_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordEmbedViewBuilder<'a, S: record_embed_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<RecordEmbedViewRecordView<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<RecordEmbedViewRecordView<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RecordEmbedView<'a> {
@@ -908,9 +911,9 @@ impl<'a> RecordEmbedViewBuilder<'a, record_embed_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordEmbedViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -918,12 +921,12 @@ impl<'a> RecordEmbedViewBuilder<'a, record_embed_view_state::Empty> {
 impl<'a, S: record_embed_view_state::State> RecordEmbedViewBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -938,11 +941,11 @@ where
         mut self,
         value: impl Into<RecordEmbedViewRecordView<'a>>,
     ) -> RecordEmbedViewBuilder<'a, record_embed_view_state::SetRecordView<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RecordEmbedViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -955,8 +958,8 @@ where
     /// Build the final struct
     pub fn build(self) -> RecordEmbedView<'a> {
         RecordEmbedView {
-            name: self.__unsafe_private_named.0,
-            record_view: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0,
+            record_view: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -966,8 +969,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> RecordEmbedView<'a> {
         RecordEmbedView {
-            name: self.__unsafe_private_named.0,
-            record_view: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0,
+            record_view: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1007,9 +1010,9 @@ pub mod view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewBuilder<'a, S: view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ViewUnionRecord<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ViewUnionRecord<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> View<'a> {
@@ -1023,9 +1026,9 @@ impl<'a> ViewBuilder<'a, view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1040,11 +1043,11 @@ where
         mut self,
         value: impl Into<ViewUnionRecord<'a>>,
     ) -> ViewBuilder<'a, view_state::SetRecord<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1057,7 +1060,7 @@ where
     /// Build the final struct
     pub fn build(self) -> View<'a> {
         View {
-            record: self.__unsafe_private_named.0.unwrap(),
+            record: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1067,7 +1070,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> View<'a> {
         View {
-            record: self.__unsafe_private_named.0.unwrap(),
+            record: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1083,59 +1086,59 @@ pub mod view_blocked_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Author;
         type Blocked;
         type Uri;
-        type Author;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Author = Unset;
         type Blocked = Unset;
         type Uri = Unset;
-        type Author = Unset;
+    }
+    ///State transition - sets the `author` field to Set
+    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAuthor<S> {}
+    impl<S: State> State for SetAuthor<S> {
+        type Author = Set<members::author>;
+        type Blocked = S::Blocked;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `blocked` field to Set
     pub struct SetBlocked<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBlocked<S> {}
     impl<S: State> State for SetBlocked<S> {
+        type Author = S::Author;
         type Blocked = Set<members::blocked>;
         type Uri = S::Uri;
-        type Author = S::Author;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Blocked = S::Blocked;
-        type Uri = Set<members::uri>;
         type Author = S::Author;
-    }
-    ///State transition - sets the `author` field to Set
-    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAuthor<S> {}
-    impl<S: State> State for SetAuthor<S> {
         type Blocked = S::Blocked;
-        type Uri = S::Uri;
-        type Author = Set<members::author>;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `author` field
+        pub struct author(());
         ///Marker type for the `blocked` field
         pub struct blocked(());
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `author` field
-        pub struct author(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ViewBlockedBuilder<'a, S: view_blocked_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlockedAuthor<'a>>, Option<bool>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlockedAuthor<'a>>, Option<bool>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ViewBlocked<'a> {
@@ -1149,9 +1152,9 @@ impl<'a> ViewBlockedBuilder<'a, view_blocked_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewBlockedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1166,11 +1169,11 @@ where
         mut self,
         value: impl Into<BlockedAuthor<'a>>,
     ) -> ViewBlockedBuilder<'a, view_blocked_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewBlockedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1185,11 +1188,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ViewBlockedBuilder<'a, view_blocked_state::SetBlocked<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ViewBlockedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1204,11 +1207,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ViewBlockedBuilder<'a, view_blocked_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ViewBlockedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1216,16 +1219,16 @@ where
 impl<'a, S> ViewBlockedBuilder<'a, S>
 where
     S: view_blocked_state::State,
+    S::Author: view_blocked_state::IsSet,
     S::Blocked: view_blocked_state::IsSet,
     S::Uri: view_blocked_state::IsSet,
-    S::Author: view_blocked_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ViewBlocked<'a> {
         ViewBlocked {
-            author: self.__unsafe_private_named.0.unwrap(),
-            blocked: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            author: self._fields.0.unwrap(),
+            blocked: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1235,9 +1238,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ViewBlocked<'a> {
         ViewBlocked {
-            author: self.__unsafe_private_named.0.unwrap(),
-            blocked: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            author: self._fields.0.unwrap(),
+            blocked: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1253,45 +1256,45 @@ pub mod view_detached_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type Detached;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type Detached = Unset;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Detached = S::Detached;
+        type Uri = Unset;
     }
     ///State transition - sets the `detached` field to Set
     pub struct SetDetached<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDetached<S> {}
     impl<S: State> State for SetDetached<S> {
-        type Uri = S::Uri;
         type Detached = Set<members::detached>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Detached = S::Detached;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `detached` field
         pub struct detached(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ViewDetachedBuilder<'a, S: view_detached_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ViewDetached<'a> {
@@ -1305,9 +1308,9 @@ impl<'a> ViewDetachedBuilder<'a, view_detached_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewDetachedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1322,11 +1325,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ViewDetachedBuilder<'a, view_detached_state::SetDetached<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewDetachedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1341,11 +1344,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ViewDetachedBuilder<'a, view_detached_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ViewDetachedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1353,14 +1356,14 @@ where
 impl<'a, S> ViewDetachedBuilder<'a, S>
 where
     S: view_detached_state::State,
-    S::Uri: view_detached_state::IsSet,
     S::Detached: view_detached_state::IsSet,
+    S::Uri: view_detached_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ViewDetached<'a> {
         ViewDetached {
-            detached: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            detached: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1370,8 +1373,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ViewDetached<'a> {
         ViewDetached {
-            detached: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            detached: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1423,9 +1426,9 @@ pub mod view_not_found_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewNotFoundBuilder<'a, S: view_not_found_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ViewNotFound<'a> {
@@ -1439,9 +1442,9 @@ impl<'a> ViewNotFoundBuilder<'a, view_not_found_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewNotFoundBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1456,11 +1459,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ViewNotFoundBuilder<'a, view_not_found_state::SetNotFound<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewNotFoundBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1475,11 +1478,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ViewNotFoundBuilder<'a, view_not_found_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ViewNotFoundBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1493,8 +1496,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ViewNotFound<'a> {
         ViewNotFound {
-            not_found: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            not_found: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1504,8 +1507,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ViewNotFound<'a> {
         ViewNotFound {
-            not_found: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            not_found: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1523,9 +1526,9 @@ pub mod view_record_state {
     pub trait State: sealed::Sealed {
         type Uri;
         type Cid;
-        type Value;
         type Author;
         type IndexedAt;
+        type Value;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
@@ -1533,9 +1536,9 @@ pub mod view_record_state {
     impl State for Empty {
         type Uri = Unset;
         type Cid = Unset;
-        type Value = Unset;
         type Author = Unset;
         type IndexedAt = Unset;
+        type Value = Unset;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
@@ -1543,9 +1546,9 @@ pub mod view_record_state {
     impl<S: State> State for SetUri<S> {
         type Uri = Set<members::uri>;
         type Cid = S::Cid;
-        type Value = S::Value;
         type Author = S::Author;
         type IndexedAt = S::IndexedAt;
+        type Value = S::Value;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
@@ -1553,19 +1556,9 @@ pub mod view_record_state {
     impl<S: State> State for SetCid<S> {
         type Uri = S::Uri;
         type Cid = Set<members::cid>;
-        type Value = S::Value;
-        type Author = S::Author;
-        type IndexedAt = S::IndexedAt;
-    }
-    ///State transition - sets the `value` field to Set
-    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetValue<S> {}
-    impl<S: State> State for SetValue<S> {
-        type Uri = S::Uri;
-        type Cid = S::Cid;
-        type Value = Set<members::value>;
         type Author = S::Author;
         type IndexedAt = S::IndexedAt;
+        type Value = S::Value;
     }
     ///State transition - sets the `author` field to Set
     pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
@@ -1573,9 +1566,9 @@ pub mod view_record_state {
     impl<S: State> State for SetAuthor<S> {
         type Uri = S::Uri;
         type Cid = S::Cid;
-        type Value = S::Value;
         type Author = Set<members::author>;
         type IndexedAt = S::IndexedAt;
+        type Value = S::Value;
     }
     ///State transition - sets the `indexed_at` field to Set
     pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
@@ -1583,9 +1576,19 @@ pub mod view_record_state {
     impl<S: State> State for SetIndexedAt<S> {
         type Uri = S::Uri;
         type Cid = S::Cid;
-        type Value = S::Value;
         type Author = S::Author;
         type IndexedAt = Set<members::indexed_at>;
+        type Value = S::Value;
+    }
+    ///State transition - sets the `value` field to Set
+    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetValue<S> {}
+    impl<S: State> State for SetValue<S> {
+        type Uri = S::Uri;
+        type Cid = S::Cid;
+        type Author = S::Author;
+        type IndexedAt = S::IndexedAt;
+        type Value = Set<members::value>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
@@ -1594,19 +1597,19 @@ pub mod view_record_state {
         pub struct uri(());
         ///Marker type for the `cid` field
         pub struct cid(());
-        ///Marker type for the `value` field
-        pub struct value(());
         ///Marker type for the `author` field
         pub struct author(());
         ///Marker type for the `indexed_at` field
         pub struct indexed_at(());
+        ///Marker type for the `value` field
+        pub struct value(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ViewRecordBuilder<'a, S: view_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileDataViewBasic<'a>>,
         Option<Cid<'a>>,
         Option<Vec<records::RecordEmbedView<'a>>>,
@@ -1619,7 +1622,7 @@ pub struct ViewRecordBuilder<'a, S: view_record_state::State> {
         Option<AtUri<'a>>,
         Option<Data<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ViewRecord<'a> {
@@ -1633,21 +1636,9 @@ impl<'a> ViewRecordBuilder<'a, view_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1662,11 +1653,11 @@ where
         mut self,
         value: impl Into<ProfileDataViewBasic<'a>>,
     ) -> ViewRecordBuilder<'a, view_record_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ViewRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1681,11 +1672,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> ViewRecordBuilder<'a, view_record_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ViewRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1696,7 +1687,7 @@ impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<records::RecordEmbedView<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `embeds` field to an Option value (optional)
@@ -1704,7 +1695,7 @@ impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
         mut self,
         value: Option<Vec<records::RecordEmbedView<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1719,11 +1710,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ViewRecordBuilder<'a, view_record_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ViewRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1731,12 +1722,12 @@ where
 impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1744,12 +1735,12 @@ impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
 impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
     /// Set the `likeCount` field (optional)
     pub fn like_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `likeCount` field to an Option value (optional)
     pub fn maybe_like_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1757,12 +1748,12 @@ impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
 impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
     /// Set the `quoteCount` field (optional)
     pub fn quote_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `quoteCount` field to an Option value (optional)
     pub fn maybe_quote_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1770,12 +1761,12 @@ impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
 impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
     /// Set the `replyCount` field (optional)
     pub fn reply_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `replyCount` field to an Option value (optional)
     pub fn maybe_reply_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -1783,12 +1774,12 @@ impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
 impl<'a, S: view_record_state::State> ViewRecordBuilder<'a, S> {
     /// Set the `repostCount` field (optional)
     pub fn repost_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `repostCount` field to an Option value (optional)
     pub fn maybe_repost_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -1803,11 +1794,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ViewRecordBuilder<'a, view_record_state::SetUri<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ViewRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1822,11 +1813,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> ViewRecordBuilder<'a, view_record_state::SetValue<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         ViewRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1836,24 +1827,24 @@ where
     S: view_record_state::State,
     S::Uri: view_record_state::IsSet,
     S::Cid: view_record_state::IsSet,
-    S::Value: view_record_state::IsSet,
     S::Author: view_record_state::IsSet,
     S::IndexedAt: view_record_state::IsSet,
+    S::Value: view_record_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ViewRecord<'a> {
         ViewRecord {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            embeds: self.__unsafe_private_named.2,
-            indexed_at: self.__unsafe_private_named.3.unwrap(),
-            labels: self.__unsafe_private_named.4,
-            like_count: self.__unsafe_private_named.5,
-            quote_count: self.__unsafe_private_named.6,
-            reply_count: self.__unsafe_private_named.7,
-            repost_count: self.__unsafe_private_named.8,
-            uri: self.__unsafe_private_named.9.unwrap(),
-            value: self.__unsafe_private_named.10.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            embeds: self._fields.2,
+            indexed_at: self._fields.3.unwrap(),
+            labels: self._fields.4,
+            like_count: self._fields.5,
+            quote_count: self._fields.6,
+            reply_count: self._fields.7,
+            repost_count: self._fields.8,
+            uri: self._fields.9.unwrap(),
+            value: self._fields.10.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1863,17 +1854,17 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ViewRecord<'a> {
         ViewRecord {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            embeds: self.__unsafe_private_named.2,
-            indexed_at: self.__unsafe_private_named.3.unwrap(),
-            labels: self.__unsafe_private_named.4,
-            like_count: self.__unsafe_private_named.5,
-            quote_count: self.__unsafe_private_named.6,
-            reply_count: self.__unsafe_private_named.7,
-            repost_count: self.__unsafe_private_named.8,
-            uri: self.__unsafe_private_named.9.unwrap(),
-            value: self.__unsafe_private_named.10.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            embeds: self._fields.2,
+            indexed_at: self._fields.3.unwrap(),
+            labels: self._fields.4,
+            like_count: self._fields.5,
+            quote_count: self._fields.6,
+            reply_count: self._fields.7,
+            repost_count: self._fields.8,
+            uri: self._fields.9.unwrap(),
+            value: self._fields.10.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/embed/video.rs b/crates/jacquard-api/src/sh_weaver/embed/video.rs
index 1473280c..5cc7645f 100644
--- a/crates/jacquard-api/src/sh_weaver/embed/video.rs
+++ b/crates/jacquard-api/src/sh_weaver/embed/video.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -377,9 +380,9 @@ pub mod caption_state {
 
 /// Builder for constructing an instance of this type
 pub struct CaptionBuilder<'a, S: caption_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>, Option<Language>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>, Option<Language>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Caption<'a> {
@@ -393,9 +396,9 @@ impl<'a> CaptionBuilder<'a, caption_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CaptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -410,11 +413,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> CaptionBuilder<'a, caption_state::SetFile<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CaptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -429,11 +432,11 @@ where
         mut self,
         value: impl Into<Language>,
     ) -> CaptionBuilder<'a, caption_state::SetLang<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CaptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -447,8 +450,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Caption<'a> {
         Caption {
-            file: self.__unsafe_private_named.0.unwrap(),
-            lang: self.__unsafe_private_named.1.unwrap(),
+            file: self._fields.0.unwrap(),
+            lang: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -461,8 +464,8 @@ where
         >,
     ) -> Caption<'a> {
         Caption {
-            file: self.__unsafe_private_named.0.unwrap(),
-            lang: self.__unsafe_private_named.1.unwrap(),
+            file: self._fields.0.unwrap(),
+            lang: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -684,9 +687,9 @@ pub mod video_record_state {
 
 /// Builder for constructing an instance of this type
 pub struct VideoRecordBuilder<'a, S: video_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<video::Video<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<video::Video<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> VideoRecord<'a> {
@@ -700,9 +703,9 @@ impl<'a> VideoRecordBuilder<'a, video_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VideoRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -717,11 +720,11 @@ where
         mut self,
         value: impl Into<Vec<video::Video<'a>>>,
     ) -> VideoRecordBuilder<'a, video_record_state::SetVideos<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         VideoRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -734,7 +737,7 @@ where
     /// Build the final struct
     pub fn build(self) -> VideoRecord<'a> {
         VideoRecord {
-            videos: self.__unsafe_private_named.0.unwrap(),
+            videos: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -747,7 +750,7 @@ where
         >,
     ) -> VideoRecord<'a> {
         VideoRecord {
-            videos: self.__unsafe_private_named.0.unwrap(),
+            videos: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -787,15 +790,15 @@ pub mod video_state {
 
 /// Builder for constructing an instance of this type
 pub struct VideoBuilder<'a, S: video_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Vec<video::Caption<'a>>>,
         Option<VideoDimensions<'a>>,
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Video<'a> {
@@ -809,9 +812,9 @@ impl<'a> VideoBuilder<'a, video_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VideoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -819,12 +822,12 @@ impl<'a> VideoBuilder<'a, video_state::Empty> {
 impl<'a, S: video_state::State> VideoBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -835,12 +838,12 @@ impl<'a, S: video_state::State> VideoBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<video::Caption<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `captions` field to an Option value (optional)
     pub fn maybe_captions(mut self, value: Option<Vec<video::Caption<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -848,12 +851,12 @@ impl<'a, S: video_state::State> VideoBuilder<'a, S> {
 impl<'a, S: video_state::State> VideoBuilder<'a, S> {
     /// Set the `dimensions` field (optional)
     pub fn dimensions(mut self, value: impl Into<Option<VideoDimensions<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `dimensions` field to an Option value (optional)
     pub fn maybe_dimensions(mut self, value: Option<VideoDimensions<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -861,12 +864,12 @@ impl<'a, S: video_state::State> VideoBuilder<'a, S> {
 impl<'a, S: video_state::State> VideoBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -881,11 +884,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> VideoBuilder<'a, video_state::SetVideo<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         VideoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -898,11 +901,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Video<'a> {
         Video {
-            alt: self.__unsafe_private_named.0,
-            captions: self.__unsafe_private_named.1,
-            dimensions: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3,
-            video: self.__unsafe_private_named.4.unwrap(),
+            alt: self._fields.0,
+            captions: self._fields.1,
+            dimensions: self._fields.2,
+            name: self._fields.3,
+            video: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -915,11 +918,11 @@ where
         >,
     ) -> Video<'a> {
         Video {
-            alt: self.__unsafe_private_named.0,
-            captions: self.__unsafe_private_named.1,
-            dimensions: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3,
-            video: self.__unsafe_private_named.4.unwrap(),
+            alt: self._fields.0,
+            captions: self._fields.1,
+            dimensions: self._fields.2,
+            name: self._fields.3,
+            video: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -971,8 +974,8 @@ pub mod view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ViewBuilder<'a, S: view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Cid<'a>>,
         Option<ViewDimensions<'a>>,
@@ -980,7 +983,7 @@ pub struct ViewBuilder<'a, S: view_state::State> {
         Option<UriValue<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> View<'a> {
@@ -994,9 +997,9 @@ impl<'a> ViewBuilder<'a, view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1004,12 +1007,12 @@ impl<'a> ViewBuilder<'a, view_state::Empty> {
 impl<'a, S: view_state::State> ViewBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1024,11 +1027,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> ViewBuilder<'a, view_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1036,12 +1039,12 @@ where
 impl<'a, S: view_state::State> ViewBuilder<'a, S> {
     /// Set the `dimensions` field (optional)
     pub fn dimensions(mut self, value: impl Into<Option<ViewDimensions<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `dimensions` field to an Option value (optional)
     pub fn maybe_dimensions(mut self, value: Option<ViewDimensions<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1049,12 +1052,12 @@ impl<'a, S: view_state::State> ViewBuilder<'a, S> {
 impl<'a, S: view_state::State> ViewBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1069,11 +1072,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ViewBuilder<'a, view_state::SetPlaylist<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1081,12 +1084,12 @@ where
 impl<'a, S: view_state::State> ViewBuilder<'a, S> {
     /// Set the `thumbnail` field (optional)
     pub fn thumbnail(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1100,12 +1103,12 @@ where
     /// Build the final struct
     pub fn build(self) -> View<'a> {
         View {
-            alt: self.__unsafe_private_named.0,
-            cid: self.__unsafe_private_named.1.unwrap(),
-            dimensions: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3,
-            playlist: self.__unsafe_private_named.4.unwrap(),
-            thumbnail: self.__unsafe_private_named.5,
+            alt: self._fields.0,
+            cid: self._fields.1.unwrap(),
+            dimensions: self._fields.2,
+            name: self._fields.3,
+            playlist: self._fields.4.unwrap(),
+            thumbnail: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -1118,12 +1121,12 @@ where
         >,
     ) -> View<'a> {
         View {
-            alt: self.__unsafe_private_named.0,
-            cid: self.__unsafe_private_named.1.unwrap(),
-            dimensions: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3,
-            playlist: self.__unsafe_private_named.4.unwrap(),
-            thumbnail: self.__unsafe_private_named.5,
+            alt: self._fields.0,
+            cid: self._fields.1.unwrap(),
+            dimensions: self._fields.2,
+            name: self._fields.3,
+            playlist: self._fields.4.unwrap(),
+            thumbnail: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/graph.rs b/crates/jacquard-api/src/sh_weaver/graph.rs
index adb7e23b..1d71ef22 100644
--- a/crates/jacquard-api/src/sh_weaver/graph.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph.rs
@@ -31,7 +31,11 @@ pub mod subscribe;
 pub mod subscribe_accept;
 pub mod tag;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -433,9 +437,9 @@ pub mod community_tag_count_state {
 
 /// Builder for constructing an instance of this type
 pub struct CommunityTagCountBuilder<'a, S: community_tag_count_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CommunityTagCount<'a> {
@@ -449,9 +453,9 @@ impl<'a> CommunityTagCountBuilder<'a, community_tag_count_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommunityTagCountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -466,11 +470,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CommunityTagCountBuilder<'a, community_tag_count_state::SetCount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommunityTagCountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -485,11 +489,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CommunityTagCountBuilder<'a, community_tag_count_state::SetTag<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommunityTagCountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -503,8 +507,8 @@ where
     /// Build the final struct
     pub fn build(self) -> CommunityTagCount<'a> {
         CommunityTagCount {
-            count: self.__unsafe_private_named.0.unwrap(),
-            tag: self.__unsafe_private_named.1.unwrap(),
+            count: self._fields.0.unwrap(),
+            tag: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -517,8 +521,8 @@ where
         >,
     ) -> CommunityTagCount<'a> {
         CommunityTagCount {
-            count: self.__unsafe_private_named.0.unwrap(),
-            tag: self.__unsafe_private_named.1.unwrap(),
+            count: self._fields.0.unwrap(),
+            tag: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -930,13 +934,9 @@ pub mod list_item_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListItemViewBuilder<'a, S: list_item_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<ListItemViewSubject<'a>>,
-        Option<AtUri<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<ListItemViewSubject<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListItemView<'a> {
@@ -950,9 +950,9 @@ impl<'a> ListItemViewBuilder<'a, list_item_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListItemViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -960,12 +960,12 @@ impl<'a> ListItemViewBuilder<'a, list_item_view_state::Empty> {
 impl<'a, S: list_item_view_state::State> ListItemViewBuilder<'a, S> {
     /// Set the `addedAt` field (optional)
     pub fn added_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `addedAt` field to an Option value (optional)
     pub fn maybe_added_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -980,11 +980,11 @@ where
         mut self,
         value: impl Into<ListItemViewSubject<'a>>,
     ) -> ListItemViewBuilder<'a, list_item_view_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListItemViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -999,11 +999,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListItemViewBuilder<'a, list_item_view_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ListItemViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1017,9 +1017,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ListItemView<'a> {
         ListItemView {
-            added_at: self.__unsafe_private_named.0,
-            subject: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            added_at: self._fields.0,
+            subject: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1032,9 +1032,9 @@ where
         >,
     ) -> ListItemView<'a> {
         ListItemView {
-            added_at: self.__unsafe_private_named.0,
-            subject: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            added_at: self._fields.0,
+            subject: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1050,134 +1050,134 @@ pub mod list_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Cid;
+        type Uri;
         type Name;
         type Creator;
-        type Uri;
-        type Cid;
-        type Purpose;
         type ItemCount;
         type IndexedAt;
+        type Purpose;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Cid = Unset;
+        type Uri = Unset;
         type Name = Unset;
         type Creator = Unset;
-        type Uri = Unset;
-        type Cid = Unset;
-        type Purpose = Unset;
         type ItemCount = Unset;
         type IndexedAt = Unset;
+        type Purpose = Unset;
     }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Creator = S::Creator;
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Cid = Set<members::cid>;
         type Uri = S::Uri;
-        type Cid = S::Cid;
-        type Purpose = S::Purpose;
-        type ItemCount = S::ItemCount;
-        type IndexedAt = S::IndexedAt;
-    }
-    ///State transition - sets the `creator` field to Set
-    pub struct SetCreator<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreator<S> {}
-    impl<S: State> State for SetCreator<S> {
         type Name = S::Name;
-        type Creator = Set<members::creator>;
-        type Uri = S::Uri;
-        type Cid = S::Cid;
-        type Purpose = S::Purpose;
+        type Creator = S::Creator;
         type ItemCount = S::ItemCount;
         type IndexedAt = S::IndexedAt;
+        type Purpose = S::Purpose;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
+        type Cid = S::Cid;
+        type Uri = Set<members::uri>;
         type Name = S::Name;
         type Creator = S::Creator;
-        type Uri = Set<members::uri>;
-        type Cid = S::Cid;
-        type Purpose = S::Purpose;
         type ItemCount = S::ItemCount;
         type IndexedAt = S::IndexedAt;
+        type Purpose = S::Purpose;
     }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type Name = S::Name;
-        type Creator = S::Creator;
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Cid = S::Cid;
         type Uri = S::Uri;
-        type Cid = Set<members::cid>;
-        type Purpose = S::Purpose;
+        type Name = Set<members::name>;
+        type Creator = S::Creator;
         type ItemCount = S::ItemCount;
         type IndexedAt = S::IndexedAt;
+        type Purpose = S::Purpose;
     }
-    ///State transition - sets the `purpose` field to Set
-    pub struct SetPurpose<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPurpose<S> {}
-    impl<S: State> State for SetPurpose<S> {
-        type Name = S::Name;
-        type Creator = S::Creator;
-        type Uri = S::Uri;
+    ///State transition - sets the `creator` field to Set
+    pub struct SetCreator<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreator<S> {}
+    impl<S: State> State for SetCreator<S> {
         type Cid = S::Cid;
-        type Purpose = Set<members::purpose>;
+        type Uri = S::Uri;
+        type Name = S::Name;
+        type Creator = Set<members::creator>;
         type ItemCount = S::ItemCount;
         type IndexedAt = S::IndexedAt;
+        type Purpose = S::Purpose;
     }
     ///State transition - sets the `item_count` field to Set
     pub struct SetItemCount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetItemCount<S> {}
     impl<S: State> State for SetItemCount<S> {
+        type Cid = S::Cid;
+        type Uri = S::Uri;
         type Name = S::Name;
         type Creator = S::Creator;
-        type Uri = S::Uri;
-        type Cid = S::Cid;
-        type Purpose = S::Purpose;
         type ItemCount = Set<members::item_count>;
         type IndexedAt = S::IndexedAt;
+        type Purpose = S::Purpose;
     }
     ///State transition - sets the `indexed_at` field to Set
     pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
     impl<S: State> State for SetIndexedAt<S> {
+        type Cid = S::Cid;
+        type Uri = S::Uri;
         type Name = S::Name;
         type Creator = S::Creator;
-        type Uri = S::Uri;
-        type Cid = S::Cid;
-        type Purpose = S::Purpose;
         type ItemCount = S::ItemCount;
         type IndexedAt = Set<members::indexed_at>;
+        type Purpose = S::Purpose;
+    }
+    ///State transition - sets the `purpose` field to Set
+    pub struct SetPurpose<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPurpose<S> {}
+    impl<S: State> State for SetPurpose<S> {
+        type Cid = S::Cid;
+        type Uri = S::Uri;
+        type Name = S::Name;
+        type Creator = S::Creator;
+        type ItemCount = S::ItemCount;
+        type IndexedAt = S::IndexedAt;
+        type Purpose = Set<members::purpose>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `cid` field
+        pub struct cid(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
         ///Marker type for the `name` field
         pub struct name(());
         ///Marker type for the `creator` field
         pub struct creator(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
-        ///Marker type for the `purpose` field
-        pub struct purpose(());
         ///Marker type for the `item_count` field
         pub struct item_count(());
         ///Marker type for the `indexed_at` field
         pub struct indexed_at(());
+        ///Marker type for the `purpose` field
+        pub struct purpose(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ListViewBuilder<'a, S: list_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<UriValue<'a>>,
         Option<Cid<'a>>,
         Option<ProfileViewBasic<'a>>,
@@ -1189,7 +1189,7 @@ pub struct ListViewBuilder<'a, S: list_view_state::State> {
         Option<AtUri<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListView<'a> {
@@ -1203,20 +1203,9 @@ impl<'a> ListViewBuilder<'a, list_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1224,12 +1213,12 @@ impl<'a> ListViewBuilder<'a, list_view_state::Empty> {
 impl<'a, S: list_view_state::State> ListViewBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1244,11 +1233,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> ListViewBuilder<'a, list_view_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1263,11 +1252,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> ListViewBuilder<'a, list_view_state::SetCreator<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1275,12 +1264,12 @@ where
 impl<'a, S: list_view_state::State> ListViewBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1295,11 +1284,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListViewBuilder<'a, list_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1314,11 +1303,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ListViewBuilder<'a, list_view_state::SetItemCount<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1333,11 +1322,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ListViewBuilder<'a, list_view_state::SetName<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1352,11 +1341,11 @@ where
         mut self,
         value: impl Into<graph::ListPurpose<'a>>,
     ) -> ListViewBuilder<'a, list_view_state::SetPurpose<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1371,11 +1360,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListViewBuilder<'a, list_view_state::SetUri<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         ListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1383,12 +1372,12 @@ where
 impl<'a, S: list_view_state::State> ListViewBuilder<'a, S> {
     /// Set the `viewerSubscribed` field (optional)
     pub fn viewer_subscribed(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `viewerSubscribed` field to an Option value (optional)
     pub fn maybe_viewer_subscribed(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -1396,27 +1385,27 @@ impl<'a, S: list_view_state::State> ListViewBuilder<'a, S> {
 impl<'a, S> ListViewBuilder<'a, S>
 where
     S: list_view_state::State,
+    S::Cid: list_view_state::IsSet,
+    S::Uri: list_view_state::IsSet,
     S::Name: list_view_state::IsSet,
     S::Creator: list_view_state::IsSet,
-    S::Uri: list_view_state::IsSet,
-    S::Cid: list_view_state::IsSet,
-    S::Purpose: list_view_state::IsSet,
     S::ItemCount: list_view_state::IsSet,
     S::IndexedAt: list_view_state::IsSet,
+    S::Purpose: list_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ListView<'a> {
         ListView {
-            avatar: self.__unsafe_private_named.0,
-            cid: self.__unsafe_private_named.1.unwrap(),
-            creator: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            indexed_at: self.__unsafe_private_named.4.unwrap(),
-            item_count: self.__unsafe_private_named.5.unwrap(),
-            name: self.__unsafe_private_named.6.unwrap(),
-            purpose: self.__unsafe_private_named.7.unwrap(),
-            uri: self.__unsafe_private_named.8.unwrap(),
-            viewer_subscribed: self.__unsafe_private_named.9,
+            avatar: self._fields.0,
+            cid: self._fields.1.unwrap(),
+            creator: self._fields.2.unwrap(),
+            description: self._fields.3,
+            indexed_at: self._fields.4.unwrap(),
+            item_count: self._fields.5.unwrap(),
+            name: self._fields.6.unwrap(),
+            purpose: self._fields.7.unwrap(),
+            uri: self._fields.8.unwrap(),
+            viewer_subscribed: self._fields.9,
             extra_data: Default::default(),
         }
     }
@@ -1429,16 +1418,16 @@ where
         >,
     ) -> ListView<'a> {
         ListView {
-            avatar: self.__unsafe_private_named.0,
-            cid: self.__unsafe_private_named.1.unwrap(),
-            creator: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            indexed_at: self.__unsafe_private_named.4.unwrap(),
-            item_count: self.__unsafe_private_named.5.unwrap(),
-            name: self.__unsafe_private_named.6.unwrap(),
-            purpose: self.__unsafe_private_named.7.unwrap(),
-            uri: self.__unsafe_private_named.8.unwrap(),
-            viewer_subscribed: self.__unsafe_private_named.9,
+            avatar: self._fields.0,
+            cid: self._fields.1.unwrap(),
+            creator: self._fields.2.unwrap(),
+            description: self._fields.3,
+            indexed_at: self._fields.4.unwrap(),
+            item_count: self._fields.5.unwrap(),
+            name: self._fields.6.unwrap(),
+            purpose: self._fields.7.unwrap(),
+            uri: self._fields.8.unwrap(),
+            viewer_subscribed: self._fields.9,
             extra_data: Some(extra_data),
         }
     }
@@ -1454,64 +1443,64 @@ pub mod resource_tags_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type CommunityTags;
         type Resource;
         type AuthorTags;
-        type CommunityTags;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type CommunityTags = Unset;
         type Resource = Unset;
         type AuthorTags = Unset;
-        type CommunityTags = Unset;
+    }
+    ///State transition - sets the `community_tags` field to Set
+    pub struct SetCommunityTags<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCommunityTags<S> {}
+    impl<S: State> State for SetCommunityTags<S> {
+        type CommunityTags = Set<members::community_tags>;
+        type Resource = S::Resource;
+        type AuthorTags = S::AuthorTags;
     }
     ///State transition - sets the `resource` field to Set
     pub struct SetResource<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetResource<S> {}
     impl<S: State> State for SetResource<S> {
+        type CommunityTags = S::CommunityTags;
         type Resource = Set<members::resource>;
         type AuthorTags = S::AuthorTags;
-        type CommunityTags = S::CommunityTags;
     }
     ///State transition - sets the `author_tags` field to Set
     pub struct SetAuthorTags<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthorTags<S> {}
     impl<S: State> State for SetAuthorTags<S> {
-        type Resource = S::Resource;
-        type AuthorTags = Set<members::author_tags>;
         type CommunityTags = S::CommunityTags;
-    }
-    ///State transition - sets the `community_tags` field to Set
-    pub struct SetCommunityTags<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCommunityTags<S> {}
-    impl<S: State> State for SetCommunityTags<S> {
         type Resource = S::Resource;
-        type AuthorTags = S::AuthorTags;
-        type CommunityTags = Set<members::community_tags>;
+        type AuthorTags = Set<members::author_tags>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `community_tags` field
+        pub struct community_tags(());
         ///Marker type for the `resource` field
         pub struct resource(());
         ///Marker type for the `author_tags` field
         pub struct author_tags(());
-        ///Marker type for the `community_tags` field
-        pub struct community_tags(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ResourceTagsViewBuilder<'a, S: resource_tags_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<CowStr<'a>>>,
         Option<Vec<graph::CommunityTagCount<'a>>>,
         Option<StrongRef<'a>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ResourceTagsView<'a> {
@@ -1525,9 +1514,9 @@ impl<'a> ResourceTagsViewBuilder<'a, resource_tags_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ResourceTagsViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1542,11 +1531,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> ResourceTagsViewBuilder<'a, resource_tags_view_state::SetAuthorTags<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ResourceTagsViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1561,11 +1550,11 @@ where
         mut self,
         value: impl Into<Vec<graph::CommunityTagCount<'a>>>,
     ) -> ResourceTagsViewBuilder<'a, resource_tags_view_state::SetCommunityTags<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ResourceTagsViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1580,11 +1569,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ResourceTagsViewBuilder<'a, resource_tags_view_state::SetResource<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ResourceTagsViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1595,12 +1584,12 @@ impl<'a, S: resource_tags_view_state::State> ResourceTagsViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<CowStr<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `viewerAppliedTags` field to an Option value (optional)
     pub fn maybe_viewer_applied_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1608,17 +1597,17 @@ impl<'a, S: resource_tags_view_state::State> ResourceTagsViewBuilder<'a, S> {
 impl<'a, S> ResourceTagsViewBuilder<'a, S>
 where
     S: resource_tags_view_state::State,
+    S::CommunityTags: resource_tags_view_state::IsSet,
     S::Resource: resource_tags_view_state::IsSet,
     S::AuthorTags: resource_tags_view_state::IsSet,
-    S::CommunityTags: resource_tags_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ResourceTagsView<'a> {
         ResourceTagsView {
-            author_tags: self.__unsafe_private_named.0.unwrap(),
-            community_tags: self.__unsafe_private_named.1.unwrap(),
-            resource: self.__unsafe_private_named.2.unwrap(),
-            viewer_applied_tags: self.__unsafe_private_named.3,
+            author_tags: self._fields.0.unwrap(),
+            community_tags: self._fields.1.unwrap(),
+            resource: self._fields.2.unwrap(),
+            viewer_applied_tags: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -1631,10 +1620,10 @@ where
         >,
     ) -> ResourceTagsView<'a> {
         ResourceTagsView {
-            author_tags: self.__unsafe_private_named.0.unwrap(),
-            community_tags: self.__unsafe_private_named.1.unwrap(),
-            resource: self.__unsafe_private_named.2.unwrap(),
-            viewer_applied_tags: self.__unsafe_private_named.3,
+            author_tags: self._fields.0.unwrap(),
+            community_tags: self._fields.1.unwrap(),
+            resource: self._fields.2.unwrap(),
+            viewer_applied_tags: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -1650,80 +1639,80 @@ pub mod tag_application_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
+        type AppliedBy;
         type Uri;
+        type CreatedAt;
         type Tag;
-        type AppliedBy;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
+        type AppliedBy = Unset;
         type Uri = Unset;
+        type CreatedAt = Unset;
         type Tag = Unset;
-        type AppliedBy = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
+    ///State transition - sets the `applied_by` field to Set
+    pub struct SetAppliedBy<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAppliedBy<S> {}
+    impl<S: State> State for SetAppliedBy<S> {
+        type AppliedBy = Set<members::applied_by>;
         type Uri = S::Uri;
+        type CreatedAt = S::CreatedAt;
         type Tag = S::Tag;
-        type AppliedBy = S::AppliedBy;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type CreatedAt = S::CreatedAt;
+        type AppliedBy = S::AppliedBy;
         type Uri = Set<members::uri>;
+        type CreatedAt = S::CreatedAt;
         type Tag = S::Tag;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
         type AppliedBy = S::AppliedBy;
+        type Uri = S::Uri;
+        type CreatedAt = Set<members::created_at>;
+        type Tag = S::Tag;
     }
     ///State transition - sets the `tag` field to Set
     pub struct SetTag<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTag<S> {}
     impl<S: State> State for SetTag<S> {
-        type CreatedAt = S::CreatedAt;
-        type Uri = S::Uri;
-        type Tag = Set<members::tag>;
         type AppliedBy = S::AppliedBy;
-    }
-    ///State transition - sets the `applied_by` field to Set
-    pub struct SetAppliedBy<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAppliedBy<S> {}
-    impl<S: State> State for SetAppliedBy<S> {
-        type CreatedAt = S::CreatedAt;
         type Uri = S::Uri;
-        type Tag = S::Tag;
-        type AppliedBy = Set<members::applied_by>;
+        type CreatedAt = S::CreatedAt;
+        type Tag = Set<members::tag>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
+        ///Marker type for the `applied_by` field
+        pub struct applied_by(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `tag` field
         pub struct tag(());
-        ///Marker type for the `applied_by` field
-        pub struct applied_by(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TagApplicationViewBuilder<'a, S: tag_application_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TagApplicationView<'a> {
@@ -1737,9 +1726,9 @@ impl<'a> TagApplicationViewBuilder<'a, tag_application_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TagApplicationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1754,11 +1743,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> TagApplicationViewBuilder<'a, tag_application_view_state::SetAppliedBy<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TagApplicationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1773,11 +1762,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TagApplicationViewBuilder<'a, tag_application_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TagApplicationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1792,11 +1781,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TagApplicationViewBuilder<'a, tag_application_view_state::SetTag<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TagApplicationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1811,11 +1800,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> TagApplicationViewBuilder<'a, tag_application_view_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TagApplicationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1823,18 +1812,18 @@ where
 impl<'a, S> TagApplicationViewBuilder<'a, S>
 where
     S: tag_application_view_state::State,
-    S::CreatedAt: tag_application_view_state::IsSet,
+    S::AppliedBy: tag_application_view_state::IsSet,
     S::Uri: tag_application_view_state::IsSet,
+    S::CreatedAt: tag_application_view_state::IsSet,
     S::Tag: tag_application_view_state::IsSet,
-    S::AppliedBy: tag_application_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TagApplicationView<'a> {
         TagApplicationView {
-            applied_by: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            tag: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            applied_by: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            tag: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1847,10 +1836,10 @@ where
         >,
     ) -> TagApplicationView<'a> {
         TagApplicationView {
-            applied_by: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            tag: self.__unsafe_private_named.2.unwrap(),
-            uri: self.__unsafe_private_named.3.unwrap(),
+            applied_by: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            tag: self._fields.2.unwrap(),
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1902,8 +1891,8 @@ pub mod tag_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct TagViewBuilder<'a, S: tag_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<i64>,
         Option<i64>,
@@ -1911,7 +1900,7 @@ pub struct TagViewBuilder<'a, S: tag_view_state::State> {
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TagView<'a> {
@@ -1925,9 +1914,9 @@ impl<'a> TagViewBuilder<'a, tag_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TagViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1935,12 +1924,12 @@ impl<'a> TagViewBuilder<'a, tag_view_state::Empty> {
 impl<'a, S: tag_view_state::State> TagViewBuilder<'a, S> {
     /// Set the `entryCount` field (optional)
     pub fn entry_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `entryCount` field to an Option value (optional)
     pub fn maybe_entry_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1948,12 +1937,12 @@ impl<'a, S: tag_view_state::State> TagViewBuilder<'a, S> {
 impl<'a, S: tag_view_state::State> TagViewBuilder<'a, S> {
     /// Set the `notebookCount` field (optional)
     pub fn notebook_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `notebookCount` field to an Option value (optional)
     pub fn maybe_notebook_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1961,12 +1950,12 @@ impl<'a, S: tag_view_state::State> TagViewBuilder<'a, S> {
 impl<'a, S: tag_view_state::State> TagViewBuilder<'a, S> {
     /// Set the `recentUseCount` field (optional)
     pub fn recent_use_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `recentUseCount` field to an Option value (optional)
     pub fn maybe_recent_use_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1981,11 +1970,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TagViewBuilder<'a, tag_view_state::SetTag<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TagViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1993,12 +1982,12 @@ where
 impl<'a, S: tag_view_state::State> TagViewBuilder<'a, S> {
     /// Set the `trendingScore` field (optional)
     pub fn trending_score(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `trendingScore` field to an Option value (optional)
     pub fn maybe_trending_score(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -2013,11 +2002,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> TagViewBuilder<'a, tag_view_state::SetUseCount<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         TagViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2031,12 +2020,12 @@ where
     /// Build the final struct
     pub fn build(self) -> TagView<'a> {
         TagView {
-            entry_count: self.__unsafe_private_named.0,
-            notebook_count: self.__unsafe_private_named.1,
-            recent_use_count: self.__unsafe_private_named.2,
-            tag: self.__unsafe_private_named.3.unwrap(),
-            trending_score: self.__unsafe_private_named.4,
-            use_count: self.__unsafe_private_named.5.unwrap(),
+            entry_count: self._fields.0,
+            notebook_count: self._fields.1,
+            recent_use_count: self._fields.2,
+            tag: self._fields.3.unwrap(),
+            trending_score: self._fields.4,
+            use_count: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2049,12 +2038,12 @@ where
         >,
     ) -> TagView<'a> {
         TagView {
-            entry_count: self.__unsafe_private_named.0,
-            notebook_count: self.__unsafe_private_named.1,
-            recent_use_count: self.__unsafe_private_named.2,
-            tag: self.__unsafe_private_named.3.unwrap(),
-            trending_score: self.__unsafe_private_named.4,
-            use_count: self.__unsafe_private_named.5.unwrap(),
+            entry_count: self._fields.0,
+            notebook_count: self._fields.1,
+            recent_use_count: self._fields.2,
+            tag: self._fields.3.unwrap(),
+            trending_score: self._fields.4,
+            use_count: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/graph/bookmark.rs b/crates/jacquard-api/src/sh_weaver/graph/bookmark.rs
index 542acaef..e3d29000 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/bookmark.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/bookmark.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -136,49 +139,45 @@ pub mod bookmark_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subject;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subject = S::Subject;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BookmarkBuilder<'a, S: bookmark_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<CowStr<'a>>,
-        Option<StrongRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Bookmark<'a> {
@@ -192,9 +191,9 @@ impl<'a> BookmarkBuilder<'a, bookmark_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,11 +208,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BookmarkBuilder<'a, bookmark_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,12 +220,12 @@ where
 impl<'a, S: bookmark_state::State> BookmarkBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -241,11 +240,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> BookmarkBuilder<'a, bookmark_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,15 +252,15 @@ where
 impl<'a, S> BookmarkBuilder<'a, S>
 where
     S: bookmark_state::State,
-    S::CreatedAt: bookmark_state::IsSet,
     S::Subject: bookmark_state::IsSet,
+    S::CreatedAt: bookmark_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Bookmark<'a> {
         Bookmark {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            note: self.__unsafe_private_named.1,
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            note: self._fields.1,
+            subject: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -274,9 +273,9 @@ where
         >,
     ) -> Bookmark<'a> {
         Bookmark {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            note: self.__unsafe_private_named.1,
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            note: self._fields.1,
+            subject: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/graph/follow.rs b/crates/jacquard-api/src/sh_weaver/graph/follow.rs
index 413e3440..a9e08486 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/follow.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/follow.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -145,9 +148,9 @@ pub mod follow_state {
 
 /// Builder for constructing an instance of this type
 pub struct FollowBuilder<'a, S: follow_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Follow<'a> {
@@ -161,9 +164,9 @@ impl<'a> FollowBuilder<'a, follow_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FollowBuilder<'a, follow_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> FollowBuilder<'a, follow_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,8 +218,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -229,8 +232,8 @@ where
         >,
     ) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/graph/follow_accept.rs b/crates/jacquard-api/src/sh_weaver/graph/follow_accept.rs
index 8cacd790..5371f21b 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/follow_accept.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/follow_accept.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,9 +149,9 @@ pub mod follow_accept_state {
 
 /// Builder for constructing an instance of this type
 pub struct FollowAcceptBuilder<'a, S: follow_accept_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> FollowAccept<'a> {
@@ -162,9 +165,9 @@ impl<'a> FollowAcceptBuilder<'a, follow_accept_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FollowAcceptBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FollowAcceptBuilder<'a, follow_accept_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FollowAcceptBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> FollowAcceptBuilder<'a, follow_accept_state::SetFollow<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FollowAcceptBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,8 +219,8 @@ where
     /// Build the final struct
     pub fn build(self) -> FollowAccept<'a> {
         FollowAccept {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            follow: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            follow: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> FollowAccept<'a> {
         FollowAccept {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            follow: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            follow: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/graph/follow_gate.rs b/crates/jacquard-api/src/sh_weaver/graph/follow_gate.rs
index 2efb3078..019203c4 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/follow_gate.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/follow_gate.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,9 +149,9 @@ pub mod follow_gate_state {
 
 /// Builder for constructing an instance of this type
 pub struct FollowGateBuilder<'a, S: follow_gate_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<bool>, Option<bool>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<bool>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> FollowGate<'a> {
@@ -162,9 +165,9 @@ impl<'a> FollowGateBuilder<'a, follow_gate_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FollowGateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FollowGateBuilder<'a, follow_gate_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FollowGateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -191,12 +194,12 @@ where
 impl<'a, S: follow_gate_state::State> FollowGateBuilder<'a, S> {
     /// Set the `invalidatePrior` field (optional)
     pub fn invalidate_prior(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `invalidatePrior` field to an Option value (optional)
     pub fn maybe_invalidate_prior(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -204,12 +207,12 @@ impl<'a, S: follow_gate_state::State> FollowGateBuilder<'a, S> {
 impl<'a, S: follow_gate_state::State> FollowGateBuilder<'a, S> {
     /// Set the `requireApproval` field (optional)
     pub fn require_approval(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `requireApproval` field to an Option value (optional)
     pub fn maybe_require_approval(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -222,9 +225,9 @@ where
     /// Build the final struct
     pub fn build(self) -> FollowGate<'a> {
         FollowGate {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            invalidate_prior: self.__unsafe_private_named.1.or_else(|| Some(false)),
-            require_approval: self.__unsafe_private_named.2.or_else(|| Some(false)),
+            created_at: self._fields.0.unwrap(),
+            invalidate_prior: self._fields.1.or_else(|| Some(false)),
+            require_approval: self._fields.2.or_else(|| Some(false)),
             extra_data: Default::default(),
         }
     }
@@ -237,9 +240,9 @@ where
         >,
     ) -> FollowGate<'a> {
         FollowGate {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            invalidate_prior: self.__unsafe_private_named.1.or_else(|| Some(false)),
-            require_approval: self.__unsafe_private_named.2.or_else(|| Some(false)),
+            created_at: self._fields.0.unwrap(),
+            invalidate_prior: self._fields.1.or_else(|| Some(false)),
+            require_approval: self._fields.2.or_else(|| Some(false)),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/graph/get_actor_bookmarks.rs b/crates/jacquard-api/src/sh_weaver/graph/get_actor_bookmarks.rs
index a3aea021..cf3a8888 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/get_actor_bookmarks.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/get_actor_bookmarks.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -101,9 +104,9 @@ pub mod get_actor_bookmarks_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorBookmarksBuilder<'a, S: get_actor_bookmarks_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorBookmarks<'a> {
@@ -117,9 +120,9 @@ impl<'a> GetActorBookmarksBuilder<'a, get_actor_bookmarks_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorBookmarksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -134,11 +137,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorBookmarksBuilder<'a, get_actor_bookmarks_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorBookmarksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -146,12 +149,12 @@ where
 impl<'a, S: get_actor_bookmarks_state::State> GetActorBookmarksBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -159,12 +162,12 @@ impl<'a, S: get_actor_bookmarks_state::State> GetActorBookmarksBuilder<'a, S> {
 impl<'a, S: get_actor_bookmarks_state::State> GetActorBookmarksBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -177,9 +180,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorBookmarks<'a> {
         GetActorBookmarks {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/graph/get_actor_likes.rs b/crates/jacquard-api/src/sh_weaver/graph/get_actor_likes.rs
index e7083fc8..6dff8970 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/get_actor_likes.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/get_actor_likes.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -101,9 +104,9 @@ pub mod get_actor_likes_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorLikesBuilder<'a, S: get_actor_likes_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorLikes<'a> {
@@ -117,9 +120,9 @@ impl<'a> GetActorLikesBuilder<'a, get_actor_likes_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorLikesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -134,11 +137,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorLikesBuilder<'a, get_actor_likes_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorLikesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -146,12 +149,12 @@ where
 impl<'a, S: get_actor_likes_state::State> GetActorLikesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -159,12 +162,12 @@ impl<'a, S: get_actor_likes_state::State> GetActorLikesBuilder<'a, S> {
 impl<'a, S: get_actor_likes_state::State> GetActorLikesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -177,9 +180,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorLikes<'a> {
         GetActorLikes {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/graph/get_actor_lists.rs b/crates/jacquard-api/src/sh_weaver/graph/get_actor_lists.rs
index 74cb5cbf..5328d0fd 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/get_actor_lists.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/get_actor_lists.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -104,14 +107,14 @@ pub mod get_actor_lists_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorListsBuilder<'a, S: get_actor_lists_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorLists<'a> {
@@ -125,9 +128,9 @@ impl<'a> GetActorListsBuilder<'a, get_actor_lists_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorListsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,11 +145,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorListsBuilder<'a, get_actor_lists_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorListsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -154,12 +157,12 @@ where
 impl<'a, S: get_actor_lists_state::State> GetActorListsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -167,12 +170,12 @@ impl<'a, S: get_actor_lists_state::State> GetActorListsBuilder<'a, S> {
 impl<'a, S: get_actor_lists_state::State> GetActorListsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -180,12 +183,12 @@ impl<'a, S: get_actor_lists_state::State> GetActorListsBuilder<'a, S> {
 impl<'a, S: get_actor_lists_state::State> GetActorListsBuilder<'a, S> {
     /// Set the `purpose` field (optional)
     pub fn purpose(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `purpose` field to an Option value (optional)
     pub fn maybe_purpose(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -198,10 +201,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorLists<'a> {
         GetActorLists {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            purpose: self.__unsafe_private_named.3,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
+            purpose: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/graph/get_actor_subscriptions.rs b/crates/jacquard-api/src/sh_weaver/graph/get_actor_subscriptions.rs
index b7a9e217..d6c7e756 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/get_actor_subscriptions.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/get_actor_subscriptions.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -101,9 +104,9 @@ pub mod get_actor_subscriptions_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetActorSubscriptionsBuilder<'a, S: get_actor_subscriptions_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetActorSubscriptions<'a> {
@@ -120,9 +123,9 @@ impl<'a> GetActorSubscriptionsBuilder<'a, get_actor_subscriptions_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetActorSubscriptionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,11 +140,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetActorSubscriptionsBuilder<'a, get_actor_subscriptions_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetActorSubscriptionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,12 +152,12 @@ where
 impl<'a, S: get_actor_subscriptions_state::State> GetActorSubscriptionsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -162,12 +165,12 @@ impl<'a, S: get_actor_subscriptions_state::State> GetActorSubscriptionsBuilder<'
 impl<'a, S: get_actor_subscriptions_state::State> GetActorSubscriptionsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -180,9 +183,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetActorSubscriptions<'a> {
         GetActorSubscriptions {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/graph/get_bookmarked_by.rs b/crates/jacquard-api/src/sh_weaver/graph/get_bookmarked_by.rs
index 075f6596..f237b793 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/get_bookmarked_by.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/get_bookmarked_by.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{AtUri, Cid};
@@ -106,9 +109,9 @@ pub mod get_bookmarked_by_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetBookmarkedByBuilder<'a, S: get_bookmarked_by_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetBookmarkedBy<'a> {
@@ -122,9 +125,9 @@ impl<'a> GetBookmarkedByBuilder<'a, get_bookmarked_by_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetBookmarkedByBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -132,12 +135,12 @@ impl<'a> GetBookmarkedByBuilder<'a, get_bookmarked_by_state::Empty> {
 impl<'a, S: get_bookmarked_by_state::State> GetBookmarkedByBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -145,12 +148,12 @@ impl<'a, S: get_bookmarked_by_state::State> GetBookmarkedByBuilder<'a, S> {
 impl<'a, S: get_bookmarked_by_state::State> GetBookmarkedByBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -165,11 +168,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetBookmarkedByBuilder<'a, get_bookmarked_by_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetBookmarkedByBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,9 +185,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetBookmarkedBy<'a> {
         GetBookmarkedBy {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            subject: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            subject: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/graph/get_followers.rs b/crates/jacquard-api/src/sh_weaver/graph/get_followers.rs
index 9d6d2923..7ef898bf 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/get_followers.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/get_followers.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -103,9 +106,9 @@ pub mod get_followers_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFollowersBuilder<'a, S: get_followers_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFollowers<'a> {
@@ -119,9 +122,9 @@ impl<'a> GetFollowersBuilder<'a, get_followers_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFollowersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,11 +139,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetFollowersBuilder<'a, get_followers_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetFollowersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,12 +151,12 @@ where
 impl<'a, S: get_followers_state::State> GetFollowersBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -161,12 +164,12 @@ impl<'a, S: get_followers_state::State> GetFollowersBuilder<'a, S> {
 impl<'a, S: get_followers_state::State> GetFollowersBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -179,9 +182,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFollowers<'a> {
         GetFollowers {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/graph/get_following.rs b/crates/jacquard-api/src/sh_weaver/graph/get_following.rs
index 00732621..62e73216 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/get_following.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/get_following.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -103,9 +106,9 @@ pub mod get_following_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFollowingBuilder<'a, S: get_following_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFollowing<'a> {
@@ -119,9 +122,9 @@ impl<'a> GetFollowingBuilder<'a, get_following_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFollowingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,11 +139,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetFollowingBuilder<'a, get_following_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetFollowingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,12 +151,12 @@ where
 impl<'a, S: get_following_state::State> GetFollowingBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -161,12 +164,12 @@ impl<'a, S: get_following_state::State> GetFollowingBuilder<'a, S> {
 impl<'a, S: get_following_state::State> GetFollowingBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -179,9 +182,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFollowing<'a> {
         GetFollowing {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/graph/get_liked_by.rs b/crates/jacquard-api/src/sh_weaver/graph/get_liked_by.rs
index 7277e048..02be04ae 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/get_liked_by.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/get_liked_by.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{AtUri, Cid};
@@ -106,9 +109,9 @@ pub mod get_liked_by_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetLikedByBuilder<'a, S: get_liked_by_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetLikedBy<'a> {
@@ -122,9 +125,9 @@ impl<'a> GetLikedByBuilder<'a, get_liked_by_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetLikedByBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -132,12 +135,12 @@ impl<'a> GetLikedByBuilder<'a, get_liked_by_state::Empty> {
 impl<'a, S: get_liked_by_state::State> GetLikedByBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -145,12 +148,12 @@ impl<'a, S: get_liked_by_state::State> GetLikedByBuilder<'a, S> {
 impl<'a, S: get_liked_by_state::State> GetLikedByBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -165,11 +168,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetLikedByBuilder<'a, get_liked_by_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetLikedByBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,9 +185,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetLikedBy<'a> {
         GetLikedBy {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            subject: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            subject: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/graph/get_list.rs b/crates/jacquard-api/src/sh_weaver/graph/get_list.rs
index 37f6a66d..8397d64d 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/get_list.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/get_list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -140,9 +143,9 @@ pub mod get_list_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetListBuilder<'a, S: get_list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetList<'a> {
@@ -156,9 +159,9 @@ impl<'a> GetListBuilder<'a, get_list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -166,12 +169,12 @@ impl<'a> GetListBuilder<'a, get_list_state::Empty> {
 impl<'a, S: get_list_state::State> GetListBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -179,12 +182,12 @@ impl<'a, S: get_list_state::State> GetListBuilder<'a, S> {
 impl<'a, S: get_list_state::State> GetListBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -199,11 +202,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetListBuilder<'a, get_list_state::SetList<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,9 +219,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetList<'a> {
         GetList {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            list: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            list: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/graph/get_popular_tags.rs b/crates/jacquard-api/src/sh_weaver/graph/get_popular_tags.rs
index c7c8c733..12bbeb59 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/get_popular_tags.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/get_popular_tags.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -85,9 +88,9 @@ pub mod get_popular_tags_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetPopularTagsBuilder<'a, S: get_popular_tags_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetPopularTags<'a> {
@@ -101,9 +104,9 @@ impl<'a> GetPopularTagsBuilder<'a, get_popular_tags_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetPopularTagsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -111,12 +114,12 @@ impl<'a> GetPopularTagsBuilder<'a, get_popular_tags_state::Empty> {
 impl<'a, S: get_popular_tags_state::State> GetPopularTagsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -124,12 +127,12 @@ impl<'a, S: get_popular_tags_state::State> GetPopularTagsBuilder<'a, S> {
 impl<'a, S: get_popular_tags_state::State> GetPopularTagsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -141,8 +144,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetPopularTags<'a> {
         GetPopularTags {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/graph/get_resource_tags.rs b/crates/jacquard-api/src/sh_weaver/graph/get_resource_tags.rs
index cb8d037d..cc2c6136 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/get_resource_tags.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/get_resource_tags.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_resource_tags_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetResourceTagsBuilder<'a, S: get_resource_tags_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetResourceTags<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetResourceTagsBuilder<'a, get_resource_tags_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetResourceTagsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetResourceTagsBuilder<'a, get_resource_tags_state::SetResource<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetResourceTagsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetResourceTags<'a> {
         GetResourceTags {
-            resource: self.__unsafe_private_named.0.unwrap(),
+            resource: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/graph/get_subscribers.rs b/crates/jacquard-api/src/sh_weaver/graph/get_subscribers.rs
index 4167bdd5..55bf9d85 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/get_subscribers.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/get_subscribers.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -104,9 +107,9 @@ pub mod get_subscribers_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSubscribersBuilder<'a, S: get_subscribers_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSubscribers<'a> {
@@ -120,9 +123,9 @@ impl<'a> GetSubscribersBuilder<'a, get_subscribers_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSubscribersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -130,12 +133,12 @@ impl<'a> GetSubscribersBuilder<'a, get_subscribers_state::Empty> {
 impl<'a, S: get_subscribers_state::State> GetSubscribersBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -143,12 +146,12 @@ impl<'a, S: get_subscribers_state::State> GetSubscribersBuilder<'a, S> {
 impl<'a, S: get_subscribers_state::State> GetSubscribersBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -163,11 +166,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetSubscribersBuilder<'a, get_subscribers_state::SetNotebook<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetSubscribersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,9 +183,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSubscribers<'a> {
         GetSubscribers {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            notebook: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            notebook: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/graph/get_tag_suggestions.rs b/crates/jacquard-api/src/sh_weaver/graph/get_tag_suggestions.rs
index 793af9d6..6da3c34f 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/get_tag_suggestions.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/get_tag_suggestions.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_tag_suggestions_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTagSuggestionsBuilder<'a, S: get_tag_suggestions_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<CowStr<'a>>>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<CowStr<'a>>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetTagSuggestions<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetTagSuggestionsBuilder<'a, get_tag_suggestions_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTagSuggestionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -112,12 +115,12 @@ impl<'a> GetTagSuggestionsBuilder<'a, get_tag_suggestions_state::Empty> {
 impl<'a, S: get_tag_suggestions_state::State> GetTagSuggestionsBuilder<'a, S> {
     /// Set the `existingTags` field (optional)
     pub fn existing_tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `existingTags` field to an Option value (optional)
     pub fn maybe_existing_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -125,12 +128,12 @@ impl<'a, S: get_tag_suggestions_state::State> GetTagSuggestionsBuilder<'a, S> {
 impl<'a, S: get_tag_suggestions_state::State> GetTagSuggestionsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -138,12 +141,12 @@ impl<'a, S: get_tag_suggestions_state::State> GetTagSuggestionsBuilder<'a, S> {
 impl<'a, S: get_tag_suggestions_state::State> GetTagSuggestionsBuilder<'a, S> {
     /// Set the `query` field (optional)
     pub fn query(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `query` field to an Option value (optional)
     pub fn maybe_query(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -155,9 +158,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetTagSuggestions<'a> {
         GetTagSuggestions {
-            existing_tags: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            query: self.__unsafe_private_named.2,
+            existing_tags: self._fields.0,
+            limit: self._fields.1,
+            query: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/graph/get_tagged_resources.rs b/crates/jacquard-api/src/sh_weaver/graph/get_tagged_resources.rs
index 2aef57f2..be7c00d2 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/get_tagged_resources.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/get_tagged_resources.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -151,8 +154,8 @@ pub mod get_tagged_resources_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTaggedResourcesBuilder<'a, S: get_tagged_resources_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<bool>,
         Option<bool>,
@@ -161,7 +164,7 @@ pub struct GetTaggedResourcesBuilder<'a, S: get_tagged_resources_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetTaggedResources<'a> {
@@ -175,9 +178,9 @@ impl<'a> GetTaggedResourcesBuilder<'a, get_tagged_resources_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTaggedResourcesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -185,12 +188,12 @@ impl<'a> GetTaggedResourcesBuilder<'a, get_tagged_resources_state::Empty> {
 impl<'a, S: get_tagged_resources_state::State> GetTaggedResourcesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -198,12 +201,12 @@ impl<'a, S: get_tagged_resources_state::State> GetTaggedResourcesBuilder<'a, S>
 impl<'a, S: get_tagged_resources_state::State> GetTaggedResourcesBuilder<'a, S> {
     /// Set the `includeAuthorTags` field (optional)
     pub fn include_author_tags(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `includeAuthorTags` field to an Option value (optional)
     pub fn maybe_include_author_tags(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -211,12 +214,12 @@ impl<'a, S: get_tagged_resources_state::State> GetTaggedResourcesBuilder<'a, S>
 impl<'a, S: get_tagged_resources_state::State> GetTaggedResourcesBuilder<'a, S> {
     /// Set the `includeCommunityTags` field (optional)
     pub fn include_community_tags(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `includeCommunityTags` field to an Option value (optional)
     pub fn maybe_include_community_tags(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -224,12 +227,12 @@ impl<'a, S: get_tagged_resources_state::State> GetTaggedResourcesBuilder<'a, S>
 impl<'a, S: get_tagged_resources_state::State> GetTaggedResourcesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -237,12 +240,12 @@ impl<'a, S: get_tagged_resources_state::State> GetTaggedResourcesBuilder<'a, S>
 impl<'a, S: get_tagged_resources_state::State> GetTaggedResourcesBuilder<'a, S> {
     /// Set the `resourceType` field (optional)
     pub fn resource_type(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `resourceType` field to an Option value (optional)
     pub fn maybe_resource_type(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -250,12 +253,12 @@ impl<'a, S: get_tagged_resources_state::State> GetTaggedResourcesBuilder<'a, S>
 impl<'a, S: get_tagged_resources_state::State> GetTaggedResourcesBuilder<'a, S> {
     /// Set the `sort` field (optional)
     pub fn sort(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `sort` field to an Option value (optional)
     pub fn maybe_sort(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -270,11 +273,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetTaggedResourcesBuilder<'a, get_tagged_resources_state::SetTag<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         GetTaggedResourcesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -287,13 +290,13 @@ where
     /// Build the final struct
     pub fn build(self) -> GetTaggedResources<'a> {
         GetTaggedResources {
-            cursor: self.__unsafe_private_named.0,
-            include_author_tags: self.__unsafe_private_named.1,
-            include_community_tags: self.__unsafe_private_named.2,
-            limit: self.__unsafe_private_named.3,
-            resource_type: self.__unsafe_private_named.4,
-            sort: self.__unsafe_private_named.5,
-            tag: self.__unsafe_private_named.6.unwrap(),
+            cursor: self._fields.0,
+            include_author_tags: self._fields.1,
+            include_community_tags: self._fields.2,
+            limit: self._fields.3,
+            resource_type: self._fields.4,
+            sort: self._fields.5,
+            tag: self._fields.6.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/graph/get_trending_tags.rs b/crates/jacquard-api/src/sh_weaver/graph/get_trending_tags.rs
index d25417b6..72423b13 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/get_trending_tags.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/get_trending_tags.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
@@ -78,8 +81,8 @@ pub mod get_trending_tags_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTrendingTagsBuilder<S: get_trending_tags_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
 }
 
 impl GetTrendingTags {
@@ -93,8 +96,8 @@ impl GetTrendingTagsBuilder<get_trending_tags_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTrendingTagsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -102,12 +105,12 @@ impl GetTrendingTagsBuilder<get_trending_tags_state::Empty> {
 impl<S: get_trending_tags_state::State> GetTrendingTagsBuilder<S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -119,7 +122,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetTrendingTags {
         GetTrendingTags {
-            limit: self.__unsafe_private_named.0,
+            limit: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/graph/like.rs b/crates/jacquard-api/src/sh_weaver/graph/like.rs
index 1e3b1e19..2fa066b8 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/like.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -146,9 +149,9 @@ pub mod like_state {
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -162,9 +165,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,8 +219,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/graph/list.rs b/crates/jacquard-api/src/sh_weaver/graph/list.rs
index 68bf5543..5239eacf 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/list.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -292,64 +295,64 @@ pub mod list_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Name;
-        type CreatedAt;
         type Purpose;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Name = Unset;
-        type CreatedAt = Unset;
         type Purpose = Unset;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
         type Name = Set<members::name>;
-        type CreatedAt = S::CreatedAt;
-        type Purpose = S::Purpose;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type Name = S::Name;
-        type CreatedAt = Set<members::created_at>;
         type Purpose = S::Purpose;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `purpose` field to Set
     pub struct SetPurpose<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPurpose<S> {}
     impl<S: State> State for SetPurpose<S> {
         type Name = S::Name;
-        type CreatedAt = S::CreatedAt;
         type Purpose = Set<members::purpose>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Name = S::Name;
+        type Purpose = S::Purpose;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `purpose` field
         pub struct purpose(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ListBuilder<'a, S: list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<list::ListPurpose<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> List<'a> {
@@ -363,9 +366,9 @@ impl<'a> ListBuilder<'a, list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -373,12 +376,12 @@ impl<'a> ListBuilder<'a, list_state::Empty> {
 impl<'a, S: list_state::State> ListBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -393,11 +396,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListBuilder<'a, list_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -405,12 +408,12 @@ where
 impl<'a, S: list_state::State> ListBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -425,11 +428,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ListBuilder<'a, list_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -444,11 +447,11 @@ where
         mut self,
         value: impl Into<list::ListPurpose<'a>>,
     ) -> ListBuilder<'a, list_state::SetPurpose<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -457,17 +460,17 @@ impl<'a, S> ListBuilder<'a, S>
 where
     S: list_state::State,
     S::Name: list_state::IsSet,
-    S::CreatedAt: list_state::IsSet,
     S::Purpose: list_state::IsSet,
+    S::CreatedAt: list_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> List<'a> {
         List {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            purpose: self.__unsafe_private_named.4.unwrap(),
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            name: self._fields.3.unwrap(),
+            purpose: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -480,11 +483,11 @@ where
         >,
     ) -> List<'a> {
         List {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            purpose: self.__unsafe_private_named.4.unwrap(),
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            name: self._fields.3.unwrap(),
+            purpose: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/graph/listitem.rs b/crates/jacquard-api/src/sh_weaver/graph/listitem.rs
index e8941770..048b9bae 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/listitem.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/listitem.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -113,49 +116,49 @@ pub mod listitem_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type List;
+        type Subject;
         type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type List = Unset;
+        type Subject = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type List = S::List;
-        type CreatedAt = S::CreatedAt;
-    }
     ///State transition - sets the `list` field to Set
     pub struct SetList<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetList<S> {}
     impl<S: State> State for SetList<S> {
-        type Subject = S::Subject;
         type List = Set<members::list>;
+        type Subject = S::Subject;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type List = S::List;
+        type Subject = Set<members::subject>;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type List = S::List;
+        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `list` field
         pub struct list(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
     }
@@ -163,9 +166,9 @@ pub mod listitem_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListitemBuilder<'a, S: listitem_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Listitem<'a> {
@@ -179,9 +182,9 @@ impl<'a> ListitemBuilder<'a, listitem_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListitemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ListitemBuilder<'a, listitem_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListitemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ListitemBuilder<'a, listitem_state::SetList<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ListitemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ListitemBuilder<'a, listitem_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ListitemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -246,16 +249,16 @@ where
 impl<'a, S> ListitemBuilder<'a, S>
 where
     S: listitem_state::State,
-    S::Subject: listitem_state::IsSet,
     S::List: listitem_state::IsSet,
+    S::Subject: listitem_state::IsSet,
     S::CreatedAt: listitem_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Listitem<'a> {
         Listitem {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            list: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            list: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -268,9 +271,9 @@ where
         >,
     ) -> Listitem<'a> {
         Listitem {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            list: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            list: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/graph/subscribe.rs b/crates/jacquard-api/src/sh_weaver/graph/subscribe.rs
index 74862e1c..879875f6 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/subscribe.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/subscribe.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -109,45 +112,45 @@ pub mod subscribe_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Notebook;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Notebook = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Notebook = S::Notebook;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `notebook` field to Set
     pub struct SetNotebook<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetNotebook<S> {}
     impl<S: State> State for SetNotebook<S> {
-        type CreatedAt = S::CreatedAt;
         type Notebook = Set<members::notebook>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Notebook = S::Notebook;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `notebook` field
         pub struct notebook(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SubscribeBuilder<'a, S: subscribe_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Subscribe<'a> {
@@ -161,9 +164,9 @@ impl<'a> SubscribeBuilder<'a, subscribe_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubscribeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SubscribeBuilder<'a, subscribe_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SubscribeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SubscribeBuilder<'a, subscribe_state::SetNotebook<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SubscribeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,14 +212,14 @@ where
 impl<'a, S> SubscribeBuilder<'a, S>
 where
     S: subscribe_state::State,
-    S::CreatedAt: subscribe_state::IsSet,
     S::Notebook: subscribe_state::IsSet,
+    S::CreatedAt: subscribe_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Subscribe<'a> {
         Subscribe {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            notebook: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            notebook: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -229,8 +232,8 @@ where
         >,
     ) -> Subscribe<'a> {
         Subscribe {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            notebook: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            notebook: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/graph/subscribe_accept.rs b/crates/jacquard-api/src/sh_weaver/graph/subscribe_accept.rs
index 24f01d3a..8f48e772 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/subscribe_accept.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/subscribe_accept.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -110,45 +113,45 @@ pub mod subscribe_accept_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subscribe;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subscribe = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subscribe = S::Subscribe;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subscribe` field to Set
     pub struct SetSubscribe<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubscribe<S> {}
     impl<S: State> State for SetSubscribe<S> {
-        type CreatedAt = S::CreatedAt;
         type Subscribe = Set<members::subscribe>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subscribe = S::Subscribe;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subscribe` field
         pub struct subscribe(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SubscribeAcceptBuilder<'a, S: subscribe_accept_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SubscribeAccept<'a> {
@@ -162,9 +165,9 @@ impl<'a> SubscribeAcceptBuilder<'a, subscribe_accept_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubscribeAcceptBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,11 +182,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SubscribeAcceptBuilder<'a, subscribe_accept_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SubscribeAcceptBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> SubscribeAcceptBuilder<'a, subscribe_accept_state::SetSubscribe<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SubscribeAcceptBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,14 +213,14 @@ where
 impl<'a, S> SubscribeAcceptBuilder<'a, S>
 where
     S: subscribe_accept_state::State,
-    S::CreatedAt: subscribe_accept_state::IsSet,
     S::Subscribe: subscribe_accept_state::IsSet,
+    S::CreatedAt: subscribe_accept_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SubscribeAccept<'a> {
         SubscribeAccept {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subscribe: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subscribe: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -230,8 +233,8 @@ where
         >,
     ) -> SubscribeAccept<'a> {
         SubscribeAccept {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subscribe: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subscribe: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/graph/tag.rs b/crates/jacquard-api/src/sh_weaver/graph/tag.rs
index d8a58fa6..df0bc8be 100644
--- a/crates/jacquard-api/src/sh_weaver/graph/tag.rs
+++ b/crates/jacquard-api/src/sh_weaver/graph/tag.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -135,63 +138,59 @@ pub mod tag_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type Tag;
         type CreatedAt;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type Tag = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type Tag = S::Tag;
-        type CreatedAt = S::CreatedAt;
+        type Subject = Unset;
     }
     ///State transition - sets the `tag` field to Set
     pub struct SetTag<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTag<S> {}
     impl<S: State> State for SetTag<S> {
-        type Subject = S::Subject;
         type Tag = Set<members::tag>;
         type CreatedAt = S::CreatedAt;
+        type Subject = S::Subject;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type Tag = S::Tag;
         type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type Tag = S::Tag;
+        type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `tag` field
         pub struct tag(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TagBuilder<'a, S: tag_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<StrongRef<'a>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Tag<'a> {
@@ -205,9 +204,9 @@ impl<'a> TagBuilder<'a, tag_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -222,11 +221,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TagBuilder<'a, tag_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -241,11 +240,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> TagBuilder<'a, tag_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -260,11 +259,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TagBuilder<'a, tag_state::SetTag<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -272,16 +271,16 @@ where
 impl<'a, S> TagBuilder<'a, S>
 where
     S: tag_state::State,
-    S::Subject: tag_state::IsSet,
     S::Tag: tag_state::IsSet,
     S::CreatedAt: tag_state::IsSet,
+    S::Subject: tag_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Tag<'a> {
         Tag {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            tag: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            tag: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -294,9 +293,9 @@ where
         >,
     ) -> Tag<'a> {
         Tag {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            tag: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            tag: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/notebook.rs b/crates/jacquard-api/src/sh_weaver/notebook.rs
index 95368ad8..16c192bb 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook.rs
@@ -37,7 +37,11 @@ pub mod search_notebooks;
 pub mod theme;
 pub mod update_reading_progress;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -1290,13 +1294,9 @@ pub mod author_list_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct AuthorListViewBuilder<'a, S: author_list_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<i64>,
-        Option<ProfileDataView<'a>>,
-        Option<AtUri<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<ProfileDataView<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AuthorListView<'a> {
@@ -1310,9 +1310,9 @@ impl<'a> AuthorListViewBuilder<'a, author_list_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AuthorListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1327,11 +1327,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AuthorListViewBuilder<'a, author_list_view_state::SetIndex<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AuthorListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1346,11 +1346,11 @@ where
         mut self,
         value: impl Into<ProfileDataView<'a>>,
     ) -> AuthorListViewBuilder<'a, author_list_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AuthorListViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1358,12 +1358,12 @@ where
 impl<'a, S: author_list_view_state::State> AuthorListViewBuilder<'a, S> {
     /// Set the `uri` field (optional)
     pub fn uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `uri` field to an Option value (optional)
     pub fn maybe_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1377,9 +1377,9 @@ where
     /// Build the final struct
     pub fn build(self) -> AuthorListView<'a> {
         AuthorListView {
-            index: self.__unsafe_private_named.0.unwrap(),
-            record: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2,
+            index: self._fields.0.unwrap(),
+            record: self._fields.1.unwrap(),
+            uri: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -1389,9 +1389,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> AuthorListView<'a> {
         AuthorListView {
-            index: self.__unsafe_private_named.0.unwrap(),
-            record: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2,
+            index: self._fields.0.unwrap(),
+            record: self._fields.1.unwrap(),
+            uri: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -2523,9 +2523,9 @@ pub mod book_entry_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct BookEntryRefBuilder<'a, S: book_entry_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<notebook::EntryView<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<notebook::EntryView<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BookEntryRef<'a> {
@@ -2539,9 +2539,9 @@ impl<'a> BookEntryRefBuilder<'a, book_entry_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BookEntryRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2556,11 +2556,11 @@ where
         mut self,
         value: impl Into<notebook::EntryView<'a>>,
     ) -> BookEntryRefBuilder<'a, book_entry_ref_state::SetEntry<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BookEntryRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2573,7 +2573,7 @@ where
     /// Build the final struct
     pub fn build(self) -> BookEntryRef<'a> {
         BookEntryRef {
-            entry: self.__unsafe_private_named.0.unwrap(),
+            entry: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2583,7 +2583,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> BookEntryRef<'a> {
         BookEntryRef {
-            entry: self.__unsafe_private_named.0.unwrap(),
+            entry: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2635,14 +2635,14 @@ pub mod book_entry_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct BookEntryViewBuilder<'a, S: book_entry_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<notebook::EntryView<'a>>,
         Option<i64>,
         Option<notebook::BookEntryRef<'a>>,
         Option<notebook::BookEntryRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BookEntryView<'a> {
@@ -2656,9 +2656,9 @@ impl<'a> BookEntryViewBuilder<'a, book_entry_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BookEntryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2673,11 +2673,11 @@ where
         mut self,
         value: impl Into<notebook::EntryView<'a>>,
     ) -> BookEntryViewBuilder<'a, book_entry_view_state::SetEntry<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BookEntryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2692,11 +2692,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> BookEntryViewBuilder<'a, book_entry_view_state::SetIndex<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BookEntryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2704,12 +2704,12 @@ where
 impl<'a, S: book_entry_view_state::State> BookEntryViewBuilder<'a, S> {
     /// Set the `next` field (optional)
     pub fn next(mut self, value: impl Into<Option<notebook::BookEntryRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `next` field to an Option value (optional)
     pub fn maybe_next(mut self, value: Option<notebook::BookEntryRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -2717,12 +2717,12 @@ impl<'a, S: book_entry_view_state::State> BookEntryViewBuilder<'a, S> {
 impl<'a, S: book_entry_view_state::State> BookEntryViewBuilder<'a, S> {
     /// Set the `prev` field (optional)
     pub fn prev(mut self, value: impl Into<Option<notebook::BookEntryRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `prev` field to an Option value (optional)
     pub fn maybe_prev(mut self, value: Option<notebook::BookEntryRef<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -2736,10 +2736,10 @@ where
     /// Build the final struct
     pub fn build(self) -> BookEntryView<'a> {
         BookEntryView {
-            entry: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
-            next: self.__unsafe_private_named.2,
-            prev: self.__unsafe_private_named.3,
+            entry: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
+            next: self._fields.2,
+            prev: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -2749,10 +2749,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> BookEntryView<'a> {
         BookEntryView {
-            entry: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
-            next: self.__unsafe_private_named.2,
-            prev: self.__unsafe_private_named.3,
+            entry: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
+            next: self._fields.2,
+            prev: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -2768,50 +2768,50 @@ pub mod chapter_entry_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Entry;
         type Index;
+        type Entry;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Entry = Unset;
         type Index = Unset;
-    }
-    ///State transition - sets the `entry` field to Set
-    pub struct SetEntry<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetEntry<S> {}
-    impl<S: State> State for SetEntry<S> {
-        type Entry = Set<members::entry>;
-        type Index = S::Index;
+        type Entry = Unset;
     }
     ///State transition - sets the `index` field to Set
     pub struct SetIndex<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIndex<S> {}
     impl<S: State> State for SetIndex<S> {
-        type Entry = S::Entry;
         type Index = Set<members::index>;
+        type Entry = S::Entry;
+    }
+    ///State transition - sets the `entry` field to Set
+    pub struct SetEntry<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetEntry<S> {}
+    impl<S: State> State for SetEntry<S> {
+        type Index = S::Index;
+        type Entry = Set<members::entry>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `entry` field
-        pub struct entry(());
         ///Marker type for the `index` field
         pub struct index(());
+        ///Marker type for the `entry` field
+        pub struct entry(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ChapterEntryViewBuilder<'a, S: chapter_entry_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<notebook::EntryView<'a>>,
         Option<i64>,
         Option<notebook::BookEntryRef<'a>>,
         Option<notebook::BookEntryRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ChapterEntryView<'a> {
@@ -2825,9 +2825,9 @@ impl<'a> ChapterEntryViewBuilder<'a, chapter_entry_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ChapterEntryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2842,11 +2842,11 @@ where
         mut self,
         value: impl Into<notebook::EntryView<'a>>,
     ) -> ChapterEntryViewBuilder<'a, chapter_entry_view_state::SetEntry<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ChapterEntryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2861,11 +2861,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ChapterEntryViewBuilder<'a, chapter_entry_view_state::SetIndex<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ChapterEntryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2873,12 +2873,12 @@ where
 impl<'a, S: chapter_entry_view_state::State> ChapterEntryViewBuilder<'a, S> {
     /// Set the `next` field (optional)
     pub fn next(mut self, value: impl Into<Option<notebook::BookEntryRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `next` field to an Option value (optional)
     pub fn maybe_next(mut self, value: Option<notebook::BookEntryRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -2886,12 +2886,12 @@ impl<'a, S: chapter_entry_view_state::State> ChapterEntryViewBuilder<'a, S> {
 impl<'a, S: chapter_entry_view_state::State> ChapterEntryViewBuilder<'a, S> {
     /// Set the `prev` field (optional)
     pub fn prev(mut self, value: impl Into<Option<notebook::BookEntryRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `prev` field to an Option value (optional)
     pub fn maybe_prev(mut self, value: Option<notebook::BookEntryRef<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -2899,16 +2899,16 @@ impl<'a, S: chapter_entry_view_state::State> ChapterEntryViewBuilder<'a, S> {
 impl<'a, S> ChapterEntryViewBuilder<'a, S>
 where
     S: chapter_entry_view_state::State,
-    S::Entry: chapter_entry_view_state::IsSet,
     S::Index: chapter_entry_view_state::IsSet,
+    S::Entry: chapter_entry_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ChapterEntryView<'a> {
         ChapterEntryView {
-            entry: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
-            next: self.__unsafe_private_named.2,
-            prev: self.__unsafe_private_named.3,
+            entry: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
+            next: self._fields.2,
+            prev: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -2918,10 +2918,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ChapterEntryView<'a> {
         ChapterEntryView {
-            entry: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
-            next: self.__unsafe_private_named.2,
-            prev: self.__unsafe_private_named.3,
+            entry: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
+            next: self._fields.2,
+            prev: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -2937,112 +2937,112 @@ pub mod chapter_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Cid;
         type Notebook;
         type Record;
         type Uri;
-        type Cid;
-        type Authors;
         type IndexedAt;
+        type Authors;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Cid = Unset;
         type Notebook = Unset;
         type Record = Unset;
         type Uri = Unset;
-        type Cid = Unset;
-        type Authors = Unset;
         type IndexedAt = Unset;
+        type Authors = Unset;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Cid = Set<members::cid>;
+        type Notebook = S::Notebook;
+        type Record = S::Record;
+        type Uri = S::Uri;
+        type IndexedAt = S::IndexedAt;
+        type Authors = S::Authors;
     }
     ///State transition - sets the `notebook` field to Set
     pub struct SetNotebook<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetNotebook<S> {}
     impl<S: State> State for SetNotebook<S> {
+        type Cid = S::Cid;
         type Notebook = Set<members::notebook>;
         type Record = S::Record;
         type Uri = S::Uri;
-        type Cid = S::Cid;
-        type Authors = S::Authors;
         type IndexedAt = S::IndexedAt;
+        type Authors = S::Authors;
     }
     ///State transition - sets the `record` field to Set
     pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecord<S> {}
     impl<S: State> State for SetRecord<S> {
+        type Cid = S::Cid;
         type Notebook = S::Notebook;
         type Record = Set<members::record>;
         type Uri = S::Uri;
-        type Cid = S::Cid;
-        type Authors = S::Authors;
         type IndexedAt = S::IndexedAt;
+        type Authors = S::Authors;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
+        type Cid = S::Cid;
         type Notebook = S::Notebook;
         type Record = S::Record;
         type Uri = Set<members::uri>;
-        type Cid = S::Cid;
-        type Authors = S::Authors;
         type IndexedAt = S::IndexedAt;
+        type Authors = S::Authors;
     }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
+        type Cid = S::Cid;
         type Notebook = S::Notebook;
         type Record = S::Record;
         type Uri = S::Uri;
-        type Cid = Set<members::cid>;
+        type IndexedAt = Set<members::indexed_at>;
         type Authors = S::Authors;
-        type IndexedAt = S::IndexedAt;
     }
     ///State transition - sets the `authors` field to Set
     pub struct SetAuthors<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthors<S> {}
     impl<S: State> State for SetAuthors<S> {
-        type Notebook = S::Notebook;
-        type Record = S::Record;
-        type Uri = S::Uri;
         type Cid = S::Cid;
-        type Authors = Set<members::authors>;
-        type IndexedAt = S::IndexedAt;
-    }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
         type Notebook = S::Notebook;
         type Record = S::Record;
         type Uri = S::Uri;
-        type Cid = S::Cid;
-        type Authors = S::Authors;
-        type IndexedAt = Set<members::indexed_at>;
+        type IndexedAt = S::IndexedAt;
+        type Authors = Set<members::authors>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `cid` field
+        pub struct cid(());
         ///Marker type for the `notebook` field
         pub struct notebook(());
         ///Marker type for the `record` field
         pub struct record(());
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
-        ///Marker type for the `authors` field
-        pub struct authors(());
         ///Marker type for the `indexed_at` field
         pub struct indexed_at(());
+        ///Marker type for the `authors` field
+        pub struct authors(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ChapterViewBuilder<'a, S: chapter_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<notebook::AuthorListView<'a>>>,
         Option<Cid<'a>>,
         Option<i64>,
@@ -3053,7 +3053,7 @@ pub struct ChapterViewBuilder<'a, S: chapter_view_state::State> {
         Option<notebook::Title<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ChapterView<'a> {
@@ -3067,19 +3067,9 @@ impl<'a> ChapterViewBuilder<'a, chapter_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ChapterViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3094,11 +3084,11 @@ where
         mut self,
         value: impl Into<Vec<notebook::AuthorListView<'a>>>,
     ) -> ChapterViewBuilder<'a, chapter_view_state::SetAuthors<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ChapterViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3113,11 +3103,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> ChapterViewBuilder<'a, chapter_view_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ChapterViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3125,12 +3115,12 @@ where
 impl<'a, S: chapter_view_state::State> ChapterViewBuilder<'a, S> {
     /// Set the `entryCount` field (optional)
     pub fn entry_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `entryCount` field to an Option value (optional)
     pub fn maybe_entry_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -3145,11 +3135,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ChapterViewBuilder<'a, chapter_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ChapterViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3164,11 +3154,11 @@ where
         mut self,
         value: impl Into<notebook::NotebookView<'a>>,
     ) -> ChapterViewBuilder<'a, chapter_view_state::SetNotebook<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ChapterViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3183,11 +3173,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> ChapterViewBuilder<'a, chapter_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ChapterViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3195,12 +3185,12 @@ where
 impl<'a, S: chapter_view_state::State> ChapterViewBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<notebook::Tags<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<notebook::Tags<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -3208,12 +3198,12 @@ impl<'a, S: chapter_view_state::State> ChapterViewBuilder<'a, S> {
 impl<'a, S: chapter_view_state::State> ChapterViewBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<notebook::Title<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<notebook::Title<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -3228,11 +3218,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ChapterViewBuilder<'a, chapter_view_state::SetUri<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         ChapterViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3240,25 +3230,25 @@ where
 impl<'a, S> ChapterViewBuilder<'a, S>
 where
     S: chapter_view_state::State,
+    S::Cid: chapter_view_state::IsSet,
     S::Notebook: chapter_view_state::IsSet,
     S::Record: chapter_view_state::IsSet,
     S::Uri: chapter_view_state::IsSet,
-    S::Cid: chapter_view_state::IsSet,
-    S::Authors: chapter_view_state::IsSet,
     S::IndexedAt: chapter_view_state::IsSet,
+    S::Authors: chapter_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ChapterView<'a> {
         ChapterView {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            entry_count: self.__unsafe_private_named.2,
-            indexed_at: self.__unsafe_private_named.3.unwrap(),
-            notebook: self.__unsafe_private_named.4.unwrap(),
-            record: self.__unsafe_private_named.5.unwrap(),
-            tags: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7,
-            uri: self.__unsafe_private_named.8.unwrap(),
+            authors: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            entry_count: self._fields.2,
+            indexed_at: self._fields.3.unwrap(),
+            notebook: self._fields.4.unwrap(),
+            record: self._fields.5.unwrap(),
+            tags: self._fields.6,
+            title: self._fields.7,
+            uri: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3268,15 +3258,15 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ChapterView<'a> {
         ChapterView {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            entry_count: self.__unsafe_private_named.2,
-            indexed_at: self.__unsafe_private_named.3.unwrap(),
-            notebook: self.__unsafe_private_named.4.unwrap(),
-            record: self.__unsafe_private_named.5.unwrap(),
-            tags: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7,
-            uri: self.__unsafe_private_named.8.unwrap(),
+            authors: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            entry_count: self._fields.2,
+            indexed_at: self._fields.3.unwrap(),
+            notebook: self._fields.4.unwrap(),
+            record: self._fields.5.unwrap(),
+            tags: self._fields.6,
+            title: self._fields.7,
+            uri: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -3305,92 +3295,92 @@ pub mod entry_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Cid;
         type Authors;
-        type Uri;
-        type Record;
         type IndexedAt;
+        type Record;
+        type Uri;
+        type Cid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Cid = Unset;
         type Authors = Unset;
-        type Uri = Unset;
-        type Record = Unset;
         type IndexedAt = Unset;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type Cid = Set<members::cid>;
-        type Authors = S::Authors;
-        type Uri = S::Uri;
-        type Record = S::Record;
-        type IndexedAt = S::IndexedAt;
+        type Record = Unset;
+        type Uri = Unset;
+        type Cid = Unset;
     }
     ///State transition - sets the `authors` field to Set
     pub struct SetAuthors<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthors<S> {}
     impl<S: State> State for SetAuthors<S> {
-        type Cid = S::Cid;
         type Authors = Set<members::authors>;
-        type Uri = S::Uri;
-        type Record = S::Record;
         type IndexedAt = S::IndexedAt;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
+        type Record = S::Record;
+        type Uri = S::Uri;
         type Cid = S::Cid;
+    }
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
         type Authors = S::Authors;
-        type Uri = Set<members::uri>;
+        type IndexedAt = Set<members::indexed_at>;
         type Record = S::Record;
-        type IndexedAt = S::IndexedAt;
+        type Uri = S::Uri;
+        type Cid = S::Cid;
     }
     ///State transition - sets the `record` field to Set
     pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecord<S> {}
     impl<S: State> State for SetRecord<S> {
-        type Cid = S::Cid;
         type Authors = S::Authors;
-        type Uri = S::Uri;
-        type Record = Set<members::record>;
         type IndexedAt = S::IndexedAt;
+        type Record = Set<members::record>;
+        type Uri = S::Uri;
+        type Cid = S::Cid;
     }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Authors = S::Authors;
+        type IndexedAt = S::IndexedAt;
+        type Record = S::Record;
+        type Uri = Set<members::uri>;
         type Cid = S::Cid;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
         type Authors = S::Authors;
-        type Uri = S::Uri;
+        type IndexedAt = S::IndexedAt;
         type Record = S::Record;
-        type IndexedAt = Set<members::indexed_at>;
+        type Uri = S::Uri;
+        type Cid = Set<members::cid>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `authors` field
         pub struct authors(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
-        ///Marker type for the `record` field
-        pub struct record(());
         ///Marker type for the `indexed_at` field
         pub struct indexed_at(());
+        ///Marker type for the `record` field
+        pub struct record(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EntryViewBuilder<'a, S: entry_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<notebook::AuthorListView<'a>>>,
         Option<i64>,
         Option<Cid<'a>>,
@@ -3407,7 +3397,7 @@ pub struct EntryViewBuilder<'a, S: entry_view_state::State> {
         Option<AtUri<'a>>,
         Option<notebook::ReadingProgress<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> EntryView<'a> {
@@ -3421,8 +3411,8 @@ impl<'a> EntryViewBuilder<'a, entry_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EntryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -3439,7 +3429,7 @@ impl<'a> EntryViewBuilder<'a, entry_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3454,11 +3444,11 @@ where
         mut self,
         value: impl Into<Vec<notebook::AuthorListView<'a>>>,
     ) -> EntryViewBuilder<'a, entry_view_state::SetAuthors<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EntryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3466,12 +3456,12 @@ where
 impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
     /// Set the `bookmarkCount` field (optional)
     pub fn bookmark_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `bookmarkCount` field to an Option value (optional)
     pub fn maybe_bookmark_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3486,11 +3476,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> EntryViewBuilder<'a, entry_view_state::SetCid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EntryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3505,11 +3495,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EntryViewBuilder<'a, entry_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         EntryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3517,12 +3507,12 @@ where
 impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
     /// Set the `likeCount` field (optional)
     pub fn like_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `likeCount` field to an Option value (optional)
     pub fn maybe_like_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -3530,12 +3520,12 @@ impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
 impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
     /// Set the `path` field (optional)
     pub fn path(mut self, value: impl Into<Option<notebook::Path<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `path` field to an Option value (optional)
     pub fn maybe_path(mut self, value: Option<notebook::Path<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -3546,7 +3536,7 @@ impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<notebook::PermissionsState<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `permissions` field to an Option value (optional)
@@ -3554,7 +3544,7 @@ impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
         mut self,
         value: Option<notebook::PermissionsState<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -3569,11 +3559,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> EntryViewBuilder<'a, entry_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         EntryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3584,7 +3574,7 @@ impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<notebook::RenderedView<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `renderedView` field to an Option value (optional)
@@ -3592,7 +3582,7 @@ impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
         mut self,
         value: Option<notebook::RenderedView<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -3600,12 +3590,12 @@ impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
 impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<notebook::Tags<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<notebook::Tags<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -3613,12 +3603,12 @@ impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
 impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<notebook::Title<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<notebook::Title<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -3633,11 +3623,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> EntryViewBuilder<'a, entry_view_state::SetUri<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         EntryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3645,12 +3635,12 @@ where
 impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
     /// Set the `viewerBookmark` field (optional)
     pub fn viewer_bookmark(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `viewerBookmark` field to an Option value (optional)
     pub fn maybe_viewer_bookmark(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -3658,12 +3648,12 @@ impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
 impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
     /// Set the `viewerLike` field (optional)
     pub fn viewer_like(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `viewerLike` field to an Option value (optional)
     pub fn maybe_viewer_like(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -3674,7 +3664,7 @@ impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<notebook::ReadingProgress<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `viewerReadingProgress` field to an Option value (optional)
@@ -3682,7 +3672,7 @@ impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
         mut self,
         value: Option<notebook::ReadingProgress<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -3690,30 +3680,30 @@ impl<'a, S: entry_view_state::State> EntryViewBuilder<'a, S> {
 impl<'a, S> EntryViewBuilder<'a, S>
 where
     S: entry_view_state::State,
-    S::Cid: entry_view_state::IsSet,
     S::Authors: entry_view_state::IsSet,
-    S::Uri: entry_view_state::IsSet,
-    S::Record: entry_view_state::IsSet,
     S::IndexedAt: entry_view_state::IsSet,
+    S::Record: entry_view_state::IsSet,
+    S::Uri: entry_view_state::IsSet,
+    S::Cid: entry_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> EntryView<'a> {
         EntryView {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            bookmark_count: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            indexed_at: self.__unsafe_private_named.3.unwrap(),
-            like_count: self.__unsafe_private_named.4,
-            path: self.__unsafe_private_named.5,
-            permissions: self.__unsafe_private_named.6,
-            record: self.__unsafe_private_named.7.unwrap(),
-            rendered_view: self.__unsafe_private_named.8,
-            tags: self.__unsafe_private_named.9,
-            title: self.__unsafe_private_named.10,
-            uri: self.__unsafe_private_named.11.unwrap(),
-            viewer_bookmark: self.__unsafe_private_named.12,
-            viewer_like: self.__unsafe_private_named.13,
-            viewer_reading_progress: self.__unsafe_private_named.14,
+            authors: self._fields.0.unwrap(),
+            bookmark_count: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            indexed_at: self._fields.3.unwrap(),
+            like_count: self._fields.4,
+            path: self._fields.5,
+            permissions: self._fields.6,
+            record: self._fields.7.unwrap(),
+            rendered_view: self._fields.8,
+            tags: self._fields.9,
+            title: self._fields.10,
+            uri: self._fields.11.unwrap(),
+            viewer_bookmark: self._fields.12,
+            viewer_like: self._fields.13,
+            viewer_reading_progress: self._fields.14,
             extra_data: Default::default(),
         }
     }
@@ -3723,21 +3713,21 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> EntryView<'a> {
         EntryView {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            bookmark_count: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            indexed_at: self.__unsafe_private_named.3.unwrap(),
-            like_count: self.__unsafe_private_named.4,
-            path: self.__unsafe_private_named.5,
-            permissions: self.__unsafe_private_named.6,
-            record: self.__unsafe_private_named.7.unwrap(),
-            rendered_view: self.__unsafe_private_named.8,
-            tags: self.__unsafe_private_named.9,
-            title: self.__unsafe_private_named.10,
-            uri: self.__unsafe_private_named.11.unwrap(),
-            viewer_bookmark: self.__unsafe_private_named.12,
-            viewer_like: self.__unsafe_private_named.13,
-            viewer_reading_progress: self.__unsafe_private_named.14,
+            authors: self._fields.0.unwrap(),
+            bookmark_count: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            indexed_at: self._fields.3.unwrap(),
+            like_count: self._fields.4,
+            path: self._fields.5,
+            permissions: self._fields.6,
+            record: self._fields.7.unwrap(),
+            rendered_view: self._fields.8,
+            tags: self._fields.9,
+            title: self._fields.10,
+            uri: self._fields.11.unwrap(),
+            viewer_bookmark: self._fields.12,
+            viewer_like: self._fields.13,
+            viewer_reading_progress: self._fields.14,
             extra_data: Some(extra_data),
         }
     }
@@ -3777,13 +3767,13 @@ pub mod feed_entry_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct FeedEntryViewBuilder<'a, S: feed_entry_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<notebook::EntryView<'a>>,
         Option<notebook::FeedNotebookContext<'a>>,
         Option<notebook::FeedReason<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> FeedEntryView<'a> {
@@ -3797,9 +3787,9 @@ impl<'a> FeedEntryViewBuilder<'a, feed_entry_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FeedEntryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3814,11 +3804,11 @@ where
         mut self,
         value: impl Into<notebook::EntryView<'a>>,
     ) -> FeedEntryViewBuilder<'a, feed_entry_view_state::SetEntry<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FeedEntryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3829,7 +3819,7 @@ impl<'a, S: feed_entry_view_state::State> FeedEntryViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<notebook::FeedNotebookContext<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `notebookContext` field to an Option value (optional)
@@ -3837,7 +3827,7 @@ impl<'a, S: feed_entry_view_state::State> FeedEntryViewBuilder<'a, S> {
         mut self,
         value: Option<notebook::FeedNotebookContext<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3845,12 +3835,12 @@ impl<'a, S: feed_entry_view_state::State> FeedEntryViewBuilder<'a, S> {
 impl<'a, S: feed_entry_view_state::State> FeedEntryViewBuilder<'a, S> {
     /// Set the `reason` field (optional)
     pub fn reason(mut self, value: impl Into<Option<notebook::FeedReason<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `reason` field to an Option value (optional)
     pub fn maybe_reason(mut self, value: Option<notebook::FeedReason<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -3863,9 +3853,9 @@ where
     /// Build the final struct
     pub fn build(self) -> FeedEntryView<'a> {
         FeedEntryView {
-            entry: self.__unsafe_private_named.0.unwrap(),
-            notebook_context: self.__unsafe_private_named.1,
-            reason: self.__unsafe_private_named.2,
+            entry: self._fields.0.unwrap(),
+            notebook_context: self._fields.1,
+            reason: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -3875,9 +3865,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> FeedEntryView<'a> {
         FeedEntryView {
-            entry: self.__unsafe_private_named.0.unwrap(),
-            notebook_context: self.__unsafe_private_named.1,
-            reason: self.__unsafe_private_named.2,
+            entry: self._fields.0.unwrap(),
+            notebook_context: self._fields.1,
+            reason: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -3929,9 +3919,9 @@ pub mod feed_notebook_context_state {
 
 /// Builder for constructing an instance of this type
 pub struct FeedNotebookContextBuilder<'a, S: feed_notebook_context_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> FeedNotebookContext<'a> {
@@ -3945,9 +3935,9 @@ impl<'a> FeedNotebookContextBuilder<'a, feed_notebook_context_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FeedNotebookContextBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3955,12 +3945,12 @@ impl<'a> FeedNotebookContextBuilder<'a, feed_notebook_context_state::Empty> {
 impl<'a, S: feed_notebook_context_state::State> FeedNotebookContextBuilder<'a, S> {
     /// Set the `path` field (optional)
     pub fn path(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `path` field to an Option value (optional)
     pub fn maybe_path(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -3975,11 +3965,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> FeedNotebookContextBuilder<'a, feed_notebook_context_state::SetTitle<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FeedNotebookContextBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3994,11 +3984,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> FeedNotebookContextBuilder<'a, feed_notebook_context_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         FeedNotebookContextBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4012,9 +4002,9 @@ where
     /// Build the final struct
     pub fn build(self) -> FeedNotebookContext<'a> {
         FeedNotebookContext {
-            path: self.__unsafe_private_named.0,
-            title: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            path: self._fields.0,
+            title: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -4024,9 +4014,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> FeedNotebookContext<'a> {
         FeedNotebookContext {
-            path: self.__unsafe_private_named.0,
-            title: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            path: self._fields.0,
+            title: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -4042,92 +4032,92 @@ pub mod notebook_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
-        type Cid;
+        type Record;
         type IndexedAt;
         type Authors;
-        type Record;
+        type Cid;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
-        type Cid = Unset;
+        type Record = Unset;
         type IndexedAt = Unset;
         type Authors = Unset;
-        type Record = Unset;
+        type Cid = Unset;
+        type Uri = Unset;
     }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Cid = S::Cid;
+    ///State transition - sets the `record` field to Set
+    pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRecord<S> {}
+    impl<S: State> State for SetRecord<S> {
+        type Record = Set<members::record>;
         type IndexedAt = S::IndexedAt;
         type Authors = S::Authors;
-        type Record = S::Record;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
+        type Cid = S::Cid;
         type Uri = S::Uri;
-        type Cid = Set<members::cid>;
-        type IndexedAt = S::IndexedAt;
-        type Authors = S::Authors;
-        type Record = S::Record;
     }
     ///State transition - sets the `indexed_at` field to Set
     pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
     impl<S: State> State for SetIndexedAt<S> {
-        type Uri = S::Uri;
-        type Cid = S::Cid;
+        type Record = S::Record;
         type IndexedAt = Set<members::indexed_at>;
         type Authors = S::Authors;
-        type Record = S::Record;
+        type Cid = S::Cid;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `authors` field to Set
     pub struct SetAuthors<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthors<S> {}
     impl<S: State> State for SetAuthors<S> {
-        type Uri = S::Uri;
-        type Cid = S::Cid;
+        type Record = S::Record;
         type IndexedAt = S::IndexedAt;
         type Authors = Set<members::authors>;
-        type Record = S::Record;
+        type Cid = S::Cid;
+        type Uri = S::Uri;
     }
-    ///State transition - sets the `record` field to Set
-    pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRecord<S> {}
-    impl<S: State> State for SetRecord<S> {
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Record = S::Record;
+        type IndexedAt = S::IndexedAt;
+        type Authors = S::Authors;
+        type Cid = Set<members::cid>;
         type Uri = S::Uri;
-        type Cid = S::Cid;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Record = S::Record;
         type IndexedAt = S::IndexedAt;
         type Authors = S::Authors;
-        type Record = Set<members::record>;
+        type Cid = S::Cid;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
+        ///Marker type for the `record` field
+        pub struct record(());
         ///Marker type for the `indexed_at` field
         pub struct indexed_at(());
         ///Marker type for the `authors` field
         pub struct authors(());
-        ///Marker type for the `record` field
-        pub struct record(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct NotebookViewBuilder<'a, S: notebook_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<notebook::AuthorListView<'a>>>,
         Option<i64>,
         Option<Cid<'a>>,
@@ -4146,7 +4136,7 @@ pub struct NotebookViewBuilder<'a, S: notebook_view_state::State> {
         Option<notebook::ReadingProgress<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> NotebookView<'a> {
@@ -4160,8 +4150,8 @@ impl<'a> NotebookViewBuilder<'a, notebook_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NotebookViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -4180,7 +4170,7 @@ impl<'a> NotebookViewBuilder<'a, notebook_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4195,11 +4185,11 @@ where
         mut self,
         value: impl Into<Vec<notebook::AuthorListView<'a>>>,
     ) -> NotebookViewBuilder<'a, notebook_view_state::SetAuthors<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NotebookViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4207,12 +4197,12 @@ where
 impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
     /// Set the `bookmarkCount` field (optional)
     pub fn bookmark_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `bookmarkCount` field to an Option value (optional)
     pub fn maybe_bookmark_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -4227,11 +4217,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> NotebookViewBuilder<'a, notebook_view_state::SetCid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         NotebookViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4239,12 +4229,12 @@ where
 impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
     /// Set the `entryCount` field (optional)
     pub fn entry_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `entryCount` field to an Option value (optional)
     pub fn maybe_entry_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -4259,11 +4249,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> NotebookViewBuilder<'a, notebook_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         NotebookViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4271,12 +4261,12 @@ where
 impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
     /// Set the `likeCount` field (optional)
     pub fn like_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `likeCount` field to an Option value (optional)
     pub fn maybe_like_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -4284,12 +4274,12 @@ impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
 impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
     /// Set the `path` field (optional)
     pub fn path(mut self, value: impl Into<Option<notebook::Path<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `path` field to an Option value (optional)
     pub fn maybe_path(mut self, value: Option<notebook::Path<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -4300,7 +4290,7 @@ impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<notebook::PermissionsState<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `permissions` field to an Option value (optional)
@@ -4308,7 +4298,7 @@ impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
         mut self,
         value: Option<notebook::PermissionsState<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -4323,11 +4313,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> NotebookViewBuilder<'a, notebook_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         NotebookViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4335,12 +4325,12 @@ where
 impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
     /// Set the `subscriberCount` field (optional)
     pub fn subscriber_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `subscriberCount` field to an Option value (optional)
     pub fn maybe_subscriber_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -4348,12 +4338,12 @@ impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
 impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<notebook::Tags<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<notebook::Tags<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -4361,12 +4351,12 @@ impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
 impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<notebook::Title<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<notebook::Title<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -4381,11 +4371,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> NotebookViewBuilder<'a, notebook_view_state::SetUri<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         NotebookViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4393,12 +4383,12 @@ where
 impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
     /// Set the `viewerBookmark` field (optional)
     pub fn viewer_bookmark(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `viewerBookmark` field to an Option value (optional)
     pub fn maybe_viewer_bookmark(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -4406,12 +4396,12 @@ impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
 impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
     /// Set the `viewerLike` field (optional)
     pub fn viewer_like(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `viewerLike` field to an Option value (optional)
     pub fn maybe_viewer_like(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -4422,7 +4412,7 @@ impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<notebook::ReadingProgress<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `viewerReadingProgress` field to an Option value (optional)
@@ -4430,7 +4420,7 @@ impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
         mut self,
         value: Option<notebook::ReadingProgress<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -4438,12 +4428,12 @@ impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
 impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
     /// Set the `viewerSubscription` field (optional)
     pub fn viewer_subscription(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `viewerSubscription` field to an Option value (optional)
     pub fn maybe_viewer_subscription(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -4451,32 +4441,32 @@ impl<'a, S: notebook_view_state::State> NotebookViewBuilder<'a, S> {
 impl<'a, S> NotebookViewBuilder<'a, S>
 where
     S: notebook_view_state::State,
-    S::Uri: notebook_view_state::IsSet,
-    S::Cid: notebook_view_state::IsSet,
+    S::Record: notebook_view_state::IsSet,
     S::IndexedAt: notebook_view_state::IsSet,
     S::Authors: notebook_view_state::IsSet,
-    S::Record: notebook_view_state::IsSet,
+    S::Cid: notebook_view_state::IsSet,
+    S::Uri: notebook_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> NotebookView<'a> {
         NotebookView {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            bookmark_count: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            entry_count: self.__unsafe_private_named.3,
-            indexed_at: self.__unsafe_private_named.4.unwrap(),
-            like_count: self.__unsafe_private_named.5,
-            path: self.__unsafe_private_named.6,
-            permissions: self.__unsafe_private_named.7,
-            record: self.__unsafe_private_named.8.unwrap(),
-            subscriber_count: self.__unsafe_private_named.9,
-            tags: self.__unsafe_private_named.10,
-            title: self.__unsafe_private_named.11,
-            uri: self.__unsafe_private_named.12.unwrap(),
-            viewer_bookmark: self.__unsafe_private_named.13,
-            viewer_like: self.__unsafe_private_named.14,
-            viewer_reading_progress: self.__unsafe_private_named.15,
-            viewer_subscription: self.__unsafe_private_named.16,
+            authors: self._fields.0.unwrap(),
+            bookmark_count: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            entry_count: self._fields.3,
+            indexed_at: self._fields.4.unwrap(),
+            like_count: self._fields.5,
+            path: self._fields.6,
+            permissions: self._fields.7,
+            record: self._fields.8.unwrap(),
+            subscriber_count: self._fields.9,
+            tags: self._fields.10,
+            title: self._fields.11,
+            uri: self._fields.12.unwrap(),
+            viewer_bookmark: self._fields.13,
+            viewer_like: self._fields.14,
+            viewer_reading_progress: self._fields.15,
+            viewer_subscription: self._fields.16,
             extra_data: Default::default(),
         }
     }
@@ -4486,23 +4476,23 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> NotebookView<'a> {
         NotebookView {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            bookmark_count: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            entry_count: self.__unsafe_private_named.3,
-            indexed_at: self.__unsafe_private_named.4.unwrap(),
-            like_count: self.__unsafe_private_named.5,
-            path: self.__unsafe_private_named.6,
-            permissions: self.__unsafe_private_named.7,
-            record: self.__unsafe_private_named.8.unwrap(),
-            subscriber_count: self.__unsafe_private_named.9,
-            tags: self.__unsafe_private_named.10,
-            title: self.__unsafe_private_named.11,
-            uri: self.__unsafe_private_named.12.unwrap(),
-            viewer_bookmark: self.__unsafe_private_named.13,
-            viewer_like: self.__unsafe_private_named.14,
-            viewer_reading_progress: self.__unsafe_private_named.15,
-            viewer_subscription: self.__unsafe_private_named.16,
+            authors: self._fields.0.unwrap(),
+            bookmark_count: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            entry_count: self._fields.3,
+            indexed_at: self._fields.4.unwrap(),
+            like_count: self._fields.5,
+            path: self._fields.6,
+            permissions: self._fields.7,
+            record: self._fields.8.unwrap(),
+            subscriber_count: self._fields.9,
+            tags: self._fields.10,
+            title: self._fields.11,
+            uri: self._fields.12.unwrap(),
+            viewer_bookmark: self._fields.13,
+            viewer_like: self._fields.14,
+            viewer_reading_progress: self._fields.15,
+            viewer_subscription: self._fields.16,
             extra_data: Some(extra_data),
         }
     }
@@ -4518,92 +4508,92 @@ pub mod page_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type IndexedAt;
         type Notebook;
-        type Uri;
         type Record;
-        type IndexedAt;
         type Cid;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type IndexedAt = Unset;
         type Notebook = Unset;
-        type Uri = Unset;
         type Record = Unset;
-        type IndexedAt = Unset;
         type Cid = Unset;
+        type Uri = Unset;
+    }
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
+        type IndexedAt = Set<members::indexed_at>;
+        type Notebook = S::Notebook;
+        type Record = S::Record;
+        type Cid = S::Cid;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `notebook` field to Set
     pub struct SetNotebook<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetNotebook<S> {}
     impl<S: State> State for SetNotebook<S> {
-        type Notebook = Set<members::notebook>;
-        type Uri = S::Uri;
-        type Record = S::Record;
         type IndexedAt = S::IndexedAt;
-        type Cid = S::Cid;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Notebook = S::Notebook;
-        type Uri = Set<members::uri>;
+        type Notebook = Set<members::notebook>;
         type Record = S::Record;
-        type IndexedAt = S::IndexedAt;
         type Cid = S::Cid;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `record` field to Set
     pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecord<S> {}
     impl<S: State> State for SetRecord<S> {
+        type IndexedAt = S::IndexedAt;
         type Notebook = S::Notebook;
-        type Uri = S::Uri;
         type Record = Set<members::record>;
-        type IndexedAt = S::IndexedAt;
         type Cid = S::Cid;
-    }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
-        type Notebook = S::Notebook;
         type Uri = S::Uri;
-        type Record = S::Record;
-        type IndexedAt = Set<members::indexed_at>;
-        type Cid = S::Cid;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
+        type IndexedAt = S::IndexedAt;
         type Notebook = S::Notebook;
-        type Uri = S::Uri;
         type Record = S::Record;
-        type IndexedAt = S::IndexedAt;
         type Cid = Set<members::cid>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type IndexedAt = S::IndexedAt;
+        type Notebook = S::Notebook;
+        type Record = S::Record;
+        type Cid = S::Cid;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `indexed_at` field
+        pub struct indexed_at(());
         ///Marker type for the `notebook` field
         pub struct notebook(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `record` field
         pub struct record(());
-        ///Marker type for the `indexed_at` field
-        pub struct indexed_at(());
         ///Marker type for the `cid` field
         pub struct cid(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PageViewBuilder<'a, S: page_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<i64>,
         Option<Datetime>,
@@ -4613,7 +4603,7 @@ pub struct PageViewBuilder<'a, S: page_view_state::State> {
         Option<notebook::Title<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PageView<'a> {
@@ -4627,9 +4617,9 @@ impl<'a> PageViewBuilder<'a, page_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4644,11 +4634,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> PageViewBuilder<'a, page_view_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4656,12 +4646,12 @@ where
 impl<'a, S: page_view_state::State> PageViewBuilder<'a, S> {
     /// Set the `entryCount` field (optional)
     pub fn entry_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `entryCount` field to an Option value (optional)
     pub fn maybe_entry_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -4676,11 +4666,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PageViewBuilder<'a, page_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4695,11 +4685,11 @@ where
         mut self,
         value: impl Into<notebook::NotebookView<'a>>,
     ) -> PageViewBuilder<'a, page_view_state::SetNotebook<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4714,11 +4704,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> PageViewBuilder<'a, page_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4726,12 +4716,12 @@ where
 impl<'a, S: page_view_state::State> PageViewBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<notebook::Tags<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<notebook::Tags<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -4739,12 +4729,12 @@ impl<'a, S: page_view_state::State> PageViewBuilder<'a, S> {
 impl<'a, S: page_view_state::State> PageViewBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<notebook::Title<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<notebook::Title<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -4759,11 +4749,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PageViewBuilder<'a, page_view_state::SetUri<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         PageViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4771,23 +4761,23 @@ where
 impl<'a, S> PageViewBuilder<'a, S>
 where
     S: page_view_state::State,
+    S::IndexedAt: page_view_state::IsSet,
     S::Notebook: page_view_state::IsSet,
-    S::Uri: page_view_state::IsSet,
     S::Record: page_view_state::IsSet,
-    S::IndexedAt: page_view_state::IsSet,
     S::Cid: page_view_state::IsSet,
+    S::Uri: page_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PageView<'a> {
         PageView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            entry_count: self.__unsafe_private_named.1,
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            notebook: self.__unsafe_private_named.3.unwrap(),
-            record: self.__unsafe_private_named.4.unwrap(),
-            tags: self.__unsafe_private_named.5,
-            title: self.__unsafe_private_named.6,
-            uri: self.__unsafe_private_named.7.unwrap(),
+            cid: self._fields.0.unwrap(),
+            entry_count: self._fields.1,
+            indexed_at: self._fields.2.unwrap(),
+            notebook: self._fields.3.unwrap(),
+            record: self._fields.4.unwrap(),
+            tags: self._fields.5,
+            title: self._fields.6,
+            uri: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -4797,14 +4787,14 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> PageView<'a> {
         PageView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            entry_count: self.__unsafe_private_named.1,
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            notebook: self.__unsafe_private_named.3.unwrap(),
-            record: self.__unsafe_private_named.4.unwrap(),
-            tags: self.__unsafe_private_named.5,
-            title: self.__unsafe_private_named.6,
-            uri: self.__unsafe_private_named.7.unwrap(),
+            cid: self._fields.0.unwrap(),
+            entry_count: self._fields.1,
+            indexed_at: self._fields.2.unwrap(),
+            notebook: self._fields.3.unwrap(),
+            record: self._fields.4.unwrap(),
+            tags: self._fields.5,
+            title: self._fields.6,
+            uri: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -4822,8 +4812,8 @@ pub mod permission_grant_state {
     pub trait State: sealed::Sealed {
         type Scope;
         type Did;
-        type Source;
         type GrantedAt;
+        type Source;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
@@ -4831,8 +4821,8 @@ pub mod permission_grant_state {
     impl State for Empty {
         type Scope = Unset;
         type Did = Unset;
-        type Source = Unset;
         type GrantedAt = Unset;
+        type Source = Unset;
     }
     ///State transition - sets the `scope` field to Set
     pub struct SetScope<S: State = Empty>(PhantomData<fn() -> S>);
@@ -4840,8 +4830,8 @@ pub mod permission_grant_state {
     impl<S: State> State for SetScope<S> {
         type Scope = Set<members::scope>;
         type Did = S::Did;
-        type Source = S::Source;
         type GrantedAt = S::GrantedAt;
+        type Source = S::Source;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
@@ -4849,17 +4839,8 @@ pub mod permission_grant_state {
     impl<S: State> State for SetDid<S> {
         type Scope = S::Scope;
         type Did = Set<members::did>;
-        type Source = S::Source;
-        type GrantedAt = S::GrantedAt;
-    }
-    ///State transition - sets the `source` field to Set
-    pub struct SetSource<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSource<S> {}
-    impl<S: State> State for SetSource<S> {
-        type Scope = S::Scope;
-        type Did = S::Did;
-        type Source = Set<members::source>;
         type GrantedAt = S::GrantedAt;
+        type Source = S::Source;
     }
     ///State transition - sets the `granted_at` field to Set
     pub struct SetGrantedAt<S: State = Empty>(PhantomData<fn() -> S>);
@@ -4867,8 +4848,17 @@ pub mod permission_grant_state {
     impl<S: State> State for SetGrantedAt<S> {
         type Scope = S::Scope;
         type Did = S::Did;
-        type Source = S::Source;
         type GrantedAt = Set<members::granted_at>;
+        type Source = S::Source;
+    }
+    ///State transition - sets the `source` field to Set
+    pub struct SetSource<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSource<S> {}
+    impl<S: State> State for SetSource<S> {
+        type Scope = S::Scope;
+        type Did = S::Did;
+        type GrantedAt = S::GrantedAt;
+        type Source = Set<members::source>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
@@ -4877,23 +4867,23 @@ pub mod permission_grant_state {
         pub struct scope(());
         ///Marker type for the `did` field
         pub struct did(());
-        ///Marker type for the `source` field
-        pub struct source(());
         ///Marker type for the `granted_at` field
         pub struct granted_at(());
+        ///Marker type for the `source` field
+        pub struct source(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PermissionGrantBuilder<'a, S: permission_grant_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Did<'a>>,
         Option<Datetime>,
         Option<PermissionGrantScope<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PermissionGrant<'a> {
@@ -4907,9 +4897,9 @@ impl<'a> PermissionGrantBuilder<'a, permission_grant_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PermissionGrantBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4924,11 +4914,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> PermissionGrantBuilder<'a, permission_grant_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PermissionGrantBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4943,11 +4933,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PermissionGrantBuilder<'a, permission_grant_state::SetGrantedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PermissionGrantBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4962,11 +4952,11 @@ where
         mut self,
         value: impl Into<PermissionGrantScope<'a>>,
     ) -> PermissionGrantBuilder<'a, permission_grant_state::SetScope<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PermissionGrantBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4981,11 +4971,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PermissionGrantBuilder<'a, permission_grant_state::SetSource<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PermissionGrantBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4995,16 +4985,16 @@ where
     S: permission_grant_state::State,
     S::Scope: permission_grant_state::IsSet,
     S::Did: permission_grant_state::IsSet,
-    S::Source: permission_grant_state::IsSet,
     S::GrantedAt: permission_grant_state::IsSet,
+    S::Source: permission_grant_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PermissionGrant<'a> {
         PermissionGrant {
-            did: self.__unsafe_private_named.0.unwrap(),
-            granted_at: self.__unsafe_private_named.1.unwrap(),
-            scope: self.__unsafe_private_named.2.unwrap(),
-            source: self.__unsafe_private_named.3.unwrap(),
+            did: self._fields.0.unwrap(),
+            granted_at: self._fields.1.unwrap(),
+            scope: self._fields.2.unwrap(),
+            source: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -5014,10 +5004,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> PermissionGrant<'a> {
         PermissionGrant {
-            did: self.__unsafe_private_named.0.unwrap(),
-            granted_at: self.__unsafe_private_named.1.unwrap(),
-            scope: self.__unsafe_private_named.2.unwrap(),
-            source: self.__unsafe_private_named.3.unwrap(),
+            did: self._fields.0.unwrap(),
+            granted_at: self._fields.1.unwrap(),
+            scope: self._fields.2.unwrap(),
+            source: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -5057,12 +5047,12 @@ pub mod permissions_state_state {
 
 /// Builder for constructing an instance of this type
 pub struct PermissionsStateBuilder<'a, S: permissions_state_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<notebook::PermissionGrant<'a>>>,
         Option<Vec<notebook::PermissionGrant<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PermissionsState<'a> {
@@ -5076,9 +5066,9 @@ impl<'a> PermissionsStateBuilder<'a, permissions_state_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PermissionsStateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5093,11 +5083,11 @@ where
         mut self,
         value: impl Into<Vec<notebook::PermissionGrant<'a>>>,
     ) -> PermissionsStateBuilder<'a, permissions_state_state::SetEditors<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PermissionsStateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5108,7 +5098,7 @@ impl<'a, S: permissions_state_state::State> PermissionsStateBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<notebook::PermissionGrant<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `viewers` field to an Option value (optional)
@@ -5116,7 +5106,7 @@ impl<'a, S: permissions_state_state::State> PermissionsStateBuilder<'a, S> {
         mut self,
         value: Option<Vec<notebook::PermissionGrant<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -5129,8 +5119,8 @@ where
     /// Build the final struct
     pub fn build(self) -> PermissionsState<'a> {
         PermissionsState {
-            editors: self.__unsafe_private_named.0.unwrap(),
-            viewers: self.__unsafe_private_named.1,
+            editors: self._fields.0.unwrap(),
+            viewers: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -5140,8 +5130,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> PermissionsState<'a> {
         PermissionsState {
-            editors: self.__unsafe_private_named.0.unwrap(),
-            viewers: self.__unsafe_private_named.1,
+            editors: self._fields.0.unwrap(),
+            viewers: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
@@ -5159,8 +5149,8 @@ pub mod published_version_view_state {
     pub trait State: sealed::Sealed {
         type Publisher;
         type Uri;
-        type Cid;
         type PublishedAt;
+        type Cid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
@@ -5168,8 +5158,8 @@ pub mod published_version_view_state {
     impl State for Empty {
         type Publisher = Unset;
         type Uri = Unset;
-        type Cid = Unset;
         type PublishedAt = Unset;
+        type Cid = Unset;
     }
     ///State transition - sets the `publisher` field to Set
     pub struct SetPublisher<S: State = Empty>(PhantomData<fn() -> S>);
@@ -5177,8 +5167,8 @@ pub mod published_version_view_state {
     impl<S: State> State for SetPublisher<S> {
         type Publisher = Set<members::publisher>;
         type Uri = S::Uri;
-        type Cid = S::Cid;
         type PublishedAt = S::PublishedAt;
+        type Cid = S::Cid;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
@@ -5186,17 +5176,8 @@ pub mod published_version_view_state {
     impl<S: State> State for SetUri<S> {
         type Publisher = S::Publisher;
         type Uri = Set<members::uri>;
-        type Cid = S::Cid;
-        type PublishedAt = S::PublishedAt;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type Publisher = S::Publisher;
-        type Uri = S::Uri;
-        type Cid = Set<members::cid>;
         type PublishedAt = S::PublishedAt;
+        type Cid = S::Cid;
     }
     ///State transition - sets the `published_at` field to Set
     pub struct SetPublishedAt<S: State = Empty>(PhantomData<fn() -> S>);
@@ -5204,8 +5185,17 @@ pub mod published_version_view_state {
     impl<S: State> State for SetPublishedAt<S> {
         type Publisher = S::Publisher;
         type Uri = S::Uri;
-        type Cid = S::Cid;
         type PublishedAt = Set<members::published_at>;
+        type Cid = S::Cid;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Publisher = S::Publisher;
+        type Uri = S::Uri;
+        type PublishedAt = S::PublishedAt;
+        type Cid = Set<members::cid>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
@@ -5214,17 +5204,17 @@ pub mod published_version_view_state {
         pub struct publisher(());
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `published_at` field
         pub struct published_at(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PublishedVersionViewBuilder<'a, S: published_version_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<StrongRef<'a>>,
         Option<bool>,
@@ -5233,7 +5223,7 @@ pub struct PublishedVersionViewBuilder<'a, S: published_version_view_state::Stat
         Option<Datetime>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PublishedVersionView<'a> {
@@ -5250,9 +5240,9 @@ impl<'a> PublishedVersionViewBuilder<'a, published_version_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PublishedVersionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5267,11 +5257,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> PublishedVersionViewBuilder<'a, published_version_view_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PublishedVersionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5279,12 +5269,12 @@ where
 impl<'a, S: published_version_view_state::State> PublishedVersionViewBuilder<'a, S> {
     /// Set the `divergedFrom` field (optional)
     pub fn diverged_from(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `divergedFrom` field to an Option value (optional)
     pub fn maybe_diverged_from(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -5292,12 +5282,12 @@ impl<'a, S: published_version_view_state::State> PublishedVersionViewBuilder<'a,
 impl<'a, S: published_version_view_state::State> PublishedVersionViewBuilder<'a, S> {
     /// Set the `isCanonical` field (optional)
     pub fn is_canonical(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `isCanonical` field to an Option value (optional)
     pub fn maybe_is_canonical(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -5315,11 +5305,11 @@ where
         'a,
         published_version_view_state::SetPublishedAt<S>,
     > {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PublishedVersionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5334,11 +5324,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> PublishedVersionViewBuilder<'a, published_version_view_state::SetPublisher<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PublishedVersionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5346,12 +5336,12 @@ where
 impl<'a, S: published_version_view_state::State> PublishedVersionViewBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -5366,11 +5356,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PublishedVersionViewBuilder<'a, published_version_view_state::SetUri<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         PublishedVersionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5380,19 +5370,19 @@ where
     S: published_version_view_state::State,
     S::Publisher: published_version_view_state::IsSet,
     S::Uri: published_version_view_state::IsSet,
-    S::Cid: published_version_view_state::IsSet,
     S::PublishedAt: published_version_view_state::IsSet,
+    S::Cid: published_version_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PublishedVersionView<'a> {
         PublishedVersionView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            diverged_from: self.__unsafe_private_named.1,
-            is_canonical: self.__unsafe_private_named.2,
-            published_at: self.__unsafe_private_named.3.unwrap(),
-            publisher: self.__unsafe_private_named.4.unwrap(),
-            updated_at: self.__unsafe_private_named.5,
-            uri: self.__unsafe_private_named.6.unwrap(),
+            cid: self._fields.0.unwrap(),
+            diverged_from: self._fields.1,
+            is_canonical: self._fields.2,
+            published_at: self._fields.3.unwrap(),
+            publisher: self._fields.4.unwrap(),
+            updated_at: self._fields.5,
+            uri: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -5402,13 +5392,13 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> PublishedVersionView<'a> {
         PublishedVersionView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            diverged_from: self.__unsafe_private_named.1,
-            is_canonical: self.__unsafe_private_named.2,
-            published_at: self.__unsafe_private_named.3.unwrap(),
-            publisher: self.__unsafe_private_named.4.unwrap(),
-            updated_at: self.__unsafe_private_named.5,
-            uri: self.__unsafe_private_named.6.unwrap(),
+            cid: self._fields.0.unwrap(),
+            diverged_from: self._fields.1,
+            is_canonical: self._fields.2,
+            published_at: self._fields.3.unwrap(),
+            publisher: self._fields.4.unwrap(),
+            updated_at: self._fields.5,
+            uri: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -5460,9 +5450,9 @@ pub mod reason_bookmark_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReasonBookmarkBuilder<'a, S: reason_bookmark_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ProfileViewBasic<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ProfileViewBasic<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReasonBookmark<'a> {
@@ -5476,9 +5466,9 @@ impl<'a> ReasonBookmarkBuilder<'a, reason_bookmark_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReasonBookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5493,11 +5483,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> ReasonBookmarkBuilder<'a, reason_bookmark_state::SetBy<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReasonBookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5512,11 +5502,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReasonBookmarkBuilder<'a, reason_bookmark_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReasonBookmarkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5530,8 +5520,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ReasonBookmark<'a> {
         ReasonBookmark {
-            by: self.__unsafe_private_named.0.unwrap(),
-            indexed_at: self.__unsafe_private_named.1.unwrap(),
+            by: self._fields.0.unwrap(),
+            indexed_at: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -5541,8 +5531,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ReasonBookmark<'a> {
         ReasonBookmark {
-            by: self.__unsafe_private_named.0.unwrap(),
-            indexed_at: self.__unsafe_private_named.1.unwrap(),
+            by: self._fields.0.unwrap(),
+            indexed_at: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -5558,45 +5548,45 @@ pub mod reason_like_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type By;
         type IndexedAt;
+        type By;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type By = Unset;
         type IndexedAt = Unset;
-    }
-    ///State transition - sets the `by` field to Set
-    pub struct SetBy<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBy<S> {}
-    impl<S: State> State for SetBy<S> {
-        type By = Set<members::by>;
-        type IndexedAt = S::IndexedAt;
+        type By = Unset;
     }
     ///State transition - sets the `indexed_at` field to Set
     pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
     impl<S: State> State for SetIndexedAt<S> {
-        type By = S::By;
         type IndexedAt = Set<members::indexed_at>;
+        type By = S::By;
+    }
+    ///State transition - sets the `by` field to Set
+    pub struct SetBy<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBy<S> {}
+    impl<S: State> State for SetBy<S> {
+        type IndexedAt = S::IndexedAt;
+        type By = Set<members::by>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `by` field
-        pub struct by(());
         ///Marker type for the `indexed_at` field
         pub struct indexed_at(());
+        ///Marker type for the `by` field
+        pub struct by(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReasonLikeBuilder<'a, S: reason_like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<ProfileViewBasic<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ProfileViewBasic<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReasonLike<'a> {
@@ -5610,9 +5600,9 @@ impl<'a> ReasonLikeBuilder<'a, reason_like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReasonLikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5627,11 +5617,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> ReasonLikeBuilder<'a, reason_like_state::SetBy<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReasonLikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5646,11 +5636,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReasonLikeBuilder<'a, reason_like_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReasonLikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5658,14 +5648,14 @@ where
 impl<'a, S> ReasonLikeBuilder<'a, S>
 where
     S: reason_like_state::State,
-    S::By: reason_like_state::IsSet,
     S::IndexedAt: reason_like_state::IsSet,
+    S::By: reason_like_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ReasonLike<'a> {
         ReasonLike {
-            by: self.__unsafe_private_named.0.unwrap(),
-            indexed_at: self.__unsafe_private_named.1.unwrap(),
+            by: self._fields.0.unwrap(),
+            indexed_at: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -5675,8 +5665,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ReasonLike<'a> {
         ReasonLike {
-            by: self.__unsafe_private_named.0.unwrap(),
-            indexed_at: self.__unsafe_private_named.1.unwrap(),
+            by: self._fields.0.unwrap(),
+            indexed_at: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -5716,9 +5706,9 @@ pub mod reason_subscription_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReasonSubscriptionBuilder<'a, S: reason_subscription_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReasonSubscription<'a> {
@@ -5732,9 +5722,9 @@ impl<'a> ReasonSubscriptionBuilder<'a, reason_subscription_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReasonSubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5749,11 +5739,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReasonSubscriptionBuilder<'a, reason_subscription_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReasonSubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5766,7 +5756,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ReasonSubscription<'a> {
         ReasonSubscription {
-            indexed_at: self.__unsafe_private_named.0.unwrap(),
+            indexed_at: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -5776,7 +5766,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ReasonSubscription<'a> {
         ReasonSubscription {
-            indexed_at: self.__unsafe_private_named.0.unwrap(),
+            indexed_at: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -5816,9 +5806,9 @@ pub mod rendered_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct RenderedViewBuilder<'a, S: rendered_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>, Option<BlobRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>, Option<BlobRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RenderedView<'a> {
@@ -5832,9 +5822,9 @@ impl<'a> RenderedViewBuilder<'a, rendered_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RenderedViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5842,12 +5832,12 @@ impl<'a> RenderedViewBuilder<'a, rendered_view_state::Empty> {
 impl<'a, S: rendered_view_state::State> RenderedViewBuilder<'a, S> {
     /// Set the `css` field (optional)
     pub fn css(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `css` field to an Option value (optional)
     pub fn maybe_css(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -5862,11 +5852,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> RenderedViewBuilder<'a, rendered_view_state::SetHtml<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RenderedViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5879,8 +5869,8 @@ where
     /// Build the final struct
     pub fn build(self) -> RenderedView<'a> {
         RenderedView {
-            css: self.__unsafe_private_named.0,
-            html: self.__unsafe_private_named.1.unwrap(),
+            css: self._fields.0,
+            html: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -5890,8 +5880,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> RenderedView<'a> {
         RenderedView {
-            css: self.__unsafe_private_named.0,
-            html: self.__unsafe_private_named.1.unwrap(),
+            css: self._fields.0,
+            html: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/authors.rs b/crates/jacquard-api/src/sh_weaver/notebook/authors.rs
index e3409a26..25dc02ec 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/authors.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/authors.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -176,9 +179,9 @@ pub mod author_list_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct AuthorListItemBuilder<'a, S: author_list_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<AuthorListItemProfile<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<AuthorListItemProfile<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AuthorListItem<'a> {
@@ -192,9 +195,9 @@ impl<'a> AuthorListItemBuilder<'a, author_list_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AuthorListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -202,12 +205,12 @@ impl<'a> AuthorListItemBuilder<'a, author_list_item_state::Empty> {
 impl<'a, S: author_list_item_state::State> AuthorListItemBuilder<'a, S> {
     /// Set the `index` field (optional)
     pub fn index(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `index` field to an Option value (optional)
     pub fn maybe_index(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -218,12 +221,12 @@ impl<'a, S: author_list_item_state::State> AuthorListItemBuilder<'a, S> {
         mut self,
         value: impl Into<Option<AuthorListItemProfile<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `profile` field to an Option value (optional)
     pub fn maybe_profile(mut self, value: Option<AuthorListItemProfile<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -236,8 +239,8 @@ where
     /// Build the final struct
     pub fn build(self) -> AuthorListItem<'a> {
         AuthorListItem {
-            index: self.__unsafe_private_named.0,
-            profile: self.__unsafe_private_named.1,
+            index: self._fields.0,
+            profile: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -250,8 +253,8 @@ where
         >,
     ) -> AuthorListItem<'a> {
         AuthorListItem {
-            index: self.__unsafe_private_named.0,
-            profile: self.__unsafe_private_named.1,
+            index: self._fields.0,
+            profile: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
@@ -374,9 +377,9 @@ pub mod authors_state {
 
 /// Builder for constructing an instance of this type
 pub struct AuthorsBuilder<'a, S: authors_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<authors::AuthorListItem<'a>>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<authors::AuthorListItem<'a>>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Authors<'a> {
@@ -390,9 +393,9 @@ impl<'a> AuthorsBuilder<'a, authors_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AuthorsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -407,11 +410,11 @@ where
         mut self,
         value: impl Into<Vec<authors::AuthorListItem<'a>>>,
     ) -> AuthorsBuilder<'a, authors_state::SetAuthorList<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AuthorsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -419,12 +422,12 @@ where
 impl<'a, S: authors_state::State> AuthorsBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -437,8 +440,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Authors<'a> {
         Authors {
-            author_list: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1,
+            author_list: self._fields.0.unwrap(),
+            created_at: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -451,8 +454,8 @@ where
         >,
     ) -> Authors<'a> {
         Authors {
-            author_list: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1,
+            author_list: self._fields.0.unwrap(),
+            created_at: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/book.rs b/crates/jacquard-api/src/sh_weaver/notebook/book.rs
index 739fd3b8..2c1e8f76 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/book.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/book.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -143,44 +146,44 @@ pub mod book_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Authors;
         type EntryList;
+        type Authors;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Authors = Unset;
         type EntryList = Unset;
-    }
-    ///State transition - sets the `authors` field to Set
-    pub struct SetAuthors<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAuthors<S> {}
-    impl<S: State> State for SetAuthors<S> {
-        type Authors = Set<members::authors>;
-        type EntryList = S::EntryList;
+        type Authors = Unset;
     }
     ///State transition - sets the `entry_list` field to Set
     pub struct SetEntryList<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEntryList<S> {}
     impl<S: State> State for SetEntryList<S> {
-        type Authors = S::Authors;
         type EntryList = Set<members::entry_list>;
+        type Authors = S::Authors;
+    }
+    ///State transition - sets the `authors` field to Set
+    pub struct SetAuthors<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAuthors<S> {}
+    impl<S: State> State for SetAuthors<S> {
+        type EntryList = S::EntryList;
+        type Authors = Set<members::authors>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `authors` field
-        pub struct authors(());
         ///Marker type for the `entry_list` field
         pub struct entry_list(());
+        ///Marker type for the `authors` field
+        pub struct authors(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BookBuilder<'a, S: book_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<Author<'a>>>,
         Option<ContentWarnings<'a>>,
         Option<Datetime>,
@@ -193,7 +196,7 @@ pub struct BookBuilder<'a, S: book_state::State> {
         Option<Title<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Book<'a> {
@@ -207,21 +210,9 @@ impl<'a> BookBuilder<'a, book_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -236,11 +227,11 @@ where
         mut self,
         value: impl Into<Vec<Author<'a>>>,
     ) -> BookBuilder<'a, book_state::SetAuthors<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -251,12 +242,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ContentWarnings<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `contentWarnings` field to an Option value (optional)
     pub fn maybe_content_warnings(mut self, value: Option<ContentWarnings<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -264,12 +255,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -284,11 +275,11 @@ where
         mut self,
         value: impl Into<Vec<StrongRef<'a>>>,
     ) -> BookBuilder<'a, book_state::SetEntryList<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -296,12 +287,12 @@ where
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `path` field (optional)
     pub fn path(mut self, value: impl Into<Option<Path<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `path` field to an Option value (optional)
     pub fn maybe_path(mut self, value: Option<Path<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -309,12 +300,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `publishGlobal` field (optional)
     pub fn publish_global(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `publishGlobal` field to an Option value (optional)
     pub fn maybe_publish_global(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -322,12 +313,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `rating` field (optional)
     pub fn rating(mut self, value: impl Into<Option<ContentRating<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `rating` field to an Option value (optional)
     pub fn maybe_rating(mut self, value: Option<ContentRating<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -335,12 +326,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Tags<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Tags<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -348,12 +339,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `theme` field (optional)
     pub fn theme(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `theme` field to an Option value (optional)
     pub fn maybe_theme(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -361,12 +352,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<Title<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<Title<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -374,12 +365,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -387,23 +378,23 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S> BookBuilder<'a, S>
 where
     S: book_state::State,
-    S::Authors: book_state::IsSet,
     S::EntryList: book_state::IsSet,
+    S::Authors: book_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Book<'a> {
         Book {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            content_warnings: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            entry_list: self.__unsafe_private_named.3.unwrap(),
-            path: self.__unsafe_private_named.4,
-            publish_global: self.__unsafe_private_named.5,
-            rating: self.__unsafe_private_named.6,
-            tags: self.__unsafe_private_named.7,
-            theme: self.__unsafe_private_named.8,
-            title: self.__unsafe_private_named.9,
-            updated_at: self.__unsafe_private_named.10,
+            authors: self._fields.0.unwrap(),
+            content_warnings: self._fields.1,
+            created_at: self._fields.2,
+            entry_list: self._fields.3.unwrap(),
+            path: self._fields.4,
+            publish_global: self._fields.5,
+            rating: self._fields.6,
+            tags: self._fields.7,
+            theme: self._fields.8,
+            title: self._fields.9,
+            updated_at: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -416,17 +407,17 @@ where
         >,
     ) -> Book<'a> {
         Book {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            content_warnings: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            entry_list: self.__unsafe_private_named.3.unwrap(),
-            path: self.__unsafe_private_named.4,
-            publish_global: self.__unsafe_private_named.5,
-            rating: self.__unsafe_private_named.6,
-            tags: self.__unsafe_private_named.7,
-            theme: self.__unsafe_private_named.8,
-            title: self.__unsafe_private_named.9,
-            updated_at: self.__unsafe_private_named.10,
+            authors: self._fields.0.unwrap(),
+            content_warnings: self._fields.1,
+            created_at: self._fields.2,
+            entry_list: self._fields.3.unwrap(),
+            path: self._fields.4,
+            publish_global: self._fields.5,
+            rating: self._fields.6,
+            tags: self._fields.7,
+            theme: self._fields.8,
+            title: self._fields.9,
+            updated_at: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/chapter.rs b/crates/jacquard-api/src/sh_weaver/notebook/chapter.rs
index 6d663707..5f72294f 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/chapter.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/chapter.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -133,49 +136,49 @@ pub mod chapter_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Notebook;
         type Authors;
+        type Notebook;
         type EntryList;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Notebook = Unset;
         type Authors = Unset;
+        type Notebook = Unset;
         type EntryList = Unset;
     }
-    ///State transition - sets the `notebook` field to Set
-    pub struct SetNotebook<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetNotebook<S> {}
-    impl<S: State> State for SetNotebook<S> {
-        type Notebook = Set<members::notebook>;
-        type Authors = S::Authors;
-        type EntryList = S::EntryList;
-    }
     ///State transition - sets the `authors` field to Set
     pub struct SetAuthors<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthors<S> {}
     impl<S: State> State for SetAuthors<S> {
-        type Notebook = S::Notebook;
         type Authors = Set<members::authors>;
+        type Notebook = S::Notebook;
+        type EntryList = S::EntryList;
+    }
+    ///State transition - sets the `notebook` field to Set
+    pub struct SetNotebook<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetNotebook<S> {}
+    impl<S: State> State for SetNotebook<S> {
+        type Authors = S::Authors;
+        type Notebook = Set<members::notebook>;
         type EntryList = S::EntryList;
     }
     ///State transition - sets the `entry_list` field to Set
     pub struct SetEntryList<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEntryList<S> {}
     impl<S: State> State for SetEntryList<S> {
-        type Notebook = S::Notebook;
         type Authors = S::Authors;
+        type Notebook = S::Notebook;
         type EntryList = Set<members::entry_list>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `notebook` field
-        pub struct notebook(());
         ///Marker type for the `authors` field
         pub struct authors(());
+        ///Marker type for the `notebook` field
+        pub struct notebook(());
         ///Marker type for the `entry_list` field
         pub struct entry_list(());
     }
@@ -183,8 +186,8 @@ pub mod chapter_state {
 
 /// Builder for constructing an instance of this type
 pub struct ChapterBuilder<'a, S: chapter_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<Author<'a>>>,
         Option<ContentWarnings<'a>>,
         Option<Datetime>,
@@ -194,7 +197,7 @@ pub struct ChapterBuilder<'a, S: chapter_state::State> {
         Option<Tags<'a>>,
         Option<Title<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Chapter<'a> {
@@ -208,9 +211,9 @@ impl<'a> ChapterBuilder<'a, chapter_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ChapterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -225,11 +228,11 @@ where
         mut self,
         value: impl Into<Vec<Author<'a>>>,
     ) -> ChapterBuilder<'a, chapter_state::SetAuthors<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ChapterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -240,12 +243,12 @@ impl<'a, S: chapter_state::State> ChapterBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ContentWarnings<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `contentWarnings` field to an Option value (optional)
     pub fn maybe_content_warnings(mut self, value: Option<ContentWarnings<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -253,12 +256,12 @@ impl<'a, S: chapter_state::State> ChapterBuilder<'a, S> {
 impl<'a, S: chapter_state::State> ChapterBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -273,11 +276,11 @@ where
         mut self,
         value: impl Into<Vec<StrongRef<'a>>>,
     ) -> ChapterBuilder<'a, chapter_state::SetEntryList<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ChapterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -292,11 +295,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ChapterBuilder<'a, chapter_state::SetNotebook<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ChapterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -304,12 +307,12 @@ where
 impl<'a, S: chapter_state::State> ChapterBuilder<'a, S> {
     /// Set the `rating` field (optional)
     pub fn rating(mut self, value: impl Into<Option<ContentRating<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `rating` field to an Option value (optional)
     pub fn maybe_rating(mut self, value: Option<ContentRating<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -317,12 +320,12 @@ impl<'a, S: chapter_state::State> ChapterBuilder<'a, S> {
 impl<'a, S: chapter_state::State> ChapterBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Tags<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Tags<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -330,12 +333,12 @@ impl<'a, S: chapter_state::State> ChapterBuilder<'a, S> {
 impl<'a, S: chapter_state::State> ChapterBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<Title<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<Title<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -343,21 +346,21 @@ impl<'a, S: chapter_state::State> ChapterBuilder<'a, S> {
 impl<'a, S> ChapterBuilder<'a, S>
 where
     S: chapter_state::State,
-    S::Notebook: chapter_state::IsSet,
     S::Authors: chapter_state::IsSet,
+    S::Notebook: chapter_state::IsSet,
     S::EntryList: chapter_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Chapter<'a> {
         Chapter {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            content_warnings: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            entry_list: self.__unsafe_private_named.3.unwrap(),
-            notebook: self.__unsafe_private_named.4.unwrap(),
-            rating: self.__unsafe_private_named.5,
-            tags: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7,
+            authors: self._fields.0.unwrap(),
+            content_warnings: self._fields.1,
+            created_at: self._fields.2,
+            entry_list: self._fields.3.unwrap(),
+            notebook: self._fields.4.unwrap(),
+            rating: self._fields.5,
+            tags: self._fields.6,
+            title: self._fields.7,
             extra_data: Default::default(),
         }
     }
@@ -370,14 +373,14 @@ where
         >,
     ) -> Chapter<'a> {
         Chapter {
-            authors: self.__unsafe_private_named.0.unwrap(),
-            content_warnings: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            entry_list: self.__unsafe_private_named.3.unwrap(),
-            notebook: self.__unsafe_private_named.4.unwrap(),
-            rating: self.__unsafe_private_named.5,
-            tags: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7,
+            authors: self._fields.0.unwrap(),
+            content_warnings: self._fields.1,
+            created_at: self._fields.2,
+            entry_list: self._fields.3.unwrap(),
+            notebook: self._fields.4.unwrap(),
+            rating: self._fields.5,
+            tags: self._fields.6,
+            title: self._fields.7,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/colour_scheme.rs b/crates/jacquard-api/src/sh_weaver/notebook/colour_scheme.rs
index c3428433..b3db295b 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/colour_scheme.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/colour_scheme.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -468,13 +471,9 @@ pub mod colour_scheme_state {
 
 /// Builder for constructing an instance of this type
 pub struct ColourSchemeBuilder<'a, S: colour_scheme_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<ColourSchemeColours<'a>>,
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<ColourSchemeColours<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ColourScheme<'a> {
@@ -488,9 +487,9 @@ impl<'a> ColourSchemeBuilder<'a, colour_scheme_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ColourSchemeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -505,11 +504,11 @@ where
         mut self,
         value: impl Into<ColourSchemeColours<'a>>,
     ) -> ColourSchemeBuilder<'a, colour_scheme_state::SetColours<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ColourSchemeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -524,11 +523,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ColourSchemeBuilder<'a, colour_scheme_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ColourSchemeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -543,11 +542,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ColourSchemeBuilder<'a, colour_scheme_state::SetVariant<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ColourSchemeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -562,9 +561,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ColourScheme<'a> {
         ColourScheme {
-            colours: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            variant: self.__unsafe_private_named.2.unwrap(),
+            colours: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            variant: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -577,9 +576,9 @@ where
         >,
     ) -> ColourScheme<'a> {
         ColourScheme {
-            colours: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            variant: self.__unsafe_private_named.2.unwrap(),
+            colours: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            variant: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/entry.rs b/crates/jacquard-api/src/sh_weaver/notebook/entry.rs
index 4c26290f..f91f053c 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/entry.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/entry.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -358,74 +361,74 @@ pub mod entry_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Content;
         type Title;
-        type CreatedAt;
         type Path;
-        type Content;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Content = Unset;
         type Title = Unset;
-        type CreatedAt = Unset;
         type Path = Unset;
-        type Content = Unset;
+        type CreatedAt = Unset;
+    }
+    ///State transition - sets the `content` field to Set
+    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContent<S> {}
+    impl<S: State> State for SetContent<S> {
+        type Content = Set<members::content>;
+        type Title = S::Title;
+        type Path = S::Path;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Title = Set<members::title>;
-        type CreatedAt = S::CreatedAt;
-        type Path = S::Path;
         type Content = S::Content;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type Title = S::Title;
-        type CreatedAt = Set<members::created_at>;
+        type Title = Set<members::title>;
         type Path = S::Path;
-        type Content = S::Content;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `path` field to Set
     pub struct SetPath<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPath<S> {}
     impl<S: State> State for SetPath<S> {
+        type Content = S::Content;
         type Title = S::Title;
-        type CreatedAt = S::CreatedAt;
         type Path = Set<members::path>;
-        type Content = S::Content;
+        type CreatedAt = S::CreatedAt;
     }
-    ///State transition - sets the `content` field to Set
-    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContent<S> {}
-    impl<S: State> State for SetContent<S> {
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Content = S::Content;
         type Title = S::Title;
-        type CreatedAt = S::CreatedAt;
         type Path = S::Path;
-        type Content = Set<members::content>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `content` field
+        pub struct content(());
         ///Marker type for the `title` field
         pub struct title(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `path` field
         pub struct path(());
-        ///Marker type for the `content` field
-        pub struct content(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EntryBuilder<'a, S: entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<Author<'a>>>,
         Option<CowStr<'a>>,
         Option<ContentWarnings<'a>>,
@@ -437,7 +440,7 @@ pub struct EntryBuilder<'a, S: entry_state::State> {
         Option<Title<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Entry<'a> {
@@ -451,20 +454,9 @@ impl<'a> EntryBuilder<'a, entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -472,12 +464,12 @@ impl<'a> EntryBuilder<'a, entry_state::Empty> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `authors` field (optional)
     pub fn authors(mut self, value: impl Into<Option<Vec<Author<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `authors` field to an Option value (optional)
     pub fn maybe_authors(mut self, value: Option<Vec<Author<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -492,11 +484,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EntryBuilder<'a, entry_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -507,12 +499,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ContentWarnings<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `contentWarnings` field to an Option value (optional)
     pub fn maybe_content_warnings(mut self, value: Option<ContentWarnings<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -527,11 +519,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EntryBuilder<'a, entry_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -539,12 +531,12 @@ where
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `embeds` field (optional)
     pub fn embeds(mut self, value: impl Into<Option<EntryEmbeds<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `embeds` field to an Option value (optional)
     pub fn maybe_embeds(mut self, value: Option<EntryEmbeds<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -559,11 +551,11 @@ where
         mut self,
         value: impl Into<Path<'a>>,
     ) -> EntryBuilder<'a, entry_state::SetPath<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -571,12 +563,12 @@ where
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `rating` field (optional)
     pub fn rating(mut self, value: impl Into<Option<ContentRating<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `rating` field to an Option value (optional)
     pub fn maybe_rating(mut self, value: Option<ContentRating<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -584,12 +576,12 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Tags<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Tags<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -604,11 +596,11 @@ where
         mut self,
         value: impl Into<Title<'a>>,
     ) -> EntryBuilder<'a, entry_state::SetTitle<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         EntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -616,12 +608,12 @@ where
 impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -629,24 +621,24 @@ impl<'a, S: entry_state::State> EntryBuilder<'a, S> {
 impl<'a, S> EntryBuilder<'a, S>
 where
     S: entry_state::State,
+    S::Content: entry_state::IsSet,
     S::Title: entry_state::IsSet,
-    S::CreatedAt: entry_state::IsSet,
     S::Path: entry_state::IsSet,
-    S::Content: entry_state::IsSet,
+    S::CreatedAt: entry_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Entry<'a> {
         Entry {
-            authors: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            content_warnings: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            embeds: self.__unsafe_private_named.4,
-            path: self.__unsafe_private_named.5.unwrap(),
-            rating: self.__unsafe_private_named.6,
-            tags: self.__unsafe_private_named.7,
-            title: self.__unsafe_private_named.8.unwrap(),
-            updated_at: self.__unsafe_private_named.9,
+            authors: self._fields.0,
+            content: self._fields.1.unwrap(),
+            content_warnings: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            embeds: self._fields.4,
+            path: self._fields.5.unwrap(),
+            rating: self._fields.6,
+            tags: self._fields.7,
+            title: self._fields.8.unwrap(),
+            updated_at: self._fields.9,
             extra_data: Default::default(),
         }
     }
@@ -659,16 +651,16 @@ where
         >,
     ) -> Entry<'a> {
         Entry {
-            authors: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            content_warnings: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            embeds: self.__unsafe_private_named.4,
-            path: self.__unsafe_private_named.5.unwrap(),
-            rating: self.__unsafe_private_named.6,
-            tags: self.__unsafe_private_named.7,
-            title: self.__unsafe_private_named.8.unwrap(),
-            updated_at: self.__unsafe_private_named.9,
+            authors: self._fields.0,
+            content: self._fields.1.unwrap(),
+            content_warnings: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            embeds: self._fields.4,
+            path: self._fields.5.unwrap(),
+            rating: self._fields.6,
+            tags: self._fields.7,
+            title: self._fields.8.unwrap(),
+            updated_at: self._fields.9,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_book_entry.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_book_entry.rs
index 13046c72..977e827c 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_book_entry.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_book_entry.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -140,9 +141,9 @@ pub mod get_book_entry_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetBookEntryBuilder<'a, S: get_book_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetBookEntry<'a> {
@@ -156,9 +157,9 @@ impl<'a> GetBookEntryBuilder<'a, get_book_entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetBookEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -166,12 +167,12 @@ impl<'a> GetBookEntryBuilder<'a, get_book_entry_state::Empty> {
 impl<'a, S: get_book_entry_state::State> GetBookEntryBuilder<'a, S> {
     /// Set the `index` field (optional)
     pub fn index(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `index` field to an Option value (optional)
     pub fn maybe_index(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -186,11 +187,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetBookEntryBuilder<'a, get_book_entry_state::SetNotebook<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetBookEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,8 +204,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetBookEntry<'a> {
         GetBookEntry {
-            index: self.__unsafe_private_named.0,
-            notebook: self.__unsafe_private_named.1.unwrap(),
+            index: self._fields.0,
+            notebook: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_chapter.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_chapter.rs
index 1de78ee6..7baa60f4 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_chapter.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_chapter.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -140,9 +143,9 @@ pub mod get_chapter_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetChapterBuilder<'a, S: get_chapter_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetChapter<'a> {
@@ -156,9 +159,9 @@ impl<'a> GetChapterBuilder<'a, get_chapter_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetChapterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -173,11 +176,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetChapterBuilder<'a, get_chapter_state::SetChapter<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetChapterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -185,12 +188,12 @@ where
 impl<'a, S: get_chapter_state::State> GetChapterBuilder<'a, S> {
     /// Set the `entryCursor` field (optional)
     pub fn entry_cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `entryCursor` field to an Option value (optional)
     pub fn maybe_entry_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -198,12 +201,12 @@ impl<'a, S: get_chapter_state::State> GetChapterBuilder<'a, S> {
 impl<'a, S: get_chapter_state::State> GetChapterBuilder<'a, S> {
     /// Set the `entryLimit` field (optional)
     pub fn entry_limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `entryLimit` field to an Option value (optional)
     pub fn maybe_entry_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -216,9 +219,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetChapter<'a> {
         GetChapter {
-            chapter: self.__unsafe_private_named.0.unwrap(),
-            entry_cursor: self.__unsafe_private_named.1,
-            entry_limit: self.__unsafe_private_named.2,
+            chapter: self._fields.0.unwrap(),
+            entry_cursor: self._fields.1,
+            entry_limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_continue_reading.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_continue_reading.rs
index 5537692d..288843da 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_continue_reading.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_continue_reading.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::value::Data;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -78,8 +81,8 @@ pub mod get_continue_reading_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetContinueReadingBuilder<S: get_continue_reading_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
 }
 
 impl GetContinueReading {
@@ -93,8 +96,8 @@ impl GetContinueReadingBuilder<get_continue_reading_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetContinueReadingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -102,12 +105,12 @@ impl GetContinueReadingBuilder<get_continue_reading_state::Empty> {
 impl<S: get_continue_reading_state::State> GetContinueReadingBuilder<S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -119,7 +122,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetContinueReading {
         GetContinueReading {
-            limit: self.__unsafe_private_named.0,
+            limit: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_entry.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_entry.rs
index 314a35ed..6da678d3 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_entry.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_entry.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -123,9 +124,9 @@ pub mod get_entry_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetEntryBuilder<'a, S: get_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetEntry<'a> {
@@ -139,9 +140,9 @@ impl<'a> GetEntryBuilder<'a, get_entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -156,11 +157,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetEntryBuilder<'a, get_entry_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -173,7 +174,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetEntry<'a> {
         GetEntry {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_entry_by_title.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_entry_by_title.rs
index 14f5ef7a..7270c6da 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_entry_by_title.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_entry_by_title.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -150,9 +153,9 @@ pub mod get_entry_by_title_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetEntryByTitleBuilder<'a, S: get_entry_by_title_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetEntryByTitle<'a> {
@@ -166,9 +169,9 @@ impl<'a> GetEntryByTitleBuilder<'a, get_entry_by_title_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetEntryByTitleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,11 +186,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetEntryByTitleBuilder<'a, get_entry_by_title_state::SetNotebook<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetEntryByTitleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -202,11 +205,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetEntryByTitleBuilder<'a, get_entry_by_title_state::SetTitle<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetEntryByTitleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -220,8 +223,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetEntryByTitle<'a> {
         GetEntryByTitle {
-            notebook: self.__unsafe_private_named.0.unwrap(),
-            title: self.__unsafe_private_named.1.unwrap(),
+            notebook: self._fields.0.unwrap(),
+            title: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_entry_detail.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_entry_detail.rs
index 29a7a028..e6ad6b18 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_entry_detail.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_entry_detail.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -134,9 +137,9 @@ pub mod get_entry_detail_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetEntryDetailBuilder<'a, S: get_entry_detail_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetEntryDetail<'a> {
@@ -150,9 +153,9 @@ impl<'a> GetEntryDetailBuilder<'a, get_entry_detail_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetEntryDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -167,11 +170,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetEntryDetailBuilder<'a, get_entry_detail_state::SetEntry<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetEntryDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,12 +182,12 @@ where
 impl<'a, S: get_entry_detail_state::State> GetEntryDetailBuilder<'a, S> {
     /// Set the `notebookContext` field (optional)
     pub fn notebook_context(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `notebookContext` field to an Option value (optional)
     pub fn maybe_notebook_context(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -197,8 +200,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetEntryDetail<'a> {
         GetEntryDetail {
-            entry: self.__unsafe_private_named.0.unwrap(),
-            notebook_context: self.__unsafe_private_named.1,
+            entry: self._fields.0.unwrap(),
+            notebook_context: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_entry_feed.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_entry_feed.rs
index 4ef2f524..a45e4ffd 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_entry_feed.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_entry_feed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -101,15 +104,15 @@ pub mod get_entry_feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetEntryFeedBuilder<'a, S: get_entry_feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
         Option<i64>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetEntryFeed<'a> {
@@ -123,9 +126,9 @@ impl<'a> GetEntryFeedBuilder<'a, get_entry_feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetEntryFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -133,12 +136,12 @@ impl<'a> GetEntryFeedBuilder<'a, get_entry_feed_state::Empty> {
 impl<'a, S: get_entry_feed_state::State> GetEntryFeedBuilder<'a, S> {
     /// Set the `algorithm` field (optional)
     pub fn algorithm(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `algorithm` field to an Option value (optional)
     pub fn maybe_algorithm(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -146,12 +149,12 @@ impl<'a, S: get_entry_feed_state::State> GetEntryFeedBuilder<'a, S> {
 impl<'a, S: get_entry_feed_state::State> GetEntryFeedBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -159,12 +162,12 @@ impl<'a, S: get_entry_feed_state::State> GetEntryFeedBuilder<'a, S> {
 impl<'a, S: get_entry_feed_state::State> GetEntryFeedBuilder<'a, S> {
     /// Set the `feed` field (optional)
     pub fn feed(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `feed` field to an Option value (optional)
     pub fn maybe_feed(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -172,12 +175,12 @@ impl<'a, S: get_entry_feed_state::State> GetEntryFeedBuilder<'a, S> {
 impl<'a, S: get_entry_feed_state::State> GetEntryFeedBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -185,12 +188,12 @@ impl<'a, S: get_entry_feed_state::State> GetEntryFeedBuilder<'a, S> {
 impl<'a, S: get_entry_feed_state::State> GetEntryFeedBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -202,11 +205,11 @@ where
     /// Build the final struct
     pub fn build(self) -> GetEntryFeed<'a> {
         GetEntryFeed {
-            algorithm: self.__unsafe_private_named.0,
-            cursor: self.__unsafe_private_named.1,
-            feed: self.__unsafe_private_named.2,
-            limit: self.__unsafe_private_named.3,
-            tags: self.__unsafe_private_named.4,
+            algorithm: self._fields.0,
+            cursor: self._fields.1,
+            feed: self._fields.2,
+            limit: self._fields.3,
+            tags: self._fields.4,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_entry_notebooks.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_entry_notebooks.rs
index 31e09676..951302c4 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_entry_notebooks.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_entry_notebooks.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -129,9 +132,9 @@ pub mod get_entry_notebooks_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetEntryNotebooksBuilder<'a, S: get_entry_notebooks_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetEntryNotebooks<'a> {
@@ -145,9 +148,9 @@ impl<'a> GetEntryNotebooksBuilder<'a, get_entry_notebooks_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetEntryNotebooksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -162,11 +165,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetEntryNotebooksBuilder<'a, get_entry_notebooks_state::SetEntry<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetEntryNotebooksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,7 +182,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetEntryNotebooks<'a> {
         GetEntryNotebooks {
-            entry: self.__unsafe_private_named.0.unwrap(),
+            entry: self._fields.0.unwrap(),
         }
     }
 }
@@ -230,14 +233,14 @@ pub mod notebook_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct NotebookRefBuilder<'a, S: notebook_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<ProfileViewBasic<'a>>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> NotebookRef<'a> {
@@ -251,9 +254,9 @@ impl<'a> NotebookRefBuilder<'a, notebook_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NotebookRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -268,11 +271,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> NotebookRefBuilder<'a, notebook_ref_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NotebookRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -280,12 +283,12 @@ where
 impl<'a, S: notebook_ref_state::State> NotebookRefBuilder<'a, S> {
     /// Set the `owner` field (optional)
     pub fn owner(mut self, value: impl Into<Option<ProfileViewBasic<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `owner` field to an Option value (optional)
     pub fn maybe_owner(mut self, value: Option<ProfileViewBasic<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -293,12 +296,12 @@ impl<'a, S: notebook_ref_state::State> NotebookRefBuilder<'a, S> {
 impl<'a, S: notebook_ref_state::State> NotebookRefBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -313,11 +316,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> NotebookRefBuilder<'a, notebook_ref_state::SetUri<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         NotebookRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -331,10 +334,10 @@ where
     /// Build the final struct
     pub fn build(self) -> NotebookRef<'a> {
         NotebookRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            owner: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            cid: self._fields.0.unwrap(),
+            owner: self._fields.1,
+            title: self._fields.2,
+            uri: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -347,10 +350,10 @@ where
         >,
     ) -> NotebookRef<'a> {
         NotebookRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            owner: self.__unsafe_private_named.1,
-            title: self.__unsafe_private_named.2,
-            uri: self.__unsafe_private_named.3.unwrap(),
+            cid: self._fields.0.unwrap(),
+            owner: self._fields.1,
+            title: self._fields.2,
+            uri: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_notebook.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_notebook.rs
index f24d3197..44a6b437 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_notebook.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_notebook.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -89,9 +92,9 @@ pub mod get_notebook_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetNotebookBuilder<'a, S: get_notebook_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetNotebook<'a> {
@@ -105,9 +108,9 @@ impl<'a> GetNotebookBuilder<'a, get_notebook_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetNotebookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -122,11 +125,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetNotebookBuilder<'a, get_notebook_state::SetNotebook<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetNotebookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -139,7 +142,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetNotebook<'a> {
         GetNotebook {
-            notebook: self.__unsafe_private_named.0.unwrap(),
+            notebook: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_notebook_by_title.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_notebook_by_title.rs
index 0307b3df..9f267af4 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_notebook_by_title.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_notebook_by_title.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -104,45 +107,45 @@ pub mod get_notebook_by_title_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Title;
         type Actor;
+        type Title;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Title = Unset;
         type Actor = Unset;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Title = Set<members::title>;
-        type Actor = S::Actor;
+        type Title = Unset;
     }
     ///State transition - sets the `actor` field to Set
     pub struct SetActor<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetActor<S> {}
     impl<S: State> State for SetActor<S> {
-        type Title = S::Title;
         type Actor = Set<members::actor>;
+        type Title = S::Title;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type Actor = S::Actor;
+        type Title = Set<members::title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `title` field
-        pub struct title(());
         ///Marker type for the `actor` field
         pub struct actor(());
+        ///Marker type for the `title` field
+        pub struct title(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GetNotebookByTitleBuilder<'a, S: get_notebook_by_title_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetNotebookByTitle<'a> {
@@ -156,9 +159,9 @@ impl<'a> GetNotebookByTitleBuilder<'a, get_notebook_by_title_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetNotebookByTitleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -173,11 +176,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetNotebookByTitleBuilder<'a, get_notebook_by_title_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetNotebookByTitleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -192,11 +195,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetNotebookByTitleBuilder<'a, get_notebook_by_title_state::SetTitle<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetNotebookByTitleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,14 +207,14 @@ where
 impl<'a, S> GetNotebookByTitleBuilder<'a, S>
 where
     S: get_notebook_by_title_state::State,
-    S::Title: get_notebook_by_title_state::IsSet,
     S::Actor: get_notebook_by_title_state::IsSet,
+    S::Title: get_notebook_by_title_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GetNotebookByTitle<'a> {
         GetNotebookByTitle {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            title: self.__unsafe_private_named.1.unwrap(),
+            actor: self._fields.0.unwrap(),
+            title: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_notebook_chapters.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_notebook_chapters.rs
index 2ef88aee..b41a72e4 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_notebook_chapters.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_notebook_chapters.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -101,9 +104,9 @@ pub mod get_notebook_chapters_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetNotebookChaptersBuilder<'a, S: get_notebook_chapters_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetNotebookChapters<'a> {
@@ -117,9 +120,9 @@ impl<'a> GetNotebookChaptersBuilder<'a, get_notebook_chapters_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetNotebookChaptersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -127,12 +130,12 @@ impl<'a> GetNotebookChaptersBuilder<'a, get_notebook_chapters_state::Empty> {
 impl<'a, S: get_notebook_chapters_state::State> GetNotebookChaptersBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -140,12 +143,12 @@ impl<'a, S: get_notebook_chapters_state::State> GetNotebookChaptersBuilder<'a, S
 impl<'a, S: get_notebook_chapters_state::State> GetNotebookChaptersBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -160,11 +163,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetNotebookChaptersBuilder<'a, get_notebook_chapters_state::SetNotebook<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetNotebookChaptersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -177,9 +180,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetNotebookChapters<'a> {
         GetNotebookChapters {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            notebook: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            notebook: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_notebook_detail.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_notebook_detail.rs
index 9f61ce8b..d6c9445c 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_notebook_detail.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_notebook_detail.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -140,9 +143,9 @@ pub mod get_notebook_detail_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetNotebookDetailBuilder<'a, S: get_notebook_detail_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetNotebookDetail<'a> {
@@ -156,9 +159,9 @@ impl<'a> GetNotebookDetailBuilder<'a, get_notebook_detail_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetNotebookDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -166,12 +169,12 @@ impl<'a> GetNotebookDetailBuilder<'a, get_notebook_detail_state::Empty> {
 impl<'a, S: get_notebook_detail_state::State> GetNotebookDetailBuilder<'a, S> {
     /// Set the `entryCursor` field (optional)
     pub fn entry_cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `entryCursor` field to an Option value (optional)
     pub fn maybe_entry_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -179,12 +182,12 @@ impl<'a, S: get_notebook_detail_state::State> GetNotebookDetailBuilder<'a, S> {
 impl<'a, S: get_notebook_detail_state::State> GetNotebookDetailBuilder<'a, S> {
     /// Set the `entryLimit` field (optional)
     pub fn entry_limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `entryLimit` field to an Option value (optional)
     pub fn maybe_entry_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -199,11 +202,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetNotebookDetailBuilder<'a, get_notebook_detail_state::SetNotebook<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetNotebookDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,9 +219,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetNotebookDetail<'a> {
         GetNotebookDetail {
-            entry_cursor: self.__unsafe_private_named.0,
-            entry_limit: self.__unsafe_private_named.1,
-            notebook: self.__unsafe_private_named.2.unwrap(),
+            entry_cursor: self._fields.0,
+            entry_limit: self._fields.1,
+            notebook: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_notebook_feed.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_notebook_feed.rs
index ad67e7c6..0c1903d7 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_notebook_feed.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_notebook_feed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -101,15 +104,15 @@ pub mod get_notebook_feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetNotebookFeedBuilder<'a, S: get_notebook_feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
         Option<i64>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetNotebookFeed<'a> {
@@ -123,9 +126,9 @@ impl<'a> GetNotebookFeedBuilder<'a, get_notebook_feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetNotebookFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -133,12 +136,12 @@ impl<'a> GetNotebookFeedBuilder<'a, get_notebook_feed_state::Empty> {
 impl<'a, S: get_notebook_feed_state::State> GetNotebookFeedBuilder<'a, S> {
     /// Set the `algorithm` field (optional)
     pub fn algorithm(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `algorithm` field to an Option value (optional)
     pub fn maybe_algorithm(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -146,12 +149,12 @@ impl<'a, S: get_notebook_feed_state::State> GetNotebookFeedBuilder<'a, S> {
 impl<'a, S: get_notebook_feed_state::State> GetNotebookFeedBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -159,12 +162,12 @@ impl<'a, S: get_notebook_feed_state::State> GetNotebookFeedBuilder<'a, S> {
 impl<'a, S: get_notebook_feed_state::State> GetNotebookFeedBuilder<'a, S> {
     /// Set the `feed` field (optional)
     pub fn feed(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `feed` field to an Option value (optional)
     pub fn maybe_feed(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -172,12 +175,12 @@ impl<'a, S: get_notebook_feed_state::State> GetNotebookFeedBuilder<'a, S> {
 impl<'a, S: get_notebook_feed_state::State> GetNotebookFeedBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -185,12 +188,12 @@ impl<'a, S: get_notebook_feed_state::State> GetNotebookFeedBuilder<'a, S> {
 impl<'a, S: get_notebook_feed_state::State> GetNotebookFeedBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -202,11 +205,11 @@ where
     /// Build the final struct
     pub fn build(self) -> GetNotebookFeed<'a> {
         GetNotebookFeed {
-            algorithm: self.__unsafe_private_named.0,
-            cursor: self.__unsafe_private_named.1,
-            feed: self.__unsafe_private_named.2,
-            limit: self.__unsafe_private_named.3,
-            tags: self.__unsafe_private_named.4,
+            algorithm: self._fields.0,
+            cursor: self._fields.1,
+            feed: self._fields.2,
+            limit: self._fields.3,
+            tags: self._fields.4,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_page.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_page.rs
index 4b585982..1e8bc582 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_page.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_page.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -126,9 +129,9 @@ pub mod get_page_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetPageBuilder<'a, S: get_page_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetPage<'a> {
@@ -142,9 +145,9 @@ impl<'a> GetPageBuilder<'a, get_page_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetPageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -159,11 +162,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetPageBuilder<'a, get_page_state::SetPage<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetPageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -176,7 +179,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetPage<'a> {
         GetPage {
-            page: self.__unsafe_private_named.0.unwrap(),
+            page: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_published_versions.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_published_versions.rs
index bc5cfe87..df971fbf 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_published_versions.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_published_versions.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_common::types::value::Data;
@@ -104,9 +107,9 @@ pub mod get_published_versions_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetPublishedVersionsBuilder<'a, S: get_published_versions_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<bool>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetPublishedVersions<'a> {
@@ -123,9 +126,9 @@ impl<'a> GetPublishedVersionsBuilder<'a, get_published_versions_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetPublishedVersionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -140,11 +143,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetPublishedVersionsBuilder<'a, get_published_versions_state::SetEntry<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetPublishedVersionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -152,12 +155,12 @@ where
 impl<'a, S: get_published_versions_state::State> GetPublishedVersionsBuilder<'a, S> {
     /// Set the `includeContent` field (optional)
     pub fn include_content(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `includeContent` field to an Option value (optional)
     pub fn maybe_include_content(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -170,8 +173,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetPublishedVersions<'a> {
         GetPublishedVersions {
-            entry: self.__unsafe_private_named.0.unwrap(),
-            include_content: self.__unsafe_private_named.1,
+            entry: self._fields.0.unwrap(),
+            include_content: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_reading_history.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_reading_history.rs
index f73d77d4..5a5c61d9 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_reading_history.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_reading_history.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -135,9 +138,9 @@ pub mod get_reading_history_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetReadingHistoryBuilder<'a, S: get_reading_history_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetReadingHistory<'a> {
@@ -151,9 +154,9 @@ impl<'a> GetReadingHistoryBuilder<'a, get_reading_history_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetReadingHistoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -161,12 +164,12 @@ impl<'a> GetReadingHistoryBuilder<'a, get_reading_history_state::Empty> {
 impl<'a, S: get_reading_history_state::State> GetReadingHistoryBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -174,12 +177,12 @@ impl<'a, S: get_reading_history_state::State> GetReadingHistoryBuilder<'a, S> {
 impl<'a, S: get_reading_history_state::State> GetReadingHistoryBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -187,12 +190,12 @@ impl<'a, S: get_reading_history_state::State> GetReadingHistoryBuilder<'a, S> {
 impl<'a, S: get_reading_history_state::State> GetReadingHistoryBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -204,9 +207,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetReadingHistory<'a> {
         GetReadingHistory {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            status: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            status: self._fields.2,
         }
     }
 }
@@ -221,49 +224,49 @@ pub mod reading_history_item_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Progress;
         type Notebook;
+        type Progress;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Progress = Unset;
         type Notebook = Unset;
-    }
-    ///State transition - sets the `progress` field to Set
-    pub struct SetProgress<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetProgress<S> {}
-    impl<S: State> State for SetProgress<S> {
-        type Progress = Set<members::progress>;
-        type Notebook = S::Notebook;
+        type Progress = Unset;
     }
     ///State transition - sets the `notebook` field to Set
     pub struct SetNotebook<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetNotebook<S> {}
     impl<S: State> State for SetNotebook<S> {
-        type Progress = S::Progress;
         type Notebook = Set<members::notebook>;
+        type Progress = S::Progress;
+    }
+    ///State transition - sets the `progress` field to Set
+    pub struct SetProgress<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetProgress<S> {}
+    impl<S: State> State for SetProgress<S> {
+        type Notebook = S::Notebook;
+        type Progress = Set<members::progress>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `progress` field
-        pub struct progress(());
         ///Marker type for the `notebook` field
         pub struct notebook(());
+        ///Marker type for the `progress` field
+        pub struct progress(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReadingHistoryItemBuilder<'a, S: reading_history_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<EntryView<'a>>,
         Option<NotebookView<'a>>,
         Option<ReadingProgress<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReadingHistoryItem<'a> {
@@ -277,9 +280,9 @@ impl<'a> ReadingHistoryItemBuilder<'a, reading_history_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReadingHistoryItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -287,12 +290,12 @@ impl<'a> ReadingHistoryItemBuilder<'a, reading_history_item_state::Empty> {
 impl<'a, S: reading_history_item_state::State> ReadingHistoryItemBuilder<'a, S> {
     /// Set the `currentEntry` field (optional)
     pub fn current_entry(mut self, value: impl Into<Option<EntryView<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `currentEntry` field to an Option value (optional)
     pub fn maybe_current_entry(mut self, value: Option<EntryView<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -307,11 +310,11 @@ where
         mut self,
         value: impl Into<NotebookView<'a>>,
     ) -> ReadingHistoryItemBuilder<'a, reading_history_item_state::SetNotebook<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReadingHistoryItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -326,11 +329,11 @@ where
         mut self,
         value: impl Into<ReadingProgress<'a>>,
     ) -> ReadingHistoryItemBuilder<'a, reading_history_item_state::SetProgress<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReadingHistoryItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -338,15 +341,15 @@ where
 impl<'a, S> ReadingHistoryItemBuilder<'a, S>
 where
     S: reading_history_item_state::State,
-    S::Progress: reading_history_item_state::IsSet,
     S::Notebook: reading_history_item_state::IsSet,
+    S::Progress: reading_history_item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ReadingHistoryItem<'a> {
         ReadingHistoryItem {
-            current_entry: self.__unsafe_private_named.0,
-            notebook: self.__unsafe_private_named.1.unwrap(),
-            progress: self.__unsafe_private_named.2.unwrap(),
+            current_entry: self._fields.0,
+            notebook: self._fields.1.unwrap(),
+            progress: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -359,9 +362,9 @@ where
         >,
     ) -> ReadingHistoryItem<'a> {
         ReadingHistoryItem {
-            current_entry: self.__unsafe_private_named.0,
-            notebook: self.__unsafe_private_named.1.unwrap(),
-            progress: self.__unsafe_private_named.2.unwrap(),
+            current_entry: self._fields.0,
+            notebook: self._fields.1.unwrap(),
+            progress: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_similar_notebooks.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_similar_notebooks.rs
index f69f0372..eb11e6b7 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_similar_notebooks.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_similar_notebooks.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_common::types::value::Data;
@@ -94,9 +97,9 @@ pub mod get_similar_notebooks_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSimilarNotebooksBuilder<'a, S: get_similar_notebooks_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSimilarNotebooks<'a> {
@@ -110,9 +113,9 @@ impl<'a> GetSimilarNotebooksBuilder<'a, get_similar_notebooks_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSimilarNotebooksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,12 +123,12 @@ impl<'a> GetSimilarNotebooksBuilder<'a, get_similar_notebooks_state::Empty> {
 impl<'a, S: get_similar_notebooks_state::State> GetSimilarNotebooksBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -140,11 +143,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetSimilarNotebooksBuilder<'a, get_similar_notebooks_state::SetNotebook<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetSimilarNotebooksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -157,8 +160,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSimilarNotebooks<'a> {
         GetSimilarNotebooks {
-            limit: self.__unsafe_private_named.0,
-            notebook: self.__unsafe_private_named.1.unwrap(),
+            limit: self._fields.0,
+            notebook: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/get_suggested_notebooks.rs b/crates/jacquard-api/src/sh_weaver/notebook/get_suggested_notebooks.rs
index 2adfc77f..d9e68502 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/get_suggested_notebooks.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/get_suggested_notebooks.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -276,8 +279,8 @@ pub mod get_suggested_notebooks_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSuggestedNotebooksBuilder<S: get_suggested_notebooks_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
 }
 
 impl GetSuggestedNotebooks {
@@ -291,8 +294,8 @@ impl GetSuggestedNotebooksBuilder<get_suggested_notebooks_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSuggestedNotebooksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -300,12 +303,12 @@ impl GetSuggestedNotebooksBuilder<get_suggested_notebooks_state::Empty> {
 impl<S: get_suggested_notebooks_state::State> GetSuggestedNotebooksBuilder<S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -317,7 +320,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSuggestedNotebooks {
         GetSuggestedNotebooks {
-            limit: self.__unsafe_private_named.0,
+            limit: self._fields.0,
         }
     }
 }
@@ -332,49 +335,49 @@ pub mod suggested_notebook_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Reason;
         type Notebook;
+        type Reason;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Reason = Unset;
         type Notebook = Unset;
-    }
-    ///State transition - sets the `reason` field to Set
-    pub struct SetReason<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetReason<S> {}
-    impl<S: State> State for SetReason<S> {
-        type Reason = Set<members::reason>;
-        type Notebook = S::Notebook;
+        type Reason = Unset;
     }
     ///State transition - sets the `notebook` field to Set
     pub struct SetNotebook<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetNotebook<S> {}
     impl<S: State> State for SetNotebook<S> {
-        type Reason = S::Reason;
         type Notebook = Set<members::notebook>;
+        type Reason = S::Reason;
+    }
+    ///State transition - sets the `reason` field to Set
+    pub struct SetReason<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetReason<S> {}
+    impl<S: State> State for SetReason<S> {
+        type Notebook = S::Notebook;
+        type Reason = Set<members::reason>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `reason` field
-        pub struct reason(());
         ///Marker type for the `notebook` field
         pub struct notebook(());
+        ///Marker type for the `reason` field
+        pub struct reason(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SuggestedNotebookBuilder<'a, S: suggested_notebook_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<NotebookView<'a>>,
         Option<get_suggested_notebooks::SuggestionReason<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SuggestedNotebook<'a> {
@@ -388,9 +391,9 @@ impl<'a> SuggestedNotebookBuilder<'a, suggested_notebook_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SuggestedNotebookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -405,11 +408,11 @@ where
         mut self,
         value: impl Into<NotebookView<'a>>,
     ) -> SuggestedNotebookBuilder<'a, suggested_notebook_state::SetNotebook<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SuggestedNotebookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -424,11 +427,11 @@ where
         mut self,
         value: impl Into<get_suggested_notebooks::SuggestionReason<'a>>,
     ) -> SuggestedNotebookBuilder<'a, suggested_notebook_state::SetReason<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SuggestedNotebookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -436,12 +439,12 @@ where
 impl<'a, S: suggested_notebook_state::State> SuggestedNotebookBuilder<'a, S> {
     /// Set the `score` field (optional)
     pub fn score(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `score` field to an Option value (optional)
     pub fn maybe_score(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -449,15 +452,15 @@ impl<'a, S: suggested_notebook_state::State> SuggestedNotebookBuilder<'a, S> {
 impl<'a, S> SuggestedNotebookBuilder<'a, S>
 where
     S: suggested_notebook_state::State,
-    S::Reason: suggested_notebook_state::IsSet,
     S::Notebook: suggested_notebook_state::IsSet,
+    S::Reason: suggested_notebook_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SuggestedNotebook<'a> {
         SuggestedNotebook {
-            notebook: self.__unsafe_private_named.0.unwrap(),
-            reason: self.__unsafe_private_named.1.unwrap(),
-            score: self.__unsafe_private_named.2,
+            notebook: self._fields.0.unwrap(),
+            reason: self._fields.1.unwrap(),
+            score: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -470,9 +473,9 @@ where
         >,
     ) -> SuggestedNotebook<'a> {
         SuggestedNotebook {
-            notebook: self.__unsafe_private_named.0.unwrap(),
-            reason: self.__unsafe_private_named.1.unwrap(),
-            score: self.__unsafe_private_named.2,
+            notebook: self._fields.0.unwrap(),
+            reason: self._fields.1.unwrap(),
+            score: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/page.rs b/crates/jacquard-api/src/sh_weaver/notebook/page.rs
index 1519aab9..ed1a79d5 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/page.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/page.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -122,49 +125,49 @@ pub mod page_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Authors;
         type EntryList;
+        type Authors;
         type Notebook;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Authors = Unset;
         type EntryList = Unset;
+        type Authors = Unset;
         type Notebook = Unset;
     }
-    ///State transition - sets the `authors` field to Set
-    pub struct SetAuthors<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAuthors<S> {}
-    impl<S: State> State for SetAuthors<S> {
-        type Authors = Set<members::authors>;
-        type EntryList = S::EntryList;
-        type Notebook = S::Notebook;
-    }
     ///State transition - sets the `entry_list` field to Set
     pub struct SetEntryList<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEntryList<S> {}
     impl<S: State> State for SetEntryList<S> {
-        type Authors = S::Authors;
         type EntryList = Set<members::entry_list>;
+        type Authors = S::Authors;
+        type Notebook = S::Notebook;
+    }
+    ///State transition - sets the `authors` field to Set
+    pub struct SetAuthors<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAuthors<S> {}
+    impl<S: State> State for SetAuthors<S> {
+        type EntryList = S::EntryList;
+        type Authors = Set<members::authors>;
         type Notebook = S::Notebook;
     }
     ///State transition - sets the `notebook` field to Set
     pub struct SetNotebook<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetNotebook<S> {}
     impl<S: State> State for SetNotebook<S> {
-        type Authors = S::Authors;
         type EntryList = S::EntryList;
+        type Authors = S::Authors;
         type Notebook = Set<members::notebook>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `authors` field
-        pub struct authors(());
         ///Marker type for the `entry_list` field
         pub struct entry_list(());
+        ///Marker type for the `authors` field
+        pub struct authors(());
         ///Marker type for the `notebook` field
         pub struct notebook(());
     }
@@ -172,15 +175,15 @@ pub mod page_state {
 
 /// Builder for constructing an instance of this type
 pub struct PageBuilder<'a, S: page_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Vec<StrongRef<'a>>>,
         Option<StrongRef<'a>>,
         Option<Tags<'a>>,
         Option<Title<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Page<'a> {
@@ -194,9 +197,9 @@ impl<'a> PageBuilder<'a, page_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,12 +207,12 @@ impl<'a> PageBuilder<'a, page_state::Empty> {
 impl<'a, S: page_state::State> PageBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -224,11 +227,11 @@ where
         mut self,
         value: impl Into<Vec<StrongRef<'a>>>,
     ) -> PageBuilder<'a, page_state::SetEntryList<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -243,11 +246,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> PageBuilder<'a, page_state::SetNotebook<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -255,12 +258,12 @@ where
 impl<'a, S: page_state::State> PageBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Tags<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Tags<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -268,12 +271,12 @@ impl<'a, S: page_state::State> PageBuilder<'a, S> {
 impl<'a, S: page_state::State> PageBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<Title<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<Title<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -281,18 +284,18 @@ impl<'a, S: page_state::State> PageBuilder<'a, S> {
 impl<'a, S> PageBuilder<'a, S>
 where
     S: page_state::State,
-    S::Authors: page_state::IsSet,
     S::EntryList: page_state::IsSet,
+    S::Authors: page_state::IsSet,
     S::Notebook: page_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Page<'a> {
         Page {
-            created_at: self.__unsafe_private_named.0,
-            entry_list: self.__unsafe_private_named.1.unwrap(),
-            notebook: self.__unsafe_private_named.2.unwrap(),
-            tags: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4,
+            created_at: self._fields.0,
+            entry_list: self._fields.1.unwrap(),
+            notebook: self._fields.2.unwrap(),
+            tags: self._fields.3,
+            title: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -305,11 +308,11 @@ where
         >,
     ) -> Page<'a> {
         Page {
-            created_at: self.__unsafe_private_named.0,
-            entry_list: self.__unsafe_private_named.1.unwrap(),
-            notebook: self.__unsafe_private_named.2.unwrap(),
-            tags: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4,
+            created_at: self._fields.0,
+            entry_list: self._fields.1.unwrap(),
+            notebook: self._fields.2.unwrap(),
+            tags: self._fields.3,
+            title: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/resolve_entry.rs b/crates/jacquard-api/src/sh_weaver/notebook/resolve_entry.rs
index c210f5bd..2757257c 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/resolve_entry.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/resolve_entry.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -120,49 +123,49 @@ pub mod resolve_entry_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Actor;
         type Entry;
+        type Actor;
         type Notebook;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Actor = Unset;
         type Entry = Unset;
+        type Actor = Unset;
         type Notebook = Unset;
     }
-    ///State transition - sets the `actor` field to Set
-    pub struct SetActor<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetActor<S> {}
-    impl<S: State> State for SetActor<S> {
-        type Actor = Set<members::actor>;
-        type Entry = S::Entry;
-        type Notebook = S::Notebook;
-    }
     ///State transition - sets the `entry` field to Set
     pub struct SetEntry<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEntry<S> {}
     impl<S: State> State for SetEntry<S> {
-        type Actor = S::Actor;
         type Entry = Set<members::entry>;
+        type Actor = S::Actor;
+        type Notebook = S::Notebook;
+    }
+    ///State transition - sets the `actor` field to Set
+    pub struct SetActor<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetActor<S> {}
+    impl<S: State> State for SetActor<S> {
+        type Entry = S::Entry;
+        type Actor = Set<members::actor>;
         type Notebook = S::Notebook;
     }
     ///State transition - sets the `notebook` field to Set
     pub struct SetNotebook<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetNotebook<S> {}
     impl<S: State> State for SetNotebook<S> {
-        type Actor = S::Actor;
         type Entry = S::Entry;
+        type Actor = S::Actor;
         type Notebook = Set<members::notebook>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `actor` field
-        pub struct actor(());
         ///Marker type for the `entry` field
         pub struct entry(());
+        ///Marker type for the `actor` field
+        pub struct actor(());
         ///Marker type for the `notebook` field
         pub struct notebook(());
     }
@@ -170,13 +173,9 @@ pub mod resolve_entry_state {
 
 /// Builder for constructing an instance of this type
 pub struct ResolveEntryBuilder<'a, S: resolve_entry_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<AtIdentifier<'a>>,
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ResolveEntry<'a> {
@@ -190,9 +189,9 @@ impl<'a> ResolveEntryBuilder<'a, resolve_entry_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ResolveEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -207,11 +206,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> ResolveEntryBuilder<'a, resolve_entry_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ResolveEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -226,11 +225,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ResolveEntryBuilder<'a, resolve_entry_state::SetEntry<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ResolveEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -245,11 +244,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ResolveEntryBuilder<'a, resolve_entry_state::SetNotebook<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ResolveEntryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -257,16 +256,16 @@ where
 impl<'a, S> ResolveEntryBuilder<'a, S>
 where
     S: resolve_entry_state::State,
-    S::Actor: resolve_entry_state::IsSet,
     S::Entry: resolve_entry_state::IsSet,
+    S::Actor: resolve_entry_state::IsSet,
     S::Notebook: resolve_entry_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ResolveEntry<'a> {
         ResolveEntry {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            entry: self.__unsafe_private_named.1.unwrap(),
-            notebook: self.__unsafe_private_named.2.unwrap(),
+            actor: self._fields.0.unwrap(),
+            entry: self._fields.1.unwrap(),
+            notebook: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/resolve_notebook.rs b/crates/jacquard-api/src/sh_weaver/notebook/resolve_notebook.rs
index ef8960ce..8f80431d 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/resolve_notebook.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/resolve_notebook.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -154,14 +157,14 @@ pub mod resolve_notebook_state {
 
 /// Builder for constructing an instance of this type
 pub struct ResolveNotebookBuilder<'a, S: resolve_notebook_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ResolveNotebook<'a> {
@@ -175,9 +178,9 @@ impl<'a> ResolveNotebookBuilder<'a, resolve_notebook_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ResolveNotebookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -192,11 +195,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> ResolveNotebookBuilder<'a, resolve_notebook_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ResolveNotebookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,12 +207,12 @@ where
 impl<'a, S: resolve_notebook_state::State> ResolveNotebookBuilder<'a, S> {
     /// Set the `entryCursor` field (optional)
     pub fn entry_cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `entryCursor` field to an Option value (optional)
     pub fn maybe_entry_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -217,12 +220,12 @@ impl<'a, S: resolve_notebook_state::State> ResolveNotebookBuilder<'a, S> {
 impl<'a, S: resolve_notebook_state::State> ResolveNotebookBuilder<'a, S> {
     /// Set the `entryLimit` field (optional)
     pub fn entry_limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `entryLimit` field to an Option value (optional)
     pub fn maybe_entry_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -237,11 +240,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ResolveNotebookBuilder<'a, resolve_notebook_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ResolveNotebookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -255,10 +258,10 @@ where
     /// Build the final struct
     pub fn build(self) -> ResolveNotebook<'a> {
         ResolveNotebook {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            entry_cursor: self.__unsafe_private_named.1,
-            entry_limit: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
+            actor: self._fields.0.unwrap(),
+            entry_cursor: self._fields.1,
+            entry_limit: self._fields.2,
+            name: self._fields.3.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/resolve_version_conflict.rs b/crates/jacquard-api/src/sh_weaver/notebook/resolve_version_conflict.rs
index 6c1372a9..37edd649 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/resolve_version_conflict.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/resolve_version_conflict.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -130,9 +133,9 @@ pub mod resolve_version_conflict_state {
 
 /// Builder for constructing an instance of this type
 pub struct ResolveVersionConflictBuilder<'a, S: resolve_version_conflict_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<AtUri<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<AtUri<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ResolveVersionConflict<'a> {
@@ -149,9 +152,9 @@ impl<'a> ResolveVersionConflictBuilder<'a, resolve_version_conflict_state::Empty
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ResolveVersionConflictBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -166,11 +169,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> ResolveVersionConflictBuilder<'a, resolve_version_conflict_state::SetUris<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ResolveVersionConflictBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,7 +186,7 @@ where
     /// Build the final struct
     pub fn build(self) -> ResolveVersionConflict<'a> {
         ResolveVersionConflict {
-            uris: self.__unsafe_private_named.0.unwrap(),
+            uris: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/search_entries.rs b/crates/jacquard-api/src/sh_weaver/notebook/search_entries.rs
index 4e5527a4..b77d3375 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/search_entries.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/search_entries.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -107,15 +110,15 @@ pub mod search_entries_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchEntriesBuilder<'a, S: search_entries_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<CowStr<'a>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchEntries<'a> {
@@ -129,9 +132,9 @@ impl<'a> SearchEntriesBuilder<'a, search_entries_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchEntriesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -139,12 +142,12 @@ impl<'a> SearchEntriesBuilder<'a, search_entries_state::Empty> {
 impl<'a, S: search_entries_state::State> SearchEntriesBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<AtIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<AtIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -152,12 +155,12 @@ impl<'a, S: search_entries_state::State> SearchEntriesBuilder<'a, S> {
 impl<'a, S: search_entries_state::State> SearchEntriesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -165,12 +168,12 @@ impl<'a, S: search_entries_state::State> SearchEntriesBuilder<'a, S> {
 impl<'a, S: search_entries_state::State> SearchEntriesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -185,11 +188,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SearchEntriesBuilder<'a, search_entries_state::SetQ<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SearchEntriesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,12 +200,12 @@ where
 impl<'a, S: search_entries_state::State> SearchEntriesBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -215,11 +218,11 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchEntries<'a> {
         SearchEntries {
-            author: self.__unsafe_private_named.0,
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            q: self.__unsafe_private_named.3.unwrap(),
-            tags: self.__unsafe_private_named.4,
+            author: self._fields.0,
+            cursor: self._fields.1,
+            limit: self._fields.2,
+            q: self._fields.3.unwrap(),
+            tags: self._fields.4,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/search_notebooks.rs b/crates/jacquard-api/src/sh_weaver/notebook/search_notebooks.rs
index 41173332..89e30f17 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/search_notebooks.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/search_notebooks.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -119,8 +122,8 @@ pub mod search_notebooks_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchNotebooksBuilder<'a, S: search_notebooks_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
@@ -129,7 +132,7 @@ pub struct SearchNotebooksBuilder<'a, S: search_notebooks_state::State> {
         Option<CowStr<'a>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchNotebooks<'a> {
@@ -143,9 +146,9 @@ impl<'a> SearchNotebooksBuilder<'a, search_notebooks_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchNotebooksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -153,12 +156,12 @@ impl<'a> SearchNotebooksBuilder<'a, search_notebooks_state::Empty> {
 impl<'a, S: search_notebooks_state::State> SearchNotebooksBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<AtIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<AtIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -166,12 +169,12 @@ impl<'a, S: search_notebooks_state::State> SearchNotebooksBuilder<'a, S> {
 impl<'a, S: search_notebooks_state::State> SearchNotebooksBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -179,12 +182,12 @@ impl<'a, S: search_notebooks_state::State> SearchNotebooksBuilder<'a, S> {
 impl<'a, S: search_notebooks_state::State> SearchNotebooksBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -199,11 +202,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SearchNotebooksBuilder<'a, search_notebooks_state::SetQ<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SearchNotebooksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -211,12 +214,12 @@ where
 impl<'a, S: search_notebooks_state::State> SearchNotebooksBuilder<'a, S> {
     /// Set the `rating` field (optional)
     pub fn rating(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `rating` field to an Option value (optional)
     pub fn maybe_rating(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -224,12 +227,12 @@ impl<'a, S: search_notebooks_state::State> SearchNotebooksBuilder<'a, S> {
 impl<'a, S: search_notebooks_state::State> SearchNotebooksBuilder<'a, S> {
     /// Set the `sort` field (optional)
     pub fn sort(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `sort` field to an Option value (optional)
     pub fn maybe_sort(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -237,12 +240,12 @@ impl<'a, S: search_notebooks_state::State> SearchNotebooksBuilder<'a, S> {
 impl<'a, S: search_notebooks_state::State> SearchNotebooksBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -255,13 +258,13 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchNotebooks<'a> {
         SearchNotebooks {
-            author: self.__unsafe_private_named.0,
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            q: self.__unsafe_private_named.3.unwrap(),
-            rating: self.__unsafe_private_named.4,
-            sort: self.__unsafe_private_named.5,
-            tags: self.__unsafe_private_named.6,
+            author: self._fields.0,
+            cursor: self._fields.1,
+            limit: self._fields.2,
+            q: self._fields.3.unwrap(),
+            rating: self._fields.4,
+            sort: self._fields.5,
+            tags: self._fields.6,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/theme.rs b/crates/jacquard-api/src/sh_weaver/notebook/theme.rs
index 4f96cb98..73224e13 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/theme.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/theme.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -358,59 +361,59 @@ pub mod code_theme_file_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Content;
         type Name;
         type Did;
-        type Content;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Content = Unset;
         type Name = Unset;
         type Did = Unset;
-        type Content = Unset;
+    }
+    ///State transition - sets the `content` field to Set
+    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContent<S> {}
+    impl<S: State> State for SetContent<S> {
+        type Content = Set<members::content>;
+        type Name = S::Name;
+        type Did = S::Did;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
+        type Content = S::Content;
         type Name = Set<members::name>;
         type Did = S::Did;
-        type Content = S::Content;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type Name = S::Name;
-        type Did = Set<members::did>;
         type Content = S::Content;
-    }
-    ///State transition - sets the `content` field to Set
-    pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContent<S> {}
-    impl<S: State> State for SetContent<S> {
         type Name = S::Name;
-        type Did = S::Did;
-        type Content = Set<members::content>;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `content` field
+        pub struct content(());
         ///Marker type for the `name` field
         pub struct name(());
         ///Marker type for the `did` field
         pub struct did(());
-        ///Marker type for the `content` field
-        pub struct content(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CodeThemeFileBuilder<'a, S: code_theme_file_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>, Option<Did<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>, Option<Did<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CodeThemeFile<'a> {
@@ -424,9 +427,9 @@ impl<'a> CodeThemeFileBuilder<'a, code_theme_file_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CodeThemeFileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -441,11 +444,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> CodeThemeFileBuilder<'a, code_theme_file_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CodeThemeFileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -460,11 +463,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> CodeThemeFileBuilder<'a, code_theme_file_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CodeThemeFileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -479,11 +482,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CodeThemeFileBuilder<'a, code_theme_file_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CodeThemeFileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -491,16 +494,16 @@ where
 impl<'a, S> CodeThemeFileBuilder<'a, S>
 where
     S: code_theme_file_state::State,
+    S::Content: code_theme_file_state::IsSet,
     S::Name: code_theme_file_state::IsSet,
     S::Did: code_theme_file_state::IsSet,
-    S::Content: code_theme_file_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CodeThemeFile<'a> {
         CodeThemeFile {
-            content: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            content: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -513,9 +516,9 @@ where
         >,
     ) -> CodeThemeFile<'a> {
         CodeThemeFile {
-            content: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            content: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -840,9 +843,9 @@ pub mod font_state {
 
 /// Builder for constructing an instance of this type
 pub struct FontBuilder<'a, S: font_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<FontValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<FontValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Font<'a> {
@@ -856,9 +859,9 @@ impl<'a> FontBuilder<'a, font_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FontBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -873,11 +876,11 @@ where
         mut self,
         value: impl Into<FontValue<'a>>,
     ) -> FontBuilder<'a, font_state::SetValue<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FontBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -890,7 +893,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Font<'a> {
         Font {
-            value: self.__unsafe_private_named.0.unwrap(),
+            value: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -903,7 +906,7 @@ where
         >,
     ) -> Font<'a> {
         Font {
-            value: self.__unsafe_private_named.0.unwrap(),
+            value: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -919,59 +922,59 @@ pub mod font_file_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Name;
         type Did;
         type Content;
-        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Name = Unset;
         type Did = Unset;
         type Content = Unset;
-        type Name = Unset;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Name = Set<members::name>;
+        type Did = S::Did;
+        type Content = S::Content;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
+        type Name = S::Name;
         type Did = Set<members::did>;
         type Content = S::Content;
-        type Name = S::Name;
     }
     ///State transition - sets the `content` field to Set
     pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContent<S> {}
     impl<S: State> State for SetContent<S> {
-        type Did = S::Did;
-        type Content = Set<members::content>;
         type Name = S::Name;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
         type Did = S::Did;
-        type Content = S::Content;
-        type Name = Set<members::name>;
+        type Content = Set<members::content>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `name` field
+        pub struct name(());
         ///Marker type for the `did` field
         pub struct did(());
         ///Marker type for the `content` field
         pub struct content(());
-        ///Marker type for the `name` field
-        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FontFileBuilder<'a, S: font_file_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>, Option<Did<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>, Option<Did<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> FontFile<'a> {
@@ -985,9 +988,9 @@ impl<'a> FontFileBuilder<'a, font_file_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FontFileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1002,11 +1005,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> FontFileBuilder<'a, font_file_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FontFileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1021,11 +1024,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> FontFileBuilder<'a, font_file_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FontFileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1040,11 +1043,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> FontFileBuilder<'a, font_file_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         FontFileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1052,16 +1055,16 @@ where
 impl<'a, S> FontFileBuilder<'a, S>
 where
     S: font_file_state::State,
+    S::Name: font_file_state::IsSet,
     S::Did: font_file_state::IsSet,
     S::Content: font_file_state::IsSet,
-    S::Name: font_file_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> FontFile<'a> {
         FontFile {
-            content: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            content: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1074,9 +1077,9 @@ where
         >,
     ) -> FontFile<'a> {
         FontFile {
-            content: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            content: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1112,62 +1115,62 @@ pub mod theme_fonts_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Heading;
-        type Body;
         type Monospace;
+        type Body;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Heading = Unset;
-        type Body = Unset;
         type Monospace = Unset;
+        type Body = Unset;
     }
     ///State transition - sets the `heading` field to Set
     pub struct SetHeading<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHeading<S> {}
     impl<S: State> State for SetHeading<S> {
         type Heading = Set<members::heading>;
-        type Body = S::Body;
-        type Monospace = S::Monospace;
-    }
-    ///State transition - sets the `body` field to Set
-    pub struct SetBody<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBody<S> {}
-    impl<S: State> State for SetBody<S> {
-        type Heading = S::Heading;
-        type Body = Set<members::body>;
         type Monospace = S::Monospace;
+        type Body = S::Body;
     }
     ///State transition - sets the `monospace` field to Set
     pub struct SetMonospace<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMonospace<S> {}
     impl<S: State> State for SetMonospace<S> {
         type Heading = S::Heading;
-        type Body = S::Body;
         type Monospace = Set<members::monospace>;
+        type Body = S::Body;
+    }
+    ///State transition - sets the `body` field to Set
+    pub struct SetBody<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBody<S> {}
+    impl<S: State> State for SetBody<S> {
+        type Heading = S::Heading;
+        type Monospace = S::Monospace;
+        type Body = Set<members::body>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `heading` field
         pub struct heading(());
-        ///Marker type for the `body` field
-        pub struct body(());
         ///Marker type for the `monospace` field
         pub struct monospace(());
+        ///Marker type for the `body` field
+        pub struct body(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ThemeFontsBuilder<'a, S: theme_fonts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<crate::sh_weaver::notebook::theme::Font<'a>>>,
         Option<Vec<crate::sh_weaver::notebook::theme::Font<'a>>>,
         Option<Vec<crate::sh_weaver::notebook::theme::Font<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ThemeFonts<'a> {
@@ -1181,9 +1184,9 @@ impl<'a> ThemeFontsBuilder<'a, theme_fonts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ThemeFontsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1198,11 +1201,11 @@ where
         mut self,
         value: impl Into<Vec<crate::sh_weaver::notebook::theme::Font<'a>>>,
     ) -> ThemeFontsBuilder<'a, theme_fonts_state::SetBody<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ThemeFontsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1217,11 +1220,11 @@ where
         mut self,
         value: impl Into<Vec<crate::sh_weaver::notebook::theme::Font<'a>>>,
     ) -> ThemeFontsBuilder<'a, theme_fonts_state::SetHeading<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ThemeFontsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1236,11 +1239,11 @@ where
         mut self,
         value: impl Into<Vec<crate::sh_weaver::notebook::theme::Font<'a>>>,
     ) -> ThemeFontsBuilder<'a, theme_fonts_state::SetMonospace<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ThemeFontsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1249,15 +1252,15 @@ impl<'a, S> ThemeFontsBuilder<'a, S>
 where
     S: theme_fonts_state::State,
     S::Heading: theme_fonts_state::IsSet,
-    S::Body: theme_fonts_state::IsSet,
     S::Monospace: theme_fonts_state::IsSet,
+    S::Body: theme_fonts_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ThemeFonts<'a> {
         ThemeFonts {
-            body: self.__unsafe_private_named.0.unwrap(),
-            heading: self.__unsafe_private_named.1.unwrap(),
-            monospace: self.__unsafe_private_named.2.unwrap(),
+            body: self._fields.0.unwrap(),
+            heading: self._fields.1.unwrap(),
+            monospace: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1270,9 +1273,9 @@ where
         >,
     ) -> ThemeFonts<'a> {
         ThemeFonts {
-            body: self.__unsafe_private_named.0.unwrap(),
-            heading: self.__unsafe_private_named.1.unwrap(),
-            monospace: self.__unsafe_private_named.2.unwrap(),
+            body: self._fields.0.unwrap(),
+            heading: self._fields.1.unwrap(),
+            monospace: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1304,10 +1307,10 @@ pub mod theme_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Fonts;
+        type DarkScheme;
+        type Spacing;
         type LightScheme;
         type DarkCodeTheme;
-        type Spacing;
-        type DarkScheme;
         type LightCodeTheme;
     }
     /// Empty state - all required fields are unset
@@ -1315,10 +1318,10 @@ pub mod theme_state {
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Fonts = Unset;
+        type DarkScheme = Unset;
+        type Spacing = Unset;
         type LightScheme = Unset;
         type DarkCodeTheme = Unset;
-        type Spacing = Unset;
-        type DarkScheme = Unset;
         type LightCodeTheme = Unset;
     }
     ///State transition - sets the `fonts` field to Set
@@ -1326,10 +1329,32 @@ pub mod theme_state {
     impl<S: State> sealed::Sealed for SetFonts<S> {}
     impl<S: State> State for SetFonts<S> {
         type Fonts = Set<members::fonts>;
+        type DarkScheme = S::DarkScheme;
+        type Spacing = S::Spacing;
         type LightScheme = S::LightScheme;
         type DarkCodeTheme = S::DarkCodeTheme;
+        type LightCodeTheme = S::LightCodeTheme;
+    }
+    ///State transition - sets the `dark_scheme` field to Set
+    pub struct SetDarkScheme<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDarkScheme<S> {}
+    impl<S: State> State for SetDarkScheme<S> {
+        type Fonts = S::Fonts;
+        type DarkScheme = Set<members::dark_scheme>;
         type Spacing = S::Spacing;
+        type LightScheme = S::LightScheme;
+        type DarkCodeTheme = S::DarkCodeTheme;
+        type LightCodeTheme = S::LightCodeTheme;
+    }
+    ///State transition - sets the `spacing` field to Set
+    pub struct SetSpacing<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSpacing<S> {}
+    impl<S: State> State for SetSpacing<S> {
+        type Fonts = S::Fonts;
         type DarkScheme = S::DarkScheme;
+        type Spacing = Set<members::spacing>;
+        type LightScheme = S::LightScheme;
+        type DarkCodeTheme = S::DarkCodeTheme;
         type LightCodeTheme = S::LightCodeTheme;
     }
     ///State transition - sets the `light_scheme` field to Set
@@ -1337,10 +1362,10 @@ pub mod theme_state {
     impl<S: State> sealed::Sealed for SetLightScheme<S> {}
     impl<S: State> State for SetLightScheme<S> {
         type Fonts = S::Fonts;
+        type DarkScheme = S::DarkScheme;
+        type Spacing = S::Spacing;
         type LightScheme = Set<members::light_scheme>;
         type DarkCodeTheme = S::DarkCodeTheme;
-        type Spacing = S::Spacing;
-        type DarkScheme = S::DarkScheme;
         type LightCodeTheme = S::LightCodeTheme;
     }
     ///State transition - sets the `dark_code_theme` field to Set
@@ -1348,32 +1373,10 @@ pub mod theme_state {
     impl<S: State> sealed::Sealed for SetDarkCodeTheme<S> {}
     impl<S: State> State for SetDarkCodeTheme<S> {
         type Fonts = S::Fonts;
-        type LightScheme = S::LightScheme;
-        type DarkCodeTheme = Set<members::dark_code_theme>;
-        type Spacing = S::Spacing;
         type DarkScheme = S::DarkScheme;
-        type LightCodeTheme = S::LightCodeTheme;
-    }
-    ///State transition - sets the `spacing` field to Set
-    pub struct SetSpacing<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSpacing<S> {}
-    impl<S: State> State for SetSpacing<S> {
-        type Fonts = S::Fonts;
-        type LightScheme = S::LightScheme;
-        type DarkCodeTheme = S::DarkCodeTheme;
-        type Spacing = Set<members::spacing>;
-        type DarkScheme = S::DarkScheme;
-        type LightCodeTheme = S::LightCodeTheme;
-    }
-    ///State transition - sets the `dark_scheme` field to Set
-    pub struct SetDarkScheme<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDarkScheme<S> {}
-    impl<S: State> State for SetDarkScheme<S> {
-        type Fonts = S::Fonts;
-        type LightScheme = S::LightScheme;
-        type DarkCodeTheme = S::DarkCodeTheme;
         type Spacing = S::Spacing;
-        type DarkScheme = Set<members::dark_scheme>;
+        type LightScheme = S::LightScheme;
+        type DarkCodeTheme = Set<members::dark_code_theme>;
         type LightCodeTheme = S::LightCodeTheme;
     }
     ///State transition - sets the `light_code_theme` field to Set
@@ -1381,10 +1384,10 @@ pub mod theme_state {
     impl<S: State> sealed::Sealed for SetLightCodeTheme<S> {}
     impl<S: State> State for SetLightCodeTheme<S> {
         type Fonts = S::Fonts;
+        type DarkScheme = S::DarkScheme;
+        type Spacing = S::Spacing;
         type LightScheme = S::LightScheme;
         type DarkCodeTheme = S::DarkCodeTheme;
-        type Spacing = S::Spacing;
-        type DarkScheme = S::DarkScheme;
         type LightCodeTheme = Set<members::light_code_theme>;
     }
     /// Marker types for field names
@@ -1392,14 +1395,14 @@ pub mod theme_state {
     pub mod members {
         ///Marker type for the `fonts` field
         pub struct fonts(());
+        ///Marker type for the `dark_scheme` field
+        pub struct dark_scheme(());
+        ///Marker type for the `spacing` field
+        pub struct spacing(());
         ///Marker type for the `light_scheme` field
         pub struct light_scheme(());
         ///Marker type for the `dark_code_theme` field
         pub struct dark_code_theme(());
-        ///Marker type for the `spacing` field
-        pub struct spacing(());
-        ///Marker type for the `dark_scheme` field
-        pub struct dark_scheme(());
         ///Marker type for the `light_code_theme` field
         pub struct light_code_theme(());
     }
@@ -1407,8 +1410,8 @@ pub mod theme_state {
 
 /// Builder for constructing an instance of this type
 pub struct ThemeBuilder<'a, S: theme_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ThemeDarkCodeTheme<'a>>,
         Option<StrongRef<'a>>,
         Option<CowStr<'a>>,
@@ -1417,7 +1420,7 @@ pub struct ThemeBuilder<'a, S: theme_state::State> {
         Option<StrongRef<'a>>,
         Option<ThemeSpacing<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Theme<'a> {
@@ -1431,9 +1434,9 @@ impl<'a> ThemeBuilder<'a, theme_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ThemeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1448,11 +1451,11 @@ where
         mut self,
         value: impl Into<ThemeDarkCodeTheme<'a>>,
     ) -> ThemeBuilder<'a, theme_state::SetDarkCodeTheme<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ThemeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1467,11 +1470,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ThemeBuilder<'a, theme_state::SetDarkScheme<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ThemeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1479,12 +1482,12 @@ where
 impl<'a, S: theme_state::State> ThemeBuilder<'a, S> {
     /// Set the `defaultTheme` field (optional)
     pub fn default_theme(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `defaultTheme` field to an Option value (optional)
     pub fn maybe_default_theme(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1499,11 +1502,11 @@ where
         mut self,
         value: impl Into<ThemeFonts<'a>>,
     ) -> ThemeBuilder<'a, theme_state::SetFonts<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ThemeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1518,11 +1521,11 @@ where
         mut self,
         value: impl Into<ThemeLightCodeTheme<'a>>,
     ) -> ThemeBuilder<'a, theme_state::SetLightCodeTheme<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ThemeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1537,11 +1540,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ThemeBuilder<'a, theme_state::SetLightScheme<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ThemeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1556,11 +1559,11 @@ where
         mut self,
         value: impl Into<ThemeSpacing<'a>>,
     ) -> ThemeBuilder<'a, theme_state::SetSpacing<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ThemeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1569,25 +1572,22 @@ impl<'a, S> ThemeBuilder<'a, S>
 where
     S: theme_state::State,
     S::Fonts: theme_state::IsSet,
+    S::DarkScheme: theme_state::IsSet,
+    S::Spacing: theme_state::IsSet,
     S::LightScheme: theme_state::IsSet,
     S::DarkCodeTheme: theme_state::IsSet,
-    S::Spacing: theme_state::IsSet,
-    S::DarkScheme: theme_state::IsSet,
     S::LightCodeTheme: theme_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Theme<'a> {
         Theme {
-            dark_code_theme: self.__unsafe_private_named.0.unwrap(),
-            dark_scheme: self.__unsafe_private_named.1.unwrap(),
-            default_theme: self
-                .__unsafe_private_named
-                .2
-                .or_else(|| Some(CowStr::from("auto"))),
-            fonts: self.__unsafe_private_named.3.unwrap(),
-            light_code_theme: self.__unsafe_private_named.4.unwrap(),
-            light_scheme: self.__unsafe_private_named.5.unwrap(),
-            spacing: self.__unsafe_private_named.6.unwrap(),
+            dark_code_theme: self._fields.0.unwrap(),
+            dark_scheme: self._fields.1.unwrap(),
+            default_theme: self._fields.2.or_else(|| Some(CowStr::from("auto"))),
+            fonts: self._fields.3.unwrap(),
+            light_code_theme: self._fields.4.unwrap(),
+            light_scheme: self._fields.5.unwrap(),
+            spacing: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1600,16 +1600,13 @@ where
         >,
     ) -> Theme<'a> {
         Theme {
-            dark_code_theme: self.__unsafe_private_named.0.unwrap(),
-            dark_scheme: self.__unsafe_private_named.1.unwrap(),
-            default_theme: self
-                .__unsafe_private_named
-                .2
-                .or_else(|| Some(CowStr::from("auto"))),
-            fonts: self.__unsafe_private_named.3.unwrap(),
-            light_code_theme: self.__unsafe_private_named.4.unwrap(),
-            light_scheme: self.__unsafe_private_named.5.unwrap(),
-            spacing: self.__unsafe_private_named.6.unwrap(),
+            dark_code_theme: self._fields.0.unwrap(),
+            dark_scheme: self._fields.1.unwrap(),
+            default_theme: self._fields.2.or_else(|| Some(CowStr::from("auto"))),
+            fonts: self._fields.3.unwrap(),
+            light_code_theme: self._fields.4.unwrap(),
+            light_scheme: self._fields.5.unwrap(),
+            spacing: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/update_reading_progress.rs b/crates/jacquard-api/src/sh_weaver/notebook/update_reading_progress.rs
index a1f0255d..0bcaebf3 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/update_reading_progress.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/update_reading_progress.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -208,14 +211,14 @@ pub mod update_reading_progress_state {
 
 /// Builder for constructing an instance of this type
 pub struct UpdateReadingProgressBuilder<'a, S: update_reading_progress_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<AtUri<'a>>,
         Option<i64>,
         Option<UpdateReadingProgressStatus<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateReadingProgress<'a> {
@@ -232,9 +235,9 @@ impl<'a> UpdateReadingProgressBuilder<'a, update_reading_progress_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateReadingProgressBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -242,12 +245,12 @@ impl<'a> UpdateReadingProgressBuilder<'a, update_reading_progress_state::Empty>
 impl<'a, S: update_reading_progress_state::State> UpdateReadingProgressBuilder<'a, S> {
     /// Set the `currentEntry` field (optional)
     pub fn current_entry(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `currentEntry` field to an Option value (optional)
     pub fn maybe_current_entry(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -265,11 +268,11 @@ where
         'a,
         update_reading_progress_state::SetNotebook<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UpdateReadingProgressBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -277,12 +280,12 @@ where
 impl<'a, S: update_reading_progress_state::State> UpdateReadingProgressBuilder<'a, S> {
     /// Set the `percentComplete` field (optional)
     pub fn percent_complete(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `percentComplete` field to an Option value (optional)
     pub fn maybe_percent_complete(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -293,7 +296,7 @@ impl<'a, S: update_reading_progress_state::State> UpdateReadingProgressBuilder<'
         mut self,
         value: impl Into<Option<UpdateReadingProgressStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
@@ -301,7 +304,7 @@ impl<'a, S: update_reading_progress_state::State> UpdateReadingProgressBuilder<'
         mut self,
         value: Option<UpdateReadingProgressStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -314,10 +317,10 @@ where
     /// Build the final struct
     pub fn build(self) -> UpdateReadingProgress<'a> {
         UpdateReadingProgress {
-            current_entry: self.__unsafe_private_named.0,
-            notebook: self.__unsafe_private_named.1.unwrap(),
-            percent_complete: self.__unsafe_private_named.2,
-            status: self.__unsafe_private_named.3,
+            current_entry: self._fields.0,
+            notebook: self._fields.1.unwrap(),
+            percent_complete: self._fields.2,
+            status: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -330,10 +333,10 @@ where
         >,
     ) -> UpdateReadingProgress<'a> {
         UpdateReadingProgress {
-            current_entry: self.__unsafe_private_named.0,
-            notebook: self.__unsafe_private_named.1.unwrap(),
-            percent_complete: self.__unsafe_private_named.2,
-            status: self.__unsafe_private_named.3,
+            current_entry: self._fields.0,
+            notebook: self._fields.1.unwrap(),
+            percent_complete: self._fields.2,
+            status: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/notification.rs b/crates/jacquard-api/src/sh_weaver/notification.rs
index d20e0343..2159b637 100644
--- a/crates/jacquard-api/src/sh_weaver/notification.rs
+++ b/crates/jacquard-api/src/sh_weaver/notification.rs
@@ -10,7 +10,11 @@ pub mod get_unread_count;
 pub mod list_notifications;
 pub mod update_seen;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -312,112 +316,112 @@ pub mod notification_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Reason;
-        type Author;
-        type Uri;
         type Cid;
-        type IsRead;
+        type Uri;
+        type Author;
+        type Reason;
         type IndexedAt;
+        type IsRead;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Reason = Unset;
-        type Author = Unset;
-        type Uri = Unset;
         type Cid = Unset;
-        type IsRead = Unset;
+        type Uri = Unset;
+        type Author = Unset;
+        type Reason = Unset;
         type IndexedAt = Unset;
+        type IsRead = Unset;
     }
-    ///State transition - sets the `reason` field to Set
-    pub struct SetReason<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetReason<S> {}
-    impl<S: State> State for SetReason<S> {
-        type Reason = Set<members::reason>;
-        type Author = S::Author;
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Cid = Set<members::cid>;
         type Uri = S::Uri;
-        type Cid = S::Cid;
-        type IsRead = S::IsRead;
-        type IndexedAt = S::IndexedAt;
-    }
-    ///State transition - sets the `author` field to Set
-    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAuthor<S> {}
-    impl<S: State> State for SetAuthor<S> {
+        type Author = S::Author;
         type Reason = S::Reason;
-        type Author = Set<members::author>;
-        type Uri = S::Uri;
-        type Cid = S::Cid;
-        type IsRead = S::IsRead;
         type IndexedAt = S::IndexedAt;
+        type IsRead = S::IsRead;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Reason = S::Reason;
-        type Author = S::Author;
-        type Uri = Set<members::uri>;
         type Cid = S::Cid;
-        type IsRead = S::IsRead;
+        type Uri = Set<members::uri>;
+        type Author = S::Author;
+        type Reason = S::Reason;
         type IndexedAt = S::IndexedAt;
+        type IsRead = S::IsRead;
     }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type Reason = S::Reason;
-        type Author = S::Author;
+    ///State transition - sets the `author` field to Set
+    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAuthor<S> {}
+    impl<S: State> State for SetAuthor<S> {
+        type Cid = S::Cid;
         type Uri = S::Uri;
-        type Cid = Set<members::cid>;
-        type IsRead = S::IsRead;
+        type Author = Set<members::author>;
+        type Reason = S::Reason;
         type IndexedAt = S::IndexedAt;
+        type IsRead = S::IsRead;
     }
-    ///State transition - sets the `is_read` field to Set
-    pub struct SetIsRead<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIsRead<S> {}
-    impl<S: State> State for SetIsRead<S> {
-        type Reason = S::Reason;
-        type Author = S::Author;
-        type Uri = S::Uri;
+    ///State transition - sets the `reason` field to Set
+    pub struct SetReason<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetReason<S> {}
+    impl<S: State> State for SetReason<S> {
         type Cid = S::Cid;
-        type IsRead = Set<members::is_read>;
+        type Uri = S::Uri;
+        type Author = S::Author;
+        type Reason = Set<members::reason>;
         type IndexedAt = S::IndexedAt;
+        type IsRead = S::IsRead;
     }
     ///State transition - sets the `indexed_at` field to Set
     pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
     impl<S: State> State for SetIndexedAt<S> {
-        type Reason = S::Reason;
-        type Author = S::Author;
-        type Uri = S::Uri;
         type Cid = S::Cid;
-        type IsRead = S::IsRead;
+        type Uri = S::Uri;
+        type Author = S::Author;
+        type Reason = S::Reason;
         type IndexedAt = Set<members::indexed_at>;
+        type IsRead = S::IsRead;
+    }
+    ///State transition - sets the `is_read` field to Set
+    pub struct SetIsRead<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIsRead<S> {}
+    impl<S: State> State for SetIsRead<S> {
+        type Cid = S::Cid;
+        type Uri = S::Uri;
+        type Author = S::Author;
+        type Reason = S::Reason;
+        type IndexedAt = S::IndexedAt;
+        type IsRead = Set<members::is_read>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `reason` field
-        pub struct reason(());
-        ///Marker type for the `author` field
-        pub struct author(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `cid` field
         pub struct cid(());
-        ///Marker type for the `is_read` field
-        pub struct is_read(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
+        ///Marker type for the `author` field
+        pub struct author(());
+        ///Marker type for the `reason` field
+        pub struct reason(());
         ///Marker type for the `indexed_at` field
         pub struct indexed_at(());
+        ///Marker type for the `is_read` field
+        pub struct is_read(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct NotificationBuilder<'a, S: notification_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<Cid<'a>>,
         Option<Datetime>,
@@ -427,7 +431,7 @@ pub struct NotificationBuilder<'a, S: notification_state::State> {
         Option<Data<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Notification<'a> {
@@ -441,9 +445,9 @@ impl<'a> NotificationBuilder<'a, notification_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -458,11 +462,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> NotificationBuilder<'a, notification_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -477,11 +481,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> NotificationBuilder<'a, notification_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -496,11 +500,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> NotificationBuilder<'a, notification_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -515,11 +519,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> NotificationBuilder<'a, notification_state::SetIsRead<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -534,11 +538,11 @@ where
         mut self,
         value: impl Into<notification::NotificationReason<'a>>,
     ) -> NotificationBuilder<'a, notification_state::SetReason<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -546,12 +550,12 @@ where
 impl<'a, S: notification_state::State> NotificationBuilder<'a, S> {
     /// Set the `reasonSubject` field (optional)
     pub fn reason_subject(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `reasonSubject` field to an Option value (optional)
     pub fn maybe_reason_subject(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -559,12 +563,12 @@ impl<'a, S: notification_state::State> NotificationBuilder<'a, S> {
 impl<'a, S: notification_state::State> NotificationBuilder<'a, S> {
     /// Set the `record` field (optional)
     pub fn record(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `record` field to an Option value (optional)
     pub fn maybe_record(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -579,11 +583,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> NotificationBuilder<'a, notification_state::SetUri<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         NotificationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -591,24 +595,24 @@ where
 impl<'a, S> NotificationBuilder<'a, S>
 where
     S: notification_state::State,
-    S::Reason: notification_state::IsSet,
-    S::Author: notification_state::IsSet,
-    S::Uri: notification_state::IsSet,
     S::Cid: notification_state::IsSet,
-    S::IsRead: notification_state::IsSet,
+    S::Uri: notification_state::IsSet,
+    S::Author: notification_state::IsSet,
+    S::Reason: notification_state::IsSet,
     S::IndexedAt: notification_state::IsSet,
+    S::IsRead: notification_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Notification<'a> {
         Notification {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            is_read: self.__unsafe_private_named.3.unwrap(),
-            reason: self.__unsafe_private_named.4.unwrap(),
-            reason_subject: self.__unsafe_private_named.5,
-            record: self.__unsafe_private_named.6,
-            uri: self.__unsafe_private_named.7.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            is_read: self._fields.3.unwrap(),
+            reason: self._fields.4.unwrap(),
+            reason_subject: self._fields.5,
+            record: self._fields.6,
+            uri: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -618,14 +622,14 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Notification<'a> {
         Notification {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            is_read: self.__unsafe_private_named.3.unwrap(),
-            reason: self.__unsafe_private_named.4.unwrap(),
-            reason_subject: self.__unsafe_private_named.5,
-            record: self.__unsafe_private_named.6,
-            uri: self.__unsafe_private_named.7.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            is_read: self._fields.3.unwrap(),
+            reason: self._fields.4.unwrap(),
+            reason_subject: self._fields.5,
+            record: self._fields.6,
+            uri: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -890,92 +894,92 @@ pub mod notification_group_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Actors;
-        type Count;
-        type Subject;
         type Reason;
         type MostRecentAt;
+        type Count;
+        type Subject;
+        type Actors;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Actors = Unset;
-        type Count = Unset;
-        type Subject = Unset;
         type Reason = Unset;
         type MostRecentAt = Unset;
+        type Count = Unset;
+        type Subject = Unset;
+        type Actors = Unset;
     }
-    ///State transition - sets the `actors` field to Set
-    pub struct SetActors<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetActors<S> {}
-    impl<S: State> State for SetActors<S> {
-        type Actors = Set<members::actors>;
+    ///State transition - sets the `reason` field to Set
+    pub struct SetReason<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetReason<S> {}
+    impl<S: State> State for SetReason<S> {
+        type Reason = Set<members::reason>;
+        type MostRecentAt = S::MostRecentAt;
         type Count = S::Count;
         type Subject = S::Subject;
+        type Actors = S::Actors;
+    }
+    ///State transition - sets the `most_recent_at` field to Set
+    pub struct SetMostRecentAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMostRecentAt<S> {}
+    impl<S: State> State for SetMostRecentAt<S> {
         type Reason = S::Reason;
-        type MostRecentAt = S::MostRecentAt;
+        type MostRecentAt = Set<members::most_recent_at>;
+        type Count = S::Count;
+        type Subject = S::Subject;
+        type Actors = S::Actors;
     }
     ///State transition - sets the `count` field to Set
     pub struct SetCount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCount<S> {}
     impl<S: State> State for SetCount<S> {
-        type Actors = S::Actors;
-        type Count = Set<members::count>;
-        type Subject = S::Subject;
         type Reason = S::Reason;
         type MostRecentAt = S::MostRecentAt;
+        type Count = Set<members::count>;
+        type Subject = S::Subject;
+        type Actors = S::Actors;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type Actors = S::Actors;
-        type Count = S::Count;
-        type Subject = Set<members::subject>;
         type Reason = S::Reason;
         type MostRecentAt = S::MostRecentAt;
-    }
-    ///State transition - sets the `reason` field to Set
-    pub struct SetReason<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetReason<S> {}
-    impl<S: State> State for SetReason<S> {
-        type Actors = S::Actors;
         type Count = S::Count;
-        type Subject = S::Subject;
-        type Reason = Set<members::reason>;
-        type MostRecentAt = S::MostRecentAt;
-    }
-    ///State transition - sets the `most_recent_at` field to Set
-    pub struct SetMostRecentAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMostRecentAt<S> {}
-    impl<S: State> State for SetMostRecentAt<S> {
+        type Subject = Set<members::subject>;
         type Actors = S::Actors;
+    }
+    ///State transition - sets the `actors` field to Set
+    pub struct SetActors<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetActors<S> {}
+    impl<S: State> State for SetActors<S> {
+        type Reason = S::Reason;
+        type MostRecentAt = S::MostRecentAt;
         type Count = S::Count;
         type Subject = S::Subject;
-        type Reason = S::Reason;
-        type MostRecentAt = Set<members::most_recent_at>;
+        type Actors = Set<members::actors>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `actors` field
-        pub struct actors(());
-        ///Marker type for the `count` field
-        pub struct count(());
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `reason` field
         pub struct reason(());
         ///Marker type for the `most_recent_at` field
         pub struct most_recent_at(());
+        ///Marker type for the `count` field
+        pub struct count(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
+        ///Marker type for the `actors` field
+        pub struct actors(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct NotificationGroupBuilder<'a, S: notification_group_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<ProfileViewBasic<'a>>>,
         Option<i64>,
         Option<bool>,
@@ -983,7 +987,7 @@ pub struct NotificationGroupBuilder<'a, S: notification_group_state::State> {
         Option<notification::NotificationReason<'a>>,
         Option<NotificationGroupSubject<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> NotificationGroup<'a> {
@@ -997,9 +1001,9 @@ impl<'a> NotificationGroupBuilder<'a, notification_group_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NotificationGroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1014,11 +1018,11 @@ where
         mut self,
         value: impl Into<Vec<ProfileViewBasic<'a>>>,
     ) -> NotificationGroupBuilder<'a, notification_group_state::SetActors<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NotificationGroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1033,11 +1037,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> NotificationGroupBuilder<'a, notification_group_state::SetCount<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         NotificationGroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1045,12 +1049,12 @@ where
 impl<'a, S: notification_group_state::State> NotificationGroupBuilder<'a, S> {
     /// Set the `isRead` field (optional)
     pub fn is_read(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `isRead` field to an Option value (optional)
     pub fn maybe_is_read(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1065,11 +1069,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> NotificationGroupBuilder<'a, notification_group_state::SetMostRecentAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         NotificationGroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1084,11 +1088,11 @@ where
         mut self,
         value: impl Into<notification::NotificationReason<'a>>,
     ) -> NotificationGroupBuilder<'a, notification_group_state::SetReason<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         NotificationGroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1103,11 +1107,11 @@ where
         mut self,
         value: impl Into<NotificationGroupSubject<'a>>,
     ) -> NotificationGroupBuilder<'a, notification_group_state::SetSubject<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         NotificationGroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1115,21 +1119,21 @@ where
 impl<'a, S> NotificationGroupBuilder<'a, S>
 where
     S: notification_group_state::State,
-    S::Actors: notification_group_state::IsSet,
-    S::Count: notification_group_state::IsSet,
-    S::Subject: notification_group_state::IsSet,
     S::Reason: notification_group_state::IsSet,
     S::MostRecentAt: notification_group_state::IsSet,
+    S::Count: notification_group_state::IsSet,
+    S::Subject: notification_group_state::IsSet,
+    S::Actors: notification_group_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> NotificationGroup<'a> {
         NotificationGroup {
-            actors: self.__unsafe_private_named.0.unwrap(),
-            count: self.__unsafe_private_named.1.unwrap(),
-            is_read: self.__unsafe_private_named.2,
-            most_recent_at: self.__unsafe_private_named.3.unwrap(),
-            reason: self.__unsafe_private_named.4.unwrap(),
-            subject: self.__unsafe_private_named.5.unwrap(),
+            actors: self._fields.0.unwrap(),
+            count: self._fields.1.unwrap(),
+            is_read: self._fields.2,
+            most_recent_at: self._fields.3.unwrap(),
+            reason: self._fields.4.unwrap(),
+            subject: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1139,12 +1143,12 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> NotificationGroup<'a> {
         NotificationGroup {
-            actors: self.__unsafe_private_named.0.unwrap(),
-            count: self.__unsafe_private_named.1.unwrap(),
-            is_read: self.__unsafe_private_named.2,
-            most_recent_at: self.__unsafe_private_named.3.unwrap(),
-            reason: self.__unsafe_private_named.4.unwrap(),
-            subject: self.__unsafe_private_named.5.unwrap(),
+            actors: self._fields.0.unwrap(),
+            count: self._fields.1.unwrap(),
+            is_read: self._fields.2,
+            most_recent_at: self._fields.3.unwrap(),
+            reason: self._fields.4.unwrap(),
+            subject: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1160,49 +1164,49 @@ pub mod subscription_update_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type UpdatedAt;
         type NewEntries;
+        type UpdatedAt;
         type Notebook;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type UpdatedAt = Unset;
         type NewEntries = Unset;
+        type UpdatedAt = Unset;
         type Notebook = Unset;
     }
-    ///State transition - sets the `updated_at` field to Set
-    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
-    impl<S: State> State for SetUpdatedAt<S> {
-        type UpdatedAt = Set<members::updated_at>;
-        type NewEntries = S::NewEntries;
-        type Notebook = S::Notebook;
-    }
     ///State transition - sets the `new_entries` field to Set
     pub struct SetNewEntries<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetNewEntries<S> {}
     impl<S: State> State for SetNewEntries<S> {
-        type UpdatedAt = S::UpdatedAt;
         type NewEntries = Set<members::new_entries>;
+        type UpdatedAt = S::UpdatedAt;
+        type Notebook = S::Notebook;
+    }
+    ///State transition - sets the `updated_at` field to Set
+    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
+    impl<S: State> State for SetUpdatedAt<S> {
+        type NewEntries = S::NewEntries;
+        type UpdatedAt = Set<members::updated_at>;
         type Notebook = S::Notebook;
     }
     ///State transition - sets the `notebook` field to Set
     pub struct SetNotebook<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetNotebook<S> {}
     impl<S: State> State for SetNotebook<S> {
-        type UpdatedAt = S::UpdatedAt;
         type NewEntries = S::NewEntries;
+        type UpdatedAt = S::UpdatedAt;
         type Notebook = Set<members::notebook>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `updated_at` field
-        pub struct updated_at(());
         ///Marker type for the `new_entries` field
         pub struct new_entries(());
+        ///Marker type for the `updated_at` field
+        pub struct updated_at(());
         ///Marker type for the `notebook` field
         pub struct notebook(());
     }
@@ -1210,14 +1214,14 @@ pub mod subscription_update_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct SubscriptionUpdateViewBuilder<'a, S: subscription_update_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<EntryView<'a>>>,
         Option<NotebookView<'a>>,
         Option<Datetime>,
         Option<Vec<EntryView<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SubscriptionUpdateView<'a> {
@@ -1234,9 +1238,9 @@ impl<'a> SubscriptionUpdateViewBuilder<'a, subscription_update_view_state::Empty
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubscriptionUpdateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1254,11 +1258,11 @@ where
         'a,
         subscription_update_view_state::SetNewEntries<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SubscriptionUpdateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1276,11 +1280,11 @@ where
         'a,
         subscription_update_view_state::SetNotebook<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SubscriptionUpdateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1298,11 +1302,11 @@ where
         'a,
         subscription_update_view_state::SetUpdatedAt<S>,
     > {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SubscriptionUpdateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1313,12 +1317,12 @@ impl<'a, S: subscription_update_view_state::State> SubscriptionUpdateViewBuilder
         mut self,
         value: impl Into<Option<Vec<EntryView<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `updatedEntries` field to an Option value (optional)
     pub fn maybe_updated_entries(mut self, value: Option<Vec<EntryView<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1326,17 +1330,17 @@ impl<'a, S: subscription_update_view_state::State> SubscriptionUpdateViewBuilder
 impl<'a, S> SubscriptionUpdateViewBuilder<'a, S>
 where
     S: subscription_update_view_state::State,
-    S::UpdatedAt: subscription_update_view_state::IsSet,
     S::NewEntries: subscription_update_view_state::IsSet,
+    S::UpdatedAt: subscription_update_view_state::IsSet,
     S::Notebook: subscription_update_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SubscriptionUpdateView<'a> {
         SubscriptionUpdateView {
-            new_entries: self.__unsafe_private_named.0.unwrap(),
-            notebook: self.__unsafe_private_named.1.unwrap(),
-            updated_at: self.__unsafe_private_named.2.unwrap(),
-            updated_entries: self.__unsafe_private_named.3,
+            new_entries: self._fields.0.unwrap(),
+            notebook: self._fields.1.unwrap(),
+            updated_at: self._fields.2.unwrap(),
+            updated_entries: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -1346,10 +1350,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> SubscriptionUpdateView<'a> {
         SubscriptionUpdateView {
-            new_entries: self.__unsafe_private_named.0.unwrap(),
-            notebook: self.__unsafe_private_named.1.unwrap(),
-            updated_at: self.__unsafe_private_named.2.unwrap(),
-            updated_entries: self.__unsafe_private_named.3,
+            new_entries: self._fields.0.unwrap(),
+            notebook: self._fields.1.unwrap(),
+            updated_at: self._fields.2.unwrap(),
+            updated_entries: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/notification/get_subscription_updates.rs b/crates/jacquard-api/src/sh_weaver/notification/get_subscription_updates.rs
index a952e09e..6705d41e 100644
--- a/crates/jacquard-api/src/sh_weaver/notification/get_subscription_updates.rs
+++ b/crates/jacquard-api/src/sh_weaver/notification/get_subscription_updates.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Datetime;
@@ -88,9 +91,9 @@ pub mod get_subscription_updates_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSubscriptionUpdatesBuilder<'a, S: get_subscription_updates_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSubscriptionUpdates<'a> {
@@ -107,9 +110,9 @@ impl<'a> GetSubscriptionUpdatesBuilder<'a, get_subscription_updates_state::Empty
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSubscriptionUpdatesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -117,12 +120,12 @@ impl<'a> GetSubscriptionUpdatesBuilder<'a, get_subscription_updates_state::Empty
 impl<'a, S: get_subscription_updates_state::State> GetSubscriptionUpdatesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -130,12 +133,12 @@ impl<'a, S: get_subscription_updates_state::State> GetSubscriptionUpdatesBuilder
 impl<'a, S: get_subscription_updates_state::State> GetSubscriptionUpdatesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -143,12 +146,12 @@ impl<'a, S: get_subscription_updates_state::State> GetSubscriptionUpdatesBuilder
 impl<'a, S: get_subscription_updates_state::State> GetSubscriptionUpdatesBuilder<'a, S> {
     /// Set the `since` field (optional)
     pub fn since(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `since` field to an Option value (optional)
     pub fn maybe_since(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -160,9 +163,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSubscriptionUpdates<'a> {
         GetSubscriptionUpdates {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            since: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            since: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notification/get_unread_count.rs b/crates/jacquard-api/src/sh_weaver/notification/get_unread_count.rs
index b09a9be9..d023bfca 100644
--- a/crates/jacquard-api/src/sh_weaver/notification/get_unread_count.rs
+++ b/crates/jacquard-api/src/sh_weaver/notification/get_unread_count.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Datetime;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -71,8 +74,8 @@ pub mod get_unread_count_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetUnreadCountBuilder<S: get_unread_count_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>,),
 }
 
 impl GetUnreadCount {
@@ -86,8 +89,8 @@ impl GetUnreadCountBuilder<get_unread_count_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetUnreadCountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -95,12 +98,12 @@ impl GetUnreadCountBuilder<get_unread_count_state::Empty> {
 impl<S: get_unread_count_state::State> GetUnreadCountBuilder<S> {
     /// Set the `seenAt` field (optional)
     pub fn seen_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `seenAt` field to an Option value (optional)
     pub fn maybe_seen_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -112,7 +115,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetUnreadCount {
         GetUnreadCount {
-            seen_at: self.__unsafe_private_named.0,
+            seen_at: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notification/list_notifications.rs b/crates/jacquard-api/src/sh_weaver/notification/list_notifications.rs
index 52a27922..e8978fb8 100644
--- a/crates/jacquard-api/src/sh_weaver/notification/list_notifications.rs
+++ b/crates/jacquard-api/src/sh_weaver/notification/list_notifications.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Datetime;
@@ -93,14 +96,14 @@ pub mod list_notifications_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListNotificationsBuilder<'a, S: list_notifications_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<i64>,
         Option<Vec<CowStr<'a>>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListNotifications<'a> {
@@ -114,9 +117,9 @@ impl<'a> ListNotificationsBuilder<'a, list_notifications_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListNotificationsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -124,12 +127,12 @@ impl<'a> ListNotificationsBuilder<'a, list_notifications_state::Empty> {
 impl<'a, S: list_notifications_state::State> ListNotificationsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -137,12 +140,12 @@ impl<'a, S: list_notifications_state::State> ListNotificationsBuilder<'a, S> {
 impl<'a, S: list_notifications_state::State> ListNotificationsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -150,12 +153,12 @@ impl<'a, S: list_notifications_state::State> ListNotificationsBuilder<'a, S> {
 impl<'a, S: list_notifications_state::State> ListNotificationsBuilder<'a, S> {
     /// Set the `reasons` field (optional)
     pub fn reasons(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `reasons` field to an Option value (optional)
     pub fn maybe_reasons(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -163,12 +166,12 @@ impl<'a, S: list_notifications_state::State> ListNotificationsBuilder<'a, S> {
 impl<'a, S: list_notifications_state::State> ListNotificationsBuilder<'a, S> {
     /// Set the `seenAt` field (optional)
     pub fn seen_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `seenAt` field to an Option value (optional)
     pub fn maybe_seen_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -180,10 +183,10 @@ where
     /// Build the final struct
     pub fn build(self) -> ListNotifications<'a> {
         ListNotifications {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            reasons: self.__unsafe_private_named.2,
-            seen_at: self.__unsafe_private_named.3,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            reasons: self._fields.2,
+            seen_at: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/sh_weaver/notification/update_seen.rs b/crates/jacquard-api/src/sh_weaver/notification/update_seen.rs
index d61eceba..a8b86029 100644
--- a/crates/jacquard-api/src/sh_weaver/notification/update_seen.rs
+++ b/crates/jacquard-api/src/sh_weaver/notification/update_seen.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Datetime;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -85,9 +88,9 @@ pub mod update_seen_state {
 
 /// Builder for constructing an instance of this type
 pub struct UpdateSeenBuilder<'a, S: update_seen_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateSeen<'a> {
@@ -101,9 +104,9 @@ impl<'a> UpdateSeenBuilder<'a, update_seen_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateSeenBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -118,11 +121,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> UpdateSeenBuilder<'a, update_seen_state::SetSeenAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UpdateSeenBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -135,7 +138,7 @@ where
     /// Build the final struct
     pub fn build(self) -> UpdateSeen<'a> {
         UpdateSeen {
-            seen_at: self.__unsafe_private_named.0.unwrap(),
+            seen_at: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -148,7 +151,7 @@ where
         >,
     ) -> UpdateSeen<'a> {
         UpdateSeen {
-            seen_at: self.__unsafe_private_named.0.unwrap(),
+            seen_at: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/sh_weaver/publish/blob.rs b/crates/jacquard-api/src/sh_weaver/publish/blob.rs
index dba36199..cf3fdfba 100644
--- a/crates/jacquard-api/src/sh_weaver/publish/blob.rs
+++ b/crates/jacquard-api/src/sh_weaver/publish/blob.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -163,45 +166,45 @@ pub mod blob_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Path;
         type Upload;
+        type Path;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Path = Unset;
         type Upload = Unset;
-    }
-    ///State transition - sets the `path` field to Set
-    pub struct SetPath<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPath<S> {}
-    impl<S: State> State for SetPath<S> {
-        type Path = Set<members::path>;
-        type Upload = S::Upload;
+        type Path = Unset;
     }
     ///State transition - sets the `upload` field to Set
     pub struct SetUpload<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUpload<S> {}
     impl<S: State> State for SetUpload<S> {
-        type Path = S::Path;
         type Upload = Set<members::upload>;
+        type Path = S::Path;
+    }
+    ///State transition - sets the `path` field to Set
+    pub struct SetPath<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPath<S> {}
+    impl<S: State> State for SetPath<S> {
+        type Upload = S::Upload;
+        type Path = Set<members::path>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `path` field
-        pub struct path(());
         ///Marker type for the `upload` field
         pub struct upload(());
+        ///Marker type for the `path` field
+        pub struct path(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BlobBuilder<'a, S: blob_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<BlobRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<BlobRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Blob<'a> {
@@ -215,9 +218,9 @@ impl<'a> BlobBuilder<'a, blob_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,11 +235,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BlobBuilder<'a, blob_state::SetPath<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -251,11 +254,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> BlobBuilder<'a, blob_state::SetUpload<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BlobBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -263,14 +266,14 @@ where
 impl<'a, S> BlobBuilder<'a, S>
 where
     S: blob_state::State,
-    S::Path: blob_state::IsSet,
     S::Upload: blob_state::IsSet,
+    S::Path: blob_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Blob<'a> {
         Blob {
-            path: self.__unsafe_private_named.0.unwrap(),
-            upload: self.__unsafe_private_named.1.unwrap(),
+            path: self._fields.0.unwrap(),
+            upload: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -283,8 +286,8 @@ where
         >,
     ) -> Blob<'a> {
         Blob {
-            path: self.__unsafe_private_named.0.unwrap(),
-            upload: self.__unsafe_private_named.1.unwrap(),
+            path: self._fields.0.unwrap(),
+            upload: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/site_standard/document.rs b/crates/jacquard-api/src/site_standard/document.rs
index 1cf02971..42de059a 100644
--- a/crates/jacquard-api/src/site_standard/document.rs
+++ b/crates/jacquard-api/src/site_standard/document.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -230,49 +233,49 @@ pub mod document_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Title;
         type PublishedAt;
+        type Title;
         type Site;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Title = Unset;
         type PublishedAt = Unset;
+        type Title = Unset;
         type Site = Unset;
     }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Title = Set<members::title>;
-        type PublishedAt = S::PublishedAt;
-        type Site = S::Site;
-    }
     ///State transition - sets the `published_at` field to Set
     pub struct SetPublishedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPublishedAt<S> {}
     impl<S: State> State for SetPublishedAt<S> {
-        type Title = S::Title;
         type PublishedAt = Set<members::published_at>;
+        type Title = S::Title;
+        type Site = S::Site;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type PublishedAt = S::PublishedAt;
+        type Title = Set<members::title>;
         type Site = S::Site;
     }
     ///State transition - sets the `site` field to Set
     pub struct SetSite<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSite<S> {}
     impl<S: State> State for SetSite<S> {
-        type Title = S::Title;
         type PublishedAt = S::PublishedAt;
+        type Title = S::Title;
         type Site = Set<members::site>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `title` field
-        pub struct title(());
         ///Marker type for the `published_at` field
         pub struct published_at(());
+        ///Marker type for the `title` field
+        pub struct title(());
         ///Marker type for the `site` field
         pub struct site(());
     }
@@ -280,8 +283,8 @@ pub mod document_state {
 
 /// Builder for constructing an instance of this type
 pub struct DocumentBuilder<'a, S: document_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<StrongRef<'a>>,
         Option<Content<'a>>,
         Option<BlobRef<'a>>,
@@ -296,7 +299,7 @@ pub struct DocumentBuilder<'a, S: document_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Document<'a> {
@@ -310,8 +313,8 @@ impl<'a> DocumentBuilder<'a, document_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -326,7 +329,7 @@ impl<'a> DocumentBuilder<'a, document_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -334,12 +337,12 @@ impl<'a> DocumentBuilder<'a, document_state::Empty> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `bskyPostRef` field (optional)
     pub fn bsky_post_ref(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `bskyPostRef` field to an Option value (optional)
     pub fn maybe_bsky_post_ref(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -347,12 +350,12 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `content` field (optional)
     pub fn content(mut self, value: impl Into<Option<Content<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `content` field to an Option value (optional)
     pub fn maybe_content(mut self, value: Option<Content<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -360,12 +363,12 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `coverImage` field (optional)
     pub fn cover_image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `coverImage` field to an Option value (optional)
     pub fn maybe_cover_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -373,12 +376,12 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -386,12 +389,12 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `path` field (optional)
     pub fn path(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `path` field to an Option value (optional)
     pub fn maybe_path(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -399,12 +402,12 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `preferences` field (optional)
     pub fn preferences(mut self, value: impl Into<Option<Preferences<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `preferences` field to an Option value (optional)
     pub fn maybe_preferences(mut self, value: Option<Preferences<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -419,11 +422,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> DocumentBuilder<'a, document_state::SetPublishedAt<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -438,11 +441,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> DocumentBuilder<'a, document_state::SetSite<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -450,12 +453,12 @@ where
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -463,12 +466,12 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `textContent` field (optional)
     pub fn text_content(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `textContent` field to an Option value (optional)
     pub fn maybe_text_content(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -476,12 +479,12 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `theme` field (optional)
     pub fn theme(mut self, value: impl Into<Option<Theme<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `theme` field to an Option value (optional)
     pub fn maybe_theme(mut self, value: Option<Theme<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -496,11 +499,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DocumentBuilder<'a, document_state::SetTitle<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         DocumentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -508,12 +511,12 @@ where
 impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -521,26 +524,26 @@ impl<'a, S: document_state::State> DocumentBuilder<'a, S> {
 impl<'a, S> DocumentBuilder<'a, S>
 where
     S: document_state::State,
-    S::Title: document_state::IsSet,
     S::PublishedAt: document_state::IsSet,
+    S::Title: document_state::IsSet,
     S::Site: document_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Document<'a> {
         Document {
-            bsky_post_ref: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1,
-            cover_image: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            path: self.__unsafe_private_named.4,
-            preferences: self.__unsafe_private_named.5,
-            published_at: self.__unsafe_private_named.6.unwrap(),
-            site: self.__unsafe_private_named.7.unwrap(),
-            tags: self.__unsafe_private_named.8,
-            text_content: self.__unsafe_private_named.9,
-            theme: self.__unsafe_private_named.10,
-            title: self.__unsafe_private_named.11.unwrap(),
-            updated_at: self.__unsafe_private_named.12,
+            bsky_post_ref: self._fields.0,
+            content: self._fields.1,
+            cover_image: self._fields.2,
+            description: self._fields.3,
+            path: self._fields.4,
+            preferences: self._fields.5,
+            published_at: self._fields.6.unwrap(),
+            site: self._fields.7.unwrap(),
+            tags: self._fields.8,
+            text_content: self._fields.9,
+            theme: self._fields.10,
+            title: self._fields.11.unwrap(),
+            updated_at: self._fields.12,
             extra_data: Default::default(),
         }
     }
@@ -553,19 +556,19 @@ where
         >,
     ) -> Document<'a> {
         Document {
-            bsky_post_ref: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1,
-            cover_image: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            path: self.__unsafe_private_named.4,
-            preferences: self.__unsafe_private_named.5,
-            published_at: self.__unsafe_private_named.6.unwrap(),
-            site: self.__unsafe_private_named.7.unwrap(),
-            tags: self.__unsafe_private_named.8,
-            text_content: self.__unsafe_private_named.9,
-            theme: self.__unsafe_private_named.10,
-            title: self.__unsafe_private_named.11.unwrap(),
-            updated_at: self.__unsafe_private_named.12,
+            bsky_post_ref: self._fields.0,
+            content: self._fields.1,
+            cover_image: self._fields.2,
+            description: self._fields.3,
+            path: self._fields.4,
+            preferences: self._fields.5,
+            published_at: self._fields.6.unwrap(),
+            site: self._fields.7.unwrap(),
+            tags: self._fields.8,
+            text_content: self._fields.9,
+            theme: self._fields.10,
+            title: self._fields.11.unwrap(),
+            updated_at: self._fields.12,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/site_standard/graph/subscription.rs b/crates/jacquard-api/src/site_standard/graph/subscription.rs
index b41436b8..d0e68e50 100644
--- a/crates/jacquard-api/src/site_standard/graph/subscription.rs
+++ b/crates/jacquard-api/src/site_standard/graph/subscription.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -131,9 +134,9 @@ pub mod subscription_state {
 
 /// Builder for constructing an instance of this type
 pub struct SubscriptionBuilder<'a, S: subscription_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Subscription<'a> {
@@ -147,9 +150,9 @@ impl<'a> SubscriptionBuilder<'a, subscription_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,11 +167,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SubscriptionBuilder<'a, subscription_state::SetPublication<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SubscriptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,7 +184,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Subscription<'a> {
         Subscription {
-            publication: self.__unsafe_private_named.0.unwrap(),
+            publication: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -194,7 +197,7 @@ where
         >,
     ) -> Subscription<'a> {
         Subscription {
-            publication: self.__unsafe_private_named.0.unwrap(),
+            publication: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/site_standard/publication.rs b/crates/jacquard-api/src/site_standard/publication.rs
index 9eeea6f7..26c819e2 100644
--- a/crates/jacquard-api/src/site_standard/publication.rs
+++ b/crates/jacquard-api/src/site_standard/publication.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -289,8 +292,8 @@ pub mod publication_state {
 
 /// Builder for constructing an instance of this type
 pub struct PublicationBuilder<'a, S: publication_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Basic<'a>>,
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
@@ -299,7 +302,7 @@ pub struct PublicationBuilder<'a, S: publication_state::State> {
         Option<Theme<'a>>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Publication<'a> {
@@ -313,9 +316,9 @@ impl<'a> PublicationBuilder<'a, publication_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -323,12 +326,12 @@ impl<'a> PublicationBuilder<'a, publication_state::Empty> {
 impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
     /// Set the `basicTheme` field (optional)
     pub fn basic_theme(mut self, value: impl Into<Option<Basic<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `basicTheme` field to an Option value (optional)
     pub fn maybe_basic_theme(mut self, value: Option<Basic<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -336,12 +339,12 @@ impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
 impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -349,12 +352,12 @@ impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
 impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
     /// Set the `icon` field (optional)
     pub fn icon(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `icon` field to an Option value (optional)
     pub fn maybe_icon(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -369,11 +372,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PublicationBuilder<'a, publication_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -384,7 +387,7 @@ impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<publication::Preferences<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `preferences` field to an Option value (optional)
@@ -392,7 +395,7 @@ impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
         mut self,
         value: Option<publication::Preferences<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -400,12 +403,12 @@ impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
 impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
     /// Set the `theme` field (optional)
     pub fn theme(mut self, value: impl Into<Option<Theme<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `theme` field to an Option value (optional)
     pub fn maybe_theme(mut self, value: Option<Theme<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -420,11 +423,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> PublicationBuilder<'a, publication_state::SetUrl<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -438,13 +441,13 @@ where
     /// Build the final struct
     pub fn build(self) -> Publication<'a> {
         Publication {
-            basic_theme: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            icon: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            preferences: self.__unsafe_private_named.4,
-            theme: self.__unsafe_private_named.5,
-            url: self.__unsafe_private_named.6.unwrap(),
+            basic_theme: self._fields.0,
+            description: self._fields.1,
+            icon: self._fields.2,
+            name: self._fields.3.unwrap(),
+            preferences: self._fields.4,
+            theme: self._fields.5,
+            url: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -457,13 +460,13 @@ where
         >,
     ) -> Publication<'a> {
         Publication {
-            basic_theme: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            icon: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            preferences: self.__unsafe_private_named.4,
-            theme: self.__unsafe_private_named.5,
-            url: self.__unsafe_private_named.6.unwrap(),
+            basic_theme: self._fields.0,
+            description: self._fields.1,
+            icon: self._fields.2,
+            name: self._fields.3.unwrap(),
+            preferences: self._fields.4,
+            theme: self._fields.5,
+            url: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/site_standard/theme/basic.rs b/crates/jacquard-api/src/site_standard/theme/basic.rs
index fae844d9..12f3b982 100644
--- a/crates/jacquard-api/src/site_standard/theme/basic.rs
+++ b/crates/jacquard-api/src/site_standard/theme/basic.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -58,65 +61,65 @@ pub mod basic_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Background;
         type Foreground;
         type Accent;
+        type Background;
         type AccentForeground;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Background = Unset;
         type Foreground = Unset;
         type Accent = Unset;
+        type Background = Unset;
         type AccentForeground = Unset;
     }
-    ///State transition - sets the `background` field to Set
-    pub struct SetBackground<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBackground<S> {}
-    impl<S: State> State for SetBackground<S> {
-        type Background = Set<members::background>;
-        type Foreground = S::Foreground;
-        type Accent = S::Accent;
-        type AccentForeground = S::AccentForeground;
-    }
     ///State transition - sets the `foreground` field to Set
     pub struct SetForeground<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetForeground<S> {}
     impl<S: State> State for SetForeground<S> {
-        type Background = S::Background;
         type Foreground = Set<members::foreground>;
         type Accent = S::Accent;
+        type Background = S::Background;
         type AccentForeground = S::AccentForeground;
     }
     ///State transition - sets the `accent` field to Set
     pub struct SetAccent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAccent<S> {}
     impl<S: State> State for SetAccent<S> {
-        type Background = S::Background;
         type Foreground = S::Foreground;
         type Accent = Set<members::accent>;
+        type Background = S::Background;
+        type AccentForeground = S::AccentForeground;
+    }
+    ///State transition - sets the `background` field to Set
+    pub struct SetBackground<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBackground<S> {}
+    impl<S: State> State for SetBackground<S> {
+        type Foreground = S::Foreground;
+        type Accent = S::Accent;
+        type Background = Set<members::background>;
         type AccentForeground = S::AccentForeground;
     }
     ///State transition - sets the `accent_foreground` field to Set
     pub struct SetAccentForeground<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAccentForeground<S> {}
     impl<S: State> State for SetAccentForeground<S> {
-        type Background = S::Background;
         type Foreground = S::Foreground;
         type Accent = S::Accent;
+        type Background = S::Background;
         type AccentForeground = Set<members::accent_foreground>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `background` field
-        pub struct background(());
         ///Marker type for the `foreground` field
         pub struct foreground(());
         ///Marker type for the `accent` field
         pub struct accent(());
+        ///Marker type for the `background` field
+        pub struct background(());
         ///Marker type for the `accent_foreground` field
         pub struct accent_foreground(());
     }
@@ -124,14 +127,9 @@ pub mod basic_state {
 
 /// Builder for constructing an instance of this type
 pub struct BasicBuilder<'a, S: basic_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Rgb<'a>>,
-        Option<Rgb<'a>>,
-        Option<Rgb<'a>>,
-        Option<Rgb<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Rgb<'a>>, Option<Rgb<'a>>, Option<Rgb<'a>>, Option<Rgb<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Basic<'a> {
@@ -145,9 +143,9 @@ impl<'a> BasicBuilder<'a, basic_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -162,11 +160,11 @@ where
         mut self,
         value: impl Into<Rgb<'a>>,
     ) -> BasicBuilder<'a, basic_state::SetAccent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,11 +179,11 @@ where
         mut self,
         value: impl Into<Rgb<'a>>,
     ) -> BasicBuilder<'a, basic_state::SetAccentForeground<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,11 +198,11 @@ where
         mut self,
         value: impl Into<Rgb<'a>>,
     ) -> BasicBuilder<'a, basic_state::SetBackground<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -219,11 +217,11 @@ where
         mut self,
         value: impl Into<Rgb<'a>>,
     ) -> BasicBuilder<'a, basic_state::SetForeground<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BasicBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -231,18 +229,18 @@ where
 impl<'a, S> BasicBuilder<'a, S>
 where
     S: basic_state::State,
-    S::Background: basic_state::IsSet,
     S::Foreground: basic_state::IsSet,
     S::Accent: basic_state::IsSet,
+    S::Background: basic_state::IsSet,
     S::AccentForeground: basic_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Basic<'a> {
         Basic {
-            accent: self.__unsafe_private_named.0.unwrap(),
-            accent_foreground: self.__unsafe_private_named.1.unwrap(),
-            background: self.__unsafe_private_named.2.unwrap(),
-            foreground: self.__unsafe_private_named.3.unwrap(),
+            accent: self._fields.0.unwrap(),
+            accent_foreground: self._fields.1.unwrap(),
+            background: self._fields.2.unwrap(),
+            foreground: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -255,10 +253,10 @@ where
         >,
     ) -> Basic<'a> {
         Basic {
-            accent: self.__unsafe_private_named.0.unwrap(),
-            accent_foreground: self.__unsafe_private_named.1.unwrap(),
-            background: self.__unsafe_private_named.2.unwrap(),
-            foreground: self.__unsafe_private_named.3.unwrap(),
+            accent: self._fields.0.unwrap(),
+            accent_foreground: self._fields.1.unwrap(),
+            background: self._fields.2.unwrap(),
+            foreground: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/site_standard/theme/color.rs b/crates/jacquard-api/src/site_standard/theme/color.rs
index 6538f46d..fe185237 100644
--- a/crates/jacquard-api/src/site_standard/theme/color.rs
+++ b/crates/jacquard-api/src/site_standard/theme/color.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -218,59 +221,59 @@ pub mod rgb_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type B;
         type R;
         type G;
+        type B;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type B = Unset;
         type R = Unset;
         type G = Unset;
-    }
-    ///State transition - sets the `b` field to Set
-    pub struct SetB<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetB<S> {}
-    impl<S: State> State for SetB<S> {
-        type B = Set<members::b>;
-        type R = S::R;
-        type G = S::G;
+        type B = Unset;
     }
     ///State transition - sets the `r` field to Set
     pub struct SetR<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetR<S> {}
     impl<S: State> State for SetR<S> {
-        type B = S::B;
         type R = Set<members::r>;
         type G = S::G;
+        type B = S::B;
     }
     ///State transition - sets the `g` field to Set
     pub struct SetG<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetG<S> {}
     impl<S: State> State for SetG<S> {
-        type B = S::B;
         type R = S::R;
         type G = Set<members::g>;
+        type B = S::B;
+    }
+    ///State transition - sets the `b` field to Set
+    pub struct SetB<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetB<S> {}
+    impl<S: State> State for SetB<S> {
+        type R = S::R;
+        type G = S::G;
+        type B = Set<members::b>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `b` field
-        pub struct b(());
         ///Marker type for the `r` field
         pub struct r(());
         ///Marker type for the `g` field
         pub struct g(());
+        ///Marker type for the `b` field
+        pub struct b(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RgbBuilder<'a, S: rgb_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Rgb<'a> {
@@ -284,9 +287,9 @@ impl<'a> RgbBuilder<'a, rgb_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RgbBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -298,11 +301,11 @@ where
 {
     /// Set the `b` field (required)
     pub fn b(mut self, value: impl Into<i64>) -> RgbBuilder<'a, rgb_state::SetB<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RgbBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -314,11 +317,11 @@ where
 {
     /// Set the `g` field (required)
     pub fn g(mut self, value: impl Into<i64>) -> RgbBuilder<'a, rgb_state::SetG<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RgbBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -330,11 +333,11 @@ where
 {
     /// Set the `r` field (required)
     pub fn r(mut self, value: impl Into<i64>) -> RgbBuilder<'a, rgb_state::SetR<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RgbBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -342,16 +345,16 @@ where
 impl<'a, S> RgbBuilder<'a, S>
 where
     S: rgb_state::State,
-    S::B: rgb_state::IsSet,
     S::R: rgb_state::IsSet,
     S::G: rgb_state::IsSet,
+    S::B: rgb_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Rgb<'a> {
         Rgb {
-            b: self.__unsafe_private_named.0.unwrap(),
-            g: self.__unsafe_private_named.1.unwrap(),
-            r: self.__unsafe_private_named.2.unwrap(),
+            b: self._fields.0.unwrap(),
+            g: self._fields.1.unwrap(),
+            r: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -364,9 +367,9 @@ where
         >,
     ) -> Rgb<'a> {
         Rgb {
-            b: self.__unsafe_private_named.0.unwrap(),
-            g: self.__unsafe_private_named.1.unwrap(),
-            r: self.__unsafe_private_named.2.unwrap(),
+            b: self._fields.0.unwrap(),
+            g: self._fields.1.unwrap(),
+            r: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -488,8 +491,8 @@ pub mod rgba_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type A;
         type R;
+        type A;
         type B;
         type G;
     }
@@ -497,26 +500,26 @@ pub mod rgba_state {
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type A = Unset;
         type R = Unset;
+        type A = Unset;
         type B = Unset;
         type G = Unset;
     }
-    ///State transition - sets the `a` field to Set
-    pub struct SetA<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetA<S> {}
-    impl<S: State> State for SetA<S> {
-        type A = Set<members::a>;
-        type R = S::R;
-        type B = S::B;
-        type G = S::G;
-    }
     ///State transition - sets the `r` field to Set
     pub struct SetR<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetR<S> {}
     impl<S: State> State for SetR<S> {
-        type A = S::A;
         type R = Set<members::r>;
+        type A = S::A;
+        type B = S::B;
+        type G = S::G;
+    }
+    ///State transition - sets the `a` field to Set
+    pub struct SetA<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetA<S> {}
+    impl<S: State> State for SetA<S> {
+        type R = S::R;
+        type A = Set<members::a>;
         type B = S::B;
         type G = S::G;
     }
@@ -524,8 +527,8 @@ pub mod rgba_state {
     pub struct SetB<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetB<S> {}
     impl<S: State> State for SetB<S> {
-        type A = S::A;
         type R = S::R;
+        type A = S::A;
         type B = Set<members::b>;
         type G = S::G;
     }
@@ -533,18 +536,18 @@ pub mod rgba_state {
     pub struct SetG<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetG<S> {}
     impl<S: State> State for SetG<S> {
-        type A = S::A;
         type R = S::R;
+        type A = S::A;
         type B = S::B;
         type G = Set<members::g>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `a` field
-        pub struct a(());
         ///Marker type for the `r` field
         pub struct r(());
+        ///Marker type for the `a` field
+        pub struct a(());
         ///Marker type for the `b` field
         pub struct b(());
         ///Marker type for the `g` field
@@ -554,9 +557,9 @@ pub mod rgba_state {
 
 /// Builder for constructing an instance of this type
 pub struct RgbaBuilder<'a, S: rgba_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Rgba<'a> {
@@ -570,9 +573,9 @@ impl<'a> RgbaBuilder<'a, rgba_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RgbaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -584,11 +587,11 @@ where
 {
     /// Set the `a` field (required)
     pub fn a(mut self, value: impl Into<i64>) -> RgbaBuilder<'a, rgba_state::SetA<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RgbaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -600,11 +603,11 @@ where
 {
     /// Set the `b` field (required)
     pub fn b(mut self, value: impl Into<i64>) -> RgbaBuilder<'a, rgba_state::SetB<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RgbaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -616,11 +619,11 @@ where
 {
     /// Set the `g` field (required)
     pub fn g(mut self, value: impl Into<i64>) -> RgbaBuilder<'a, rgba_state::SetG<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RgbaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -632,11 +635,11 @@ where
 {
     /// Set the `r` field (required)
     pub fn r(mut self, value: impl Into<i64>) -> RgbaBuilder<'a, rgba_state::SetR<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RgbaBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -644,18 +647,18 @@ where
 impl<'a, S> RgbaBuilder<'a, S>
 where
     S: rgba_state::State,
-    S::A: rgba_state::IsSet,
     S::R: rgba_state::IsSet,
+    S::A: rgba_state::IsSet,
     S::B: rgba_state::IsSet,
     S::G: rgba_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Rgba<'a> {
         Rgba {
-            a: self.__unsafe_private_named.0.unwrap(),
-            b: self.__unsafe_private_named.1.unwrap(),
-            g: self.__unsafe_private_named.2.unwrap(),
-            r: self.__unsafe_private_named.3.unwrap(),
+            a: self._fields.0.unwrap(),
+            b: self._fields.1.unwrap(),
+            g: self._fields.2.unwrap(),
+            r: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -668,10 +671,10 @@ where
         >,
     ) -> Rgba<'a> {
         Rgba {
-            a: self.__unsafe_private_named.0.unwrap(),
-            b: self.__unsafe_private_named.1.unwrap(),
-            g: self.__unsafe_private_named.2.unwrap(),
-            r: self.__unsafe_private_named.3.unwrap(),
+            a: self._fields.0.unwrap(),
+            b: self._fields.1.unwrap(),
+            g: self._fields.2.unwrap(),
+            r: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_clippr/actor.rs b/crates/jacquard-api/src/social_clippr/actor.rs
index b5012dd9..c5957c26 100644
--- a/crates/jacquard-api/src/social_clippr/actor.rs
+++ b/crates/jacquard-api/src/social_clippr/actor.rs
@@ -13,7 +13,11 @@ pub mod search_clips;
 pub mod search_profiles;
 pub mod search_tags;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -261,58 +265,58 @@ pub mod profile_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Handle;
         type DisplayName;
         type Did;
-        type Handle;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Handle = Unset;
         type DisplayName = Unset;
         type Did = Unset;
-        type Handle = Unset;
+    }
+    ///State transition - sets the `handle` field to Set
+    pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHandle<S> {}
+    impl<S: State> State for SetHandle<S> {
+        type Handle = Set<members::handle>;
+        type DisplayName = S::DisplayName;
+        type Did = S::Did;
     }
     ///State transition - sets the `display_name` field to Set
     pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDisplayName<S> {}
     impl<S: State> State for SetDisplayName<S> {
+        type Handle = S::Handle;
         type DisplayName = Set<members::display_name>;
         type Did = S::Did;
-        type Handle = S::Handle;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type DisplayName = S::DisplayName;
-        type Did = Set<members::did>;
         type Handle = S::Handle;
-    }
-    ///State transition - sets the `handle` field to Set
-    pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHandle<S> {}
-    impl<S: State> State for SetHandle<S> {
         type DisplayName = S::DisplayName;
-        type Did = S::Did;
-        type Handle = Set<members::handle>;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `handle` field
+        pub struct handle(());
         ///Marker type for the `display_name` field
         pub struct display_name(());
         ///Marker type for the `did` field
         pub struct did(());
-        ///Marker type for the `handle` field
-        pub struct handle(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ProfileViewBuilder<'a, S: profile_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<UriValue<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -320,7 +324,7 @@ pub struct ProfileViewBuilder<'a, S: profile_view_state::State> {
         Option<CowStr<'a>>,
         Option<Handle<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileView<'a> {
@@ -334,9 +338,9 @@ impl<'a> ProfileViewBuilder<'a, profile_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -344,12 +348,12 @@ impl<'a> ProfileViewBuilder<'a, profile_view_state::Empty> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -357,12 +361,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -370,12 +374,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -390,11 +394,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ProfileViewBuilder<'a, profile_view_state::SetDid<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -409,11 +413,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProfileViewBuilder<'a, profile_view_state::SetDisplayName<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -428,11 +432,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> ProfileViewBuilder<'a, profile_view_state::SetHandle<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -440,19 +444,19 @@ where
 impl<'a, S> ProfileViewBuilder<'a, S>
 where
     S: profile_view_state::State,
+    S::Handle: profile_view_state::IsSet,
     S::DisplayName: profile_view_state::IsSet,
     S::Did: profile_view_state::IsSet,
-    S::Handle: profile_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ProfileView<'a> {
         ProfileView {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            did: self.__unsafe_private_named.3.unwrap(),
-            display_name: self.__unsafe_private_named.4.unwrap(),
-            handle: self.__unsafe_private_named.5.unwrap(),
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            description: self._fields.2,
+            did: self._fields.3.unwrap(),
+            display_name: self._fields.4.unwrap(),
+            handle: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -465,12 +469,12 @@ where
         >,
     ) -> ProfileView<'a> {
         ProfileView {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            did: self.__unsafe_private_named.3.unwrap(),
-            display_name: self.__unsafe_private_named.4.unwrap(),
-            handle: self.__unsafe_private_named.5.unwrap(),
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            description: self._fields.2,
+            did: self._fields.3.unwrap(),
+            display_name: self._fields.4.unwrap(),
+            handle: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_clippr/actor/get_preferences.rs b/crates/jacquard-api/src/social_clippr/actor/get_preferences.rs
index cf9e8ea3..047f0917 100644
--- a/crates/jacquard-api/src/social_clippr/actor/get_preferences.rs
+++ b/crates/jacquard-api/src/social_clippr/actor/get_preferences.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/social_clippr/actor/get_profile.rs b/crates/jacquard-api/src/social_clippr/actor/get_profile.rs
index 2181ac3c..d6443f27 100644
--- a/crates/jacquard-api/src/social_clippr/actor/get_profile.rs
+++ b/crates/jacquard-api/src/social_clippr/actor/get_profile.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetProfileBuilder<'a, S: get_profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetProfile<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetProfileBuilder<'a, get_profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetProfileBuilder<'a, get_profile_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetProfile<'a> {
         GetProfile {
-            actor: self.__unsafe_private_named.0.unwrap(),
+            actor: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_clippr/actor/profile.rs b/crates/jacquard-api/src/social_clippr/actor/profile.rs
index 866669fd..efd6cee9 100644
--- a/crates/jacquard-api/src/social_clippr/actor/profile.rs
+++ b/crates/jacquard-api/src/social_clippr/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -241,14 +244,14 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -262,9 +265,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -272,12 +275,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -292,11 +295,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ProfileBuilder<'a, profile_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -304,12 +307,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -324,11 +327,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProfileBuilder<'a, profile_state::SetDisplayName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -342,10 +345,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3.unwrap(),
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            display_name: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -358,10 +361,10 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3.unwrap(),
+            avatar: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            display_name: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_clippr/actor/put_preferences.rs b/crates/jacquard-api/src/social_clippr/actor/put_preferences.rs
index eac8d672..dfacd7ef 100644
--- a/crates/jacquard-api/src/social_clippr/actor/put_preferences.rs
+++ b/crates/jacquard-api/src/social_clippr/actor/put_preferences.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
@@ -82,9 +85,9 @@ pub mod put_preferences_state {
 
 /// Builder for constructing an instance of this type
 pub struct PutPreferencesBuilder<'a, S: put_preferences_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Preferences<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Preferences<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PutPreferences<'a> {
@@ -98,9 +101,9 @@ impl<'a> PutPreferencesBuilder<'a, put_preferences_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PutPreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -115,11 +118,11 @@ where
         mut self,
         value: impl Into<Preferences<'a>>,
     ) -> PutPreferencesBuilder<'a, put_preferences_state::SetPreferences<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PutPreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -132,7 +135,7 @@ where
     /// Build the final struct
     pub fn build(self) -> PutPreferences<'a> {
         PutPreferences {
-            preferences: self.__unsafe_private_named.0.unwrap(),
+            preferences: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -145,7 +148,7 @@ where
         >,
     ) -> PutPreferences<'a> {
         PutPreferences {
-            preferences: self.__unsafe_private_named.0.unwrap(),
+            preferences: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_clippr/actor/search_clips.rs b/crates/jacquard-api/src/social_clippr/actor/search_clips.rs
index ac026d45..926fe2e1 100644
--- a/crates/jacquard-api/src/social_clippr/actor/search_clips.rs
+++ b/crates/jacquard-api/src/social_clippr/actor/search_clips.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -106,14 +109,14 @@ pub mod search_clips_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchClipsBuilder<'a, S: search_clips_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchClips<'a> {
@@ -127,9 +130,9 @@ impl<'a> SearchClipsBuilder<'a, search_clips_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchClipsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,12 +140,12 @@ impl<'a> SearchClipsBuilder<'a, search_clips_state::Empty> {
 impl<'a, S: search_clips_state::State> SearchClipsBuilder<'a, S> {
     /// Set the `actor` field (optional)
     pub fn actor(mut self, value: impl Into<Option<AtIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `actor` field to an Option value (optional)
     pub fn maybe_actor(mut self, value: Option<AtIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -150,12 +153,12 @@ impl<'a, S: search_clips_state::State> SearchClipsBuilder<'a, S> {
 impl<'a, S: search_clips_state::State> SearchClipsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -163,12 +166,12 @@ impl<'a, S: search_clips_state::State> SearchClipsBuilder<'a, S> {
 impl<'a, S: search_clips_state::State> SearchClipsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -183,11 +186,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SearchClipsBuilder<'a, search_clips_state::SetQ<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SearchClipsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,10 +203,10 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchClips<'a> {
         SearchClips {
-            actor: self.__unsafe_private_named.0,
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            q: self.__unsafe_private_named.3.unwrap(),
+            actor: self._fields.0,
+            cursor: self._fields.1,
+            limit: self._fields.2,
+            q: self._fields.3.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_clippr/actor/search_profiles.rs b/crates/jacquard-api/src/social_clippr/actor/search_profiles.rs
index 6e9d6066..4294d323 100644
--- a/crates/jacquard-api/src/social_clippr/actor/search_profiles.rs
+++ b/crates/jacquard-api/src/social_clippr/actor/search_profiles.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -89,9 +92,9 @@ pub mod search_profiles_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchProfilesBuilder<'a, S: search_profiles_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchProfiles<'a> {
@@ -105,9 +108,9 @@ impl<'a> SearchProfilesBuilder<'a, search_profiles_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchProfilesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -115,12 +118,12 @@ impl<'a> SearchProfilesBuilder<'a, search_profiles_state::Empty> {
 impl<'a, S: search_profiles_state::State> SearchProfilesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -128,12 +131,12 @@ impl<'a, S: search_profiles_state::State> SearchProfilesBuilder<'a, S> {
 impl<'a, S: search_profiles_state::State> SearchProfilesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -141,12 +144,12 @@ impl<'a, S: search_profiles_state::State> SearchProfilesBuilder<'a, S> {
 impl<'a, S: search_profiles_state::State> SearchProfilesBuilder<'a, S> {
     /// Set the `q` field (optional)
     pub fn q(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `q` field to an Option value (optional)
     pub fn maybe_q(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -158,9 +161,9 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchProfiles<'a> {
         SearchProfiles {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            q: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            q: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_clippr/actor/search_tags.rs b/crates/jacquard-api/src/social_clippr/actor/search_tags.rs
index 1ba82e6f..66cb92ef 100644
--- a/crates/jacquard-api/src/social_clippr/actor/search_tags.rs
+++ b/crates/jacquard-api/src/social_clippr/actor/search_tags.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -106,14 +109,14 @@ pub mod search_tags_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchTagsBuilder<'a, S: search_tags_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchTags<'a> {
@@ -127,9 +130,9 @@ impl<'a> SearchTagsBuilder<'a, search_tags_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchTagsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,12 +140,12 @@ impl<'a> SearchTagsBuilder<'a, search_tags_state::Empty> {
 impl<'a, S: search_tags_state::State> SearchTagsBuilder<'a, S> {
     /// Set the `actor` field (optional)
     pub fn actor(mut self, value: impl Into<Option<AtIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `actor` field to an Option value (optional)
     pub fn maybe_actor(mut self, value: Option<AtIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -150,12 +153,12 @@ impl<'a, S: search_tags_state::State> SearchTagsBuilder<'a, S> {
 impl<'a, S: search_tags_state::State> SearchTagsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -163,12 +166,12 @@ impl<'a, S: search_tags_state::State> SearchTagsBuilder<'a, S> {
 impl<'a, S: search_tags_state::State> SearchTagsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -183,11 +186,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SearchTagsBuilder<'a, search_tags_state::SetQ<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SearchTagsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,10 +203,10 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchTags<'a> {
         SearchTags {
-            actor: self.__unsafe_private_named.0,
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            q: self.__unsafe_private_named.3.unwrap(),
+            actor: self._fields.0,
+            cursor: self._fields.1,
+            limit: self._fields.2,
+            q: self._fields.3.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_clippr/feed.rs b/crates/jacquard-api/src/social_clippr/feed.rs
index 32338a18..e6715d0d 100644
--- a/crates/jacquard-api/src/social_clippr/feed.rs
+++ b/crates/jacquard-api/src/social_clippr/feed.rs
@@ -13,7 +13,11 @@ pub mod get_tag_list;
 pub mod get_tags;
 pub mod tag;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -112,99 +116,99 @@ pub mod clip_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Uri;
         type IndexedAt;
         type Record;
-        type Uri;
-        type Cid;
         type Author;
+        type Cid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Uri = Unset;
         type IndexedAt = Unset;
         type Record = Unset;
-        type Uri = Unset;
-        type Cid = Unset;
         type Author = Unset;
+        type Cid = Unset;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Uri = Set<members::uri>;
+        type IndexedAt = S::IndexedAt;
+        type Record = S::Record;
+        type Author = S::Author;
+        type Cid = S::Cid;
     }
     ///State transition - sets the `indexed_at` field to Set
     pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
     impl<S: State> State for SetIndexedAt<S> {
+        type Uri = S::Uri;
         type IndexedAt = Set<members::indexed_at>;
         type Record = S::Record;
-        type Uri = S::Uri;
-        type Cid = S::Cid;
         type Author = S::Author;
+        type Cid = S::Cid;
     }
     ///State transition - sets the `record` field to Set
     pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecord<S> {}
     impl<S: State> State for SetRecord<S> {
+        type Uri = S::Uri;
         type IndexedAt = S::IndexedAt;
         type Record = Set<members::record>;
-        type Uri = S::Uri;
-        type Cid = S::Cid;
         type Author = S::Author;
+        type Cid = S::Cid;
     }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
+    ///State transition - sets the `author` field to Set
+    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAuthor<S> {}
+    impl<S: State> State for SetAuthor<S> {
+        type Uri = S::Uri;
         type IndexedAt = S::IndexedAt;
         type Record = S::Record;
-        type Uri = Set<members::uri>;
+        type Author = Set<members::author>;
         type Cid = S::Cid;
-        type Author = S::Author;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type IndexedAt = S::IndexedAt;
-        type Record = S::Record;
         type Uri = S::Uri;
-        type Cid = Set<members::cid>;
-        type Author = S::Author;
-    }
-    ///State transition - sets the `author` field to Set
-    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAuthor<S> {}
-    impl<S: State> State for SetAuthor<S> {
         type IndexedAt = S::IndexedAt;
         type Record = S::Record;
-        type Uri = S::Uri;
-        type Cid = S::Cid;
-        type Author = Set<members::author>;
+        type Author = S::Author;
+        type Cid = Set<members::cid>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `uri` field
+        pub struct uri(());
         ///Marker type for the `indexed_at` field
         pub struct indexed_at(());
         ///Marker type for the `record` field
         pub struct record(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `author` field
         pub struct author(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ClipViewBuilder<'a, S: clip_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileView<'a>>,
         Option<Cid<'a>>,
         Option<Datetime>,
         Option<Data<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ClipView<'a> {
@@ -218,9 +222,9 @@ impl<'a> ClipViewBuilder<'a, clip_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ClipViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -235,11 +239,11 @@ where
         mut self,
         value: impl Into<ProfileView<'a>>,
     ) -> ClipViewBuilder<'a, clip_view_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ClipViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -254,11 +258,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> ClipViewBuilder<'a, clip_view_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ClipViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -273,11 +277,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ClipViewBuilder<'a, clip_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ClipViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -292,11 +296,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> ClipViewBuilder<'a, clip_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ClipViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -311,11 +315,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ClipViewBuilder<'a, clip_view_state::SetUri<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ClipViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -323,20 +327,20 @@ where
 impl<'a, S> ClipViewBuilder<'a, S>
 where
     S: clip_view_state::State,
+    S::Uri: clip_view_state::IsSet,
     S::IndexedAt: clip_view_state::IsSet,
     S::Record: clip_view_state::IsSet,
-    S::Uri: clip_view_state::IsSet,
-    S::Cid: clip_view_state::IsSet,
     S::Author: clip_view_state::IsSet,
+    S::Cid: clip_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ClipView<'a> {
         ClipView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            record: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            record: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -346,11 +350,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ClipView<'a> {
         ClipView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            record: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            record: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -514,99 +518,99 @@ pub mod tag_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type IndexedAt;
-        type Cid;
         type Uri;
         type Author;
         type Record;
+        type Cid;
+        type IndexedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type IndexedAt = Unset;
-        type Cid = Unset;
         type Uri = Unset;
         type Author = Unset;
         type Record = Unset;
-    }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
-        type IndexedAt = Set<members::indexed_at>;
-        type Cid = S::Cid;
-        type Uri = S::Uri;
-        type Author = S::Author;
-        type Record = S::Record;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type IndexedAt = S::IndexedAt;
-        type Cid = Set<members::cid>;
-        type Uri = S::Uri;
-        type Author = S::Author;
-        type Record = S::Record;
+        type Cid = Unset;
+        type IndexedAt = Unset;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type IndexedAt = S::IndexedAt;
-        type Cid = S::Cid;
         type Uri = Set<members::uri>;
         type Author = S::Author;
         type Record = S::Record;
+        type Cid = S::Cid;
+        type IndexedAt = S::IndexedAt;
     }
     ///State transition - sets the `author` field to Set
     pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthor<S> {}
     impl<S: State> State for SetAuthor<S> {
-        type IndexedAt = S::IndexedAt;
-        type Cid = S::Cid;
         type Uri = S::Uri;
         type Author = Set<members::author>;
         type Record = S::Record;
+        type Cid = S::Cid;
+        type IndexedAt = S::IndexedAt;
     }
     ///State transition - sets the `record` field to Set
     pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecord<S> {}
     impl<S: State> State for SetRecord<S> {
-        type IndexedAt = S::IndexedAt;
-        type Cid = S::Cid;
         type Uri = S::Uri;
         type Author = S::Author;
         type Record = Set<members::record>;
+        type Cid = S::Cid;
+        type IndexedAt = S::IndexedAt;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Uri = S::Uri;
+        type Author = S::Author;
+        type Record = S::Record;
+        type Cid = Set<members::cid>;
+        type IndexedAt = S::IndexedAt;
+    }
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
+        type Uri = S::Uri;
+        type Author = S::Author;
+        type Record = S::Record;
+        type Cid = S::Cid;
+        type IndexedAt = Set<members::indexed_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `indexed_at` field
-        pub struct indexed_at(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `uri` field
         pub struct uri(());
         ///Marker type for the `author` field
         pub struct author(());
         ///Marker type for the `record` field
         pub struct record(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
+        ///Marker type for the `indexed_at` field
+        pub struct indexed_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TagViewBuilder<'a, S: tag_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileView<'a>>,
         Option<Cid<'a>>,
         Option<Datetime>,
         Option<Data<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TagView<'a> {
@@ -620,9 +624,9 @@ impl<'a> TagViewBuilder<'a, tag_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TagViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -637,11 +641,11 @@ where
         mut self,
         value: impl Into<ProfileView<'a>>,
     ) -> TagViewBuilder<'a, tag_view_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TagViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -656,11 +660,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> TagViewBuilder<'a, tag_view_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TagViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -675,11 +679,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TagViewBuilder<'a, tag_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TagViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -694,11 +698,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> TagViewBuilder<'a, tag_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TagViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -713,11 +717,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> TagViewBuilder<'a, tag_view_state::SetUri<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         TagViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -725,20 +729,20 @@ where
 impl<'a, S> TagViewBuilder<'a, S>
 where
     S: tag_view_state::State,
-    S::IndexedAt: tag_view_state::IsSet,
-    S::Cid: tag_view_state::IsSet,
     S::Uri: tag_view_state::IsSet,
     S::Author: tag_view_state::IsSet,
     S::Record: tag_view_state::IsSet,
+    S::Cid: tag_view_state::IsSet,
+    S::IndexedAt: tag_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TagView<'a> {
         TagView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            record: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            record: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -748,11 +752,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> TagView<'a> {
         TagView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            record: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            record: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_clippr/feed/clip.rs b/crates/jacquard-api/src/social_clippr/feed/clip.rs
index c764278c..3bdc9cf9 100644
--- a/crates/jacquard-api/src/social_clippr/feed/clip.rs
+++ b/crates/jacquard-api/src/social_clippr/feed/clip.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -247,92 +250,92 @@ pub mod clip_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Unlisted;
         type Url;
-        type Title;
-        type Description;
         type CreatedAt;
-        type Unlisted;
+        type Description;
+        type Title;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Unlisted = Unset;
         type Url = Unset;
-        type Title = Unset;
-        type Description = Unset;
         type CreatedAt = Unset;
-        type Unlisted = Unset;
+        type Description = Unset;
+        type Title = Unset;
+    }
+    ///State transition - sets the `unlisted` field to Set
+    pub struct SetUnlisted<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUnlisted<S> {}
+    impl<S: State> State for SetUnlisted<S> {
+        type Unlisted = Set<members::unlisted>;
+        type Url = S::Url;
+        type CreatedAt = S::CreatedAt;
+        type Description = S::Description;
+        type Title = S::Title;
     }
     ///State transition - sets the `url` field to Set
     pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUrl<S> {}
     impl<S: State> State for SetUrl<S> {
+        type Unlisted = S::Unlisted;
         type Url = Set<members::url>;
-        type Title = S::Title;
-        type Description = S::Description;
         type CreatedAt = S::CreatedAt;
-        type Unlisted = S::Unlisted;
+        type Description = S::Description;
+        type Title = S::Title;
     }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Unlisted = S::Unlisted;
         type Url = S::Url;
-        type Title = Set<members::title>;
+        type CreatedAt = Set<members::created_at>;
         type Description = S::Description;
-        type CreatedAt = S::CreatedAt;
-        type Unlisted = S::Unlisted;
+        type Title = S::Title;
     }
     ///State transition - sets the `description` field to Set
     pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDescription<S> {}
     impl<S: State> State for SetDescription<S> {
-        type Url = S::Url;
-        type Title = S::Title;
-        type Description = Set<members::description>;
-        type CreatedAt = S::CreatedAt;
         type Unlisted = S::Unlisted;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type Url = S::Url;
+        type CreatedAt = S::CreatedAt;
+        type Description = Set<members::description>;
         type Title = S::Title;
-        type Description = S::Description;
-        type CreatedAt = Set<members::created_at>;
-        type Unlisted = S::Unlisted;
     }
-    ///State transition - sets the `unlisted` field to Set
-    pub struct SetUnlisted<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUnlisted<S> {}
-    impl<S: State> State for SetUnlisted<S> {
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type Unlisted = S::Unlisted;
         type Url = S::Url;
-        type Title = S::Title;
-        type Description = S::Description;
         type CreatedAt = S::CreatedAt;
-        type Unlisted = Set<members::unlisted>;
+        type Description = S::Description;
+        type Title = Set<members::title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `unlisted` field
+        pub struct unlisted(());
         ///Marker type for the `url` field
         pub struct url(());
-        ///Marker type for the `title` field
-        pub struct title(());
-        ///Marker type for the `description` field
-        pub struct description(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `unlisted` field
-        pub struct unlisted(());
+        ///Marker type for the `description` field
+        pub struct description(());
+        ///Marker type for the `title` field
+        pub struct title(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ClipBuilder<'a, S: clip_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Vec<Language>>,
@@ -343,7 +346,7 @@ pub struct ClipBuilder<'a, S: clip_state::State> {
         Option<bool>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Clip<'a> {
@@ -357,19 +360,9 @@ impl<'a> ClipBuilder<'a, clip_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ClipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -384,11 +377,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ClipBuilder<'a, clip_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ClipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -403,11 +396,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ClipBuilder<'a, clip_state::SetDescription<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ClipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -415,12 +408,12 @@ where
 impl<'a, S: clip_state::State> ClipBuilder<'a, S> {
     /// Set the `languages` field (optional)
     pub fn languages(mut self, value: impl Into<Option<Vec<Language>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `languages` field to an Option value (optional)
     pub fn maybe_languages(mut self, value: Option<Vec<Language>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -428,12 +421,12 @@ impl<'a, S: clip_state::State> ClipBuilder<'a, S> {
 impl<'a, S: clip_state::State> ClipBuilder<'a, S> {
     /// Set the `notes` field (optional)
     pub fn notes(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `notes` field to an Option value (optional)
     pub fn maybe_notes(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -441,12 +434,12 @@ impl<'a, S: clip_state::State> ClipBuilder<'a, S> {
 impl<'a, S: clip_state::State> ClipBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<StrongRef<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -461,11 +454,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ClipBuilder<'a, clip_state::SetTitle<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ClipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -480,11 +473,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ClipBuilder<'a, clip_state::SetUnlisted<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ClipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -492,12 +485,12 @@ where
 impl<'a, S: clip_state::State> ClipBuilder<'a, S> {
     /// Set the `unread` field (optional)
     pub fn unread(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `unread` field to an Option value (optional)
     pub fn maybe_unread(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -512,11 +505,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ClipBuilder<'a, clip_state::SetUrl<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         ClipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -524,24 +517,24 @@ where
 impl<'a, S> ClipBuilder<'a, S>
 where
     S: clip_state::State,
+    S::Unlisted: clip_state::IsSet,
     S::Url: clip_state::IsSet,
-    S::Title: clip_state::IsSet,
-    S::Description: clip_state::IsSet,
     S::CreatedAt: clip_state::IsSet,
-    S::Unlisted: clip_state::IsSet,
+    S::Description: clip_state::IsSet,
+    S::Title: clip_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Clip<'a> {
         Clip {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1.unwrap(),
-            languages: self.__unsafe_private_named.2,
-            notes: self.__unsafe_private_named.3,
-            tags: self.__unsafe_private_named.4,
-            title: self.__unsafe_private_named.5.unwrap(),
-            unlisted: self.__unsafe_private_named.6.unwrap(),
-            unread: self.__unsafe_private_named.7.or_else(|| Some(true)),
-            url: self.__unsafe_private_named.8.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1.unwrap(),
+            languages: self._fields.2,
+            notes: self._fields.3,
+            tags: self._fields.4,
+            title: self._fields.5.unwrap(),
+            unlisted: self._fields.6.unwrap(),
+            unread: self._fields.7.or_else(|| Some(true)),
+            url: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -554,15 +547,15 @@ where
         >,
     ) -> Clip<'a> {
         Clip {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1.unwrap(),
-            languages: self.__unsafe_private_named.2,
-            notes: self.__unsafe_private_named.3,
-            tags: self.__unsafe_private_named.4,
-            title: self.__unsafe_private_named.5.unwrap(),
-            unlisted: self.__unsafe_private_named.6.unwrap(),
-            unread: self.__unsafe_private_named.7.or_else(|| Some(true)),
-            url: self.__unsafe_private_named.8.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1.unwrap(),
+            languages: self._fields.2,
+            notes: self._fields.3,
+            tags: self._fields.4,
+            title: self._fields.5.unwrap(),
+            unlisted: self._fields.6.unwrap(),
+            unread: self._fields.7.or_else(|| Some(true)),
+            url: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_clippr/feed/get_clips.rs b/crates/jacquard-api/src/social_clippr/feed/get_clips.rs
index 86324a28..d653bf68 100644
--- a/crates/jacquard-api/src/social_clippr/feed/get_clips.rs
+++ b/crates/jacquard-api/src/social_clippr/feed/get_clips.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -87,9 +90,9 @@ pub mod get_clips_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetClipsBuilder<'a, S: get_clips_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<AtUri<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<AtUri<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetClips<'a> {
@@ -103,9 +106,9 @@ impl<'a> GetClipsBuilder<'a, get_clips_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetClipsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,11 +123,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> GetClipsBuilder<'a, get_clips_state::SetUris<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetClipsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,7 +140,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetClips<'a> {
         GetClips {
-            uris: self.__unsafe_private_named.0.unwrap(),
+            uris: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_clippr/feed/get_profile_clips.rs b/crates/jacquard-api/src/social_clippr/feed/get_profile_clips.rs
index 4b1036fe..005dae4a 100644
--- a/crates/jacquard-api/src/social_clippr/feed/get_profile_clips.rs
+++ b/crates/jacquard-api/src/social_clippr/feed/get_profile_clips.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -110,14 +113,14 @@ pub mod get_profile_clips_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetProfileClipsBuilder<'a, S: get_profile_clips_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtIdentifier<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetProfileClips<'a> {
@@ -131,9 +134,9 @@ impl<'a> GetProfileClipsBuilder<'a, get_profile_clips_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetProfileClipsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -148,11 +151,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetProfileClipsBuilder<'a, get_profile_clips_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetProfileClipsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -160,12 +163,12 @@ where
 impl<'a, S: get_profile_clips_state::State> GetProfileClipsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -173,12 +176,12 @@ impl<'a, S: get_profile_clips_state::State> GetProfileClipsBuilder<'a, S> {
 impl<'a, S: get_profile_clips_state::State> GetProfileClipsBuilder<'a, S> {
     /// Set the `filter` field (optional)
     pub fn filter(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `filter` field to an Option value (optional)
     pub fn maybe_filter(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -186,12 +189,12 @@ impl<'a, S: get_profile_clips_state::State> GetProfileClipsBuilder<'a, S> {
 impl<'a, S: get_profile_clips_state::State> GetProfileClipsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -204,10 +207,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetProfileClips<'a> {
         GetProfileClips {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            filter: self.__unsafe_private_named.2,
-            limit: self.__unsafe_private_named.3,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            filter: self._fields.2,
+            limit: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_clippr/feed/get_profile_tags.rs b/crates/jacquard-api/src/social_clippr/feed/get_profile_tags.rs
index 60702c14..ff87738f 100644
--- a/crates/jacquard-api/src/social_clippr/feed/get_profile_tags.rs
+++ b/crates/jacquard-api/src/social_clippr/feed/get_profile_tags.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -101,9 +104,9 @@ pub mod get_profile_tags_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetProfileTagsBuilder<'a, S: get_profile_tags_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetProfileTags<'a> {
@@ -117,9 +120,9 @@ impl<'a> GetProfileTagsBuilder<'a, get_profile_tags_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetProfileTagsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -134,11 +137,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetProfileTagsBuilder<'a, get_profile_tags_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetProfileTagsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -146,12 +149,12 @@ where
 impl<'a, S: get_profile_tags_state::State> GetProfileTagsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -159,12 +162,12 @@ impl<'a, S: get_profile_tags_state::State> GetProfileTagsBuilder<'a, S> {
 impl<'a, S: get_profile_tags_state::State> GetProfileTagsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -177,9 +180,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetProfileTags<'a> {
         GetProfileTags {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_clippr/feed/get_tag_list.rs b/crates/jacquard-api/src/social_clippr/feed/get_tag_list.rs
index 5ee74077..cf0e57f1 100644
--- a/crates/jacquard-api/src/social_clippr/feed/get_tag_list.rs
+++ b/crates/jacquard-api/src/social_clippr/feed/get_tag_list.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -75,9 +78,9 @@ pub mod get_tag_list_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTagListBuilder<'a, S: get_tag_list_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetTagList<'a> {
@@ -91,9 +94,9 @@ impl<'a> GetTagListBuilder<'a, get_tag_list_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTagListBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -101,12 +104,12 @@ impl<'a> GetTagListBuilder<'a, get_tag_list_state::Empty> {
 impl<'a, S: get_tag_list_state::State> GetTagListBuilder<'a, S> {
     /// Set the `actor` field (optional)
     pub fn actor(mut self, value: impl Into<Option<AtIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `actor` field to an Option value (optional)
     pub fn maybe_actor(mut self, value: Option<AtIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -118,7 +121,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetTagList<'a> {
         GetTagList {
-            actor: self.__unsafe_private_named.0,
+            actor: self._fields.0,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_clippr/feed/get_tags.rs b/crates/jacquard-api/src/social_clippr/feed/get_tags.rs
index be74869d..ea0ae240 100644
--- a/crates/jacquard-api/src/social_clippr/feed/get_tags.rs
+++ b/crates/jacquard-api/src/social_clippr/feed/get_tags.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -87,9 +90,9 @@ pub mod get_tags_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTagsBuilder<'a, S: get_tags_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<AtUri<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<AtUri<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetTags<'a> {
@@ -103,9 +106,9 @@ impl<'a> GetTagsBuilder<'a, get_tags_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTagsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -120,11 +123,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> GetTagsBuilder<'a, get_tags_state::SetUris<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetTagsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -137,7 +140,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetTags<'a> {
         GetTags {
-            uris: self.__unsafe_private_named.0.unwrap(),
+            uris: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_clippr/feed/tag.rs b/crates/jacquard-api/src/social_clippr/feed/tag.rs
index 0cd13203..1ca1efb0 100644
--- a/crates/jacquard-api/src/social_clippr/feed/tag.rs
+++ b/crates/jacquard-api/src/social_clippr/feed/tag.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -222,14 +225,14 @@ pub mod tag_state {
 
 /// Builder for constructing an instance of this type
 pub struct TagBuilder<'a, S: tag_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Tag<'a> {
@@ -243,9 +246,9 @@ impl<'a> TagBuilder<'a, tag_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,12 +256,12 @@ impl<'a> TagBuilder<'a, tag_state::Empty> {
 impl<'a, S: tag_state::State> TagBuilder<'a, S> {
     /// Set the `color` field (optional)
     pub fn color(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `color` field to an Option value (optional)
     pub fn maybe_color(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -273,11 +276,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TagBuilder<'a, tag_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -285,12 +288,12 @@ where
 impl<'a, S: tag_state::State> TagBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -305,11 +308,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TagBuilder<'a, tag_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -323,10 +326,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Tag<'a> {
         Tag {
-            color: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
+            color: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            name: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -339,10 +342,10 @@ where
         >,
     ) -> Tag<'a> {
         Tag {
-            color: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
+            color: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            name: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_colibri/approval.rs b/crates/jacquard-api/src/social_colibri/approval.rs
index fb410998..22af8731 100644
--- a/crates/jacquard-api/src/social_colibri/approval.rs
+++ b/crates/jacquard-api/src/social_colibri/approval.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -161,9 +164,9 @@ pub mod approval_state {
 
 /// Builder for constructing an instance of this type
 pub struct ApprovalBuilder<'a, S: approval_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<Datetime>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<Datetime>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Approval<'a> {
@@ -177,9 +180,9 @@ impl<'a> ApprovalBuilder<'a, approval_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ApprovalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -194,11 +197,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ApprovalBuilder<'a, approval_state::SetCommunity<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ApprovalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,11 +216,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ApprovalBuilder<'a, approval_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ApprovalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,11 +235,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ApprovalBuilder<'a, approval_state::SetMembership<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ApprovalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -251,9 +254,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Approval<'a> {
         Approval {
-            community: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            membership: self.__unsafe_private_named.2.unwrap(),
+            community: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            membership: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -266,9 +269,9 @@ where
         >,
     ) -> Approval<'a> {
         Approval {
-            community: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            membership: self.__unsafe_private_named.2.unwrap(),
+            community: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            membership: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_colibri/membership.rs b/crates/jacquard-api/src/social_colibri/membership.rs
index c4f02b97..c51bf358 100644
--- a/crates/jacquard-api/src/social_colibri/membership.rs
+++ b/crates/jacquard-api/src/social_colibri/membership.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -144,9 +147,9 @@ pub mod membership_state {
 
 /// Builder for constructing an instance of this type
 pub struct MembershipBuilder<'a, S: membership_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Membership<'a> {
@@ -160,9 +163,9 @@ impl<'a> MembershipBuilder<'a, membership_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MembershipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -177,11 +180,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> MembershipBuilder<'a, membership_state::SetCommunity<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MembershipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MembershipBuilder<'a, membership_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MembershipBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -214,8 +217,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Membership<'a> {
         Membership {
-            community: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
+            community: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -228,8 +231,8 @@ where
         >,
     ) -> Membership<'a> {
         Membership {
-            community: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
+            community: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_drydown/fragrance.rs b/crates/jacquard-api/src/social_drydown/fragrance.rs
index 87e3effe..10ee3ad5 100644
--- a/crates/jacquard-api/src/social_drydown/fragrance.rs
+++ b/crates/jacquard-api/src/social_drydown/fragrance.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -159,65 +162,65 @@ pub mod fragrance_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
-        type House;
         type CreatedAt;
+        type House;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
-        type House = Unset;
         type CreatedAt = Unset;
+        type House = Unset;
+        type Name = Unset;
     }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
         type House = S::House;
-        type CreatedAt = S::CreatedAt;
+        type Name = S::Name;
     }
     ///State transition - sets the `house` field to Set
     pub struct SetHouse<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHouse<S> {}
     impl<S: State> State for SetHouse<S> {
-        type Name = S::Name;
-        type House = Set<members::house>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+        type House = Set<members::house>;
         type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type CreatedAt = S::CreatedAt;
         type House = S::House;
-        type CreatedAt = Set<members::created_at>;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
-        ///Marker type for the `house` field
-        pub struct house(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `house` field
+        pub struct house(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FragranceBuilder<'a, S: fragrance_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Fragrance<'a> {
@@ -231,9 +234,9 @@ impl<'a> FragranceBuilder<'a, fragrance_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FragranceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -248,11 +251,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FragranceBuilder<'a, fragrance_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FragranceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -267,11 +270,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> FragranceBuilder<'a, fragrance_state::SetHouse<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FragranceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -286,11 +289,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> FragranceBuilder<'a, fragrance_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         FragranceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -298,12 +301,12 @@ where
 impl<'a, S: fragrance_state::State> FragranceBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -311,12 +314,12 @@ impl<'a, S: fragrance_state::State> FragranceBuilder<'a, S> {
 impl<'a, S: fragrance_state::State> FragranceBuilder<'a, S> {
     /// Set the `year` field (optional)
     pub fn year(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `year` field to an Option value (optional)
     pub fn maybe_year(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -324,18 +327,18 @@ impl<'a, S: fragrance_state::State> FragranceBuilder<'a, S> {
 impl<'a, S> FragranceBuilder<'a, S>
 where
     S: fragrance_state::State,
-    S::Name: fragrance_state::IsSet,
-    S::House: fragrance_state::IsSet,
     S::CreatedAt: fragrance_state::IsSet,
+    S::House: fragrance_state::IsSet,
+    S::Name: fragrance_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Fragrance<'a> {
         Fragrance {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            house: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            updated_at: self.__unsafe_private_named.3,
-            year: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            house: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            updated_at: self._fields.3,
+            year: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -348,11 +351,11 @@ where
         >,
     ) -> Fragrance<'a> {
         Fragrance {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            house: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            updated_at: self.__unsafe_private_named.3,
-            year: self.__unsafe_private_named.4,
+            created_at: self._fields.0.unwrap(),
+            house: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            updated_at: self._fields.3,
+            year: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_drydown/house.rs b/crates/jacquard-api/src/social_drydown/house.rs
index 4f2386bc..6b3c680e 100644
--- a/crates/jacquard-api/src/social_drydown/house.rs
+++ b/crates/jacquard-api/src/social_drydown/house.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -171,9 +174,9 @@ pub mod house_state {
 
 /// Builder for constructing an instance of this type
 pub struct HouseBuilder<'a, S: house_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> House<'a> {
@@ -187,9 +190,9 @@ impl<'a> HouseBuilder<'a, house_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HouseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,11 +207,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> HouseBuilder<'a, house_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         HouseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -223,11 +226,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> HouseBuilder<'a, house_state::SetName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         HouseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -235,12 +238,12 @@ where
 impl<'a, S: house_state::State> HouseBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -254,9 +257,9 @@ where
     /// Build the final struct
     pub fn build(self) -> House<'a> {
         House {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            updated_at: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            updated_at: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -269,9 +272,9 @@ where
         >,
     ) -> House<'a> {
         House {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            name: self.__unsafe_private_named.1.unwrap(),
-            updated_at: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            name: self._fields.1.unwrap(),
+            updated_at: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_drydown/review.rs b/crates/jacquard-api/src/social_drydown/review.rs
index 7ed941c8..47c4cbbc 100644
--- a/crates/jacquard-api/src/social_drydown/review.rs
+++ b/crates/jacquard-api/src/social_drydown/review.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -367,44 +370,44 @@ pub mod review_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Fragrance;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Fragrance = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Fragrance = S::Fragrance;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `fragrance` field to Set
     pub struct SetFragrance<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetFragrance<S> {}
     impl<S: State> State for SetFragrance<S> {
-        type CreatedAt = S::CreatedAt;
         type Fragrance = Set<members::fragrance>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Fragrance = S::Fragrance;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `fragrance` field
         pub struct fragrance(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReviewBuilder<'a, S: review_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<Datetime>,
         Option<i64>,
@@ -426,7 +429,7 @@ pub struct ReviewBuilder<'a, S: review_state::State> {
         Option<bool>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Review<'a> {
@@ -440,8 +443,8 @@ impl<'a> ReviewBuilder<'a, review_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -463,7 +466,7 @@ impl<'a> ReviewBuilder<'a, review_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -471,12 +474,12 @@ impl<'a> ReviewBuilder<'a, review_state::Empty> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `complexity` field (optional)
     pub fn complexity(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `complexity` field to an Option value (optional)
     pub fn maybe_complexity(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -491,11 +494,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReviewBuilder<'a, review_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -503,12 +506,12 @@ where
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `drydownRating` field (optional)
     pub fn drydown_rating(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `drydownRating` field to an Option value (optional)
     pub fn maybe_drydown_rating(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -516,12 +519,12 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `elevation` field (optional)
     pub fn elevation(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `elevation` field to an Option value (optional)
     pub fn maybe_elevation(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -529,12 +532,12 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `endRating` field (optional)
     pub fn end_rating(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `endRating` field to an Option value (optional)
     pub fn maybe_end_rating(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -549,11 +552,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ReviewBuilder<'a, review_state::SetFragrance<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ReviewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -561,12 +564,12 @@ where
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `longevity` field (optional)
     pub fn longevity(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `longevity` field to an Option value (optional)
     pub fn maybe_longevity(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -574,12 +577,12 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `midProjection` field (optional)
     pub fn mid_projection(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `midProjection` field to an Option value (optional)
     pub fn maybe_mid_projection(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -587,12 +590,12 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `openingProjection` field (optional)
     pub fn opening_projection(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `openingProjection` field to an Option value (optional)
     pub fn maybe_opening_projection(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -600,12 +603,12 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `openingRating` field (optional)
     pub fn opening_rating(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `openingRating` field to an Option value (optional)
     pub fn maybe_opening_rating(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -613,12 +616,12 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `overallRating` field (optional)
     pub fn overall_rating(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `overallRating` field to an Option value (optional)
     pub fn maybe_overall_rating(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -626,12 +629,12 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `sillage` field (optional)
     pub fn sillage(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `sillage` field to an Option value (optional)
     pub fn maybe_sillage(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -639,12 +642,12 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `stage1Temp` field (optional)
     pub fn stage1_temp(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `stage1Temp` field to an Option value (optional)
     pub fn maybe_stage1_temp(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -652,12 +655,12 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `stage2CompletedAt` field (optional)
     pub fn stage2_completed_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `stage2CompletedAt` field to an Option value (optional)
     pub fn maybe_stage2_completed_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -665,12 +668,12 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `stage2Temp` field (optional)
     pub fn stage2_temp(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `stage2Temp` field to an Option value (optional)
     pub fn maybe_stage2_temp(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -678,12 +681,12 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `stage3Temp` field (optional)
     pub fn stage3_temp(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `stage3Temp` field to an Option value (optional)
     pub fn maybe_stage3_temp(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -691,12 +694,12 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -704,12 +707,12 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `uvIndex` field (optional)
     pub fn uv_index(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `uvIndex` field to an Option value (optional)
     pub fn maybe_uv_index(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -717,12 +720,12 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `weatherOptIn` field (optional)
     pub fn weather_opt_in(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `weatherOptIn` field to an Option value (optional)
     pub fn maybe_weather_opt_in(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -730,12 +733,12 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
     /// Set the `weightedScore` field (optional)
     pub fn weighted_score(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `weightedScore` field to an Option value (optional)
     pub fn maybe_weighted_score(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -743,32 +746,32 @@ impl<'a, S: review_state::State> ReviewBuilder<'a, S> {
 impl<'a, S> ReviewBuilder<'a, S>
 where
     S: review_state::State,
-    S::CreatedAt: review_state::IsSet,
     S::Fragrance: review_state::IsSet,
+    S::CreatedAt: review_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Review<'a> {
         Review {
-            complexity: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            drydown_rating: self.__unsafe_private_named.2,
-            elevation: self.__unsafe_private_named.3,
-            end_rating: self.__unsafe_private_named.4,
-            fragrance: self.__unsafe_private_named.5.unwrap(),
-            longevity: self.__unsafe_private_named.6,
-            mid_projection: self.__unsafe_private_named.7,
-            opening_projection: self.__unsafe_private_named.8,
-            opening_rating: self.__unsafe_private_named.9,
-            overall_rating: self.__unsafe_private_named.10,
-            sillage: self.__unsafe_private_named.11,
-            stage1_temp: self.__unsafe_private_named.12,
-            stage2_completed_at: self.__unsafe_private_named.13,
-            stage2_temp: self.__unsafe_private_named.14,
-            stage3_temp: self.__unsafe_private_named.15,
-            text: self.__unsafe_private_named.16,
-            uv_index: self.__unsafe_private_named.17,
-            weather_opt_in: self.__unsafe_private_named.18,
-            weighted_score: self.__unsafe_private_named.19,
+            complexity: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            drydown_rating: self._fields.2,
+            elevation: self._fields.3,
+            end_rating: self._fields.4,
+            fragrance: self._fields.5.unwrap(),
+            longevity: self._fields.6,
+            mid_projection: self._fields.7,
+            opening_projection: self._fields.8,
+            opening_rating: self._fields.9,
+            overall_rating: self._fields.10,
+            sillage: self._fields.11,
+            stage1_temp: self._fields.12,
+            stage2_completed_at: self._fields.13,
+            stage2_temp: self._fields.14,
+            stage3_temp: self._fields.15,
+            text: self._fields.16,
+            uv_index: self._fields.17,
+            weather_opt_in: self._fields.18,
+            weighted_score: self._fields.19,
             extra_data: Default::default(),
         }
     }
@@ -781,26 +784,26 @@ where
         >,
     ) -> Review<'a> {
         Review {
-            complexity: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            drydown_rating: self.__unsafe_private_named.2,
-            elevation: self.__unsafe_private_named.3,
-            end_rating: self.__unsafe_private_named.4,
-            fragrance: self.__unsafe_private_named.5.unwrap(),
-            longevity: self.__unsafe_private_named.6,
-            mid_projection: self.__unsafe_private_named.7,
-            opening_projection: self.__unsafe_private_named.8,
-            opening_rating: self.__unsafe_private_named.9,
-            overall_rating: self.__unsafe_private_named.10,
-            sillage: self.__unsafe_private_named.11,
-            stage1_temp: self.__unsafe_private_named.12,
-            stage2_completed_at: self.__unsafe_private_named.13,
-            stage2_temp: self.__unsafe_private_named.14,
-            stage3_temp: self.__unsafe_private_named.15,
-            text: self.__unsafe_private_named.16,
-            uv_index: self.__unsafe_private_named.17,
-            weather_opt_in: self.__unsafe_private_named.18,
-            weighted_score: self.__unsafe_private_named.19,
+            complexity: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            drydown_rating: self._fields.2,
+            elevation: self._fields.3,
+            end_rating: self._fields.4,
+            fragrance: self._fields.5.unwrap(),
+            longevity: self._fields.6,
+            mid_projection: self._fields.7,
+            opening_projection: self._fields.8,
+            opening_rating: self._fields.9,
+            overall_rating: self._fields.10,
+            sillage: self._fields.11,
+            stage1_temp: self._fields.12,
+            stage2_completed_at: self._fields.13,
+            stage2_temp: self._fields.14,
+            stage3_temp: self._fields.15,
+            text: self._fields.16,
+            uv_index: self._fields.17,
+            weather_opt_in: self._fields.18,
+            weighted_score: self._fields.19,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_drydown/settings.rs b/crates/jacquard-api/src/social_drydown/settings.rs
index 75cfd4d3..39f3efd5 100644
--- a/crates/jacquard-api/src/social_drydown/settings.rs
+++ b/crates/jacquard-api/src/social_drydown/settings.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -322,8 +325,8 @@ pub mod settings_state {
 
 /// Builder for constructing an instance of this type
 pub struct SettingsBuilder<'a, S: settings_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<Datetime>,
         Option<i64>,
@@ -332,7 +335,7 @@ pub struct SettingsBuilder<'a, S: settings_state::State> {
         Option<i64>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Settings<'a> {
@@ -346,9 +349,9 @@ impl<'a> SettingsBuilder<'a, settings_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -356,12 +359,12 @@ impl<'a> SettingsBuilder<'a, settings_state::Empty> {
 impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
     /// Set the `complexityPreference` field (optional)
     pub fn complexity_preference(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `complexityPreference` field to an Option value (optional)
     pub fn maybe_complexity_preference(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -376,11 +379,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SettingsBuilder<'a, settings_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -388,12 +391,12 @@ where
 impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
     /// Set the `longevityPriority` field (optional)
     pub fn longevity_priority(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `longevityPriority` field to an Option value (optional)
     pub fn maybe_longevity_priority(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -401,12 +404,12 @@ impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
 impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
     /// Set the `presenceStyle` field (optional)
     pub fn presence_style(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `presenceStyle` field to an Option value (optional)
     pub fn maybe_presence_style(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -417,12 +420,12 @@ impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
         mut self,
         value: impl Into<Option<SettingsScoreLens<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `scoreLens` field to an Option value (optional)
     pub fn maybe_score_lens(mut self, value: Option<SettingsScoreLens<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -430,12 +433,12 @@ impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
 impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
     /// Set the `scoringApproach` field (optional)
     pub fn scoring_approach(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `scoringApproach` field to an Option value (optional)
     pub fn maybe_scoring_approach(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -443,12 +446,12 @@ impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
 impl<'a, S: settings_state::State> SettingsBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -461,13 +464,13 @@ where
     /// Build the final struct
     pub fn build(self) -> Settings<'a> {
         Settings {
-            complexity_preference: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            longevity_priority: self.__unsafe_private_named.2,
-            presence_style: self.__unsafe_private_named.3,
-            score_lens: self.__unsafe_private_named.4,
-            scoring_approach: self.__unsafe_private_named.5,
-            updated_at: self.__unsafe_private_named.6,
+            complexity_preference: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            longevity_priority: self._fields.2,
+            presence_style: self._fields.3,
+            score_lens: self._fields.4,
+            scoring_approach: self._fields.5,
+            updated_at: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -480,13 +483,13 @@ where
         >,
     ) -> Settings<'a> {
         Settings {
-            complexity_preference: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            longevity_priority: self.__unsafe_private_named.2,
-            presence_style: self.__unsafe_private_named.3,
-            score_lens: self.__unsafe_private_named.4,
-            scoring_approach: self.__unsafe_private_named.5,
-            updated_at: self.__unsafe_private_named.6,
+            complexity_preference: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            longevity_priority: self._fields.2,
+            presence_style: self._fields.3,
+            score_lens: self._fields.4,
+            scoring_approach: self._fields.5,
+            updated_at: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/api_reference.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/api_reference.rs
index 3d9cedbc..e964f40d 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/api_reference.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/api_reference.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -5907,8 +5910,8 @@ pub mod api_reference_state {
 
 /// Builder for constructing an instance of this type
 pub struct ApiReferenceBuilder<'a, S: api_reference_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ApiReferenceAbout<'a>>,
         Option<ApiReferenceAbstract<'a>>,
         Option<ApiReferenceAccessMode<'a>>,
@@ -6051,7 +6054,7 @@ pub struct ApiReferenceBuilder<'a, S: api_reference_state::State> {
         Option<ApiReferenceWorkExample<'a>>,
         Option<ApiReferenceWorkTranslation<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ApiReference<'a> {
@@ -6065,8 +6068,8 @@ impl<'a> ApiReferenceBuilder<'a, api_reference_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ApiReferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -6209,7 +6212,7 @@ impl<'a> ApiReferenceBuilder<'a, api_reference_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6217,12 +6220,12 @@ impl<'a> ApiReferenceBuilder<'a, api_reference_state::Empty> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `about` field (optional)
     pub fn about(mut self, value: impl Into<Option<ApiReferenceAbout<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `about` field to an Option value (optional)
     pub fn maybe_about(mut self, value: Option<ApiReferenceAbout<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -6233,12 +6236,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAbstract<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `abstract` field to an Option value (optional)
     pub fn maybe_abstract(mut self, value: Option<ApiReferenceAbstract<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -6249,7 +6252,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAccessMode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `accessMode` field to an Option value (optional)
@@ -6257,7 +6260,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceAccessMode<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -6268,7 +6271,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAccessModeSufficient<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `accessModeSufficient` field to an Option value (optional)
@@ -6276,7 +6279,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceAccessModeSufficient<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -6287,7 +6290,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAccessibilityApi<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `accessibilityAPI` field to an Option value (optional)
@@ -6295,7 +6298,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceAccessibilityApi<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -6306,7 +6309,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAccessibilityControl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `accessibilityControl` field to an Option value (optional)
@@ -6314,7 +6317,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceAccessibilityControl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -6325,7 +6328,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAccessibilityFeature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `accessibilityFeature` field to an Option value (optional)
@@ -6333,7 +6336,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceAccessibilityFeature<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -6344,7 +6347,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAccessibilityHazard<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `accessibilityHazard` field to an Option value (optional)
@@ -6352,7 +6355,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceAccessibilityHazard<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -6363,7 +6366,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAccessibilitySummary<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `accessibilitySummary` field to an Option value (optional)
@@ -6371,7 +6374,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceAccessibilitySummary<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -6382,7 +6385,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAccountablePerson<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `accountablePerson` field to an Option value (optional)
@@ -6390,7 +6393,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceAccountablePerson<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -6401,7 +6404,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAcquireLicensePage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `acquireLicensePage` field to an Option value (optional)
@@ -6409,7 +6412,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceAcquireLicensePage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -6420,7 +6423,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -6428,7 +6431,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -6439,7 +6442,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -6447,7 +6450,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -6458,7 +6461,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -6466,7 +6469,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -6477,7 +6480,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAlternativeHeadline<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `alternativeHeadline` field to an Option value (optional)
@@ -6485,7 +6488,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceAlternativeHeadline<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -6496,7 +6499,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceArchivedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `archivedAt` field to an Option value (optional)
@@ -6504,7 +6507,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceArchivedAt<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -6515,7 +6518,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceArticleBody<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `articleBody` field to an Option value (optional)
@@ -6523,7 +6526,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceArticleBody<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -6534,7 +6537,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceArticleSection<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `articleSection` field to an Option value (optional)
@@ -6542,7 +6545,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceArticleSection<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -6553,12 +6556,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAssembly<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `assembly` field to an Option value (optional)
     pub fn maybe_assembly(mut self, value: Option<ApiReferenceAssembly<'a>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -6569,7 +6572,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAssemblyVersion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `assemblyVersion` field to an Option value (optional)
@@ -6577,7 +6580,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceAssemblyVersion<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -6588,12 +6591,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAssesses<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `assesses` field to an Option value (optional)
     pub fn maybe_assesses(mut self, value: Option<ApiReferenceAssesses<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -6604,7 +6607,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAssociatedMedia<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `associatedMedia` field to an Option value (optional)
@@ -6612,7 +6615,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceAssociatedMedia<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -6623,12 +6626,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceAudience<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `audience` field to an Option value (optional)
     pub fn maybe_audience(mut self, value: Option<ApiReferenceAudience<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -6636,12 +6639,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `audio` field (optional)
     pub fn audio(mut self, value: impl Into<Option<ApiReferenceAudio<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `audio` field to an Option value (optional)
     pub fn maybe_audio(mut self, value: Option<ApiReferenceAudio<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -6649,12 +6652,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<ApiReferenceAuthor<'a>>>) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<ApiReferenceAuthor<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -6662,12 +6665,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<ApiReferenceAward<'a>>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<ApiReferenceAward<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -6675,12 +6678,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<ApiReferenceAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<ApiReferenceAwards<'a>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -6691,12 +6694,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceBackstory<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `backstory` field to an Option value (optional)
     pub fn maybe_backstory(mut self, value: Option<ApiReferenceBackstory<'a>>) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -6707,12 +6710,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceCharacter<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `character` field to an Option value (optional)
     pub fn maybe_character(mut self, value: Option<ApiReferenceCharacter<'a>>) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -6723,12 +6726,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceCitation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `citation` field to an Option value (optional)
     pub fn maybe_citation(mut self, value: Option<ApiReferenceCitation<'a>>) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -6736,12 +6739,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<ApiReferenceComment<'a>>>) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<ApiReferenceComment<'a>>) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -6752,7 +6755,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceCommentCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `commentCount` field to an Option value (optional)
@@ -6760,7 +6763,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceCommentCount<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -6771,7 +6774,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceConditionsOfAccess<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `conditionsOfAccess` field to an Option value (optional)
@@ -6779,7 +6782,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceConditionsOfAccess<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -6790,7 +6793,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceContentLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `contentLocation` field to an Option value (optional)
@@ -6798,7 +6801,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceContentLocation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -6809,7 +6812,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceContentRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `contentRating` field to an Option value (optional)
@@ -6817,7 +6820,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceContentRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -6828,7 +6831,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceContentReferenceTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `contentReferenceTime` field to an Option value (optional)
@@ -6836,7 +6839,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceContentReferenceTime<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -6847,7 +6850,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceContributor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `contributor` field to an Option value (optional)
@@ -6855,7 +6858,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceContributor<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -6866,7 +6869,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceCopyrightHolder<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `copyrightHolder` field to an Option value (optional)
@@ -6874,7 +6877,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceCopyrightHolder<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -6885,7 +6888,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceCopyrightNotice<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `copyrightNotice` field to an Option value (optional)
@@ -6893,7 +6896,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceCopyrightNotice<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -6904,7 +6907,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceCopyrightYear<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `copyrightYear` field to an Option value (optional)
@@ -6912,7 +6915,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceCopyrightYear<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -6923,7 +6926,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceCorrection<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `correction` field to an Option value (optional)
@@ -6931,7 +6934,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceCorrection<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -6942,7 +6945,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceCountryOfOrigin<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `countryOfOrigin` field to an Option value (optional)
@@ -6950,7 +6953,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceCountryOfOrigin<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -6961,7 +6964,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceCreativeWorkStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `creativeWorkStatus` field to an Option value (optional)
@@ -6969,7 +6972,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceCreativeWorkStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -6977,12 +6980,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `creator` field (optional)
     pub fn creator(mut self, value: impl Into<Option<ApiReferenceCreator<'a>>>) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `creator` field to an Option value (optional)
     pub fn maybe_creator(mut self, value: Option<ApiReferenceCreator<'a>>) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -6993,7 +6996,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceCreditText<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `creditText` field to an Option value (optional)
@@ -7001,7 +7004,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceCreditText<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -7012,7 +7015,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceDateCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `dateCreated` field to an Option value (optional)
@@ -7020,7 +7023,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceDateCreated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -7031,7 +7034,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceDateModified<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `dateModified` field to an Option value (optional)
@@ -7039,7 +7042,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceDateModified<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -7050,7 +7053,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `datePublished` field to an Option value (optional)
@@ -7058,7 +7061,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -7069,7 +7072,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceDependencies<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `dependencies` field to an Option value (optional)
@@ -7077,7 +7080,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceDependencies<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -7088,7 +7091,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
@@ -7096,7 +7099,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -7107,7 +7110,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceDigitalSourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `digitalSourceType` field to an Option value (optional)
@@ -7115,7 +7118,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceDigitalSourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -7126,7 +7129,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -7134,7 +7137,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -7145,7 +7148,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceDiscussionUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `discussionUrl` field to an Option value (optional)
@@ -7153,7 +7156,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceDiscussionUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -7164,12 +7167,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceEditEidr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `editEIDR` field to an Option value (optional)
     pub fn maybe_edit_eidr(mut self, value: Option<ApiReferenceEditEidr<'a>>) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -7177,12 +7180,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `editor` field (optional)
     pub fn editor(mut self, value: impl Into<Option<ApiReferenceEditor<'a>>>) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `editor` field to an Option value (optional)
     pub fn maybe_editor(mut self, value: Option<ApiReferenceEditor<'a>>) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -7193,7 +7196,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceEducationalAlignment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `educationalAlignment` field to an Option value (optional)
@@ -7201,7 +7204,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceEducationalAlignment<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -7212,7 +7215,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceEducationalLevel<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `educationalLevel` field to an Option value (optional)
@@ -7220,7 +7223,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceEducationalLevel<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -7231,7 +7234,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceEducationalUse<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `educationalUse` field to an Option value (optional)
@@ -7239,7 +7242,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceEducationalUse<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -7250,12 +7253,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceEncoding<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `encoding` field to an Option value (optional)
     pub fn maybe_encoding(mut self, value: Option<ApiReferenceEncoding<'a>>) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -7266,7 +7269,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceEncodingFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `encodingFormat` field to an Option value (optional)
@@ -7274,7 +7277,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceEncodingFormat<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -7285,12 +7288,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceEncodings<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `encodings` field to an Option value (optional)
     pub fn maybe_encodings(mut self, value: Option<ApiReferenceEncodings<'a>>) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -7301,7 +7304,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceExampleOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `exampleOfWork` field to an Option value (optional)
@@ -7309,7 +7312,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceExampleOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -7320,7 +7323,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceExecutableLibraryName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `executableLibraryName` field to an Option value (optional)
@@ -7328,7 +7331,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceExecutableLibraryName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -7336,12 +7339,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `expires` field (optional)
     pub fn expires(mut self, value: impl Into<Option<ApiReferenceExpires<'a>>>) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `expires` field to an Option value (optional)
     pub fn maybe_expires(mut self, value: Option<ApiReferenceExpires<'a>>) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -7352,7 +7355,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceFileFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `fileFormat` field to an Option value (optional)
@@ -7360,7 +7363,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceFileFormat<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -7368,12 +7371,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<ApiReferenceFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<ApiReferenceFunder<'a>>) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -7381,12 +7384,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<ApiReferenceFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<ApiReferenceFunding<'a>>) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -7394,12 +7397,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<ApiReferenceGenre<'a>>>) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<ApiReferenceGenre<'a>>) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -7410,12 +7413,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceHasPart<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `hasPart` field to an Option value (optional)
     pub fn maybe_has_part(mut self, value: Option<ApiReferenceHasPart<'a>>) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -7426,12 +7429,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceHeadline<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `headline` field to an Option value (optional)
     pub fn maybe_headline(mut self, value: Option<ApiReferenceHeadline<'a>>) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -7442,7 +7445,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceIdentifier<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
@@ -7450,7 +7453,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceIdentifier<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -7458,12 +7461,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<ApiReferenceImage<'a>>>) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<ApiReferenceImage<'a>>) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -7474,7 +7477,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceInLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `inLanguage` field to an Option value (optional)
@@ -7482,7 +7485,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceInLanguage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -7493,7 +7496,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -7501,7 +7504,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -7512,7 +7515,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceInteractivityType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `interactivityType` field to an Option value (optional)
@@ -7520,7 +7523,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceInteractivityType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -7531,7 +7534,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceInterpretedAsClaim<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `interpretedAsClaim` field to an Option value (optional)
@@ -7539,7 +7542,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceInterpretedAsClaim<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -7550,7 +7553,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceIsAccessibleForFree<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `isAccessibleForFree` field to an Option value (optional)
@@ -7558,7 +7561,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceIsAccessibleForFree<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -7569,7 +7572,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceIsBasedOn<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `isBasedOn` field to an Option value (optional)
@@ -7577,7 +7580,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceIsBasedOn<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -7588,7 +7591,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceIsBasedOnUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `isBasedOnUrl` field to an Option value (optional)
@@ -7596,7 +7599,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceIsBasedOnUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -7607,7 +7610,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceIsFamilyFriendly<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value.into();
+        self._fields.79 = value.into();
         self
     }
     /// Set the `isFamilyFriendly` field to an Option value (optional)
@@ -7615,7 +7618,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceIsFamilyFriendly<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value;
+        self._fields.79 = value;
         self
     }
 }
@@ -7626,12 +7629,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceIsPartOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value.into();
+        self._fields.80 = value.into();
         self
     }
     /// Set the `isPartOf` field to an Option value (optional)
     pub fn maybe_is_part_of(mut self, value: Option<ApiReferenceIsPartOf<'a>>) -> Self {
-        self.__unsafe_private_named.80 = value;
+        self._fields.80 = value;
         self
     }
 }
@@ -7642,12 +7645,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceKeywords<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.81 = value.into();
+        self._fields.81 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<ApiReferenceKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.81 = value;
+        self._fields.81 = value;
         self
     }
 }
@@ -7658,7 +7661,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceLearningResourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value.into();
+        self._fields.82 = value.into();
         self
     }
     /// Set the `learningResourceType` field to an Option value (optional)
@@ -7666,7 +7669,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceLearningResourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value;
+        self._fields.82 = value;
         self
     }
 }
@@ -7674,12 +7677,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `license` field (optional)
     pub fn license(mut self, value: impl Into<Option<ApiReferenceLicense<'a>>>) -> Self {
-        self.__unsafe_private_named.83 = value.into();
+        self._fields.83 = value.into();
         self
     }
     /// Set the `license` field to an Option value (optional)
     pub fn maybe_license(mut self, value: Option<ApiReferenceLicense<'a>>) -> Self {
-        self.__unsafe_private_named.83 = value;
+        self._fields.83 = value;
         self
     }
 }
@@ -7690,7 +7693,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceLocationCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value.into();
+        self._fields.84 = value.into();
         self
     }
     /// Set the `locationCreated` field to an Option value (optional)
@@ -7698,7 +7701,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceLocationCreated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value;
+        self._fields.84 = value;
         self
     }
 }
@@ -7709,7 +7712,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceMainEntity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.85 = value.into();
+        self._fields.85 = value.into();
         self
     }
     /// Set the `mainEntity` field to an Option value (optional)
@@ -7717,7 +7720,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceMainEntity<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.85 = value;
+        self._fields.85 = value;
         self
     }
 }
@@ -7728,7 +7731,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.86 = value.into();
+        self._fields.86 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -7736,7 +7739,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.86 = value;
+        self._fields.86 = value;
         self
     }
 }
@@ -7747,7 +7750,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceMaintainer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.87 = value.into();
+        self._fields.87 = value.into();
         self
     }
     /// Set the `maintainer` field to an Option value (optional)
@@ -7755,7 +7758,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceMaintainer<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.87 = value;
+        self._fields.87 = value;
         self
     }
 }
@@ -7766,12 +7769,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceMaterial<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.88 = value.into();
+        self._fields.88 = value.into();
         self
     }
     /// Set the `material` field to an Option value (optional)
     pub fn maybe_material(mut self, value: Option<ApiReferenceMaterial<'a>>) -> Self {
-        self.__unsafe_private_named.88 = value;
+        self._fields.88 = value;
         self
     }
 }
@@ -7782,7 +7785,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceMaterialExtent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.89 = value.into();
+        self._fields.89 = value.into();
         self
     }
     /// Set the `materialExtent` field to an Option value (optional)
@@ -7790,7 +7793,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceMaterialExtent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.89 = value;
+        self._fields.89 = value;
         self
     }
 }
@@ -7801,12 +7804,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceMentions<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.90 = value.into();
+        self._fields.90 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<ApiReferenceMentions<'a>>) -> Self {
-        self.__unsafe_private_named.90 = value;
+        self._fields.90 = value;
         self
     }
 }
@@ -7814,12 +7817,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<ApiReferenceName<'a>>>) -> Self {
-        self.__unsafe_private_named.91 = value.into();
+        self._fields.91 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<ApiReferenceName<'a>>) -> Self {
-        self.__unsafe_private_named.91 = value;
+        self._fields.91 = value;
         self
     }
 }
@@ -7827,12 +7830,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `offers` field (optional)
     pub fn offers(mut self, value: impl Into<Option<ApiReferenceOffers<'a>>>) -> Self {
-        self.__unsafe_private_named.92 = value.into();
+        self._fields.92 = value.into();
         self
     }
     /// Set the `offers` field to an Option value (optional)
     pub fn maybe_offers(mut self, value: Option<ApiReferenceOffers<'a>>) -> Self {
-        self.__unsafe_private_named.92 = value;
+        self._fields.92 = value;
         self
     }
 }
@@ -7843,12 +7846,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferencePageEnd<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.93 = value.into();
+        self._fields.93 = value.into();
         self
     }
     /// Set the `pageEnd` field to an Option value (optional)
     pub fn maybe_page_end(mut self, value: Option<ApiReferencePageEnd<'a>>) -> Self {
-        self.__unsafe_private_named.93 = value;
+        self._fields.93 = value;
         self
     }
 }
@@ -7859,12 +7862,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferencePageStart<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value.into();
+        self._fields.94 = value.into();
         self
     }
     /// Set the `pageStart` field to an Option value (optional)
     pub fn maybe_page_start(mut self, value: Option<ApiReferencePageStart<'a>>) -> Self {
-        self.__unsafe_private_named.94 = value;
+        self._fields.94 = value;
         self
     }
 }
@@ -7875,7 +7878,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferencePagination<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.95 = value.into();
+        self._fields.95 = value.into();
         self
     }
     /// Set the `pagination` field to an Option value (optional)
@@ -7883,7 +7886,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferencePagination<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.95 = value;
+        self._fields.95 = value;
         self
     }
 }
@@ -7891,12 +7894,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `pattern` field (optional)
     pub fn pattern(mut self, value: impl Into<Option<ApiReferencePattern<'a>>>) -> Self {
-        self.__unsafe_private_named.96 = value.into();
+        self._fields.96 = value.into();
         self
     }
     /// Set the `pattern` field to an Option value (optional)
     pub fn maybe_pattern(mut self, value: Option<ApiReferencePattern<'a>>) -> Self {
-        self.__unsafe_private_named.96 = value;
+        self._fields.96 = value;
         self
     }
 }
@@ -7907,12 +7910,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferencePosition<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.97 = value.into();
+        self._fields.97 = value.into();
         self
     }
     /// Set the `position` field to an Option value (optional)
     pub fn maybe_position(mut self, value: Option<ApiReferencePosition<'a>>) -> Self {
-        self.__unsafe_private_named.97 = value;
+        self._fields.97 = value;
         self
     }
 }
@@ -7923,7 +7926,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferencePotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value.into();
+        self._fields.98 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -7931,7 +7934,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferencePotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value;
+        self._fields.98 = value;
         self
     }
 }
@@ -7942,12 +7945,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceProducer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.99 = value.into();
+        self._fields.99 = value.into();
         self
     }
     /// Set the `producer` field to an Option value (optional)
     pub fn maybe_producer(mut self, value: Option<ApiReferenceProducer<'a>>) -> Self {
-        self.__unsafe_private_named.99 = value;
+        self._fields.99 = value;
         self
     }
 }
@@ -7958,7 +7961,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceProficiencyLevel<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value.into();
+        self._fields.100 = value.into();
         self
     }
     /// Set the `proficiencyLevel` field to an Option value (optional)
@@ -7966,7 +7969,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceProficiencyLevel<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value;
+        self._fields.100 = value;
         self
     }
 }
@@ -7977,7 +7980,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceProgrammingModel<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value.into();
+        self._fields.101 = value.into();
         self
     }
     /// Set the `programmingModel` field to an Option value (optional)
@@ -7985,7 +7988,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceProgrammingModel<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value;
+        self._fields.101 = value;
         self
     }
 }
@@ -7996,12 +7999,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceProvider<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value.into();
+        self._fields.102 = value.into();
         self
     }
     /// Set the `provider` field to an Option value (optional)
     pub fn maybe_provider(mut self, value: Option<ApiReferenceProvider<'a>>) -> Self {
-        self.__unsafe_private_named.102 = value;
+        self._fields.102 = value;
         self
     }
 }
@@ -8012,7 +8015,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferencePublication<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.103 = value.into();
+        self._fields.103 = value.into();
         self
     }
     /// Set the `publication` field to an Option value (optional)
@@ -8020,7 +8023,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferencePublication<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.103 = value;
+        self._fields.103 = value;
         self
     }
 }
@@ -8031,12 +8034,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferencePublisher<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value.into();
+        self._fields.104 = value.into();
         self
     }
     /// Set the `publisher` field to an Option value (optional)
     pub fn maybe_publisher(mut self, value: Option<ApiReferencePublisher<'a>>) -> Self {
-        self.__unsafe_private_named.104 = value;
+        self._fields.104 = value;
         self
     }
 }
@@ -8047,7 +8050,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferencePublisherImprint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.105 = value.into();
+        self._fields.105 = value.into();
         self
     }
     /// Set the `publisherImprint` field to an Option value (optional)
@@ -8055,7 +8058,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferencePublisherImprint<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.105 = value;
+        self._fields.105 = value;
         self
     }
 }
@@ -8066,7 +8069,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferencePublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value.into();
+        self._fields.106 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -8074,7 +8077,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferencePublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value;
+        self._fields.106 = value;
         self
     }
 }
@@ -8085,7 +8088,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceRecordedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value.into();
+        self._fields.107 = value.into();
         self
     }
     /// Set the `recordedAt` field to an Option value (optional)
@@ -8093,7 +8096,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceRecordedAt<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value;
+        self._fields.107 = value;
         self
     }
 }
@@ -8104,7 +8107,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceReleasedEvent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.108 = value.into();
+        self._fields.108 = value.into();
         self
     }
     /// Set the `releasedEvent` field to an Option value (optional)
@@ -8112,7 +8115,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceReleasedEvent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.108 = value;
+        self._fields.108 = value;
         self
     }
 }
@@ -8120,12 +8123,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<ApiReferenceReview<'a>>>) -> Self {
-        self.__unsafe_private_named.109 = value.into();
+        self._fields.109 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<ApiReferenceReview<'a>>) -> Self {
-        self.__unsafe_private_named.109 = value;
+        self._fields.109 = value;
         self
     }
 }
@@ -8133,12 +8136,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `reviews` field (optional)
     pub fn reviews(mut self, value: impl Into<Option<ApiReferenceReviews<'a>>>) -> Self {
-        self.__unsafe_private_named.110 = value.into();
+        self._fields.110 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<ApiReferenceReviews<'a>>) -> Self {
-        self.__unsafe_private_named.110 = value;
+        self._fields.110 = value;
         self
     }
 }
@@ -8146,12 +8149,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<ApiReferenceSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.111 = value.into();
+        self._fields.111 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<ApiReferenceSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.111 = value;
+        self._fields.111 = value;
         self
     }
 }
@@ -8162,7 +8165,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceSchemaVersion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value.into();
+        self._fields.112 = value.into();
         self
     }
     /// Set the `schemaVersion` field to an Option value (optional)
@@ -8170,7 +8173,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceSchemaVersion<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value;
+        self._fields.112 = value;
         self
     }
 }
@@ -8181,7 +8184,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceSdDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value.into();
+        self._fields.113 = value.into();
         self
     }
     /// Set the `sdDatePublished` field to an Option value (optional)
@@ -8189,7 +8192,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceSdDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value;
+        self._fields.113 = value;
         self
     }
 }
@@ -8200,12 +8203,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceSdLicense<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.114 = value.into();
+        self._fields.114 = value.into();
         self
     }
     /// Set the `sdLicense` field to an Option value (optional)
     pub fn maybe_sd_license(mut self, value: Option<ApiReferenceSdLicense<'a>>) -> Self {
-        self.__unsafe_private_named.114 = value;
+        self._fields.114 = value;
         self
     }
 }
@@ -8216,7 +8219,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceSdPublisher<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.115 = value.into();
+        self._fields.115 = value.into();
         self
     }
     /// Set the `sdPublisher` field to an Option value (optional)
@@ -8224,7 +8227,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceSdPublisher<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.115 = value;
+        self._fields.115 = value;
         self
     }
 }
@@ -8232,12 +8235,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<ApiReferenceSize<'a>>>) -> Self {
-        self.__unsafe_private_named.116 = value.into();
+        self._fields.116 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<ApiReferenceSize<'a>>) -> Self {
-        self.__unsafe_private_named.116 = value;
+        self._fields.116 = value;
         self
     }
 }
@@ -8248,7 +8251,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceSourceOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.117 = value.into();
+        self._fields.117 = value.into();
         self
     }
     /// Set the `sourceOrganization` field to an Option value (optional)
@@ -8256,7 +8259,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceSourceOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.117 = value;
+        self._fields.117 = value;
         self
     }
 }
@@ -8264,12 +8267,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `spatial` field (optional)
     pub fn spatial(mut self, value: impl Into<Option<ApiReferenceSpatial<'a>>>) -> Self {
-        self.__unsafe_private_named.118 = value.into();
+        self._fields.118 = value.into();
         self
     }
     /// Set the `spatial` field to an Option value (optional)
     pub fn maybe_spatial(mut self, value: Option<ApiReferenceSpatial<'a>>) -> Self {
-        self.__unsafe_private_named.118 = value;
+        self._fields.118 = value;
         self
     }
 }
@@ -8280,7 +8283,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceSpatialCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.119 = value.into();
+        self._fields.119 = value.into();
         self
     }
     /// Set the `spatialCoverage` field to an Option value (optional)
@@ -8288,7 +8291,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceSpatialCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.119 = value;
+        self._fields.119 = value;
         self
     }
 }
@@ -8299,12 +8302,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceSpeakable<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.120 = value.into();
+        self._fields.120 = value.into();
         self
     }
     /// Set the `speakable` field to an Option value (optional)
     pub fn maybe_speakable(mut self, value: Option<ApiReferenceSpeakable<'a>>) -> Self {
-        self.__unsafe_private_named.120 = value;
+        self._fields.120 = value;
         self
     }
 }
@@ -8312,12 +8315,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `sponsor` field (optional)
     pub fn sponsor(mut self, value: impl Into<Option<ApiReferenceSponsor<'a>>>) -> Self {
-        self.__unsafe_private_named.121 = value.into();
+        self._fields.121 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<ApiReferenceSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.121 = value;
+        self._fields.121 = value;
         self
     }
 }
@@ -8328,12 +8331,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceSubjectOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.122 = value.into();
+        self._fields.122 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<ApiReferenceSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.122 = value;
+        self._fields.122 = value;
         self
     }
 }
@@ -8344,7 +8347,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceTargetPlatform<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.123 = value.into();
+        self._fields.123 = value.into();
         self
     }
     /// Set the `targetPlatform` field to an Option value (optional)
@@ -8352,7 +8355,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceTargetPlatform<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.123 = value;
+        self._fields.123 = value;
         self
     }
 }
@@ -8360,12 +8363,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `teaches` field (optional)
     pub fn teaches(mut self, value: impl Into<Option<ApiReferenceTeaches<'a>>>) -> Self {
-        self.__unsafe_private_named.124 = value.into();
+        self._fields.124 = value.into();
         self
     }
     /// Set the `teaches` field to an Option value (optional)
     pub fn maybe_teaches(mut self, value: Option<ApiReferenceTeaches<'a>>) -> Self {
-        self.__unsafe_private_named.124 = value;
+        self._fields.124 = value;
         self
     }
 }
@@ -8376,12 +8379,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceTemporal<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.125 = value.into();
+        self._fields.125 = value.into();
         self
     }
     /// Set the `temporal` field to an Option value (optional)
     pub fn maybe_temporal(mut self, value: Option<ApiReferenceTemporal<'a>>) -> Self {
-        self.__unsafe_private_named.125 = value;
+        self._fields.125 = value;
         self
     }
 }
@@ -8392,7 +8395,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceTemporalCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.126 = value.into();
+        self._fields.126 = value.into();
         self
     }
     /// Set the `temporalCoverage` field to an Option value (optional)
@@ -8400,7 +8403,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceTemporalCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.126 = value;
+        self._fields.126 = value;
         self
     }
 }
@@ -8408,12 +8411,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<ApiReferenceText<'a>>>) -> Self {
-        self.__unsafe_private_named.127 = value.into();
+        self._fields.127 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<ApiReferenceText<'a>>) -> Self {
-        self.__unsafe_private_named.127 = value;
+        self._fields.127 = value;
         self
     }
 }
@@ -8424,12 +8427,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceThumbnail<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.128 = value.into();
+        self._fields.128 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<ApiReferenceThumbnail<'a>>) -> Self {
-        self.__unsafe_private_named.128 = value;
+        self._fields.128 = value;
         self
     }
 }
@@ -8440,7 +8443,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceThumbnailUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.129 = value.into();
+        self._fields.129 = value.into();
         self
     }
     /// Set the `thumbnailUrl` field to an Option value (optional)
@@ -8448,7 +8451,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceThumbnailUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.129 = value;
+        self._fields.129 = value;
         self
     }
 }
@@ -8459,7 +8462,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceTimeRequired<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.130 = value.into();
+        self._fields.130 = value.into();
         self
     }
     /// Set the `timeRequired` field to an Option value (optional)
@@ -8467,7 +8470,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceTimeRequired<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.130 = value;
+        self._fields.130 = value;
         self
     }
 }
@@ -8478,7 +8481,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceTranslationOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.131 = value.into();
+        self._fields.131 = value.into();
         self
     }
     /// Set the `translationOfWork` field to an Option value (optional)
@@ -8486,7 +8489,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceTranslationOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.131 = value;
+        self._fields.131 = value;
         self
     }
 }
@@ -8497,7 +8500,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceTranslator<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.132 = value.into();
+        self._fields.132 = value.into();
         self
     }
     /// Set the `translator` field to an Option value (optional)
@@ -8505,7 +8508,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceTranslator<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.132 = value;
+        self._fields.132 = value;
         self
     }
 }
@@ -8516,7 +8519,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceTypicalAgeRange<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.133 = value.into();
+        self._fields.133 = value.into();
         self
     }
     /// Set the `typicalAgeRange` field to an Option value (optional)
@@ -8524,7 +8527,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceTypicalAgeRange<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.133 = value;
+        self._fields.133 = value;
         self
     }
 }
@@ -8532,12 +8535,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<ApiReferenceUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.134 = value.into();
+        self._fields.134 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<ApiReferenceUrl<'a>>) -> Self {
-        self.__unsafe_private_named.134 = value;
+        self._fields.134 = value;
         self
     }
 }
@@ -8548,12 +8551,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceUsageInfo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.135 = value.into();
+        self._fields.135 = value.into();
         self
     }
     /// Set the `usageInfo` field to an Option value (optional)
     pub fn maybe_usage_info(mut self, value: Option<ApiReferenceUsageInfo<'a>>) -> Self {
-        self.__unsafe_private_named.135 = value;
+        self._fields.135 = value;
         self
     }
 }
@@ -8561,12 +8564,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `version` field (optional)
     pub fn version(mut self, value: impl Into<Option<ApiReferenceVersion<'a>>>) -> Self {
-        self.__unsafe_private_named.136 = value.into();
+        self._fields.136 = value.into();
         self
     }
     /// Set the `version` field to an Option value (optional)
     pub fn maybe_version(mut self, value: Option<ApiReferenceVersion<'a>>) -> Self {
-        self.__unsafe_private_named.136 = value;
+        self._fields.136 = value;
         self
     }
 }
@@ -8574,12 +8577,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
 impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
     /// Set the `video` field (optional)
     pub fn video(mut self, value: impl Into<Option<ApiReferenceVideo<'a>>>) -> Self {
-        self.__unsafe_private_named.137 = value.into();
+        self._fields.137 = value.into();
         self
     }
     /// Set the `video` field to an Option value (optional)
     pub fn maybe_video(mut self, value: Option<ApiReferenceVideo<'a>>) -> Self {
-        self.__unsafe_private_named.137 = value;
+        self._fields.137 = value;
         self
     }
 }
@@ -8590,12 +8593,12 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceWordCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.138 = value.into();
+        self._fields.138 = value.into();
         self
     }
     /// Set the `wordCount` field to an Option value (optional)
     pub fn maybe_word_count(mut self, value: Option<ApiReferenceWordCount<'a>>) -> Self {
-        self.__unsafe_private_named.138 = value;
+        self._fields.138 = value;
         self
     }
 }
@@ -8606,7 +8609,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceWorkExample<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.139 = value.into();
+        self._fields.139 = value.into();
         self
     }
     /// Set the `workExample` field to an Option value (optional)
@@ -8614,7 +8617,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceWorkExample<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.139 = value;
+        self._fields.139 = value;
         self
     }
 }
@@ -8625,7 +8628,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ApiReferenceWorkTranslation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.140 = value.into();
+        self._fields.140 = value.into();
         self
     }
     /// Set the `workTranslation` field to an Option value (optional)
@@ -8633,7 +8636,7 @@ impl<'a, S: api_reference_state::State> ApiReferenceBuilder<'a, S> {
         mut self,
         value: Option<ApiReferenceWorkTranslation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.140 = value;
+        self._fields.140 = value;
         self
     }
 }
@@ -8645,147 +8648,147 @@ where
     /// Build the final struct
     pub fn build(self) -> ApiReference<'a> {
         ApiReference {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            additional_type: self.__unsafe_private_named.11,
-            aggregate_rating: self.__unsafe_private_named.12,
-            alternate_name: self.__unsafe_private_named.13,
-            alternative_headline: self.__unsafe_private_named.14,
-            archived_at: self.__unsafe_private_named.15,
-            article_body: self.__unsafe_private_named.16,
-            article_section: self.__unsafe_private_named.17,
-            assembly: self.__unsafe_private_named.18,
-            assembly_version: self.__unsafe_private_named.19,
-            assesses: self.__unsafe_private_named.20,
-            associated_media: self.__unsafe_private_named.21,
-            audience: self.__unsafe_private_named.22,
-            audio: self.__unsafe_private_named.23,
-            author: self.__unsafe_private_named.24,
-            award: self.__unsafe_private_named.25,
-            awards: self.__unsafe_private_named.26,
-            backstory: self.__unsafe_private_named.27,
-            character: self.__unsafe_private_named.28,
-            citation: self.__unsafe_private_named.29,
-            comment: self.__unsafe_private_named.30,
-            comment_count: self.__unsafe_private_named.31,
-            conditions_of_access: self.__unsafe_private_named.32,
-            content_location: self.__unsafe_private_named.33,
-            content_rating: self.__unsafe_private_named.34,
-            content_reference_time: self.__unsafe_private_named.35,
-            contributor: self.__unsafe_private_named.36,
-            copyright_holder: self.__unsafe_private_named.37,
-            copyright_notice: self.__unsafe_private_named.38,
-            copyright_year: self.__unsafe_private_named.39,
-            correction: self.__unsafe_private_named.40,
-            country_of_origin: self.__unsafe_private_named.41,
-            creative_work_status: self.__unsafe_private_named.42,
-            creator: self.__unsafe_private_named.43,
-            credit_text: self.__unsafe_private_named.44,
-            date_created: self.__unsafe_private_named.45,
-            date_modified: self.__unsafe_private_named.46,
-            date_published: self.__unsafe_private_named.47,
-            dependencies: self.__unsafe_private_named.48,
-            description: self.__unsafe_private_named.49,
-            digital_source_type: self.__unsafe_private_named.50,
-            disambiguating_description: self.__unsafe_private_named.51,
-            discussion_url: self.__unsafe_private_named.52,
-            edit_eidr: self.__unsafe_private_named.53,
-            editor: self.__unsafe_private_named.54,
-            educational_alignment: self.__unsafe_private_named.55,
-            educational_level: self.__unsafe_private_named.56,
-            educational_use: self.__unsafe_private_named.57,
-            encoding: self.__unsafe_private_named.58,
-            encoding_format: self.__unsafe_private_named.59,
-            encodings: self.__unsafe_private_named.60,
-            example_of_work: self.__unsafe_private_named.61,
-            executable_library_name: self.__unsafe_private_named.62,
-            expires: self.__unsafe_private_named.63,
-            file_format: self.__unsafe_private_named.64,
-            funder: self.__unsafe_private_named.65,
-            funding: self.__unsafe_private_named.66,
-            genre: self.__unsafe_private_named.67,
-            has_part: self.__unsafe_private_named.68,
-            headline: self.__unsafe_private_named.69,
-            identifier: self.__unsafe_private_named.70,
-            image: self.__unsafe_private_named.71,
-            in_language: self.__unsafe_private_named.72,
-            interaction_statistic: self.__unsafe_private_named.73,
-            interactivity_type: self.__unsafe_private_named.74,
-            interpreted_as_claim: self.__unsafe_private_named.75,
-            is_accessible_for_free: self.__unsafe_private_named.76,
-            is_based_on: self.__unsafe_private_named.77,
-            is_based_on_url: self.__unsafe_private_named.78,
-            is_family_friendly: self.__unsafe_private_named.79,
-            is_part_of: self.__unsafe_private_named.80,
-            keywords: self.__unsafe_private_named.81,
-            learning_resource_type: self.__unsafe_private_named.82,
-            license: self.__unsafe_private_named.83,
-            location_created: self.__unsafe_private_named.84,
-            main_entity: self.__unsafe_private_named.85,
-            main_entity_of_page: self.__unsafe_private_named.86,
-            maintainer: self.__unsafe_private_named.87,
-            material: self.__unsafe_private_named.88,
-            material_extent: self.__unsafe_private_named.89,
-            mentions: self.__unsafe_private_named.90,
-            name: self.__unsafe_private_named.91,
-            offers: self.__unsafe_private_named.92,
-            page_end: self.__unsafe_private_named.93,
-            page_start: self.__unsafe_private_named.94,
-            pagination: self.__unsafe_private_named.95,
-            pattern: self.__unsafe_private_named.96,
-            position: self.__unsafe_private_named.97,
-            potential_action: self.__unsafe_private_named.98,
-            producer: self.__unsafe_private_named.99,
-            proficiency_level: self.__unsafe_private_named.100,
-            programming_model: self.__unsafe_private_named.101,
-            provider: self.__unsafe_private_named.102,
-            publication: self.__unsafe_private_named.103,
-            publisher: self.__unsafe_private_named.104,
-            publisher_imprint: self.__unsafe_private_named.105,
-            publishing_principles: self.__unsafe_private_named.106,
-            recorded_at: self.__unsafe_private_named.107,
-            released_event: self.__unsafe_private_named.108,
-            review: self.__unsafe_private_named.109,
-            reviews: self.__unsafe_private_named.110,
-            same_as: self.__unsafe_private_named.111,
-            schema_version: self.__unsafe_private_named.112,
-            sd_date_published: self.__unsafe_private_named.113,
-            sd_license: self.__unsafe_private_named.114,
-            sd_publisher: self.__unsafe_private_named.115,
-            size: self.__unsafe_private_named.116,
-            source_organization: self.__unsafe_private_named.117,
-            spatial: self.__unsafe_private_named.118,
-            spatial_coverage: self.__unsafe_private_named.119,
-            speakable: self.__unsafe_private_named.120,
-            sponsor: self.__unsafe_private_named.121,
-            subject_of: self.__unsafe_private_named.122,
-            target_platform: self.__unsafe_private_named.123,
-            teaches: self.__unsafe_private_named.124,
-            temporal: self.__unsafe_private_named.125,
-            temporal_coverage: self.__unsafe_private_named.126,
-            text: self.__unsafe_private_named.127,
-            thumbnail: self.__unsafe_private_named.128,
-            thumbnail_url: self.__unsafe_private_named.129,
-            time_required: self.__unsafe_private_named.130,
-            translation_of_work: self.__unsafe_private_named.131,
-            translator: self.__unsafe_private_named.132,
-            typical_age_range: self.__unsafe_private_named.133,
-            url: self.__unsafe_private_named.134,
-            usage_info: self.__unsafe_private_named.135,
-            version: self.__unsafe_private_named.136,
-            video: self.__unsafe_private_named.137,
-            word_count: self.__unsafe_private_named.138,
-            work_example: self.__unsafe_private_named.139,
-            work_translation: self.__unsafe_private_named.140,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            additional_type: self._fields.11,
+            aggregate_rating: self._fields.12,
+            alternate_name: self._fields.13,
+            alternative_headline: self._fields.14,
+            archived_at: self._fields.15,
+            article_body: self._fields.16,
+            article_section: self._fields.17,
+            assembly: self._fields.18,
+            assembly_version: self._fields.19,
+            assesses: self._fields.20,
+            associated_media: self._fields.21,
+            audience: self._fields.22,
+            audio: self._fields.23,
+            author: self._fields.24,
+            award: self._fields.25,
+            awards: self._fields.26,
+            backstory: self._fields.27,
+            character: self._fields.28,
+            citation: self._fields.29,
+            comment: self._fields.30,
+            comment_count: self._fields.31,
+            conditions_of_access: self._fields.32,
+            content_location: self._fields.33,
+            content_rating: self._fields.34,
+            content_reference_time: self._fields.35,
+            contributor: self._fields.36,
+            copyright_holder: self._fields.37,
+            copyright_notice: self._fields.38,
+            copyright_year: self._fields.39,
+            correction: self._fields.40,
+            country_of_origin: self._fields.41,
+            creative_work_status: self._fields.42,
+            creator: self._fields.43,
+            credit_text: self._fields.44,
+            date_created: self._fields.45,
+            date_modified: self._fields.46,
+            date_published: self._fields.47,
+            dependencies: self._fields.48,
+            description: self._fields.49,
+            digital_source_type: self._fields.50,
+            disambiguating_description: self._fields.51,
+            discussion_url: self._fields.52,
+            edit_eidr: self._fields.53,
+            editor: self._fields.54,
+            educational_alignment: self._fields.55,
+            educational_level: self._fields.56,
+            educational_use: self._fields.57,
+            encoding: self._fields.58,
+            encoding_format: self._fields.59,
+            encodings: self._fields.60,
+            example_of_work: self._fields.61,
+            executable_library_name: self._fields.62,
+            expires: self._fields.63,
+            file_format: self._fields.64,
+            funder: self._fields.65,
+            funding: self._fields.66,
+            genre: self._fields.67,
+            has_part: self._fields.68,
+            headline: self._fields.69,
+            identifier: self._fields.70,
+            image: self._fields.71,
+            in_language: self._fields.72,
+            interaction_statistic: self._fields.73,
+            interactivity_type: self._fields.74,
+            interpreted_as_claim: self._fields.75,
+            is_accessible_for_free: self._fields.76,
+            is_based_on: self._fields.77,
+            is_based_on_url: self._fields.78,
+            is_family_friendly: self._fields.79,
+            is_part_of: self._fields.80,
+            keywords: self._fields.81,
+            learning_resource_type: self._fields.82,
+            license: self._fields.83,
+            location_created: self._fields.84,
+            main_entity: self._fields.85,
+            main_entity_of_page: self._fields.86,
+            maintainer: self._fields.87,
+            material: self._fields.88,
+            material_extent: self._fields.89,
+            mentions: self._fields.90,
+            name: self._fields.91,
+            offers: self._fields.92,
+            page_end: self._fields.93,
+            page_start: self._fields.94,
+            pagination: self._fields.95,
+            pattern: self._fields.96,
+            position: self._fields.97,
+            potential_action: self._fields.98,
+            producer: self._fields.99,
+            proficiency_level: self._fields.100,
+            programming_model: self._fields.101,
+            provider: self._fields.102,
+            publication: self._fields.103,
+            publisher: self._fields.104,
+            publisher_imprint: self._fields.105,
+            publishing_principles: self._fields.106,
+            recorded_at: self._fields.107,
+            released_event: self._fields.108,
+            review: self._fields.109,
+            reviews: self._fields.110,
+            same_as: self._fields.111,
+            schema_version: self._fields.112,
+            sd_date_published: self._fields.113,
+            sd_license: self._fields.114,
+            sd_publisher: self._fields.115,
+            size: self._fields.116,
+            source_organization: self._fields.117,
+            spatial: self._fields.118,
+            spatial_coverage: self._fields.119,
+            speakable: self._fields.120,
+            sponsor: self._fields.121,
+            subject_of: self._fields.122,
+            target_platform: self._fields.123,
+            teaches: self._fields.124,
+            temporal: self._fields.125,
+            temporal_coverage: self._fields.126,
+            text: self._fields.127,
+            thumbnail: self._fields.128,
+            thumbnail_url: self._fields.129,
+            time_required: self._fields.130,
+            translation_of_work: self._fields.131,
+            translator: self._fields.132,
+            typical_age_range: self._fields.133,
+            url: self._fields.134,
+            usage_info: self._fields.135,
+            version: self._fields.136,
+            video: self._fields.137,
+            word_count: self._fields.138,
+            work_example: self._fields.139,
+            work_translation: self._fields.140,
             extra_data: Default::default(),
         }
     }
@@ -8795,147 +8798,147 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ApiReference<'a> {
         ApiReference {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            additional_type: self.__unsafe_private_named.11,
-            aggregate_rating: self.__unsafe_private_named.12,
-            alternate_name: self.__unsafe_private_named.13,
-            alternative_headline: self.__unsafe_private_named.14,
-            archived_at: self.__unsafe_private_named.15,
-            article_body: self.__unsafe_private_named.16,
-            article_section: self.__unsafe_private_named.17,
-            assembly: self.__unsafe_private_named.18,
-            assembly_version: self.__unsafe_private_named.19,
-            assesses: self.__unsafe_private_named.20,
-            associated_media: self.__unsafe_private_named.21,
-            audience: self.__unsafe_private_named.22,
-            audio: self.__unsafe_private_named.23,
-            author: self.__unsafe_private_named.24,
-            award: self.__unsafe_private_named.25,
-            awards: self.__unsafe_private_named.26,
-            backstory: self.__unsafe_private_named.27,
-            character: self.__unsafe_private_named.28,
-            citation: self.__unsafe_private_named.29,
-            comment: self.__unsafe_private_named.30,
-            comment_count: self.__unsafe_private_named.31,
-            conditions_of_access: self.__unsafe_private_named.32,
-            content_location: self.__unsafe_private_named.33,
-            content_rating: self.__unsafe_private_named.34,
-            content_reference_time: self.__unsafe_private_named.35,
-            contributor: self.__unsafe_private_named.36,
-            copyright_holder: self.__unsafe_private_named.37,
-            copyright_notice: self.__unsafe_private_named.38,
-            copyright_year: self.__unsafe_private_named.39,
-            correction: self.__unsafe_private_named.40,
-            country_of_origin: self.__unsafe_private_named.41,
-            creative_work_status: self.__unsafe_private_named.42,
-            creator: self.__unsafe_private_named.43,
-            credit_text: self.__unsafe_private_named.44,
-            date_created: self.__unsafe_private_named.45,
-            date_modified: self.__unsafe_private_named.46,
-            date_published: self.__unsafe_private_named.47,
-            dependencies: self.__unsafe_private_named.48,
-            description: self.__unsafe_private_named.49,
-            digital_source_type: self.__unsafe_private_named.50,
-            disambiguating_description: self.__unsafe_private_named.51,
-            discussion_url: self.__unsafe_private_named.52,
-            edit_eidr: self.__unsafe_private_named.53,
-            editor: self.__unsafe_private_named.54,
-            educational_alignment: self.__unsafe_private_named.55,
-            educational_level: self.__unsafe_private_named.56,
-            educational_use: self.__unsafe_private_named.57,
-            encoding: self.__unsafe_private_named.58,
-            encoding_format: self.__unsafe_private_named.59,
-            encodings: self.__unsafe_private_named.60,
-            example_of_work: self.__unsafe_private_named.61,
-            executable_library_name: self.__unsafe_private_named.62,
-            expires: self.__unsafe_private_named.63,
-            file_format: self.__unsafe_private_named.64,
-            funder: self.__unsafe_private_named.65,
-            funding: self.__unsafe_private_named.66,
-            genre: self.__unsafe_private_named.67,
-            has_part: self.__unsafe_private_named.68,
-            headline: self.__unsafe_private_named.69,
-            identifier: self.__unsafe_private_named.70,
-            image: self.__unsafe_private_named.71,
-            in_language: self.__unsafe_private_named.72,
-            interaction_statistic: self.__unsafe_private_named.73,
-            interactivity_type: self.__unsafe_private_named.74,
-            interpreted_as_claim: self.__unsafe_private_named.75,
-            is_accessible_for_free: self.__unsafe_private_named.76,
-            is_based_on: self.__unsafe_private_named.77,
-            is_based_on_url: self.__unsafe_private_named.78,
-            is_family_friendly: self.__unsafe_private_named.79,
-            is_part_of: self.__unsafe_private_named.80,
-            keywords: self.__unsafe_private_named.81,
-            learning_resource_type: self.__unsafe_private_named.82,
-            license: self.__unsafe_private_named.83,
-            location_created: self.__unsafe_private_named.84,
-            main_entity: self.__unsafe_private_named.85,
-            main_entity_of_page: self.__unsafe_private_named.86,
-            maintainer: self.__unsafe_private_named.87,
-            material: self.__unsafe_private_named.88,
-            material_extent: self.__unsafe_private_named.89,
-            mentions: self.__unsafe_private_named.90,
-            name: self.__unsafe_private_named.91,
-            offers: self.__unsafe_private_named.92,
-            page_end: self.__unsafe_private_named.93,
-            page_start: self.__unsafe_private_named.94,
-            pagination: self.__unsafe_private_named.95,
-            pattern: self.__unsafe_private_named.96,
-            position: self.__unsafe_private_named.97,
-            potential_action: self.__unsafe_private_named.98,
-            producer: self.__unsafe_private_named.99,
-            proficiency_level: self.__unsafe_private_named.100,
-            programming_model: self.__unsafe_private_named.101,
-            provider: self.__unsafe_private_named.102,
-            publication: self.__unsafe_private_named.103,
-            publisher: self.__unsafe_private_named.104,
-            publisher_imprint: self.__unsafe_private_named.105,
-            publishing_principles: self.__unsafe_private_named.106,
-            recorded_at: self.__unsafe_private_named.107,
-            released_event: self.__unsafe_private_named.108,
-            review: self.__unsafe_private_named.109,
-            reviews: self.__unsafe_private_named.110,
-            same_as: self.__unsafe_private_named.111,
-            schema_version: self.__unsafe_private_named.112,
-            sd_date_published: self.__unsafe_private_named.113,
-            sd_license: self.__unsafe_private_named.114,
-            sd_publisher: self.__unsafe_private_named.115,
-            size: self.__unsafe_private_named.116,
-            source_organization: self.__unsafe_private_named.117,
-            spatial: self.__unsafe_private_named.118,
-            spatial_coverage: self.__unsafe_private_named.119,
-            speakable: self.__unsafe_private_named.120,
-            sponsor: self.__unsafe_private_named.121,
-            subject_of: self.__unsafe_private_named.122,
-            target_platform: self.__unsafe_private_named.123,
-            teaches: self.__unsafe_private_named.124,
-            temporal: self.__unsafe_private_named.125,
-            temporal_coverage: self.__unsafe_private_named.126,
-            text: self.__unsafe_private_named.127,
-            thumbnail: self.__unsafe_private_named.128,
-            thumbnail_url: self.__unsafe_private_named.129,
-            time_required: self.__unsafe_private_named.130,
-            translation_of_work: self.__unsafe_private_named.131,
-            translator: self.__unsafe_private_named.132,
-            typical_age_range: self.__unsafe_private_named.133,
-            url: self.__unsafe_private_named.134,
-            usage_info: self.__unsafe_private_named.135,
-            version: self.__unsafe_private_named.136,
-            video: self.__unsafe_private_named.137,
-            word_count: self.__unsafe_private_named.138,
-            work_example: self.__unsafe_private_named.139,
-            work_translation: self.__unsafe_private_named.140,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            additional_type: self._fields.11,
+            aggregate_rating: self._fields.12,
+            alternate_name: self._fields.13,
+            alternative_headline: self._fields.14,
+            archived_at: self._fields.15,
+            article_body: self._fields.16,
+            article_section: self._fields.17,
+            assembly: self._fields.18,
+            assembly_version: self._fields.19,
+            assesses: self._fields.20,
+            associated_media: self._fields.21,
+            audience: self._fields.22,
+            audio: self._fields.23,
+            author: self._fields.24,
+            award: self._fields.25,
+            awards: self._fields.26,
+            backstory: self._fields.27,
+            character: self._fields.28,
+            citation: self._fields.29,
+            comment: self._fields.30,
+            comment_count: self._fields.31,
+            conditions_of_access: self._fields.32,
+            content_location: self._fields.33,
+            content_rating: self._fields.34,
+            content_reference_time: self._fields.35,
+            contributor: self._fields.36,
+            copyright_holder: self._fields.37,
+            copyright_notice: self._fields.38,
+            copyright_year: self._fields.39,
+            correction: self._fields.40,
+            country_of_origin: self._fields.41,
+            creative_work_status: self._fields.42,
+            creator: self._fields.43,
+            credit_text: self._fields.44,
+            date_created: self._fields.45,
+            date_modified: self._fields.46,
+            date_published: self._fields.47,
+            dependencies: self._fields.48,
+            description: self._fields.49,
+            digital_source_type: self._fields.50,
+            disambiguating_description: self._fields.51,
+            discussion_url: self._fields.52,
+            edit_eidr: self._fields.53,
+            editor: self._fields.54,
+            educational_alignment: self._fields.55,
+            educational_level: self._fields.56,
+            educational_use: self._fields.57,
+            encoding: self._fields.58,
+            encoding_format: self._fields.59,
+            encodings: self._fields.60,
+            example_of_work: self._fields.61,
+            executable_library_name: self._fields.62,
+            expires: self._fields.63,
+            file_format: self._fields.64,
+            funder: self._fields.65,
+            funding: self._fields.66,
+            genre: self._fields.67,
+            has_part: self._fields.68,
+            headline: self._fields.69,
+            identifier: self._fields.70,
+            image: self._fields.71,
+            in_language: self._fields.72,
+            interaction_statistic: self._fields.73,
+            interactivity_type: self._fields.74,
+            interpreted_as_claim: self._fields.75,
+            is_accessible_for_free: self._fields.76,
+            is_based_on: self._fields.77,
+            is_based_on_url: self._fields.78,
+            is_family_friendly: self._fields.79,
+            is_part_of: self._fields.80,
+            keywords: self._fields.81,
+            learning_resource_type: self._fields.82,
+            license: self._fields.83,
+            location_created: self._fields.84,
+            main_entity: self._fields.85,
+            main_entity_of_page: self._fields.86,
+            maintainer: self._fields.87,
+            material: self._fields.88,
+            material_extent: self._fields.89,
+            mentions: self._fields.90,
+            name: self._fields.91,
+            offers: self._fields.92,
+            page_end: self._fields.93,
+            page_start: self._fields.94,
+            pagination: self._fields.95,
+            pattern: self._fields.96,
+            position: self._fields.97,
+            potential_action: self._fields.98,
+            producer: self._fields.99,
+            proficiency_level: self._fields.100,
+            programming_model: self._fields.101,
+            provider: self._fields.102,
+            publication: self._fields.103,
+            publisher: self._fields.104,
+            publisher_imprint: self._fields.105,
+            publishing_principles: self._fields.106,
+            recorded_at: self._fields.107,
+            released_event: self._fields.108,
+            review: self._fields.109,
+            reviews: self._fields.110,
+            same_as: self._fields.111,
+            schema_version: self._fields.112,
+            sd_date_published: self._fields.113,
+            sd_license: self._fields.114,
+            sd_publisher: self._fields.115,
+            size: self._fields.116,
+            source_organization: self._fields.117,
+            spatial: self._fields.118,
+            spatial_coverage: self._fields.119,
+            speakable: self._fields.120,
+            sponsor: self._fields.121,
+            subject_of: self._fields.122,
+            target_platform: self._fields.123,
+            teaches: self._fields.124,
+            temporal: self._fields.125,
+            temporal_coverage: self._fields.126,
+            text: self._fields.127,
+            thumbnail: self._fields.128,
+            thumbnail_url: self._fields.129,
+            time_required: self._fields.130,
+            translation_of_work: self._fields.131,
+            translator: self._fields.132,
+            typical_age_range: self._fields.133,
+            url: self._fields.134,
+            usage_info: self._fields.135,
+            version: self._fields.136,
+            video: self._fields.137,
+            word_count: self._fields.138,
+            work_example: self._fields.139,
+            work_translation: self._fields.140,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/article.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/article.rs
index 72be5a65..4493e07c 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/article.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/article.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -5641,8 +5644,8 @@ pub mod article_state {
 
 /// Builder for constructing an instance of this type
 pub struct ArticleBuilder<'a, S: article_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ArticleAbout<'a>>,
         Option<ArticleAbstract<'a>>,
         Option<ArticleAccessMode<'a>>,
@@ -5778,7 +5781,7 @@ pub struct ArticleBuilder<'a, S: article_state::State> {
         Option<ArticleWorkExample<'a>>,
         Option<ArticleWorkTranslation<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Article<'a> {
@@ -5792,8 +5795,8 @@ impl<'a> ArticleBuilder<'a, article_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ArticleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -5929,7 +5932,7 @@ impl<'a> ArticleBuilder<'a, article_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5937,12 +5940,12 @@ impl<'a> ArticleBuilder<'a, article_state::Empty> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `about` field (optional)
     pub fn about(mut self, value: impl Into<Option<ArticleAbout<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `about` field to an Option value (optional)
     pub fn maybe_about(mut self, value: Option<ArticleAbout<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -5950,12 +5953,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `abstract` field (optional)
     pub fn r#abstract(mut self, value: impl Into<Option<ArticleAbstract<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `abstract` field to an Option value (optional)
     pub fn maybe_abstract(mut self, value: Option<ArticleAbstract<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -5966,12 +5969,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleAccessMode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `accessMode` field to an Option value (optional)
     pub fn maybe_access_mode(mut self, value: Option<ArticleAccessMode<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -5982,7 +5985,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleAccessModeSufficient<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `accessModeSufficient` field to an Option value (optional)
@@ -5990,7 +5993,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleAccessModeSufficient<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -6001,7 +6004,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleAccessibilityApi<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `accessibilityAPI` field to an Option value (optional)
@@ -6009,7 +6012,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleAccessibilityApi<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -6020,7 +6023,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleAccessibilityControl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `accessibilityControl` field to an Option value (optional)
@@ -6028,7 +6031,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleAccessibilityControl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -6039,7 +6042,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleAccessibilityFeature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `accessibilityFeature` field to an Option value (optional)
@@ -6047,7 +6050,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleAccessibilityFeature<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -6058,7 +6061,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleAccessibilityHazard<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `accessibilityHazard` field to an Option value (optional)
@@ -6066,7 +6069,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleAccessibilityHazard<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -6077,7 +6080,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleAccessibilitySummary<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `accessibilitySummary` field to an Option value (optional)
@@ -6085,7 +6088,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleAccessibilitySummary<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -6096,7 +6099,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleAccountablePerson<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `accountablePerson` field to an Option value (optional)
@@ -6104,7 +6107,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleAccountablePerson<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -6115,7 +6118,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleAcquireLicensePage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `acquireLicensePage` field to an Option value (optional)
@@ -6123,7 +6126,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleAcquireLicensePage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -6134,7 +6137,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -6142,7 +6145,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -6153,7 +6156,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -6161,7 +6164,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -6172,7 +6175,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -6180,7 +6183,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -6191,7 +6194,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleAlternativeHeadline<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `alternativeHeadline` field to an Option value (optional)
@@ -6199,7 +6202,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleAlternativeHeadline<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -6210,12 +6213,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleArchivedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `archivedAt` field to an Option value (optional)
     pub fn maybe_archived_at(mut self, value: Option<ArticleArchivedAt<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -6226,12 +6229,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleArticleBody<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `articleBody` field to an Option value (optional)
     pub fn maybe_article_body(mut self, value: Option<ArticleArticleBody<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -6242,7 +6245,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleArticleSection<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `articleSection` field to an Option value (optional)
@@ -6250,7 +6253,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleArticleSection<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -6258,12 +6261,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `assesses` field (optional)
     pub fn assesses(mut self, value: impl Into<Option<ArticleAssesses<'a>>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `assesses` field to an Option value (optional)
     pub fn maybe_assesses(mut self, value: Option<ArticleAssesses<'a>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -6274,7 +6277,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleAssociatedMedia<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `associatedMedia` field to an Option value (optional)
@@ -6282,7 +6285,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleAssociatedMedia<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -6290,12 +6293,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `audience` field (optional)
     pub fn audience(mut self, value: impl Into<Option<ArticleAudience<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `audience` field to an Option value (optional)
     pub fn maybe_audience(mut self, value: Option<ArticleAudience<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -6303,12 +6306,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `audio` field (optional)
     pub fn audio(mut self, value: impl Into<Option<ArticleAudio<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `audio` field to an Option value (optional)
     pub fn maybe_audio(mut self, value: Option<ArticleAudio<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -6316,12 +6319,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<ArticleAuthor<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<ArticleAuthor<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -6329,12 +6332,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<ArticleAward<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<ArticleAward<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -6342,12 +6345,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<ArticleAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<ArticleAwards<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -6355,12 +6358,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `backstory` field (optional)
     pub fn backstory(mut self, value: impl Into<Option<ArticleBackstory<'a>>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `backstory` field to an Option value (optional)
     pub fn maybe_backstory(mut self, value: Option<ArticleBackstory<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -6368,12 +6371,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `character` field (optional)
     pub fn character(mut self, value: impl Into<Option<ArticleCharacter<'a>>>) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `character` field to an Option value (optional)
     pub fn maybe_character(mut self, value: Option<ArticleCharacter<'a>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -6381,12 +6384,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `citation` field (optional)
     pub fn citation(mut self, value: impl Into<Option<ArticleCitation<'a>>>) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `citation` field to an Option value (optional)
     pub fn maybe_citation(mut self, value: Option<ArticleCitation<'a>>) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -6394,12 +6397,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<ArticleComment<'a>>>) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<ArticleComment<'a>>) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -6410,7 +6413,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleCommentCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `commentCount` field to an Option value (optional)
@@ -6418,7 +6421,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleCommentCount<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -6429,7 +6432,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleConditionsOfAccess<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `conditionsOfAccess` field to an Option value (optional)
@@ -6437,7 +6440,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleConditionsOfAccess<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -6448,7 +6451,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleContentLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `contentLocation` field to an Option value (optional)
@@ -6456,7 +6459,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleContentLocation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -6467,7 +6470,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleContentRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `contentRating` field to an Option value (optional)
@@ -6475,7 +6478,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleContentRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -6486,7 +6489,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleContentReferenceTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `contentReferenceTime` field to an Option value (optional)
@@ -6494,7 +6497,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleContentReferenceTime<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -6505,12 +6508,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleContributor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `contributor` field to an Option value (optional)
     pub fn maybe_contributor(mut self, value: Option<ArticleContributor<'a>>) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -6521,7 +6524,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleCopyrightHolder<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `copyrightHolder` field to an Option value (optional)
@@ -6529,7 +6532,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleCopyrightHolder<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -6540,7 +6543,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleCopyrightNotice<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `copyrightNotice` field to an Option value (optional)
@@ -6548,7 +6551,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleCopyrightNotice<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -6559,7 +6562,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleCopyrightYear<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `copyrightYear` field to an Option value (optional)
@@ -6567,7 +6570,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleCopyrightYear<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -6578,12 +6581,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleCorrection<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `correction` field to an Option value (optional)
     pub fn maybe_correction(mut self, value: Option<ArticleCorrection<'a>>) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -6594,7 +6597,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleCountryOfOrigin<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `countryOfOrigin` field to an Option value (optional)
@@ -6602,7 +6605,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleCountryOfOrigin<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -6613,7 +6616,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleCreativeWorkStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `creativeWorkStatus` field to an Option value (optional)
@@ -6621,7 +6624,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleCreativeWorkStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -6629,12 +6632,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `creator` field (optional)
     pub fn creator(mut self, value: impl Into<Option<ArticleCreator<'a>>>) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `creator` field to an Option value (optional)
     pub fn maybe_creator(mut self, value: Option<ArticleCreator<'a>>) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -6645,12 +6648,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleCreditText<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `creditText` field to an Option value (optional)
     pub fn maybe_credit_text(mut self, value: Option<ArticleCreditText<'a>>) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -6661,12 +6664,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleDateCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `dateCreated` field to an Option value (optional)
     pub fn maybe_date_created(mut self, value: Option<ArticleDateCreated<'a>>) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -6677,7 +6680,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleDateModified<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `dateModified` field to an Option value (optional)
@@ -6685,7 +6688,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleDateModified<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -6696,7 +6699,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `datePublished` field to an Option value (optional)
@@ -6704,7 +6707,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -6715,12 +6718,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<ArticleDescription<'a>>) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -6731,7 +6734,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleDigitalSourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `digitalSourceType` field to an Option value (optional)
@@ -6739,7 +6742,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleDigitalSourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -6750,7 +6753,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -6758,7 +6761,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -6769,7 +6772,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleDiscussionUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `discussionUrl` field to an Option value (optional)
@@ -6777,7 +6780,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleDiscussionUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -6785,12 +6788,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `editEIDR` field (optional)
     pub fn edit_eidr(mut self, value: impl Into<Option<ArticleEditEidr<'a>>>) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `editEIDR` field to an Option value (optional)
     pub fn maybe_edit_eidr(mut self, value: Option<ArticleEditEidr<'a>>) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -6798,12 +6801,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `editor` field (optional)
     pub fn editor(mut self, value: impl Into<Option<ArticleEditor<'a>>>) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `editor` field to an Option value (optional)
     pub fn maybe_editor(mut self, value: Option<ArticleEditor<'a>>) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -6814,7 +6817,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleEducationalAlignment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `educationalAlignment` field to an Option value (optional)
@@ -6822,7 +6825,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleEducationalAlignment<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -6833,7 +6836,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleEducationalLevel<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `educationalLevel` field to an Option value (optional)
@@ -6841,7 +6844,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleEducationalLevel<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -6852,7 +6855,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleEducationalUse<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `educationalUse` field to an Option value (optional)
@@ -6860,7 +6863,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleEducationalUse<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -6868,12 +6871,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `encoding` field (optional)
     pub fn encoding(mut self, value: impl Into<Option<ArticleEncoding<'a>>>) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `encoding` field to an Option value (optional)
     pub fn maybe_encoding(mut self, value: Option<ArticleEncoding<'a>>) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -6884,7 +6887,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleEncodingFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `encodingFormat` field to an Option value (optional)
@@ -6892,7 +6895,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleEncodingFormat<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -6900,12 +6903,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `encodings` field (optional)
     pub fn encodings(mut self, value: impl Into<Option<ArticleEncodings<'a>>>) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `encodings` field to an Option value (optional)
     pub fn maybe_encodings(mut self, value: Option<ArticleEncodings<'a>>) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -6916,7 +6919,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleExampleOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `exampleOfWork` field to an Option value (optional)
@@ -6924,7 +6927,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleExampleOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -6932,12 +6935,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `expires` field (optional)
     pub fn expires(mut self, value: impl Into<Option<ArticleExpires<'a>>>) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `expires` field to an Option value (optional)
     pub fn maybe_expires(mut self, value: Option<ArticleExpires<'a>>) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -6948,12 +6951,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleFileFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `fileFormat` field to an Option value (optional)
     pub fn maybe_file_format(mut self, value: Option<ArticleFileFormat<'a>>) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -6961,12 +6964,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<ArticleFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<ArticleFunder<'a>>) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -6974,12 +6977,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<ArticleFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<ArticleFunding<'a>>) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -6987,12 +6990,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<ArticleGenre<'a>>>) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<ArticleGenre<'a>>) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -7000,12 +7003,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `hasPart` field (optional)
     pub fn has_part(mut self, value: impl Into<Option<ArticleHasPart<'a>>>) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `hasPart` field to an Option value (optional)
     pub fn maybe_has_part(mut self, value: Option<ArticleHasPart<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -7013,12 +7016,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `headline` field (optional)
     pub fn headline(mut self, value: impl Into<Option<ArticleHeadline<'a>>>) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `headline` field to an Option value (optional)
     pub fn maybe_headline(mut self, value: Option<ArticleHeadline<'a>>) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -7029,12 +7032,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleIdentifier<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<ArticleIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -7042,12 +7045,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<ArticleImage<'a>>>) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<ArticleImage<'a>>) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -7058,12 +7061,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleInLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `inLanguage` field to an Option value (optional)
     pub fn maybe_in_language(mut self, value: Option<ArticleInLanguage<'a>>) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -7074,7 +7077,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -7082,7 +7085,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -7093,7 +7096,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleInteractivityType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `interactivityType` field to an Option value (optional)
@@ -7101,7 +7104,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleInteractivityType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -7112,7 +7115,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleInterpretedAsClaim<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `interpretedAsClaim` field to an Option value (optional)
@@ -7120,7 +7123,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleInterpretedAsClaim<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -7131,7 +7134,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleIsAccessibleForFree<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `isAccessibleForFree` field to an Option value (optional)
@@ -7139,7 +7142,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleIsAccessibleForFree<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -7150,12 +7153,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleIsBasedOn<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `isBasedOn` field to an Option value (optional)
     pub fn maybe_is_based_on(mut self, value: Option<ArticleIsBasedOn<'a>>) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -7166,7 +7169,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleIsBasedOnUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `isBasedOnUrl` field to an Option value (optional)
@@ -7174,7 +7177,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleIsBasedOnUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -7185,7 +7188,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleIsFamilyFriendly<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `isFamilyFriendly` field to an Option value (optional)
@@ -7193,7 +7196,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleIsFamilyFriendly<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -7201,12 +7204,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `isPartOf` field (optional)
     pub fn is_part_of(mut self, value: impl Into<Option<ArticleIsPartOf<'a>>>) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `isPartOf` field to an Option value (optional)
     pub fn maybe_is_part_of(mut self, value: Option<ArticleIsPartOf<'a>>) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -7214,12 +7217,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<ArticleKeywords<'a>>>) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<ArticleKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -7230,7 +7233,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleLearningResourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `learningResourceType` field to an Option value (optional)
@@ -7238,7 +7241,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleLearningResourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -7246,12 +7249,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `license` field (optional)
     pub fn license(mut self, value: impl Into<Option<ArticleLicense<'a>>>) -> Self {
-        self.__unsafe_private_named.79 = value.into();
+        self._fields.79 = value.into();
         self
     }
     /// Set the `license` field to an Option value (optional)
     pub fn maybe_license(mut self, value: Option<ArticleLicense<'a>>) -> Self {
-        self.__unsafe_private_named.79 = value;
+        self._fields.79 = value;
         self
     }
 }
@@ -7262,7 +7265,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleLocationCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value.into();
+        self._fields.80 = value.into();
         self
     }
     /// Set the `locationCreated` field to an Option value (optional)
@@ -7270,7 +7273,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleLocationCreated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value;
+        self._fields.80 = value;
         self
     }
 }
@@ -7281,12 +7284,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleMainEntity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.81 = value.into();
+        self._fields.81 = value.into();
         self
     }
     /// Set the `mainEntity` field to an Option value (optional)
     pub fn maybe_main_entity(mut self, value: Option<ArticleMainEntity<'a>>) -> Self {
-        self.__unsafe_private_named.81 = value;
+        self._fields.81 = value;
         self
     }
 }
@@ -7297,7 +7300,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value.into();
+        self._fields.82 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -7305,7 +7308,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value;
+        self._fields.82 = value;
         self
     }
 }
@@ -7316,12 +7319,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleMaintainer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.83 = value.into();
+        self._fields.83 = value.into();
         self
     }
     /// Set the `maintainer` field to an Option value (optional)
     pub fn maybe_maintainer(mut self, value: Option<ArticleMaintainer<'a>>) -> Self {
-        self.__unsafe_private_named.83 = value;
+        self._fields.83 = value;
         self
     }
 }
@@ -7329,12 +7332,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `material` field (optional)
     pub fn material(mut self, value: impl Into<Option<ArticleMaterial<'a>>>) -> Self {
-        self.__unsafe_private_named.84 = value.into();
+        self._fields.84 = value.into();
         self
     }
     /// Set the `material` field to an Option value (optional)
     pub fn maybe_material(mut self, value: Option<ArticleMaterial<'a>>) -> Self {
-        self.__unsafe_private_named.84 = value;
+        self._fields.84 = value;
         self
     }
 }
@@ -7345,7 +7348,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleMaterialExtent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.85 = value.into();
+        self._fields.85 = value.into();
         self
     }
     /// Set the `materialExtent` field to an Option value (optional)
@@ -7353,7 +7356,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleMaterialExtent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.85 = value;
+        self._fields.85 = value;
         self
     }
 }
@@ -7361,12 +7364,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `mentions` field (optional)
     pub fn mentions(mut self, value: impl Into<Option<ArticleMentions<'a>>>) -> Self {
-        self.__unsafe_private_named.86 = value.into();
+        self._fields.86 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<ArticleMentions<'a>>) -> Self {
-        self.__unsafe_private_named.86 = value;
+        self._fields.86 = value;
         self
     }
 }
@@ -7374,12 +7377,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<ArticleName<'a>>>) -> Self {
-        self.__unsafe_private_named.87 = value.into();
+        self._fields.87 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<ArticleName<'a>>) -> Self {
-        self.__unsafe_private_named.87 = value;
+        self._fields.87 = value;
         self
     }
 }
@@ -7387,12 +7390,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `offers` field (optional)
     pub fn offers(mut self, value: impl Into<Option<ArticleOffers<'a>>>) -> Self {
-        self.__unsafe_private_named.88 = value.into();
+        self._fields.88 = value.into();
         self
     }
     /// Set the `offers` field to an Option value (optional)
     pub fn maybe_offers(mut self, value: Option<ArticleOffers<'a>>) -> Self {
-        self.__unsafe_private_named.88 = value;
+        self._fields.88 = value;
         self
     }
 }
@@ -7400,12 +7403,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `pageEnd` field (optional)
     pub fn page_end(mut self, value: impl Into<Option<ArticlePageEnd<'a>>>) -> Self {
-        self.__unsafe_private_named.89 = value.into();
+        self._fields.89 = value.into();
         self
     }
     /// Set the `pageEnd` field to an Option value (optional)
     pub fn maybe_page_end(mut self, value: Option<ArticlePageEnd<'a>>) -> Self {
-        self.__unsafe_private_named.89 = value;
+        self._fields.89 = value;
         self
     }
 }
@@ -7413,12 +7416,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `pageStart` field (optional)
     pub fn page_start(mut self, value: impl Into<Option<ArticlePageStart<'a>>>) -> Self {
-        self.__unsafe_private_named.90 = value.into();
+        self._fields.90 = value.into();
         self
     }
     /// Set the `pageStart` field to an Option value (optional)
     pub fn maybe_page_start(mut self, value: Option<ArticlePageStart<'a>>) -> Self {
-        self.__unsafe_private_named.90 = value;
+        self._fields.90 = value;
         self
     }
 }
@@ -7429,12 +7432,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticlePagination<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.91 = value.into();
+        self._fields.91 = value.into();
         self
     }
     /// Set the `pagination` field to an Option value (optional)
     pub fn maybe_pagination(mut self, value: Option<ArticlePagination<'a>>) -> Self {
-        self.__unsafe_private_named.91 = value;
+        self._fields.91 = value;
         self
     }
 }
@@ -7442,12 +7445,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `pattern` field (optional)
     pub fn pattern(mut self, value: impl Into<Option<ArticlePattern<'a>>>) -> Self {
-        self.__unsafe_private_named.92 = value.into();
+        self._fields.92 = value.into();
         self
     }
     /// Set the `pattern` field to an Option value (optional)
     pub fn maybe_pattern(mut self, value: Option<ArticlePattern<'a>>) -> Self {
-        self.__unsafe_private_named.92 = value;
+        self._fields.92 = value;
         self
     }
 }
@@ -7455,12 +7458,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `position` field (optional)
     pub fn position(mut self, value: impl Into<Option<ArticlePosition<'a>>>) -> Self {
-        self.__unsafe_private_named.93 = value.into();
+        self._fields.93 = value.into();
         self
     }
     /// Set the `position` field to an Option value (optional)
     pub fn maybe_position(mut self, value: Option<ArticlePosition<'a>>) -> Self {
-        self.__unsafe_private_named.93 = value;
+        self._fields.93 = value;
         self
     }
 }
@@ -7471,7 +7474,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticlePotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value.into();
+        self._fields.94 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -7479,7 +7482,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticlePotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value;
+        self._fields.94 = value;
         self
     }
 }
@@ -7487,12 +7490,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `producer` field (optional)
     pub fn producer(mut self, value: impl Into<Option<ArticleProducer<'a>>>) -> Self {
-        self.__unsafe_private_named.95 = value.into();
+        self._fields.95 = value.into();
         self
     }
     /// Set the `producer` field to an Option value (optional)
     pub fn maybe_producer(mut self, value: Option<ArticleProducer<'a>>) -> Self {
-        self.__unsafe_private_named.95 = value;
+        self._fields.95 = value;
         self
     }
 }
@@ -7500,12 +7503,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `provider` field (optional)
     pub fn provider(mut self, value: impl Into<Option<ArticleProvider<'a>>>) -> Self {
-        self.__unsafe_private_named.96 = value.into();
+        self._fields.96 = value.into();
         self
     }
     /// Set the `provider` field to an Option value (optional)
     pub fn maybe_provider(mut self, value: Option<ArticleProvider<'a>>) -> Self {
-        self.__unsafe_private_named.96 = value;
+        self._fields.96 = value;
         self
     }
 }
@@ -7516,12 +7519,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticlePublication<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.97 = value.into();
+        self._fields.97 = value.into();
         self
     }
     /// Set the `publication` field to an Option value (optional)
     pub fn maybe_publication(mut self, value: Option<ArticlePublication<'a>>) -> Self {
-        self.__unsafe_private_named.97 = value;
+        self._fields.97 = value;
         self
     }
 }
@@ -7529,12 +7532,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `publisher` field (optional)
     pub fn publisher(mut self, value: impl Into<Option<ArticlePublisher<'a>>>) -> Self {
-        self.__unsafe_private_named.98 = value.into();
+        self._fields.98 = value.into();
         self
     }
     /// Set the `publisher` field to an Option value (optional)
     pub fn maybe_publisher(mut self, value: Option<ArticlePublisher<'a>>) -> Self {
-        self.__unsafe_private_named.98 = value;
+        self._fields.98 = value;
         self
     }
 }
@@ -7545,7 +7548,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticlePublisherImprint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.99 = value.into();
+        self._fields.99 = value.into();
         self
     }
     /// Set the `publisherImprint` field to an Option value (optional)
@@ -7553,7 +7556,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticlePublisherImprint<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.99 = value;
+        self._fields.99 = value;
         self
     }
 }
@@ -7564,7 +7567,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticlePublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value.into();
+        self._fields.100 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -7572,7 +7575,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticlePublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value;
+        self._fields.100 = value;
         self
     }
 }
@@ -7583,12 +7586,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleRecordedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value.into();
+        self._fields.101 = value.into();
         self
     }
     /// Set the `recordedAt` field to an Option value (optional)
     pub fn maybe_recorded_at(mut self, value: Option<ArticleRecordedAt<'a>>) -> Self {
-        self.__unsafe_private_named.101 = value;
+        self._fields.101 = value;
         self
     }
 }
@@ -7599,7 +7602,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleReleasedEvent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value.into();
+        self._fields.102 = value.into();
         self
     }
     /// Set the `releasedEvent` field to an Option value (optional)
@@ -7607,7 +7610,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleReleasedEvent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value;
+        self._fields.102 = value;
         self
     }
 }
@@ -7615,12 +7618,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<ArticleReview<'a>>>) -> Self {
-        self.__unsafe_private_named.103 = value.into();
+        self._fields.103 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<ArticleReview<'a>>) -> Self {
-        self.__unsafe_private_named.103 = value;
+        self._fields.103 = value;
         self
     }
 }
@@ -7628,12 +7631,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `reviews` field (optional)
     pub fn reviews(mut self, value: impl Into<Option<ArticleReviews<'a>>>) -> Self {
-        self.__unsafe_private_named.104 = value.into();
+        self._fields.104 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<ArticleReviews<'a>>) -> Self {
-        self.__unsafe_private_named.104 = value;
+        self._fields.104 = value;
         self
     }
 }
@@ -7641,12 +7644,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<ArticleSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.105 = value.into();
+        self._fields.105 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<ArticleSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.105 = value;
+        self._fields.105 = value;
         self
     }
 }
@@ -7657,7 +7660,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleSchemaVersion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value.into();
+        self._fields.106 = value.into();
         self
     }
     /// Set the `schemaVersion` field to an Option value (optional)
@@ -7665,7 +7668,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleSchemaVersion<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value;
+        self._fields.106 = value;
         self
     }
 }
@@ -7676,7 +7679,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleSdDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value.into();
+        self._fields.107 = value.into();
         self
     }
     /// Set the `sdDatePublished` field to an Option value (optional)
@@ -7684,7 +7687,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleSdDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value;
+        self._fields.107 = value;
         self
     }
 }
@@ -7692,12 +7695,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `sdLicense` field (optional)
     pub fn sd_license(mut self, value: impl Into<Option<ArticleSdLicense<'a>>>) -> Self {
-        self.__unsafe_private_named.108 = value.into();
+        self._fields.108 = value.into();
         self
     }
     /// Set the `sdLicense` field to an Option value (optional)
     pub fn maybe_sd_license(mut self, value: Option<ArticleSdLicense<'a>>) -> Self {
-        self.__unsafe_private_named.108 = value;
+        self._fields.108 = value;
         self
     }
 }
@@ -7708,12 +7711,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleSdPublisher<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.109 = value.into();
+        self._fields.109 = value.into();
         self
     }
     /// Set the `sdPublisher` field to an Option value (optional)
     pub fn maybe_sd_publisher(mut self, value: Option<ArticleSdPublisher<'a>>) -> Self {
-        self.__unsafe_private_named.109 = value;
+        self._fields.109 = value;
         self
     }
 }
@@ -7721,12 +7724,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<ArticleSize<'a>>>) -> Self {
-        self.__unsafe_private_named.110 = value.into();
+        self._fields.110 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<ArticleSize<'a>>) -> Self {
-        self.__unsafe_private_named.110 = value;
+        self._fields.110 = value;
         self
     }
 }
@@ -7737,7 +7740,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleSourceOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.111 = value.into();
+        self._fields.111 = value.into();
         self
     }
     /// Set the `sourceOrganization` field to an Option value (optional)
@@ -7745,7 +7748,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleSourceOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.111 = value;
+        self._fields.111 = value;
         self
     }
 }
@@ -7753,12 +7756,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `spatial` field (optional)
     pub fn spatial(mut self, value: impl Into<Option<ArticleSpatial<'a>>>) -> Self {
-        self.__unsafe_private_named.112 = value.into();
+        self._fields.112 = value.into();
         self
     }
     /// Set the `spatial` field to an Option value (optional)
     pub fn maybe_spatial(mut self, value: Option<ArticleSpatial<'a>>) -> Self {
-        self.__unsafe_private_named.112 = value;
+        self._fields.112 = value;
         self
     }
 }
@@ -7769,7 +7772,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleSpatialCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value.into();
+        self._fields.113 = value.into();
         self
     }
     /// Set the `spatialCoverage` field to an Option value (optional)
@@ -7777,7 +7780,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleSpatialCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value;
+        self._fields.113 = value;
         self
     }
 }
@@ -7785,12 +7788,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `speakable` field (optional)
     pub fn speakable(mut self, value: impl Into<Option<ArticleSpeakable<'a>>>) -> Self {
-        self.__unsafe_private_named.114 = value.into();
+        self._fields.114 = value.into();
         self
     }
     /// Set the `speakable` field to an Option value (optional)
     pub fn maybe_speakable(mut self, value: Option<ArticleSpeakable<'a>>) -> Self {
-        self.__unsafe_private_named.114 = value;
+        self._fields.114 = value;
         self
     }
 }
@@ -7798,12 +7801,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `sponsor` field (optional)
     pub fn sponsor(mut self, value: impl Into<Option<ArticleSponsor<'a>>>) -> Self {
-        self.__unsafe_private_named.115 = value.into();
+        self._fields.115 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<ArticleSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.115 = value;
+        self._fields.115 = value;
         self
     }
 }
@@ -7811,12 +7814,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `subjectOf` field (optional)
     pub fn subject_of(mut self, value: impl Into<Option<ArticleSubjectOf<'a>>>) -> Self {
-        self.__unsafe_private_named.116 = value.into();
+        self._fields.116 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<ArticleSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.116 = value;
+        self._fields.116 = value;
         self
     }
 }
@@ -7824,12 +7827,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `teaches` field (optional)
     pub fn teaches(mut self, value: impl Into<Option<ArticleTeaches<'a>>>) -> Self {
-        self.__unsafe_private_named.117 = value.into();
+        self._fields.117 = value.into();
         self
     }
     /// Set the `teaches` field to an Option value (optional)
     pub fn maybe_teaches(mut self, value: Option<ArticleTeaches<'a>>) -> Self {
-        self.__unsafe_private_named.117 = value;
+        self._fields.117 = value;
         self
     }
 }
@@ -7837,12 +7840,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `temporal` field (optional)
     pub fn temporal(mut self, value: impl Into<Option<ArticleTemporal<'a>>>) -> Self {
-        self.__unsafe_private_named.118 = value.into();
+        self._fields.118 = value.into();
         self
     }
     /// Set the `temporal` field to an Option value (optional)
     pub fn maybe_temporal(mut self, value: Option<ArticleTemporal<'a>>) -> Self {
-        self.__unsafe_private_named.118 = value;
+        self._fields.118 = value;
         self
     }
 }
@@ -7853,7 +7856,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleTemporalCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.119 = value.into();
+        self._fields.119 = value.into();
         self
     }
     /// Set the `temporalCoverage` field to an Option value (optional)
@@ -7861,7 +7864,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleTemporalCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.119 = value;
+        self._fields.119 = value;
         self
     }
 }
@@ -7869,12 +7872,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<ArticleText<'a>>>) -> Self {
-        self.__unsafe_private_named.120 = value.into();
+        self._fields.120 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<ArticleText<'a>>) -> Self {
-        self.__unsafe_private_named.120 = value;
+        self._fields.120 = value;
         self
     }
 }
@@ -7882,12 +7885,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `thumbnail` field (optional)
     pub fn thumbnail(mut self, value: impl Into<Option<ArticleThumbnail<'a>>>) -> Self {
-        self.__unsafe_private_named.121 = value.into();
+        self._fields.121 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<ArticleThumbnail<'a>>) -> Self {
-        self.__unsafe_private_named.121 = value;
+        self._fields.121 = value;
         self
     }
 }
@@ -7898,7 +7901,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleThumbnailUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.122 = value.into();
+        self._fields.122 = value.into();
         self
     }
     /// Set the `thumbnailUrl` field to an Option value (optional)
@@ -7906,7 +7909,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleThumbnailUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.122 = value;
+        self._fields.122 = value;
         self
     }
 }
@@ -7917,7 +7920,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleTimeRequired<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.123 = value.into();
+        self._fields.123 = value.into();
         self
     }
     /// Set the `timeRequired` field to an Option value (optional)
@@ -7925,7 +7928,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleTimeRequired<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.123 = value;
+        self._fields.123 = value;
         self
     }
 }
@@ -7936,7 +7939,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleTranslationOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.124 = value.into();
+        self._fields.124 = value.into();
         self
     }
     /// Set the `translationOfWork` field to an Option value (optional)
@@ -7944,7 +7947,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleTranslationOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.124 = value;
+        self._fields.124 = value;
         self
     }
 }
@@ -7955,12 +7958,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleTranslator<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.125 = value.into();
+        self._fields.125 = value.into();
         self
     }
     /// Set the `translator` field to an Option value (optional)
     pub fn maybe_translator(mut self, value: Option<ArticleTranslator<'a>>) -> Self {
-        self.__unsafe_private_named.125 = value;
+        self._fields.125 = value;
         self
     }
 }
@@ -7971,7 +7974,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleTypicalAgeRange<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.126 = value.into();
+        self._fields.126 = value.into();
         self
     }
     /// Set the `typicalAgeRange` field to an Option value (optional)
@@ -7979,7 +7982,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleTypicalAgeRange<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.126 = value;
+        self._fields.126 = value;
         self
     }
 }
@@ -7987,12 +7990,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<ArticleUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.127 = value.into();
+        self._fields.127 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<ArticleUrl<'a>>) -> Self {
-        self.__unsafe_private_named.127 = value;
+        self._fields.127 = value;
         self
     }
 }
@@ -8000,12 +8003,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `usageInfo` field (optional)
     pub fn usage_info(mut self, value: impl Into<Option<ArticleUsageInfo<'a>>>) -> Self {
-        self.__unsafe_private_named.128 = value.into();
+        self._fields.128 = value.into();
         self
     }
     /// Set the `usageInfo` field to an Option value (optional)
     pub fn maybe_usage_info(mut self, value: Option<ArticleUsageInfo<'a>>) -> Self {
-        self.__unsafe_private_named.128 = value;
+        self._fields.128 = value;
         self
     }
 }
@@ -8013,12 +8016,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `version` field (optional)
     pub fn version(mut self, value: impl Into<Option<ArticleVersion<'a>>>) -> Self {
-        self.__unsafe_private_named.129 = value.into();
+        self._fields.129 = value.into();
         self
     }
     /// Set the `version` field to an Option value (optional)
     pub fn maybe_version(mut self, value: Option<ArticleVersion<'a>>) -> Self {
-        self.__unsafe_private_named.129 = value;
+        self._fields.129 = value;
         self
     }
 }
@@ -8026,12 +8029,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `video` field (optional)
     pub fn video(mut self, value: impl Into<Option<ArticleVideo<'a>>>) -> Self {
-        self.__unsafe_private_named.130 = value.into();
+        self._fields.130 = value.into();
         self
     }
     /// Set the `video` field to an Option value (optional)
     pub fn maybe_video(mut self, value: Option<ArticleVideo<'a>>) -> Self {
-        self.__unsafe_private_named.130 = value;
+        self._fields.130 = value;
         self
     }
 }
@@ -8039,12 +8042,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
 impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
     /// Set the `wordCount` field (optional)
     pub fn word_count(mut self, value: impl Into<Option<ArticleWordCount<'a>>>) -> Self {
-        self.__unsafe_private_named.131 = value.into();
+        self._fields.131 = value.into();
         self
     }
     /// Set the `wordCount` field to an Option value (optional)
     pub fn maybe_word_count(mut self, value: Option<ArticleWordCount<'a>>) -> Self {
-        self.__unsafe_private_named.131 = value;
+        self._fields.131 = value;
         self
     }
 }
@@ -8055,12 +8058,12 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleWorkExample<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.132 = value.into();
+        self._fields.132 = value.into();
         self
     }
     /// Set the `workExample` field to an Option value (optional)
     pub fn maybe_work_example(mut self, value: Option<ArticleWorkExample<'a>>) -> Self {
-        self.__unsafe_private_named.132 = value;
+        self._fields.132 = value;
         self
     }
 }
@@ -8071,7 +8074,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ArticleWorkTranslation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.133 = value.into();
+        self._fields.133 = value.into();
         self
     }
     /// Set the `workTranslation` field to an Option value (optional)
@@ -8079,7 +8082,7 @@ impl<'a, S: article_state::State> ArticleBuilder<'a, S> {
         mut self,
         value: Option<ArticleWorkTranslation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.133 = value;
+        self._fields.133 = value;
         self
     }
 }
@@ -8091,140 +8094,140 @@ where
     /// Build the final struct
     pub fn build(self) -> Article<'a> {
         Article {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            additional_type: self.__unsafe_private_named.11,
-            aggregate_rating: self.__unsafe_private_named.12,
-            alternate_name: self.__unsafe_private_named.13,
-            alternative_headline: self.__unsafe_private_named.14,
-            archived_at: self.__unsafe_private_named.15,
-            article_body: self.__unsafe_private_named.16,
-            article_section: self.__unsafe_private_named.17,
-            assesses: self.__unsafe_private_named.18,
-            associated_media: self.__unsafe_private_named.19,
-            audience: self.__unsafe_private_named.20,
-            audio: self.__unsafe_private_named.21,
-            author: self.__unsafe_private_named.22,
-            award: self.__unsafe_private_named.23,
-            awards: self.__unsafe_private_named.24,
-            backstory: self.__unsafe_private_named.25,
-            character: self.__unsafe_private_named.26,
-            citation: self.__unsafe_private_named.27,
-            comment: self.__unsafe_private_named.28,
-            comment_count: self.__unsafe_private_named.29,
-            conditions_of_access: self.__unsafe_private_named.30,
-            content_location: self.__unsafe_private_named.31,
-            content_rating: self.__unsafe_private_named.32,
-            content_reference_time: self.__unsafe_private_named.33,
-            contributor: self.__unsafe_private_named.34,
-            copyright_holder: self.__unsafe_private_named.35,
-            copyright_notice: self.__unsafe_private_named.36,
-            copyright_year: self.__unsafe_private_named.37,
-            correction: self.__unsafe_private_named.38,
-            country_of_origin: self.__unsafe_private_named.39,
-            creative_work_status: self.__unsafe_private_named.40,
-            creator: self.__unsafe_private_named.41,
-            credit_text: self.__unsafe_private_named.42,
-            date_created: self.__unsafe_private_named.43,
-            date_modified: self.__unsafe_private_named.44,
-            date_published: self.__unsafe_private_named.45,
-            description: self.__unsafe_private_named.46,
-            digital_source_type: self.__unsafe_private_named.47,
-            disambiguating_description: self.__unsafe_private_named.48,
-            discussion_url: self.__unsafe_private_named.49,
-            edit_eidr: self.__unsafe_private_named.50,
-            editor: self.__unsafe_private_named.51,
-            educational_alignment: self.__unsafe_private_named.52,
-            educational_level: self.__unsafe_private_named.53,
-            educational_use: self.__unsafe_private_named.54,
-            encoding: self.__unsafe_private_named.55,
-            encoding_format: self.__unsafe_private_named.56,
-            encodings: self.__unsafe_private_named.57,
-            example_of_work: self.__unsafe_private_named.58,
-            expires: self.__unsafe_private_named.59,
-            file_format: self.__unsafe_private_named.60,
-            funder: self.__unsafe_private_named.61,
-            funding: self.__unsafe_private_named.62,
-            genre: self.__unsafe_private_named.63,
-            has_part: self.__unsafe_private_named.64,
-            headline: self.__unsafe_private_named.65,
-            identifier: self.__unsafe_private_named.66,
-            image: self.__unsafe_private_named.67,
-            in_language: self.__unsafe_private_named.68,
-            interaction_statistic: self.__unsafe_private_named.69,
-            interactivity_type: self.__unsafe_private_named.70,
-            interpreted_as_claim: self.__unsafe_private_named.71,
-            is_accessible_for_free: self.__unsafe_private_named.72,
-            is_based_on: self.__unsafe_private_named.73,
-            is_based_on_url: self.__unsafe_private_named.74,
-            is_family_friendly: self.__unsafe_private_named.75,
-            is_part_of: self.__unsafe_private_named.76,
-            keywords: self.__unsafe_private_named.77,
-            learning_resource_type: self.__unsafe_private_named.78,
-            license: self.__unsafe_private_named.79,
-            location_created: self.__unsafe_private_named.80,
-            main_entity: self.__unsafe_private_named.81,
-            main_entity_of_page: self.__unsafe_private_named.82,
-            maintainer: self.__unsafe_private_named.83,
-            material: self.__unsafe_private_named.84,
-            material_extent: self.__unsafe_private_named.85,
-            mentions: self.__unsafe_private_named.86,
-            name: self.__unsafe_private_named.87,
-            offers: self.__unsafe_private_named.88,
-            page_end: self.__unsafe_private_named.89,
-            page_start: self.__unsafe_private_named.90,
-            pagination: self.__unsafe_private_named.91,
-            pattern: self.__unsafe_private_named.92,
-            position: self.__unsafe_private_named.93,
-            potential_action: self.__unsafe_private_named.94,
-            producer: self.__unsafe_private_named.95,
-            provider: self.__unsafe_private_named.96,
-            publication: self.__unsafe_private_named.97,
-            publisher: self.__unsafe_private_named.98,
-            publisher_imprint: self.__unsafe_private_named.99,
-            publishing_principles: self.__unsafe_private_named.100,
-            recorded_at: self.__unsafe_private_named.101,
-            released_event: self.__unsafe_private_named.102,
-            review: self.__unsafe_private_named.103,
-            reviews: self.__unsafe_private_named.104,
-            same_as: self.__unsafe_private_named.105,
-            schema_version: self.__unsafe_private_named.106,
-            sd_date_published: self.__unsafe_private_named.107,
-            sd_license: self.__unsafe_private_named.108,
-            sd_publisher: self.__unsafe_private_named.109,
-            size: self.__unsafe_private_named.110,
-            source_organization: self.__unsafe_private_named.111,
-            spatial: self.__unsafe_private_named.112,
-            spatial_coverage: self.__unsafe_private_named.113,
-            speakable: self.__unsafe_private_named.114,
-            sponsor: self.__unsafe_private_named.115,
-            subject_of: self.__unsafe_private_named.116,
-            teaches: self.__unsafe_private_named.117,
-            temporal: self.__unsafe_private_named.118,
-            temporal_coverage: self.__unsafe_private_named.119,
-            text: self.__unsafe_private_named.120,
-            thumbnail: self.__unsafe_private_named.121,
-            thumbnail_url: self.__unsafe_private_named.122,
-            time_required: self.__unsafe_private_named.123,
-            translation_of_work: self.__unsafe_private_named.124,
-            translator: self.__unsafe_private_named.125,
-            typical_age_range: self.__unsafe_private_named.126,
-            url: self.__unsafe_private_named.127,
-            usage_info: self.__unsafe_private_named.128,
-            version: self.__unsafe_private_named.129,
-            video: self.__unsafe_private_named.130,
-            word_count: self.__unsafe_private_named.131,
-            work_example: self.__unsafe_private_named.132,
-            work_translation: self.__unsafe_private_named.133,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            additional_type: self._fields.11,
+            aggregate_rating: self._fields.12,
+            alternate_name: self._fields.13,
+            alternative_headline: self._fields.14,
+            archived_at: self._fields.15,
+            article_body: self._fields.16,
+            article_section: self._fields.17,
+            assesses: self._fields.18,
+            associated_media: self._fields.19,
+            audience: self._fields.20,
+            audio: self._fields.21,
+            author: self._fields.22,
+            award: self._fields.23,
+            awards: self._fields.24,
+            backstory: self._fields.25,
+            character: self._fields.26,
+            citation: self._fields.27,
+            comment: self._fields.28,
+            comment_count: self._fields.29,
+            conditions_of_access: self._fields.30,
+            content_location: self._fields.31,
+            content_rating: self._fields.32,
+            content_reference_time: self._fields.33,
+            contributor: self._fields.34,
+            copyright_holder: self._fields.35,
+            copyright_notice: self._fields.36,
+            copyright_year: self._fields.37,
+            correction: self._fields.38,
+            country_of_origin: self._fields.39,
+            creative_work_status: self._fields.40,
+            creator: self._fields.41,
+            credit_text: self._fields.42,
+            date_created: self._fields.43,
+            date_modified: self._fields.44,
+            date_published: self._fields.45,
+            description: self._fields.46,
+            digital_source_type: self._fields.47,
+            disambiguating_description: self._fields.48,
+            discussion_url: self._fields.49,
+            edit_eidr: self._fields.50,
+            editor: self._fields.51,
+            educational_alignment: self._fields.52,
+            educational_level: self._fields.53,
+            educational_use: self._fields.54,
+            encoding: self._fields.55,
+            encoding_format: self._fields.56,
+            encodings: self._fields.57,
+            example_of_work: self._fields.58,
+            expires: self._fields.59,
+            file_format: self._fields.60,
+            funder: self._fields.61,
+            funding: self._fields.62,
+            genre: self._fields.63,
+            has_part: self._fields.64,
+            headline: self._fields.65,
+            identifier: self._fields.66,
+            image: self._fields.67,
+            in_language: self._fields.68,
+            interaction_statistic: self._fields.69,
+            interactivity_type: self._fields.70,
+            interpreted_as_claim: self._fields.71,
+            is_accessible_for_free: self._fields.72,
+            is_based_on: self._fields.73,
+            is_based_on_url: self._fields.74,
+            is_family_friendly: self._fields.75,
+            is_part_of: self._fields.76,
+            keywords: self._fields.77,
+            learning_resource_type: self._fields.78,
+            license: self._fields.79,
+            location_created: self._fields.80,
+            main_entity: self._fields.81,
+            main_entity_of_page: self._fields.82,
+            maintainer: self._fields.83,
+            material: self._fields.84,
+            material_extent: self._fields.85,
+            mentions: self._fields.86,
+            name: self._fields.87,
+            offers: self._fields.88,
+            page_end: self._fields.89,
+            page_start: self._fields.90,
+            pagination: self._fields.91,
+            pattern: self._fields.92,
+            position: self._fields.93,
+            potential_action: self._fields.94,
+            producer: self._fields.95,
+            provider: self._fields.96,
+            publication: self._fields.97,
+            publisher: self._fields.98,
+            publisher_imprint: self._fields.99,
+            publishing_principles: self._fields.100,
+            recorded_at: self._fields.101,
+            released_event: self._fields.102,
+            review: self._fields.103,
+            reviews: self._fields.104,
+            same_as: self._fields.105,
+            schema_version: self._fields.106,
+            sd_date_published: self._fields.107,
+            sd_license: self._fields.108,
+            sd_publisher: self._fields.109,
+            size: self._fields.110,
+            source_organization: self._fields.111,
+            spatial: self._fields.112,
+            spatial_coverage: self._fields.113,
+            speakable: self._fields.114,
+            sponsor: self._fields.115,
+            subject_of: self._fields.116,
+            teaches: self._fields.117,
+            temporal: self._fields.118,
+            temporal_coverage: self._fields.119,
+            text: self._fields.120,
+            thumbnail: self._fields.121,
+            thumbnail_url: self._fields.122,
+            time_required: self._fields.123,
+            translation_of_work: self._fields.124,
+            translator: self._fields.125,
+            typical_age_range: self._fields.126,
+            url: self._fields.127,
+            usage_info: self._fields.128,
+            version: self._fields.129,
+            video: self._fields.130,
+            word_count: self._fields.131,
+            work_example: self._fields.132,
+            work_translation: self._fields.133,
             extra_data: Default::default(),
         }
     }
@@ -8234,140 +8237,140 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Article<'a> {
         Article {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            additional_type: self.__unsafe_private_named.11,
-            aggregate_rating: self.__unsafe_private_named.12,
-            alternate_name: self.__unsafe_private_named.13,
-            alternative_headline: self.__unsafe_private_named.14,
-            archived_at: self.__unsafe_private_named.15,
-            article_body: self.__unsafe_private_named.16,
-            article_section: self.__unsafe_private_named.17,
-            assesses: self.__unsafe_private_named.18,
-            associated_media: self.__unsafe_private_named.19,
-            audience: self.__unsafe_private_named.20,
-            audio: self.__unsafe_private_named.21,
-            author: self.__unsafe_private_named.22,
-            award: self.__unsafe_private_named.23,
-            awards: self.__unsafe_private_named.24,
-            backstory: self.__unsafe_private_named.25,
-            character: self.__unsafe_private_named.26,
-            citation: self.__unsafe_private_named.27,
-            comment: self.__unsafe_private_named.28,
-            comment_count: self.__unsafe_private_named.29,
-            conditions_of_access: self.__unsafe_private_named.30,
-            content_location: self.__unsafe_private_named.31,
-            content_rating: self.__unsafe_private_named.32,
-            content_reference_time: self.__unsafe_private_named.33,
-            contributor: self.__unsafe_private_named.34,
-            copyright_holder: self.__unsafe_private_named.35,
-            copyright_notice: self.__unsafe_private_named.36,
-            copyright_year: self.__unsafe_private_named.37,
-            correction: self.__unsafe_private_named.38,
-            country_of_origin: self.__unsafe_private_named.39,
-            creative_work_status: self.__unsafe_private_named.40,
-            creator: self.__unsafe_private_named.41,
-            credit_text: self.__unsafe_private_named.42,
-            date_created: self.__unsafe_private_named.43,
-            date_modified: self.__unsafe_private_named.44,
-            date_published: self.__unsafe_private_named.45,
-            description: self.__unsafe_private_named.46,
-            digital_source_type: self.__unsafe_private_named.47,
-            disambiguating_description: self.__unsafe_private_named.48,
-            discussion_url: self.__unsafe_private_named.49,
-            edit_eidr: self.__unsafe_private_named.50,
-            editor: self.__unsafe_private_named.51,
-            educational_alignment: self.__unsafe_private_named.52,
-            educational_level: self.__unsafe_private_named.53,
-            educational_use: self.__unsafe_private_named.54,
-            encoding: self.__unsafe_private_named.55,
-            encoding_format: self.__unsafe_private_named.56,
-            encodings: self.__unsafe_private_named.57,
-            example_of_work: self.__unsafe_private_named.58,
-            expires: self.__unsafe_private_named.59,
-            file_format: self.__unsafe_private_named.60,
-            funder: self.__unsafe_private_named.61,
-            funding: self.__unsafe_private_named.62,
-            genre: self.__unsafe_private_named.63,
-            has_part: self.__unsafe_private_named.64,
-            headline: self.__unsafe_private_named.65,
-            identifier: self.__unsafe_private_named.66,
-            image: self.__unsafe_private_named.67,
-            in_language: self.__unsafe_private_named.68,
-            interaction_statistic: self.__unsafe_private_named.69,
-            interactivity_type: self.__unsafe_private_named.70,
-            interpreted_as_claim: self.__unsafe_private_named.71,
-            is_accessible_for_free: self.__unsafe_private_named.72,
-            is_based_on: self.__unsafe_private_named.73,
-            is_based_on_url: self.__unsafe_private_named.74,
-            is_family_friendly: self.__unsafe_private_named.75,
-            is_part_of: self.__unsafe_private_named.76,
-            keywords: self.__unsafe_private_named.77,
-            learning_resource_type: self.__unsafe_private_named.78,
-            license: self.__unsafe_private_named.79,
-            location_created: self.__unsafe_private_named.80,
-            main_entity: self.__unsafe_private_named.81,
-            main_entity_of_page: self.__unsafe_private_named.82,
-            maintainer: self.__unsafe_private_named.83,
-            material: self.__unsafe_private_named.84,
-            material_extent: self.__unsafe_private_named.85,
-            mentions: self.__unsafe_private_named.86,
-            name: self.__unsafe_private_named.87,
-            offers: self.__unsafe_private_named.88,
-            page_end: self.__unsafe_private_named.89,
-            page_start: self.__unsafe_private_named.90,
-            pagination: self.__unsafe_private_named.91,
-            pattern: self.__unsafe_private_named.92,
-            position: self.__unsafe_private_named.93,
-            potential_action: self.__unsafe_private_named.94,
-            producer: self.__unsafe_private_named.95,
-            provider: self.__unsafe_private_named.96,
-            publication: self.__unsafe_private_named.97,
-            publisher: self.__unsafe_private_named.98,
-            publisher_imprint: self.__unsafe_private_named.99,
-            publishing_principles: self.__unsafe_private_named.100,
-            recorded_at: self.__unsafe_private_named.101,
-            released_event: self.__unsafe_private_named.102,
-            review: self.__unsafe_private_named.103,
-            reviews: self.__unsafe_private_named.104,
-            same_as: self.__unsafe_private_named.105,
-            schema_version: self.__unsafe_private_named.106,
-            sd_date_published: self.__unsafe_private_named.107,
-            sd_license: self.__unsafe_private_named.108,
-            sd_publisher: self.__unsafe_private_named.109,
-            size: self.__unsafe_private_named.110,
-            source_organization: self.__unsafe_private_named.111,
-            spatial: self.__unsafe_private_named.112,
-            spatial_coverage: self.__unsafe_private_named.113,
-            speakable: self.__unsafe_private_named.114,
-            sponsor: self.__unsafe_private_named.115,
-            subject_of: self.__unsafe_private_named.116,
-            teaches: self.__unsafe_private_named.117,
-            temporal: self.__unsafe_private_named.118,
-            temporal_coverage: self.__unsafe_private_named.119,
-            text: self.__unsafe_private_named.120,
-            thumbnail: self.__unsafe_private_named.121,
-            thumbnail_url: self.__unsafe_private_named.122,
-            time_required: self.__unsafe_private_named.123,
-            translation_of_work: self.__unsafe_private_named.124,
-            translator: self.__unsafe_private_named.125,
-            typical_age_range: self.__unsafe_private_named.126,
-            url: self.__unsafe_private_named.127,
-            usage_info: self.__unsafe_private_named.128,
-            version: self.__unsafe_private_named.129,
-            video: self.__unsafe_private_named.130,
-            word_count: self.__unsafe_private_named.131,
-            work_example: self.__unsafe_private_named.132,
-            work_translation: self.__unsafe_private_named.133,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            additional_type: self._fields.11,
+            aggregate_rating: self._fields.12,
+            alternate_name: self._fields.13,
+            alternative_headline: self._fields.14,
+            archived_at: self._fields.15,
+            article_body: self._fields.16,
+            article_section: self._fields.17,
+            assesses: self._fields.18,
+            associated_media: self._fields.19,
+            audience: self._fields.20,
+            audio: self._fields.21,
+            author: self._fields.22,
+            award: self._fields.23,
+            awards: self._fields.24,
+            backstory: self._fields.25,
+            character: self._fields.26,
+            citation: self._fields.27,
+            comment: self._fields.28,
+            comment_count: self._fields.29,
+            conditions_of_access: self._fields.30,
+            content_location: self._fields.31,
+            content_rating: self._fields.32,
+            content_reference_time: self._fields.33,
+            contributor: self._fields.34,
+            copyright_holder: self._fields.35,
+            copyright_notice: self._fields.36,
+            copyright_year: self._fields.37,
+            correction: self._fields.38,
+            country_of_origin: self._fields.39,
+            creative_work_status: self._fields.40,
+            creator: self._fields.41,
+            credit_text: self._fields.42,
+            date_created: self._fields.43,
+            date_modified: self._fields.44,
+            date_published: self._fields.45,
+            description: self._fields.46,
+            digital_source_type: self._fields.47,
+            disambiguating_description: self._fields.48,
+            discussion_url: self._fields.49,
+            edit_eidr: self._fields.50,
+            editor: self._fields.51,
+            educational_alignment: self._fields.52,
+            educational_level: self._fields.53,
+            educational_use: self._fields.54,
+            encoding: self._fields.55,
+            encoding_format: self._fields.56,
+            encodings: self._fields.57,
+            example_of_work: self._fields.58,
+            expires: self._fields.59,
+            file_format: self._fields.60,
+            funder: self._fields.61,
+            funding: self._fields.62,
+            genre: self._fields.63,
+            has_part: self._fields.64,
+            headline: self._fields.65,
+            identifier: self._fields.66,
+            image: self._fields.67,
+            in_language: self._fields.68,
+            interaction_statistic: self._fields.69,
+            interactivity_type: self._fields.70,
+            interpreted_as_claim: self._fields.71,
+            is_accessible_for_free: self._fields.72,
+            is_based_on: self._fields.73,
+            is_based_on_url: self._fields.74,
+            is_family_friendly: self._fields.75,
+            is_part_of: self._fields.76,
+            keywords: self._fields.77,
+            learning_resource_type: self._fields.78,
+            license: self._fields.79,
+            location_created: self._fields.80,
+            main_entity: self._fields.81,
+            main_entity_of_page: self._fields.82,
+            maintainer: self._fields.83,
+            material: self._fields.84,
+            material_extent: self._fields.85,
+            mentions: self._fields.86,
+            name: self._fields.87,
+            offers: self._fields.88,
+            page_end: self._fields.89,
+            page_start: self._fields.90,
+            pagination: self._fields.91,
+            pattern: self._fields.92,
+            position: self._fields.93,
+            potential_action: self._fields.94,
+            producer: self._fields.95,
+            provider: self._fields.96,
+            publication: self._fields.97,
+            publisher: self._fields.98,
+            publisher_imprint: self._fields.99,
+            publishing_principles: self._fields.100,
+            recorded_at: self._fields.101,
+            released_event: self._fields.102,
+            review: self._fields.103,
+            reviews: self._fields.104,
+            same_as: self._fields.105,
+            schema_version: self._fields.106,
+            sd_date_published: self._fields.107,
+            sd_license: self._fields.108,
+            sd_publisher: self._fields.109,
+            size: self._fields.110,
+            source_organization: self._fields.111,
+            spatial: self._fields.112,
+            spatial_coverage: self._fields.113,
+            speakable: self._fields.114,
+            sponsor: self._fields.115,
+            subject_of: self._fields.116,
+            teaches: self._fields.117,
+            temporal: self._fields.118,
+            temporal_coverage: self._fields.119,
+            text: self._fields.120,
+            thumbnail: self._fields.121,
+            thumbnail_url: self._fields.122,
+            time_required: self._fields.123,
+            translation_of_work: self._fields.124,
+            translator: self._fields.125,
+            typical_age_range: self._fields.126,
+            url: self._fields.127,
+            usage_info: self._fields.128,
+            version: self._fields.129,
+            video: self._fields.130,
+            word_count: self._fields.131,
+            work_example: self._fields.132,
+            work_translation: self._fields.133,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/book.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/book.rs
index 5f41bd5d..35c17fb9 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/book.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/book.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -5601,8 +5604,8 @@ pub mod book_state {
 
 /// Builder for constructing an instance of this type
 pub struct BookBuilder<'a, S: book_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BookAbout<'a>>,
         Option<BookAbridged<'a>>,
         Option<BookAbstract<'a>>,
@@ -5737,7 +5740,7 @@ pub struct BookBuilder<'a, S: book_state::State> {
         Option<BookWorkExample<'a>>,
         Option<BookWorkTranslation<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Book<'a> {
@@ -5751,8 +5754,8 @@ impl<'a> BookBuilder<'a, book_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BookBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -5887,7 +5890,7 @@ impl<'a> BookBuilder<'a, book_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5895,12 +5898,12 @@ impl<'a> BookBuilder<'a, book_state::Empty> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `about` field (optional)
     pub fn about(mut self, value: impl Into<Option<BookAbout<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `about` field to an Option value (optional)
     pub fn maybe_about(mut self, value: Option<BookAbout<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -5908,12 +5911,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `abridged` field (optional)
     pub fn abridged(mut self, value: impl Into<Option<BookAbridged<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `abridged` field to an Option value (optional)
     pub fn maybe_abridged(mut self, value: Option<BookAbridged<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -5921,12 +5924,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `abstract` field (optional)
     pub fn r#abstract(mut self, value: impl Into<Option<BookAbstract<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `abstract` field to an Option value (optional)
     pub fn maybe_abstract(mut self, value: Option<BookAbstract<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -5934,12 +5937,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `accessMode` field (optional)
     pub fn access_mode(mut self, value: impl Into<Option<BookAccessMode<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `accessMode` field to an Option value (optional)
     pub fn maybe_access_mode(mut self, value: Option<BookAccessMode<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -5950,7 +5953,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookAccessModeSufficient<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `accessModeSufficient` field to an Option value (optional)
@@ -5958,7 +5961,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookAccessModeSufficient<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -5969,7 +5972,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookAccessibilityApi<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `accessibilityAPI` field to an Option value (optional)
@@ -5977,7 +5980,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookAccessibilityApi<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -5988,7 +5991,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookAccessibilityControl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `accessibilityControl` field to an Option value (optional)
@@ -5996,7 +5999,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookAccessibilityControl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -6007,7 +6010,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookAccessibilityFeature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `accessibilityFeature` field to an Option value (optional)
@@ -6015,7 +6018,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookAccessibilityFeature<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -6026,7 +6029,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookAccessibilityHazard<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `accessibilityHazard` field to an Option value (optional)
@@ -6034,7 +6037,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookAccessibilityHazard<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -6045,7 +6048,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookAccessibilitySummary<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `accessibilitySummary` field to an Option value (optional)
@@ -6053,7 +6056,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookAccessibilitySummary<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -6064,7 +6067,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookAccountablePerson<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `accountablePerson` field to an Option value (optional)
@@ -6072,7 +6075,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookAccountablePerson<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -6083,7 +6086,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookAcquireLicensePage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `acquireLicensePage` field to an Option value (optional)
@@ -6091,7 +6094,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookAcquireLicensePage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -6102,7 +6105,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -6110,7 +6113,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -6121,7 +6124,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -6129,7 +6132,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -6140,12 +6143,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
     pub fn maybe_alternate_name(mut self, value: Option<BookAlternateName<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -6156,7 +6159,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookAlternativeHeadline<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `alternativeHeadline` field to an Option value (optional)
@@ -6164,7 +6167,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookAlternativeHeadline<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -6172,12 +6175,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `archivedAt` field (optional)
     pub fn archived_at(mut self, value: impl Into<Option<BookArchivedAt<'a>>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `archivedAt` field to an Option value (optional)
     pub fn maybe_archived_at(mut self, value: Option<BookArchivedAt<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -6185,12 +6188,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `assesses` field (optional)
     pub fn assesses(mut self, value: impl Into<Option<BookAssesses<'a>>>) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `assesses` field to an Option value (optional)
     pub fn maybe_assesses(mut self, value: Option<BookAssesses<'a>>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -6201,7 +6204,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookAssociatedMedia<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `associatedMedia` field to an Option value (optional)
@@ -6209,7 +6212,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookAssociatedMedia<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -6217,12 +6220,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `audience` field (optional)
     pub fn audience(mut self, value: impl Into<Option<BookAudience<'a>>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `audience` field to an Option value (optional)
     pub fn maybe_audience(mut self, value: Option<BookAudience<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -6230,12 +6233,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `audio` field (optional)
     pub fn audio(mut self, value: impl Into<Option<BookAudio<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `audio` field to an Option value (optional)
     pub fn maybe_audio(mut self, value: Option<BookAudio<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -6243,12 +6246,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<BookAuthor<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<BookAuthor<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -6256,12 +6259,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<BookAward<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<BookAward<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -6269,12 +6272,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<BookAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<BookAwards<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -6285,12 +6288,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookBookEdition<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `bookEdition` field to an Option value (optional)
     pub fn maybe_book_edition(mut self, value: Option<BookBookEdition<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -6298,12 +6301,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `bookFormat` field (optional)
     pub fn book_format(mut self, value: impl Into<Option<BookBookFormat<'a>>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `bookFormat` field to an Option value (optional)
     pub fn maybe_book_format(mut self, value: Option<BookBookFormat<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -6311,12 +6314,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `character` field (optional)
     pub fn character(mut self, value: impl Into<Option<BookCharacter<'a>>>) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `character` field to an Option value (optional)
     pub fn maybe_character(mut self, value: Option<BookCharacter<'a>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -6324,12 +6327,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `citation` field (optional)
     pub fn citation(mut self, value: impl Into<Option<BookCitation<'a>>>) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `citation` field to an Option value (optional)
     pub fn maybe_citation(mut self, value: Option<BookCitation<'a>>) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -6337,12 +6340,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<BookComment<'a>>>) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<BookComment<'a>>) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -6353,12 +6356,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookCommentCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `commentCount` field to an Option value (optional)
     pub fn maybe_comment_count(mut self, value: Option<BookCommentCount<'a>>) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -6369,7 +6372,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookConditionsOfAccess<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `conditionsOfAccess` field to an Option value (optional)
@@ -6377,7 +6380,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookConditionsOfAccess<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -6388,7 +6391,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookContentLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `contentLocation` field to an Option value (optional)
@@ -6396,7 +6399,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookContentLocation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -6407,12 +6410,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookContentRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `contentRating` field to an Option value (optional)
     pub fn maybe_content_rating(mut self, value: Option<BookContentRating<'a>>) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -6423,7 +6426,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookContentReferenceTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `contentReferenceTime` field to an Option value (optional)
@@ -6431,7 +6434,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookContentReferenceTime<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -6439,12 +6442,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `contributor` field (optional)
     pub fn contributor(mut self, value: impl Into<Option<BookContributor<'a>>>) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `contributor` field to an Option value (optional)
     pub fn maybe_contributor(mut self, value: Option<BookContributor<'a>>) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -6455,7 +6458,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookCopyrightHolder<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `copyrightHolder` field to an Option value (optional)
@@ -6463,7 +6466,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookCopyrightHolder<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -6474,7 +6477,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookCopyrightNotice<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `copyrightNotice` field to an Option value (optional)
@@ -6482,7 +6485,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookCopyrightNotice<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -6493,12 +6496,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookCopyrightYear<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `copyrightYear` field to an Option value (optional)
     pub fn maybe_copyright_year(mut self, value: Option<BookCopyrightYear<'a>>) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -6506,12 +6509,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `correction` field (optional)
     pub fn correction(mut self, value: impl Into<Option<BookCorrection<'a>>>) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `correction` field to an Option value (optional)
     pub fn maybe_correction(mut self, value: Option<BookCorrection<'a>>) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -6522,7 +6525,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookCountryOfOrigin<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `countryOfOrigin` field to an Option value (optional)
@@ -6530,7 +6533,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookCountryOfOrigin<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -6541,7 +6544,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookCreativeWorkStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `creativeWorkStatus` field to an Option value (optional)
@@ -6549,7 +6552,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookCreativeWorkStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -6557,12 +6560,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `creator` field (optional)
     pub fn creator(mut self, value: impl Into<Option<BookCreator<'a>>>) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `creator` field to an Option value (optional)
     pub fn maybe_creator(mut self, value: Option<BookCreator<'a>>) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -6570,12 +6573,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `creditText` field (optional)
     pub fn credit_text(mut self, value: impl Into<Option<BookCreditText<'a>>>) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `creditText` field to an Option value (optional)
     pub fn maybe_credit_text(mut self, value: Option<BookCreditText<'a>>) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -6586,12 +6589,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookDateCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `dateCreated` field to an Option value (optional)
     pub fn maybe_date_created(mut self, value: Option<BookDateCreated<'a>>) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -6602,12 +6605,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookDateModified<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `dateModified` field to an Option value (optional)
     pub fn maybe_date_modified(mut self, value: Option<BookDateModified<'a>>) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -6618,12 +6621,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `datePublished` field to an Option value (optional)
     pub fn maybe_date_published(mut self, value: Option<BookDatePublished<'a>>) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -6631,12 +6634,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<BookDescription<'a>>>) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<BookDescription<'a>>) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -6647,7 +6650,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookDigitalSourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `digitalSourceType` field to an Option value (optional)
@@ -6655,7 +6658,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookDigitalSourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -6666,7 +6669,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -6674,7 +6677,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -6685,12 +6688,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookDiscussionUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `discussionUrl` field to an Option value (optional)
     pub fn maybe_discussion_url(mut self, value: Option<BookDiscussionUrl<'a>>) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -6698,12 +6701,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `editEIDR` field (optional)
     pub fn edit_eidr(mut self, value: impl Into<Option<BookEditEidr<'a>>>) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `editEIDR` field to an Option value (optional)
     pub fn maybe_edit_eidr(mut self, value: Option<BookEditEidr<'a>>) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -6711,12 +6714,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `editor` field (optional)
     pub fn editor(mut self, value: impl Into<Option<BookEditor<'a>>>) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `editor` field to an Option value (optional)
     pub fn maybe_editor(mut self, value: Option<BookEditor<'a>>) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -6727,7 +6730,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookEducationalAlignment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `educationalAlignment` field to an Option value (optional)
@@ -6735,7 +6738,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookEducationalAlignment<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -6746,7 +6749,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookEducationalLevel<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `educationalLevel` field to an Option value (optional)
@@ -6754,7 +6757,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookEducationalLevel<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -6765,7 +6768,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookEducationalUse<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `educationalUse` field to an Option value (optional)
@@ -6773,7 +6776,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookEducationalUse<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -6781,12 +6784,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `encoding` field (optional)
     pub fn encoding(mut self, value: impl Into<Option<BookEncoding<'a>>>) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `encoding` field to an Option value (optional)
     pub fn maybe_encoding(mut self, value: Option<BookEncoding<'a>>) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -6797,7 +6800,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookEncodingFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `encodingFormat` field to an Option value (optional)
@@ -6805,7 +6808,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookEncodingFormat<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -6813,12 +6816,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `encodings` field (optional)
     pub fn encodings(mut self, value: impl Into<Option<BookEncodings<'a>>>) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `encodings` field to an Option value (optional)
     pub fn maybe_encodings(mut self, value: Option<BookEncodings<'a>>) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -6829,7 +6832,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookExampleOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `exampleOfWork` field to an Option value (optional)
@@ -6837,7 +6840,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookExampleOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -6845,12 +6848,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `expires` field (optional)
     pub fn expires(mut self, value: impl Into<Option<BookExpires<'a>>>) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `expires` field to an Option value (optional)
     pub fn maybe_expires(mut self, value: Option<BookExpires<'a>>) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -6858,12 +6861,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `fileFormat` field (optional)
     pub fn file_format(mut self, value: impl Into<Option<BookFileFormat<'a>>>) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `fileFormat` field to an Option value (optional)
     pub fn maybe_file_format(mut self, value: Option<BookFileFormat<'a>>) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -6871,12 +6874,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<BookFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<BookFunder<'a>>) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -6884,12 +6887,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<BookFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<BookFunding<'a>>) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -6897,12 +6900,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<BookGenre<'a>>>) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<BookGenre<'a>>) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -6910,12 +6913,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `hasPart` field (optional)
     pub fn has_part(mut self, value: impl Into<Option<BookHasPart<'a>>>) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `hasPart` field to an Option value (optional)
     pub fn maybe_has_part(mut self, value: Option<BookHasPart<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -6923,12 +6926,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `headline` field (optional)
     pub fn headline(mut self, value: impl Into<Option<BookHeadline<'a>>>) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `headline` field to an Option value (optional)
     pub fn maybe_headline(mut self, value: Option<BookHeadline<'a>>) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -6936,12 +6939,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `identifier` field (optional)
     pub fn identifier(mut self, value: impl Into<Option<BookIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<BookIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -6949,12 +6952,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `illustrator` field (optional)
     pub fn illustrator(mut self, value: impl Into<Option<BookIllustrator<'a>>>) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `illustrator` field to an Option value (optional)
     pub fn maybe_illustrator(mut self, value: Option<BookIllustrator<'a>>) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -6962,12 +6965,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<BookImage<'a>>>) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<BookImage<'a>>) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -6975,12 +6978,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `inLanguage` field (optional)
     pub fn in_language(mut self, value: impl Into<Option<BookInLanguage<'a>>>) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `inLanguage` field to an Option value (optional)
     pub fn maybe_in_language(mut self, value: Option<BookInLanguage<'a>>) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -6991,7 +6994,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -6999,7 +7002,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -7010,7 +7013,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookInteractivityType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `interactivityType` field to an Option value (optional)
@@ -7018,7 +7021,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookInteractivityType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -7029,7 +7032,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookInterpretedAsClaim<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `interpretedAsClaim` field to an Option value (optional)
@@ -7037,7 +7040,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookInterpretedAsClaim<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -7048,7 +7051,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookIsAccessibleForFree<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `isAccessibleForFree` field to an Option value (optional)
@@ -7056,7 +7059,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookIsAccessibleForFree<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -7064,12 +7067,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `isBasedOn` field (optional)
     pub fn is_based_on(mut self, value: impl Into<Option<BookIsBasedOn<'a>>>) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `isBasedOn` field to an Option value (optional)
     pub fn maybe_is_based_on(mut self, value: Option<BookIsBasedOn<'a>>) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -7080,12 +7083,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookIsBasedOnUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `isBasedOnUrl` field to an Option value (optional)
     pub fn maybe_is_based_on_url(mut self, value: Option<BookIsBasedOnUrl<'a>>) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -7096,7 +7099,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookIsFamilyFriendly<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `isFamilyFriendly` field to an Option value (optional)
@@ -7104,7 +7107,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookIsFamilyFriendly<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -7112,12 +7115,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `isPartOf` field (optional)
     pub fn is_part_of(mut self, value: impl Into<Option<BookIsPartOf<'a>>>) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `isPartOf` field to an Option value (optional)
     pub fn maybe_is_part_of(mut self, value: Option<BookIsPartOf<'a>>) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -7125,12 +7128,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `isbn` field (optional)
     pub fn isbn(mut self, value: impl Into<Option<BookIsbn<'a>>>) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `isbn` field to an Option value (optional)
     pub fn maybe_isbn(mut self, value: Option<BookIsbn<'a>>) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -7138,12 +7141,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<BookKeywords<'a>>>) -> Self {
-        self.__unsafe_private_named.79 = value.into();
+        self._fields.79 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<BookKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.79 = value;
+        self._fields.79 = value;
         self
     }
 }
@@ -7154,7 +7157,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookLearningResourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value.into();
+        self._fields.80 = value.into();
         self
     }
     /// Set the `learningResourceType` field to an Option value (optional)
@@ -7162,7 +7165,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookLearningResourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value;
+        self._fields.80 = value;
         self
     }
 }
@@ -7170,12 +7173,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `license` field (optional)
     pub fn license(mut self, value: impl Into<Option<BookLicense<'a>>>) -> Self {
-        self.__unsafe_private_named.81 = value.into();
+        self._fields.81 = value.into();
         self
     }
     /// Set the `license` field to an Option value (optional)
     pub fn maybe_license(mut self, value: Option<BookLicense<'a>>) -> Self {
-        self.__unsafe_private_named.81 = value;
+        self._fields.81 = value;
         self
     }
 }
@@ -7186,7 +7189,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookLocationCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value.into();
+        self._fields.82 = value.into();
         self
     }
     /// Set the `locationCreated` field to an Option value (optional)
@@ -7194,7 +7197,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookLocationCreated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value;
+        self._fields.82 = value;
         self
     }
 }
@@ -7202,12 +7205,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `mainEntity` field (optional)
     pub fn main_entity(mut self, value: impl Into<Option<BookMainEntity<'a>>>) -> Self {
-        self.__unsafe_private_named.83 = value.into();
+        self._fields.83 = value.into();
         self
     }
     /// Set the `mainEntity` field to an Option value (optional)
     pub fn maybe_main_entity(mut self, value: Option<BookMainEntity<'a>>) -> Self {
-        self.__unsafe_private_named.83 = value;
+        self._fields.83 = value;
         self
     }
 }
@@ -7218,7 +7221,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value.into();
+        self._fields.84 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -7226,7 +7229,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value;
+        self._fields.84 = value;
         self
     }
 }
@@ -7234,12 +7237,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `maintainer` field (optional)
     pub fn maintainer(mut self, value: impl Into<Option<BookMaintainer<'a>>>) -> Self {
-        self.__unsafe_private_named.85 = value.into();
+        self._fields.85 = value.into();
         self
     }
     /// Set the `maintainer` field to an Option value (optional)
     pub fn maybe_maintainer(mut self, value: Option<BookMaintainer<'a>>) -> Self {
-        self.__unsafe_private_named.85 = value;
+        self._fields.85 = value;
         self
     }
 }
@@ -7247,12 +7250,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `material` field (optional)
     pub fn material(mut self, value: impl Into<Option<BookMaterial<'a>>>) -> Self {
-        self.__unsafe_private_named.86 = value.into();
+        self._fields.86 = value.into();
         self
     }
     /// Set the `material` field to an Option value (optional)
     pub fn maybe_material(mut self, value: Option<BookMaterial<'a>>) -> Self {
-        self.__unsafe_private_named.86 = value;
+        self._fields.86 = value;
         self
     }
 }
@@ -7263,7 +7266,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookMaterialExtent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.87 = value.into();
+        self._fields.87 = value.into();
         self
     }
     /// Set the `materialExtent` field to an Option value (optional)
@@ -7271,7 +7274,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookMaterialExtent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.87 = value;
+        self._fields.87 = value;
         self
     }
 }
@@ -7279,12 +7282,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `mentions` field (optional)
     pub fn mentions(mut self, value: impl Into<Option<BookMentions<'a>>>) -> Self {
-        self.__unsafe_private_named.88 = value.into();
+        self._fields.88 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<BookMentions<'a>>) -> Self {
-        self.__unsafe_private_named.88 = value;
+        self._fields.88 = value;
         self
     }
 }
@@ -7292,12 +7295,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<BookName<'a>>>) -> Self {
-        self.__unsafe_private_named.89 = value.into();
+        self._fields.89 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<BookName<'a>>) -> Self {
-        self.__unsafe_private_named.89 = value;
+        self._fields.89 = value;
         self
     }
 }
@@ -7308,7 +7311,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookNumberOfPages<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.90 = value.into();
+        self._fields.90 = value.into();
         self
     }
     /// Set the `numberOfPages` field to an Option value (optional)
@@ -7316,7 +7319,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookNumberOfPages<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.90 = value;
+        self._fields.90 = value;
         self
     }
 }
@@ -7324,12 +7327,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `offers` field (optional)
     pub fn offers(mut self, value: impl Into<Option<BookOffers<'a>>>) -> Self {
-        self.__unsafe_private_named.91 = value.into();
+        self._fields.91 = value.into();
         self
     }
     /// Set the `offers` field to an Option value (optional)
     pub fn maybe_offers(mut self, value: Option<BookOffers<'a>>) -> Self {
-        self.__unsafe_private_named.91 = value;
+        self._fields.91 = value;
         self
     }
 }
@@ -7337,12 +7340,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `pattern` field (optional)
     pub fn pattern(mut self, value: impl Into<Option<BookPattern<'a>>>) -> Self {
-        self.__unsafe_private_named.92 = value.into();
+        self._fields.92 = value.into();
         self
     }
     /// Set the `pattern` field to an Option value (optional)
     pub fn maybe_pattern(mut self, value: Option<BookPattern<'a>>) -> Self {
-        self.__unsafe_private_named.92 = value;
+        self._fields.92 = value;
         self
     }
 }
@@ -7350,12 +7353,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `position` field (optional)
     pub fn position(mut self, value: impl Into<Option<BookPosition<'a>>>) -> Self {
-        self.__unsafe_private_named.93 = value.into();
+        self._fields.93 = value.into();
         self
     }
     /// Set the `position` field to an Option value (optional)
     pub fn maybe_position(mut self, value: Option<BookPosition<'a>>) -> Self {
-        self.__unsafe_private_named.93 = value;
+        self._fields.93 = value;
         self
     }
 }
@@ -7366,7 +7369,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookPotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value.into();
+        self._fields.94 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -7374,7 +7377,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookPotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value;
+        self._fields.94 = value;
         self
     }
 }
@@ -7382,12 +7385,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `producer` field (optional)
     pub fn producer(mut self, value: impl Into<Option<BookProducer<'a>>>) -> Self {
-        self.__unsafe_private_named.95 = value.into();
+        self._fields.95 = value.into();
         self
     }
     /// Set the `producer` field to an Option value (optional)
     pub fn maybe_producer(mut self, value: Option<BookProducer<'a>>) -> Self {
-        self.__unsafe_private_named.95 = value;
+        self._fields.95 = value;
         self
     }
 }
@@ -7395,12 +7398,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `provider` field (optional)
     pub fn provider(mut self, value: impl Into<Option<BookProvider<'a>>>) -> Self {
-        self.__unsafe_private_named.96 = value.into();
+        self._fields.96 = value.into();
         self
     }
     /// Set the `provider` field to an Option value (optional)
     pub fn maybe_provider(mut self, value: Option<BookProvider<'a>>) -> Self {
-        self.__unsafe_private_named.96 = value;
+        self._fields.96 = value;
         self
     }
 }
@@ -7408,12 +7411,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `publication` field (optional)
     pub fn publication(mut self, value: impl Into<Option<BookPublication<'a>>>) -> Self {
-        self.__unsafe_private_named.97 = value.into();
+        self._fields.97 = value.into();
         self
     }
     /// Set the `publication` field to an Option value (optional)
     pub fn maybe_publication(mut self, value: Option<BookPublication<'a>>) -> Self {
-        self.__unsafe_private_named.97 = value;
+        self._fields.97 = value;
         self
     }
 }
@@ -7421,12 +7424,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `publisher` field (optional)
     pub fn publisher(mut self, value: impl Into<Option<BookPublisher<'a>>>) -> Self {
-        self.__unsafe_private_named.98 = value.into();
+        self._fields.98 = value.into();
         self
     }
     /// Set the `publisher` field to an Option value (optional)
     pub fn maybe_publisher(mut self, value: Option<BookPublisher<'a>>) -> Self {
-        self.__unsafe_private_named.98 = value;
+        self._fields.98 = value;
         self
     }
 }
@@ -7437,7 +7440,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookPublisherImprint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.99 = value.into();
+        self._fields.99 = value.into();
         self
     }
     /// Set the `publisherImprint` field to an Option value (optional)
@@ -7445,7 +7448,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookPublisherImprint<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.99 = value;
+        self._fields.99 = value;
         self
     }
 }
@@ -7456,7 +7459,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookPublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value.into();
+        self._fields.100 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -7464,7 +7467,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookPublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value;
+        self._fields.100 = value;
         self
     }
 }
@@ -7472,12 +7475,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `recordedAt` field (optional)
     pub fn recorded_at(mut self, value: impl Into<Option<BookRecordedAt<'a>>>) -> Self {
-        self.__unsafe_private_named.101 = value.into();
+        self._fields.101 = value.into();
         self
     }
     /// Set the `recordedAt` field to an Option value (optional)
     pub fn maybe_recorded_at(mut self, value: Option<BookRecordedAt<'a>>) -> Self {
-        self.__unsafe_private_named.101 = value;
+        self._fields.101 = value;
         self
     }
 }
@@ -7488,12 +7491,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookReleasedEvent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value.into();
+        self._fields.102 = value.into();
         self
     }
     /// Set the `releasedEvent` field to an Option value (optional)
     pub fn maybe_released_event(mut self, value: Option<BookReleasedEvent<'a>>) -> Self {
-        self.__unsafe_private_named.102 = value;
+        self._fields.102 = value;
         self
     }
 }
@@ -7501,12 +7504,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<BookReview<'a>>>) -> Self {
-        self.__unsafe_private_named.103 = value.into();
+        self._fields.103 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<BookReview<'a>>) -> Self {
-        self.__unsafe_private_named.103 = value;
+        self._fields.103 = value;
         self
     }
 }
@@ -7514,12 +7517,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `reviews` field (optional)
     pub fn reviews(mut self, value: impl Into<Option<BookReviews<'a>>>) -> Self {
-        self.__unsafe_private_named.104 = value.into();
+        self._fields.104 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<BookReviews<'a>>) -> Self {
-        self.__unsafe_private_named.104 = value;
+        self._fields.104 = value;
         self
     }
 }
@@ -7527,12 +7530,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<BookSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.105 = value.into();
+        self._fields.105 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<BookSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.105 = value;
+        self._fields.105 = value;
         self
     }
 }
@@ -7543,12 +7546,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookSchemaVersion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value.into();
+        self._fields.106 = value.into();
         self
     }
     /// Set the `schemaVersion` field to an Option value (optional)
     pub fn maybe_schema_version(mut self, value: Option<BookSchemaVersion<'a>>) -> Self {
-        self.__unsafe_private_named.106 = value;
+        self._fields.106 = value;
         self
     }
 }
@@ -7559,7 +7562,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookSdDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value.into();
+        self._fields.107 = value.into();
         self
     }
     /// Set the `sdDatePublished` field to an Option value (optional)
@@ -7567,7 +7570,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookSdDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value;
+        self._fields.107 = value;
         self
     }
 }
@@ -7575,12 +7578,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `sdLicense` field (optional)
     pub fn sd_license(mut self, value: impl Into<Option<BookSdLicense<'a>>>) -> Self {
-        self.__unsafe_private_named.108 = value.into();
+        self._fields.108 = value.into();
         self
     }
     /// Set the `sdLicense` field to an Option value (optional)
     pub fn maybe_sd_license(mut self, value: Option<BookSdLicense<'a>>) -> Self {
-        self.__unsafe_private_named.108 = value;
+        self._fields.108 = value;
         self
     }
 }
@@ -7591,12 +7594,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookSdPublisher<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.109 = value.into();
+        self._fields.109 = value.into();
         self
     }
     /// Set the `sdPublisher` field to an Option value (optional)
     pub fn maybe_sd_publisher(mut self, value: Option<BookSdPublisher<'a>>) -> Self {
-        self.__unsafe_private_named.109 = value;
+        self._fields.109 = value;
         self
     }
 }
@@ -7604,12 +7607,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<BookSize<'a>>>) -> Self {
-        self.__unsafe_private_named.110 = value.into();
+        self._fields.110 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<BookSize<'a>>) -> Self {
-        self.__unsafe_private_named.110 = value;
+        self._fields.110 = value;
         self
     }
 }
@@ -7620,7 +7623,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookSourceOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.111 = value.into();
+        self._fields.111 = value.into();
         self
     }
     /// Set the `sourceOrganization` field to an Option value (optional)
@@ -7628,7 +7631,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookSourceOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.111 = value;
+        self._fields.111 = value;
         self
     }
 }
@@ -7636,12 +7639,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `spatial` field (optional)
     pub fn spatial(mut self, value: impl Into<Option<BookSpatial<'a>>>) -> Self {
-        self.__unsafe_private_named.112 = value.into();
+        self._fields.112 = value.into();
         self
     }
     /// Set the `spatial` field to an Option value (optional)
     pub fn maybe_spatial(mut self, value: Option<BookSpatial<'a>>) -> Self {
-        self.__unsafe_private_named.112 = value;
+        self._fields.112 = value;
         self
     }
 }
@@ -7652,7 +7655,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookSpatialCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value.into();
+        self._fields.113 = value.into();
         self
     }
     /// Set the `spatialCoverage` field to an Option value (optional)
@@ -7660,7 +7663,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookSpatialCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value;
+        self._fields.113 = value;
         self
     }
 }
@@ -7668,12 +7671,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `sponsor` field (optional)
     pub fn sponsor(mut self, value: impl Into<Option<BookSponsor<'a>>>) -> Self {
-        self.__unsafe_private_named.114 = value.into();
+        self._fields.114 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<BookSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.114 = value;
+        self._fields.114 = value;
         self
     }
 }
@@ -7681,12 +7684,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `subjectOf` field (optional)
     pub fn subject_of(mut self, value: impl Into<Option<BookSubjectOf<'a>>>) -> Self {
-        self.__unsafe_private_named.115 = value.into();
+        self._fields.115 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<BookSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.115 = value;
+        self._fields.115 = value;
         self
     }
 }
@@ -7694,12 +7697,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `teaches` field (optional)
     pub fn teaches(mut self, value: impl Into<Option<BookTeaches<'a>>>) -> Self {
-        self.__unsafe_private_named.116 = value.into();
+        self._fields.116 = value.into();
         self
     }
     /// Set the `teaches` field to an Option value (optional)
     pub fn maybe_teaches(mut self, value: Option<BookTeaches<'a>>) -> Self {
-        self.__unsafe_private_named.116 = value;
+        self._fields.116 = value;
         self
     }
 }
@@ -7707,12 +7710,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `temporal` field (optional)
     pub fn temporal(mut self, value: impl Into<Option<BookTemporal<'a>>>) -> Self {
-        self.__unsafe_private_named.117 = value.into();
+        self._fields.117 = value.into();
         self
     }
     /// Set the `temporal` field to an Option value (optional)
     pub fn maybe_temporal(mut self, value: Option<BookTemporal<'a>>) -> Self {
-        self.__unsafe_private_named.117 = value;
+        self._fields.117 = value;
         self
     }
 }
@@ -7723,7 +7726,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookTemporalCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.118 = value.into();
+        self._fields.118 = value.into();
         self
     }
     /// Set the `temporalCoverage` field to an Option value (optional)
@@ -7731,7 +7734,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookTemporalCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.118 = value;
+        self._fields.118 = value;
         self
     }
 }
@@ -7739,12 +7742,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<BookText<'a>>>) -> Self {
-        self.__unsafe_private_named.119 = value.into();
+        self._fields.119 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<BookText<'a>>) -> Self {
-        self.__unsafe_private_named.119 = value;
+        self._fields.119 = value;
         self
     }
 }
@@ -7752,12 +7755,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `thumbnail` field (optional)
     pub fn thumbnail(mut self, value: impl Into<Option<BookThumbnail<'a>>>) -> Self {
-        self.__unsafe_private_named.120 = value.into();
+        self._fields.120 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<BookThumbnail<'a>>) -> Self {
-        self.__unsafe_private_named.120 = value;
+        self._fields.120 = value;
         self
     }
 }
@@ -7768,12 +7771,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookThumbnailUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.121 = value.into();
+        self._fields.121 = value.into();
         self
     }
     /// Set the `thumbnailUrl` field to an Option value (optional)
     pub fn maybe_thumbnail_url(mut self, value: Option<BookThumbnailUrl<'a>>) -> Self {
-        self.__unsafe_private_named.121 = value;
+        self._fields.121 = value;
         self
     }
 }
@@ -7784,12 +7787,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookTimeRequired<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.122 = value.into();
+        self._fields.122 = value.into();
         self
     }
     /// Set the `timeRequired` field to an Option value (optional)
     pub fn maybe_time_required(mut self, value: Option<BookTimeRequired<'a>>) -> Self {
-        self.__unsafe_private_named.122 = value;
+        self._fields.122 = value;
         self
     }
 }
@@ -7800,7 +7803,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookTranslationOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.123 = value.into();
+        self._fields.123 = value.into();
         self
     }
     /// Set the `translationOfWork` field to an Option value (optional)
@@ -7808,7 +7811,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookTranslationOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.123 = value;
+        self._fields.123 = value;
         self
     }
 }
@@ -7816,12 +7819,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `translator` field (optional)
     pub fn translator(mut self, value: impl Into<Option<BookTranslator<'a>>>) -> Self {
-        self.__unsafe_private_named.124 = value.into();
+        self._fields.124 = value.into();
         self
     }
     /// Set the `translator` field to an Option value (optional)
     pub fn maybe_translator(mut self, value: Option<BookTranslator<'a>>) -> Self {
-        self.__unsafe_private_named.124 = value;
+        self._fields.124 = value;
         self
     }
 }
@@ -7832,7 +7835,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookTypicalAgeRange<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.125 = value.into();
+        self._fields.125 = value.into();
         self
     }
     /// Set the `typicalAgeRange` field to an Option value (optional)
@@ -7840,7 +7843,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookTypicalAgeRange<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.125 = value;
+        self._fields.125 = value;
         self
     }
 }
@@ -7848,12 +7851,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<BookUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.126 = value.into();
+        self._fields.126 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<BookUrl<'a>>) -> Self {
-        self.__unsafe_private_named.126 = value;
+        self._fields.126 = value;
         self
     }
 }
@@ -7861,12 +7864,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `usageInfo` field (optional)
     pub fn usage_info(mut self, value: impl Into<Option<BookUsageInfo<'a>>>) -> Self {
-        self.__unsafe_private_named.127 = value.into();
+        self._fields.127 = value.into();
         self
     }
     /// Set the `usageInfo` field to an Option value (optional)
     pub fn maybe_usage_info(mut self, value: Option<BookUsageInfo<'a>>) -> Self {
-        self.__unsafe_private_named.127 = value;
+        self._fields.127 = value;
         self
     }
 }
@@ -7874,12 +7877,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `version` field (optional)
     pub fn version(mut self, value: impl Into<Option<BookVersion<'a>>>) -> Self {
-        self.__unsafe_private_named.128 = value.into();
+        self._fields.128 = value.into();
         self
     }
     /// Set the `version` field to an Option value (optional)
     pub fn maybe_version(mut self, value: Option<BookVersion<'a>>) -> Self {
-        self.__unsafe_private_named.128 = value;
+        self._fields.128 = value;
         self
     }
 }
@@ -7887,12 +7890,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `video` field (optional)
     pub fn video(mut self, value: impl Into<Option<BookVideo<'a>>>) -> Self {
-        self.__unsafe_private_named.129 = value.into();
+        self._fields.129 = value.into();
         self
     }
     /// Set the `video` field to an Option value (optional)
     pub fn maybe_video(mut self, value: Option<BookVideo<'a>>) -> Self {
-        self.__unsafe_private_named.129 = value;
+        self._fields.129 = value;
         self
     }
 }
@@ -7900,12 +7903,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
 impl<'a, S: book_state::State> BookBuilder<'a, S> {
     /// Set the `wordCount` field (optional)
     pub fn word_count(mut self, value: impl Into<Option<BookWordCount<'a>>>) -> Self {
-        self.__unsafe_private_named.130 = value.into();
+        self._fields.130 = value.into();
         self
     }
     /// Set the `wordCount` field to an Option value (optional)
     pub fn maybe_word_count(mut self, value: Option<BookWordCount<'a>>) -> Self {
-        self.__unsafe_private_named.130 = value;
+        self._fields.130 = value;
         self
     }
 }
@@ -7916,12 +7919,12 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookWorkExample<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.131 = value.into();
+        self._fields.131 = value.into();
         self
     }
     /// Set the `workExample` field to an Option value (optional)
     pub fn maybe_work_example(mut self, value: Option<BookWorkExample<'a>>) -> Self {
-        self.__unsafe_private_named.131 = value;
+        self._fields.131 = value;
         self
     }
 }
@@ -7932,7 +7935,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BookWorkTranslation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.132 = value.into();
+        self._fields.132 = value.into();
         self
     }
     /// Set the `workTranslation` field to an Option value (optional)
@@ -7940,7 +7943,7 @@ impl<'a, S: book_state::State> BookBuilder<'a, S> {
         mut self,
         value: Option<BookWorkTranslation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.132 = value;
+        self._fields.132 = value;
         self
     }
 }
@@ -7952,139 +7955,139 @@ where
     /// Build the final struct
     pub fn build(self) -> Book<'a> {
         Book {
-            about: self.__unsafe_private_named.0,
-            abridged: self.__unsafe_private_named.1,
-            r#abstract: self.__unsafe_private_named.2,
-            access_mode: self.__unsafe_private_named.3,
-            access_mode_sufficient: self.__unsafe_private_named.4,
-            accessibility_api: self.__unsafe_private_named.5,
-            accessibility_control: self.__unsafe_private_named.6,
-            accessibility_feature: self.__unsafe_private_named.7,
-            accessibility_hazard: self.__unsafe_private_named.8,
-            accessibility_summary: self.__unsafe_private_named.9,
-            accountable_person: self.__unsafe_private_named.10,
-            acquire_license_page: self.__unsafe_private_named.11,
-            additional_type: self.__unsafe_private_named.12,
-            aggregate_rating: self.__unsafe_private_named.13,
-            alternate_name: self.__unsafe_private_named.14,
-            alternative_headline: self.__unsafe_private_named.15,
-            archived_at: self.__unsafe_private_named.16,
-            assesses: self.__unsafe_private_named.17,
-            associated_media: self.__unsafe_private_named.18,
-            audience: self.__unsafe_private_named.19,
-            audio: self.__unsafe_private_named.20,
-            author: self.__unsafe_private_named.21,
-            award: self.__unsafe_private_named.22,
-            awards: self.__unsafe_private_named.23,
-            book_edition: self.__unsafe_private_named.24,
-            book_format: self.__unsafe_private_named.25,
-            character: self.__unsafe_private_named.26,
-            citation: self.__unsafe_private_named.27,
-            comment: self.__unsafe_private_named.28,
-            comment_count: self.__unsafe_private_named.29,
-            conditions_of_access: self.__unsafe_private_named.30,
-            content_location: self.__unsafe_private_named.31,
-            content_rating: self.__unsafe_private_named.32,
-            content_reference_time: self.__unsafe_private_named.33,
-            contributor: self.__unsafe_private_named.34,
-            copyright_holder: self.__unsafe_private_named.35,
-            copyright_notice: self.__unsafe_private_named.36,
-            copyright_year: self.__unsafe_private_named.37,
-            correction: self.__unsafe_private_named.38,
-            country_of_origin: self.__unsafe_private_named.39,
-            creative_work_status: self.__unsafe_private_named.40,
-            creator: self.__unsafe_private_named.41,
-            credit_text: self.__unsafe_private_named.42,
-            date_created: self.__unsafe_private_named.43,
-            date_modified: self.__unsafe_private_named.44,
-            date_published: self.__unsafe_private_named.45,
-            description: self.__unsafe_private_named.46,
-            digital_source_type: self.__unsafe_private_named.47,
-            disambiguating_description: self.__unsafe_private_named.48,
-            discussion_url: self.__unsafe_private_named.49,
-            edit_eidr: self.__unsafe_private_named.50,
-            editor: self.__unsafe_private_named.51,
-            educational_alignment: self.__unsafe_private_named.52,
-            educational_level: self.__unsafe_private_named.53,
-            educational_use: self.__unsafe_private_named.54,
-            encoding: self.__unsafe_private_named.55,
-            encoding_format: self.__unsafe_private_named.56,
-            encodings: self.__unsafe_private_named.57,
-            example_of_work: self.__unsafe_private_named.58,
-            expires: self.__unsafe_private_named.59,
-            file_format: self.__unsafe_private_named.60,
-            funder: self.__unsafe_private_named.61,
-            funding: self.__unsafe_private_named.62,
-            genre: self.__unsafe_private_named.63,
-            has_part: self.__unsafe_private_named.64,
-            headline: self.__unsafe_private_named.65,
-            identifier: self.__unsafe_private_named.66,
-            illustrator: self.__unsafe_private_named.67,
-            image: self.__unsafe_private_named.68,
-            in_language: self.__unsafe_private_named.69,
-            interaction_statistic: self.__unsafe_private_named.70,
-            interactivity_type: self.__unsafe_private_named.71,
-            interpreted_as_claim: self.__unsafe_private_named.72,
-            is_accessible_for_free: self.__unsafe_private_named.73,
-            is_based_on: self.__unsafe_private_named.74,
-            is_based_on_url: self.__unsafe_private_named.75,
-            is_family_friendly: self.__unsafe_private_named.76,
-            is_part_of: self.__unsafe_private_named.77,
-            isbn: self.__unsafe_private_named.78,
-            keywords: self.__unsafe_private_named.79,
-            learning_resource_type: self.__unsafe_private_named.80,
-            license: self.__unsafe_private_named.81,
-            location_created: self.__unsafe_private_named.82,
-            main_entity: self.__unsafe_private_named.83,
-            main_entity_of_page: self.__unsafe_private_named.84,
-            maintainer: self.__unsafe_private_named.85,
-            material: self.__unsafe_private_named.86,
-            material_extent: self.__unsafe_private_named.87,
-            mentions: self.__unsafe_private_named.88,
-            name: self.__unsafe_private_named.89,
-            number_of_pages: self.__unsafe_private_named.90,
-            offers: self.__unsafe_private_named.91,
-            pattern: self.__unsafe_private_named.92,
-            position: self.__unsafe_private_named.93,
-            potential_action: self.__unsafe_private_named.94,
-            producer: self.__unsafe_private_named.95,
-            provider: self.__unsafe_private_named.96,
-            publication: self.__unsafe_private_named.97,
-            publisher: self.__unsafe_private_named.98,
-            publisher_imprint: self.__unsafe_private_named.99,
-            publishing_principles: self.__unsafe_private_named.100,
-            recorded_at: self.__unsafe_private_named.101,
-            released_event: self.__unsafe_private_named.102,
-            review: self.__unsafe_private_named.103,
-            reviews: self.__unsafe_private_named.104,
-            same_as: self.__unsafe_private_named.105,
-            schema_version: self.__unsafe_private_named.106,
-            sd_date_published: self.__unsafe_private_named.107,
-            sd_license: self.__unsafe_private_named.108,
-            sd_publisher: self.__unsafe_private_named.109,
-            size: self.__unsafe_private_named.110,
-            source_organization: self.__unsafe_private_named.111,
-            spatial: self.__unsafe_private_named.112,
-            spatial_coverage: self.__unsafe_private_named.113,
-            sponsor: self.__unsafe_private_named.114,
-            subject_of: self.__unsafe_private_named.115,
-            teaches: self.__unsafe_private_named.116,
-            temporal: self.__unsafe_private_named.117,
-            temporal_coverage: self.__unsafe_private_named.118,
-            text: self.__unsafe_private_named.119,
-            thumbnail: self.__unsafe_private_named.120,
-            thumbnail_url: self.__unsafe_private_named.121,
-            time_required: self.__unsafe_private_named.122,
-            translation_of_work: self.__unsafe_private_named.123,
-            translator: self.__unsafe_private_named.124,
-            typical_age_range: self.__unsafe_private_named.125,
-            url: self.__unsafe_private_named.126,
-            usage_info: self.__unsafe_private_named.127,
-            version: self.__unsafe_private_named.128,
-            video: self.__unsafe_private_named.129,
-            word_count: self.__unsafe_private_named.130,
-            work_example: self.__unsafe_private_named.131,
-            work_translation: self.__unsafe_private_named.132,
+            about: self._fields.0,
+            abridged: self._fields.1,
+            r#abstract: self._fields.2,
+            access_mode: self._fields.3,
+            access_mode_sufficient: self._fields.4,
+            accessibility_api: self._fields.5,
+            accessibility_control: self._fields.6,
+            accessibility_feature: self._fields.7,
+            accessibility_hazard: self._fields.8,
+            accessibility_summary: self._fields.9,
+            accountable_person: self._fields.10,
+            acquire_license_page: self._fields.11,
+            additional_type: self._fields.12,
+            aggregate_rating: self._fields.13,
+            alternate_name: self._fields.14,
+            alternative_headline: self._fields.15,
+            archived_at: self._fields.16,
+            assesses: self._fields.17,
+            associated_media: self._fields.18,
+            audience: self._fields.19,
+            audio: self._fields.20,
+            author: self._fields.21,
+            award: self._fields.22,
+            awards: self._fields.23,
+            book_edition: self._fields.24,
+            book_format: self._fields.25,
+            character: self._fields.26,
+            citation: self._fields.27,
+            comment: self._fields.28,
+            comment_count: self._fields.29,
+            conditions_of_access: self._fields.30,
+            content_location: self._fields.31,
+            content_rating: self._fields.32,
+            content_reference_time: self._fields.33,
+            contributor: self._fields.34,
+            copyright_holder: self._fields.35,
+            copyright_notice: self._fields.36,
+            copyright_year: self._fields.37,
+            correction: self._fields.38,
+            country_of_origin: self._fields.39,
+            creative_work_status: self._fields.40,
+            creator: self._fields.41,
+            credit_text: self._fields.42,
+            date_created: self._fields.43,
+            date_modified: self._fields.44,
+            date_published: self._fields.45,
+            description: self._fields.46,
+            digital_source_type: self._fields.47,
+            disambiguating_description: self._fields.48,
+            discussion_url: self._fields.49,
+            edit_eidr: self._fields.50,
+            editor: self._fields.51,
+            educational_alignment: self._fields.52,
+            educational_level: self._fields.53,
+            educational_use: self._fields.54,
+            encoding: self._fields.55,
+            encoding_format: self._fields.56,
+            encodings: self._fields.57,
+            example_of_work: self._fields.58,
+            expires: self._fields.59,
+            file_format: self._fields.60,
+            funder: self._fields.61,
+            funding: self._fields.62,
+            genre: self._fields.63,
+            has_part: self._fields.64,
+            headline: self._fields.65,
+            identifier: self._fields.66,
+            illustrator: self._fields.67,
+            image: self._fields.68,
+            in_language: self._fields.69,
+            interaction_statistic: self._fields.70,
+            interactivity_type: self._fields.71,
+            interpreted_as_claim: self._fields.72,
+            is_accessible_for_free: self._fields.73,
+            is_based_on: self._fields.74,
+            is_based_on_url: self._fields.75,
+            is_family_friendly: self._fields.76,
+            is_part_of: self._fields.77,
+            isbn: self._fields.78,
+            keywords: self._fields.79,
+            learning_resource_type: self._fields.80,
+            license: self._fields.81,
+            location_created: self._fields.82,
+            main_entity: self._fields.83,
+            main_entity_of_page: self._fields.84,
+            maintainer: self._fields.85,
+            material: self._fields.86,
+            material_extent: self._fields.87,
+            mentions: self._fields.88,
+            name: self._fields.89,
+            number_of_pages: self._fields.90,
+            offers: self._fields.91,
+            pattern: self._fields.92,
+            position: self._fields.93,
+            potential_action: self._fields.94,
+            producer: self._fields.95,
+            provider: self._fields.96,
+            publication: self._fields.97,
+            publisher: self._fields.98,
+            publisher_imprint: self._fields.99,
+            publishing_principles: self._fields.100,
+            recorded_at: self._fields.101,
+            released_event: self._fields.102,
+            review: self._fields.103,
+            reviews: self._fields.104,
+            same_as: self._fields.105,
+            schema_version: self._fields.106,
+            sd_date_published: self._fields.107,
+            sd_license: self._fields.108,
+            sd_publisher: self._fields.109,
+            size: self._fields.110,
+            source_organization: self._fields.111,
+            spatial: self._fields.112,
+            spatial_coverage: self._fields.113,
+            sponsor: self._fields.114,
+            subject_of: self._fields.115,
+            teaches: self._fields.116,
+            temporal: self._fields.117,
+            temporal_coverage: self._fields.118,
+            text: self._fields.119,
+            thumbnail: self._fields.120,
+            thumbnail_url: self._fields.121,
+            time_required: self._fields.122,
+            translation_of_work: self._fields.123,
+            translator: self._fields.124,
+            typical_age_range: self._fields.125,
+            url: self._fields.126,
+            usage_info: self._fields.127,
+            version: self._fields.128,
+            video: self._fields.129,
+            word_count: self._fields.130,
+            work_example: self._fields.131,
+            work_translation: self._fields.132,
             extra_data: Default::default(),
         }
     }
@@ -8094,139 +8097,139 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Book<'a> {
         Book {
-            about: self.__unsafe_private_named.0,
-            abridged: self.__unsafe_private_named.1,
-            r#abstract: self.__unsafe_private_named.2,
-            access_mode: self.__unsafe_private_named.3,
-            access_mode_sufficient: self.__unsafe_private_named.4,
-            accessibility_api: self.__unsafe_private_named.5,
-            accessibility_control: self.__unsafe_private_named.6,
-            accessibility_feature: self.__unsafe_private_named.7,
-            accessibility_hazard: self.__unsafe_private_named.8,
-            accessibility_summary: self.__unsafe_private_named.9,
-            accountable_person: self.__unsafe_private_named.10,
-            acquire_license_page: self.__unsafe_private_named.11,
-            additional_type: self.__unsafe_private_named.12,
-            aggregate_rating: self.__unsafe_private_named.13,
-            alternate_name: self.__unsafe_private_named.14,
-            alternative_headline: self.__unsafe_private_named.15,
-            archived_at: self.__unsafe_private_named.16,
-            assesses: self.__unsafe_private_named.17,
-            associated_media: self.__unsafe_private_named.18,
-            audience: self.__unsafe_private_named.19,
-            audio: self.__unsafe_private_named.20,
-            author: self.__unsafe_private_named.21,
-            award: self.__unsafe_private_named.22,
-            awards: self.__unsafe_private_named.23,
-            book_edition: self.__unsafe_private_named.24,
-            book_format: self.__unsafe_private_named.25,
-            character: self.__unsafe_private_named.26,
-            citation: self.__unsafe_private_named.27,
-            comment: self.__unsafe_private_named.28,
-            comment_count: self.__unsafe_private_named.29,
-            conditions_of_access: self.__unsafe_private_named.30,
-            content_location: self.__unsafe_private_named.31,
-            content_rating: self.__unsafe_private_named.32,
-            content_reference_time: self.__unsafe_private_named.33,
-            contributor: self.__unsafe_private_named.34,
-            copyright_holder: self.__unsafe_private_named.35,
-            copyright_notice: self.__unsafe_private_named.36,
-            copyright_year: self.__unsafe_private_named.37,
-            correction: self.__unsafe_private_named.38,
-            country_of_origin: self.__unsafe_private_named.39,
-            creative_work_status: self.__unsafe_private_named.40,
-            creator: self.__unsafe_private_named.41,
-            credit_text: self.__unsafe_private_named.42,
-            date_created: self.__unsafe_private_named.43,
-            date_modified: self.__unsafe_private_named.44,
-            date_published: self.__unsafe_private_named.45,
-            description: self.__unsafe_private_named.46,
-            digital_source_type: self.__unsafe_private_named.47,
-            disambiguating_description: self.__unsafe_private_named.48,
-            discussion_url: self.__unsafe_private_named.49,
-            edit_eidr: self.__unsafe_private_named.50,
-            editor: self.__unsafe_private_named.51,
-            educational_alignment: self.__unsafe_private_named.52,
-            educational_level: self.__unsafe_private_named.53,
-            educational_use: self.__unsafe_private_named.54,
-            encoding: self.__unsafe_private_named.55,
-            encoding_format: self.__unsafe_private_named.56,
-            encodings: self.__unsafe_private_named.57,
-            example_of_work: self.__unsafe_private_named.58,
-            expires: self.__unsafe_private_named.59,
-            file_format: self.__unsafe_private_named.60,
-            funder: self.__unsafe_private_named.61,
-            funding: self.__unsafe_private_named.62,
-            genre: self.__unsafe_private_named.63,
-            has_part: self.__unsafe_private_named.64,
-            headline: self.__unsafe_private_named.65,
-            identifier: self.__unsafe_private_named.66,
-            illustrator: self.__unsafe_private_named.67,
-            image: self.__unsafe_private_named.68,
-            in_language: self.__unsafe_private_named.69,
-            interaction_statistic: self.__unsafe_private_named.70,
-            interactivity_type: self.__unsafe_private_named.71,
-            interpreted_as_claim: self.__unsafe_private_named.72,
-            is_accessible_for_free: self.__unsafe_private_named.73,
-            is_based_on: self.__unsafe_private_named.74,
-            is_based_on_url: self.__unsafe_private_named.75,
-            is_family_friendly: self.__unsafe_private_named.76,
-            is_part_of: self.__unsafe_private_named.77,
-            isbn: self.__unsafe_private_named.78,
-            keywords: self.__unsafe_private_named.79,
-            learning_resource_type: self.__unsafe_private_named.80,
-            license: self.__unsafe_private_named.81,
-            location_created: self.__unsafe_private_named.82,
-            main_entity: self.__unsafe_private_named.83,
-            main_entity_of_page: self.__unsafe_private_named.84,
-            maintainer: self.__unsafe_private_named.85,
-            material: self.__unsafe_private_named.86,
-            material_extent: self.__unsafe_private_named.87,
-            mentions: self.__unsafe_private_named.88,
-            name: self.__unsafe_private_named.89,
-            number_of_pages: self.__unsafe_private_named.90,
-            offers: self.__unsafe_private_named.91,
-            pattern: self.__unsafe_private_named.92,
-            position: self.__unsafe_private_named.93,
-            potential_action: self.__unsafe_private_named.94,
-            producer: self.__unsafe_private_named.95,
-            provider: self.__unsafe_private_named.96,
-            publication: self.__unsafe_private_named.97,
-            publisher: self.__unsafe_private_named.98,
-            publisher_imprint: self.__unsafe_private_named.99,
-            publishing_principles: self.__unsafe_private_named.100,
-            recorded_at: self.__unsafe_private_named.101,
-            released_event: self.__unsafe_private_named.102,
-            review: self.__unsafe_private_named.103,
-            reviews: self.__unsafe_private_named.104,
-            same_as: self.__unsafe_private_named.105,
-            schema_version: self.__unsafe_private_named.106,
-            sd_date_published: self.__unsafe_private_named.107,
-            sd_license: self.__unsafe_private_named.108,
-            sd_publisher: self.__unsafe_private_named.109,
-            size: self.__unsafe_private_named.110,
-            source_organization: self.__unsafe_private_named.111,
-            spatial: self.__unsafe_private_named.112,
-            spatial_coverage: self.__unsafe_private_named.113,
-            sponsor: self.__unsafe_private_named.114,
-            subject_of: self.__unsafe_private_named.115,
-            teaches: self.__unsafe_private_named.116,
-            temporal: self.__unsafe_private_named.117,
-            temporal_coverage: self.__unsafe_private_named.118,
-            text: self.__unsafe_private_named.119,
-            thumbnail: self.__unsafe_private_named.120,
-            thumbnail_url: self.__unsafe_private_named.121,
-            time_required: self.__unsafe_private_named.122,
-            translation_of_work: self.__unsafe_private_named.123,
-            translator: self.__unsafe_private_named.124,
-            typical_age_range: self.__unsafe_private_named.125,
-            url: self.__unsafe_private_named.126,
-            usage_info: self.__unsafe_private_named.127,
-            version: self.__unsafe_private_named.128,
-            video: self.__unsafe_private_named.129,
-            word_count: self.__unsafe_private_named.130,
-            work_example: self.__unsafe_private_named.131,
-            work_translation: self.__unsafe_private_named.132,
+            about: self._fields.0,
+            abridged: self._fields.1,
+            r#abstract: self._fields.2,
+            access_mode: self._fields.3,
+            access_mode_sufficient: self._fields.4,
+            accessibility_api: self._fields.5,
+            accessibility_control: self._fields.6,
+            accessibility_feature: self._fields.7,
+            accessibility_hazard: self._fields.8,
+            accessibility_summary: self._fields.9,
+            accountable_person: self._fields.10,
+            acquire_license_page: self._fields.11,
+            additional_type: self._fields.12,
+            aggregate_rating: self._fields.13,
+            alternate_name: self._fields.14,
+            alternative_headline: self._fields.15,
+            archived_at: self._fields.16,
+            assesses: self._fields.17,
+            associated_media: self._fields.18,
+            audience: self._fields.19,
+            audio: self._fields.20,
+            author: self._fields.21,
+            award: self._fields.22,
+            awards: self._fields.23,
+            book_edition: self._fields.24,
+            book_format: self._fields.25,
+            character: self._fields.26,
+            citation: self._fields.27,
+            comment: self._fields.28,
+            comment_count: self._fields.29,
+            conditions_of_access: self._fields.30,
+            content_location: self._fields.31,
+            content_rating: self._fields.32,
+            content_reference_time: self._fields.33,
+            contributor: self._fields.34,
+            copyright_holder: self._fields.35,
+            copyright_notice: self._fields.36,
+            copyright_year: self._fields.37,
+            correction: self._fields.38,
+            country_of_origin: self._fields.39,
+            creative_work_status: self._fields.40,
+            creator: self._fields.41,
+            credit_text: self._fields.42,
+            date_created: self._fields.43,
+            date_modified: self._fields.44,
+            date_published: self._fields.45,
+            description: self._fields.46,
+            digital_source_type: self._fields.47,
+            disambiguating_description: self._fields.48,
+            discussion_url: self._fields.49,
+            edit_eidr: self._fields.50,
+            editor: self._fields.51,
+            educational_alignment: self._fields.52,
+            educational_level: self._fields.53,
+            educational_use: self._fields.54,
+            encoding: self._fields.55,
+            encoding_format: self._fields.56,
+            encodings: self._fields.57,
+            example_of_work: self._fields.58,
+            expires: self._fields.59,
+            file_format: self._fields.60,
+            funder: self._fields.61,
+            funding: self._fields.62,
+            genre: self._fields.63,
+            has_part: self._fields.64,
+            headline: self._fields.65,
+            identifier: self._fields.66,
+            illustrator: self._fields.67,
+            image: self._fields.68,
+            in_language: self._fields.69,
+            interaction_statistic: self._fields.70,
+            interactivity_type: self._fields.71,
+            interpreted_as_claim: self._fields.72,
+            is_accessible_for_free: self._fields.73,
+            is_based_on: self._fields.74,
+            is_based_on_url: self._fields.75,
+            is_family_friendly: self._fields.76,
+            is_part_of: self._fields.77,
+            isbn: self._fields.78,
+            keywords: self._fields.79,
+            learning_resource_type: self._fields.80,
+            license: self._fields.81,
+            location_created: self._fields.82,
+            main_entity: self._fields.83,
+            main_entity_of_page: self._fields.84,
+            maintainer: self._fields.85,
+            material: self._fields.86,
+            material_extent: self._fields.87,
+            mentions: self._fields.88,
+            name: self._fields.89,
+            number_of_pages: self._fields.90,
+            offers: self._fields.91,
+            pattern: self._fields.92,
+            position: self._fields.93,
+            potential_action: self._fields.94,
+            producer: self._fields.95,
+            provider: self._fields.96,
+            publication: self._fields.97,
+            publisher: self._fields.98,
+            publisher_imprint: self._fields.99,
+            publishing_principles: self._fields.100,
+            recorded_at: self._fields.101,
+            released_event: self._fields.102,
+            review: self._fields.103,
+            reviews: self._fields.104,
+            same_as: self._fields.105,
+            schema_version: self._fields.106,
+            sd_date_published: self._fields.107,
+            sd_license: self._fields.108,
+            sd_publisher: self._fields.109,
+            size: self._fields.110,
+            source_organization: self._fields.111,
+            spatial: self._fields.112,
+            spatial_coverage: self._fields.113,
+            sponsor: self._fields.114,
+            subject_of: self._fields.115,
+            teaches: self._fields.116,
+            temporal: self._fields.117,
+            temporal_coverage: self._fields.118,
+            text: self._fields.119,
+            thumbnail: self._fields.120,
+            thumbnail_url: self._fields.121,
+            time_required: self._fields.122,
+            translation_of_work: self._fields.123,
+            translator: self._fields.124,
+            typical_age_range: self._fields.125,
+            url: self._fields.126,
+            usage_info: self._fields.127,
+            version: self._fields.128,
+            video: self._fields.129,
+            word_count: self._fields.130,
+            work_example: self._fields.131,
+            work_translation: self._fields.132,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/brand.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/brand.rs
index 48fde160..8c44f804 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/brand.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/brand.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -837,8 +840,8 @@ pub mod brand_state {
 
 /// Builder for constructing an instance of this type
 pub struct BrandBuilder<'a, S: brand_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BrandAdditionalType<'a>>,
         Option<BrandAggregateRating<'a>>,
         Option<BrandAlternateName<'a>>,
@@ -856,7 +859,7 @@ pub struct BrandBuilder<'a, S: brand_state::State> {
         Option<BrandSubjectOf<'a>>,
         Option<BrandUrl<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Brand<'a> {
@@ -870,8 +873,8 @@ impl<'a> BrandBuilder<'a, brand_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BrandBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -889,7 +892,7 @@ impl<'a> BrandBuilder<'a, brand_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -900,7 +903,7 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BrandAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -908,7 +911,7 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
         mut self,
         value: Option<BrandAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -919,7 +922,7 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BrandAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -927,7 +930,7 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
         mut self,
         value: Option<BrandAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -938,7 +941,7 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BrandAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -946,7 +949,7 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
         mut self,
         value: Option<BrandAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -957,12 +960,12 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BrandDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<BrandDescription<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -973,7 +976,7 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BrandDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -981,7 +984,7 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
         mut self,
         value: Option<BrandDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -989,12 +992,12 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
 impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
     /// Set the `identifier` field (optional)
     pub fn identifier(mut self, value: impl Into<Option<BrandIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<BrandIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1002,12 +1005,12 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
 impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<BrandImage<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<BrandImage<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1015,12 +1018,12 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
 impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
     /// Set the `logo` field (optional)
     pub fn logo(mut self, value: impl Into<Option<BrandLogo<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `logo` field to an Option value (optional)
     pub fn maybe_logo(mut self, value: Option<BrandLogo<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -1031,7 +1034,7 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BrandMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -1039,7 +1042,7 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
         mut self,
         value: Option<BrandMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -1047,12 +1050,12 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
 impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<BrandName<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<BrandName<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -1063,7 +1066,7 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
         mut self,
         value: impl Into<Option<BrandPotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -1071,7 +1074,7 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
         mut self,
         value: Option<BrandPotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -1079,12 +1082,12 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
 impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<BrandReview<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<BrandReview<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -1092,12 +1095,12 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
 impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<BrandSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<BrandSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -1105,12 +1108,12 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
 impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
     /// Set the `slogan` field (optional)
     pub fn slogan(mut self, value: impl Into<Option<BrandSlogan<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `slogan` field to an Option value (optional)
     pub fn maybe_slogan(mut self, value: Option<BrandSlogan<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -1118,12 +1121,12 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
 impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
     /// Set the `subjectOf` field (optional)
     pub fn subject_of(mut self, value: impl Into<Option<BrandSubjectOf<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<BrandSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -1131,12 +1134,12 @@ impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
 impl<'a, S: brand_state::State> BrandBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<BrandUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<BrandUrl<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -1148,22 +1151,22 @@ where
     /// Build the final struct
     pub fn build(self) -> Brand<'a> {
         Brand {
-            additional_type: self.__unsafe_private_named.0,
-            aggregate_rating: self.__unsafe_private_named.1,
-            alternate_name: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            disambiguating_description: self.__unsafe_private_named.4,
-            identifier: self.__unsafe_private_named.5,
-            image: self.__unsafe_private_named.6,
-            logo: self.__unsafe_private_named.7,
-            main_entity_of_page: self.__unsafe_private_named.8,
-            name: self.__unsafe_private_named.9,
-            potential_action: self.__unsafe_private_named.10,
-            review: self.__unsafe_private_named.11,
-            same_as: self.__unsafe_private_named.12,
-            slogan: self.__unsafe_private_named.13,
-            subject_of: self.__unsafe_private_named.14,
-            url: self.__unsafe_private_named.15,
+            additional_type: self._fields.0,
+            aggregate_rating: self._fields.1,
+            alternate_name: self._fields.2,
+            description: self._fields.3,
+            disambiguating_description: self._fields.4,
+            identifier: self._fields.5,
+            image: self._fields.6,
+            logo: self._fields.7,
+            main_entity_of_page: self._fields.8,
+            name: self._fields.9,
+            potential_action: self._fields.10,
+            review: self._fields.11,
+            same_as: self._fields.12,
+            slogan: self._fields.13,
+            subject_of: self._fields.14,
+            url: self._fields.15,
             extra_data: Default::default(),
         }
     }
@@ -1173,22 +1176,22 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Brand<'a> {
         Brand {
-            additional_type: self.__unsafe_private_named.0,
-            aggregate_rating: self.__unsafe_private_named.1,
-            alternate_name: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            disambiguating_description: self.__unsafe_private_named.4,
-            identifier: self.__unsafe_private_named.5,
-            image: self.__unsafe_private_named.6,
-            logo: self.__unsafe_private_named.7,
-            main_entity_of_page: self.__unsafe_private_named.8,
-            name: self.__unsafe_private_named.9,
-            potential_action: self.__unsafe_private_named.10,
-            review: self.__unsafe_private_named.11,
-            same_as: self.__unsafe_private_named.12,
-            slogan: self.__unsafe_private_named.13,
-            subject_of: self.__unsafe_private_named.14,
-            url: self.__unsafe_private_named.15,
+            additional_type: self._fields.0,
+            aggregate_rating: self._fields.1,
+            alternate_name: self._fields.2,
+            description: self._fields.3,
+            disambiguating_description: self._fields.4,
+            identifier: self._fields.5,
+            image: self._fields.6,
+            logo: self._fields.7,
+            main_entity_of_page: self._fields.8,
+            name: self._fields.9,
+            potential_action: self._fields.10,
+            review: self._fields.11,
+            same_as: self._fields.12,
+            slogan: self._fields.13,
+            subject_of: self._fields.14,
+            url: self._fields.15,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/event.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/event.rs
index 639d7708..bb2367d7 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/event.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/event.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -2452,8 +2455,8 @@ pub mod event_state {
 
 /// Builder for constructing an instance of this type
 pub struct EventBuilder<'a, S: event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<EventAbout<'a>>,
         Option<EventActor<'a>>,
         Option<EventAdditionalType<'a>>,
@@ -2508,7 +2511,7 @@ pub struct EventBuilder<'a, S: event_state::State> {
         Option<EventWorkFeatured<'a>>,
         Option<EventWorkPerformed<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Event<'a> {
@@ -2522,8 +2525,8 @@ impl<'a> EventBuilder<'a, event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -2578,7 +2581,7 @@ impl<'a> EventBuilder<'a, event_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2586,12 +2589,12 @@ impl<'a> EventBuilder<'a, event_state::Empty> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `about` field (optional)
     pub fn about(mut self, value: impl Into<Option<EventAbout<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `about` field to an Option value (optional)
     pub fn maybe_about(mut self, value: Option<EventAbout<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -2599,12 +2602,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `actor` field (optional)
     pub fn actor(mut self, value: impl Into<Option<EventActor<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `actor` field to an Option value (optional)
     pub fn maybe_actor(mut self, value: Option<EventActor<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -2615,7 +2618,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -2623,7 +2626,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: Option<EventAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -2634,7 +2637,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -2642,7 +2645,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: Option<EventAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -2653,7 +2656,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -2661,7 +2664,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: Option<EventAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -2669,12 +2672,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `attendee` field (optional)
     pub fn attendee(mut self, value: impl Into<Option<EventAttendee<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `attendee` field to an Option value (optional)
     pub fn maybe_attendee(mut self, value: Option<EventAttendee<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -2682,12 +2685,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `attendees` field (optional)
     pub fn attendees(mut self, value: impl Into<Option<EventAttendees<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `attendees` field to an Option value (optional)
     pub fn maybe_attendees(mut self, value: Option<EventAttendees<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -2695,12 +2698,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `audience` field (optional)
     pub fn audience(mut self, value: impl Into<Option<EventAudience<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `audience` field to an Option value (optional)
     pub fn maybe_audience(mut self, value: Option<EventAudience<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -2708,12 +2711,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `composer` field (optional)
     pub fn composer(mut self, value: impl Into<Option<EventComposer<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `composer` field to an Option value (optional)
     pub fn maybe_composer(mut self, value: Option<EventComposer<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -2724,12 +2727,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventContributor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `contributor` field to an Option value (optional)
     pub fn maybe_contributor(mut self, value: Option<EventContributor<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -2740,12 +2743,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<EventDescription<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -2753,12 +2756,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `director` field (optional)
     pub fn director(mut self, value: impl Into<Option<EventDirector<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `director` field to an Option value (optional)
     pub fn maybe_director(mut self, value: Option<EventDirector<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -2769,7 +2772,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -2777,7 +2780,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: Option<EventDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -2785,12 +2788,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `doorTime` field (optional)
     pub fn door_time(mut self, value: impl Into<Option<EventDoorTime<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `doorTime` field to an Option value (optional)
     pub fn maybe_door_time(mut self, value: Option<EventDoorTime<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -2798,12 +2801,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `duration` field (optional)
     pub fn duration(mut self, value: impl Into<Option<EventDuration<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `duration` field to an Option value (optional)
     pub fn maybe_duration(mut self, value: Option<EventDuration<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -2811,12 +2814,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `endDate` field (optional)
     pub fn end_date(mut self, value: impl Into<Option<EventEndDate<'a>>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `endDate` field to an Option value (optional)
     pub fn maybe_end_date(mut self, value: Option<EventEndDate<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -2827,7 +2830,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventEventAttendanceMode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `eventAttendanceMode` field to an Option value (optional)
@@ -2835,7 +2838,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: Option<EventEventAttendanceMode<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -2846,7 +2849,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventEventSchedule<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `eventSchedule` field to an Option value (optional)
@@ -2854,7 +2857,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: Option<EventEventSchedule<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -2865,12 +2868,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventEventStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `eventStatus` field to an Option value (optional)
     pub fn maybe_event_status(mut self, value: Option<EventEventStatus<'a>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -2878,12 +2881,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<EventFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<EventFunder<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -2891,12 +2894,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<EventFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<EventFunding<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -2904,12 +2907,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `identifier` field (optional)
     pub fn identifier(mut self, value: impl Into<Option<EventIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<EventIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -2917,12 +2920,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<EventImage<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<EventImage<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -2930,12 +2933,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `inLanguage` field (optional)
     pub fn in_language(mut self, value: impl Into<Option<EventInLanguage<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `inLanguage` field to an Option value (optional)
     pub fn maybe_in_language(mut self, value: Option<EventInLanguage<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -2946,7 +2949,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventIsAccessibleForFree<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `isAccessibleForFree` field to an Option value (optional)
@@ -2954,7 +2957,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: Option<EventIsAccessibleForFree<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -2962,12 +2965,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<EventKeywords<'a>>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<EventKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -2975,12 +2978,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<EventLocation<'a>>>) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<EventLocation<'a>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -2991,7 +2994,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -2999,7 +3002,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: Option<EventMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -3010,7 +3013,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventMaximumAttendeeCapacity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `maximumAttendeeCapacity` field to an Option value (optional)
@@ -3018,7 +3021,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: Option<EventMaximumAttendeeCapacity<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -3029,7 +3032,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventMaximumPhysicalAttendeeCapacity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `maximumPhysicalAttendeeCapacity` field to an Option value (optional)
@@ -3037,7 +3040,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: Option<EventMaximumPhysicalAttendeeCapacity<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -3048,7 +3051,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventMaximumVirtualAttendeeCapacity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `maximumVirtualAttendeeCapacity` field to an Option value (optional)
@@ -3056,7 +3059,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: Option<EventMaximumVirtualAttendeeCapacity<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -3064,12 +3067,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<EventName<'a>>>) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<EventName<'a>>) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -3077,12 +3080,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `offers` field (optional)
     pub fn offers(mut self, value: impl Into<Option<EventOffers<'a>>>) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `offers` field to an Option value (optional)
     pub fn maybe_offers(mut self, value: Option<EventOffers<'a>>) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -3090,12 +3093,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `organizer` field (optional)
     pub fn organizer(mut self, value: impl Into<Option<EventOrganizer<'a>>>) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `organizer` field to an Option value (optional)
     pub fn maybe_organizer(mut self, value: Option<EventOrganizer<'a>>) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -3103,12 +3106,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `performer` field (optional)
     pub fn performer(mut self, value: impl Into<Option<EventPerformer<'a>>>) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `performer` field to an Option value (optional)
     pub fn maybe_performer(mut self, value: Option<EventPerformer<'a>>) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -3116,12 +3119,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `performers` field (optional)
     pub fn performers(mut self, value: impl Into<Option<EventPerformers<'a>>>) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `performers` field to an Option value (optional)
     pub fn maybe_performers(mut self, value: Option<EventPerformers<'a>>) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -3132,7 +3135,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventPotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -3140,7 +3143,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: Option<EventPotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -3151,7 +3154,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventPreviousStartDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `previousStartDate` field to an Option value (optional)
@@ -3159,7 +3162,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: Option<EventPreviousStartDate<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -3167,12 +3170,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `recordedIn` field (optional)
     pub fn recorded_in(mut self, value: impl Into<Option<EventRecordedIn<'a>>>) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `recordedIn` field to an Option value (optional)
     pub fn maybe_recorded_in(mut self, value: Option<EventRecordedIn<'a>>) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -3183,7 +3186,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventRemainingAttendeeCapacity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `remainingAttendeeCapacity` field to an Option value (optional)
@@ -3191,7 +3194,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: Option<EventRemainingAttendeeCapacity<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -3199,12 +3202,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<EventReview<'a>>>) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<EventReview<'a>>) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -3212,12 +3215,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<EventSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<EventSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -3225,12 +3228,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `sponsor` field (optional)
     pub fn sponsor(mut self, value: impl Into<Option<EventSponsor<'a>>>) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<EventSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -3238,12 +3241,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `startDate` field (optional)
     pub fn start_date(mut self, value: impl Into<Option<EventStartDate<'a>>>) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `startDate` field to an Option value (optional)
     pub fn maybe_start_date(mut self, value: Option<EventStartDate<'a>>) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -3251,12 +3254,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `subEvent` field (optional)
     pub fn sub_event(mut self, value: impl Into<Option<EventSubEvent<'a>>>) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `subEvent` field to an Option value (optional)
     pub fn maybe_sub_event(mut self, value: Option<EventSubEvent<'a>>) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -3264,12 +3267,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `subEvents` field (optional)
     pub fn sub_events(mut self, value: impl Into<Option<EventSubEvents<'a>>>) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `subEvents` field to an Option value (optional)
     pub fn maybe_sub_events(mut self, value: Option<EventSubEvents<'a>>) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -3277,12 +3280,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `subjectOf` field (optional)
     pub fn subject_of(mut self, value: impl Into<Option<EventSubjectOf<'a>>>) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<EventSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -3290,12 +3293,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `superEvent` field (optional)
     pub fn super_event(mut self, value: impl Into<Option<EventSuperEvent<'a>>>) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `superEvent` field to an Option value (optional)
     pub fn maybe_super_event(mut self, value: Option<EventSuperEvent<'a>>) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -3303,12 +3306,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `translator` field (optional)
     pub fn translator(mut self, value: impl Into<Option<EventTranslator<'a>>>) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `translator` field to an Option value (optional)
     pub fn maybe_translator(mut self, value: Option<EventTranslator<'a>>) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -3319,7 +3322,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventTypicalAgeRange<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `typicalAgeRange` field to an Option value (optional)
@@ -3327,7 +3330,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: Option<EventTypicalAgeRange<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -3335,12 +3338,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<EventUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<EventUrl<'a>>) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -3351,12 +3354,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventWorkFeatured<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `workFeatured` field to an Option value (optional)
     pub fn maybe_work_featured(mut self, value: Option<EventWorkFeatured<'a>>) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -3367,7 +3370,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<EventWorkPerformed<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `workPerformed` field to an Option value (optional)
@@ -3375,7 +3378,7 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
         mut self,
         value: Option<EventWorkPerformed<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -3387,59 +3390,59 @@ where
     /// Build the final struct
     pub fn build(self) -> Event<'a> {
         Event {
-            about: self.__unsafe_private_named.0,
-            actor: self.__unsafe_private_named.1,
-            additional_type: self.__unsafe_private_named.2,
-            aggregate_rating: self.__unsafe_private_named.3,
-            alternate_name: self.__unsafe_private_named.4,
-            attendee: self.__unsafe_private_named.5,
-            attendees: self.__unsafe_private_named.6,
-            audience: self.__unsafe_private_named.7,
-            composer: self.__unsafe_private_named.8,
-            contributor: self.__unsafe_private_named.9,
-            description: self.__unsafe_private_named.10,
-            director: self.__unsafe_private_named.11,
-            disambiguating_description: self.__unsafe_private_named.12,
-            door_time: self.__unsafe_private_named.13,
-            duration: self.__unsafe_private_named.14,
-            end_date: self.__unsafe_private_named.15,
-            event_attendance_mode: self.__unsafe_private_named.16,
-            event_schedule: self.__unsafe_private_named.17,
-            event_status: self.__unsafe_private_named.18,
-            funder: self.__unsafe_private_named.19,
-            funding: self.__unsafe_private_named.20,
-            identifier: self.__unsafe_private_named.21,
-            image: self.__unsafe_private_named.22,
-            in_language: self.__unsafe_private_named.23,
-            is_accessible_for_free: self.__unsafe_private_named.24,
-            keywords: self.__unsafe_private_named.25,
-            location: self.__unsafe_private_named.26,
-            main_entity_of_page: self.__unsafe_private_named.27,
-            maximum_attendee_capacity: self.__unsafe_private_named.28,
-            maximum_physical_attendee_capacity: self.__unsafe_private_named.29,
-            maximum_virtual_attendee_capacity: self.__unsafe_private_named.30,
-            name: self.__unsafe_private_named.31,
-            offers: self.__unsafe_private_named.32,
-            organizer: self.__unsafe_private_named.33,
-            performer: self.__unsafe_private_named.34,
-            performers: self.__unsafe_private_named.35,
-            potential_action: self.__unsafe_private_named.36,
-            previous_start_date: self.__unsafe_private_named.37,
-            recorded_in: self.__unsafe_private_named.38,
-            remaining_attendee_capacity: self.__unsafe_private_named.39,
-            review: self.__unsafe_private_named.40,
-            same_as: self.__unsafe_private_named.41,
-            sponsor: self.__unsafe_private_named.42,
-            start_date: self.__unsafe_private_named.43,
-            sub_event: self.__unsafe_private_named.44,
-            sub_events: self.__unsafe_private_named.45,
-            subject_of: self.__unsafe_private_named.46,
-            super_event: self.__unsafe_private_named.47,
-            translator: self.__unsafe_private_named.48,
-            typical_age_range: self.__unsafe_private_named.49,
-            url: self.__unsafe_private_named.50,
-            work_featured: self.__unsafe_private_named.51,
-            work_performed: self.__unsafe_private_named.52,
+            about: self._fields.0,
+            actor: self._fields.1,
+            additional_type: self._fields.2,
+            aggregate_rating: self._fields.3,
+            alternate_name: self._fields.4,
+            attendee: self._fields.5,
+            attendees: self._fields.6,
+            audience: self._fields.7,
+            composer: self._fields.8,
+            contributor: self._fields.9,
+            description: self._fields.10,
+            director: self._fields.11,
+            disambiguating_description: self._fields.12,
+            door_time: self._fields.13,
+            duration: self._fields.14,
+            end_date: self._fields.15,
+            event_attendance_mode: self._fields.16,
+            event_schedule: self._fields.17,
+            event_status: self._fields.18,
+            funder: self._fields.19,
+            funding: self._fields.20,
+            identifier: self._fields.21,
+            image: self._fields.22,
+            in_language: self._fields.23,
+            is_accessible_for_free: self._fields.24,
+            keywords: self._fields.25,
+            location: self._fields.26,
+            main_entity_of_page: self._fields.27,
+            maximum_attendee_capacity: self._fields.28,
+            maximum_physical_attendee_capacity: self._fields.29,
+            maximum_virtual_attendee_capacity: self._fields.30,
+            name: self._fields.31,
+            offers: self._fields.32,
+            organizer: self._fields.33,
+            performer: self._fields.34,
+            performers: self._fields.35,
+            potential_action: self._fields.36,
+            previous_start_date: self._fields.37,
+            recorded_in: self._fields.38,
+            remaining_attendee_capacity: self._fields.39,
+            review: self._fields.40,
+            same_as: self._fields.41,
+            sponsor: self._fields.42,
+            start_date: self._fields.43,
+            sub_event: self._fields.44,
+            sub_events: self._fields.45,
+            subject_of: self._fields.46,
+            super_event: self._fields.47,
+            translator: self._fields.48,
+            typical_age_range: self._fields.49,
+            url: self._fields.50,
+            work_featured: self._fields.51,
+            work_performed: self._fields.52,
             extra_data: Default::default(),
         }
     }
@@ -3449,59 +3452,59 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Event<'a> {
         Event {
-            about: self.__unsafe_private_named.0,
-            actor: self.__unsafe_private_named.1,
-            additional_type: self.__unsafe_private_named.2,
-            aggregate_rating: self.__unsafe_private_named.3,
-            alternate_name: self.__unsafe_private_named.4,
-            attendee: self.__unsafe_private_named.5,
-            attendees: self.__unsafe_private_named.6,
-            audience: self.__unsafe_private_named.7,
-            composer: self.__unsafe_private_named.8,
-            contributor: self.__unsafe_private_named.9,
-            description: self.__unsafe_private_named.10,
-            director: self.__unsafe_private_named.11,
-            disambiguating_description: self.__unsafe_private_named.12,
-            door_time: self.__unsafe_private_named.13,
-            duration: self.__unsafe_private_named.14,
-            end_date: self.__unsafe_private_named.15,
-            event_attendance_mode: self.__unsafe_private_named.16,
-            event_schedule: self.__unsafe_private_named.17,
-            event_status: self.__unsafe_private_named.18,
-            funder: self.__unsafe_private_named.19,
-            funding: self.__unsafe_private_named.20,
-            identifier: self.__unsafe_private_named.21,
-            image: self.__unsafe_private_named.22,
-            in_language: self.__unsafe_private_named.23,
-            is_accessible_for_free: self.__unsafe_private_named.24,
-            keywords: self.__unsafe_private_named.25,
-            location: self.__unsafe_private_named.26,
-            main_entity_of_page: self.__unsafe_private_named.27,
-            maximum_attendee_capacity: self.__unsafe_private_named.28,
-            maximum_physical_attendee_capacity: self.__unsafe_private_named.29,
-            maximum_virtual_attendee_capacity: self.__unsafe_private_named.30,
-            name: self.__unsafe_private_named.31,
-            offers: self.__unsafe_private_named.32,
-            organizer: self.__unsafe_private_named.33,
-            performer: self.__unsafe_private_named.34,
-            performers: self.__unsafe_private_named.35,
-            potential_action: self.__unsafe_private_named.36,
-            previous_start_date: self.__unsafe_private_named.37,
-            recorded_in: self.__unsafe_private_named.38,
-            remaining_attendee_capacity: self.__unsafe_private_named.39,
-            review: self.__unsafe_private_named.40,
-            same_as: self.__unsafe_private_named.41,
-            sponsor: self.__unsafe_private_named.42,
-            start_date: self.__unsafe_private_named.43,
-            sub_event: self.__unsafe_private_named.44,
-            sub_events: self.__unsafe_private_named.45,
-            subject_of: self.__unsafe_private_named.46,
-            super_event: self.__unsafe_private_named.47,
-            translator: self.__unsafe_private_named.48,
-            typical_age_range: self.__unsafe_private_named.49,
-            url: self.__unsafe_private_named.50,
-            work_featured: self.__unsafe_private_named.51,
-            work_performed: self.__unsafe_private_named.52,
+            about: self._fields.0,
+            actor: self._fields.1,
+            additional_type: self._fields.2,
+            aggregate_rating: self._fields.3,
+            alternate_name: self._fields.4,
+            attendee: self._fields.5,
+            attendees: self._fields.6,
+            audience: self._fields.7,
+            composer: self._fields.8,
+            contributor: self._fields.9,
+            description: self._fields.10,
+            director: self._fields.11,
+            disambiguating_description: self._fields.12,
+            door_time: self._fields.13,
+            duration: self._fields.14,
+            end_date: self._fields.15,
+            event_attendance_mode: self._fields.16,
+            event_schedule: self._fields.17,
+            event_status: self._fields.18,
+            funder: self._fields.19,
+            funding: self._fields.20,
+            identifier: self._fields.21,
+            image: self._fields.22,
+            in_language: self._fields.23,
+            is_accessible_for_free: self._fields.24,
+            keywords: self._fields.25,
+            location: self._fields.26,
+            main_entity_of_page: self._fields.27,
+            maximum_attendee_capacity: self._fields.28,
+            maximum_physical_attendee_capacity: self._fields.29,
+            maximum_virtual_attendee_capacity: self._fields.30,
+            name: self._fields.31,
+            offers: self._fields.32,
+            organizer: self._fields.33,
+            performer: self._fields.34,
+            performers: self._fields.35,
+            potential_action: self._fields.36,
+            previous_start_date: self._fields.37,
+            recorded_in: self._fields.38,
+            remaining_attendee_capacity: self._fields.39,
+            review: self._fields.40,
+            same_as: self._fields.41,
+            sponsor: self._fields.42,
+            start_date: self._fields.43,
+            sub_event: self._fields.44,
+            sub_events: self._fields.45,
+            subject_of: self._fields.46,
+            super_event: self._fields.47,
+            translator: self._fields.48,
+            typical_age_range: self._fields.49,
+            url: self._fields.50,
+            work_featured: self._fields.51,
+            work_performed: self._fields.52,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/hotel.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/hotel.rs
index c0a35d8a..a2aa173f 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/hotel.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/hotel.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -5603,8 +5606,8 @@ pub mod hotel_state {
 
 /// Builder for constructing an instance of this type
 pub struct HotelBuilder<'a, S: hotel_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<HotelAcceptedPaymentMethod<'a>>,
         Option<HotelActionableFeedbackPolicy<'a>>,
         Option<HotelAdditionalProperty<'a>>,
@@ -5739,7 +5742,7 @@ pub struct HotelBuilder<'a, S: hotel_state::State> {
         Option<HotelUrl<'a>>,
         Option<HotelVatId<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Hotel<'a> {
@@ -5753,8 +5756,8 @@ impl<'a> HotelBuilder<'a, hotel_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HotelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -5889,7 +5892,7 @@ impl<'a> HotelBuilder<'a, hotel_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5900,7 +5903,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelAcceptedPaymentMethod<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `acceptedPaymentMethod` field to an Option value (optional)
@@ -5908,7 +5911,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelAcceptedPaymentMethod<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -5919,7 +5922,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelActionableFeedbackPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `actionableFeedbackPolicy` field to an Option value (optional)
@@ -5927,7 +5930,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelActionableFeedbackPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -5938,7 +5941,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelAdditionalProperty<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `additionalProperty` field to an Option value (optional)
@@ -5946,7 +5949,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelAdditionalProperty<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -5957,7 +5960,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -5965,7 +5968,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -5973,12 +5976,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `address` field (optional)
     pub fn address(mut self, value: impl Into<Option<HotelAddress<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `address` field to an Option value (optional)
     pub fn maybe_address(mut self, value: Option<HotelAddress<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -5989,7 +5992,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelAgentInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `agentInteractionStatistic` field to an Option value (optional)
@@ -5997,7 +6000,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelAgentInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -6008,7 +6011,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -6016,7 +6019,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -6027,7 +6030,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -6035,7 +6038,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -6043,12 +6046,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `alumni` field (optional)
     pub fn alumni(mut self, value: impl Into<Option<HotelAlumni<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `alumni` field to an Option value (optional)
     pub fn maybe_alumni(mut self, value: Option<HotelAlumni<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -6059,7 +6062,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelAmenityFeature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `amenityFeature` field to an Option value (optional)
@@ -6067,7 +6070,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelAmenityFeature<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -6075,12 +6078,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `areaServed` field (optional)
     pub fn area_served(mut self, value: impl Into<Option<HotelAreaServed<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `areaServed` field to an Option value (optional)
     pub fn maybe_area_served(mut self, value: Option<HotelAreaServed<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -6088,12 +6091,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `audience` field (optional)
     pub fn audience(mut self, value: impl Into<Option<HotelAudience<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `audience` field to an Option value (optional)
     pub fn maybe_audience(mut self, value: Option<HotelAudience<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -6104,7 +6107,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelAvailableLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `availableLanguage` field to an Option value (optional)
@@ -6112,7 +6115,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelAvailableLanguage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -6120,12 +6123,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<HotelAward<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<HotelAward<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -6133,12 +6136,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<HotelAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<HotelAwards<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -6146,12 +6149,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `branchCode` field (optional)
     pub fn branch_code(mut self, value: impl Into<Option<HotelBranchCode<'a>>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `branchCode` field to an Option value (optional)
     pub fn maybe_branch_code(mut self, value: Option<HotelBranchCode<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -6159,12 +6162,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `branchOf` field (optional)
     pub fn branch_of(mut self, value: impl Into<Option<HotelBranchOf<'a>>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `branchOf` field to an Option value (optional)
     pub fn maybe_branch_of(mut self, value: Option<HotelBranchOf<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -6172,12 +6175,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `brand` field (optional)
     pub fn brand(mut self, value: impl Into<Option<HotelBrand<'a>>>) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `brand` field to an Option value (optional)
     pub fn maybe_brand(mut self, value: Option<HotelBrand<'a>>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -6188,12 +6191,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelCheckinTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `checkinTime` field to an Option value (optional)
     pub fn maybe_checkin_time(mut self, value: Option<HotelCheckinTime<'a>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -6204,12 +6207,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelCheckoutTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `checkoutTime` field to an Option value (optional)
     pub fn maybe_checkout_time(mut self, value: Option<HotelCheckoutTime<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -6220,7 +6223,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelCompanyRegistration<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `companyRegistration` field to an Option value (optional)
@@ -6228,7 +6231,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelCompanyRegistration<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -6239,12 +6242,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelContactPoint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `contactPoint` field to an Option value (optional)
     pub fn maybe_contact_point(mut self, value: Option<HotelContactPoint<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -6255,7 +6258,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelContactPoints<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `contactPoints` field to an Option value (optional)
@@ -6263,7 +6266,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelContactPoints<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -6274,12 +6277,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelContainedIn<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `containedIn` field to an Option value (optional)
     pub fn maybe_contained_in(mut self, value: Option<HotelContainedIn<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -6290,7 +6293,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelContainedInPlace<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `containedInPlace` field to an Option value (optional)
@@ -6298,7 +6301,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelContainedInPlace<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -6309,7 +6312,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelContainsPlace<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `containsPlace` field to an Option value (optional)
@@ -6317,7 +6320,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelContainsPlace<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -6328,7 +6331,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelCorrectionsPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `correctionsPolicy` field to an Option value (optional)
@@ -6336,7 +6339,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelCorrectionsPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -6347,7 +6350,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelCurrenciesAccepted<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `currenciesAccepted` field to an Option value (optional)
@@ -6355,7 +6358,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelCurrenciesAccepted<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -6363,12 +6366,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `department` field (optional)
     pub fn department(mut self, value: impl Into<Option<HotelDepartment<'a>>>) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `department` field to an Option value (optional)
     pub fn maybe_department(mut self, value: Option<HotelDepartment<'a>>) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -6379,12 +6382,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<HotelDescription<'a>>) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -6395,7 +6398,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -6403,7 +6406,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -6414,7 +6417,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelDissolutionDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `dissolutionDate` field to an Option value (optional)
@@ -6422,7 +6425,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelDissolutionDate<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -6433,7 +6436,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelDiversityPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `diversityPolicy` field to an Option value (optional)
@@ -6441,7 +6444,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelDiversityPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -6452,7 +6455,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelDiversityStaffingReport<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `diversityStaffingReport` field to an Option value (optional)
@@ -6460,7 +6463,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelDiversityStaffingReport<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -6468,12 +6471,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `duns` field (optional)
     pub fn duns(mut self, value: impl Into<Option<HotelDuns<'a>>>) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `duns` field to an Option value (optional)
     pub fn maybe_duns(mut self, value: Option<HotelDuns<'a>>) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -6481,12 +6484,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `email` field (optional)
     pub fn email(mut self, value: impl Into<Option<HotelEmail<'a>>>) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `email` field to an Option value (optional)
     pub fn maybe_email(mut self, value: Option<HotelEmail<'a>>) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -6494,12 +6497,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `employee` field (optional)
     pub fn employee(mut self, value: impl Into<Option<HotelEmployee<'a>>>) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `employee` field to an Option value (optional)
     pub fn maybe_employee(mut self, value: Option<HotelEmployee<'a>>) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -6507,12 +6510,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `employees` field (optional)
     pub fn employees(mut self, value: impl Into<Option<HotelEmployees<'a>>>) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `employees` field to an Option value (optional)
     pub fn maybe_employees(mut self, value: Option<HotelEmployees<'a>>) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -6523,12 +6526,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelEthicsPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `ethicsPolicy` field to an Option value (optional)
     pub fn maybe_ethics_policy(mut self, value: Option<HotelEthicsPolicy<'a>>) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -6536,12 +6539,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `event` field (optional)
     pub fn event(mut self, value: impl Into<Option<HotelEvent<'a>>>) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `event` field to an Option value (optional)
     pub fn maybe_event(mut self, value: Option<HotelEvent<'a>>) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -6549,12 +6552,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `events` field (optional)
     pub fn events(mut self, value: impl Into<Option<HotelEvents<'a>>>) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `events` field to an Option value (optional)
     pub fn maybe_events(mut self, value: Option<HotelEvents<'a>>) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -6562,12 +6565,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `faxNumber` field (optional)
     pub fn fax_number(mut self, value: impl Into<Option<HotelFaxNumber<'a>>>) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `faxNumber` field to an Option value (optional)
     pub fn maybe_fax_number(mut self, value: Option<HotelFaxNumber<'a>>) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -6575,12 +6578,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `founder` field (optional)
     pub fn founder(mut self, value: impl Into<Option<HotelFounder<'a>>>) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `founder` field to an Option value (optional)
     pub fn maybe_founder(mut self, value: Option<HotelFounder<'a>>) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -6588,12 +6591,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `founders` field (optional)
     pub fn founders(mut self, value: impl Into<Option<HotelFounders<'a>>>) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `founders` field to an Option value (optional)
     pub fn maybe_founders(mut self, value: Option<HotelFounders<'a>>) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -6604,12 +6607,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelFoundingDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `foundingDate` field to an Option value (optional)
     pub fn maybe_founding_date(mut self, value: Option<HotelFoundingDate<'a>>) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -6620,7 +6623,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelFoundingLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `foundingLocation` field to an Option value (optional)
@@ -6628,7 +6631,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelFoundingLocation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -6636,12 +6639,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<HotelFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<HotelFunder<'a>>) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -6649,12 +6652,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<HotelFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<HotelFunding<'a>>) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -6662,12 +6665,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `geo` field (optional)
     pub fn geo(mut self, value: impl Into<Option<HotelGeo<'a>>>) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `geo` field to an Option value (optional)
     pub fn maybe_geo(mut self, value: Option<HotelGeo<'a>>) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -6678,12 +6681,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelGeoContains<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `geoContains` field to an Option value (optional)
     pub fn maybe_geo_contains(mut self, value: Option<HotelGeoContains<'a>>) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -6694,12 +6697,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelGeoCoveredBy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `geoCoveredBy` field to an Option value (optional)
     pub fn maybe_geo_covered_by(mut self, value: Option<HotelGeoCoveredBy<'a>>) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -6707,12 +6710,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `geoCovers` field (optional)
     pub fn geo_covers(mut self, value: impl Into<Option<HotelGeoCovers<'a>>>) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `geoCovers` field to an Option value (optional)
     pub fn maybe_geo_covers(mut self, value: Option<HotelGeoCovers<'a>>) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -6720,12 +6723,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `geoCrosses` field (optional)
     pub fn geo_crosses(mut self, value: impl Into<Option<HotelGeoCrosses<'a>>>) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `geoCrosses` field to an Option value (optional)
     pub fn maybe_geo_crosses(mut self, value: Option<HotelGeoCrosses<'a>>) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -6736,12 +6739,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelGeoDisjoint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `geoDisjoint` field to an Option value (optional)
     pub fn maybe_geo_disjoint(mut self, value: Option<HotelGeoDisjoint<'a>>) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -6749,12 +6752,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `geoEquals` field (optional)
     pub fn geo_equals(mut self, value: impl Into<Option<HotelGeoEquals<'a>>>) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `geoEquals` field to an Option value (optional)
     pub fn maybe_geo_equals(mut self, value: Option<HotelGeoEquals<'a>>) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -6765,7 +6768,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelGeoIntersects<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `geoIntersects` field to an Option value (optional)
@@ -6773,7 +6776,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelGeoIntersects<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -6784,12 +6787,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelGeoOverlaps<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `geoOverlaps` field to an Option value (optional)
     pub fn maybe_geo_overlaps(mut self, value: Option<HotelGeoOverlaps<'a>>) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -6797,12 +6800,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `geoTouches` field (optional)
     pub fn geo_touches(mut self, value: impl Into<Option<HotelGeoTouches<'a>>>) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `geoTouches` field to an Option value (optional)
     pub fn maybe_geo_touches(mut self, value: Option<HotelGeoTouches<'a>>) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -6810,12 +6813,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `geoWithin` field (optional)
     pub fn geo_within(mut self, value: impl Into<Option<HotelGeoWithin<'a>>>) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `geoWithin` field to an Option value (optional)
     pub fn maybe_geo_within(mut self, value: Option<HotelGeoWithin<'a>>) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -6826,7 +6829,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelGlobalLocationNumber<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `globalLocationNumber` field to an Option value (optional)
@@ -6834,7 +6837,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelGlobalLocationNumber<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -6845,7 +6848,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelHasCertification<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `hasCertification` field to an Option value (optional)
@@ -6853,7 +6856,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelHasCertification<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -6864,7 +6867,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelHasCredential<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `hasCredential` field to an Option value (optional)
@@ -6872,7 +6875,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelHasCredential<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -6883,7 +6886,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelHasDriveThroughService<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `hasDriveThroughService` field to an Option value (optional)
@@ -6891,7 +6894,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelHasDriveThroughService<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -6902,7 +6905,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelHasGs1DigitalLink<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `hasGS1DigitalLink` field to an Option value (optional)
@@ -6910,7 +6913,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelHasGs1DigitalLink<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -6918,12 +6921,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `hasMap` field (optional)
     pub fn has_map(mut self, value: impl Into<Option<HotelHasMap<'a>>>) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `hasMap` field to an Option value (optional)
     pub fn maybe_has_map(mut self, value: Option<HotelHasMap<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -6934,7 +6937,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelHasMemberProgram<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `hasMemberProgram` field to an Option value (optional)
@@ -6942,7 +6945,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelHasMemberProgram<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -6953,7 +6956,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelHasMerchantReturnPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `hasMerchantReturnPolicy` field to an Option value (optional)
@@ -6961,7 +6964,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelHasMerchantReturnPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -6972,7 +6975,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelHasOfferCatalog<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `hasOfferCatalog` field to an Option value (optional)
@@ -6980,7 +6983,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelHasOfferCatalog<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -6988,12 +6991,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `hasPOS` field (optional)
     pub fn has_pos(mut self, value: impl Into<Option<HotelHasPos<'a>>>) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `hasPOS` field to an Option value (optional)
     pub fn maybe_has_pos(mut self, value: Option<HotelHasPos<'a>>) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -7004,7 +7007,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelHasProductReturnPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `hasProductReturnPolicy` field to an Option value (optional)
@@ -7012,7 +7015,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelHasProductReturnPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -7023,7 +7026,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelHasShippingService<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `hasShippingService` field to an Option value (optional)
@@ -7031,7 +7034,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelHasShippingService<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -7039,12 +7042,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `identifier` field (optional)
     pub fn identifier(mut self, value: impl Into<Option<HotelIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<HotelIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -7052,12 +7055,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<HotelImage<'a>>>) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<HotelImage<'a>>) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -7068,7 +7071,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -7076,7 +7079,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -7087,7 +7090,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelIsAccessibleForFree<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `isAccessibleForFree` field to an Option value (optional)
@@ -7095,7 +7098,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelIsAccessibleForFree<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -7103,12 +7106,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `isicV4` field (optional)
     pub fn isic_v4(mut self, value: impl Into<Option<HotelIsicV4<'a>>>) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `isicV4` field to an Option value (optional)
     pub fn maybe_isic_v4(mut self, value: Option<HotelIsicV4<'a>>) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -7119,12 +7122,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelIso6523Code<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `iso6523Code` field to an Option value (optional)
     pub fn maybe_iso6523_code(mut self, value: Option<HotelIso6523Code<'a>>) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -7132,12 +7135,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<HotelKeywords<'a>>>) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<HotelKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -7145,12 +7148,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `knowsAbout` field (optional)
     pub fn knows_about(mut self, value: impl Into<Option<HotelKnowsAbout<'a>>>) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `knowsAbout` field to an Option value (optional)
     pub fn maybe_knows_about(mut self, value: Option<HotelKnowsAbout<'a>>) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -7161,7 +7164,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelKnowsLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value.into();
+        self._fields.79 = value.into();
         self
     }
     /// Set the `knowsLanguage` field to an Option value (optional)
@@ -7169,7 +7172,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelKnowsLanguage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value;
+        self._fields.79 = value;
         self
     }
 }
@@ -7177,12 +7180,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `latitude` field (optional)
     pub fn latitude(mut self, value: impl Into<Option<HotelLatitude<'a>>>) -> Self {
-        self.__unsafe_private_named.80 = value.into();
+        self._fields.80 = value.into();
         self
     }
     /// Set the `latitude` field to an Option value (optional)
     pub fn maybe_latitude(mut self, value: Option<HotelLatitude<'a>>) -> Self {
-        self.__unsafe_private_named.80 = value;
+        self._fields.80 = value;
         self
     }
 }
@@ -7193,12 +7196,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelLegalAddress<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.81 = value.into();
+        self._fields.81 = value.into();
         self
     }
     /// Set the `legalAddress` field to an Option value (optional)
     pub fn maybe_legal_address(mut self, value: Option<HotelLegalAddress<'a>>) -> Self {
-        self.__unsafe_private_named.81 = value;
+        self._fields.81 = value;
         self
     }
 }
@@ -7206,12 +7209,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `legalName` field (optional)
     pub fn legal_name(mut self, value: impl Into<Option<HotelLegalName<'a>>>) -> Self {
-        self.__unsafe_private_named.82 = value.into();
+        self._fields.82 = value.into();
         self
     }
     /// Set the `legalName` field to an Option value (optional)
     pub fn maybe_legal_name(mut self, value: Option<HotelLegalName<'a>>) -> Self {
-        self.__unsafe_private_named.82 = value;
+        self._fields.82 = value;
         self
     }
 }
@@ -7222,7 +7225,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelLegalRepresentative<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.83 = value.into();
+        self._fields.83 = value.into();
         self
     }
     /// Set the `legalRepresentative` field to an Option value (optional)
@@ -7230,7 +7233,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelLegalRepresentative<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.83 = value;
+        self._fields.83 = value;
         self
     }
 }
@@ -7238,12 +7241,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `leiCode` field (optional)
     pub fn lei_code(mut self, value: impl Into<Option<HotelLeiCode<'a>>>) -> Self {
-        self.__unsafe_private_named.84 = value.into();
+        self._fields.84 = value.into();
         self
     }
     /// Set the `leiCode` field to an Option value (optional)
     pub fn maybe_lei_code(mut self, value: Option<HotelLeiCode<'a>>) -> Self {
-        self.__unsafe_private_named.84 = value;
+        self._fields.84 = value;
         self
     }
 }
@@ -7251,12 +7254,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<HotelLocation<'a>>>) -> Self {
-        self.__unsafe_private_named.85 = value.into();
+        self._fields.85 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<HotelLocation<'a>>) -> Self {
-        self.__unsafe_private_named.85 = value;
+        self._fields.85 = value;
         self
     }
 }
@@ -7264,12 +7267,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `logo` field (optional)
     pub fn logo(mut self, value: impl Into<Option<HotelLogo<'a>>>) -> Self {
-        self.__unsafe_private_named.86 = value.into();
+        self._fields.86 = value.into();
         self
     }
     /// Set the `logo` field to an Option value (optional)
     pub fn maybe_logo(mut self, value: Option<HotelLogo<'a>>) -> Self {
-        self.__unsafe_private_named.86 = value;
+        self._fields.86 = value;
         self
     }
 }
@@ -7277,12 +7280,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `longitude` field (optional)
     pub fn longitude(mut self, value: impl Into<Option<HotelLongitude<'a>>>) -> Self {
-        self.__unsafe_private_named.87 = value.into();
+        self._fields.87 = value.into();
         self
     }
     /// Set the `longitude` field to an Option value (optional)
     pub fn maybe_longitude(mut self, value: Option<HotelLongitude<'a>>) -> Self {
-        self.__unsafe_private_named.87 = value;
+        self._fields.87 = value;
         self
     }
 }
@@ -7293,7 +7296,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.88 = value.into();
+        self._fields.88 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -7301,7 +7304,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.88 = value;
+        self._fields.88 = value;
         self
     }
 }
@@ -7309,12 +7312,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `makesOffer` field (optional)
     pub fn makes_offer(mut self, value: impl Into<Option<HotelMakesOffer<'a>>>) -> Self {
-        self.__unsafe_private_named.89 = value.into();
+        self._fields.89 = value.into();
         self
     }
     /// Set the `makesOffer` field to an Option value (optional)
     pub fn maybe_makes_offer(mut self, value: Option<HotelMakesOffer<'a>>) -> Self {
-        self.__unsafe_private_named.89 = value;
+        self._fields.89 = value;
         self
     }
 }
@@ -7322,12 +7325,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `map` field (optional)
     pub fn map(mut self, value: impl Into<Option<HotelMap<'a>>>) -> Self {
-        self.__unsafe_private_named.90 = value.into();
+        self._fields.90 = value.into();
         self
     }
     /// Set the `map` field to an Option value (optional)
     pub fn maybe_map(mut self, value: Option<HotelMap<'a>>) -> Self {
-        self.__unsafe_private_named.90 = value;
+        self._fields.90 = value;
         self
     }
 }
@@ -7335,12 +7338,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `maps` field (optional)
     pub fn maps(mut self, value: impl Into<Option<HotelMaps<'a>>>) -> Self {
-        self.__unsafe_private_named.91 = value.into();
+        self._fields.91 = value.into();
         self
     }
     /// Set the `maps` field to an Option value (optional)
     pub fn maybe_maps(mut self, value: Option<HotelMaps<'a>>) -> Self {
-        self.__unsafe_private_named.91 = value;
+        self._fields.91 = value;
         self
     }
 }
@@ -7351,7 +7354,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelMaximumAttendeeCapacity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.92 = value.into();
+        self._fields.92 = value.into();
         self
     }
     /// Set the `maximumAttendeeCapacity` field to an Option value (optional)
@@ -7359,7 +7362,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelMaximumAttendeeCapacity<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.92 = value;
+        self._fields.92 = value;
         self
     }
 }
@@ -7367,12 +7370,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `member` field (optional)
     pub fn member(mut self, value: impl Into<Option<HotelMember<'a>>>) -> Self {
-        self.__unsafe_private_named.93 = value.into();
+        self._fields.93 = value.into();
         self
     }
     /// Set the `member` field to an Option value (optional)
     pub fn maybe_member(mut self, value: Option<HotelMember<'a>>) -> Self {
-        self.__unsafe_private_named.93 = value;
+        self._fields.93 = value;
         self
     }
 }
@@ -7380,12 +7383,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `memberOf` field (optional)
     pub fn member_of(mut self, value: impl Into<Option<HotelMemberOf<'a>>>) -> Self {
-        self.__unsafe_private_named.94 = value.into();
+        self._fields.94 = value.into();
         self
     }
     /// Set the `memberOf` field to an Option value (optional)
     pub fn maybe_member_of(mut self, value: Option<HotelMemberOf<'a>>) -> Self {
-        self.__unsafe_private_named.94 = value;
+        self._fields.94 = value;
         self
     }
 }
@@ -7393,12 +7396,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `members` field (optional)
     pub fn members(mut self, value: impl Into<Option<HotelMembers<'a>>>) -> Self {
-        self.__unsafe_private_named.95 = value.into();
+        self._fields.95 = value.into();
         self
     }
     /// Set the `members` field to an Option value (optional)
     pub fn maybe_members(mut self, value: Option<HotelMembers<'a>>) -> Self {
-        self.__unsafe_private_named.95 = value;
+        self._fields.95 = value;
         self
     }
 }
@@ -7406,12 +7409,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `naics` field (optional)
     pub fn naics(mut self, value: impl Into<Option<HotelNaics<'a>>>) -> Self {
-        self.__unsafe_private_named.96 = value.into();
+        self._fields.96 = value.into();
         self
     }
     /// Set the `naics` field to an Option value (optional)
     pub fn maybe_naics(mut self, value: Option<HotelNaics<'a>>) -> Self {
-        self.__unsafe_private_named.96 = value;
+        self._fields.96 = value;
         self
     }
 }
@@ -7419,12 +7422,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<HotelName<'a>>>) -> Self {
-        self.__unsafe_private_named.97 = value.into();
+        self._fields.97 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<HotelName<'a>>) -> Self {
-        self.__unsafe_private_named.97 = value;
+        self._fields.97 = value;
         self
     }
 }
@@ -7435,7 +7438,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelNonprofitStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value.into();
+        self._fields.98 = value.into();
         self
     }
     /// Set the `nonprofitStatus` field to an Option value (optional)
@@ -7443,7 +7446,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelNonprofitStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value;
+        self._fields.98 = value;
         self
     }
 }
@@ -7454,7 +7457,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelNumberOfEmployees<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.99 = value.into();
+        self._fields.99 = value.into();
         self
     }
     /// Set the `numberOfEmployees` field to an Option value (optional)
@@ -7462,7 +7465,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelNumberOfEmployees<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.99 = value;
+        self._fields.99 = value;
         self
     }
 }
@@ -7473,7 +7476,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelNumberOfRooms<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value.into();
+        self._fields.100 = value.into();
         self
     }
     /// Set the `numberOfRooms` field to an Option value (optional)
@@ -7481,7 +7484,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelNumberOfRooms<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value;
+        self._fields.100 = value;
         self
     }
 }
@@ -7492,12 +7495,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelOpeningHours<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value.into();
+        self._fields.101 = value.into();
         self
     }
     /// Set the `openingHours` field to an Option value (optional)
     pub fn maybe_opening_hours(mut self, value: Option<HotelOpeningHours<'a>>) -> Self {
-        self.__unsafe_private_named.101 = value;
+        self._fields.101 = value;
         self
     }
 }
@@ -7508,7 +7511,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelOpeningHoursSpecification<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value.into();
+        self._fields.102 = value.into();
         self
     }
     /// Set the `openingHoursSpecification` field to an Option value (optional)
@@ -7516,7 +7519,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelOpeningHoursSpecification<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value;
+        self._fields.102 = value;
         self
     }
 }
@@ -7527,7 +7530,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelOwnershipFundingInfo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.103 = value.into();
+        self._fields.103 = value.into();
         self
     }
     /// Set the `ownershipFundingInfo` field to an Option value (optional)
@@ -7535,7 +7538,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelOwnershipFundingInfo<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.103 = value;
+        self._fields.103 = value;
         self
     }
 }
@@ -7543,12 +7546,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `owns` field (optional)
     pub fn owns(mut self, value: impl Into<Option<HotelOwns<'a>>>) -> Self {
-        self.__unsafe_private_named.104 = value.into();
+        self._fields.104 = value.into();
         self
     }
     /// Set the `owns` field to an Option value (optional)
     pub fn maybe_owns(mut self, value: Option<HotelOwns<'a>>) -> Self {
-        self.__unsafe_private_named.104 = value;
+        self._fields.104 = value;
         self
     }
 }
@@ -7559,7 +7562,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelParentOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.105 = value.into();
+        self._fields.105 = value.into();
         self
     }
     /// Set the `parentOrganization` field to an Option value (optional)
@@ -7567,7 +7570,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelParentOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.105 = value;
+        self._fields.105 = value;
         self
     }
 }
@@ -7578,7 +7581,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelPaymentAccepted<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value.into();
+        self._fields.106 = value.into();
         self
     }
     /// Set the `paymentAccepted` field to an Option value (optional)
@@ -7586,7 +7589,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelPaymentAccepted<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value;
+        self._fields.106 = value;
         self
     }
 }
@@ -7597,12 +7600,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelPetsAllowed<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value.into();
+        self._fields.107 = value.into();
         self
     }
     /// Set the `petsAllowed` field to an Option value (optional)
     pub fn maybe_pets_allowed(mut self, value: Option<HotelPetsAllowed<'a>>) -> Self {
-        self.__unsafe_private_named.107 = value;
+        self._fields.107 = value;
         self
     }
 }
@@ -7610,12 +7613,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `photo` field (optional)
     pub fn photo(mut self, value: impl Into<Option<HotelPhoto<'a>>>) -> Self {
-        self.__unsafe_private_named.108 = value.into();
+        self._fields.108 = value.into();
         self
     }
     /// Set the `photo` field to an Option value (optional)
     pub fn maybe_photo(mut self, value: Option<HotelPhoto<'a>>) -> Self {
-        self.__unsafe_private_named.108 = value;
+        self._fields.108 = value;
         self
     }
 }
@@ -7623,12 +7626,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `photos` field (optional)
     pub fn photos(mut self, value: impl Into<Option<HotelPhotos<'a>>>) -> Self {
-        self.__unsafe_private_named.109 = value.into();
+        self._fields.109 = value.into();
         self
     }
     /// Set the `photos` field to an Option value (optional)
     pub fn maybe_photos(mut self, value: Option<HotelPhotos<'a>>) -> Self {
-        self.__unsafe_private_named.109 = value;
+        self._fields.109 = value;
         self
     }
 }
@@ -7639,7 +7642,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelPotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.110 = value.into();
+        self._fields.110 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -7647,7 +7650,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelPotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.110 = value;
+        self._fields.110 = value;
         self
     }
 }
@@ -7655,12 +7658,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `priceRange` field (optional)
     pub fn price_range(mut self, value: impl Into<Option<HotelPriceRange<'a>>>) -> Self {
-        self.__unsafe_private_named.111 = value.into();
+        self._fields.111 = value.into();
         self
     }
     /// Set the `priceRange` field to an Option value (optional)
     pub fn maybe_price_range(mut self, value: Option<HotelPriceRange<'a>>) -> Self {
-        self.__unsafe_private_named.111 = value;
+        self._fields.111 = value;
         self
     }
 }
@@ -7671,12 +7674,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelPublicAccess<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value.into();
+        self._fields.112 = value.into();
         self
     }
     /// Set the `publicAccess` field to an Option value (optional)
     pub fn maybe_public_access(mut self, value: Option<HotelPublicAccess<'a>>) -> Self {
-        self.__unsafe_private_named.112 = value;
+        self._fields.112 = value;
         self
     }
 }
@@ -7687,7 +7690,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelPublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value.into();
+        self._fields.113 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -7695,7 +7698,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelPublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value;
+        self._fields.113 = value;
         self
     }
 }
@@ -7703,12 +7706,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<HotelReview<'a>>>) -> Self {
-        self.__unsafe_private_named.114 = value.into();
+        self._fields.114 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<HotelReview<'a>>) -> Self {
-        self.__unsafe_private_named.114 = value;
+        self._fields.114 = value;
         self
     }
 }
@@ -7716,12 +7719,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `reviews` field (optional)
     pub fn reviews(mut self, value: impl Into<Option<HotelReviews<'a>>>) -> Self {
-        self.__unsafe_private_named.115 = value.into();
+        self._fields.115 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<HotelReviews<'a>>) -> Self {
-        self.__unsafe_private_named.115 = value;
+        self._fields.115 = value;
         self
     }
 }
@@ -7729,12 +7732,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<HotelSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.116 = value.into();
+        self._fields.116 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<HotelSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.116 = value;
+        self._fields.116 = value;
         self
     }
 }
@@ -7742,12 +7745,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `seeks` field (optional)
     pub fn seeks(mut self, value: impl Into<Option<HotelSeeks<'a>>>) -> Self {
-        self.__unsafe_private_named.117 = value.into();
+        self._fields.117 = value.into();
         self
     }
     /// Set the `seeks` field to an Option value (optional)
     pub fn maybe_seeks(mut self, value: Option<HotelSeeks<'a>>) -> Self {
-        self.__unsafe_private_named.117 = value;
+        self._fields.117 = value;
         self
     }
 }
@@ -7758,12 +7761,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelServiceArea<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.118 = value.into();
+        self._fields.118 = value.into();
         self
     }
     /// Set the `serviceArea` field to an Option value (optional)
     pub fn maybe_service_area(mut self, value: Option<HotelServiceArea<'a>>) -> Self {
-        self.__unsafe_private_named.118 = value;
+        self._fields.118 = value;
         self
     }
 }
@@ -7771,12 +7774,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `skills` field (optional)
     pub fn skills(mut self, value: impl Into<Option<HotelSkills<'a>>>) -> Self {
-        self.__unsafe_private_named.119 = value.into();
+        self._fields.119 = value.into();
         self
     }
     /// Set the `skills` field to an Option value (optional)
     pub fn maybe_skills(mut self, value: Option<HotelSkills<'a>>) -> Self {
-        self.__unsafe_private_named.119 = value;
+        self._fields.119 = value;
         self
     }
 }
@@ -7784,12 +7787,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `slogan` field (optional)
     pub fn slogan(mut self, value: impl Into<Option<HotelSlogan<'a>>>) -> Self {
-        self.__unsafe_private_named.120 = value.into();
+        self._fields.120 = value.into();
         self
     }
     /// Set the `slogan` field to an Option value (optional)
     pub fn maybe_slogan(mut self, value: Option<HotelSlogan<'a>>) -> Self {
-        self.__unsafe_private_named.120 = value;
+        self._fields.120 = value;
         self
     }
 }
@@ -7800,7 +7803,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelSmokingAllowed<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.121 = value.into();
+        self._fields.121 = value.into();
         self
     }
     /// Set the `smokingAllowed` field to an Option value (optional)
@@ -7808,7 +7811,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelSmokingAllowed<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.121 = value;
+        self._fields.121 = value;
         self
     }
 }
@@ -7819,7 +7822,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelSpecialOpeningHoursSpecification<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.122 = value.into();
+        self._fields.122 = value.into();
         self
     }
     /// Set the `specialOpeningHoursSpecification` field to an Option value (optional)
@@ -7827,7 +7830,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelSpecialOpeningHoursSpecification<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.122 = value;
+        self._fields.122 = value;
         self
     }
 }
@@ -7835,12 +7838,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `sponsor` field (optional)
     pub fn sponsor(mut self, value: impl Into<Option<HotelSponsor<'a>>>) -> Self {
-        self.__unsafe_private_named.123 = value.into();
+        self._fields.123 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<HotelSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.123 = value;
+        self._fields.123 = value;
         self
     }
 }
@@ -7848,12 +7851,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `starRating` field (optional)
     pub fn star_rating(mut self, value: impl Into<Option<HotelStarRating<'a>>>) -> Self {
-        self.__unsafe_private_named.124 = value.into();
+        self._fields.124 = value.into();
         self
     }
     /// Set the `starRating` field to an Option value (optional)
     pub fn maybe_star_rating(mut self, value: Option<HotelStarRating<'a>>) -> Self {
-        self.__unsafe_private_named.124 = value;
+        self._fields.124 = value;
         self
     }
 }
@@ -7864,7 +7867,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelSubOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.125 = value.into();
+        self._fields.125 = value.into();
         self
     }
     /// Set the `subOrganization` field to an Option value (optional)
@@ -7872,7 +7875,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelSubOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.125 = value;
+        self._fields.125 = value;
         self
     }
 }
@@ -7880,12 +7883,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `subjectOf` field (optional)
     pub fn subject_of(mut self, value: impl Into<Option<HotelSubjectOf<'a>>>) -> Self {
-        self.__unsafe_private_named.126 = value.into();
+        self._fields.126 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<HotelSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.126 = value;
+        self._fields.126 = value;
         self
     }
 }
@@ -7893,12 +7896,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `taxID` field (optional)
     pub fn tax_id(mut self, value: impl Into<Option<HotelTaxId<'a>>>) -> Self {
-        self.__unsafe_private_named.127 = value.into();
+        self._fields.127 = value.into();
         self
     }
     /// Set the `taxID` field to an Option value (optional)
     pub fn maybe_tax_id(mut self, value: Option<HotelTaxId<'a>>) -> Self {
-        self.__unsafe_private_named.127 = value;
+        self._fields.127 = value;
         self
     }
 }
@@ -7906,12 +7909,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `telephone` field (optional)
     pub fn telephone(mut self, value: impl Into<Option<HotelTelephone<'a>>>) -> Self {
-        self.__unsafe_private_named.128 = value.into();
+        self._fields.128 = value.into();
         self
     }
     /// Set the `telephone` field to an Option value (optional)
     pub fn maybe_telephone(mut self, value: Option<HotelTelephone<'a>>) -> Self {
-        self.__unsafe_private_named.128 = value;
+        self._fields.128 = value;
         self
     }
 }
@@ -7922,7 +7925,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelTourBookingPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.129 = value.into();
+        self._fields.129 = value.into();
         self
     }
     /// Set the `tourBookingPage` field to an Option value (optional)
@@ -7930,7 +7933,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelTourBookingPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.129 = value;
+        self._fields.129 = value;
         self
     }
 }
@@ -7941,7 +7944,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: impl Into<Option<HotelUnnamedSourcesPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.130 = value.into();
+        self._fields.130 = value.into();
         self
     }
     /// Set the `unnamedSourcesPolicy` field to an Option value (optional)
@@ -7949,7 +7952,7 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
         mut self,
         value: Option<HotelUnnamedSourcesPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.130 = value;
+        self._fields.130 = value;
         self
     }
 }
@@ -7957,12 +7960,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<HotelUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.131 = value.into();
+        self._fields.131 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<HotelUrl<'a>>) -> Self {
-        self.__unsafe_private_named.131 = value;
+        self._fields.131 = value;
         self
     }
 }
@@ -7970,12 +7973,12 @@ impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
 impl<'a, S: hotel_state::State> HotelBuilder<'a, S> {
     /// Set the `vatID` field (optional)
     pub fn vat_id(mut self, value: impl Into<Option<HotelVatId<'a>>>) -> Self {
-        self.__unsafe_private_named.132 = value.into();
+        self._fields.132 = value.into();
         self
     }
     /// Set the `vatID` field to an Option value (optional)
     pub fn maybe_vat_id(mut self, value: Option<HotelVatId<'a>>) -> Self {
-        self.__unsafe_private_named.132 = value;
+        self._fields.132 = value;
         self
     }
 }
@@ -7987,139 +7990,139 @@ where
     /// Build the final struct
     pub fn build(self) -> Hotel<'a> {
         Hotel {
-            accepted_payment_method: self.__unsafe_private_named.0,
-            actionable_feedback_policy: self.__unsafe_private_named.1,
-            additional_property: self.__unsafe_private_named.2,
-            additional_type: self.__unsafe_private_named.3,
-            address: self.__unsafe_private_named.4,
-            agent_interaction_statistic: self.__unsafe_private_named.5,
-            aggregate_rating: self.__unsafe_private_named.6,
-            alternate_name: self.__unsafe_private_named.7,
-            alumni: self.__unsafe_private_named.8,
-            amenity_feature: self.__unsafe_private_named.9,
-            area_served: self.__unsafe_private_named.10,
-            audience: self.__unsafe_private_named.11,
-            available_language: self.__unsafe_private_named.12,
-            award: self.__unsafe_private_named.13,
-            awards: self.__unsafe_private_named.14,
-            branch_code: self.__unsafe_private_named.15,
-            branch_of: self.__unsafe_private_named.16,
-            brand: self.__unsafe_private_named.17,
-            checkin_time: self.__unsafe_private_named.18,
-            checkout_time: self.__unsafe_private_named.19,
-            company_registration: self.__unsafe_private_named.20,
-            contact_point: self.__unsafe_private_named.21,
-            contact_points: self.__unsafe_private_named.22,
-            contained_in: self.__unsafe_private_named.23,
-            contained_in_place: self.__unsafe_private_named.24,
-            contains_place: self.__unsafe_private_named.25,
-            corrections_policy: self.__unsafe_private_named.26,
-            currencies_accepted: self.__unsafe_private_named.27,
-            department: self.__unsafe_private_named.28,
-            description: self.__unsafe_private_named.29,
-            disambiguating_description: self.__unsafe_private_named.30,
-            dissolution_date: self.__unsafe_private_named.31,
-            diversity_policy: self.__unsafe_private_named.32,
-            diversity_staffing_report: self.__unsafe_private_named.33,
-            duns: self.__unsafe_private_named.34,
-            email: self.__unsafe_private_named.35,
-            employee: self.__unsafe_private_named.36,
-            employees: self.__unsafe_private_named.37,
-            ethics_policy: self.__unsafe_private_named.38,
-            event: self.__unsafe_private_named.39,
-            events: self.__unsafe_private_named.40,
-            fax_number: self.__unsafe_private_named.41,
-            founder: self.__unsafe_private_named.42,
-            founders: self.__unsafe_private_named.43,
-            founding_date: self.__unsafe_private_named.44,
-            founding_location: self.__unsafe_private_named.45,
-            funder: self.__unsafe_private_named.46,
-            funding: self.__unsafe_private_named.47,
-            geo: self.__unsafe_private_named.48,
-            geo_contains: self.__unsafe_private_named.49,
-            geo_covered_by: self.__unsafe_private_named.50,
-            geo_covers: self.__unsafe_private_named.51,
-            geo_crosses: self.__unsafe_private_named.52,
-            geo_disjoint: self.__unsafe_private_named.53,
-            geo_equals: self.__unsafe_private_named.54,
-            geo_intersects: self.__unsafe_private_named.55,
-            geo_overlaps: self.__unsafe_private_named.56,
-            geo_touches: self.__unsafe_private_named.57,
-            geo_within: self.__unsafe_private_named.58,
-            global_location_number: self.__unsafe_private_named.59,
-            has_certification: self.__unsafe_private_named.60,
-            has_credential: self.__unsafe_private_named.61,
-            has_drive_through_service: self.__unsafe_private_named.62,
-            has_gs1_digital_link: self.__unsafe_private_named.63,
-            has_map: self.__unsafe_private_named.64,
-            has_member_program: self.__unsafe_private_named.65,
-            has_merchant_return_policy: self.__unsafe_private_named.66,
-            has_offer_catalog: self.__unsafe_private_named.67,
-            has_pos: self.__unsafe_private_named.68,
-            has_product_return_policy: self.__unsafe_private_named.69,
-            has_shipping_service: self.__unsafe_private_named.70,
-            identifier: self.__unsafe_private_named.71,
-            image: self.__unsafe_private_named.72,
-            interaction_statistic: self.__unsafe_private_named.73,
-            is_accessible_for_free: self.__unsafe_private_named.74,
-            isic_v4: self.__unsafe_private_named.75,
-            iso6523_code: self.__unsafe_private_named.76,
-            keywords: self.__unsafe_private_named.77,
-            knows_about: self.__unsafe_private_named.78,
-            knows_language: self.__unsafe_private_named.79,
-            latitude: self.__unsafe_private_named.80,
-            legal_address: self.__unsafe_private_named.81,
-            legal_name: self.__unsafe_private_named.82,
-            legal_representative: self.__unsafe_private_named.83,
-            lei_code: self.__unsafe_private_named.84,
-            location: self.__unsafe_private_named.85,
-            logo: self.__unsafe_private_named.86,
-            longitude: self.__unsafe_private_named.87,
-            main_entity_of_page: self.__unsafe_private_named.88,
-            makes_offer: self.__unsafe_private_named.89,
-            map: self.__unsafe_private_named.90,
-            maps: self.__unsafe_private_named.91,
-            maximum_attendee_capacity: self.__unsafe_private_named.92,
-            member: self.__unsafe_private_named.93,
-            member_of: self.__unsafe_private_named.94,
-            members: self.__unsafe_private_named.95,
-            naics: self.__unsafe_private_named.96,
-            name: self.__unsafe_private_named.97,
-            nonprofit_status: self.__unsafe_private_named.98,
-            number_of_employees: self.__unsafe_private_named.99,
-            number_of_rooms: self.__unsafe_private_named.100,
-            opening_hours: self.__unsafe_private_named.101,
-            opening_hours_specification: self.__unsafe_private_named.102,
-            ownership_funding_info: self.__unsafe_private_named.103,
-            owns: self.__unsafe_private_named.104,
-            parent_organization: self.__unsafe_private_named.105,
-            payment_accepted: self.__unsafe_private_named.106,
-            pets_allowed: self.__unsafe_private_named.107,
-            photo: self.__unsafe_private_named.108,
-            photos: self.__unsafe_private_named.109,
-            potential_action: self.__unsafe_private_named.110,
-            price_range: self.__unsafe_private_named.111,
-            public_access: self.__unsafe_private_named.112,
-            publishing_principles: self.__unsafe_private_named.113,
-            review: self.__unsafe_private_named.114,
-            reviews: self.__unsafe_private_named.115,
-            same_as: self.__unsafe_private_named.116,
-            seeks: self.__unsafe_private_named.117,
-            service_area: self.__unsafe_private_named.118,
-            skills: self.__unsafe_private_named.119,
-            slogan: self.__unsafe_private_named.120,
-            smoking_allowed: self.__unsafe_private_named.121,
-            special_opening_hours_specification: self.__unsafe_private_named.122,
-            sponsor: self.__unsafe_private_named.123,
-            star_rating: self.__unsafe_private_named.124,
-            sub_organization: self.__unsafe_private_named.125,
-            subject_of: self.__unsafe_private_named.126,
-            tax_id: self.__unsafe_private_named.127,
-            telephone: self.__unsafe_private_named.128,
-            tour_booking_page: self.__unsafe_private_named.129,
-            unnamed_sources_policy: self.__unsafe_private_named.130,
-            url: self.__unsafe_private_named.131,
-            vat_id: self.__unsafe_private_named.132,
+            accepted_payment_method: self._fields.0,
+            actionable_feedback_policy: self._fields.1,
+            additional_property: self._fields.2,
+            additional_type: self._fields.3,
+            address: self._fields.4,
+            agent_interaction_statistic: self._fields.5,
+            aggregate_rating: self._fields.6,
+            alternate_name: self._fields.7,
+            alumni: self._fields.8,
+            amenity_feature: self._fields.9,
+            area_served: self._fields.10,
+            audience: self._fields.11,
+            available_language: self._fields.12,
+            award: self._fields.13,
+            awards: self._fields.14,
+            branch_code: self._fields.15,
+            branch_of: self._fields.16,
+            brand: self._fields.17,
+            checkin_time: self._fields.18,
+            checkout_time: self._fields.19,
+            company_registration: self._fields.20,
+            contact_point: self._fields.21,
+            contact_points: self._fields.22,
+            contained_in: self._fields.23,
+            contained_in_place: self._fields.24,
+            contains_place: self._fields.25,
+            corrections_policy: self._fields.26,
+            currencies_accepted: self._fields.27,
+            department: self._fields.28,
+            description: self._fields.29,
+            disambiguating_description: self._fields.30,
+            dissolution_date: self._fields.31,
+            diversity_policy: self._fields.32,
+            diversity_staffing_report: self._fields.33,
+            duns: self._fields.34,
+            email: self._fields.35,
+            employee: self._fields.36,
+            employees: self._fields.37,
+            ethics_policy: self._fields.38,
+            event: self._fields.39,
+            events: self._fields.40,
+            fax_number: self._fields.41,
+            founder: self._fields.42,
+            founders: self._fields.43,
+            founding_date: self._fields.44,
+            founding_location: self._fields.45,
+            funder: self._fields.46,
+            funding: self._fields.47,
+            geo: self._fields.48,
+            geo_contains: self._fields.49,
+            geo_covered_by: self._fields.50,
+            geo_covers: self._fields.51,
+            geo_crosses: self._fields.52,
+            geo_disjoint: self._fields.53,
+            geo_equals: self._fields.54,
+            geo_intersects: self._fields.55,
+            geo_overlaps: self._fields.56,
+            geo_touches: self._fields.57,
+            geo_within: self._fields.58,
+            global_location_number: self._fields.59,
+            has_certification: self._fields.60,
+            has_credential: self._fields.61,
+            has_drive_through_service: self._fields.62,
+            has_gs1_digital_link: self._fields.63,
+            has_map: self._fields.64,
+            has_member_program: self._fields.65,
+            has_merchant_return_policy: self._fields.66,
+            has_offer_catalog: self._fields.67,
+            has_pos: self._fields.68,
+            has_product_return_policy: self._fields.69,
+            has_shipping_service: self._fields.70,
+            identifier: self._fields.71,
+            image: self._fields.72,
+            interaction_statistic: self._fields.73,
+            is_accessible_for_free: self._fields.74,
+            isic_v4: self._fields.75,
+            iso6523_code: self._fields.76,
+            keywords: self._fields.77,
+            knows_about: self._fields.78,
+            knows_language: self._fields.79,
+            latitude: self._fields.80,
+            legal_address: self._fields.81,
+            legal_name: self._fields.82,
+            legal_representative: self._fields.83,
+            lei_code: self._fields.84,
+            location: self._fields.85,
+            logo: self._fields.86,
+            longitude: self._fields.87,
+            main_entity_of_page: self._fields.88,
+            makes_offer: self._fields.89,
+            map: self._fields.90,
+            maps: self._fields.91,
+            maximum_attendee_capacity: self._fields.92,
+            member: self._fields.93,
+            member_of: self._fields.94,
+            members: self._fields.95,
+            naics: self._fields.96,
+            name: self._fields.97,
+            nonprofit_status: self._fields.98,
+            number_of_employees: self._fields.99,
+            number_of_rooms: self._fields.100,
+            opening_hours: self._fields.101,
+            opening_hours_specification: self._fields.102,
+            ownership_funding_info: self._fields.103,
+            owns: self._fields.104,
+            parent_organization: self._fields.105,
+            payment_accepted: self._fields.106,
+            pets_allowed: self._fields.107,
+            photo: self._fields.108,
+            photos: self._fields.109,
+            potential_action: self._fields.110,
+            price_range: self._fields.111,
+            public_access: self._fields.112,
+            publishing_principles: self._fields.113,
+            review: self._fields.114,
+            reviews: self._fields.115,
+            same_as: self._fields.116,
+            seeks: self._fields.117,
+            service_area: self._fields.118,
+            skills: self._fields.119,
+            slogan: self._fields.120,
+            smoking_allowed: self._fields.121,
+            special_opening_hours_specification: self._fields.122,
+            sponsor: self._fields.123,
+            star_rating: self._fields.124,
+            sub_organization: self._fields.125,
+            subject_of: self._fields.126,
+            tax_id: self._fields.127,
+            telephone: self._fields.128,
+            tour_booking_page: self._fields.129,
+            unnamed_sources_policy: self._fields.130,
+            url: self._fields.131,
+            vat_id: self._fields.132,
             extra_data: Default::default(),
         }
     }
@@ -8129,139 +8132,139 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Hotel<'a> {
         Hotel {
-            accepted_payment_method: self.__unsafe_private_named.0,
-            actionable_feedback_policy: self.__unsafe_private_named.1,
-            additional_property: self.__unsafe_private_named.2,
-            additional_type: self.__unsafe_private_named.3,
-            address: self.__unsafe_private_named.4,
-            agent_interaction_statistic: self.__unsafe_private_named.5,
-            aggregate_rating: self.__unsafe_private_named.6,
-            alternate_name: self.__unsafe_private_named.7,
-            alumni: self.__unsafe_private_named.8,
-            amenity_feature: self.__unsafe_private_named.9,
-            area_served: self.__unsafe_private_named.10,
-            audience: self.__unsafe_private_named.11,
-            available_language: self.__unsafe_private_named.12,
-            award: self.__unsafe_private_named.13,
-            awards: self.__unsafe_private_named.14,
-            branch_code: self.__unsafe_private_named.15,
-            branch_of: self.__unsafe_private_named.16,
-            brand: self.__unsafe_private_named.17,
-            checkin_time: self.__unsafe_private_named.18,
-            checkout_time: self.__unsafe_private_named.19,
-            company_registration: self.__unsafe_private_named.20,
-            contact_point: self.__unsafe_private_named.21,
-            contact_points: self.__unsafe_private_named.22,
-            contained_in: self.__unsafe_private_named.23,
-            contained_in_place: self.__unsafe_private_named.24,
-            contains_place: self.__unsafe_private_named.25,
-            corrections_policy: self.__unsafe_private_named.26,
-            currencies_accepted: self.__unsafe_private_named.27,
-            department: self.__unsafe_private_named.28,
-            description: self.__unsafe_private_named.29,
-            disambiguating_description: self.__unsafe_private_named.30,
-            dissolution_date: self.__unsafe_private_named.31,
-            diversity_policy: self.__unsafe_private_named.32,
-            diversity_staffing_report: self.__unsafe_private_named.33,
-            duns: self.__unsafe_private_named.34,
-            email: self.__unsafe_private_named.35,
-            employee: self.__unsafe_private_named.36,
-            employees: self.__unsafe_private_named.37,
-            ethics_policy: self.__unsafe_private_named.38,
-            event: self.__unsafe_private_named.39,
-            events: self.__unsafe_private_named.40,
-            fax_number: self.__unsafe_private_named.41,
-            founder: self.__unsafe_private_named.42,
-            founders: self.__unsafe_private_named.43,
-            founding_date: self.__unsafe_private_named.44,
-            founding_location: self.__unsafe_private_named.45,
-            funder: self.__unsafe_private_named.46,
-            funding: self.__unsafe_private_named.47,
-            geo: self.__unsafe_private_named.48,
-            geo_contains: self.__unsafe_private_named.49,
-            geo_covered_by: self.__unsafe_private_named.50,
-            geo_covers: self.__unsafe_private_named.51,
-            geo_crosses: self.__unsafe_private_named.52,
-            geo_disjoint: self.__unsafe_private_named.53,
-            geo_equals: self.__unsafe_private_named.54,
-            geo_intersects: self.__unsafe_private_named.55,
-            geo_overlaps: self.__unsafe_private_named.56,
-            geo_touches: self.__unsafe_private_named.57,
-            geo_within: self.__unsafe_private_named.58,
-            global_location_number: self.__unsafe_private_named.59,
-            has_certification: self.__unsafe_private_named.60,
-            has_credential: self.__unsafe_private_named.61,
-            has_drive_through_service: self.__unsafe_private_named.62,
-            has_gs1_digital_link: self.__unsafe_private_named.63,
-            has_map: self.__unsafe_private_named.64,
-            has_member_program: self.__unsafe_private_named.65,
-            has_merchant_return_policy: self.__unsafe_private_named.66,
-            has_offer_catalog: self.__unsafe_private_named.67,
-            has_pos: self.__unsafe_private_named.68,
-            has_product_return_policy: self.__unsafe_private_named.69,
-            has_shipping_service: self.__unsafe_private_named.70,
-            identifier: self.__unsafe_private_named.71,
-            image: self.__unsafe_private_named.72,
-            interaction_statistic: self.__unsafe_private_named.73,
-            is_accessible_for_free: self.__unsafe_private_named.74,
-            isic_v4: self.__unsafe_private_named.75,
-            iso6523_code: self.__unsafe_private_named.76,
-            keywords: self.__unsafe_private_named.77,
-            knows_about: self.__unsafe_private_named.78,
-            knows_language: self.__unsafe_private_named.79,
-            latitude: self.__unsafe_private_named.80,
-            legal_address: self.__unsafe_private_named.81,
-            legal_name: self.__unsafe_private_named.82,
-            legal_representative: self.__unsafe_private_named.83,
-            lei_code: self.__unsafe_private_named.84,
-            location: self.__unsafe_private_named.85,
-            logo: self.__unsafe_private_named.86,
-            longitude: self.__unsafe_private_named.87,
-            main_entity_of_page: self.__unsafe_private_named.88,
-            makes_offer: self.__unsafe_private_named.89,
-            map: self.__unsafe_private_named.90,
-            maps: self.__unsafe_private_named.91,
-            maximum_attendee_capacity: self.__unsafe_private_named.92,
-            member: self.__unsafe_private_named.93,
-            member_of: self.__unsafe_private_named.94,
-            members: self.__unsafe_private_named.95,
-            naics: self.__unsafe_private_named.96,
-            name: self.__unsafe_private_named.97,
-            nonprofit_status: self.__unsafe_private_named.98,
-            number_of_employees: self.__unsafe_private_named.99,
-            number_of_rooms: self.__unsafe_private_named.100,
-            opening_hours: self.__unsafe_private_named.101,
-            opening_hours_specification: self.__unsafe_private_named.102,
-            ownership_funding_info: self.__unsafe_private_named.103,
-            owns: self.__unsafe_private_named.104,
-            parent_organization: self.__unsafe_private_named.105,
-            payment_accepted: self.__unsafe_private_named.106,
-            pets_allowed: self.__unsafe_private_named.107,
-            photo: self.__unsafe_private_named.108,
-            photos: self.__unsafe_private_named.109,
-            potential_action: self.__unsafe_private_named.110,
-            price_range: self.__unsafe_private_named.111,
-            public_access: self.__unsafe_private_named.112,
-            publishing_principles: self.__unsafe_private_named.113,
-            review: self.__unsafe_private_named.114,
-            reviews: self.__unsafe_private_named.115,
-            same_as: self.__unsafe_private_named.116,
-            seeks: self.__unsafe_private_named.117,
-            service_area: self.__unsafe_private_named.118,
-            skills: self.__unsafe_private_named.119,
-            slogan: self.__unsafe_private_named.120,
-            smoking_allowed: self.__unsafe_private_named.121,
-            special_opening_hours_specification: self.__unsafe_private_named.122,
-            sponsor: self.__unsafe_private_named.123,
-            star_rating: self.__unsafe_private_named.124,
-            sub_organization: self.__unsafe_private_named.125,
-            subject_of: self.__unsafe_private_named.126,
-            tax_id: self.__unsafe_private_named.127,
-            telephone: self.__unsafe_private_named.128,
-            tour_booking_page: self.__unsafe_private_named.129,
-            unnamed_sources_policy: self.__unsafe_private_named.130,
-            url: self.__unsafe_private_named.131,
-            vat_id: self.__unsafe_private_named.132,
+            accepted_payment_method: self._fields.0,
+            actionable_feedback_policy: self._fields.1,
+            additional_property: self._fields.2,
+            additional_type: self._fields.3,
+            address: self._fields.4,
+            agent_interaction_statistic: self._fields.5,
+            aggregate_rating: self._fields.6,
+            alternate_name: self._fields.7,
+            alumni: self._fields.8,
+            amenity_feature: self._fields.9,
+            area_served: self._fields.10,
+            audience: self._fields.11,
+            available_language: self._fields.12,
+            award: self._fields.13,
+            awards: self._fields.14,
+            branch_code: self._fields.15,
+            branch_of: self._fields.16,
+            brand: self._fields.17,
+            checkin_time: self._fields.18,
+            checkout_time: self._fields.19,
+            company_registration: self._fields.20,
+            contact_point: self._fields.21,
+            contact_points: self._fields.22,
+            contained_in: self._fields.23,
+            contained_in_place: self._fields.24,
+            contains_place: self._fields.25,
+            corrections_policy: self._fields.26,
+            currencies_accepted: self._fields.27,
+            department: self._fields.28,
+            description: self._fields.29,
+            disambiguating_description: self._fields.30,
+            dissolution_date: self._fields.31,
+            diversity_policy: self._fields.32,
+            diversity_staffing_report: self._fields.33,
+            duns: self._fields.34,
+            email: self._fields.35,
+            employee: self._fields.36,
+            employees: self._fields.37,
+            ethics_policy: self._fields.38,
+            event: self._fields.39,
+            events: self._fields.40,
+            fax_number: self._fields.41,
+            founder: self._fields.42,
+            founders: self._fields.43,
+            founding_date: self._fields.44,
+            founding_location: self._fields.45,
+            funder: self._fields.46,
+            funding: self._fields.47,
+            geo: self._fields.48,
+            geo_contains: self._fields.49,
+            geo_covered_by: self._fields.50,
+            geo_covers: self._fields.51,
+            geo_crosses: self._fields.52,
+            geo_disjoint: self._fields.53,
+            geo_equals: self._fields.54,
+            geo_intersects: self._fields.55,
+            geo_overlaps: self._fields.56,
+            geo_touches: self._fields.57,
+            geo_within: self._fields.58,
+            global_location_number: self._fields.59,
+            has_certification: self._fields.60,
+            has_credential: self._fields.61,
+            has_drive_through_service: self._fields.62,
+            has_gs1_digital_link: self._fields.63,
+            has_map: self._fields.64,
+            has_member_program: self._fields.65,
+            has_merchant_return_policy: self._fields.66,
+            has_offer_catalog: self._fields.67,
+            has_pos: self._fields.68,
+            has_product_return_policy: self._fields.69,
+            has_shipping_service: self._fields.70,
+            identifier: self._fields.71,
+            image: self._fields.72,
+            interaction_statistic: self._fields.73,
+            is_accessible_for_free: self._fields.74,
+            isic_v4: self._fields.75,
+            iso6523_code: self._fields.76,
+            keywords: self._fields.77,
+            knows_about: self._fields.78,
+            knows_language: self._fields.79,
+            latitude: self._fields.80,
+            legal_address: self._fields.81,
+            legal_name: self._fields.82,
+            legal_representative: self._fields.83,
+            lei_code: self._fields.84,
+            location: self._fields.85,
+            logo: self._fields.86,
+            longitude: self._fields.87,
+            main_entity_of_page: self._fields.88,
+            makes_offer: self._fields.89,
+            map: self._fields.90,
+            maps: self._fields.91,
+            maximum_attendee_capacity: self._fields.92,
+            member: self._fields.93,
+            member_of: self._fields.94,
+            members: self._fields.95,
+            naics: self._fields.96,
+            name: self._fields.97,
+            nonprofit_status: self._fields.98,
+            number_of_employees: self._fields.99,
+            number_of_rooms: self._fields.100,
+            opening_hours: self._fields.101,
+            opening_hours_specification: self._fields.102,
+            ownership_funding_info: self._fields.103,
+            owns: self._fields.104,
+            parent_organization: self._fields.105,
+            payment_accepted: self._fields.106,
+            pets_allowed: self._fields.107,
+            photo: self._fields.108,
+            photos: self._fields.109,
+            potential_action: self._fields.110,
+            price_range: self._fields.111,
+            public_access: self._fields.112,
+            publishing_principles: self._fields.113,
+            review: self._fields.114,
+            reviews: self._fields.115,
+            same_as: self._fields.116,
+            seeks: self._fields.117,
+            service_area: self._fields.118,
+            skills: self._fields.119,
+            slogan: self._fields.120,
+            smoking_allowed: self._fields.121,
+            special_opening_hours_specification: self._fields.122,
+            sponsor: self._fields.123,
+            star_rating: self._fields.124,
+            sub_organization: self._fields.125,
+            subject_of: self._fields.126,
+            tax_id: self._fields.127,
+            telephone: self._fields.128,
+            tour_booking_page: self._fields.129,
+            unnamed_sources_policy: self._fields.130,
+            url: self._fields.131,
+            vat_id: self._fields.132,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/image_object.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/image_object.rs
index 7d40f77c..a6a12e94 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/image_object.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/image_object.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -6236,8 +6239,8 @@ pub mod image_object_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImageObjectBuilder<'a, S: image_object_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ImageObjectAbout<'a>>,
         Option<ImageObjectAbstract<'a>>,
         Option<ImageObjectAccessMode<'a>>,
@@ -6388,7 +6391,7 @@ pub struct ImageObjectBuilder<'a, S: image_object_state::State> {
         Option<ImageObjectWorkExample<'a>>,
         Option<ImageObjectWorkTranslation<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ImageObject<'a> {
@@ -6402,8 +6405,8 @@ impl<'a> ImageObjectBuilder<'a, image_object_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageObjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -6554,7 +6557,7 @@ impl<'a> ImageObjectBuilder<'a, image_object_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6562,12 +6565,12 @@ impl<'a> ImageObjectBuilder<'a, image_object_state::Empty> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `about` field (optional)
     pub fn about(mut self, value: impl Into<Option<ImageObjectAbout<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `about` field to an Option value (optional)
     pub fn maybe_about(mut self, value: Option<ImageObjectAbout<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -6578,12 +6581,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAbstract<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `abstract` field to an Option value (optional)
     pub fn maybe_abstract(mut self, value: Option<ImageObjectAbstract<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -6594,7 +6597,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAccessMode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `accessMode` field to an Option value (optional)
@@ -6602,7 +6605,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectAccessMode<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -6613,7 +6616,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAccessModeSufficient<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `accessModeSufficient` field to an Option value (optional)
@@ -6621,7 +6624,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectAccessModeSufficient<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -6632,7 +6635,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAccessibilityApi<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `accessibilityAPI` field to an Option value (optional)
@@ -6640,7 +6643,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectAccessibilityApi<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -6651,7 +6654,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAccessibilityControl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `accessibilityControl` field to an Option value (optional)
@@ -6659,7 +6662,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectAccessibilityControl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -6670,7 +6673,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAccessibilityFeature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `accessibilityFeature` field to an Option value (optional)
@@ -6678,7 +6681,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectAccessibilityFeature<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -6689,7 +6692,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAccessibilityHazard<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `accessibilityHazard` field to an Option value (optional)
@@ -6697,7 +6700,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectAccessibilityHazard<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -6708,7 +6711,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAccessibilitySummary<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `accessibilitySummary` field to an Option value (optional)
@@ -6716,7 +6719,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectAccessibilitySummary<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -6727,7 +6730,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAccountablePerson<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `accountablePerson` field to an Option value (optional)
@@ -6735,7 +6738,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectAccountablePerson<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -6746,7 +6749,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAcquireLicensePage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `acquireLicensePage` field to an Option value (optional)
@@ -6754,7 +6757,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectAcquireLicensePage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -6765,7 +6768,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -6773,7 +6776,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -6784,7 +6787,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -6792,7 +6795,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -6803,7 +6806,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -6811,7 +6814,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -6822,7 +6825,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAlternativeHeadline<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `alternativeHeadline` field to an Option value (optional)
@@ -6830,7 +6833,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectAlternativeHeadline<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -6841,7 +6844,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectArchivedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `archivedAt` field to an Option value (optional)
@@ -6849,7 +6852,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectArchivedAt<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -6860,12 +6863,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAssesses<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `assesses` field to an Option value (optional)
     pub fn maybe_assesses(mut self, value: Option<ImageObjectAssesses<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -6876,7 +6879,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAssociatedArticle<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `associatedArticle` field to an Option value (optional)
@@ -6884,7 +6887,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectAssociatedArticle<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -6895,7 +6898,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAssociatedMedia<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `associatedMedia` field to an Option value (optional)
@@ -6903,7 +6906,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectAssociatedMedia<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -6914,12 +6917,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectAudience<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `audience` field to an Option value (optional)
     pub fn maybe_audience(mut self, value: Option<ImageObjectAudience<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -6927,12 +6930,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `audio` field (optional)
     pub fn audio(mut self, value: impl Into<Option<ImageObjectAudio<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `audio` field to an Option value (optional)
     pub fn maybe_audio(mut self, value: Option<ImageObjectAudio<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -6940,12 +6943,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<ImageObjectAuthor<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<ImageObjectAuthor<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -6953,12 +6956,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<ImageObjectAward<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<ImageObjectAward<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -6966,12 +6969,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<ImageObjectAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<ImageObjectAwards<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -6979,12 +6982,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `bitrate` field (optional)
     pub fn bitrate(mut self, value: impl Into<Option<ImageObjectBitrate<'a>>>) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `bitrate` field to an Option value (optional)
     pub fn maybe_bitrate(mut self, value: Option<ImageObjectBitrate<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -6992,12 +6995,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `caption` field (optional)
     pub fn caption(mut self, value: impl Into<Option<ImageObjectCaption<'a>>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `caption` field to an Option value (optional)
     pub fn maybe_caption(mut self, value: Option<ImageObjectCaption<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -7008,12 +7011,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectCharacter<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `character` field to an Option value (optional)
     pub fn maybe_character(mut self, value: Option<ImageObjectCharacter<'a>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -7024,12 +7027,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectCitation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `citation` field to an Option value (optional)
     pub fn maybe_citation(mut self, value: Option<ImageObjectCitation<'a>>) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -7037,12 +7040,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<ImageObjectComment<'a>>>) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<ImageObjectComment<'a>>) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -7053,7 +7056,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectCommentCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `commentCount` field to an Option value (optional)
@@ -7061,7 +7064,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectCommentCount<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -7072,7 +7075,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectConditionsOfAccess<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `conditionsOfAccess` field to an Option value (optional)
@@ -7080,7 +7083,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectConditionsOfAccess<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -7091,7 +7094,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectContentLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `contentLocation` field to an Option value (optional)
@@ -7099,7 +7102,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectContentLocation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -7110,7 +7113,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectContentRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `contentRating` field to an Option value (optional)
@@ -7118,7 +7121,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectContentRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -7129,7 +7132,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectContentReferenceTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `contentReferenceTime` field to an Option value (optional)
@@ -7137,7 +7140,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectContentReferenceTime<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -7148,7 +7151,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectContentSize<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `contentSize` field to an Option value (optional)
@@ -7156,7 +7159,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectContentSize<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -7167,7 +7170,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectContentUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `contentUrl` field to an Option value (optional)
@@ -7175,7 +7178,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectContentUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -7186,7 +7189,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectContributor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `contributor` field to an Option value (optional)
@@ -7194,7 +7197,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectContributor<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -7205,7 +7208,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectCopyrightHolder<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `copyrightHolder` field to an Option value (optional)
@@ -7213,7 +7216,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectCopyrightHolder<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -7224,7 +7227,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectCopyrightNotice<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `copyrightNotice` field to an Option value (optional)
@@ -7232,7 +7235,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectCopyrightNotice<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -7243,7 +7246,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectCopyrightYear<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `copyrightYear` field to an Option value (optional)
@@ -7251,7 +7254,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectCopyrightYear<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -7262,12 +7265,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectCorrection<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `correction` field to an Option value (optional)
     pub fn maybe_correction(mut self, value: Option<ImageObjectCorrection<'a>>) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -7278,7 +7281,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectCountryOfOrigin<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `countryOfOrigin` field to an Option value (optional)
@@ -7286,7 +7289,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectCountryOfOrigin<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -7297,7 +7300,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectCreativeWorkStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `creativeWorkStatus` field to an Option value (optional)
@@ -7305,7 +7308,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectCreativeWorkStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -7313,12 +7316,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `creator` field (optional)
     pub fn creator(mut self, value: impl Into<Option<ImageObjectCreator<'a>>>) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `creator` field to an Option value (optional)
     pub fn maybe_creator(mut self, value: Option<ImageObjectCreator<'a>>) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -7329,7 +7332,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectCreditText<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `creditText` field to an Option value (optional)
@@ -7337,7 +7340,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectCreditText<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -7348,7 +7351,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectDateCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `dateCreated` field to an Option value (optional)
@@ -7356,7 +7359,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectDateCreated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -7367,7 +7370,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectDateModified<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `dateModified` field to an Option value (optional)
@@ -7375,7 +7378,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectDateModified<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -7386,7 +7389,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `datePublished` field to an Option value (optional)
@@ -7394,7 +7397,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -7405,7 +7408,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
@@ -7413,7 +7416,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -7424,7 +7427,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectDigitalSourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `digitalSourceType` field to an Option value (optional)
@@ -7432,7 +7435,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectDigitalSourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -7443,7 +7446,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -7451,7 +7454,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -7462,7 +7465,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectDiscussionUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `discussionUrl` field to an Option value (optional)
@@ -7470,7 +7473,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectDiscussionUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -7481,12 +7484,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectDuration<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `duration` field to an Option value (optional)
     pub fn maybe_duration(mut self, value: Option<ImageObjectDuration<'a>>) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -7497,12 +7500,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectEditEidr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `editEIDR` field to an Option value (optional)
     pub fn maybe_edit_eidr(mut self, value: Option<ImageObjectEditEidr<'a>>) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -7510,12 +7513,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `editor` field (optional)
     pub fn editor(mut self, value: impl Into<Option<ImageObjectEditor<'a>>>) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `editor` field to an Option value (optional)
     pub fn maybe_editor(mut self, value: Option<ImageObjectEditor<'a>>) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -7526,7 +7529,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectEducationalAlignment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `educationalAlignment` field to an Option value (optional)
@@ -7534,7 +7537,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectEducationalAlignment<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -7545,7 +7548,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectEducationalLevel<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `educationalLevel` field to an Option value (optional)
@@ -7553,7 +7556,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectEducationalLevel<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -7564,7 +7567,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectEducationalUse<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `educationalUse` field to an Option value (optional)
@@ -7572,7 +7575,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectEducationalUse<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -7583,12 +7586,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectEmbedUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `embedUrl` field to an Option value (optional)
     pub fn maybe_embed_url(mut self, value: Option<ImageObjectEmbedUrl<'a>>) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -7599,7 +7602,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectEmbeddedTextCaption<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `embeddedTextCaption` field to an Option value (optional)
@@ -7607,7 +7610,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectEmbeddedTextCaption<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -7618,7 +7621,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectEncodesCreativeWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `encodesCreativeWork` field to an Option value (optional)
@@ -7626,7 +7629,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectEncodesCreativeWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -7637,12 +7640,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectEncoding<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `encoding` field to an Option value (optional)
     pub fn maybe_encoding(mut self, value: Option<ImageObjectEncoding<'a>>) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -7653,7 +7656,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectEncodingFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `encodingFormat` field to an Option value (optional)
@@ -7661,7 +7664,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectEncodingFormat<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -7672,12 +7675,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectEncodings<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `encodings` field to an Option value (optional)
     pub fn maybe_encodings(mut self, value: Option<ImageObjectEncodings<'a>>) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -7685,12 +7688,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `endTime` field (optional)
     pub fn end_time(mut self, value: impl Into<Option<ImageObjectEndTime<'a>>>) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `endTime` field to an Option value (optional)
     pub fn maybe_end_time(mut self, value: Option<ImageObjectEndTime<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -7701,7 +7704,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectExampleOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `exampleOfWork` field to an Option value (optional)
@@ -7709,7 +7712,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectExampleOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -7720,12 +7723,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectExifData<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `exifData` field to an Option value (optional)
     pub fn maybe_exif_data(mut self, value: Option<ImageObjectExifData<'a>>) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -7733,12 +7736,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `expires` field (optional)
     pub fn expires(mut self, value: impl Into<Option<ImageObjectExpires<'a>>>) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `expires` field to an Option value (optional)
     pub fn maybe_expires(mut self, value: Option<ImageObjectExpires<'a>>) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -7749,7 +7752,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectFileFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `fileFormat` field to an Option value (optional)
@@ -7757,7 +7760,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectFileFormat<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -7765,12 +7768,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<ImageObjectFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<ImageObjectFunder<'a>>) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -7778,12 +7781,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<ImageObjectFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<ImageObjectFunding<'a>>) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -7791,12 +7794,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<ImageObjectGenre<'a>>>) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<ImageObjectGenre<'a>>) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -7804,12 +7807,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `hasPart` field (optional)
     pub fn has_part(mut self, value: impl Into<Option<ImageObjectHasPart<'a>>>) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `hasPart` field to an Option value (optional)
     pub fn maybe_has_part(mut self, value: Option<ImageObjectHasPart<'a>>) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -7820,12 +7823,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectHeadline<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `headline` field to an Option value (optional)
     pub fn maybe_headline(mut self, value: Option<ImageObjectHeadline<'a>>) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -7833,12 +7836,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `height` field (optional)
     pub fn height(mut self, value: impl Into<Option<ImageObjectHeight<'a>>>) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `height` field to an Option value (optional)
     pub fn maybe_height(mut self, value: Option<ImageObjectHeight<'a>>) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -7849,12 +7852,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectIdentifier<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<ImageObjectIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -7862,12 +7865,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<ImageObjectImage<'a>>>) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<ImageObjectImage<'a>>) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -7878,7 +7881,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectInLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `inLanguage` field to an Option value (optional)
@@ -7886,7 +7889,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectInLanguage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -7897,7 +7900,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectIneligibleRegion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `ineligibleRegion` field to an Option value (optional)
@@ -7905,7 +7908,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectIneligibleRegion<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -7916,7 +7919,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value.into();
+        self._fields.79 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -7924,7 +7927,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value;
+        self._fields.79 = value;
         self
     }
 }
@@ -7935,7 +7938,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectInteractivityType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value.into();
+        self._fields.80 = value.into();
         self
     }
     /// Set the `interactivityType` field to an Option value (optional)
@@ -7943,7 +7946,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectInteractivityType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value;
+        self._fields.80 = value;
         self
     }
 }
@@ -7954,7 +7957,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectInterpretedAsClaim<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.81 = value.into();
+        self._fields.81 = value.into();
         self
     }
     /// Set the `interpretedAsClaim` field to an Option value (optional)
@@ -7962,7 +7965,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectInterpretedAsClaim<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.81 = value;
+        self._fields.81 = value;
         self
     }
 }
@@ -7973,7 +7976,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectIsAccessibleForFree<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value.into();
+        self._fields.82 = value.into();
         self
     }
     /// Set the `isAccessibleForFree` field to an Option value (optional)
@@ -7981,7 +7984,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectIsAccessibleForFree<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value;
+        self._fields.82 = value;
         self
     }
 }
@@ -7992,12 +7995,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectIsBasedOn<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.83 = value.into();
+        self._fields.83 = value.into();
         self
     }
     /// Set the `isBasedOn` field to an Option value (optional)
     pub fn maybe_is_based_on(mut self, value: Option<ImageObjectIsBasedOn<'a>>) -> Self {
-        self.__unsafe_private_named.83 = value;
+        self._fields.83 = value;
         self
     }
 }
@@ -8008,7 +8011,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectIsBasedOnUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value.into();
+        self._fields.84 = value.into();
         self
     }
     /// Set the `isBasedOnUrl` field to an Option value (optional)
@@ -8016,7 +8019,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectIsBasedOnUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value;
+        self._fields.84 = value;
         self
     }
 }
@@ -8027,7 +8030,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectIsFamilyFriendly<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.85 = value.into();
+        self._fields.85 = value.into();
         self
     }
     /// Set the `isFamilyFriendly` field to an Option value (optional)
@@ -8035,7 +8038,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectIsFamilyFriendly<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.85 = value;
+        self._fields.85 = value;
         self
     }
 }
@@ -8046,12 +8049,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectIsPartOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.86 = value.into();
+        self._fields.86 = value.into();
         self
     }
     /// Set the `isPartOf` field to an Option value (optional)
     pub fn maybe_is_part_of(mut self, value: Option<ImageObjectIsPartOf<'a>>) -> Self {
-        self.__unsafe_private_named.86 = value;
+        self._fields.86 = value;
         self
     }
 }
@@ -8062,12 +8065,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectKeywords<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.87 = value.into();
+        self._fields.87 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<ImageObjectKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.87 = value;
+        self._fields.87 = value;
         self
     }
 }
@@ -8078,7 +8081,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectLearningResourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.88 = value.into();
+        self._fields.88 = value.into();
         self
     }
     /// Set the `learningResourceType` field to an Option value (optional)
@@ -8086,7 +8089,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectLearningResourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.88 = value;
+        self._fields.88 = value;
         self
     }
 }
@@ -8094,12 +8097,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `license` field (optional)
     pub fn license(mut self, value: impl Into<Option<ImageObjectLicense<'a>>>) -> Self {
-        self.__unsafe_private_named.89 = value.into();
+        self._fields.89 = value.into();
         self
     }
     /// Set the `license` field to an Option value (optional)
     pub fn maybe_license(mut self, value: Option<ImageObjectLicense<'a>>) -> Self {
-        self.__unsafe_private_named.89 = value;
+        self._fields.89 = value;
         self
     }
 }
@@ -8110,7 +8113,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectLocationCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.90 = value.into();
+        self._fields.90 = value.into();
         self
     }
     /// Set the `locationCreated` field to an Option value (optional)
@@ -8118,7 +8121,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectLocationCreated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.90 = value;
+        self._fields.90 = value;
         self
     }
 }
@@ -8129,7 +8132,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectMainEntity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.91 = value.into();
+        self._fields.91 = value.into();
         self
     }
     /// Set the `mainEntity` field to an Option value (optional)
@@ -8137,7 +8140,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectMainEntity<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.91 = value;
+        self._fields.91 = value;
         self
     }
 }
@@ -8148,7 +8151,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.92 = value.into();
+        self._fields.92 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -8156,7 +8159,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.92 = value;
+        self._fields.92 = value;
         self
     }
 }
@@ -8167,12 +8170,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectMaintainer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.93 = value.into();
+        self._fields.93 = value.into();
         self
     }
     /// Set the `maintainer` field to an Option value (optional)
     pub fn maybe_maintainer(mut self, value: Option<ImageObjectMaintainer<'a>>) -> Self {
-        self.__unsafe_private_named.93 = value;
+        self._fields.93 = value;
         self
     }
 }
@@ -8183,12 +8186,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectMaterial<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value.into();
+        self._fields.94 = value.into();
         self
     }
     /// Set the `material` field to an Option value (optional)
     pub fn maybe_material(mut self, value: Option<ImageObjectMaterial<'a>>) -> Self {
-        self.__unsafe_private_named.94 = value;
+        self._fields.94 = value;
         self
     }
 }
@@ -8199,7 +8202,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectMaterialExtent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.95 = value.into();
+        self._fields.95 = value.into();
         self
     }
     /// Set the `materialExtent` field to an Option value (optional)
@@ -8207,7 +8210,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectMaterialExtent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.95 = value;
+        self._fields.95 = value;
         self
     }
 }
@@ -8218,12 +8221,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectMentions<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.96 = value.into();
+        self._fields.96 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<ImageObjectMentions<'a>>) -> Self {
-        self.__unsafe_private_named.96 = value;
+        self._fields.96 = value;
         self
     }
 }
@@ -8231,12 +8234,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<ImageObjectName<'a>>>) -> Self {
-        self.__unsafe_private_named.97 = value.into();
+        self._fields.97 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<ImageObjectName<'a>>) -> Self {
-        self.__unsafe_private_named.97 = value;
+        self._fields.97 = value;
         self
     }
 }
@@ -8244,12 +8247,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `offers` field (optional)
     pub fn offers(mut self, value: impl Into<Option<ImageObjectOffers<'a>>>) -> Self {
-        self.__unsafe_private_named.98 = value.into();
+        self._fields.98 = value.into();
         self
     }
     /// Set the `offers` field to an Option value (optional)
     pub fn maybe_offers(mut self, value: Option<ImageObjectOffers<'a>>) -> Self {
-        self.__unsafe_private_named.98 = value;
+        self._fields.98 = value;
         self
     }
 }
@@ -8257,12 +8260,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `pattern` field (optional)
     pub fn pattern(mut self, value: impl Into<Option<ImageObjectPattern<'a>>>) -> Self {
-        self.__unsafe_private_named.99 = value.into();
+        self._fields.99 = value.into();
         self
     }
     /// Set the `pattern` field to an Option value (optional)
     pub fn maybe_pattern(mut self, value: Option<ImageObjectPattern<'a>>) -> Self {
-        self.__unsafe_private_named.99 = value;
+        self._fields.99 = value;
         self
     }
 }
@@ -8273,7 +8276,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectPlayerType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value.into();
+        self._fields.100 = value.into();
         self
     }
     /// Set the `playerType` field to an Option value (optional)
@@ -8281,7 +8284,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectPlayerType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value;
+        self._fields.100 = value;
         self
     }
 }
@@ -8292,12 +8295,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectPosition<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value.into();
+        self._fields.101 = value.into();
         self
     }
     /// Set the `position` field to an Option value (optional)
     pub fn maybe_position(mut self, value: Option<ImageObjectPosition<'a>>) -> Self {
-        self.__unsafe_private_named.101 = value;
+        self._fields.101 = value;
         self
     }
 }
@@ -8308,7 +8311,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectPotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value.into();
+        self._fields.102 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -8316,7 +8319,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectPotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value;
+        self._fields.102 = value;
         self
     }
 }
@@ -8327,12 +8330,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectProducer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.103 = value.into();
+        self._fields.103 = value.into();
         self
     }
     /// Set the `producer` field to an Option value (optional)
     pub fn maybe_producer(mut self, value: Option<ImageObjectProducer<'a>>) -> Self {
-        self.__unsafe_private_named.103 = value;
+        self._fields.103 = value;
         self
     }
 }
@@ -8343,7 +8346,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectProductionCompany<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value.into();
+        self._fields.104 = value.into();
         self
     }
     /// Set the `productionCompany` field to an Option value (optional)
@@ -8351,7 +8354,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectProductionCompany<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value;
+        self._fields.104 = value;
         self
     }
 }
@@ -8362,12 +8365,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectProvider<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.105 = value.into();
+        self._fields.105 = value.into();
         self
     }
     /// Set the `provider` field to an Option value (optional)
     pub fn maybe_provider(mut self, value: Option<ImageObjectProvider<'a>>) -> Self {
-        self.__unsafe_private_named.105 = value;
+        self._fields.105 = value;
         self
     }
 }
@@ -8378,7 +8381,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectPublication<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value.into();
+        self._fields.106 = value.into();
         self
     }
     /// Set the `publication` field to an Option value (optional)
@@ -8386,7 +8389,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectPublication<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value;
+        self._fields.106 = value;
         self
     }
 }
@@ -8397,12 +8400,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectPublisher<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value.into();
+        self._fields.107 = value.into();
         self
     }
     /// Set the `publisher` field to an Option value (optional)
     pub fn maybe_publisher(mut self, value: Option<ImageObjectPublisher<'a>>) -> Self {
-        self.__unsafe_private_named.107 = value;
+        self._fields.107 = value;
         self
     }
 }
@@ -8413,7 +8416,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectPublisherImprint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.108 = value.into();
+        self._fields.108 = value.into();
         self
     }
     /// Set the `publisherImprint` field to an Option value (optional)
@@ -8421,7 +8424,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectPublisherImprint<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.108 = value;
+        self._fields.108 = value;
         self
     }
 }
@@ -8432,7 +8435,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectPublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.109 = value.into();
+        self._fields.109 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -8440,7 +8443,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectPublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.109 = value;
+        self._fields.109 = value;
         self
     }
 }
@@ -8451,7 +8454,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectRecordedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.110 = value.into();
+        self._fields.110 = value.into();
         self
     }
     /// Set the `recordedAt` field to an Option value (optional)
@@ -8459,7 +8462,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectRecordedAt<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.110 = value;
+        self._fields.110 = value;
         self
     }
 }
@@ -8470,7 +8473,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectRegionsAllowed<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.111 = value.into();
+        self._fields.111 = value.into();
         self
     }
     /// Set the `regionsAllowed` field to an Option value (optional)
@@ -8478,7 +8481,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectRegionsAllowed<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.111 = value;
+        self._fields.111 = value;
         self
     }
 }
@@ -8489,7 +8492,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectReleasedEvent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value.into();
+        self._fields.112 = value.into();
         self
     }
     /// Set the `releasedEvent` field to an Option value (optional)
@@ -8497,7 +8500,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectReleasedEvent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value;
+        self._fields.112 = value;
         self
     }
 }
@@ -8508,7 +8511,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectRepresentativeOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value.into();
+        self._fields.113 = value.into();
         self
     }
     /// Set the `representativeOfPage` field to an Option value (optional)
@@ -8516,7 +8519,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectRepresentativeOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value;
+        self._fields.113 = value;
         self
     }
 }
@@ -8527,7 +8530,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectRequiresSubscription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.114 = value.into();
+        self._fields.114 = value.into();
         self
     }
     /// Set the `requiresSubscription` field to an Option value (optional)
@@ -8535,7 +8538,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectRequiresSubscription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.114 = value;
+        self._fields.114 = value;
         self
     }
 }
@@ -8543,12 +8546,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<ImageObjectReview<'a>>>) -> Self {
-        self.__unsafe_private_named.115 = value.into();
+        self._fields.115 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<ImageObjectReview<'a>>) -> Self {
-        self.__unsafe_private_named.115 = value;
+        self._fields.115 = value;
         self
     }
 }
@@ -8556,12 +8559,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `reviews` field (optional)
     pub fn reviews(mut self, value: impl Into<Option<ImageObjectReviews<'a>>>) -> Self {
-        self.__unsafe_private_named.116 = value.into();
+        self._fields.116 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<ImageObjectReviews<'a>>) -> Self {
-        self.__unsafe_private_named.116 = value;
+        self._fields.116 = value;
         self
     }
 }
@@ -8569,12 +8572,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<ImageObjectSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.117 = value.into();
+        self._fields.117 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<ImageObjectSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.117 = value;
+        self._fields.117 = value;
         self
     }
 }
@@ -8585,7 +8588,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectSchemaVersion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.118 = value.into();
+        self._fields.118 = value.into();
         self
     }
     /// Set the `schemaVersion` field to an Option value (optional)
@@ -8593,7 +8596,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectSchemaVersion<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.118 = value;
+        self._fields.118 = value;
         self
     }
 }
@@ -8604,7 +8607,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectSdDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.119 = value.into();
+        self._fields.119 = value.into();
         self
     }
     /// Set the `sdDatePublished` field to an Option value (optional)
@@ -8612,7 +8615,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectSdDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.119 = value;
+        self._fields.119 = value;
         self
     }
 }
@@ -8623,12 +8626,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectSdLicense<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.120 = value.into();
+        self._fields.120 = value.into();
         self
     }
     /// Set the `sdLicense` field to an Option value (optional)
     pub fn maybe_sd_license(mut self, value: Option<ImageObjectSdLicense<'a>>) -> Self {
-        self.__unsafe_private_named.120 = value;
+        self._fields.120 = value;
         self
     }
 }
@@ -8639,7 +8642,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectSdPublisher<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.121 = value.into();
+        self._fields.121 = value.into();
         self
     }
     /// Set the `sdPublisher` field to an Option value (optional)
@@ -8647,7 +8650,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectSdPublisher<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.121 = value;
+        self._fields.121 = value;
         self
     }
 }
@@ -8655,12 +8658,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `sha256` field (optional)
     pub fn sha256(mut self, value: impl Into<Option<ImageObjectSha256<'a>>>) -> Self {
-        self.__unsafe_private_named.122 = value.into();
+        self._fields.122 = value.into();
         self
     }
     /// Set the `sha256` field to an Option value (optional)
     pub fn maybe_sha256(mut self, value: Option<ImageObjectSha256<'a>>) -> Self {
-        self.__unsafe_private_named.122 = value;
+        self._fields.122 = value;
         self
     }
 }
@@ -8668,12 +8671,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<ImageObjectSize<'a>>>) -> Self {
-        self.__unsafe_private_named.123 = value.into();
+        self._fields.123 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<ImageObjectSize<'a>>) -> Self {
-        self.__unsafe_private_named.123 = value;
+        self._fields.123 = value;
         self
     }
 }
@@ -8684,7 +8687,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectSourceOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.124 = value.into();
+        self._fields.124 = value.into();
         self
     }
     /// Set the `sourceOrganization` field to an Option value (optional)
@@ -8692,7 +8695,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectSourceOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.124 = value;
+        self._fields.124 = value;
         self
     }
 }
@@ -8700,12 +8703,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `spatial` field (optional)
     pub fn spatial(mut self, value: impl Into<Option<ImageObjectSpatial<'a>>>) -> Self {
-        self.__unsafe_private_named.125 = value.into();
+        self._fields.125 = value.into();
         self
     }
     /// Set the `spatial` field to an Option value (optional)
     pub fn maybe_spatial(mut self, value: Option<ImageObjectSpatial<'a>>) -> Self {
-        self.__unsafe_private_named.125 = value;
+        self._fields.125 = value;
         self
     }
 }
@@ -8716,7 +8719,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectSpatialCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.126 = value.into();
+        self._fields.126 = value.into();
         self
     }
     /// Set the `spatialCoverage` field to an Option value (optional)
@@ -8724,7 +8727,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectSpatialCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.126 = value;
+        self._fields.126 = value;
         self
     }
 }
@@ -8732,12 +8735,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `sponsor` field (optional)
     pub fn sponsor(mut self, value: impl Into<Option<ImageObjectSponsor<'a>>>) -> Self {
-        self.__unsafe_private_named.127 = value.into();
+        self._fields.127 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<ImageObjectSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.127 = value;
+        self._fields.127 = value;
         self
     }
 }
@@ -8748,12 +8751,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectStartTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.128 = value.into();
+        self._fields.128 = value.into();
         self
     }
     /// Set the `startTime` field to an Option value (optional)
     pub fn maybe_start_time(mut self, value: Option<ImageObjectStartTime<'a>>) -> Self {
-        self.__unsafe_private_named.128 = value;
+        self._fields.128 = value;
         self
     }
 }
@@ -8764,12 +8767,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectSubjectOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.129 = value.into();
+        self._fields.129 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<ImageObjectSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.129 = value;
+        self._fields.129 = value;
         self
     }
 }
@@ -8777,12 +8780,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `teaches` field (optional)
     pub fn teaches(mut self, value: impl Into<Option<ImageObjectTeaches<'a>>>) -> Self {
-        self.__unsafe_private_named.130 = value.into();
+        self._fields.130 = value.into();
         self
     }
     /// Set the `teaches` field to an Option value (optional)
     pub fn maybe_teaches(mut self, value: Option<ImageObjectTeaches<'a>>) -> Self {
-        self.__unsafe_private_named.130 = value;
+        self._fields.130 = value;
         self
     }
 }
@@ -8793,12 +8796,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectTemporal<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.131 = value.into();
+        self._fields.131 = value.into();
         self
     }
     /// Set the `temporal` field to an Option value (optional)
     pub fn maybe_temporal(mut self, value: Option<ImageObjectTemporal<'a>>) -> Self {
-        self.__unsafe_private_named.131 = value;
+        self._fields.131 = value;
         self
     }
 }
@@ -8809,7 +8812,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectTemporalCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.132 = value.into();
+        self._fields.132 = value.into();
         self
     }
     /// Set the `temporalCoverage` field to an Option value (optional)
@@ -8817,7 +8820,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectTemporalCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.132 = value;
+        self._fields.132 = value;
         self
     }
 }
@@ -8825,12 +8828,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<ImageObjectText<'a>>>) -> Self {
-        self.__unsafe_private_named.133 = value.into();
+        self._fields.133 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<ImageObjectText<'a>>) -> Self {
-        self.__unsafe_private_named.133 = value;
+        self._fields.133 = value;
         self
     }
 }
@@ -8841,12 +8844,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectThumbnail<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.134 = value.into();
+        self._fields.134 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<ImageObjectThumbnail<'a>>) -> Self {
-        self.__unsafe_private_named.134 = value;
+        self._fields.134 = value;
         self
     }
 }
@@ -8857,7 +8860,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectThumbnailUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.135 = value.into();
+        self._fields.135 = value.into();
         self
     }
     /// Set the `thumbnailUrl` field to an Option value (optional)
@@ -8865,7 +8868,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectThumbnailUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.135 = value;
+        self._fields.135 = value;
         self
     }
 }
@@ -8876,7 +8879,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectTimeRequired<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.136 = value.into();
+        self._fields.136 = value.into();
         self
     }
     /// Set the `timeRequired` field to an Option value (optional)
@@ -8884,7 +8887,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectTimeRequired<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.136 = value;
+        self._fields.136 = value;
         self
     }
 }
@@ -8895,7 +8898,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectTranslationOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.137 = value.into();
+        self._fields.137 = value.into();
         self
     }
     /// Set the `translationOfWork` field to an Option value (optional)
@@ -8903,7 +8906,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectTranslationOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.137 = value;
+        self._fields.137 = value;
         self
     }
 }
@@ -8914,12 +8917,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectTranslator<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.138 = value.into();
+        self._fields.138 = value.into();
         self
     }
     /// Set the `translator` field to an Option value (optional)
     pub fn maybe_translator(mut self, value: Option<ImageObjectTranslator<'a>>) -> Self {
-        self.__unsafe_private_named.138 = value;
+        self._fields.138 = value;
         self
     }
 }
@@ -8930,7 +8933,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectTypicalAgeRange<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.139 = value.into();
+        self._fields.139 = value.into();
         self
     }
     /// Set the `typicalAgeRange` field to an Option value (optional)
@@ -8938,7 +8941,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectTypicalAgeRange<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.139 = value;
+        self._fields.139 = value;
         self
     }
 }
@@ -8949,7 +8952,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectUploadDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.140 = value.into();
+        self._fields.140 = value.into();
         self
     }
     /// Set the `uploadDate` field to an Option value (optional)
@@ -8957,7 +8960,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectUploadDate<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.140 = value;
+        self._fields.140 = value;
         self
     }
 }
@@ -8965,12 +8968,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<ImageObjectUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.141 = value.into();
+        self._fields.141 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<ImageObjectUrl<'a>>) -> Self {
-        self.__unsafe_private_named.141 = value;
+        self._fields.141 = value;
         self
     }
 }
@@ -8981,12 +8984,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectUsageInfo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.142 = value.into();
+        self._fields.142 = value.into();
         self
     }
     /// Set the `usageInfo` field to an Option value (optional)
     pub fn maybe_usage_info(mut self, value: Option<ImageObjectUsageInfo<'a>>) -> Self {
-        self.__unsafe_private_named.142 = value;
+        self._fields.142 = value;
         self
     }
 }
@@ -8994,12 +8997,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `version` field (optional)
     pub fn version(mut self, value: impl Into<Option<ImageObjectVersion<'a>>>) -> Self {
-        self.__unsafe_private_named.143 = value.into();
+        self._fields.143 = value.into();
         self
     }
     /// Set the `version` field to an Option value (optional)
     pub fn maybe_version(mut self, value: Option<ImageObjectVersion<'a>>) -> Self {
-        self.__unsafe_private_named.143 = value;
+        self._fields.143 = value;
         self
     }
 }
@@ -9007,12 +9010,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `video` field (optional)
     pub fn video(mut self, value: impl Into<Option<ImageObjectVideo<'a>>>) -> Self {
-        self.__unsafe_private_named.144 = value.into();
+        self._fields.144 = value.into();
         self
     }
     /// Set the `video` field to an Option value (optional)
     pub fn maybe_video(mut self, value: Option<ImageObjectVideo<'a>>) -> Self {
-        self.__unsafe_private_named.144 = value;
+        self._fields.144 = value;
         self
     }
 }
@@ -9020,12 +9023,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
 impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
     /// Set the `width` field (optional)
     pub fn width(mut self, value: impl Into<Option<ImageObjectWidth<'a>>>) -> Self {
-        self.__unsafe_private_named.145 = value.into();
+        self._fields.145 = value.into();
         self
     }
     /// Set the `width` field to an Option value (optional)
     pub fn maybe_width(mut self, value: Option<ImageObjectWidth<'a>>) -> Self {
-        self.__unsafe_private_named.145 = value;
+        self._fields.145 = value;
         self
     }
 }
@@ -9036,12 +9039,12 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectWordCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.146 = value.into();
+        self._fields.146 = value.into();
         self
     }
     /// Set the `wordCount` field to an Option value (optional)
     pub fn maybe_word_count(mut self, value: Option<ImageObjectWordCount<'a>>) -> Self {
-        self.__unsafe_private_named.146 = value;
+        self._fields.146 = value;
         self
     }
 }
@@ -9052,7 +9055,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectWorkExample<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.147 = value.into();
+        self._fields.147 = value.into();
         self
     }
     /// Set the `workExample` field to an Option value (optional)
@@ -9060,7 +9063,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectWorkExample<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.147 = value;
+        self._fields.147 = value;
         self
     }
 }
@@ -9071,7 +9074,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ImageObjectWorkTranslation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.148 = value.into();
+        self._fields.148 = value.into();
         self
     }
     /// Set the `workTranslation` field to an Option value (optional)
@@ -9079,7 +9082,7 @@ impl<'a, S: image_object_state::State> ImageObjectBuilder<'a, S> {
         mut self,
         value: Option<ImageObjectWorkTranslation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.148 = value;
+        self._fields.148 = value;
         self
     }
 }
@@ -9091,155 +9094,155 @@ where
     /// Build the final struct
     pub fn build(self) -> ImageObject<'a> {
         ImageObject {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            additional_type: self.__unsafe_private_named.11,
-            aggregate_rating: self.__unsafe_private_named.12,
-            alternate_name: self.__unsafe_private_named.13,
-            alternative_headline: self.__unsafe_private_named.14,
-            archived_at: self.__unsafe_private_named.15,
-            assesses: self.__unsafe_private_named.16,
-            associated_article: self.__unsafe_private_named.17,
-            associated_media: self.__unsafe_private_named.18,
-            audience: self.__unsafe_private_named.19,
-            audio: self.__unsafe_private_named.20,
-            author: self.__unsafe_private_named.21,
-            award: self.__unsafe_private_named.22,
-            awards: self.__unsafe_private_named.23,
-            bitrate: self.__unsafe_private_named.24,
-            caption: self.__unsafe_private_named.25,
-            character: self.__unsafe_private_named.26,
-            citation: self.__unsafe_private_named.27,
-            comment: self.__unsafe_private_named.28,
-            comment_count: self.__unsafe_private_named.29,
-            conditions_of_access: self.__unsafe_private_named.30,
-            content_location: self.__unsafe_private_named.31,
-            content_rating: self.__unsafe_private_named.32,
-            content_reference_time: self.__unsafe_private_named.33,
-            content_size: self.__unsafe_private_named.34,
-            content_url: self.__unsafe_private_named.35,
-            contributor: self.__unsafe_private_named.36,
-            copyright_holder: self.__unsafe_private_named.37,
-            copyright_notice: self.__unsafe_private_named.38,
-            copyright_year: self.__unsafe_private_named.39,
-            correction: self.__unsafe_private_named.40,
-            country_of_origin: self.__unsafe_private_named.41,
-            creative_work_status: self.__unsafe_private_named.42,
-            creator: self.__unsafe_private_named.43,
-            credit_text: self.__unsafe_private_named.44,
-            date_created: self.__unsafe_private_named.45,
-            date_modified: self.__unsafe_private_named.46,
-            date_published: self.__unsafe_private_named.47,
-            description: self.__unsafe_private_named.48,
-            digital_source_type: self.__unsafe_private_named.49,
-            disambiguating_description: self.__unsafe_private_named.50,
-            discussion_url: self.__unsafe_private_named.51,
-            duration: self.__unsafe_private_named.52,
-            edit_eidr: self.__unsafe_private_named.53,
-            editor: self.__unsafe_private_named.54,
-            educational_alignment: self.__unsafe_private_named.55,
-            educational_level: self.__unsafe_private_named.56,
-            educational_use: self.__unsafe_private_named.57,
-            embed_url: self.__unsafe_private_named.58,
-            embedded_text_caption: self.__unsafe_private_named.59,
-            encodes_creative_work: self.__unsafe_private_named.60,
-            encoding: self.__unsafe_private_named.61,
-            encoding_format: self.__unsafe_private_named.62,
-            encodings: self.__unsafe_private_named.63,
-            end_time: self.__unsafe_private_named.64,
-            example_of_work: self.__unsafe_private_named.65,
-            exif_data: self.__unsafe_private_named.66,
-            expires: self.__unsafe_private_named.67,
-            file_format: self.__unsafe_private_named.68,
-            funder: self.__unsafe_private_named.69,
-            funding: self.__unsafe_private_named.70,
-            genre: self.__unsafe_private_named.71,
-            has_part: self.__unsafe_private_named.72,
-            headline: self.__unsafe_private_named.73,
-            height: self.__unsafe_private_named.74,
-            identifier: self.__unsafe_private_named.75,
-            image: self.__unsafe_private_named.76,
-            in_language: self.__unsafe_private_named.77,
-            ineligible_region: self.__unsafe_private_named.78,
-            interaction_statistic: self.__unsafe_private_named.79,
-            interactivity_type: self.__unsafe_private_named.80,
-            interpreted_as_claim: self.__unsafe_private_named.81,
-            is_accessible_for_free: self.__unsafe_private_named.82,
-            is_based_on: self.__unsafe_private_named.83,
-            is_based_on_url: self.__unsafe_private_named.84,
-            is_family_friendly: self.__unsafe_private_named.85,
-            is_part_of: self.__unsafe_private_named.86,
-            keywords: self.__unsafe_private_named.87,
-            learning_resource_type: self.__unsafe_private_named.88,
-            license: self.__unsafe_private_named.89,
-            location_created: self.__unsafe_private_named.90,
-            main_entity: self.__unsafe_private_named.91,
-            main_entity_of_page: self.__unsafe_private_named.92,
-            maintainer: self.__unsafe_private_named.93,
-            material: self.__unsafe_private_named.94,
-            material_extent: self.__unsafe_private_named.95,
-            mentions: self.__unsafe_private_named.96,
-            name: self.__unsafe_private_named.97,
-            offers: self.__unsafe_private_named.98,
-            pattern: self.__unsafe_private_named.99,
-            player_type: self.__unsafe_private_named.100,
-            position: self.__unsafe_private_named.101,
-            potential_action: self.__unsafe_private_named.102,
-            producer: self.__unsafe_private_named.103,
-            production_company: self.__unsafe_private_named.104,
-            provider: self.__unsafe_private_named.105,
-            publication: self.__unsafe_private_named.106,
-            publisher: self.__unsafe_private_named.107,
-            publisher_imprint: self.__unsafe_private_named.108,
-            publishing_principles: self.__unsafe_private_named.109,
-            recorded_at: self.__unsafe_private_named.110,
-            regions_allowed: self.__unsafe_private_named.111,
-            released_event: self.__unsafe_private_named.112,
-            representative_of_page: self.__unsafe_private_named.113,
-            requires_subscription: self.__unsafe_private_named.114,
-            review: self.__unsafe_private_named.115,
-            reviews: self.__unsafe_private_named.116,
-            same_as: self.__unsafe_private_named.117,
-            schema_version: self.__unsafe_private_named.118,
-            sd_date_published: self.__unsafe_private_named.119,
-            sd_license: self.__unsafe_private_named.120,
-            sd_publisher: self.__unsafe_private_named.121,
-            sha256: self.__unsafe_private_named.122,
-            size: self.__unsafe_private_named.123,
-            source_organization: self.__unsafe_private_named.124,
-            spatial: self.__unsafe_private_named.125,
-            spatial_coverage: self.__unsafe_private_named.126,
-            sponsor: self.__unsafe_private_named.127,
-            start_time: self.__unsafe_private_named.128,
-            subject_of: self.__unsafe_private_named.129,
-            teaches: self.__unsafe_private_named.130,
-            temporal: self.__unsafe_private_named.131,
-            temporal_coverage: self.__unsafe_private_named.132,
-            text: self.__unsafe_private_named.133,
-            thumbnail: self.__unsafe_private_named.134,
-            thumbnail_url: self.__unsafe_private_named.135,
-            time_required: self.__unsafe_private_named.136,
-            translation_of_work: self.__unsafe_private_named.137,
-            translator: self.__unsafe_private_named.138,
-            typical_age_range: self.__unsafe_private_named.139,
-            upload_date: self.__unsafe_private_named.140,
-            url: self.__unsafe_private_named.141,
-            usage_info: self.__unsafe_private_named.142,
-            version: self.__unsafe_private_named.143,
-            video: self.__unsafe_private_named.144,
-            width: self.__unsafe_private_named.145,
-            word_count: self.__unsafe_private_named.146,
-            work_example: self.__unsafe_private_named.147,
-            work_translation: self.__unsafe_private_named.148,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            additional_type: self._fields.11,
+            aggregate_rating: self._fields.12,
+            alternate_name: self._fields.13,
+            alternative_headline: self._fields.14,
+            archived_at: self._fields.15,
+            assesses: self._fields.16,
+            associated_article: self._fields.17,
+            associated_media: self._fields.18,
+            audience: self._fields.19,
+            audio: self._fields.20,
+            author: self._fields.21,
+            award: self._fields.22,
+            awards: self._fields.23,
+            bitrate: self._fields.24,
+            caption: self._fields.25,
+            character: self._fields.26,
+            citation: self._fields.27,
+            comment: self._fields.28,
+            comment_count: self._fields.29,
+            conditions_of_access: self._fields.30,
+            content_location: self._fields.31,
+            content_rating: self._fields.32,
+            content_reference_time: self._fields.33,
+            content_size: self._fields.34,
+            content_url: self._fields.35,
+            contributor: self._fields.36,
+            copyright_holder: self._fields.37,
+            copyright_notice: self._fields.38,
+            copyright_year: self._fields.39,
+            correction: self._fields.40,
+            country_of_origin: self._fields.41,
+            creative_work_status: self._fields.42,
+            creator: self._fields.43,
+            credit_text: self._fields.44,
+            date_created: self._fields.45,
+            date_modified: self._fields.46,
+            date_published: self._fields.47,
+            description: self._fields.48,
+            digital_source_type: self._fields.49,
+            disambiguating_description: self._fields.50,
+            discussion_url: self._fields.51,
+            duration: self._fields.52,
+            edit_eidr: self._fields.53,
+            editor: self._fields.54,
+            educational_alignment: self._fields.55,
+            educational_level: self._fields.56,
+            educational_use: self._fields.57,
+            embed_url: self._fields.58,
+            embedded_text_caption: self._fields.59,
+            encodes_creative_work: self._fields.60,
+            encoding: self._fields.61,
+            encoding_format: self._fields.62,
+            encodings: self._fields.63,
+            end_time: self._fields.64,
+            example_of_work: self._fields.65,
+            exif_data: self._fields.66,
+            expires: self._fields.67,
+            file_format: self._fields.68,
+            funder: self._fields.69,
+            funding: self._fields.70,
+            genre: self._fields.71,
+            has_part: self._fields.72,
+            headline: self._fields.73,
+            height: self._fields.74,
+            identifier: self._fields.75,
+            image: self._fields.76,
+            in_language: self._fields.77,
+            ineligible_region: self._fields.78,
+            interaction_statistic: self._fields.79,
+            interactivity_type: self._fields.80,
+            interpreted_as_claim: self._fields.81,
+            is_accessible_for_free: self._fields.82,
+            is_based_on: self._fields.83,
+            is_based_on_url: self._fields.84,
+            is_family_friendly: self._fields.85,
+            is_part_of: self._fields.86,
+            keywords: self._fields.87,
+            learning_resource_type: self._fields.88,
+            license: self._fields.89,
+            location_created: self._fields.90,
+            main_entity: self._fields.91,
+            main_entity_of_page: self._fields.92,
+            maintainer: self._fields.93,
+            material: self._fields.94,
+            material_extent: self._fields.95,
+            mentions: self._fields.96,
+            name: self._fields.97,
+            offers: self._fields.98,
+            pattern: self._fields.99,
+            player_type: self._fields.100,
+            position: self._fields.101,
+            potential_action: self._fields.102,
+            producer: self._fields.103,
+            production_company: self._fields.104,
+            provider: self._fields.105,
+            publication: self._fields.106,
+            publisher: self._fields.107,
+            publisher_imprint: self._fields.108,
+            publishing_principles: self._fields.109,
+            recorded_at: self._fields.110,
+            regions_allowed: self._fields.111,
+            released_event: self._fields.112,
+            representative_of_page: self._fields.113,
+            requires_subscription: self._fields.114,
+            review: self._fields.115,
+            reviews: self._fields.116,
+            same_as: self._fields.117,
+            schema_version: self._fields.118,
+            sd_date_published: self._fields.119,
+            sd_license: self._fields.120,
+            sd_publisher: self._fields.121,
+            sha256: self._fields.122,
+            size: self._fields.123,
+            source_organization: self._fields.124,
+            spatial: self._fields.125,
+            spatial_coverage: self._fields.126,
+            sponsor: self._fields.127,
+            start_time: self._fields.128,
+            subject_of: self._fields.129,
+            teaches: self._fields.130,
+            temporal: self._fields.131,
+            temporal_coverage: self._fields.132,
+            text: self._fields.133,
+            thumbnail: self._fields.134,
+            thumbnail_url: self._fields.135,
+            time_required: self._fields.136,
+            translation_of_work: self._fields.137,
+            translator: self._fields.138,
+            typical_age_range: self._fields.139,
+            upload_date: self._fields.140,
+            url: self._fields.141,
+            usage_info: self._fields.142,
+            version: self._fields.143,
+            video: self._fields.144,
+            width: self._fields.145,
+            word_count: self._fields.146,
+            work_example: self._fields.147,
+            work_translation: self._fields.148,
             extra_data: Default::default(),
         }
     }
@@ -9249,155 +9252,155 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ImageObject<'a> {
         ImageObject {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            additional_type: self.__unsafe_private_named.11,
-            aggregate_rating: self.__unsafe_private_named.12,
-            alternate_name: self.__unsafe_private_named.13,
-            alternative_headline: self.__unsafe_private_named.14,
-            archived_at: self.__unsafe_private_named.15,
-            assesses: self.__unsafe_private_named.16,
-            associated_article: self.__unsafe_private_named.17,
-            associated_media: self.__unsafe_private_named.18,
-            audience: self.__unsafe_private_named.19,
-            audio: self.__unsafe_private_named.20,
-            author: self.__unsafe_private_named.21,
-            award: self.__unsafe_private_named.22,
-            awards: self.__unsafe_private_named.23,
-            bitrate: self.__unsafe_private_named.24,
-            caption: self.__unsafe_private_named.25,
-            character: self.__unsafe_private_named.26,
-            citation: self.__unsafe_private_named.27,
-            comment: self.__unsafe_private_named.28,
-            comment_count: self.__unsafe_private_named.29,
-            conditions_of_access: self.__unsafe_private_named.30,
-            content_location: self.__unsafe_private_named.31,
-            content_rating: self.__unsafe_private_named.32,
-            content_reference_time: self.__unsafe_private_named.33,
-            content_size: self.__unsafe_private_named.34,
-            content_url: self.__unsafe_private_named.35,
-            contributor: self.__unsafe_private_named.36,
-            copyright_holder: self.__unsafe_private_named.37,
-            copyright_notice: self.__unsafe_private_named.38,
-            copyright_year: self.__unsafe_private_named.39,
-            correction: self.__unsafe_private_named.40,
-            country_of_origin: self.__unsafe_private_named.41,
-            creative_work_status: self.__unsafe_private_named.42,
-            creator: self.__unsafe_private_named.43,
-            credit_text: self.__unsafe_private_named.44,
-            date_created: self.__unsafe_private_named.45,
-            date_modified: self.__unsafe_private_named.46,
-            date_published: self.__unsafe_private_named.47,
-            description: self.__unsafe_private_named.48,
-            digital_source_type: self.__unsafe_private_named.49,
-            disambiguating_description: self.__unsafe_private_named.50,
-            discussion_url: self.__unsafe_private_named.51,
-            duration: self.__unsafe_private_named.52,
-            edit_eidr: self.__unsafe_private_named.53,
-            editor: self.__unsafe_private_named.54,
-            educational_alignment: self.__unsafe_private_named.55,
-            educational_level: self.__unsafe_private_named.56,
-            educational_use: self.__unsafe_private_named.57,
-            embed_url: self.__unsafe_private_named.58,
-            embedded_text_caption: self.__unsafe_private_named.59,
-            encodes_creative_work: self.__unsafe_private_named.60,
-            encoding: self.__unsafe_private_named.61,
-            encoding_format: self.__unsafe_private_named.62,
-            encodings: self.__unsafe_private_named.63,
-            end_time: self.__unsafe_private_named.64,
-            example_of_work: self.__unsafe_private_named.65,
-            exif_data: self.__unsafe_private_named.66,
-            expires: self.__unsafe_private_named.67,
-            file_format: self.__unsafe_private_named.68,
-            funder: self.__unsafe_private_named.69,
-            funding: self.__unsafe_private_named.70,
-            genre: self.__unsafe_private_named.71,
-            has_part: self.__unsafe_private_named.72,
-            headline: self.__unsafe_private_named.73,
-            height: self.__unsafe_private_named.74,
-            identifier: self.__unsafe_private_named.75,
-            image: self.__unsafe_private_named.76,
-            in_language: self.__unsafe_private_named.77,
-            ineligible_region: self.__unsafe_private_named.78,
-            interaction_statistic: self.__unsafe_private_named.79,
-            interactivity_type: self.__unsafe_private_named.80,
-            interpreted_as_claim: self.__unsafe_private_named.81,
-            is_accessible_for_free: self.__unsafe_private_named.82,
-            is_based_on: self.__unsafe_private_named.83,
-            is_based_on_url: self.__unsafe_private_named.84,
-            is_family_friendly: self.__unsafe_private_named.85,
-            is_part_of: self.__unsafe_private_named.86,
-            keywords: self.__unsafe_private_named.87,
-            learning_resource_type: self.__unsafe_private_named.88,
-            license: self.__unsafe_private_named.89,
-            location_created: self.__unsafe_private_named.90,
-            main_entity: self.__unsafe_private_named.91,
-            main_entity_of_page: self.__unsafe_private_named.92,
-            maintainer: self.__unsafe_private_named.93,
-            material: self.__unsafe_private_named.94,
-            material_extent: self.__unsafe_private_named.95,
-            mentions: self.__unsafe_private_named.96,
-            name: self.__unsafe_private_named.97,
-            offers: self.__unsafe_private_named.98,
-            pattern: self.__unsafe_private_named.99,
-            player_type: self.__unsafe_private_named.100,
-            position: self.__unsafe_private_named.101,
-            potential_action: self.__unsafe_private_named.102,
-            producer: self.__unsafe_private_named.103,
-            production_company: self.__unsafe_private_named.104,
-            provider: self.__unsafe_private_named.105,
-            publication: self.__unsafe_private_named.106,
-            publisher: self.__unsafe_private_named.107,
-            publisher_imprint: self.__unsafe_private_named.108,
-            publishing_principles: self.__unsafe_private_named.109,
-            recorded_at: self.__unsafe_private_named.110,
-            regions_allowed: self.__unsafe_private_named.111,
-            released_event: self.__unsafe_private_named.112,
-            representative_of_page: self.__unsafe_private_named.113,
-            requires_subscription: self.__unsafe_private_named.114,
-            review: self.__unsafe_private_named.115,
-            reviews: self.__unsafe_private_named.116,
-            same_as: self.__unsafe_private_named.117,
-            schema_version: self.__unsafe_private_named.118,
-            sd_date_published: self.__unsafe_private_named.119,
-            sd_license: self.__unsafe_private_named.120,
-            sd_publisher: self.__unsafe_private_named.121,
-            sha256: self.__unsafe_private_named.122,
-            size: self.__unsafe_private_named.123,
-            source_organization: self.__unsafe_private_named.124,
-            spatial: self.__unsafe_private_named.125,
-            spatial_coverage: self.__unsafe_private_named.126,
-            sponsor: self.__unsafe_private_named.127,
-            start_time: self.__unsafe_private_named.128,
-            subject_of: self.__unsafe_private_named.129,
-            teaches: self.__unsafe_private_named.130,
-            temporal: self.__unsafe_private_named.131,
-            temporal_coverage: self.__unsafe_private_named.132,
-            text: self.__unsafe_private_named.133,
-            thumbnail: self.__unsafe_private_named.134,
-            thumbnail_url: self.__unsafe_private_named.135,
-            time_required: self.__unsafe_private_named.136,
-            translation_of_work: self.__unsafe_private_named.137,
-            translator: self.__unsafe_private_named.138,
-            typical_age_range: self.__unsafe_private_named.139,
-            upload_date: self.__unsafe_private_named.140,
-            url: self.__unsafe_private_named.141,
-            usage_info: self.__unsafe_private_named.142,
-            version: self.__unsafe_private_named.143,
-            video: self.__unsafe_private_named.144,
-            width: self.__unsafe_private_named.145,
-            word_count: self.__unsafe_private_named.146,
-            work_example: self.__unsafe_private_named.147,
-            work_translation: self.__unsafe_private_named.148,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            additional_type: self._fields.11,
+            aggregate_rating: self._fields.12,
+            alternate_name: self._fields.13,
+            alternative_headline: self._fields.14,
+            archived_at: self._fields.15,
+            assesses: self._fields.16,
+            associated_article: self._fields.17,
+            associated_media: self._fields.18,
+            audience: self._fields.19,
+            audio: self._fields.20,
+            author: self._fields.21,
+            award: self._fields.22,
+            awards: self._fields.23,
+            bitrate: self._fields.24,
+            caption: self._fields.25,
+            character: self._fields.26,
+            citation: self._fields.27,
+            comment: self._fields.28,
+            comment_count: self._fields.29,
+            conditions_of_access: self._fields.30,
+            content_location: self._fields.31,
+            content_rating: self._fields.32,
+            content_reference_time: self._fields.33,
+            content_size: self._fields.34,
+            content_url: self._fields.35,
+            contributor: self._fields.36,
+            copyright_holder: self._fields.37,
+            copyright_notice: self._fields.38,
+            copyright_year: self._fields.39,
+            correction: self._fields.40,
+            country_of_origin: self._fields.41,
+            creative_work_status: self._fields.42,
+            creator: self._fields.43,
+            credit_text: self._fields.44,
+            date_created: self._fields.45,
+            date_modified: self._fields.46,
+            date_published: self._fields.47,
+            description: self._fields.48,
+            digital_source_type: self._fields.49,
+            disambiguating_description: self._fields.50,
+            discussion_url: self._fields.51,
+            duration: self._fields.52,
+            edit_eidr: self._fields.53,
+            editor: self._fields.54,
+            educational_alignment: self._fields.55,
+            educational_level: self._fields.56,
+            educational_use: self._fields.57,
+            embed_url: self._fields.58,
+            embedded_text_caption: self._fields.59,
+            encodes_creative_work: self._fields.60,
+            encoding: self._fields.61,
+            encoding_format: self._fields.62,
+            encodings: self._fields.63,
+            end_time: self._fields.64,
+            example_of_work: self._fields.65,
+            exif_data: self._fields.66,
+            expires: self._fields.67,
+            file_format: self._fields.68,
+            funder: self._fields.69,
+            funding: self._fields.70,
+            genre: self._fields.71,
+            has_part: self._fields.72,
+            headline: self._fields.73,
+            height: self._fields.74,
+            identifier: self._fields.75,
+            image: self._fields.76,
+            in_language: self._fields.77,
+            ineligible_region: self._fields.78,
+            interaction_statistic: self._fields.79,
+            interactivity_type: self._fields.80,
+            interpreted_as_claim: self._fields.81,
+            is_accessible_for_free: self._fields.82,
+            is_based_on: self._fields.83,
+            is_based_on_url: self._fields.84,
+            is_family_friendly: self._fields.85,
+            is_part_of: self._fields.86,
+            keywords: self._fields.87,
+            learning_resource_type: self._fields.88,
+            license: self._fields.89,
+            location_created: self._fields.90,
+            main_entity: self._fields.91,
+            main_entity_of_page: self._fields.92,
+            maintainer: self._fields.93,
+            material: self._fields.94,
+            material_extent: self._fields.95,
+            mentions: self._fields.96,
+            name: self._fields.97,
+            offers: self._fields.98,
+            pattern: self._fields.99,
+            player_type: self._fields.100,
+            position: self._fields.101,
+            potential_action: self._fields.102,
+            producer: self._fields.103,
+            production_company: self._fields.104,
+            provider: self._fields.105,
+            publication: self._fields.106,
+            publisher: self._fields.107,
+            publisher_imprint: self._fields.108,
+            publishing_principles: self._fields.109,
+            recorded_at: self._fields.110,
+            regions_allowed: self._fields.111,
+            released_event: self._fields.112,
+            representative_of_page: self._fields.113,
+            requires_subscription: self._fields.114,
+            review: self._fields.115,
+            reviews: self._fields.116,
+            same_as: self._fields.117,
+            schema_version: self._fields.118,
+            sd_date_published: self._fields.119,
+            sd_license: self._fields.120,
+            sd_publisher: self._fields.121,
+            sha256: self._fields.122,
+            size: self._fields.123,
+            source_organization: self._fields.124,
+            spatial: self._fields.125,
+            spatial_coverage: self._fields.126,
+            sponsor: self._fields.127,
+            start_time: self._fields.128,
+            subject_of: self._fields.129,
+            teaches: self._fields.130,
+            temporal: self._fields.131,
+            temporal_coverage: self._fields.132,
+            text: self._fields.133,
+            thumbnail: self._fields.134,
+            thumbnail_url: self._fields.135,
+            time_required: self._fields.136,
+            translation_of_work: self._fields.137,
+            translator: self._fields.138,
+            typical_age_range: self._fields.139,
+            upload_date: self._fields.140,
+            url: self._fields.141,
+            usage_info: self._fields.142,
+            version: self._fields.143,
+            video: self._fields.144,
+            width: self._fields.145,
+            word_count: self._fields.146,
+            work_example: self._fields.147,
+            work_translation: self._fields.148,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/local_business.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/local_business.rs
index f191bb95..c1379a87 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/local_business.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/local_business.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -5331,8 +5334,8 @@ pub mod local_business_state {
 
 /// Builder for constructing an instance of this type
 pub struct LocalBusinessBuilder<'a, S: local_business_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<LocalBusinessAcceptedPaymentMethod<'a>>,
         Option<LocalBusinessActionableFeedbackPolicy<'a>>,
         Option<LocalBusinessAdditionalProperty<'a>>,
@@ -5460,7 +5463,7 @@ pub struct LocalBusinessBuilder<'a, S: local_business_state::State> {
         Option<LocalBusinessUrl<'a>>,
         Option<LocalBusinessVatId<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LocalBusiness<'a> {
@@ -5474,8 +5477,8 @@ impl<'a> LocalBusinessBuilder<'a, local_business_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LocalBusinessBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -5603,7 +5606,7 @@ impl<'a> LocalBusinessBuilder<'a, local_business_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5614,7 +5617,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessAcceptedPaymentMethod<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `acceptedPaymentMethod` field to an Option value (optional)
@@ -5622,7 +5625,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessAcceptedPaymentMethod<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -5633,7 +5636,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessActionableFeedbackPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `actionableFeedbackPolicy` field to an Option value (optional)
@@ -5641,7 +5644,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessActionableFeedbackPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -5652,7 +5655,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessAdditionalProperty<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `additionalProperty` field to an Option value (optional)
@@ -5660,7 +5663,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessAdditionalProperty<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -5671,7 +5674,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -5679,7 +5682,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -5690,12 +5693,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessAddress<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `address` field to an Option value (optional)
     pub fn maybe_address(mut self, value: Option<LocalBusinessAddress<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -5706,7 +5709,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessAgentInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `agentInteractionStatistic` field to an Option value (optional)
@@ -5714,7 +5717,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessAgentInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -5725,7 +5728,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -5733,7 +5736,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -5744,7 +5747,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -5752,7 +5755,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -5760,12 +5763,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `alumni` field (optional)
     pub fn alumni(mut self, value: impl Into<Option<LocalBusinessAlumni<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `alumni` field to an Option value (optional)
     pub fn maybe_alumni(mut self, value: Option<LocalBusinessAlumni<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -5776,7 +5779,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessAmenityFeature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `amenityFeature` field to an Option value (optional)
@@ -5784,7 +5787,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessAmenityFeature<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -5795,7 +5798,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessAreaServed<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `areaServed` field to an Option value (optional)
@@ -5803,7 +5806,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessAreaServed<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -5811,12 +5814,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<LocalBusinessAward<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<LocalBusinessAward<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -5824,12 +5827,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<LocalBusinessAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<LocalBusinessAwards<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -5840,7 +5843,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessBranchCode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `branchCode` field to an Option value (optional)
@@ -5848,7 +5851,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessBranchCode<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -5859,12 +5862,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessBranchOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `branchOf` field to an Option value (optional)
     pub fn maybe_branch_of(mut self, value: Option<LocalBusinessBranchOf<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -5872,12 +5875,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `brand` field (optional)
     pub fn brand(mut self, value: impl Into<Option<LocalBusinessBrand<'a>>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `brand` field to an Option value (optional)
     pub fn maybe_brand(mut self, value: Option<LocalBusinessBrand<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -5888,7 +5891,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessCompanyRegistration<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `companyRegistration` field to an Option value (optional)
@@ -5896,7 +5899,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessCompanyRegistration<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -5907,7 +5910,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessContactPoint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `contactPoint` field to an Option value (optional)
@@ -5915,7 +5918,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessContactPoint<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -5926,7 +5929,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessContactPoints<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `contactPoints` field to an Option value (optional)
@@ -5934,7 +5937,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessContactPoints<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -5945,7 +5948,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessContainedIn<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `containedIn` field to an Option value (optional)
@@ -5953,7 +5956,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessContainedIn<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -5964,7 +5967,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessContainedInPlace<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `containedInPlace` field to an Option value (optional)
@@ -5972,7 +5975,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessContainedInPlace<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -5983,7 +5986,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessContainsPlace<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `containsPlace` field to an Option value (optional)
@@ -5991,7 +5994,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessContainsPlace<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -6002,7 +6005,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessCorrectionsPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `correctionsPolicy` field to an Option value (optional)
@@ -6010,7 +6013,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessCorrectionsPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -6021,7 +6024,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessCurrenciesAccepted<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `currenciesAccepted` field to an Option value (optional)
@@ -6029,7 +6032,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessCurrenciesAccepted<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -6040,7 +6043,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessDepartment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `department` field to an Option value (optional)
@@ -6048,7 +6051,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessDepartment<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -6059,7 +6062,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
@@ -6067,7 +6070,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -6078,7 +6081,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -6086,7 +6089,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -6097,7 +6100,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessDissolutionDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `dissolutionDate` field to an Option value (optional)
@@ -6105,7 +6108,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessDissolutionDate<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -6116,7 +6119,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessDiversityPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `diversityPolicy` field to an Option value (optional)
@@ -6124,7 +6127,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessDiversityPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -6135,7 +6138,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessDiversityStaffingReport<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `diversityStaffingReport` field to an Option value (optional)
@@ -6143,7 +6146,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessDiversityStaffingReport<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -6151,12 +6154,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `duns` field (optional)
     pub fn duns(mut self, value: impl Into<Option<LocalBusinessDuns<'a>>>) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `duns` field to an Option value (optional)
     pub fn maybe_duns(mut self, value: Option<LocalBusinessDuns<'a>>) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -6164,12 +6167,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `email` field (optional)
     pub fn email(mut self, value: impl Into<Option<LocalBusinessEmail<'a>>>) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `email` field to an Option value (optional)
     pub fn maybe_email(mut self, value: Option<LocalBusinessEmail<'a>>) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -6180,12 +6183,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessEmployee<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `employee` field to an Option value (optional)
     pub fn maybe_employee(mut self, value: Option<LocalBusinessEmployee<'a>>) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -6196,12 +6199,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessEmployees<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `employees` field to an Option value (optional)
     pub fn maybe_employees(mut self, value: Option<LocalBusinessEmployees<'a>>) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -6212,7 +6215,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessEthicsPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `ethicsPolicy` field to an Option value (optional)
@@ -6220,7 +6223,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessEthicsPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -6228,12 +6231,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `event` field (optional)
     pub fn event(mut self, value: impl Into<Option<LocalBusinessEvent<'a>>>) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `event` field to an Option value (optional)
     pub fn maybe_event(mut self, value: Option<LocalBusinessEvent<'a>>) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -6241,12 +6244,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `events` field (optional)
     pub fn events(mut self, value: impl Into<Option<LocalBusinessEvents<'a>>>) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `events` field to an Option value (optional)
     pub fn maybe_events(mut self, value: Option<LocalBusinessEvents<'a>>) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -6257,7 +6260,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessFaxNumber<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `faxNumber` field to an Option value (optional)
@@ -6265,7 +6268,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessFaxNumber<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -6276,12 +6279,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessFounder<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `founder` field to an Option value (optional)
     pub fn maybe_founder(mut self, value: Option<LocalBusinessFounder<'a>>) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -6292,12 +6295,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessFounders<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `founders` field to an Option value (optional)
     pub fn maybe_founders(mut self, value: Option<LocalBusinessFounders<'a>>) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -6308,7 +6311,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessFoundingDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `foundingDate` field to an Option value (optional)
@@ -6316,7 +6319,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessFoundingDate<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -6327,7 +6330,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessFoundingLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `foundingLocation` field to an Option value (optional)
@@ -6335,7 +6338,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessFoundingLocation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -6343,12 +6346,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<LocalBusinessFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<LocalBusinessFunder<'a>>) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -6359,12 +6362,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessFunding<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<LocalBusinessFunding<'a>>) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -6372,12 +6375,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `geo` field (optional)
     pub fn geo(mut self, value: impl Into<Option<LocalBusinessGeo<'a>>>) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `geo` field to an Option value (optional)
     pub fn maybe_geo(mut self, value: Option<LocalBusinessGeo<'a>>) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -6388,7 +6391,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessGeoContains<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `geoContains` field to an Option value (optional)
@@ -6396,7 +6399,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessGeoContains<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -6407,7 +6410,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessGeoCoveredBy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `geoCoveredBy` field to an Option value (optional)
@@ -6415,7 +6418,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessGeoCoveredBy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -6426,7 +6429,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessGeoCovers<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `geoCovers` field to an Option value (optional)
@@ -6434,7 +6437,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessGeoCovers<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -6445,7 +6448,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessGeoCrosses<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `geoCrosses` field to an Option value (optional)
@@ -6453,7 +6456,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessGeoCrosses<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -6464,7 +6467,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessGeoDisjoint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `geoDisjoint` field to an Option value (optional)
@@ -6472,7 +6475,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessGeoDisjoint<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -6483,7 +6486,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessGeoEquals<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `geoEquals` field to an Option value (optional)
@@ -6491,7 +6494,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessGeoEquals<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -6502,7 +6505,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessGeoIntersects<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `geoIntersects` field to an Option value (optional)
@@ -6510,7 +6513,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessGeoIntersects<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -6521,7 +6524,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessGeoOverlaps<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `geoOverlaps` field to an Option value (optional)
@@ -6529,7 +6532,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessGeoOverlaps<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -6540,7 +6543,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessGeoTouches<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `geoTouches` field to an Option value (optional)
@@ -6548,7 +6551,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessGeoTouches<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -6559,7 +6562,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessGeoWithin<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `geoWithin` field to an Option value (optional)
@@ -6567,7 +6570,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessGeoWithin<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -6578,7 +6581,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessGlobalLocationNumber<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `globalLocationNumber` field to an Option value (optional)
@@ -6586,7 +6589,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessGlobalLocationNumber<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -6597,7 +6600,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessHasCertification<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `hasCertification` field to an Option value (optional)
@@ -6605,7 +6608,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessHasCertification<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -6616,7 +6619,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessHasCredential<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `hasCredential` field to an Option value (optional)
@@ -6624,7 +6627,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessHasCredential<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -6635,7 +6638,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessHasDriveThroughService<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `hasDriveThroughService` field to an Option value (optional)
@@ -6643,7 +6646,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessHasDriveThroughService<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -6654,7 +6657,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessHasGs1DigitalLink<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `hasGS1DigitalLink` field to an Option value (optional)
@@ -6662,7 +6665,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessHasGs1DigitalLink<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -6670,12 +6673,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `hasMap` field (optional)
     pub fn has_map(mut self, value: impl Into<Option<LocalBusinessHasMap<'a>>>) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `hasMap` field to an Option value (optional)
     pub fn maybe_has_map(mut self, value: Option<LocalBusinessHasMap<'a>>) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -6686,7 +6689,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessHasMemberProgram<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `hasMemberProgram` field to an Option value (optional)
@@ -6694,7 +6697,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessHasMemberProgram<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -6705,7 +6708,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessHasMerchantReturnPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `hasMerchantReturnPolicy` field to an Option value (optional)
@@ -6713,7 +6716,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessHasMerchantReturnPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -6724,7 +6727,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessHasOfferCatalog<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `hasOfferCatalog` field to an Option value (optional)
@@ -6732,7 +6735,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessHasOfferCatalog<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -6740,12 +6743,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `hasPOS` field (optional)
     pub fn has_pos(mut self, value: impl Into<Option<LocalBusinessHasPos<'a>>>) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `hasPOS` field to an Option value (optional)
     pub fn maybe_has_pos(mut self, value: Option<LocalBusinessHasPos<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -6756,7 +6759,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessHasProductReturnPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `hasProductReturnPolicy` field to an Option value (optional)
@@ -6764,7 +6767,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessHasProductReturnPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -6775,7 +6778,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessHasShippingService<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `hasShippingService` field to an Option value (optional)
@@ -6783,7 +6786,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessHasShippingService<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -6794,7 +6797,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessIdentifier<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
@@ -6802,7 +6805,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessIdentifier<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -6810,12 +6813,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<LocalBusinessImage<'a>>>) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<LocalBusinessImage<'a>>) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -6826,7 +6829,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -6834,7 +6837,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -6845,7 +6848,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessIsAccessibleForFree<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `isAccessibleForFree` field to an Option value (optional)
@@ -6853,7 +6856,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessIsAccessibleForFree<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -6861,12 +6864,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `isicV4` field (optional)
     pub fn isic_v4(mut self, value: impl Into<Option<LocalBusinessIsicV4<'a>>>) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `isicV4` field to an Option value (optional)
     pub fn maybe_isic_v4(mut self, value: Option<LocalBusinessIsicV4<'a>>) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -6877,7 +6880,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessIso6523Code<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `iso6523Code` field to an Option value (optional)
@@ -6885,7 +6888,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessIso6523Code<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -6896,12 +6899,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessKeywords<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<LocalBusinessKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -6912,7 +6915,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessKnowsAbout<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `knowsAbout` field to an Option value (optional)
@@ -6920,7 +6923,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessKnowsAbout<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -6931,7 +6934,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessKnowsLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `knowsLanguage` field to an Option value (optional)
@@ -6939,7 +6942,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessKnowsLanguage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -6950,12 +6953,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessLatitude<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `latitude` field to an Option value (optional)
     pub fn maybe_latitude(mut self, value: Option<LocalBusinessLatitude<'a>>) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -6966,7 +6969,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessLegalAddress<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `legalAddress` field to an Option value (optional)
@@ -6974,7 +6977,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessLegalAddress<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -6985,7 +6988,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessLegalName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `legalName` field to an Option value (optional)
@@ -6993,7 +6996,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessLegalName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -7004,7 +7007,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessLegalRepresentative<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value.into();
+        self._fields.79 = value.into();
         self
     }
     /// Set the `legalRepresentative` field to an Option value (optional)
@@ -7012,7 +7015,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessLegalRepresentative<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value;
+        self._fields.79 = value;
         self
     }
 }
@@ -7023,12 +7026,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessLeiCode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value.into();
+        self._fields.80 = value.into();
         self
     }
     /// Set the `leiCode` field to an Option value (optional)
     pub fn maybe_lei_code(mut self, value: Option<LocalBusinessLeiCode<'a>>) -> Self {
-        self.__unsafe_private_named.80 = value;
+        self._fields.80 = value;
         self
     }
 }
@@ -7039,12 +7042,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.81 = value.into();
+        self._fields.81 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<LocalBusinessLocation<'a>>) -> Self {
-        self.__unsafe_private_named.81 = value;
+        self._fields.81 = value;
         self
     }
 }
@@ -7052,12 +7055,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `logo` field (optional)
     pub fn logo(mut self, value: impl Into<Option<LocalBusinessLogo<'a>>>) -> Self {
-        self.__unsafe_private_named.82 = value.into();
+        self._fields.82 = value.into();
         self
     }
     /// Set the `logo` field to an Option value (optional)
     pub fn maybe_logo(mut self, value: Option<LocalBusinessLogo<'a>>) -> Self {
-        self.__unsafe_private_named.82 = value;
+        self._fields.82 = value;
         self
     }
 }
@@ -7068,12 +7071,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessLongitude<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.83 = value.into();
+        self._fields.83 = value.into();
         self
     }
     /// Set the `longitude` field to an Option value (optional)
     pub fn maybe_longitude(mut self, value: Option<LocalBusinessLongitude<'a>>) -> Self {
-        self.__unsafe_private_named.83 = value;
+        self._fields.83 = value;
         self
     }
 }
@@ -7084,7 +7087,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value.into();
+        self._fields.84 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -7092,7 +7095,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value;
+        self._fields.84 = value;
         self
     }
 }
@@ -7103,7 +7106,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessMakesOffer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.85 = value.into();
+        self._fields.85 = value.into();
         self
     }
     /// Set the `makesOffer` field to an Option value (optional)
@@ -7111,7 +7114,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessMakesOffer<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.85 = value;
+        self._fields.85 = value;
         self
     }
 }
@@ -7119,12 +7122,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `map` field (optional)
     pub fn map(mut self, value: impl Into<Option<LocalBusinessMap<'a>>>) -> Self {
-        self.__unsafe_private_named.86 = value.into();
+        self._fields.86 = value.into();
         self
     }
     /// Set the `map` field to an Option value (optional)
     pub fn maybe_map(mut self, value: Option<LocalBusinessMap<'a>>) -> Self {
-        self.__unsafe_private_named.86 = value;
+        self._fields.86 = value;
         self
     }
 }
@@ -7132,12 +7135,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `maps` field (optional)
     pub fn maps(mut self, value: impl Into<Option<LocalBusinessMaps<'a>>>) -> Self {
-        self.__unsafe_private_named.87 = value.into();
+        self._fields.87 = value.into();
         self
     }
     /// Set the `maps` field to an Option value (optional)
     pub fn maybe_maps(mut self, value: Option<LocalBusinessMaps<'a>>) -> Self {
-        self.__unsafe_private_named.87 = value;
+        self._fields.87 = value;
         self
     }
 }
@@ -7148,7 +7151,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessMaximumAttendeeCapacity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.88 = value.into();
+        self._fields.88 = value.into();
         self
     }
     /// Set the `maximumAttendeeCapacity` field to an Option value (optional)
@@ -7156,7 +7159,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessMaximumAttendeeCapacity<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.88 = value;
+        self._fields.88 = value;
         self
     }
 }
@@ -7164,12 +7167,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `member` field (optional)
     pub fn member(mut self, value: impl Into<Option<LocalBusinessMember<'a>>>) -> Self {
-        self.__unsafe_private_named.89 = value.into();
+        self._fields.89 = value.into();
         self
     }
     /// Set the `member` field to an Option value (optional)
     pub fn maybe_member(mut self, value: Option<LocalBusinessMember<'a>>) -> Self {
-        self.__unsafe_private_named.89 = value;
+        self._fields.89 = value;
         self
     }
 }
@@ -7180,12 +7183,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessMemberOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.90 = value.into();
+        self._fields.90 = value.into();
         self
     }
     /// Set the `memberOf` field to an Option value (optional)
     pub fn maybe_member_of(mut self, value: Option<LocalBusinessMemberOf<'a>>) -> Self {
-        self.__unsafe_private_named.90 = value;
+        self._fields.90 = value;
         self
     }
 }
@@ -7196,12 +7199,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessMembers<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.91 = value.into();
+        self._fields.91 = value.into();
         self
     }
     /// Set the `members` field to an Option value (optional)
     pub fn maybe_members(mut self, value: Option<LocalBusinessMembers<'a>>) -> Self {
-        self.__unsafe_private_named.91 = value;
+        self._fields.91 = value;
         self
     }
 }
@@ -7209,12 +7212,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `naics` field (optional)
     pub fn naics(mut self, value: impl Into<Option<LocalBusinessNaics<'a>>>) -> Self {
-        self.__unsafe_private_named.92 = value.into();
+        self._fields.92 = value.into();
         self
     }
     /// Set the `naics` field to an Option value (optional)
     pub fn maybe_naics(mut self, value: Option<LocalBusinessNaics<'a>>) -> Self {
-        self.__unsafe_private_named.92 = value;
+        self._fields.92 = value;
         self
     }
 }
@@ -7222,12 +7225,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<LocalBusinessName<'a>>>) -> Self {
-        self.__unsafe_private_named.93 = value.into();
+        self._fields.93 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<LocalBusinessName<'a>>) -> Self {
-        self.__unsafe_private_named.93 = value;
+        self._fields.93 = value;
         self
     }
 }
@@ -7238,7 +7241,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessNonprofitStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value.into();
+        self._fields.94 = value.into();
         self
     }
     /// Set the `nonprofitStatus` field to an Option value (optional)
@@ -7246,7 +7249,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessNonprofitStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value;
+        self._fields.94 = value;
         self
     }
 }
@@ -7257,7 +7260,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessNumberOfEmployees<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.95 = value.into();
+        self._fields.95 = value.into();
         self
     }
     /// Set the `numberOfEmployees` field to an Option value (optional)
@@ -7265,7 +7268,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessNumberOfEmployees<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.95 = value;
+        self._fields.95 = value;
         self
     }
 }
@@ -7276,7 +7279,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessOpeningHours<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.96 = value.into();
+        self._fields.96 = value.into();
         self
     }
     /// Set the `openingHours` field to an Option value (optional)
@@ -7284,7 +7287,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessOpeningHours<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.96 = value;
+        self._fields.96 = value;
         self
     }
 }
@@ -7295,7 +7298,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessOpeningHoursSpecification<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.97 = value.into();
+        self._fields.97 = value.into();
         self
     }
     /// Set the `openingHoursSpecification` field to an Option value (optional)
@@ -7303,7 +7306,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessOpeningHoursSpecification<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.97 = value;
+        self._fields.97 = value;
         self
     }
 }
@@ -7314,7 +7317,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessOwnershipFundingInfo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value.into();
+        self._fields.98 = value.into();
         self
     }
     /// Set the `ownershipFundingInfo` field to an Option value (optional)
@@ -7322,7 +7325,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessOwnershipFundingInfo<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value;
+        self._fields.98 = value;
         self
     }
 }
@@ -7330,12 +7333,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `owns` field (optional)
     pub fn owns(mut self, value: impl Into<Option<LocalBusinessOwns<'a>>>) -> Self {
-        self.__unsafe_private_named.99 = value.into();
+        self._fields.99 = value.into();
         self
     }
     /// Set the `owns` field to an Option value (optional)
     pub fn maybe_owns(mut self, value: Option<LocalBusinessOwns<'a>>) -> Self {
-        self.__unsafe_private_named.99 = value;
+        self._fields.99 = value;
         self
     }
 }
@@ -7346,7 +7349,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessParentOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value.into();
+        self._fields.100 = value.into();
         self
     }
     /// Set the `parentOrganization` field to an Option value (optional)
@@ -7354,7 +7357,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessParentOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value;
+        self._fields.100 = value;
         self
     }
 }
@@ -7365,7 +7368,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessPaymentAccepted<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value.into();
+        self._fields.101 = value.into();
         self
     }
     /// Set the `paymentAccepted` field to an Option value (optional)
@@ -7373,7 +7376,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessPaymentAccepted<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value;
+        self._fields.101 = value;
         self
     }
 }
@@ -7381,12 +7384,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `photo` field (optional)
     pub fn photo(mut self, value: impl Into<Option<LocalBusinessPhoto<'a>>>) -> Self {
-        self.__unsafe_private_named.102 = value.into();
+        self._fields.102 = value.into();
         self
     }
     /// Set the `photo` field to an Option value (optional)
     pub fn maybe_photo(mut self, value: Option<LocalBusinessPhoto<'a>>) -> Self {
-        self.__unsafe_private_named.102 = value;
+        self._fields.102 = value;
         self
     }
 }
@@ -7394,12 +7397,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `photos` field (optional)
     pub fn photos(mut self, value: impl Into<Option<LocalBusinessPhotos<'a>>>) -> Self {
-        self.__unsafe_private_named.103 = value.into();
+        self._fields.103 = value.into();
         self
     }
     /// Set the `photos` field to an Option value (optional)
     pub fn maybe_photos(mut self, value: Option<LocalBusinessPhotos<'a>>) -> Self {
-        self.__unsafe_private_named.103 = value;
+        self._fields.103 = value;
         self
     }
 }
@@ -7410,7 +7413,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessPotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value.into();
+        self._fields.104 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -7418,7 +7421,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessPotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value;
+        self._fields.104 = value;
         self
     }
 }
@@ -7429,7 +7432,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessPriceRange<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.105 = value.into();
+        self._fields.105 = value.into();
         self
     }
     /// Set the `priceRange` field to an Option value (optional)
@@ -7437,7 +7440,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessPriceRange<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.105 = value;
+        self._fields.105 = value;
         self
     }
 }
@@ -7448,7 +7451,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessPublicAccess<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value.into();
+        self._fields.106 = value.into();
         self
     }
     /// Set the `publicAccess` field to an Option value (optional)
@@ -7456,7 +7459,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessPublicAccess<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value;
+        self._fields.106 = value;
         self
     }
 }
@@ -7467,7 +7470,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessPublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value.into();
+        self._fields.107 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -7475,7 +7478,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessPublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value;
+        self._fields.107 = value;
         self
     }
 }
@@ -7483,12 +7486,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<LocalBusinessReview<'a>>>) -> Self {
-        self.__unsafe_private_named.108 = value.into();
+        self._fields.108 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<LocalBusinessReview<'a>>) -> Self {
-        self.__unsafe_private_named.108 = value;
+        self._fields.108 = value;
         self
     }
 }
@@ -7499,12 +7502,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessReviews<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.109 = value.into();
+        self._fields.109 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<LocalBusinessReviews<'a>>) -> Self {
-        self.__unsafe_private_named.109 = value;
+        self._fields.109 = value;
         self
     }
 }
@@ -7512,12 +7515,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<LocalBusinessSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.110 = value.into();
+        self._fields.110 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<LocalBusinessSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.110 = value;
+        self._fields.110 = value;
         self
     }
 }
@@ -7525,12 +7528,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `seeks` field (optional)
     pub fn seeks(mut self, value: impl Into<Option<LocalBusinessSeeks<'a>>>) -> Self {
-        self.__unsafe_private_named.111 = value.into();
+        self._fields.111 = value.into();
         self
     }
     /// Set the `seeks` field to an Option value (optional)
     pub fn maybe_seeks(mut self, value: Option<LocalBusinessSeeks<'a>>) -> Self {
-        self.__unsafe_private_named.111 = value;
+        self._fields.111 = value;
         self
     }
 }
@@ -7541,7 +7544,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessServiceArea<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value.into();
+        self._fields.112 = value.into();
         self
     }
     /// Set the `serviceArea` field to an Option value (optional)
@@ -7549,7 +7552,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessServiceArea<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value;
+        self._fields.112 = value;
         self
     }
 }
@@ -7557,12 +7560,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `skills` field (optional)
     pub fn skills(mut self, value: impl Into<Option<LocalBusinessSkills<'a>>>) -> Self {
-        self.__unsafe_private_named.113 = value.into();
+        self._fields.113 = value.into();
         self
     }
     /// Set the `skills` field to an Option value (optional)
     pub fn maybe_skills(mut self, value: Option<LocalBusinessSkills<'a>>) -> Self {
-        self.__unsafe_private_named.113 = value;
+        self._fields.113 = value;
         self
     }
 }
@@ -7570,12 +7573,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `slogan` field (optional)
     pub fn slogan(mut self, value: impl Into<Option<LocalBusinessSlogan<'a>>>) -> Self {
-        self.__unsafe_private_named.114 = value.into();
+        self._fields.114 = value.into();
         self
     }
     /// Set the `slogan` field to an Option value (optional)
     pub fn maybe_slogan(mut self, value: Option<LocalBusinessSlogan<'a>>) -> Self {
-        self.__unsafe_private_named.114 = value;
+        self._fields.114 = value;
         self
     }
 }
@@ -7586,7 +7589,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessSmokingAllowed<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.115 = value.into();
+        self._fields.115 = value.into();
         self
     }
     /// Set the `smokingAllowed` field to an Option value (optional)
@@ -7594,7 +7597,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessSmokingAllowed<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.115 = value;
+        self._fields.115 = value;
         self
     }
 }
@@ -7605,7 +7608,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessSpecialOpeningHoursSpecification<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.116 = value.into();
+        self._fields.116 = value.into();
         self
     }
     /// Set the `specialOpeningHoursSpecification` field to an Option value (optional)
@@ -7613,7 +7616,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessSpecialOpeningHoursSpecification<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.116 = value;
+        self._fields.116 = value;
         self
     }
 }
@@ -7624,12 +7627,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessSponsor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.117 = value.into();
+        self._fields.117 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<LocalBusinessSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.117 = value;
+        self._fields.117 = value;
         self
     }
 }
@@ -7640,7 +7643,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessSubOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.118 = value.into();
+        self._fields.118 = value.into();
         self
     }
     /// Set the `subOrganization` field to an Option value (optional)
@@ -7648,7 +7651,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessSubOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.118 = value;
+        self._fields.118 = value;
         self
     }
 }
@@ -7659,7 +7662,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessSubjectOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.119 = value.into();
+        self._fields.119 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
@@ -7667,7 +7670,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessSubjectOf<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.119 = value;
+        self._fields.119 = value;
         self
     }
 }
@@ -7675,12 +7678,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `taxID` field (optional)
     pub fn tax_id(mut self, value: impl Into<Option<LocalBusinessTaxId<'a>>>) -> Self {
-        self.__unsafe_private_named.120 = value.into();
+        self._fields.120 = value.into();
         self
     }
     /// Set the `taxID` field to an Option value (optional)
     pub fn maybe_tax_id(mut self, value: Option<LocalBusinessTaxId<'a>>) -> Self {
-        self.__unsafe_private_named.120 = value;
+        self._fields.120 = value;
         self
     }
 }
@@ -7691,12 +7694,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessTelephone<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.121 = value.into();
+        self._fields.121 = value.into();
         self
     }
     /// Set the `telephone` field to an Option value (optional)
     pub fn maybe_telephone(mut self, value: Option<LocalBusinessTelephone<'a>>) -> Self {
-        self.__unsafe_private_named.121 = value;
+        self._fields.121 = value;
         self
     }
 }
@@ -7707,7 +7710,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessTourBookingPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.122 = value.into();
+        self._fields.122 = value.into();
         self
     }
     /// Set the `tourBookingPage` field to an Option value (optional)
@@ -7715,7 +7718,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessTourBookingPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.122 = value;
+        self._fields.122 = value;
         self
     }
 }
@@ -7726,7 +7729,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: impl Into<Option<LocalBusinessUnnamedSourcesPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.123 = value.into();
+        self._fields.123 = value.into();
         self
     }
     /// Set the `unnamedSourcesPolicy` field to an Option value (optional)
@@ -7734,7 +7737,7 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
         mut self,
         value: Option<LocalBusinessUnnamedSourcesPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.123 = value;
+        self._fields.123 = value;
         self
     }
 }
@@ -7742,12 +7745,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<LocalBusinessUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.124 = value.into();
+        self._fields.124 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<LocalBusinessUrl<'a>>) -> Self {
-        self.__unsafe_private_named.124 = value;
+        self._fields.124 = value;
         self
     }
 }
@@ -7755,12 +7758,12 @@ impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
 impl<'a, S: local_business_state::State> LocalBusinessBuilder<'a, S> {
     /// Set the `vatID` field (optional)
     pub fn vat_id(mut self, value: impl Into<Option<LocalBusinessVatId<'a>>>) -> Self {
-        self.__unsafe_private_named.125 = value.into();
+        self._fields.125 = value.into();
         self
     }
     /// Set the `vatID` field to an Option value (optional)
     pub fn maybe_vat_id(mut self, value: Option<LocalBusinessVatId<'a>>) -> Self {
-        self.__unsafe_private_named.125 = value;
+        self._fields.125 = value;
         self
     }
 }
@@ -7772,132 +7775,132 @@ where
     /// Build the final struct
     pub fn build(self) -> LocalBusiness<'a> {
         LocalBusiness {
-            accepted_payment_method: self.__unsafe_private_named.0,
-            actionable_feedback_policy: self.__unsafe_private_named.1,
-            additional_property: self.__unsafe_private_named.2,
-            additional_type: self.__unsafe_private_named.3,
-            address: self.__unsafe_private_named.4,
-            agent_interaction_statistic: self.__unsafe_private_named.5,
-            aggregate_rating: self.__unsafe_private_named.6,
-            alternate_name: self.__unsafe_private_named.7,
-            alumni: self.__unsafe_private_named.8,
-            amenity_feature: self.__unsafe_private_named.9,
-            area_served: self.__unsafe_private_named.10,
-            award: self.__unsafe_private_named.11,
-            awards: self.__unsafe_private_named.12,
-            branch_code: self.__unsafe_private_named.13,
-            branch_of: self.__unsafe_private_named.14,
-            brand: self.__unsafe_private_named.15,
-            company_registration: self.__unsafe_private_named.16,
-            contact_point: self.__unsafe_private_named.17,
-            contact_points: self.__unsafe_private_named.18,
-            contained_in: self.__unsafe_private_named.19,
-            contained_in_place: self.__unsafe_private_named.20,
-            contains_place: self.__unsafe_private_named.21,
-            corrections_policy: self.__unsafe_private_named.22,
-            currencies_accepted: self.__unsafe_private_named.23,
-            department: self.__unsafe_private_named.24,
-            description: self.__unsafe_private_named.25,
-            disambiguating_description: self.__unsafe_private_named.26,
-            dissolution_date: self.__unsafe_private_named.27,
-            diversity_policy: self.__unsafe_private_named.28,
-            diversity_staffing_report: self.__unsafe_private_named.29,
-            duns: self.__unsafe_private_named.30,
-            email: self.__unsafe_private_named.31,
-            employee: self.__unsafe_private_named.32,
-            employees: self.__unsafe_private_named.33,
-            ethics_policy: self.__unsafe_private_named.34,
-            event: self.__unsafe_private_named.35,
-            events: self.__unsafe_private_named.36,
-            fax_number: self.__unsafe_private_named.37,
-            founder: self.__unsafe_private_named.38,
-            founders: self.__unsafe_private_named.39,
-            founding_date: self.__unsafe_private_named.40,
-            founding_location: self.__unsafe_private_named.41,
-            funder: self.__unsafe_private_named.42,
-            funding: self.__unsafe_private_named.43,
-            geo: self.__unsafe_private_named.44,
-            geo_contains: self.__unsafe_private_named.45,
-            geo_covered_by: self.__unsafe_private_named.46,
-            geo_covers: self.__unsafe_private_named.47,
-            geo_crosses: self.__unsafe_private_named.48,
-            geo_disjoint: self.__unsafe_private_named.49,
-            geo_equals: self.__unsafe_private_named.50,
-            geo_intersects: self.__unsafe_private_named.51,
-            geo_overlaps: self.__unsafe_private_named.52,
-            geo_touches: self.__unsafe_private_named.53,
-            geo_within: self.__unsafe_private_named.54,
-            global_location_number: self.__unsafe_private_named.55,
-            has_certification: self.__unsafe_private_named.56,
-            has_credential: self.__unsafe_private_named.57,
-            has_drive_through_service: self.__unsafe_private_named.58,
-            has_gs1_digital_link: self.__unsafe_private_named.59,
-            has_map: self.__unsafe_private_named.60,
-            has_member_program: self.__unsafe_private_named.61,
-            has_merchant_return_policy: self.__unsafe_private_named.62,
-            has_offer_catalog: self.__unsafe_private_named.63,
-            has_pos: self.__unsafe_private_named.64,
-            has_product_return_policy: self.__unsafe_private_named.65,
-            has_shipping_service: self.__unsafe_private_named.66,
-            identifier: self.__unsafe_private_named.67,
-            image: self.__unsafe_private_named.68,
-            interaction_statistic: self.__unsafe_private_named.69,
-            is_accessible_for_free: self.__unsafe_private_named.70,
-            isic_v4: self.__unsafe_private_named.71,
-            iso6523_code: self.__unsafe_private_named.72,
-            keywords: self.__unsafe_private_named.73,
-            knows_about: self.__unsafe_private_named.74,
-            knows_language: self.__unsafe_private_named.75,
-            latitude: self.__unsafe_private_named.76,
-            legal_address: self.__unsafe_private_named.77,
-            legal_name: self.__unsafe_private_named.78,
-            legal_representative: self.__unsafe_private_named.79,
-            lei_code: self.__unsafe_private_named.80,
-            location: self.__unsafe_private_named.81,
-            logo: self.__unsafe_private_named.82,
-            longitude: self.__unsafe_private_named.83,
-            main_entity_of_page: self.__unsafe_private_named.84,
-            makes_offer: self.__unsafe_private_named.85,
-            map: self.__unsafe_private_named.86,
-            maps: self.__unsafe_private_named.87,
-            maximum_attendee_capacity: self.__unsafe_private_named.88,
-            member: self.__unsafe_private_named.89,
-            member_of: self.__unsafe_private_named.90,
-            members: self.__unsafe_private_named.91,
-            naics: self.__unsafe_private_named.92,
-            name: self.__unsafe_private_named.93,
-            nonprofit_status: self.__unsafe_private_named.94,
-            number_of_employees: self.__unsafe_private_named.95,
-            opening_hours: self.__unsafe_private_named.96,
-            opening_hours_specification: self.__unsafe_private_named.97,
-            ownership_funding_info: self.__unsafe_private_named.98,
-            owns: self.__unsafe_private_named.99,
-            parent_organization: self.__unsafe_private_named.100,
-            payment_accepted: self.__unsafe_private_named.101,
-            photo: self.__unsafe_private_named.102,
-            photos: self.__unsafe_private_named.103,
-            potential_action: self.__unsafe_private_named.104,
-            price_range: self.__unsafe_private_named.105,
-            public_access: self.__unsafe_private_named.106,
-            publishing_principles: self.__unsafe_private_named.107,
-            review: self.__unsafe_private_named.108,
-            reviews: self.__unsafe_private_named.109,
-            same_as: self.__unsafe_private_named.110,
-            seeks: self.__unsafe_private_named.111,
-            service_area: self.__unsafe_private_named.112,
-            skills: self.__unsafe_private_named.113,
-            slogan: self.__unsafe_private_named.114,
-            smoking_allowed: self.__unsafe_private_named.115,
-            special_opening_hours_specification: self.__unsafe_private_named.116,
-            sponsor: self.__unsafe_private_named.117,
-            sub_organization: self.__unsafe_private_named.118,
-            subject_of: self.__unsafe_private_named.119,
-            tax_id: self.__unsafe_private_named.120,
-            telephone: self.__unsafe_private_named.121,
-            tour_booking_page: self.__unsafe_private_named.122,
-            unnamed_sources_policy: self.__unsafe_private_named.123,
-            url: self.__unsafe_private_named.124,
-            vat_id: self.__unsafe_private_named.125,
+            accepted_payment_method: self._fields.0,
+            actionable_feedback_policy: self._fields.1,
+            additional_property: self._fields.2,
+            additional_type: self._fields.3,
+            address: self._fields.4,
+            agent_interaction_statistic: self._fields.5,
+            aggregate_rating: self._fields.6,
+            alternate_name: self._fields.7,
+            alumni: self._fields.8,
+            amenity_feature: self._fields.9,
+            area_served: self._fields.10,
+            award: self._fields.11,
+            awards: self._fields.12,
+            branch_code: self._fields.13,
+            branch_of: self._fields.14,
+            brand: self._fields.15,
+            company_registration: self._fields.16,
+            contact_point: self._fields.17,
+            contact_points: self._fields.18,
+            contained_in: self._fields.19,
+            contained_in_place: self._fields.20,
+            contains_place: self._fields.21,
+            corrections_policy: self._fields.22,
+            currencies_accepted: self._fields.23,
+            department: self._fields.24,
+            description: self._fields.25,
+            disambiguating_description: self._fields.26,
+            dissolution_date: self._fields.27,
+            diversity_policy: self._fields.28,
+            diversity_staffing_report: self._fields.29,
+            duns: self._fields.30,
+            email: self._fields.31,
+            employee: self._fields.32,
+            employees: self._fields.33,
+            ethics_policy: self._fields.34,
+            event: self._fields.35,
+            events: self._fields.36,
+            fax_number: self._fields.37,
+            founder: self._fields.38,
+            founders: self._fields.39,
+            founding_date: self._fields.40,
+            founding_location: self._fields.41,
+            funder: self._fields.42,
+            funding: self._fields.43,
+            geo: self._fields.44,
+            geo_contains: self._fields.45,
+            geo_covered_by: self._fields.46,
+            geo_covers: self._fields.47,
+            geo_crosses: self._fields.48,
+            geo_disjoint: self._fields.49,
+            geo_equals: self._fields.50,
+            geo_intersects: self._fields.51,
+            geo_overlaps: self._fields.52,
+            geo_touches: self._fields.53,
+            geo_within: self._fields.54,
+            global_location_number: self._fields.55,
+            has_certification: self._fields.56,
+            has_credential: self._fields.57,
+            has_drive_through_service: self._fields.58,
+            has_gs1_digital_link: self._fields.59,
+            has_map: self._fields.60,
+            has_member_program: self._fields.61,
+            has_merchant_return_policy: self._fields.62,
+            has_offer_catalog: self._fields.63,
+            has_pos: self._fields.64,
+            has_product_return_policy: self._fields.65,
+            has_shipping_service: self._fields.66,
+            identifier: self._fields.67,
+            image: self._fields.68,
+            interaction_statistic: self._fields.69,
+            is_accessible_for_free: self._fields.70,
+            isic_v4: self._fields.71,
+            iso6523_code: self._fields.72,
+            keywords: self._fields.73,
+            knows_about: self._fields.74,
+            knows_language: self._fields.75,
+            latitude: self._fields.76,
+            legal_address: self._fields.77,
+            legal_name: self._fields.78,
+            legal_representative: self._fields.79,
+            lei_code: self._fields.80,
+            location: self._fields.81,
+            logo: self._fields.82,
+            longitude: self._fields.83,
+            main_entity_of_page: self._fields.84,
+            makes_offer: self._fields.85,
+            map: self._fields.86,
+            maps: self._fields.87,
+            maximum_attendee_capacity: self._fields.88,
+            member: self._fields.89,
+            member_of: self._fields.90,
+            members: self._fields.91,
+            naics: self._fields.92,
+            name: self._fields.93,
+            nonprofit_status: self._fields.94,
+            number_of_employees: self._fields.95,
+            opening_hours: self._fields.96,
+            opening_hours_specification: self._fields.97,
+            ownership_funding_info: self._fields.98,
+            owns: self._fields.99,
+            parent_organization: self._fields.100,
+            payment_accepted: self._fields.101,
+            photo: self._fields.102,
+            photos: self._fields.103,
+            potential_action: self._fields.104,
+            price_range: self._fields.105,
+            public_access: self._fields.106,
+            publishing_principles: self._fields.107,
+            review: self._fields.108,
+            reviews: self._fields.109,
+            same_as: self._fields.110,
+            seeks: self._fields.111,
+            service_area: self._fields.112,
+            skills: self._fields.113,
+            slogan: self._fields.114,
+            smoking_allowed: self._fields.115,
+            special_opening_hours_specification: self._fields.116,
+            sponsor: self._fields.117,
+            sub_organization: self._fields.118,
+            subject_of: self._fields.119,
+            tax_id: self._fields.120,
+            telephone: self._fields.121,
+            tour_booking_page: self._fields.122,
+            unnamed_sources_policy: self._fields.123,
+            url: self._fields.124,
+            vat_id: self._fields.125,
             extra_data: Default::default(),
         }
     }
@@ -7907,132 +7910,132 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> LocalBusiness<'a> {
         LocalBusiness {
-            accepted_payment_method: self.__unsafe_private_named.0,
-            actionable_feedback_policy: self.__unsafe_private_named.1,
-            additional_property: self.__unsafe_private_named.2,
-            additional_type: self.__unsafe_private_named.3,
-            address: self.__unsafe_private_named.4,
-            agent_interaction_statistic: self.__unsafe_private_named.5,
-            aggregate_rating: self.__unsafe_private_named.6,
-            alternate_name: self.__unsafe_private_named.7,
-            alumni: self.__unsafe_private_named.8,
-            amenity_feature: self.__unsafe_private_named.9,
-            area_served: self.__unsafe_private_named.10,
-            award: self.__unsafe_private_named.11,
-            awards: self.__unsafe_private_named.12,
-            branch_code: self.__unsafe_private_named.13,
-            branch_of: self.__unsafe_private_named.14,
-            brand: self.__unsafe_private_named.15,
-            company_registration: self.__unsafe_private_named.16,
-            contact_point: self.__unsafe_private_named.17,
-            contact_points: self.__unsafe_private_named.18,
-            contained_in: self.__unsafe_private_named.19,
-            contained_in_place: self.__unsafe_private_named.20,
-            contains_place: self.__unsafe_private_named.21,
-            corrections_policy: self.__unsafe_private_named.22,
-            currencies_accepted: self.__unsafe_private_named.23,
-            department: self.__unsafe_private_named.24,
-            description: self.__unsafe_private_named.25,
-            disambiguating_description: self.__unsafe_private_named.26,
-            dissolution_date: self.__unsafe_private_named.27,
-            diversity_policy: self.__unsafe_private_named.28,
-            diversity_staffing_report: self.__unsafe_private_named.29,
-            duns: self.__unsafe_private_named.30,
-            email: self.__unsafe_private_named.31,
-            employee: self.__unsafe_private_named.32,
-            employees: self.__unsafe_private_named.33,
-            ethics_policy: self.__unsafe_private_named.34,
-            event: self.__unsafe_private_named.35,
-            events: self.__unsafe_private_named.36,
-            fax_number: self.__unsafe_private_named.37,
-            founder: self.__unsafe_private_named.38,
-            founders: self.__unsafe_private_named.39,
-            founding_date: self.__unsafe_private_named.40,
-            founding_location: self.__unsafe_private_named.41,
-            funder: self.__unsafe_private_named.42,
-            funding: self.__unsafe_private_named.43,
-            geo: self.__unsafe_private_named.44,
-            geo_contains: self.__unsafe_private_named.45,
-            geo_covered_by: self.__unsafe_private_named.46,
-            geo_covers: self.__unsafe_private_named.47,
-            geo_crosses: self.__unsafe_private_named.48,
-            geo_disjoint: self.__unsafe_private_named.49,
-            geo_equals: self.__unsafe_private_named.50,
-            geo_intersects: self.__unsafe_private_named.51,
-            geo_overlaps: self.__unsafe_private_named.52,
-            geo_touches: self.__unsafe_private_named.53,
-            geo_within: self.__unsafe_private_named.54,
-            global_location_number: self.__unsafe_private_named.55,
-            has_certification: self.__unsafe_private_named.56,
-            has_credential: self.__unsafe_private_named.57,
-            has_drive_through_service: self.__unsafe_private_named.58,
-            has_gs1_digital_link: self.__unsafe_private_named.59,
-            has_map: self.__unsafe_private_named.60,
-            has_member_program: self.__unsafe_private_named.61,
-            has_merchant_return_policy: self.__unsafe_private_named.62,
-            has_offer_catalog: self.__unsafe_private_named.63,
-            has_pos: self.__unsafe_private_named.64,
-            has_product_return_policy: self.__unsafe_private_named.65,
-            has_shipping_service: self.__unsafe_private_named.66,
-            identifier: self.__unsafe_private_named.67,
-            image: self.__unsafe_private_named.68,
-            interaction_statistic: self.__unsafe_private_named.69,
-            is_accessible_for_free: self.__unsafe_private_named.70,
-            isic_v4: self.__unsafe_private_named.71,
-            iso6523_code: self.__unsafe_private_named.72,
-            keywords: self.__unsafe_private_named.73,
-            knows_about: self.__unsafe_private_named.74,
-            knows_language: self.__unsafe_private_named.75,
-            latitude: self.__unsafe_private_named.76,
-            legal_address: self.__unsafe_private_named.77,
-            legal_name: self.__unsafe_private_named.78,
-            legal_representative: self.__unsafe_private_named.79,
-            lei_code: self.__unsafe_private_named.80,
-            location: self.__unsafe_private_named.81,
-            logo: self.__unsafe_private_named.82,
-            longitude: self.__unsafe_private_named.83,
-            main_entity_of_page: self.__unsafe_private_named.84,
-            makes_offer: self.__unsafe_private_named.85,
-            map: self.__unsafe_private_named.86,
-            maps: self.__unsafe_private_named.87,
-            maximum_attendee_capacity: self.__unsafe_private_named.88,
-            member: self.__unsafe_private_named.89,
-            member_of: self.__unsafe_private_named.90,
-            members: self.__unsafe_private_named.91,
-            naics: self.__unsafe_private_named.92,
-            name: self.__unsafe_private_named.93,
-            nonprofit_status: self.__unsafe_private_named.94,
-            number_of_employees: self.__unsafe_private_named.95,
-            opening_hours: self.__unsafe_private_named.96,
-            opening_hours_specification: self.__unsafe_private_named.97,
-            ownership_funding_info: self.__unsafe_private_named.98,
-            owns: self.__unsafe_private_named.99,
-            parent_organization: self.__unsafe_private_named.100,
-            payment_accepted: self.__unsafe_private_named.101,
-            photo: self.__unsafe_private_named.102,
-            photos: self.__unsafe_private_named.103,
-            potential_action: self.__unsafe_private_named.104,
-            price_range: self.__unsafe_private_named.105,
-            public_access: self.__unsafe_private_named.106,
-            publishing_principles: self.__unsafe_private_named.107,
-            review: self.__unsafe_private_named.108,
-            reviews: self.__unsafe_private_named.109,
-            same_as: self.__unsafe_private_named.110,
-            seeks: self.__unsafe_private_named.111,
-            service_area: self.__unsafe_private_named.112,
-            skills: self.__unsafe_private_named.113,
-            slogan: self.__unsafe_private_named.114,
-            smoking_allowed: self.__unsafe_private_named.115,
-            special_opening_hours_specification: self.__unsafe_private_named.116,
-            sponsor: self.__unsafe_private_named.117,
-            sub_organization: self.__unsafe_private_named.118,
-            subject_of: self.__unsafe_private_named.119,
-            tax_id: self.__unsafe_private_named.120,
-            telephone: self.__unsafe_private_named.121,
-            tour_booking_page: self.__unsafe_private_named.122,
-            unnamed_sources_policy: self.__unsafe_private_named.123,
-            url: self.__unsafe_private_named.124,
-            vat_id: self.__unsafe_private_named.125,
+            accepted_payment_method: self._fields.0,
+            actionable_feedback_policy: self._fields.1,
+            additional_property: self._fields.2,
+            additional_type: self._fields.3,
+            address: self._fields.4,
+            agent_interaction_statistic: self._fields.5,
+            aggregate_rating: self._fields.6,
+            alternate_name: self._fields.7,
+            alumni: self._fields.8,
+            amenity_feature: self._fields.9,
+            area_served: self._fields.10,
+            award: self._fields.11,
+            awards: self._fields.12,
+            branch_code: self._fields.13,
+            branch_of: self._fields.14,
+            brand: self._fields.15,
+            company_registration: self._fields.16,
+            contact_point: self._fields.17,
+            contact_points: self._fields.18,
+            contained_in: self._fields.19,
+            contained_in_place: self._fields.20,
+            contains_place: self._fields.21,
+            corrections_policy: self._fields.22,
+            currencies_accepted: self._fields.23,
+            department: self._fields.24,
+            description: self._fields.25,
+            disambiguating_description: self._fields.26,
+            dissolution_date: self._fields.27,
+            diversity_policy: self._fields.28,
+            diversity_staffing_report: self._fields.29,
+            duns: self._fields.30,
+            email: self._fields.31,
+            employee: self._fields.32,
+            employees: self._fields.33,
+            ethics_policy: self._fields.34,
+            event: self._fields.35,
+            events: self._fields.36,
+            fax_number: self._fields.37,
+            founder: self._fields.38,
+            founders: self._fields.39,
+            founding_date: self._fields.40,
+            founding_location: self._fields.41,
+            funder: self._fields.42,
+            funding: self._fields.43,
+            geo: self._fields.44,
+            geo_contains: self._fields.45,
+            geo_covered_by: self._fields.46,
+            geo_covers: self._fields.47,
+            geo_crosses: self._fields.48,
+            geo_disjoint: self._fields.49,
+            geo_equals: self._fields.50,
+            geo_intersects: self._fields.51,
+            geo_overlaps: self._fields.52,
+            geo_touches: self._fields.53,
+            geo_within: self._fields.54,
+            global_location_number: self._fields.55,
+            has_certification: self._fields.56,
+            has_credential: self._fields.57,
+            has_drive_through_service: self._fields.58,
+            has_gs1_digital_link: self._fields.59,
+            has_map: self._fields.60,
+            has_member_program: self._fields.61,
+            has_merchant_return_policy: self._fields.62,
+            has_offer_catalog: self._fields.63,
+            has_pos: self._fields.64,
+            has_product_return_policy: self._fields.65,
+            has_shipping_service: self._fields.66,
+            identifier: self._fields.67,
+            image: self._fields.68,
+            interaction_statistic: self._fields.69,
+            is_accessible_for_free: self._fields.70,
+            isic_v4: self._fields.71,
+            iso6523_code: self._fields.72,
+            keywords: self._fields.73,
+            knows_about: self._fields.74,
+            knows_language: self._fields.75,
+            latitude: self._fields.76,
+            legal_address: self._fields.77,
+            legal_name: self._fields.78,
+            legal_representative: self._fields.79,
+            lei_code: self._fields.80,
+            location: self._fields.81,
+            logo: self._fields.82,
+            longitude: self._fields.83,
+            main_entity_of_page: self._fields.84,
+            makes_offer: self._fields.85,
+            map: self._fields.86,
+            maps: self._fields.87,
+            maximum_attendee_capacity: self._fields.88,
+            member: self._fields.89,
+            member_of: self._fields.90,
+            members: self._fields.91,
+            naics: self._fields.92,
+            name: self._fields.93,
+            nonprofit_status: self._fields.94,
+            number_of_employees: self._fields.95,
+            opening_hours: self._fields.96,
+            opening_hours_specification: self._fields.97,
+            ownership_funding_info: self._fields.98,
+            owns: self._fields.99,
+            parent_organization: self._fields.100,
+            payment_accepted: self._fields.101,
+            photo: self._fields.102,
+            photos: self._fields.103,
+            potential_action: self._fields.104,
+            price_range: self._fields.105,
+            public_access: self._fields.106,
+            publishing_principles: self._fields.107,
+            review: self._fields.108,
+            reviews: self._fields.109,
+            same_as: self._fields.110,
+            seeks: self._fields.111,
+            service_area: self._fields.112,
+            skills: self._fields.113,
+            slogan: self._fields.114,
+            smoking_allowed: self._fields.115,
+            special_opening_hours_specification: self._fields.116,
+            sponsor: self._fields.117,
+            sub_organization: self._fields.118,
+            subject_of: self._fields.119,
+            tax_id: self._fields.120,
+            telephone: self._fields.121,
+            tour_booking_page: self._fields.122,
+            unnamed_sources_policy: self._fields.123,
+            url: self._fields.124,
+            vat_id: self._fields.125,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/movie.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/movie.rs
index 34dd3c28..26975c9e 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/movie.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/movie.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -5804,8 +5807,8 @@ pub mod movie_state {
 
 /// Builder for constructing an instance of this type
 pub struct MovieBuilder<'a, S: movie_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<MovieAbout<'a>>,
         Option<MovieAbstract<'a>>,
         Option<MovieAccessMode<'a>>,
@@ -5944,7 +5947,7 @@ pub struct MovieBuilder<'a, S: movie_state::State> {
         Option<MovieWorkExample<'a>>,
         Option<MovieWorkTranslation<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Movie<'a> {
@@ -5958,8 +5961,8 @@ impl<'a> MovieBuilder<'a, movie_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MovieBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -6098,7 +6101,7 @@ impl<'a> MovieBuilder<'a, movie_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6106,12 +6109,12 @@ impl<'a> MovieBuilder<'a, movie_state::Empty> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `about` field (optional)
     pub fn about(mut self, value: impl Into<Option<MovieAbout<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `about` field to an Option value (optional)
     pub fn maybe_about(mut self, value: Option<MovieAbout<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -6119,12 +6122,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `abstract` field (optional)
     pub fn r#abstract(mut self, value: impl Into<Option<MovieAbstract<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `abstract` field to an Option value (optional)
     pub fn maybe_abstract(mut self, value: Option<MovieAbstract<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -6132,12 +6135,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `accessMode` field (optional)
     pub fn access_mode(mut self, value: impl Into<Option<MovieAccessMode<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `accessMode` field to an Option value (optional)
     pub fn maybe_access_mode(mut self, value: Option<MovieAccessMode<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -6148,7 +6151,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieAccessModeSufficient<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `accessModeSufficient` field to an Option value (optional)
@@ -6156,7 +6159,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieAccessModeSufficient<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -6167,7 +6170,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieAccessibilityApi<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `accessibilityAPI` field to an Option value (optional)
@@ -6175,7 +6178,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieAccessibilityApi<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -6186,7 +6189,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieAccessibilityControl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `accessibilityControl` field to an Option value (optional)
@@ -6194,7 +6197,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieAccessibilityControl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -6205,7 +6208,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieAccessibilityFeature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `accessibilityFeature` field to an Option value (optional)
@@ -6213,7 +6216,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieAccessibilityFeature<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -6224,7 +6227,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieAccessibilityHazard<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `accessibilityHazard` field to an Option value (optional)
@@ -6232,7 +6235,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieAccessibilityHazard<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -6243,7 +6246,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieAccessibilitySummary<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `accessibilitySummary` field to an Option value (optional)
@@ -6251,7 +6254,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieAccessibilitySummary<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -6262,7 +6265,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieAccountablePerson<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `accountablePerson` field to an Option value (optional)
@@ -6270,7 +6273,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieAccountablePerson<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -6281,7 +6284,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieAcquireLicensePage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `acquireLicensePage` field to an Option value (optional)
@@ -6289,7 +6292,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieAcquireLicensePage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -6297,12 +6300,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `actor` field (optional)
     pub fn actor(mut self, value: impl Into<Option<MovieActor<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `actor` field to an Option value (optional)
     pub fn maybe_actor(mut self, value: Option<MovieActor<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -6310,12 +6313,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `actors` field (optional)
     pub fn actors(mut self, value: impl Into<Option<MovieActors<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `actors` field to an Option value (optional)
     pub fn maybe_actors(mut self, value: Option<MovieActors<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -6326,7 +6329,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -6334,7 +6337,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -6345,7 +6348,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -6353,7 +6356,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -6364,7 +6367,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -6372,7 +6375,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -6383,7 +6386,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieAlternativeHeadline<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `alternativeHeadline` field to an Option value (optional)
@@ -6391,7 +6394,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieAlternativeHeadline<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -6399,12 +6402,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `archivedAt` field (optional)
     pub fn archived_at(mut self, value: impl Into<Option<MovieArchivedAt<'a>>>) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `archivedAt` field to an Option value (optional)
     pub fn maybe_archived_at(mut self, value: Option<MovieArchivedAt<'a>>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -6412,12 +6415,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `assesses` field (optional)
     pub fn assesses(mut self, value: impl Into<Option<MovieAssesses<'a>>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `assesses` field to an Option value (optional)
     pub fn maybe_assesses(mut self, value: Option<MovieAssesses<'a>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -6428,7 +6431,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieAssociatedMedia<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `associatedMedia` field to an Option value (optional)
@@ -6436,7 +6439,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieAssociatedMedia<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -6444,12 +6447,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `audience` field (optional)
     pub fn audience(mut self, value: impl Into<Option<MovieAudience<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `audience` field to an Option value (optional)
     pub fn maybe_audience(mut self, value: Option<MovieAudience<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -6457,12 +6460,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `audio` field (optional)
     pub fn audio(mut self, value: impl Into<Option<MovieAudio<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `audio` field to an Option value (optional)
     pub fn maybe_audio(mut self, value: Option<MovieAudio<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -6470,12 +6473,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<MovieAuthor<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<MovieAuthor<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -6483,12 +6486,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<MovieAward<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<MovieAward<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -6496,12 +6499,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<MovieAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<MovieAwards<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -6509,12 +6512,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `character` field (optional)
     pub fn character(mut self, value: impl Into<Option<MovieCharacter<'a>>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `character` field to an Option value (optional)
     pub fn maybe_character(mut self, value: Option<MovieCharacter<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -6522,12 +6525,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `citation` field (optional)
     pub fn citation(mut self, value: impl Into<Option<MovieCitation<'a>>>) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `citation` field to an Option value (optional)
     pub fn maybe_citation(mut self, value: Option<MovieCitation<'a>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -6535,12 +6538,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<MovieComment<'a>>>) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<MovieComment<'a>>) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -6551,12 +6554,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieCommentCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `commentCount` field to an Option value (optional)
     pub fn maybe_comment_count(mut self, value: Option<MovieCommentCount<'a>>) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -6567,7 +6570,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieConditionsOfAccess<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `conditionsOfAccess` field to an Option value (optional)
@@ -6575,7 +6578,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieConditionsOfAccess<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -6586,7 +6589,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieContentLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `contentLocation` field to an Option value (optional)
@@ -6594,7 +6597,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieContentLocation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -6605,7 +6608,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieContentRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `contentRating` field to an Option value (optional)
@@ -6613,7 +6616,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieContentRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -6624,7 +6627,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieContentReferenceTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `contentReferenceTime` field to an Option value (optional)
@@ -6632,7 +6635,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieContentReferenceTime<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -6643,12 +6646,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieContributor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `contributor` field to an Option value (optional)
     pub fn maybe_contributor(mut self, value: Option<MovieContributor<'a>>) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -6659,7 +6662,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieCopyrightHolder<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `copyrightHolder` field to an Option value (optional)
@@ -6667,7 +6670,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieCopyrightHolder<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -6678,7 +6681,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieCopyrightNotice<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `copyrightNotice` field to an Option value (optional)
@@ -6686,7 +6689,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieCopyrightNotice<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -6697,7 +6700,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieCopyrightYear<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `copyrightYear` field to an Option value (optional)
@@ -6705,7 +6708,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieCopyrightYear<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -6713,12 +6716,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `correction` field (optional)
     pub fn correction(mut self, value: impl Into<Option<MovieCorrection<'a>>>) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `correction` field to an Option value (optional)
     pub fn maybe_correction(mut self, value: Option<MovieCorrection<'a>>) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -6729,7 +6732,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieCountryOfOrigin<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `countryOfOrigin` field to an Option value (optional)
@@ -6737,7 +6740,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieCountryOfOrigin<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -6748,7 +6751,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieCreativeWorkStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `creativeWorkStatus` field to an Option value (optional)
@@ -6756,7 +6759,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieCreativeWorkStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -6764,12 +6767,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `creator` field (optional)
     pub fn creator(mut self, value: impl Into<Option<MovieCreator<'a>>>) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `creator` field to an Option value (optional)
     pub fn maybe_creator(mut self, value: Option<MovieCreator<'a>>) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -6777,12 +6780,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `creditText` field (optional)
     pub fn credit_text(mut self, value: impl Into<Option<MovieCreditText<'a>>>) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `creditText` field to an Option value (optional)
     pub fn maybe_credit_text(mut self, value: Option<MovieCreditText<'a>>) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -6793,12 +6796,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieDateCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `dateCreated` field to an Option value (optional)
     pub fn maybe_date_created(mut self, value: Option<MovieDateCreated<'a>>) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -6809,12 +6812,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieDateModified<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `dateModified` field to an Option value (optional)
     pub fn maybe_date_modified(mut self, value: Option<MovieDateModified<'a>>) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -6825,7 +6828,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `datePublished` field to an Option value (optional)
@@ -6833,7 +6836,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -6844,12 +6847,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<MovieDescription<'a>>) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -6860,7 +6863,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieDigitalSourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `digitalSourceType` field to an Option value (optional)
@@ -6868,7 +6871,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieDigitalSourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -6876,12 +6879,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `director` field (optional)
     pub fn director(mut self, value: impl Into<Option<MovieDirector<'a>>>) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `director` field to an Option value (optional)
     pub fn maybe_director(mut self, value: Option<MovieDirector<'a>>) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -6889,12 +6892,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `directors` field (optional)
     pub fn directors(mut self, value: impl Into<Option<MovieDirectors<'a>>>) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `directors` field to an Option value (optional)
     pub fn maybe_directors(mut self, value: Option<MovieDirectors<'a>>) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -6905,7 +6908,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -6913,7 +6916,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -6924,7 +6927,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieDiscussionUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `discussionUrl` field to an Option value (optional)
@@ -6932,7 +6935,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieDiscussionUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -6940,12 +6943,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `duration` field (optional)
     pub fn duration(mut self, value: impl Into<Option<MovieDuration<'a>>>) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `duration` field to an Option value (optional)
     pub fn maybe_duration(mut self, value: Option<MovieDuration<'a>>) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -6953,12 +6956,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `editEIDR` field (optional)
     pub fn edit_eidr(mut self, value: impl Into<Option<MovieEditEidr<'a>>>) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `editEIDR` field to an Option value (optional)
     pub fn maybe_edit_eidr(mut self, value: Option<MovieEditEidr<'a>>) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -6966,12 +6969,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `editor` field (optional)
     pub fn editor(mut self, value: impl Into<Option<MovieEditor<'a>>>) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `editor` field to an Option value (optional)
     pub fn maybe_editor(mut self, value: Option<MovieEditor<'a>>) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -6982,7 +6985,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieEducationalAlignment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `educationalAlignment` field to an Option value (optional)
@@ -6990,7 +6993,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieEducationalAlignment<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -7001,7 +7004,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieEducationalLevel<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `educationalLevel` field to an Option value (optional)
@@ -7009,7 +7012,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieEducationalLevel<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -7020,7 +7023,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieEducationalUse<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `educationalUse` field to an Option value (optional)
@@ -7028,7 +7031,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieEducationalUse<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -7036,12 +7039,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `encoding` field (optional)
     pub fn encoding(mut self, value: impl Into<Option<MovieEncoding<'a>>>) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `encoding` field to an Option value (optional)
     pub fn maybe_encoding(mut self, value: Option<MovieEncoding<'a>>) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -7052,7 +7055,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieEncodingFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `encodingFormat` field to an Option value (optional)
@@ -7060,7 +7063,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieEncodingFormat<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -7068,12 +7071,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `encodings` field (optional)
     pub fn encodings(mut self, value: impl Into<Option<MovieEncodings<'a>>>) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `encodings` field to an Option value (optional)
     pub fn maybe_encodings(mut self, value: Option<MovieEncodings<'a>>) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -7084,7 +7087,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieExampleOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `exampleOfWork` field to an Option value (optional)
@@ -7092,7 +7095,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieExampleOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -7100,12 +7103,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `expires` field (optional)
     pub fn expires(mut self, value: impl Into<Option<MovieExpires<'a>>>) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `expires` field to an Option value (optional)
     pub fn maybe_expires(mut self, value: Option<MovieExpires<'a>>) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -7113,12 +7116,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `fileFormat` field (optional)
     pub fn file_format(mut self, value: impl Into<Option<MovieFileFormat<'a>>>) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `fileFormat` field to an Option value (optional)
     pub fn maybe_file_format(mut self, value: Option<MovieFileFormat<'a>>) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -7126,12 +7129,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<MovieFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<MovieFunder<'a>>) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -7139,12 +7142,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<MovieFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<MovieFunding<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -7152,12 +7155,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<MovieGenre<'a>>>) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<MovieGenre<'a>>) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -7165,12 +7168,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `hasPart` field (optional)
     pub fn has_part(mut self, value: impl Into<Option<MovieHasPart<'a>>>) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `hasPart` field to an Option value (optional)
     pub fn maybe_has_part(mut self, value: Option<MovieHasPart<'a>>) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -7178,12 +7181,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `headline` field (optional)
     pub fn headline(mut self, value: impl Into<Option<MovieHeadline<'a>>>) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `headline` field to an Option value (optional)
     pub fn maybe_headline(mut self, value: Option<MovieHeadline<'a>>) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -7191,12 +7194,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `identifier` field (optional)
     pub fn identifier(mut self, value: impl Into<Option<MovieIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<MovieIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -7204,12 +7207,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<MovieImage<'a>>>) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<MovieImage<'a>>) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -7217,12 +7220,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `inLanguage` field (optional)
     pub fn in_language(mut self, value: impl Into<Option<MovieInLanguage<'a>>>) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `inLanguage` field to an Option value (optional)
     pub fn maybe_in_language(mut self, value: Option<MovieInLanguage<'a>>) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -7233,7 +7236,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -7241,7 +7244,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -7252,7 +7255,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieInteractivityType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `interactivityType` field to an Option value (optional)
@@ -7260,7 +7263,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieInteractivityType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -7271,7 +7274,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieInterpretedAsClaim<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `interpretedAsClaim` field to an Option value (optional)
@@ -7279,7 +7282,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieInterpretedAsClaim<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -7290,7 +7293,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieIsAccessibleForFree<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `isAccessibleForFree` field to an Option value (optional)
@@ -7298,7 +7301,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieIsAccessibleForFree<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -7306,12 +7309,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `isBasedOn` field (optional)
     pub fn is_based_on(mut self, value: impl Into<Option<MovieIsBasedOn<'a>>>) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `isBasedOn` field to an Option value (optional)
     pub fn maybe_is_based_on(mut self, value: Option<MovieIsBasedOn<'a>>) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -7322,7 +7325,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieIsBasedOnUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `isBasedOnUrl` field to an Option value (optional)
@@ -7330,7 +7333,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieIsBasedOnUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -7341,7 +7344,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieIsFamilyFriendly<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `isFamilyFriendly` field to an Option value (optional)
@@ -7349,7 +7352,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieIsFamilyFriendly<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -7357,12 +7360,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `isPartOf` field (optional)
     pub fn is_part_of(mut self, value: impl Into<Option<MovieIsPartOf<'a>>>) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `isPartOf` field to an Option value (optional)
     pub fn maybe_is_part_of(mut self, value: Option<MovieIsPartOf<'a>>) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -7370,12 +7373,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<MovieKeywords<'a>>>) -> Self {
-        self.__unsafe_private_named.79 = value.into();
+        self._fields.79 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<MovieKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.79 = value;
+        self._fields.79 = value;
         self
     }
 }
@@ -7386,7 +7389,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieLearningResourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value.into();
+        self._fields.80 = value.into();
         self
     }
     /// Set the `learningResourceType` field to an Option value (optional)
@@ -7394,7 +7397,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieLearningResourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value;
+        self._fields.80 = value;
         self
     }
 }
@@ -7402,12 +7405,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `license` field (optional)
     pub fn license(mut self, value: impl Into<Option<MovieLicense<'a>>>) -> Self {
-        self.__unsafe_private_named.81 = value.into();
+        self._fields.81 = value.into();
         self
     }
     /// Set the `license` field to an Option value (optional)
     pub fn maybe_license(mut self, value: Option<MovieLicense<'a>>) -> Self {
-        self.__unsafe_private_named.81 = value;
+        self._fields.81 = value;
         self
     }
 }
@@ -7418,7 +7421,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieLocationCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value.into();
+        self._fields.82 = value.into();
         self
     }
     /// Set the `locationCreated` field to an Option value (optional)
@@ -7426,7 +7429,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieLocationCreated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value;
+        self._fields.82 = value;
         self
     }
 }
@@ -7434,12 +7437,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `mainEntity` field (optional)
     pub fn main_entity(mut self, value: impl Into<Option<MovieMainEntity<'a>>>) -> Self {
-        self.__unsafe_private_named.83 = value.into();
+        self._fields.83 = value.into();
         self
     }
     /// Set the `mainEntity` field to an Option value (optional)
     pub fn maybe_main_entity(mut self, value: Option<MovieMainEntity<'a>>) -> Self {
-        self.__unsafe_private_named.83 = value;
+        self._fields.83 = value;
         self
     }
 }
@@ -7450,7 +7453,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value.into();
+        self._fields.84 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -7458,7 +7461,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value;
+        self._fields.84 = value;
         self
     }
 }
@@ -7466,12 +7469,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `maintainer` field (optional)
     pub fn maintainer(mut self, value: impl Into<Option<MovieMaintainer<'a>>>) -> Self {
-        self.__unsafe_private_named.85 = value.into();
+        self._fields.85 = value.into();
         self
     }
     /// Set the `maintainer` field to an Option value (optional)
     pub fn maybe_maintainer(mut self, value: Option<MovieMaintainer<'a>>) -> Self {
-        self.__unsafe_private_named.85 = value;
+        self._fields.85 = value;
         self
     }
 }
@@ -7479,12 +7482,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `material` field (optional)
     pub fn material(mut self, value: impl Into<Option<MovieMaterial<'a>>>) -> Self {
-        self.__unsafe_private_named.86 = value.into();
+        self._fields.86 = value.into();
         self
     }
     /// Set the `material` field to an Option value (optional)
     pub fn maybe_material(mut self, value: Option<MovieMaterial<'a>>) -> Self {
-        self.__unsafe_private_named.86 = value;
+        self._fields.86 = value;
         self
     }
 }
@@ -7495,7 +7498,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieMaterialExtent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.87 = value.into();
+        self._fields.87 = value.into();
         self
     }
     /// Set the `materialExtent` field to an Option value (optional)
@@ -7503,7 +7506,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieMaterialExtent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.87 = value;
+        self._fields.87 = value;
         self
     }
 }
@@ -7511,12 +7514,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `mentions` field (optional)
     pub fn mentions(mut self, value: impl Into<Option<MovieMentions<'a>>>) -> Self {
-        self.__unsafe_private_named.88 = value.into();
+        self._fields.88 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<MovieMentions<'a>>) -> Self {
-        self.__unsafe_private_named.88 = value;
+        self._fields.88 = value;
         self
     }
 }
@@ -7524,12 +7527,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `musicBy` field (optional)
     pub fn music_by(mut self, value: impl Into<Option<MovieMusicBy<'a>>>) -> Self {
-        self.__unsafe_private_named.89 = value.into();
+        self._fields.89 = value.into();
         self
     }
     /// Set the `musicBy` field to an Option value (optional)
     pub fn maybe_music_by(mut self, value: Option<MovieMusicBy<'a>>) -> Self {
-        self.__unsafe_private_named.89 = value;
+        self._fields.89 = value;
         self
     }
 }
@@ -7537,12 +7540,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<MovieName<'a>>>) -> Self {
-        self.__unsafe_private_named.90 = value.into();
+        self._fields.90 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<MovieName<'a>>) -> Self {
-        self.__unsafe_private_named.90 = value;
+        self._fields.90 = value;
         self
     }
 }
@@ -7550,12 +7553,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `offers` field (optional)
     pub fn offers(mut self, value: impl Into<Option<MovieOffers<'a>>>) -> Self {
-        self.__unsafe_private_named.91 = value.into();
+        self._fields.91 = value.into();
         self
     }
     /// Set the `offers` field to an Option value (optional)
     pub fn maybe_offers(mut self, value: Option<MovieOffers<'a>>) -> Self {
-        self.__unsafe_private_named.91 = value;
+        self._fields.91 = value;
         self
     }
 }
@@ -7563,12 +7566,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `pattern` field (optional)
     pub fn pattern(mut self, value: impl Into<Option<MoviePattern<'a>>>) -> Self {
-        self.__unsafe_private_named.92 = value.into();
+        self._fields.92 = value.into();
         self
     }
     /// Set the `pattern` field to an Option value (optional)
     pub fn maybe_pattern(mut self, value: Option<MoviePattern<'a>>) -> Self {
-        self.__unsafe_private_named.92 = value;
+        self._fields.92 = value;
         self
     }
 }
@@ -7576,12 +7579,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `position` field (optional)
     pub fn position(mut self, value: impl Into<Option<MoviePosition<'a>>>) -> Self {
-        self.__unsafe_private_named.93 = value.into();
+        self._fields.93 = value.into();
         self
     }
     /// Set the `position` field to an Option value (optional)
     pub fn maybe_position(mut self, value: Option<MoviePosition<'a>>) -> Self {
-        self.__unsafe_private_named.93 = value;
+        self._fields.93 = value;
         self
     }
 }
@@ -7592,7 +7595,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MoviePotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value.into();
+        self._fields.94 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -7600,7 +7603,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MoviePotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value;
+        self._fields.94 = value;
         self
     }
 }
@@ -7608,12 +7611,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `producer` field (optional)
     pub fn producer(mut self, value: impl Into<Option<MovieProducer<'a>>>) -> Self {
-        self.__unsafe_private_named.95 = value.into();
+        self._fields.95 = value.into();
         self
     }
     /// Set the `producer` field to an Option value (optional)
     pub fn maybe_producer(mut self, value: Option<MovieProducer<'a>>) -> Self {
-        self.__unsafe_private_named.95 = value;
+        self._fields.95 = value;
         self
     }
 }
@@ -7624,7 +7627,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieProductionCompany<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.96 = value.into();
+        self._fields.96 = value.into();
         self
     }
     /// Set the `productionCompany` field to an Option value (optional)
@@ -7632,7 +7635,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieProductionCompany<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.96 = value;
+        self._fields.96 = value;
         self
     }
 }
@@ -7640,12 +7643,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `provider` field (optional)
     pub fn provider(mut self, value: impl Into<Option<MovieProvider<'a>>>) -> Self {
-        self.__unsafe_private_named.97 = value.into();
+        self._fields.97 = value.into();
         self
     }
     /// Set the `provider` field to an Option value (optional)
     pub fn maybe_provider(mut self, value: Option<MovieProvider<'a>>) -> Self {
-        self.__unsafe_private_named.97 = value;
+        self._fields.97 = value;
         self
     }
 }
@@ -7656,12 +7659,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MoviePublication<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value.into();
+        self._fields.98 = value.into();
         self
     }
     /// Set the `publication` field to an Option value (optional)
     pub fn maybe_publication(mut self, value: Option<MoviePublication<'a>>) -> Self {
-        self.__unsafe_private_named.98 = value;
+        self._fields.98 = value;
         self
     }
 }
@@ -7669,12 +7672,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `publisher` field (optional)
     pub fn publisher(mut self, value: impl Into<Option<MoviePublisher<'a>>>) -> Self {
-        self.__unsafe_private_named.99 = value.into();
+        self._fields.99 = value.into();
         self
     }
     /// Set the `publisher` field to an Option value (optional)
     pub fn maybe_publisher(mut self, value: Option<MoviePublisher<'a>>) -> Self {
-        self.__unsafe_private_named.99 = value;
+        self._fields.99 = value;
         self
     }
 }
@@ -7685,7 +7688,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MoviePublisherImprint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value.into();
+        self._fields.100 = value.into();
         self
     }
     /// Set the `publisherImprint` field to an Option value (optional)
@@ -7693,7 +7696,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MoviePublisherImprint<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value;
+        self._fields.100 = value;
         self
     }
 }
@@ -7704,7 +7707,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MoviePublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value.into();
+        self._fields.101 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -7712,7 +7715,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MoviePublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value;
+        self._fields.101 = value;
         self
     }
 }
@@ -7720,12 +7723,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `recordedAt` field (optional)
     pub fn recorded_at(mut self, value: impl Into<Option<MovieRecordedAt<'a>>>) -> Self {
-        self.__unsafe_private_named.102 = value.into();
+        self._fields.102 = value.into();
         self
     }
     /// Set the `recordedAt` field to an Option value (optional)
     pub fn maybe_recorded_at(mut self, value: Option<MovieRecordedAt<'a>>) -> Self {
-        self.__unsafe_private_named.102 = value;
+        self._fields.102 = value;
         self
     }
 }
@@ -7736,7 +7739,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieReleasedEvent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.103 = value.into();
+        self._fields.103 = value.into();
         self
     }
     /// Set the `releasedEvent` field to an Option value (optional)
@@ -7744,7 +7747,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieReleasedEvent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.103 = value;
+        self._fields.103 = value;
         self
     }
 }
@@ -7752,12 +7755,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<MovieReview<'a>>>) -> Self {
-        self.__unsafe_private_named.104 = value.into();
+        self._fields.104 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<MovieReview<'a>>) -> Self {
-        self.__unsafe_private_named.104 = value;
+        self._fields.104 = value;
         self
     }
 }
@@ -7765,12 +7768,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `reviews` field (optional)
     pub fn reviews(mut self, value: impl Into<Option<MovieReviews<'a>>>) -> Self {
-        self.__unsafe_private_named.105 = value.into();
+        self._fields.105 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<MovieReviews<'a>>) -> Self {
-        self.__unsafe_private_named.105 = value;
+        self._fields.105 = value;
         self
     }
 }
@@ -7778,12 +7781,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<MovieSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.106 = value.into();
+        self._fields.106 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<MovieSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.106 = value;
+        self._fields.106 = value;
         self
     }
 }
@@ -7794,7 +7797,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieSchemaVersion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value.into();
+        self._fields.107 = value.into();
         self
     }
     /// Set the `schemaVersion` field to an Option value (optional)
@@ -7802,7 +7805,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieSchemaVersion<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value;
+        self._fields.107 = value;
         self
     }
 }
@@ -7813,7 +7816,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieSdDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.108 = value.into();
+        self._fields.108 = value.into();
         self
     }
     /// Set the `sdDatePublished` field to an Option value (optional)
@@ -7821,7 +7824,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieSdDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.108 = value;
+        self._fields.108 = value;
         self
     }
 }
@@ -7829,12 +7832,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `sdLicense` field (optional)
     pub fn sd_license(mut self, value: impl Into<Option<MovieSdLicense<'a>>>) -> Self {
-        self.__unsafe_private_named.109 = value.into();
+        self._fields.109 = value.into();
         self
     }
     /// Set the `sdLicense` field to an Option value (optional)
     pub fn maybe_sd_license(mut self, value: Option<MovieSdLicense<'a>>) -> Self {
-        self.__unsafe_private_named.109 = value;
+        self._fields.109 = value;
         self
     }
 }
@@ -7845,12 +7848,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieSdPublisher<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.110 = value.into();
+        self._fields.110 = value.into();
         self
     }
     /// Set the `sdPublisher` field to an Option value (optional)
     pub fn maybe_sd_publisher(mut self, value: Option<MovieSdPublisher<'a>>) -> Self {
-        self.__unsafe_private_named.110 = value;
+        self._fields.110 = value;
         self
     }
 }
@@ -7858,12 +7861,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<MovieSize<'a>>>) -> Self {
-        self.__unsafe_private_named.111 = value.into();
+        self._fields.111 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<MovieSize<'a>>) -> Self {
-        self.__unsafe_private_named.111 = value;
+        self._fields.111 = value;
         self
     }
 }
@@ -7874,7 +7877,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieSourceOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value.into();
+        self._fields.112 = value.into();
         self
     }
     /// Set the `sourceOrganization` field to an Option value (optional)
@@ -7882,7 +7885,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieSourceOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value;
+        self._fields.112 = value;
         self
     }
 }
@@ -7890,12 +7893,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `spatial` field (optional)
     pub fn spatial(mut self, value: impl Into<Option<MovieSpatial<'a>>>) -> Self {
-        self.__unsafe_private_named.113 = value.into();
+        self._fields.113 = value.into();
         self
     }
     /// Set the `spatial` field to an Option value (optional)
     pub fn maybe_spatial(mut self, value: Option<MovieSpatial<'a>>) -> Self {
-        self.__unsafe_private_named.113 = value;
+        self._fields.113 = value;
         self
     }
 }
@@ -7906,7 +7909,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieSpatialCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.114 = value.into();
+        self._fields.114 = value.into();
         self
     }
     /// Set the `spatialCoverage` field to an Option value (optional)
@@ -7914,7 +7917,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieSpatialCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.114 = value;
+        self._fields.114 = value;
         self
     }
 }
@@ -7922,12 +7925,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `sponsor` field (optional)
     pub fn sponsor(mut self, value: impl Into<Option<MovieSponsor<'a>>>) -> Self {
-        self.__unsafe_private_named.115 = value.into();
+        self._fields.115 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<MovieSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.115 = value;
+        self._fields.115 = value;
         self
     }
 }
@@ -7935,12 +7938,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `subjectOf` field (optional)
     pub fn subject_of(mut self, value: impl Into<Option<MovieSubjectOf<'a>>>) -> Self {
-        self.__unsafe_private_named.116 = value.into();
+        self._fields.116 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<MovieSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.116 = value;
+        self._fields.116 = value;
         self
     }
 }
@@ -7951,7 +7954,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieSubtitleLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.117 = value.into();
+        self._fields.117 = value.into();
         self
     }
     /// Set the `subtitleLanguage` field to an Option value (optional)
@@ -7959,7 +7962,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieSubtitleLanguage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.117 = value;
+        self._fields.117 = value;
         self
     }
 }
@@ -7967,12 +7970,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `teaches` field (optional)
     pub fn teaches(mut self, value: impl Into<Option<MovieTeaches<'a>>>) -> Self {
-        self.__unsafe_private_named.118 = value.into();
+        self._fields.118 = value.into();
         self
     }
     /// Set the `teaches` field to an Option value (optional)
     pub fn maybe_teaches(mut self, value: Option<MovieTeaches<'a>>) -> Self {
-        self.__unsafe_private_named.118 = value;
+        self._fields.118 = value;
         self
     }
 }
@@ -7980,12 +7983,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `temporal` field (optional)
     pub fn temporal(mut self, value: impl Into<Option<MovieTemporal<'a>>>) -> Self {
-        self.__unsafe_private_named.119 = value.into();
+        self._fields.119 = value.into();
         self
     }
     /// Set the `temporal` field to an Option value (optional)
     pub fn maybe_temporal(mut self, value: Option<MovieTemporal<'a>>) -> Self {
-        self.__unsafe_private_named.119 = value;
+        self._fields.119 = value;
         self
     }
 }
@@ -7996,7 +7999,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieTemporalCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.120 = value.into();
+        self._fields.120 = value.into();
         self
     }
     /// Set the `temporalCoverage` field to an Option value (optional)
@@ -8004,7 +8007,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieTemporalCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.120 = value;
+        self._fields.120 = value;
         self
     }
 }
@@ -8012,12 +8015,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<MovieText<'a>>>) -> Self {
-        self.__unsafe_private_named.121 = value.into();
+        self._fields.121 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<MovieText<'a>>) -> Self {
-        self.__unsafe_private_named.121 = value;
+        self._fields.121 = value;
         self
     }
 }
@@ -8025,12 +8028,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `thumbnail` field (optional)
     pub fn thumbnail(mut self, value: impl Into<Option<MovieThumbnail<'a>>>) -> Self {
-        self.__unsafe_private_named.122 = value.into();
+        self._fields.122 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<MovieThumbnail<'a>>) -> Self {
-        self.__unsafe_private_named.122 = value;
+        self._fields.122 = value;
         self
     }
 }
@@ -8041,12 +8044,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieThumbnailUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.123 = value.into();
+        self._fields.123 = value.into();
         self
     }
     /// Set the `thumbnailUrl` field to an Option value (optional)
     pub fn maybe_thumbnail_url(mut self, value: Option<MovieThumbnailUrl<'a>>) -> Self {
-        self.__unsafe_private_named.123 = value;
+        self._fields.123 = value;
         self
     }
 }
@@ -8057,12 +8060,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieTimeRequired<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.124 = value.into();
+        self._fields.124 = value.into();
         self
     }
     /// Set the `timeRequired` field to an Option value (optional)
     pub fn maybe_time_required(mut self, value: Option<MovieTimeRequired<'a>>) -> Self {
-        self.__unsafe_private_named.124 = value;
+        self._fields.124 = value;
         self
     }
 }
@@ -8070,12 +8073,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `titleEIDR` field (optional)
     pub fn title_eidr(mut self, value: impl Into<Option<MovieTitleEidr<'a>>>) -> Self {
-        self.__unsafe_private_named.125 = value.into();
+        self._fields.125 = value.into();
         self
     }
     /// Set the `titleEIDR` field to an Option value (optional)
     pub fn maybe_title_eidr(mut self, value: Option<MovieTitleEidr<'a>>) -> Self {
-        self.__unsafe_private_named.125 = value;
+        self._fields.125 = value;
         self
     }
 }
@@ -8083,12 +8086,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `trailer` field (optional)
     pub fn trailer(mut self, value: impl Into<Option<MovieTrailer<'a>>>) -> Self {
-        self.__unsafe_private_named.126 = value.into();
+        self._fields.126 = value.into();
         self
     }
     /// Set the `trailer` field to an Option value (optional)
     pub fn maybe_trailer(mut self, value: Option<MovieTrailer<'a>>) -> Self {
-        self.__unsafe_private_named.126 = value;
+        self._fields.126 = value;
         self
     }
 }
@@ -8099,7 +8102,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieTranslationOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.127 = value.into();
+        self._fields.127 = value.into();
         self
     }
     /// Set the `translationOfWork` field to an Option value (optional)
@@ -8107,7 +8110,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieTranslationOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.127 = value;
+        self._fields.127 = value;
         self
     }
 }
@@ -8115,12 +8118,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `translator` field (optional)
     pub fn translator(mut self, value: impl Into<Option<MovieTranslator<'a>>>) -> Self {
-        self.__unsafe_private_named.128 = value.into();
+        self._fields.128 = value.into();
         self
     }
     /// Set the `translator` field to an Option value (optional)
     pub fn maybe_translator(mut self, value: Option<MovieTranslator<'a>>) -> Self {
-        self.__unsafe_private_named.128 = value;
+        self._fields.128 = value;
         self
     }
 }
@@ -8131,7 +8134,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieTypicalAgeRange<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.129 = value.into();
+        self._fields.129 = value.into();
         self
     }
     /// Set the `typicalAgeRange` field to an Option value (optional)
@@ -8139,7 +8142,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieTypicalAgeRange<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.129 = value;
+        self._fields.129 = value;
         self
     }
 }
@@ -8147,12 +8150,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<MovieUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.130 = value.into();
+        self._fields.130 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<MovieUrl<'a>>) -> Self {
-        self.__unsafe_private_named.130 = value;
+        self._fields.130 = value;
         self
     }
 }
@@ -8160,12 +8163,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `usageInfo` field (optional)
     pub fn usage_info(mut self, value: impl Into<Option<MovieUsageInfo<'a>>>) -> Self {
-        self.__unsafe_private_named.131 = value.into();
+        self._fields.131 = value.into();
         self
     }
     /// Set the `usageInfo` field to an Option value (optional)
     pub fn maybe_usage_info(mut self, value: Option<MovieUsageInfo<'a>>) -> Self {
-        self.__unsafe_private_named.131 = value;
+        self._fields.131 = value;
         self
     }
 }
@@ -8173,12 +8176,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `version` field (optional)
     pub fn version(mut self, value: impl Into<Option<MovieVersion<'a>>>) -> Self {
-        self.__unsafe_private_named.132 = value.into();
+        self._fields.132 = value.into();
         self
     }
     /// Set the `version` field to an Option value (optional)
     pub fn maybe_version(mut self, value: Option<MovieVersion<'a>>) -> Self {
-        self.__unsafe_private_named.132 = value;
+        self._fields.132 = value;
         self
     }
 }
@@ -8186,12 +8189,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `video` field (optional)
     pub fn video(mut self, value: impl Into<Option<MovieVideo<'a>>>) -> Self {
-        self.__unsafe_private_named.133 = value.into();
+        self._fields.133 = value.into();
         self
     }
     /// Set the `video` field to an Option value (optional)
     pub fn maybe_video(mut self, value: Option<MovieVideo<'a>>) -> Self {
-        self.__unsafe_private_named.133 = value;
+        self._fields.133 = value;
         self
     }
 }
@@ -8199,12 +8202,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
 impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
     /// Set the `wordCount` field (optional)
     pub fn word_count(mut self, value: impl Into<Option<MovieWordCount<'a>>>) -> Self {
-        self.__unsafe_private_named.134 = value.into();
+        self._fields.134 = value.into();
         self
     }
     /// Set the `wordCount` field to an Option value (optional)
     pub fn maybe_word_count(mut self, value: Option<MovieWordCount<'a>>) -> Self {
-        self.__unsafe_private_named.134 = value;
+        self._fields.134 = value;
         self
     }
 }
@@ -8215,12 +8218,12 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieWorkExample<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.135 = value.into();
+        self._fields.135 = value.into();
         self
     }
     /// Set the `workExample` field to an Option value (optional)
     pub fn maybe_work_example(mut self, value: Option<MovieWorkExample<'a>>) -> Self {
-        self.__unsafe_private_named.135 = value;
+        self._fields.135 = value;
         self
     }
 }
@@ -8231,7 +8234,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MovieWorkTranslation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.136 = value.into();
+        self._fields.136 = value.into();
         self
     }
     /// Set the `workTranslation` field to an Option value (optional)
@@ -8239,7 +8242,7 @@ impl<'a, S: movie_state::State> MovieBuilder<'a, S> {
         mut self,
         value: Option<MovieWorkTranslation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.136 = value;
+        self._fields.136 = value;
         self
     }
 }
@@ -8251,143 +8254,143 @@ where
     /// Build the final struct
     pub fn build(self) -> Movie<'a> {
         Movie {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            actor: self.__unsafe_private_named.11,
-            actors: self.__unsafe_private_named.12,
-            additional_type: self.__unsafe_private_named.13,
-            aggregate_rating: self.__unsafe_private_named.14,
-            alternate_name: self.__unsafe_private_named.15,
-            alternative_headline: self.__unsafe_private_named.16,
-            archived_at: self.__unsafe_private_named.17,
-            assesses: self.__unsafe_private_named.18,
-            associated_media: self.__unsafe_private_named.19,
-            audience: self.__unsafe_private_named.20,
-            audio: self.__unsafe_private_named.21,
-            author: self.__unsafe_private_named.22,
-            award: self.__unsafe_private_named.23,
-            awards: self.__unsafe_private_named.24,
-            character: self.__unsafe_private_named.25,
-            citation: self.__unsafe_private_named.26,
-            comment: self.__unsafe_private_named.27,
-            comment_count: self.__unsafe_private_named.28,
-            conditions_of_access: self.__unsafe_private_named.29,
-            content_location: self.__unsafe_private_named.30,
-            content_rating: self.__unsafe_private_named.31,
-            content_reference_time: self.__unsafe_private_named.32,
-            contributor: self.__unsafe_private_named.33,
-            copyright_holder: self.__unsafe_private_named.34,
-            copyright_notice: self.__unsafe_private_named.35,
-            copyright_year: self.__unsafe_private_named.36,
-            correction: self.__unsafe_private_named.37,
-            country_of_origin: self.__unsafe_private_named.38,
-            creative_work_status: self.__unsafe_private_named.39,
-            creator: self.__unsafe_private_named.40,
-            credit_text: self.__unsafe_private_named.41,
-            date_created: self.__unsafe_private_named.42,
-            date_modified: self.__unsafe_private_named.43,
-            date_published: self.__unsafe_private_named.44,
-            description: self.__unsafe_private_named.45,
-            digital_source_type: self.__unsafe_private_named.46,
-            director: self.__unsafe_private_named.47,
-            directors: self.__unsafe_private_named.48,
-            disambiguating_description: self.__unsafe_private_named.49,
-            discussion_url: self.__unsafe_private_named.50,
-            duration: self.__unsafe_private_named.51,
-            edit_eidr: self.__unsafe_private_named.52,
-            editor: self.__unsafe_private_named.53,
-            educational_alignment: self.__unsafe_private_named.54,
-            educational_level: self.__unsafe_private_named.55,
-            educational_use: self.__unsafe_private_named.56,
-            encoding: self.__unsafe_private_named.57,
-            encoding_format: self.__unsafe_private_named.58,
-            encodings: self.__unsafe_private_named.59,
-            example_of_work: self.__unsafe_private_named.60,
-            expires: self.__unsafe_private_named.61,
-            file_format: self.__unsafe_private_named.62,
-            funder: self.__unsafe_private_named.63,
-            funding: self.__unsafe_private_named.64,
-            genre: self.__unsafe_private_named.65,
-            has_part: self.__unsafe_private_named.66,
-            headline: self.__unsafe_private_named.67,
-            identifier: self.__unsafe_private_named.68,
-            image: self.__unsafe_private_named.69,
-            in_language: self.__unsafe_private_named.70,
-            interaction_statistic: self.__unsafe_private_named.71,
-            interactivity_type: self.__unsafe_private_named.72,
-            interpreted_as_claim: self.__unsafe_private_named.73,
-            is_accessible_for_free: self.__unsafe_private_named.74,
-            is_based_on: self.__unsafe_private_named.75,
-            is_based_on_url: self.__unsafe_private_named.76,
-            is_family_friendly: self.__unsafe_private_named.77,
-            is_part_of: self.__unsafe_private_named.78,
-            keywords: self.__unsafe_private_named.79,
-            learning_resource_type: self.__unsafe_private_named.80,
-            license: self.__unsafe_private_named.81,
-            location_created: self.__unsafe_private_named.82,
-            main_entity: self.__unsafe_private_named.83,
-            main_entity_of_page: self.__unsafe_private_named.84,
-            maintainer: self.__unsafe_private_named.85,
-            material: self.__unsafe_private_named.86,
-            material_extent: self.__unsafe_private_named.87,
-            mentions: self.__unsafe_private_named.88,
-            music_by: self.__unsafe_private_named.89,
-            name: self.__unsafe_private_named.90,
-            offers: self.__unsafe_private_named.91,
-            pattern: self.__unsafe_private_named.92,
-            position: self.__unsafe_private_named.93,
-            potential_action: self.__unsafe_private_named.94,
-            producer: self.__unsafe_private_named.95,
-            production_company: self.__unsafe_private_named.96,
-            provider: self.__unsafe_private_named.97,
-            publication: self.__unsafe_private_named.98,
-            publisher: self.__unsafe_private_named.99,
-            publisher_imprint: self.__unsafe_private_named.100,
-            publishing_principles: self.__unsafe_private_named.101,
-            recorded_at: self.__unsafe_private_named.102,
-            released_event: self.__unsafe_private_named.103,
-            review: self.__unsafe_private_named.104,
-            reviews: self.__unsafe_private_named.105,
-            same_as: self.__unsafe_private_named.106,
-            schema_version: self.__unsafe_private_named.107,
-            sd_date_published: self.__unsafe_private_named.108,
-            sd_license: self.__unsafe_private_named.109,
-            sd_publisher: self.__unsafe_private_named.110,
-            size: self.__unsafe_private_named.111,
-            source_organization: self.__unsafe_private_named.112,
-            spatial: self.__unsafe_private_named.113,
-            spatial_coverage: self.__unsafe_private_named.114,
-            sponsor: self.__unsafe_private_named.115,
-            subject_of: self.__unsafe_private_named.116,
-            subtitle_language: self.__unsafe_private_named.117,
-            teaches: self.__unsafe_private_named.118,
-            temporal: self.__unsafe_private_named.119,
-            temporal_coverage: self.__unsafe_private_named.120,
-            text: self.__unsafe_private_named.121,
-            thumbnail: self.__unsafe_private_named.122,
-            thumbnail_url: self.__unsafe_private_named.123,
-            time_required: self.__unsafe_private_named.124,
-            title_eidr: self.__unsafe_private_named.125,
-            trailer: self.__unsafe_private_named.126,
-            translation_of_work: self.__unsafe_private_named.127,
-            translator: self.__unsafe_private_named.128,
-            typical_age_range: self.__unsafe_private_named.129,
-            url: self.__unsafe_private_named.130,
-            usage_info: self.__unsafe_private_named.131,
-            version: self.__unsafe_private_named.132,
-            video: self.__unsafe_private_named.133,
-            word_count: self.__unsafe_private_named.134,
-            work_example: self.__unsafe_private_named.135,
-            work_translation: self.__unsafe_private_named.136,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            actor: self._fields.11,
+            actors: self._fields.12,
+            additional_type: self._fields.13,
+            aggregate_rating: self._fields.14,
+            alternate_name: self._fields.15,
+            alternative_headline: self._fields.16,
+            archived_at: self._fields.17,
+            assesses: self._fields.18,
+            associated_media: self._fields.19,
+            audience: self._fields.20,
+            audio: self._fields.21,
+            author: self._fields.22,
+            award: self._fields.23,
+            awards: self._fields.24,
+            character: self._fields.25,
+            citation: self._fields.26,
+            comment: self._fields.27,
+            comment_count: self._fields.28,
+            conditions_of_access: self._fields.29,
+            content_location: self._fields.30,
+            content_rating: self._fields.31,
+            content_reference_time: self._fields.32,
+            contributor: self._fields.33,
+            copyright_holder: self._fields.34,
+            copyright_notice: self._fields.35,
+            copyright_year: self._fields.36,
+            correction: self._fields.37,
+            country_of_origin: self._fields.38,
+            creative_work_status: self._fields.39,
+            creator: self._fields.40,
+            credit_text: self._fields.41,
+            date_created: self._fields.42,
+            date_modified: self._fields.43,
+            date_published: self._fields.44,
+            description: self._fields.45,
+            digital_source_type: self._fields.46,
+            director: self._fields.47,
+            directors: self._fields.48,
+            disambiguating_description: self._fields.49,
+            discussion_url: self._fields.50,
+            duration: self._fields.51,
+            edit_eidr: self._fields.52,
+            editor: self._fields.53,
+            educational_alignment: self._fields.54,
+            educational_level: self._fields.55,
+            educational_use: self._fields.56,
+            encoding: self._fields.57,
+            encoding_format: self._fields.58,
+            encodings: self._fields.59,
+            example_of_work: self._fields.60,
+            expires: self._fields.61,
+            file_format: self._fields.62,
+            funder: self._fields.63,
+            funding: self._fields.64,
+            genre: self._fields.65,
+            has_part: self._fields.66,
+            headline: self._fields.67,
+            identifier: self._fields.68,
+            image: self._fields.69,
+            in_language: self._fields.70,
+            interaction_statistic: self._fields.71,
+            interactivity_type: self._fields.72,
+            interpreted_as_claim: self._fields.73,
+            is_accessible_for_free: self._fields.74,
+            is_based_on: self._fields.75,
+            is_based_on_url: self._fields.76,
+            is_family_friendly: self._fields.77,
+            is_part_of: self._fields.78,
+            keywords: self._fields.79,
+            learning_resource_type: self._fields.80,
+            license: self._fields.81,
+            location_created: self._fields.82,
+            main_entity: self._fields.83,
+            main_entity_of_page: self._fields.84,
+            maintainer: self._fields.85,
+            material: self._fields.86,
+            material_extent: self._fields.87,
+            mentions: self._fields.88,
+            music_by: self._fields.89,
+            name: self._fields.90,
+            offers: self._fields.91,
+            pattern: self._fields.92,
+            position: self._fields.93,
+            potential_action: self._fields.94,
+            producer: self._fields.95,
+            production_company: self._fields.96,
+            provider: self._fields.97,
+            publication: self._fields.98,
+            publisher: self._fields.99,
+            publisher_imprint: self._fields.100,
+            publishing_principles: self._fields.101,
+            recorded_at: self._fields.102,
+            released_event: self._fields.103,
+            review: self._fields.104,
+            reviews: self._fields.105,
+            same_as: self._fields.106,
+            schema_version: self._fields.107,
+            sd_date_published: self._fields.108,
+            sd_license: self._fields.109,
+            sd_publisher: self._fields.110,
+            size: self._fields.111,
+            source_organization: self._fields.112,
+            spatial: self._fields.113,
+            spatial_coverage: self._fields.114,
+            sponsor: self._fields.115,
+            subject_of: self._fields.116,
+            subtitle_language: self._fields.117,
+            teaches: self._fields.118,
+            temporal: self._fields.119,
+            temporal_coverage: self._fields.120,
+            text: self._fields.121,
+            thumbnail: self._fields.122,
+            thumbnail_url: self._fields.123,
+            time_required: self._fields.124,
+            title_eidr: self._fields.125,
+            trailer: self._fields.126,
+            translation_of_work: self._fields.127,
+            translator: self._fields.128,
+            typical_age_range: self._fields.129,
+            url: self._fields.130,
+            usage_info: self._fields.131,
+            version: self._fields.132,
+            video: self._fields.133,
+            word_count: self._fields.134,
+            work_example: self._fields.135,
+            work_translation: self._fields.136,
             extra_data: Default::default(),
         }
     }
@@ -8397,143 +8400,143 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Movie<'a> {
         Movie {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            actor: self.__unsafe_private_named.11,
-            actors: self.__unsafe_private_named.12,
-            additional_type: self.__unsafe_private_named.13,
-            aggregate_rating: self.__unsafe_private_named.14,
-            alternate_name: self.__unsafe_private_named.15,
-            alternative_headline: self.__unsafe_private_named.16,
-            archived_at: self.__unsafe_private_named.17,
-            assesses: self.__unsafe_private_named.18,
-            associated_media: self.__unsafe_private_named.19,
-            audience: self.__unsafe_private_named.20,
-            audio: self.__unsafe_private_named.21,
-            author: self.__unsafe_private_named.22,
-            award: self.__unsafe_private_named.23,
-            awards: self.__unsafe_private_named.24,
-            character: self.__unsafe_private_named.25,
-            citation: self.__unsafe_private_named.26,
-            comment: self.__unsafe_private_named.27,
-            comment_count: self.__unsafe_private_named.28,
-            conditions_of_access: self.__unsafe_private_named.29,
-            content_location: self.__unsafe_private_named.30,
-            content_rating: self.__unsafe_private_named.31,
-            content_reference_time: self.__unsafe_private_named.32,
-            contributor: self.__unsafe_private_named.33,
-            copyright_holder: self.__unsafe_private_named.34,
-            copyright_notice: self.__unsafe_private_named.35,
-            copyright_year: self.__unsafe_private_named.36,
-            correction: self.__unsafe_private_named.37,
-            country_of_origin: self.__unsafe_private_named.38,
-            creative_work_status: self.__unsafe_private_named.39,
-            creator: self.__unsafe_private_named.40,
-            credit_text: self.__unsafe_private_named.41,
-            date_created: self.__unsafe_private_named.42,
-            date_modified: self.__unsafe_private_named.43,
-            date_published: self.__unsafe_private_named.44,
-            description: self.__unsafe_private_named.45,
-            digital_source_type: self.__unsafe_private_named.46,
-            director: self.__unsafe_private_named.47,
-            directors: self.__unsafe_private_named.48,
-            disambiguating_description: self.__unsafe_private_named.49,
-            discussion_url: self.__unsafe_private_named.50,
-            duration: self.__unsafe_private_named.51,
-            edit_eidr: self.__unsafe_private_named.52,
-            editor: self.__unsafe_private_named.53,
-            educational_alignment: self.__unsafe_private_named.54,
-            educational_level: self.__unsafe_private_named.55,
-            educational_use: self.__unsafe_private_named.56,
-            encoding: self.__unsafe_private_named.57,
-            encoding_format: self.__unsafe_private_named.58,
-            encodings: self.__unsafe_private_named.59,
-            example_of_work: self.__unsafe_private_named.60,
-            expires: self.__unsafe_private_named.61,
-            file_format: self.__unsafe_private_named.62,
-            funder: self.__unsafe_private_named.63,
-            funding: self.__unsafe_private_named.64,
-            genre: self.__unsafe_private_named.65,
-            has_part: self.__unsafe_private_named.66,
-            headline: self.__unsafe_private_named.67,
-            identifier: self.__unsafe_private_named.68,
-            image: self.__unsafe_private_named.69,
-            in_language: self.__unsafe_private_named.70,
-            interaction_statistic: self.__unsafe_private_named.71,
-            interactivity_type: self.__unsafe_private_named.72,
-            interpreted_as_claim: self.__unsafe_private_named.73,
-            is_accessible_for_free: self.__unsafe_private_named.74,
-            is_based_on: self.__unsafe_private_named.75,
-            is_based_on_url: self.__unsafe_private_named.76,
-            is_family_friendly: self.__unsafe_private_named.77,
-            is_part_of: self.__unsafe_private_named.78,
-            keywords: self.__unsafe_private_named.79,
-            learning_resource_type: self.__unsafe_private_named.80,
-            license: self.__unsafe_private_named.81,
-            location_created: self.__unsafe_private_named.82,
-            main_entity: self.__unsafe_private_named.83,
-            main_entity_of_page: self.__unsafe_private_named.84,
-            maintainer: self.__unsafe_private_named.85,
-            material: self.__unsafe_private_named.86,
-            material_extent: self.__unsafe_private_named.87,
-            mentions: self.__unsafe_private_named.88,
-            music_by: self.__unsafe_private_named.89,
-            name: self.__unsafe_private_named.90,
-            offers: self.__unsafe_private_named.91,
-            pattern: self.__unsafe_private_named.92,
-            position: self.__unsafe_private_named.93,
-            potential_action: self.__unsafe_private_named.94,
-            producer: self.__unsafe_private_named.95,
-            production_company: self.__unsafe_private_named.96,
-            provider: self.__unsafe_private_named.97,
-            publication: self.__unsafe_private_named.98,
-            publisher: self.__unsafe_private_named.99,
-            publisher_imprint: self.__unsafe_private_named.100,
-            publishing_principles: self.__unsafe_private_named.101,
-            recorded_at: self.__unsafe_private_named.102,
-            released_event: self.__unsafe_private_named.103,
-            review: self.__unsafe_private_named.104,
-            reviews: self.__unsafe_private_named.105,
-            same_as: self.__unsafe_private_named.106,
-            schema_version: self.__unsafe_private_named.107,
-            sd_date_published: self.__unsafe_private_named.108,
-            sd_license: self.__unsafe_private_named.109,
-            sd_publisher: self.__unsafe_private_named.110,
-            size: self.__unsafe_private_named.111,
-            source_organization: self.__unsafe_private_named.112,
-            spatial: self.__unsafe_private_named.113,
-            spatial_coverage: self.__unsafe_private_named.114,
-            sponsor: self.__unsafe_private_named.115,
-            subject_of: self.__unsafe_private_named.116,
-            subtitle_language: self.__unsafe_private_named.117,
-            teaches: self.__unsafe_private_named.118,
-            temporal: self.__unsafe_private_named.119,
-            temporal_coverage: self.__unsafe_private_named.120,
-            text: self.__unsafe_private_named.121,
-            thumbnail: self.__unsafe_private_named.122,
-            thumbnail_url: self.__unsafe_private_named.123,
-            time_required: self.__unsafe_private_named.124,
-            title_eidr: self.__unsafe_private_named.125,
-            trailer: self.__unsafe_private_named.126,
-            translation_of_work: self.__unsafe_private_named.127,
-            translator: self.__unsafe_private_named.128,
-            typical_age_range: self.__unsafe_private_named.129,
-            url: self.__unsafe_private_named.130,
-            usage_info: self.__unsafe_private_named.131,
-            version: self.__unsafe_private_named.132,
-            video: self.__unsafe_private_named.133,
-            word_count: self.__unsafe_private_named.134,
-            work_example: self.__unsafe_private_named.135,
-            work_translation: self.__unsafe_private_named.136,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            actor: self._fields.11,
+            actors: self._fields.12,
+            additional_type: self._fields.13,
+            aggregate_rating: self._fields.14,
+            alternate_name: self._fields.15,
+            alternative_headline: self._fields.16,
+            archived_at: self._fields.17,
+            assesses: self._fields.18,
+            associated_media: self._fields.19,
+            audience: self._fields.20,
+            audio: self._fields.21,
+            author: self._fields.22,
+            award: self._fields.23,
+            awards: self._fields.24,
+            character: self._fields.25,
+            citation: self._fields.26,
+            comment: self._fields.27,
+            comment_count: self._fields.28,
+            conditions_of_access: self._fields.29,
+            content_location: self._fields.30,
+            content_rating: self._fields.31,
+            content_reference_time: self._fields.32,
+            contributor: self._fields.33,
+            copyright_holder: self._fields.34,
+            copyright_notice: self._fields.35,
+            copyright_year: self._fields.36,
+            correction: self._fields.37,
+            country_of_origin: self._fields.38,
+            creative_work_status: self._fields.39,
+            creator: self._fields.40,
+            credit_text: self._fields.41,
+            date_created: self._fields.42,
+            date_modified: self._fields.43,
+            date_published: self._fields.44,
+            description: self._fields.45,
+            digital_source_type: self._fields.46,
+            director: self._fields.47,
+            directors: self._fields.48,
+            disambiguating_description: self._fields.49,
+            discussion_url: self._fields.50,
+            duration: self._fields.51,
+            edit_eidr: self._fields.52,
+            editor: self._fields.53,
+            educational_alignment: self._fields.54,
+            educational_level: self._fields.55,
+            educational_use: self._fields.56,
+            encoding: self._fields.57,
+            encoding_format: self._fields.58,
+            encodings: self._fields.59,
+            example_of_work: self._fields.60,
+            expires: self._fields.61,
+            file_format: self._fields.62,
+            funder: self._fields.63,
+            funding: self._fields.64,
+            genre: self._fields.65,
+            has_part: self._fields.66,
+            headline: self._fields.67,
+            identifier: self._fields.68,
+            image: self._fields.69,
+            in_language: self._fields.70,
+            interaction_statistic: self._fields.71,
+            interactivity_type: self._fields.72,
+            interpreted_as_claim: self._fields.73,
+            is_accessible_for_free: self._fields.74,
+            is_based_on: self._fields.75,
+            is_based_on_url: self._fields.76,
+            is_family_friendly: self._fields.77,
+            is_part_of: self._fields.78,
+            keywords: self._fields.79,
+            learning_resource_type: self._fields.80,
+            license: self._fields.81,
+            location_created: self._fields.82,
+            main_entity: self._fields.83,
+            main_entity_of_page: self._fields.84,
+            maintainer: self._fields.85,
+            material: self._fields.86,
+            material_extent: self._fields.87,
+            mentions: self._fields.88,
+            music_by: self._fields.89,
+            name: self._fields.90,
+            offers: self._fields.91,
+            pattern: self._fields.92,
+            position: self._fields.93,
+            potential_action: self._fields.94,
+            producer: self._fields.95,
+            production_company: self._fields.96,
+            provider: self._fields.97,
+            publication: self._fields.98,
+            publisher: self._fields.99,
+            publisher_imprint: self._fields.100,
+            publishing_principles: self._fields.101,
+            recorded_at: self._fields.102,
+            released_event: self._fields.103,
+            review: self._fields.104,
+            reviews: self._fields.105,
+            same_as: self._fields.106,
+            schema_version: self._fields.107,
+            sd_date_published: self._fields.108,
+            sd_license: self._fields.109,
+            sd_publisher: self._fields.110,
+            size: self._fields.111,
+            source_organization: self._fields.112,
+            spatial: self._fields.113,
+            spatial_coverage: self._fields.114,
+            sponsor: self._fields.115,
+            subject_of: self._fields.116,
+            subtitle_language: self._fields.117,
+            teaches: self._fields.118,
+            temporal: self._fields.119,
+            temporal_coverage: self._fields.120,
+            text: self._fields.121,
+            thumbnail: self._fields.122,
+            thumbnail_url: self._fields.123,
+            time_required: self._fields.124,
+            title_eidr: self._fields.125,
+            trailer: self._fields.126,
+            translation_of_work: self._fields.127,
+            translator: self._fields.128,
+            typical_age_range: self._fields.129,
+            url: self._fields.130,
+            usage_info: self._fields.131,
+            version: self._fields.132,
+            video: self._fields.133,
+            word_count: self._fields.134,
+            work_example: self._fields.135,
+            work_translation: self._fields.136,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/music_event.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/music_event.rs
index d694b4f7..bd608f93 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/music_event.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/music_event.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -2446,8 +2449,8 @@ pub mod music_event_state {
 
 /// Builder for constructing an instance of this type
 pub struct MusicEventBuilder<'a, S: music_event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<MusicEventAbout<'a>>,
         Option<MusicEventActor<'a>>,
         Option<MusicEventAdditionalType<'a>>,
@@ -2502,7 +2505,7 @@ pub struct MusicEventBuilder<'a, S: music_event_state::State> {
         Option<MusicEventWorkFeatured<'a>>,
         Option<MusicEventWorkPerformed<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MusicEvent<'a> {
@@ -2516,8 +2519,8 @@ impl<'a> MusicEventBuilder<'a, music_event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MusicEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -2572,7 +2575,7 @@ impl<'a> MusicEventBuilder<'a, music_event_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2580,12 +2583,12 @@ impl<'a> MusicEventBuilder<'a, music_event_state::Empty> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `about` field (optional)
     pub fn about(mut self, value: impl Into<Option<MusicEventAbout<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `about` field to an Option value (optional)
     pub fn maybe_about(mut self, value: Option<MusicEventAbout<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -2593,12 +2596,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `actor` field (optional)
     pub fn actor(mut self, value: impl Into<Option<MusicEventActor<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `actor` field to an Option value (optional)
     pub fn maybe_actor(mut self, value: Option<MusicEventActor<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -2609,7 +2612,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -2617,7 +2620,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -2628,7 +2631,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -2636,7 +2639,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -2647,7 +2650,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -2655,7 +2658,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -2663,12 +2666,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `attendee` field (optional)
     pub fn attendee(mut self, value: impl Into<Option<MusicEventAttendee<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `attendee` field to an Option value (optional)
     pub fn maybe_attendee(mut self, value: Option<MusicEventAttendee<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -2679,12 +2682,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventAttendees<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `attendees` field to an Option value (optional)
     pub fn maybe_attendees(mut self, value: Option<MusicEventAttendees<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -2692,12 +2695,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `audience` field (optional)
     pub fn audience(mut self, value: impl Into<Option<MusicEventAudience<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `audience` field to an Option value (optional)
     pub fn maybe_audience(mut self, value: Option<MusicEventAudience<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -2705,12 +2708,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `composer` field (optional)
     pub fn composer(mut self, value: impl Into<Option<MusicEventComposer<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `composer` field to an Option value (optional)
     pub fn maybe_composer(mut self, value: Option<MusicEventComposer<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -2721,7 +2724,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventContributor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `contributor` field to an Option value (optional)
@@ -2729,7 +2732,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventContributor<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -2740,7 +2743,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
@@ -2748,7 +2751,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -2756,12 +2759,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `director` field (optional)
     pub fn director(mut self, value: impl Into<Option<MusicEventDirector<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `director` field to an Option value (optional)
     pub fn maybe_director(mut self, value: Option<MusicEventDirector<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -2772,7 +2775,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -2780,7 +2783,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -2791,12 +2794,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventDoorTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `doorTime` field to an Option value (optional)
     pub fn maybe_door_time(mut self, value: Option<MusicEventDoorTime<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -2804,12 +2807,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `duration` field (optional)
     pub fn duration(mut self, value: impl Into<Option<MusicEventDuration<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `duration` field to an Option value (optional)
     pub fn maybe_duration(mut self, value: Option<MusicEventDuration<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -2817,12 +2820,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `endDate` field (optional)
     pub fn end_date(mut self, value: impl Into<Option<MusicEventEndDate<'a>>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `endDate` field to an Option value (optional)
     pub fn maybe_end_date(mut self, value: Option<MusicEventEndDate<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -2833,7 +2836,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventEventAttendanceMode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `eventAttendanceMode` field to an Option value (optional)
@@ -2841,7 +2844,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventEventAttendanceMode<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -2852,7 +2855,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventEventSchedule<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `eventSchedule` field to an Option value (optional)
@@ -2860,7 +2863,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventEventSchedule<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -2871,7 +2874,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventEventStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `eventStatus` field to an Option value (optional)
@@ -2879,7 +2882,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventEventStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -2887,12 +2890,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<MusicEventFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<MusicEventFunder<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -2900,12 +2903,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<MusicEventFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<MusicEventFunding<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -2916,12 +2919,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventIdentifier<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<MusicEventIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -2929,12 +2932,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<MusicEventImage<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<MusicEventImage<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -2945,12 +2948,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventInLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `inLanguage` field to an Option value (optional)
     pub fn maybe_in_language(mut self, value: Option<MusicEventInLanguage<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -2961,7 +2964,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventIsAccessibleForFree<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `isAccessibleForFree` field to an Option value (optional)
@@ -2969,7 +2972,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventIsAccessibleForFree<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -2977,12 +2980,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<MusicEventKeywords<'a>>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<MusicEventKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -2990,12 +2993,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<MusicEventLocation<'a>>>) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<MusicEventLocation<'a>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -3006,7 +3009,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -3014,7 +3017,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -3025,7 +3028,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventMaximumAttendeeCapacity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `maximumAttendeeCapacity` field to an Option value (optional)
@@ -3033,7 +3036,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventMaximumAttendeeCapacity<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -3044,7 +3047,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventMaximumPhysicalAttendeeCapacity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `maximumPhysicalAttendeeCapacity` field to an Option value (optional)
@@ -3052,7 +3055,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventMaximumPhysicalAttendeeCapacity<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -3063,7 +3066,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventMaximumVirtualAttendeeCapacity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `maximumVirtualAttendeeCapacity` field to an Option value (optional)
@@ -3071,7 +3074,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventMaximumVirtualAttendeeCapacity<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -3079,12 +3082,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<MusicEventName<'a>>>) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<MusicEventName<'a>>) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -3092,12 +3095,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `offers` field (optional)
     pub fn offers(mut self, value: impl Into<Option<MusicEventOffers<'a>>>) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `offers` field to an Option value (optional)
     pub fn maybe_offers(mut self, value: Option<MusicEventOffers<'a>>) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -3108,12 +3111,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventOrganizer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `organizer` field to an Option value (optional)
     pub fn maybe_organizer(mut self, value: Option<MusicEventOrganizer<'a>>) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -3124,12 +3127,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventPerformer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `performer` field to an Option value (optional)
     pub fn maybe_performer(mut self, value: Option<MusicEventPerformer<'a>>) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -3140,12 +3143,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventPerformers<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `performers` field to an Option value (optional)
     pub fn maybe_performers(mut self, value: Option<MusicEventPerformers<'a>>) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -3156,7 +3159,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventPotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -3164,7 +3167,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventPotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -3175,7 +3178,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventPreviousStartDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `previousStartDate` field to an Option value (optional)
@@ -3183,7 +3186,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventPreviousStartDate<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -3194,12 +3197,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventRecordedIn<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `recordedIn` field to an Option value (optional)
     pub fn maybe_recorded_in(mut self, value: Option<MusicEventRecordedIn<'a>>) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -3210,7 +3213,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventRemainingAttendeeCapacity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `remainingAttendeeCapacity` field to an Option value (optional)
@@ -3218,7 +3221,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventRemainingAttendeeCapacity<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -3226,12 +3229,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<MusicEventReview<'a>>>) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<MusicEventReview<'a>>) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -3239,12 +3242,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<MusicEventSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<MusicEventSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -3252,12 +3255,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `sponsor` field (optional)
     pub fn sponsor(mut self, value: impl Into<Option<MusicEventSponsor<'a>>>) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<MusicEventSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -3268,12 +3271,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventStartDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `startDate` field to an Option value (optional)
     pub fn maybe_start_date(mut self, value: Option<MusicEventStartDate<'a>>) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -3284,12 +3287,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventSubEvent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `subEvent` field to an Option value (optional)
     pub fn maybe_sub_event(mut self, value: Option<MusicEventSubEvent<'a>>) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -3300,12 +3303,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventSubEvents<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `subEvents` field to an Option value (optional)
     pub fn maybe_sub_events(mut self, value: Option<MusicEventSubEvents<'a>>) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -3316,12 +3319,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventSubjectOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<MusicEventSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -3332,12 +3335,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventSuperEvent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `superEvent` field to an Option value (optional)
     pub fn maybe_super_event(mut self, value: Option<MusicEventSuperEvent<'a>>) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -3348,12 +3351,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventTranslator<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `translator` field to an Option value (optional)
     pub fn maybe_translator(mut self, value: Option<MusicEventTranslator<'a>>) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -3364,7 +3367,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventTypicalAgeRange<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `typicalAgeRange` field to an Option value (optional)
@@ -3372,7 +3375,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventTypicalAgeRange<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -3380,12 +3383,12 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
 impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<MusicEventUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<MusicEventUrl<'a>>) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -3396,7 +3399,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventWorkFeatured<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `workFeatured` field to an Option value (optional)
@@ -3404,7 +3407,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventWorkFeatured<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -3415,7 +3418,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicEventWorkPerformed<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `workPerformed` field to an Option value (optional)
@@ -3423,7 +3426,7 @@ impl<'a, S: music_event_state::State> MusicEventBuilder<'a, S> {
         mut self,
         value: Option<MusicEventWorkPerformed<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -3435,59 +3438,59 @@ where
     /// Build the final struct
     pub fn build(self) -> MusicEvent<'a> {
         MusicEvent {
-            about: self.__unsafe_private_named.0,
-            actor: self.__unsafe_private_named.1,
-            additional_type: self.__unsafe_private_named.2,
-            aggregate_rating: self.__unsafe_private_named.3,
-            alternate_name: self.__unsafe_private_named.4,
-            attendee: self.__unsafe_private_named.5,
-            attendees: self.__unsafe_private_named.6,
-            audience: self.__unsafe_private_named.7,
-            composer: self.__unsafe_private_named.8,
-            contributor: self.__unsafe_private_named.9,
-            description: self.__unsafe_private_named.10,
-            director: self.__unsafe_private_named.11,
-            disambiguating_description: self.__unsafe_private_named.12,
-            door_time: self.__unsafe_private_named.13,
-            duration: self.__unsafe_private_named.14,
-            end_date: self.__unsafe_private_named.15,
-            event_attendance_mode: self.__unsafe_private_named.16,
-            event_schedule: self.__unsafe_private_named.17,
-            event_status: self.__unsafe_private_named.18,
-            funder: self.__unsafe_private_named.19,
-            funding: self.__unsafe_private_named.20,
-            identifier: self.__unsafe_private_named.21,
-            image: self.__unsafe_private_named.22,
-            in_language: self.__unsafe_private_named.23,
-            is_accessible_for_free: self.__unsafe_private_named.24,
-            keywords: self.__unsafe_private_named.25,
-            location: self.__unsafe_private_named.26,
-            main_entity_of_page: self.__unsafe_private_named.27,
-            maximum_attendee_capacity: self.__unsafe_private_named.28,
-            maximum_physical_attendee_capacity: self.__unsafe_private_named.29,
-            maximum_virtual_attendee_capacity: self.__unsafe_private_named.30,
-            name: self.__unsafe_private_named.31,
-            offers: self.__unsafe_private_named.32,
-            organizer: self.__unsafe_private_named.33,
-            performer: self.__unsafe_private_named.34,
-            performers: self.__unsafe_private_named.35,
-            potential_action: self.__unsafe_private_named.36,
-            previous_start_date: self.__unsafe_private_named.37,
-            recorded_in: self.__unsafe_private_named.38,
-            remaining_attendee_capacity: self.__unsafe_private_named.39,
-            review: self.__unsafe_private_named.40,
-            same_as: self.__unsafe_private_named.41,
-            sponsor: self.__unsafe_private_named.42,
-            start_date: self.__unsafe_private_named.43,
-            sub_event: self.__unsafe_private_named.44,
-            sub_events: self.__unsafe_private_named.45,
-            subject_of: self.__unsafe_private_named.46,
-            super_event: self.__unsafe_private_named.47,
-            translator: self.__unsafe_private_named.48,
-            typical_age_range: self.__unsafe_private_named.49,
-            url: self.__unsafe_private_named.50,
-            work_featured: self.__unsafe_private_named.51,
-            work_performed: self.__unsafe_private_named.52,
+            about: self._fields.0,
+            actor: self._fields.1,
+            additional_type: self._fields.2,
+            aggregate_rating: self._fields.3,
+            alternate_name: self._fields.4,
+            attendee: self._fields.5,
+            attendees: self._fields.6,
+            audience: self._fields.7,
+            composer: self._fields.8,
+            contributor: self._fields.9,
+            description: self._fields.10,
+            director: self._fields.11,
+            disambiguating_description: self._fields.12,
+            door_time: self._fields.13,
+            duration: self._fields.14,
+            end_date: self._fields.15,
+            event_attendance_mode: self._fields.16,
+            event_schedule: self._fields.17,
+            event_status: self._fields.18,
+            funder: self._fields.19,
+            funding: self._fields.20,
+            identifier: self._fields.21,
+            image: self._fields.22,
+            in_language: self._fields.23,
+            is_accessible_for_free: self._fields.24,
+            keywords: self._fields.25,
+            location: self._fields.26,
+            main_entity_of_page: self._fields.27,
+            maximum_attendee_capacity: self._fields.28,
+            maximum_physical_attendee_capacity: self._fields.29,
+            maximum_virtual_attendee_capacity: self._fields.30,
+            name: self._fields.31,
+            offers: self._fields.32,
+            organizer: self._fields.33,
+            performer: self._fields.34,
+            performers: self._fields.35,
+            potential_action: self._fields.36,
+            previous_start_date: self._fields.37,
+            recorded_in: self._fields.38,
+            remaining_attendee_capacity: self._fields.39,
+            review: self._fields.40,
+            same_as: self._fields.41,
+            sponsor: self._fields.42,
+            start_date: self._fields.43,
+            sub_event: self._fields.44,
+            sub_events: self._fields.45,
+            subject_of: self._fields.46,
+            super_event: self._fields.47,
+            translator: self._fields.48,
+            typical_age_range: self._fields.49,
+            url: self._fields.50,
+            work_featured: self._fields.51,
+            work_performed: self._fields.52,
             extra_data: Default::default(),
         }
     }
@@ -3497,59 +3500,59 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> MusicEvent<'a> {
         MusicEvent {
-            about: self.__unsafe_private_named.0,
-            actor: self.__unsafe_private_named.1,
-            additional_type: self.__unsafe_private_named.2,
-            aggregate_rating: self.__unsafe_private_named.3,
-            alternate_name: self.__unsafe_private_named.4,
-            attendee: self.__unsafe_private_named.5,
-            attendees: self.__unsafe_private_named.6,
-            audience: self.__unsafe_private_named.7,
-            composer: self.__unsafe_private_named.8,
-            contributor: self.__unsafe_private_named.9,
-            description: self.__unsafe_private_named.10,
-            director: self.__unsafe_private_named.11,
-            disambiguating_description: self.__unsafe_private_named.12,
-            door_time: self.__unsafe_private_named.13,
-            duration: self.__unsafe_private_named.14,
-            end_date: self.__unsafe_private_named.15,
-            event_attendance_mode: self.__unsafe_private_named.16,
-            event_schedule: self.__unsafe_private_named.17,
-            event_status: self.__unsafe_private_named.18,
-            funder: self.__unsafe_private_named.19,
-            funding: self.__unsafe_private_named.20,
-            identifier: self.__unsafe_private_named.21,
-            image: self.__unsafe_private_named.22,
-            in_language: self.__unsafe_private_named.23,
-            is_accessible_for_free: self.__unsafe_private_named.24,
-            keywords: self.__unsafe_private_named.25,
-            location: self.__unsafe_private_named.26,
-            main_entity_of_page: self.__unsafe_private_named.27,
-            maximum_attendee_capacity: self.__unsafe_private_named.28,
-            maximum_physical_attendee_capacity: self.__unsafe_private_named.29,
-            maximum_virtual_attendee_capacity: self.__unsafe_private_named.30,
-            name: self.__unsafe_private_named.31,
-            offers: self.__unsafe_private_named.32,
-            organizer: self.__unsafe_private_named.33,
-            performer: self.__unsafe_private_named.34,
-            performers: self.__unsafe_private_named.35,
-            potential_action: self.__unsafe_private_named.36,
-            previous_start_date: self.__unsafe_private_named.37,
-            recorded_in: self.__unsafe_private_named.38,
-            remaining_attendee_capacity: self.__unsafe_private_named.39,
-            review: self.__unsafe_private_named.40,
-            same_as: self.__unsafe_private_named.41,
-            sponsor: self.__unsafe_private_named.42,
-            start_date: self.__unsafe_private_named.43,
-            sub_event: self.__unsafe_private_named.44,
-            sub_events: self.__unsafe_private_named.45,
-            subject_of: self.__unsafe_private_named.46,
-            super_event: self.__unsafe_private_named.47,
-            translator: self.__unsafe_private_named.48,
-            typical_age_range: self.__unsafe_private_named.49,
-            url: self.__unsafe_private_named.50,
-            work_featured: self.__unsafe_private_named.51,
-            work_performed: self.__unsafe_private_named.52,
+            about: self._fields.0,
+            actor: self._fields.1,
+            additional_type: self._fields.2,
+            aggregate_rating: self._fields.3,
+            alternate_name: self._fields.4,
+            attendee: self._fields.5,
+            attendees: self._fields.6,
+            audience: self._fields.7,
+            composer: self._fields.8,
+            contributor: self._fields.9,
+            description: self._fields.10,
+            director: self._fields.11,
+            disambiguating_description: self._fields.12,
+            door_time: self._fields.13,
+            duration: self._fields.14,
+            end_date: self._fields.15,
+            event_attendance_mode: self._fields.16,
+            event_schedule: self._fields.17,
+            event_status: self._fields.18,
+            funder: self._fields.19,
+            funding: self._fields.20,
+            identifier: self._fields.21,
+            image: self._fields.22,
+            in_language: self._fields.23,
+            is_accessible_for_free: self._fields.24,
+            keywords: self._fields.25,
+            location: self._fields.26,
+            main_entity_of_page: self._fields.27,
+            maximum_attendee_capacity: self._fields.28,
+            maximum_physical_attendee_capacity: self._fields.29,
+            maximum_virtual_attendee_capacity: self._fields.30,
+            name: self._fields.31,
+            offers: self._fields.32,
+            organizer: self._fields.33,
+            performer: self._fields.34,
+            performers: self._fields.35,
+            potential_action: self._fields.36,
+            previous_start_date: self._fields.37,
+            recorded_in: self._fields.38,
+            remaining_attendee_capacity: self._fields.39,
+            review: self._fields.40,
+            same_as: self._fields.41,
+            sponsor: self._fields.42,
+            start_date: self._fields.43,
+            sub_event: self._fields.44,
+            sub_events: self._fields.45,
+            subject_of: self._fields.46,
+            super_event: self._fields.47,
+            translator: self._fields.48,
+            typical_age_range: self._fields.49,
+            url: self._fields.50,
+            work_featured: self._fields.51,
+            work_performed: self._fields.52,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/music_group.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/music_group.rs
index 84046fd4..14c42f5c 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/music_group.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/music_group.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -4107,8 +4110,8 @@ pub mod music_group_state {
 
 /// Builder for constructing an instance of this type
 pub struct MusicGroupBuilder<'a, S: music_group_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<MusicGroupAcceptedPaymentMethod<'a>>,
         Option<MusicGroupActionableFeedbackPolicy<'a>>,
         Option<MusicGroupAdditionalType<'a>>,
@@ -4205,7 +4208,7 @@ pub struct MusicGroupBuilder<'a, S: music_group_state::State> {
         Option<MusicGroupUrl<'a>>,
         Option<MusicGroupVatId<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MusicGroup<'a> {
@@ -4219,8 +4222,8 @@ impl<'a> MusicGroupBuilder<'a, music_group_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MusicGroupBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -4317,7 +4320,7 @@ impl<'a> MusicGroupBuilder<'a, music_group_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4328,7 +4331,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupAcceptedPaymentMethod<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `acceptedPaymentMethod` field to an Option value (optional)
@@ -4336,7 +4339,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupAcceptedPaymentMethod<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -4347,7 +4350,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupActionableFeedbackPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `actionableFeedbackPolicy` field to an Option value (optional)
@@ -4355,7 +4358,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupActionableFeedbackPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -4366,7 +4369,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -4374,7 +4377,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -4382,12 +4385,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `address` field (optional)
     pub fn address(mut self, value: impl Into<Option<MusicGroupAddress<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `address` field to an Option value (optional)
     pub fn maybe_address(mut self, value: Option<MusicGroupAddress<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -4398,7 +4401,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupAgentInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `agentInteractionStatistic` field to an Option value (optional)
@@ -4406,7 +4409,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupAgentInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -4417,7 +4420,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -4425,7 +4428,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -4433,12 +4436,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `album` field (optional)
     pub fn album(mut self, value: impl Into<Option<MusicGroupAlbum<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `album` field to an Option value (optional)
     pub fn maybe_album(mut self, value: Option<MusicGroupAlbum<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -4446,12 +4449,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `albums` field (optional)
     pub fn albums(mut self, value: impl Into<Option<MusicGroupAlbums<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `albums` field to an Option value (optional)
     pub fn maybe_albums(mut self, value: Option<MusicGroupAlbums<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -4462,7 +4465,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -4470,7 +4473,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -4478,12 +4481,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `alumni` field (optional)
     pub fn alumni(mut self, value: impl Into<Option<MusicGroupAlumni<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `alumni` field to an Option value (optional)
     pub fn maybe_alumni(mut self, value: Option<MusicGroupAlumni<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -4494,12 +4497,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupAreaServed<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `areaServed` field to an Option value (optional)
     pub fn maybe_area_served(mut self, value: Option<MusicGroupAreaServed<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -4507,12 +4510,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<MusicGroupAward<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<MusicGroupAward<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -4520,12 +4523,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<MusicGroupAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<MusicGroupAwards<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -4533,12 +4536,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `brand` field (optional)
     pub fn brand(mut self, value: impl Into<Option<MusicGroupBrand<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `brand` field to an Option value (optional)
     pub fn maybe_brand(mut self, value: Option<MusicGroupBrand<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -4549,7 +4552,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupCompanyRegistration<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `companyRegistration` field to an Option value (optional)
@@ -4557,7 +4560,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupCompanyRegistration<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -4568,7 +4571,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupContactPoint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `contactPoint` field to an Option value (optional)
@@ -4576,7 +4579,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupContactPoint<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -4587,7 +4590,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupContactPoints<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `contactPoints` field to an Option value (optional)
@@ -4595,7 +4598,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupContactPoints<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -4606,7 +4609,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupCorrectionsPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `correctionsPolicy` field to an Option value (optional)
@@ -4614,7 +4617,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupCorrectionsPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -4625,12 +4628,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupDepartment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `department` field to an Option value (optional)
     pub fn maybe_department(mut self, value: Option<MusicGroupDepartment<'a>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -4641,7 +4644,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
@@ -4649,7 +4652,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -4660,7 +4663,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -4668,7 +4671,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -4679,7 +4682,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupDissolutionDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `dissolutionDate` field to an Option value (optional)
@@ -4687,7 +4690,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupDissolutionDate<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -4698,7 +4701,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupDiversityPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `diversityPolicy` field to an Option value (optional)
@@ -4706,7 +4709,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupDiversityPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -4717,7 +4720,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupDiversityStaffingReport<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `diversityStaffingReport` field to an Option value (optional)
@@ -4725,7 +4728,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupDiversityStaffingReport<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -4733,12 +4736,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `duns` field (optional)
     pub fn duns(mut self, value: impl Into<Option<MusicGroupDuns<'a>>>) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `duns` field to an Option value (optional)
     pub fn maybe_duns(mut self, value: Option<MusicGroupDuns<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -4746,12 +4749,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `email` field (optional)
     pub fn email(mut self, value: impl Into<Option<MusicGroupEmail<'a>>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `email` field to an Option value (optional)
     pub fn maybe_email(mut self, value: Option<MusicGroupEmail<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -4759,12 +4762,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `employee` field (optional)
     pub fn employee(mut self, value: impl Into<Option<MusicGroupEmployee<'a>>>) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `employee` field to an Option value (optional)
     pub fn maybe_employee(mut self, value: Option<MusicGroupEmployee<'a>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -4775,12 +4778,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupEmployees<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `employees` field to an Option value (optional)
     pub fn maybe_employees(mut self, value: Option<MusicGroupEmployees<'a>>) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -4791,7 +4794,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupEthicsPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `ethicsPolicy` field to an Option value (optional)
@@ -4799,7 +4802,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupEthicsPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -4807,12 +4810,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `event` field (optional)
     pub fn event(mut self, value: impl Into<Option<MusicGroupEvent<'a>>>) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `event` field to an Option value (optional)
     pub fn maybe_event(mut self, value: Option<MusicGroupEvent<'a>>) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -4820,12 +4823,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `events` field (optional)
     pub fn events(mut self, value: impl Into<Option<MusicGroupEvents<'a>>>) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `events` field to an Option value (optional)
     pub fn maybe_events(mut self, value: Option<MusicGroupEvents<'a>>) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -4836,12 +4839,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupFaxNumber<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `faxNumber` field to an Option value (optional)
     pub fn maybe_fax_number(mut self, value: Option<MusicGroupFaxNumber<'a>>) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -4849,12 +4852,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `founder` field (optional)
     pub fn founder(mut self, value: impl Into<Option<MusicGroupFounder<'a>>>) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `founder` field to an Option value (optional)
     pub fn maybe_founder(mut self, value: Option<MusicGroupFounder<'a>>) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -4862,12 +4865,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `founders` field (optional)
     pub fn founders(mut self, value: impl Into<Option<MusicGroupFounders<'a>>>) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `founders` field to an Option value (optional)
     pub fn maybe_founders(mut self, value: Option<MusicGroupFounders<'a>>) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -4878,7 +4881,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupFoundingDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `foundingDate` field to an Option value (optional)
@@ -4886,7 +4889,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupFoundingDate<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -4897,7 +4900,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupFoundingLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `foundingLocation` field to an Option value (optional)
@@ -4905,7 +4908,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupFoundingLocation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -4913,12 +4916,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<MusicGroupFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<MusicGroupFunder<'a>>) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -4926,12 +4929,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<MusicGroupFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<MusicGroupFunding<'a>>) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -4939,12 +4942,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<MusicGroupGenre<'a>>>) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<MusicGroupGenre<'a>>) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -4955,7 +4958,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupGlobalLocationNumber<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `globalLocationNumber` field to an Option value (optional)
@@ -4963,7 +4966,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupGlobalLocationNumber<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -4974,7 +4977,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupHasCertification<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `hasCertification` field to an Option value (optional)
@@ -4982,7 +4985,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupHasCertification<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -4993,7 +4996,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupHasCredential<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `hasCredential` field to an Option value (optional)
@@ -5001,7 +5004,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupHasCredential<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -5012,7 +5015,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupHasGs1DigitalLink<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `hasGS1DigitalLink` field to an Option value (optional)
@@ -5020,7 +5023,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupHasGs1DigitalLink<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -5031,7 +5034,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupHasMemberProgram<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `hasMemberProgram` field to an Option value (optional)
@@ -5039,7 +5042,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupHasMemberProgram<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -5050,7 +5053,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupHasMerchantReturnPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `hasMerchantReturnPolicy` field to an Option value (optional)
@@ -5058,7 +5061,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupHasMerchantReturnPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -5069,7 +5072,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupHasOfferCatalog<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `hasOfferCatalog` field to an Option value (optional)
@@ -5077,7 +5080,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupHasOfferCatalog<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -5085,12 +5088,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `hasPOS` field (optional)
     pub fn has_pos(mut self, value: impl Into<Option<MusicGroupHasPos<'a>>>) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `hasPOS` field to an Option value (optional)
     pub fn maybe_has_pos(mut self, value: Option<MusicGroupHasPos<'a>>) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -5101,7 +5104,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupHasProductReturnPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `hasProductReturnPolicy` field to an Option value (optional)
@@ -5109,7 +5112,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupHasProductReturnPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -5120,7 +5123,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupHasShippingService<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `hasShippingService` field to an Option value (optional)
@@ -5128,7 +5131,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupHasShippingService<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -5139,12 +5142,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupIdentifier<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<MusicGroupIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -5152,12 +5155,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<MusicGroupImage<'a>>>) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<MusicGroupImage<'a>>) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -5168,7 +5171,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -5176,7 +5179,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -5184,12 +5187,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `isicV4` field (optional)
     pub fn isic_v4(mut self, value: impl Into<Option<MusicGroupIsicV4<'a>>>) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `isicV4` field to an Option value (optional)
     pub fn maybe_isic_v4(mut self, value: Option<MusicGroupIsicV4<'a>>) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -5200,7 +5203,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupIso6523Code<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `iso6523Code` field to an Option value (optional)
@@ -5208,7 +5211,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupIso6523Code<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -5216,12 +5219,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<MusicGroupKeywords<'a>>>) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<MusicGroupKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -5232,12 +5235,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupKnowsAbout<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `knowsAbout` field to an Option value (optional)
     pub fn maybe_knows_about(mut self, value: Option<MusicGroupKnowsAbout<'a>>) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -5248,7 +5251,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupKnowsLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `knowsLanguage` field to an Option value (optional)
@@ -5256,7 +5259,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupKnowsLanguage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -5267,7 +5270,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupLegalAddress<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `legalAddress` field to an Option value (optional)
@@ -5275,7 +5278,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupLegalAddress<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -5286,12 +5289,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupLegalName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `legalName` field to an Option value (optional)
     pub fn maybe_legal_name(mut self, value: Option<MusicGroupLegalName<'a>>) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -5302,7 +5305,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupLegalRepresentative<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `legalRepresentative` field to an Option value (optional)
@@ -5310,7 +5313,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupLegalRepresentative<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -5318,12 +5321,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `leiCode` field (optional)
     pub fn lei_code(mut self, value: impl Into<Option<MusicGroupLeiCode<'a>>>) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `leiCode` field to an Option value (optional)
     pub fn maybe_lei_code(mut self, value: Option<MusicGroupLeiCode<'a>>) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -5331,12 +5334,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<MusicGroupLocation<'a>>>) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<MusicGroupLocation<'a>>) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -5344,12 +5347,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `logo` field (optional)
     pub fn logo(mut self, value: impl Into<Option<MusicGroupLogo<'a>>>) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `logo` field to an Option value (optional)
     pub fn maybe_logo(mut self, value: Option<MusicGroupLogo<'a>>) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -5360,7 +5363,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -5368,7 +5371,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -5379,12 +5382,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupMakesOffer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `makesOffer` field to an Option value (optional)
     pub fn maybe_makes_offer(mut self, value: Option<MusicGroupMakesOffer<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -5392,12 +5395,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `member` field (optional)
     pub fn member(mut self, value: impl Into<Option<MusicGroupMember<'a>>>) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `member` field to an Option value (optional)
     pub fn maybe_member(mut self, value: Option<MusicGroupMember<'a>>) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -5408,12 +5411,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupMemberOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `memberOf` field to an Option value (optional)
     pub fn maybe_member_of(mut self, value: Option<MusicGroupMemberOf<'a>>) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -5421,12 +5424,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `members` field (optional)
     pub fn members(mut self, value: impl Into<Option<MusicGroupMembers<'a>>>) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `members` field to an Option value (optional)
     pub fn maybe_members(mut self, value: Option<MusicGroupMembers<'a>>) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -5437,7 +5440,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupMusicGroupMember<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `musicGroupMember` field to an Option value (optional)
@@ -5445,7 +5448,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupMusicGroupMember<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -5453,12 +5456,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `naics` field (optional)
     pub fn naics(mut self, value: impl Into<Option<MusicGroupNaics<'a>>>) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `naics` field to an Option value (optional)
     pub fn maybe_naics(mut self, value: Option<MusicGroupNaics<'a>>) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -5466,12 +5469,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<MusicGroupName<'a>>>) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<MusicGroupName<'a>>) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -5482,7 +5485,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupNonprofitStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `nonprofitStatus` field to an Option value (optional)
@@ -5490,7 +5493,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupNonprofitStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -5501,7 +5504,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupNumberOfEmployees<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `numberOfEmployees` field to an Option value (optional)
@@ -5509,7 +5512,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupNumberOfEmployees<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -5520,7 +5523,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupOwnershipFundingInfo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `ownershipFundingInfo` field to an Option value (optional)
@@ -5528,7 +5531,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupOwnershipFundingInfo<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -5536,12 +5539,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `owns` field (optional)
     pub fn owns(mut self, value: impl Into<Option<MusicGroupOwns<'a>>>) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `owns` field to an Option value (optional)
     pub fn maybe_owns(mut self, value: Option<MusicGroupOwns<'a>>) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -5552,7 +5555,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupParentOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `parentOrganization` field to an Option value (optional)
@@ -5560,7 +5563,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupParentOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -5571,7 +5574,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupPotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -5579,7 +5582,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupPotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -5590,7 +5593,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupPublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -5598,7 +5601,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupPublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -5606,12 +5609,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<MusicGroupReview<'a>>>) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<MusicGroupReview<'a>>) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -5619,12 +5622,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `reviews` field (optional)
     pub fn reviews(mut self, value: impl Into<Option<MusicGroupReviews<'a>>>) -> Self {
-        self.__unsafe_private_named.79 = value.into();
+        self._fields.79 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<MusicGroupReviews<'a>>) -> Self {
-        self.__unsafe_private_named.79 = value;
+        self._fields.79 = value;
         self
     }
 }
@@ -5632,12 +5635,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<MusicGroupSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.80 = value.into();
+        self._fields.80 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<MusicGroupSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.80 = value;
+        self._fields.80 = value;
         self
     }
 }
@@ -5645,12 +5648,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `seeks` field (optional)
     pub fn seeks(mut self, value: impl Into<Option<MusicGroupSeeks<'a>>>) -> Self {
-        self.__unsafe_private_named.81 = value.into();
+        self._fields.81 = value.into();
         self
     }
     /// Set the `seeks` field to an Option value (optional)
     pub fn maybe_seeks(mut self, value: Option<MusicGroupSeeks<'a>>) -> Self {
-        self.__unsafe_private_named.81 = value;
+        self._fields.81 = value;
         self
     }
 }
@@ -5661,7 +5664,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupServiceArea<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value.into();
+        self._fields.82 = value.into();
         self
     }
     /// Set the `serviceArea` field to an Option value (optional)
@@ -5669,7 +5672,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupServiceArea<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value;
+        self._fields.82 = value;
         self
     }
 }
@@ -5677,12 +5680,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `skills` field (optional)
     pub fn skills(mut self, value: impl Into<Option<MusicGroupSkills<'a>>>) -> Self {
-        self.__unsafe_private_named.83 = value.into();
+        self._fields.83 = value.into();
         self
     }
     /// Set the `skills` field to an Option value (optional)
     pub fn maybe_skills(mut self, value: Option<MusicGroupSkills<'a>>) -> Self {
-        self.__unsafe_private_named.83 = value;
+        self._fields.83 = value;
         self
     }
 }
@@ -5690,12 +5693,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `slogan` field (optional)
     pub fn slogan(mut self, value: impl Into<Option<MusicGroupSlogan<'a>>>) -> Self {
-        self.__unsafe_private_named.84 = value.into();
+        self._fields.84 = value.into();
         self
     }
     /// Set the `slogan` field to an Option value (optional)
     pub fn maybe_slogan(mut self, value: Option<MusicGroupSlogan<'a>>) -> Self {
-        self.__unsafe_private_named.84 = value;
+        self._fields.84 = value;
         self
     }
 }
@@ -5703,12 +5706,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `sponsor` field (optional)
     pub fn sponsor(mut self, value: impl Into<Option<MusicGroupSponsor<'a>>>) -> Self {
-        self.__unsafe_private_named.85 = value.into();
+        self._fields.85 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<MusicGroupSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.85 = value;
+        self._fields.85 = value;
         self
     }
 }
@@ -5719,7 +5722,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupSubOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.86 = value.into();
+        self._fields.86 = value.into();
         self
     }
     /// Set the `subOrganization` field to an Option value (optional)
@@ -5727,7 +5730,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupSubOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.86 = value;
+        self._fields.86 = value;
         self
     }
 }
@@ -5738,12 +5741,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupSubjectOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.87 = value.into();
+        self._fields.87 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<MusicGroupSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.87 = value;
+        self._fields.87 = value;
         self
     }
 }
@@ -5751,12 +5754,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `taxID` field (optional)
     pub fn tax_id(mut self, value: impl Into<Option<MusicGroupTaxId<'a>>>) -> Self {
-        self.__unsafe_private_named.88 = value.into();
+        self._fields.88 = value.into();
         self
     }
     /// Set the `taxID` field to an Option value (optional)
     pub fn maybe_tax_id(mut self, value: Option<MusicGroupTaxId<'a>>) -> Self {
-        self.__unsafe_private_named.88 = value;
+        self._fields.88 = value;
         self
     }
 }
@@ -5767,12 +5770,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupTelephone<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.89 = value.into();
+        self._fields.89 = value.into();
         self
     }
     /// Set the `telephone` field to an Option value (optional)
     pub fn maybe_telephone(mut self, value: Option<MusicGroupTelephone<'a>>) -> Self {
-        self.__unsafe_private_named.89 = value;
+        self._fields.89 = value;
         self
     }
 }
@@ -5780,12 +5783,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `track` field (optional)
     pub fn track(mut self, value: impl Into<Option<MusicGroupTrack<'a>>>) -> Self {
-        self.__unsafe_private_named.90 = value.into();
+        self._fields.90 = value.into();
         self
     }
     /// Set the `track` field to an Option value (optional)
     pub fn maybe_track(mut self, value: Option<MusicGroupTrack<'a>>) -> Self {
-        self.__unsafe_private_named.90 = value;
+        self._fields.90 = value;
         self
     }
 }
@@ -5793,12 +5796,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `tracks` field (optional)
     pub fn tracks(mut self, value: impl Into<Option<MusicGroupTracks<'a>>>) -> Self {
-        self.__unsafe_private_named.91 = value.into();
+        self._fields.91 = value.into();
         self
     }
     /// Set the `tracks` field to an Option value (optional)
     pub fn maybe_tracks(mut self, value: Option<MusicGroupTracks<'a>>) -> Self {
-        self.__unsafe_private_named.91 = value;
+        self._fields.91 = value;
         self
     }
 }
@@ -5809,7 +5812,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: impl Into<Option<MusicGroupUnnamedSourcesPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.92 = value.into();
+        self._fields.92 = value.into();
         self
     }
     /// Set the `unnamedSourcesPolicy` field to an Option value (optional)
@@ -5817,7 +5820,7 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
         mut self,
         value: Option<MusicGroupUnnamedSourcesPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.92 = value;
+        self._fields.92 = value;
         self
     }
 }
@@ -5825,12 +5828,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<MusicGroupUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.93 = value.into();
+        self._fields.93 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<MusicGroupUrl<'a>>) -> Self {
-        self.__unsafe_private_named.93 = value;
+        self._fields.93 = value;
         self
     }
 }
@@ -5838,12 +5841,12 @@ impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
 impl<'a, S: music_group_state::State> MusicGroupBuilder<'a, S> {
     /// Set the `vatID` field (optional)
     pub fn vat_id(mut self, value: impl Into<Option<MusicGroupVatId<'a>>>) -> Self {
-        self.__unsafe_private_named.94 = value.into();
+        self._fields.94 = value.into();
         self
     }
     /// Set the `vatID` field to an Option value (optional)
     pub fn maybe_vat_id(mut self, value: Option<MusicGroupVatId<'a>>) -> Self {
-        self.__unsafe_private_named.94 = value;
+        self._fields.94 = value;
         self
     }
 }
@@ -5855,101 +5858,101 @@ where
     /// Build the final struct
     pub fn build(self) -> MusicGroup<'a> {
         MusicGroup {
-            accepted_payment_method: self.__unsafe_private_named.0,
-            actionable_feedback_policy: self.__unsafe_private_named.1,
-            additional_type: self.__unsafe_private_named.2,
-            address: self.__unsafe_private_named.3,
-            agent_interaction_statistic: self.__unsafe_private_named.4,
-            aggregate_rating: self.__unsafe_private_named.5,
-            album: self.__unsafe_private_named.6,
-            albums: self.__unsafe_private_named.7,
-            alternate_name: self.__unsafe_private_named.8,
-            alumni: self.__unsafe_private_named.9,
-            area_served: self.__unsafe_private_named.10,
-            award: self.__unsafe_private_named.11,
-            awards: self.__unsafe_private_named.12,
-            brand: self.__unsafe_private_named.13,
-            company_registration: self.__unsafe_private_named.14,
-            contact_point: self.__unsafe_private_named.15,
-            contact_points: self.__unsafe_private_named.16,
-            corrections_policy: self.__unsafe_private_named.17,
-            department: self.__unsafe_private_named.18,
-            description: self.__unsafe_private_named.19,
-            disambiguating_description: self.__unsafe_private_named.20,
-            dissolution_date: self.__unsafe_private_named.21,
-            diversity_policy: self.__unsafe_private_named.22,
-            diversity_staffing_report: self.__unsafe_private_named.23,
-            duns: self.__unsafe_private_named.24,
-            email: self.__unsafe_private_named.25,
-            employee: self.__unsafe_private_named.26,
-            employees: self.__unsafe_private_named.27,
-            ethics_policy: self.__unsafe_private_named.28,
-            event: self.__unsafe_private_named.29,
-            events: self.__unsafe_private_named.30,
-            fax_number: self.__unsafe_private_named.31,
-            founder: self.__unsafe_private_named.32,
-            founders: self.__unsafe_private_named.33,
-            founding_date: self.__unsafe_private_named.34,
-            founding_location: self.__unsafe_private_named.35,
-            funder: self.__unsafe_private_named.36,
-            funding: self.__unsafe_private_named.37,
-            genre: self.__unsafe_private_named.38,
-            global_location_number: self.__unsafe_private_named.39,
-            has_certification: self.__unsafe_private_named.40,
-            has_credential: self.__unsafe_private_named.41,
-            has_gs1_digital_link: self.__unsafe_private_named.42,
-            has_member_program: self.__unsafe_private_named.43,
-            has_merchant_return_policy: self.__unsafe_private_named.44,
-            has_offer_catalog: self.__unsafe_private_named.45,
-            has_pos: self.__unsafe_private_named.46,
-            has_product_return_policy: self.__unsafe_private_named.47,
-            has_shipping_service: self.__unsafe_private_named.48,
-            identifier: self.__unsafe_private_named.49,
-            image: self.__unsafe_private_named.50,
-            interaction_statistic: self.__unsafe_private_named.51,
-            isic_v4: self.__unsafe_private_named.52,
-            iso6523_code: self.__unsafe_private_named.53,
-            keywords: self.__unsafe_private_named.54,
-            knows_about: self.__unsafe_private_named.55,
-            knows_language: self.__unsafe_private_named.56,
-            legal_address: self.__unsafe_private_named.57,
-            legal_name: self.__unsafe_private_named.58,
-            legal_representative: self.__unsafe_private_named.59,
-            lei_code: self.__unsafe_private_named.60,
-            location: self.__unsafe_private_named.61,
-            logo: self.__unsafe_private_named.62,
-            main_entity_of_page: self.__unsafe_private_named.63,
-            makes_offer: self.__unsafe_private_named.64,
-            member: self.__unsafe_private_named.65,
-            member_of: self.__unsafe_private_named.66,
-            members: self.__unsafe_private_named.67,
-            music_group_member: self.__unsafe_private_named.68,
-            naics: self.__unsafe_private_named.69,
-            name: self.__unsafe_private_named.70,
-            nonprofit_status: self.__unsafe_private_named.71,
-            number_of_employees: self.__unsafe_private_named.72,
-            ownership_funding_info: self.__unsafe_private_named.73,
-            owns: self.__unsafe_private_named.74,
-            parent_organization: self.__unsafe_private_named.75,
-            potential_action: self.__unsafe_private_named.76,
-            publishing_principles: self.__unsafe_private_named.77,
-            review: self.__unsafe_private_named.78,
-            reviews: self.__unsafe_private_named.79,
-            same_as: self.__unsafe_private_named.80,
-            seeks: self.__unsafe_private_named.81,
-            service_area: self.__unsafe_private_named.82,
-            skills: self.__unsafe_private_named.83,
-            slogan: self.__unsafe_private_named.84,
-            sponsor: self.__unsafe_private_named.85,
-            sub_organization: self.__unsafe_private_named.86,
-            subject_of: self.__unsafe_private_named.87,
-            tax_id: self.__unsafe_private_named.88,
-            telephone: self.__unsafe_private_named.89,
-            track: self.__unsafe_private_named.90,
-            tracks: self.__unsafe_private_named.91,
-            unnamed_sources_policy: self.__unsafe_private_named.92,
-            url: self.__unsafe_private_named.93,
-            vat_id: self.__unsafe_private_named.94,
+            accepted_payment_method: self._fields.0,
+            actionable_feedback_policy: self._fields.1,
+            additional_type: self._fields.2,
+            address: self._fields.3,
+            agent_interaction_statistic: self._fields.4,
+            aggregate_rating: self._fields.5,
+            album: self._fields.6,
+            albums: self._fields.7,
+            alternate_name: self._fields.8,
+            alumni: self._fields.9,
+            area_served: self._fields.10,
+            award: self._fields.11,
+            awards: self._fields.12,
+            brand: self._fields.13,
+            company_registration: self._fields.14,
+            contact_point: self._fields.15,
+            contact_points: self._fields.16,
+            corrections_policy: self._fields.17,
+            department: self._fields.18,
+            description: self._fields.19,
+            disambiguating_description: self._fields.20,
+            dissolution_date: self._fields.21,
+            diversity_policy: self._fields.22,
+            diversity_staffing_report: self._fields.23,
+            duns: self._fields.24,
+            email: self._fields.25,
+            employee: self._fields.26,
+            employees: self._fields.27,
+            ethics_policy: self._fields.28,
+            event: self._fields.29,
+            events: self._fields.30,
+            fax_number: self._fields.31,
+            founder: self._fields.32,
+            founders: self._fields.33,
+            founding_date: self._fields.34,
+            founding_location: self._fields.35,
+            funder: self._fields.36,
+            funding: self._fields.37,
+            genre: self._fields.38,
+            global_location_number: self._fields.39,
+            has_certification: self._fields.40,
+            has_credential: self._fields.41,
+            has_gs1_digital_link: self._fields.42,
+            has_member_program: self._fields.43,
+            has_merchant_return_policy: self._fields.44,
+            has_offer_catalog: self._fields.45,
+            has_pos: self._fields.46,
+            has_product_return_policy: self._fields.47,
+            has_shipping_service: self._fields.48,
+            identifier: self._fields.49,
+            image: self._fields.50,
+            interaction_statistic: self._fields.51,
+            isic_v4: self._fields.52,
+            iso6523_code: self._fields.53,
+            keywords: self._fields.54,
+            knows_about: self._fields.55,
+            knows_language: self._fields.56,
+            legal_address: self._fields.57,
+            legal_name: self._fields.58,
+            legal_representative: self._fields.59,
+            lei_code: self._fields.60,
+            location: self._fields.61,
+            logo: self._fields.62,
+            main_entity_of_page: self._fields.63,
+            makes_offer: self._fields.64,
+            member: self._fields.65,
+            member_of: self._fields.66,
+            members: self._fields.67,
+            music_group_member: self._fields.68,
+            naics: self._fields.69,
+            name: self._fields.70,
+            nonprofit_status: self._fields.71,
+            number_of_employees: self._fields.72,
+            ownership_funding_info: self._fields.73,
+            owns: self._fields.74,
+            parent_organization: self._fields.75,
+            potential_action: self._fields.76,
+            publishing_principles: self._fields.77,
+            review: self._fields.78,
+            reviews: self._fields.79,
+            same_as: self._fields.80,
+            seeks: self._fields.81,
+            service_area: self._fields.82,
+            skills: self._fields.83,
+            slogan: self._fields.84,
+            sponsor: self._fields.85,
+            sub_organization: self._fields.86,
+            subject_of: self._fields.87,
+            tax_id: self._fields.88,
+            telephone: self._fields.89,
+            track: self._fields.90,
+            tracks: self._fields.91,
+            unnamed_sources_policy: self._fields.92,
+            url: self._fields.93,
+            vat_id: self._fields.94,
             extra_data: Default::default(),
         }
     }
@@ -5959,101 +5962,101 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> MusicGroup<'a> {
         MusicGroup {
-            accepted_payment_method: self.__unsafe_private_named.0,
-            actionable_feedback_policy: self.__unsafe_private_named.1,
-            additional_type: self.__unsafe_private_named.2,
-            address: self.__unsafe_private_named.3,
-            agent_interaction_statistic: self.__unsafe_private_named.4,
-            aggregate_rating: self.__unsafe_private_named.5,
-            album: self.__unsafe_private_named.6,
-            albums: self.__unsafe_private_named.7,
-            alternate_name: self.__unsafe_private_named.8,
-            alumni: self.__unsafe_private_named.9,
-            area_served: self.__unsafe_private_named.10,
-            award: self.__unsafe_private_named.11,
-            awards: self.__unsafe_private_named.12,
-            brand: self.__unsafe_private_named.13,
-            company_registration: self.__unsafe_private_named.14,
-            contact_point: self.__unsafe_private_named.15,
-            contact_points: self.__unsafe_private_named.16,
-            corrections_policy: self.__unsafe_private_named.17,
-            department: self.__unsafe_private_named.18,
-            description: self.__unsafe_private_named.19,
-            disambiguating_description: self.__unsafe_private_named.20,
-            dissolution_date: self.__unsafe_private_named.21,
-            diversity_policy: self.__unsafe_private_named.22,
-            diversity_staffing_report: self.__unsafe_private_named.23,
-            duns: self.__unsafe_private_named.24,
-            email: self.__unsafe_private_named.25,
-            employee: self.__unsafe_private_named.26,
-            employees: self.__unsafe_private_named.27,
-            ethics_policy: self.__unsafe_private_named.28,
-            event: self.__unsafe_private_named.29,
-            events: self.__unsafe_private_named.30,
-            fax_number: self.__unsafe_private_named.31,
-            founder: self.__unsafe_private_named.32,
-            founders: self.__unsafe_private_named.33,
-            founding_date: self.__unsafe_private_named.34,
-            founding_location: self.__unsafe_private_named.35,
-            funder: self.__unsafe_private_named.36,
-            funding: self.__unsafe_private_named.37,
-            genre: self.__unsafe_private_named.38,
-            global_location_number: self.__unsafe_private_named.39,
-            has_certification: self.__unsafe_private_named.40,
-            has_credential: self.__unsafe_private_named.41,
-            has_gs1_digital_link: self.__unsafe_private_named.42,
-            has_member_program: self.__unsafe_private_named.43,
-            has_merchant_return_policy: self.__unsafe_private_named.44,
-            has_offer_catalog: self.__unsafe_private_named.45,
-            has_pos: self.__unsafe_private_named.46,
-            has_product_return_policy: self.__unsafe_private_named.47,
-            has_shipping_service: self.__unsafe_private_named.48,
-            identifier: self.__unsafe_private_named.49,
-            image: self.__unsafe_private_named.50,
-            interaction_statistic: self.__unsafe_private_named.51,
-            isic_v4: self.__unsafe_private_named.52,
-            iso6523_code: self.__unsafe_private_named.53,
-            keywords: self.__unsafe_private_named.54,
-            knows_about: self.__unsafe_private_named.55,
-            knows_language: self.__unsafe_private_named.56,
-            legal_address: self.__unsafe_private_named.57,
-            legal_name: self.__unsafe_private_named.58,
-            legal_representative: self.__unsafe_private_named.59,
-            lei_code: self.__unsafe_private_named.60,
-            location: self.__unsafe_private_named.61,
-            logo: self.__unsafe_private_named.62,
-            main_entity_of_page: self.__unsafe_private_named.63,
-            makes_offer: self.__unsafe_private_named.64,
-            member: self.__unsafe_private_named.65,
-            member_of: self.__unsafe_private_named.66,
-            members: self.__unsafe_private_named.67,
-            music_group_member: self.__unsafe_private_named.68,
-            naics: self.__unsafe_private_named.69,
-            name: self.__unsafe_private_named.70,
-            nonprofit_status: self.__unsafe_private_named.71,
-            number_of_employees: self.__unsafe_private_named.72,
-            ownership_funding_info: self.__unsafe_private_named.73,
-            owns: self.__unsafe_private_named.74,
-            parent_organization: self.__unsafe_private_named.75,
-            potential_action: self.__unsafe_private_named.76,
-            publishing_principles: self.__unsafe_private_named.77,
-            review: self.__unsafe_private_named.78,
-            reviews: self.__unsafe_private_named.79,
-            same_as: self.__unsafe_private_named.80,
-            seeks: self.__unsafe_private_named.81,
-            service_area: self.__unsafe_private_named.82,
-            skills: self.__unsafe_private_named.83,
-            slogan: self.__unsafe_private_named.84,
-            sponsor: self.__unsafe_private_named.85,
-            sub_organization: self.__unsafe_private_named.86,
-            subject_of: self.__unsafe_private_named.87,
-            tax_id: self.__unsafe_private_named.88,
-            telephone: self.__unsafe_private_named.89,
-            track: self.__unsafe_private_named.90,
-            tracks: self.__unsafe_private_named.91,
-            unnamed_sources_policy: self.__unsafe_private_named.92,
-            url: self.__unsafe_private_named.93,
-            vat_id: self.__unsafe_private_named.94,
+            accepted_payment_method: self._fields.0,
+            actionable_feedback_policy: self._fields.1,
+            additional_type: self._fields.2,
+            address: self._fields.3,
+            agent_interaction_statistic: self._fields.4,
+            aggregate_rating: self._fields.5,
+            album: self._fields.6,
+            albums: self._fields.7,
+            alternate_name: self._fields.8,
+            alumni: self._fields.9,
+            area_served: self._fields.10,
+            award: self._fields.11,
+            awards: self._fields.12,
+            brand: self._fields.13,
+            company_registration: self._fields.14,
+            contact_point: self._fields.15,
+            contact_points: self._fields.16,
+            corrections_policy: self._fields.17,
+            department: self._fields.18,
+            description: self._fields.19,
+            disambiguating_description: self._fields.20,
+            dissolution_date: self._fields.21,
+            diversity_policy: self._fields.22,
+            diversity_staffing_report: self._fields.23,
+            duns: self._fields.24,
+            email: self._fields.25,
+            employee: self._fields.26,
+            employees: self._fields.27,
+            ethics_policy: self._fields.28,
+            event: self._fields.29,
+            events: self._fields.30,
+            fax_number: self._fields.31,
+            founder: self._fields.32,
+            founders: self._fields.33,
+            founding_date: self._fields.34,
+            founding_location: self._fields.35,
+            funder: self._fields.36,
+            funding: self._fields.37,
+            genre: self._fields.38,
+            global_location_number: self._fields.39,
+            has_certification: self._fields.40,
+            has_credential: self._fields.41,
+            has_gs1_digital_link: self._fields.42,
+            has_member_program: self._fields.43,
+            has_merchant_return_policy: self._fields.44,
+            has_offer_catalog: self._fields.45,
+            has_pos: self._fields.46,
+            has_product_return_policy: self._fields.47,
+            has_shipping_service: self._fields.48,
+            identifier: self._fields.49,
+            image: self._fields.50,
+            interaction_statistic: self._fields.51,
+            isic_v4: self._fields.52,
+            iso6523_code: self._fields.53,
+            keywords: self._fields.54,
+            knows_about: self._fields.55,
+            knows_language: self._fields.56,
+            legal_address: self._fields.57,
+            legal_name: self._fields.58,
+            legal_representative: self._fields.59,
+            lei_code: self._fields.60,
+            location: self._fields.61,
+            logo: self._fields.62,
+            main_entity_of_page: self._fields.63,
+            makes_offer: self._fields.64,
+            member: self._fields.65,
+            member_of: self._fields.66,
+            members: self._fields.67,
+            music_group_member: self._fields.68,
+            naics: self._fields.69,
+            name: self._fields.70,
+            nonprofit_status: self._fields.71,
+            number_of_employees: self._fields.72,
+            ownership_funding_info: self._fields.73,
+            owns: self._fields.74,
+            parent_organization: self._fields.75,
+            potential_action: self._fields.76,
+            publishing_principles: self._fields.77,
+            review: self._fields.78,
+            reviews: self._fields.79,
+            same_as: self._fields.80,
+            seeks: self._fields.81,
+            service_area: self._fields.82,
+            skills: self._fields.83,
+            slogan: self._fields.84,
+            sponsor: self._fields.85,
+            sub_organization: self._fields.86,
+            subject_of: self._fields.87,
+            tax_id: self._fields.88,
+            telephone: self._fields.89,
+            track: self._fields.90,
+            tracks: self._fields.91,
+            unnamed_sources_policy: self._fields.92,
+            url: self._fields.93,
+            vat_id: self._fields.94,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/offer.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/offer.rs
index c92d1401..bb1d48ec 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/offer.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/offer.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -2829,8 +2832,8 @@ pub mod offer_state {
 
 /// Builder for constructing an instance of this type
 pub struct OfferBuilder<'a, S: offer_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<OfferAcceptedPaymentMethod<'a>>,
         Option<OfferAddOn<'a>>,
         Option<OfferAdditionalProperty<'a>>,
@@ -2898,7 +2901,7 @@ pub struct OfferBuilder<'a, S: offer_state::State> {
         Option<OfferValidThrough<'a>>,
         Option<OfferWarranty<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Offer<'a> {
@@ -2912,8 +2915,8 @@ impl<'a> OfferBuilder<'a, offer_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OfferBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -2981,7 +2984,7 @@ impl<'a> OfferBuilder<'a, offer_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2992,7 +2995,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferAcceptedPaymentMethod<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `acceptedPaymentMethod` field to an Option value (optional)
@@ -3000,7 +3003,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferAcceptedPaymentMethod<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -3008,12 +3011,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `addOn` field (optional)
     pub fn add_on(mut self, value: impl Into<Option<OfferAddOn<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `addOn` field to an Option value (optional)
     pub fn maybe_add_on(mut self, value: Option<OfferAddOn<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3024,7 +3027,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferAdditionalProperty<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `additionalProperty` field to an Option value (optional)
@@ -3032,7 +3035,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferAdditionalProperty<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -3043,7 +3046,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -3051,7 +3054,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -3062,7 +3065,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferAdvanceBookingRequirement<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `advanceBookingRequirement` field to an Option value (optional)
@@ -3070,7 +3073,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferAdvanceBookingRequirement<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -3081,7 +3084,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -3089,7 +3092,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -3100,7 +3103,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -3108,7 +3111,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -3116,12 +3119,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `areaServed` field (optional)
     pub fn area_served(mut self, value: impl Into<Option<OfferAreaServed<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `areaServed` field to an Option value (optional)
     pub fn maybe_area_served(mut self, value: Option<OfferAreaServed<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -3129,12 +3132,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `asin` field (optional)
     pub fn asin(mut self, value: impl Into<Option<OfferAsin<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `asin` field to an Option value (optional)
     pub fn maybe_asin(mut self, value: Option<OfferAsin<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -3145,12 +3148,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferAvailability<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `availability` field to an Option value (optional)
     pub fn maybe_availability(mut self, value: Option<OfferAvailability<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -3161,7 +3164,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferAvailabilityEnds<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `availabilityEnds` field to an Option value (optional)
@@ -3169,7 +3172,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferAvailabilityEnds<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -3180,7 +3183,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferAvailabilityStarts<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `availabilityStarts` field to an Option value (optional)
@@ -3188,7 +3191,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferAvailabilityStarts<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -3199,7 +3202,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferAvailableAtOrFrom<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `availableAtOrFrom` field to an Option value (optional)
@@ -3207,7 +3210,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferAvailableAtOrFrom<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -3218,7 +3221,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferAvailableDeliveryMethod<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `availableDeliveryMethod` field to an Option value (optional)
@@ -3226,7 +3229,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferAvailableDeliveryMethod<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -3237,7 +3240,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferBusinessFunction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `businessFunction` field to an Option value (optional)
@@ -3245,7 +3248,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferBusinessFunction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -3253,12 +3256,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<OfferCategory<'a>>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<OfferCategory<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -3269,7 +3272,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferCheckoutPageUrlTemplate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `checkoutPageURLTemplate` field to an Option value (optional)
@@ -3277,7 +3280,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferCheckoutPageUrlTemplate<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -3288,7 +3291,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferDeliveryLeadTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `deliveryLeadTime` field to an Option value (optional)
@@ -3296,7 +3299,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferDeliveryLeadTime<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -3307,12 +3310,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<OfferDescription<'a>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -3323,7 +3326,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -3331,7 +3334,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -3342,7 +3345,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferEligibleCustomerType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `eligibleCustomerType` field to an Option value (optional)
@@ -3350,7 +3353,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferEligibleCustomerType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -3361,7 +3364,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferEligibleDuration<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `eligibleDuration` field to an Option value (optional)
@@ -3369,7 +3372,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferEligibleDuration<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -3380,7 +3383,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferEligibleQuantity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `eligibleQuantity` field to an Option value (optional)
@@ -3388,7 +3391,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferEligibleQuantity<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -3399,7 +3402,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferEligibleRegion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `eligibleRegion` field to an Option value (optional)
@@ -3407,7 +3410,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferEligibleRegion<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -3418,7 +3421,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferEligibleTransactionVolume<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `eligibleTransactionVolume` field to an Option value (optional)
@@ -3426,7 +3429,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferEligibleTransactionVolume<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -3434,12 +3437,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `gtin` field (optional)
     pub fn gtin(mut self, value: impl Into<Option<OfferGtin<'a>>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `gtin` field to an Option value (optional)
     pub fn maybe_gtin(mut self, value: Option<OfferGtin<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -3447,12 +3450,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `gtin12` field (optional)
     pub fn gtin12(mut self, value: impl Into<Option<OfferGtin12<'a>>>) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `gtin12` field to an Option value (optional)
     pub fn maybe_gtin12(mut self, value: Option<OfferGtin12<'a>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -3460,12 +3463,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `gtin13` field (optional)
     pub fn gtin13(mut self, value: impl Into<Option<OfferGtin13<'a>>>) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `gtin13` field to an Option value (optional)
     pub fn maybe_gtin13(mut self, value: Option<OfferGtin13<'a>>) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -3473,12 +3476,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `gtin14` field (optional)
     pub fn gtin14(mut self, value: impl Into<Option<OfferGtin14<'a>>>) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `gtin14` field to an Option value (optional)
     pub fn maybe_gtin14(mut self, value: Option<OfferGtin14<'a>>) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -3486,12 +3489,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `gtin8` field (optional)
     pub fn gtin8(mut self, value: impl Into<Option<OfferGtin8<'a>>>) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `gtin8` field to an Option value (optional)
     pub fn maybe_gtin8(mut self, value: Option<OfferGtin8<'a>>) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -3502,7 +3505,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferHasAdultConsideration<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `hasAdultConsideration` field to an Option value (optional)
@@ -3510,7 +3513,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferHasAdultConsideration<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -3521,7 +3524,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferHasGs1DigitalLink<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `hasGS1DigitalLink` field to an Option value (optional)
@@ -3529,7 +3532,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferHasGs1DigitalLink<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -3540,7 +3543,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferHasMeasurement<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `hasMeasurement` field to an Option value (optional)
@@ -3548,7 +3551,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferHasMeasurement<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -3559,7 +3562,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferHasMerchantReturnPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `hasMerchantReturnPolicy` field to an Option value (optional)
@@ -3567,7 +3570,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferHasMerchantReturnPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -3575,12 +3578,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `identifier` field (optional)
     pub fn identifier(mut self, value: impl Into<Option<OfferIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<OfferIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -3588,12 +3591,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<OfferImage<'a>>>) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<OfferImage<'a>>) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -3604,7 +3607,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferIncludesObject<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `includesObject` field to an Option value (optional)
@@ -3612,7 +3615,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferIncludesObject<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -3623,7 +3626,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferIneligibleRegion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `ineligibleRegion` field to an Option value (optional)
@@ -3631,7 +3634,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferIneligibleRegion<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -3642,7 +3645,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferInventoryLevel<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `inventoryLevel` field to an Option value (optional)
@@ -3650,7 +3653,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferInventoryLevel<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -3661,7 +3664,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferIsFamilyFriendly<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `isFamilyFriendly` field to an Option value (optional)
@@ -3669,7 +3672,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferIsFamilyFriendly<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -3680,7 +3683,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferItemCondition<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `itemCondition` field to an Option value (optional)
@@ -3688,7 +3691,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferItemCondition<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -3699,12 +3702,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferItemOffered<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `itemOffered` field to an Option value (optional)
     pub fn maybe_item_offered(mut self, value: Option<OfferItemOffered<'a>>) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -3715,12 +3718,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferLeaseLength<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `leaseLength` field to an Option value (optional)
     pub fn maybe_lease_length(mut self, value: Option<OfferLeaseLength<'a>>) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -3731,7 +3734,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -3739,7 +3742,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -3747,12 +3750,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `mobileUrl` field (optional)
     pub fn mobile_url(mut self, value: impl Into<Option<OfferMobileUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `mobileUrl` field to an Option value (optional)
     pub fn maybe_mobile_url(mut self, value: Option<OfferMobileUrl<'a>>) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -3760,12 +3763,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `mpn` field (optional)
     pub fn mpn(mut self, value: impl Into<Option<OfferMpn<'a>>>) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `mpn` field to an Option value (optional)
     pub fn maybe_mpn(mut self, value: Option<OfferMpn<'a>>) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -3773,12 +3776,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<OfferName<'a>>>) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<OfferName<'a>>) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -3786,12 +3789,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `offeredBy` field (optional)
     pub fn offered_by(mut self, value: impl Into<Option<OfferOfferedBy<'a>>>) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `offeredBy` field to an Option value (optional)
     pub fn maybe_offered_by(mut self, value: Option<OfferOfferedBy<'a>>) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -3802,7 +3805,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferPotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -3810,7 +3813,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferPotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -3818,12 +3821,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `price` field (optional)
     pub fn price(mut self, value: impl Into<Option<OfferPrice<'a>>>) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `price` field to an Option value (optional)
     pub fn maybe_price(mut self, value: Option<OfferPrice<'a>>) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -3834,7 +3837,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferPriceCurrency<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `priceCurrency` field to an Option value (optional)
@@ -3842,7 +3845,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferPriceCurrency<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -3853,7 +3856,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferPriceSpecification<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `priceSpecification` field to an Option value (optional)
@@ -3861,7 +3864,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferPriceSpecification<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -3872,7 +3875,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferPriceValidUntil<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `priceValidUntil` field to an Option value (optional)
@@ -3880,7 +3883,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferPriceValidUntil<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -3888,12 +3891,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<OfferReview<'a>>>) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<OfferReview<'a>>) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -3901,12 +3904,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `reviews` field (optional)
     pub fn reviews(mut self, value: impl Into<Option<OfferReviews<'a>>>) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<OfferReviews<'a>>) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -3914,12 +3917,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<OfferSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<OfferSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -3927,12 +3930,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `seller` field (optional)
     pub fn seller(mut self, value: impl Into<Option<OfferSeller<'a>>>) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `seller` field to an Option value (optional)
     pub fn maybe_seller(mut self, value: Option<OfferSeller<'a>>) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -3943,12 +3946,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferSerialNumber<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `serialNumber` field to an Option value (optional)
     pub fn maybe_serial_number(mut self, value: Option<OfferSerialNumber<'a>>) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -3959,7 +3962,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferShippingDetails<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `shippingDetails` field to an Option value (optional)
@@ -3967,7 +3970,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferShippingDetails<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -3975,12 +3978,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `sku` field (optional)
     pub fn sku(mut self, value: impl Into<Option<OfferSku<'a>>>) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `sku` field to an Option value (optional)
     pub fn maybe_sku(mut self, value: Option<OfferSku<'a>>) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -3988,12 +3991,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `subjectOf` field (optional)
     pub fn subject_of(mut self, value: impl Into<Option<OfferSubjectOf<'a>>>) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<OfferSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -4001,12 +4004,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<OfferUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<OfferUrl<'a>>) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -4017,7 +4020,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferValidForMemberTier<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `validForMemberTier` field to an Option value (optional)
@@ -4025,7 +4028,7 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: Option<OfferValidForMemberTier<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -4033,12 +4036,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `validFrom` field (optional)
     pub fn valid_from(mut self, value: impl Into<Option<OfferValidFrom<'a>>>) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `validFrom` field to an Option value (optional)
     pub fn maybe_valid_from(mut self, value: Option<OfferValidFrom<'a>>) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -4049,12 +4052,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OfferValidThrough<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `validThrough` field to an Option value (optional)
     pub fn maybe_valid_through(mut self, value: Option<OfferValidThrough<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -4062,12 +4065,12 @@ impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
 impl<'a, S: offer_state::State> OfferBuilder<'a, S> {
     /// Set the `warranty` field (optional)
     pub fn warranty(mut self, value: impl Into<Option<OfferWarranty<'a>>>) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `warranty` field to an Option value (optional)
     pub fn maybe_warranty(mut self, value: Option<OfferWarranty<'a>>) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -4079,72 +4082,72 @@ where
     /// Build the final struct
     pub fn build(self) -> Offer<'a> {
         Offer {
-            accepted_payment_method: self.__unsafe_private_named.0,
-            add_on: self.__unsafe_private_named.1,
-            additional_property: self.__unsafe_private_named.2,
-            additional_type: self.__unsafe_private_named.3,
-            advance_booking_requirement: self.__unsafe_private_named.4,
-            aggregate_rating: self.__unsafe_private_named.5,
-            alternate_name: self.__unsafe_private_named.6,
-            area_served: self.__unsafe_private_named.7,
-            asin: self.__unsafe_private_named.8,
-            availability: self.__unsafe_private_named.9,
-            availability_ends: self.__unsafe_private_named.10,
-            availability_starts: self.__unsafe_private_named.11,
-            available_at_or_from: self.__unsafe_private_named.12,
-            available_delivery_method: self.__unsafe_private_named.13,
-            business_function: self.__unsafe_private_named.14,
-            category: self.__unsafe_private_named.15,
-            checkout_page_url_template: self.__unsafe_private_named.16,
-            delivery_lead_time: self.__unsafe_private_named.17,
-            description: self.__unsafe_private_named.18,
-            disambiguating_description: self.__unsafe_private_named.19,
-            eligible_customer_type: self.__unsafe_private_named.20,
-            eligible_duration: self.__unsafe_private_named.21,
-            eligible_quantity: self.__unsafe_private_named.22,
-            eligible_region: self.__unsafe_private_named.23,
-            eligible_transaction_volume: self.__unsafe_private_named.24,
-            gtin: self.__unsafe_private_named.25,
-            gtin12: self.__unsafe_private_named.26,
-            gtin13: self.__unsafe_private_named.27,
-            gtin14: self.__unsafe_private_named.28,
-            gtin8: self.__unsafe_private_named.29,
-            has_adult_consideration: self.__unsafe_private_named.30,
-            has_gs1_digital_link: self.__unsafe_private_named.31,
-            has_measurement: self.__unsafe_private_named.32,
-            has_merchant_return_policy: self.__unsafe_private_named.33,
-            identifier: self.__unsafe_private_named.34,
-            image: self.__unsafe_private_named.35,
-            includes_object: self.__unsafe_private_named.36,
-            ineligible_region: self.__unsafe_private_named.37,
-            inventory_level: self.__unsafe_private_named.38,
-            is_family_friendly: self.__unsafe_private_named.39,
-            item_condition: self.__unsafe_private_named.40,
-            item_offered: self.__unsafe_private_named.41,
-            lease_length: self.__unsafe_private_named.42,
-            main_entity_of_page: self.__unsafe_private_named.43,
-            mobile_url: self.__unsafe_private_named.44,
-            mpn: self.__unsafe_private_named.45,
-            name: self.__unsafe_private_named.46,
-            offered_by: self.__unsafe_private_named.47,
-            potential_action: self.__unsafe_private_named.48,
-            price: self.__unsafe_private_named.49,
-            price_currency: self.__unsafe_private_named.50,
-            price_specification: self.__unsafe_private_named.51,
-            price_valid_until: self.__unsafe_private_named.52,
-            review: self.__unsafe_private_named.53,
-            reviews: self.__unsafe_private_named.54,
-            same_as: self.__unsafe_private_named.55,
-            seller: self.__unsafe_private_named.56,
-            serial_number: self.__unsafe_private_named.57,
-            shipping_details: self.__unsafe_private_named.58,
-            sku: self.__unsafe_private_named.59,
-            subject_of: self.__unsafe_private_named.60,
-            url: self.__unsafe_private_named.61,
-            valid_for_member_tier: self.__unsafe_private_named.62,
-            valid_from: self.__unsafe_private_named.63,
-            valid_through: self.__unsafe_private_named.64,
-            warranty: self.__unsafe_private_named.65,
+            accepted_payment_method: self._fields.0,
+            add_on: self._fields.1,
+            additional_property: self._fields.2,
+            additional_type: self._fields.3,
+            advance_booking_requirement: self._fields.4,
+            aggregate_rating: self._fields.5,
+            alternate_name: self._fields.6,
+            area_served: self._fields.7,
+            asin: self._fields.8,
+            availability: self._fields.9,
+            availability_ends: self._fields.10,
+            availability_starts: self._fields.11,
+            available_at_or_from: self._fields.12,
+            available_delivery_method: self._fields.13,
+            business_function: self._fields.14,
+            category: self._fields.15,
+            checkout_page_url_template: self._fields.16,
+            delivery_lead_time: self._fields.17,
+            description: self._fields.18,
+            disambiguating_description: self._fields.19,
+            eligible_customer_type: self._fields.20,
+            eligible_duration: self._fields.21,
+            eligible_quantity: self._fields.22,
+            eligible_region: self._fields.23,
+            eligible_transaction_volume: self._fields.24,
+            gtin: self._fields.25,
+            gtin12: self._fields.26,
+            gtin13: self._fields.27,
+            gtin14: self._fields.28,
+            gtin8: self._fields.29,
+            has_adult_consideration: self._fields.30,
+            has_gs1_digital_link: self._fields.31,
+            has_measurement: self._fields.32,
+            has_merchant_return_policy: self._fields.33,
+            identifier: self._fields.34,
+            image: self._fields.35,
+            includes_object: self._fields.36,
+            ineligible_region: self._fields.37,
+            inventory_level: self._fields.38,
+            is_family_friendly: self._fields.39,
+            item_condition: self._fields.40,
+            item_offered: self._fields.41,
+            lease_length: self._fields.42,
+            main_entity_of_page: self._fields.43,
+            mobile_url: self._fields.44,
+            mpn: self._fields.45,
+            name: self._fields.46,
+            offered_by: self._fields.47,
+            potential_action: self._fields.48,
+            price: self._fields.49,
+            price_currency: self._fields.50,
+            price_specification: self._fields.51,
+            price_valid_until: self._fields.52,
+            review: self._fields.53,
+            reviews: self._fields.54,
+            same_as: self._fields.55,
+            seller: self._fields.56,
+            serial_number: self._fields.57,
+            shipping_details: self._fields.58,
+            sku: self._fields.59,
+            subject_of: self._fields.60,
+            url: self._fields.61,
+            valid_for_member_tier: self._fields.62,
+            valid_from: self._fields.63,
+            valid_through: self._fields.64,
+            warranty: self._fields.65,
             extra_data: Default::default(),
         }
     }
@@ -4154,72 +4157,72 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Offer<'a> {
         Offer {
-            accepted_payment_method: self.__unsafe_private_named.0,
-            add_on: self.__unsafe_private_named.1,
-            additional_property: self.__unsafe_private_named.2,
-            additional_type: self.__unsafe_private_named.3,
-            advance_booking_requirement: self.__unsafe_private_named.4,
-            aggregate_rating: self.__unsafe_private_named.5,
-            alternate_name: self.__unsafe_private_named.6,
-            area_served: self.__unsafe_private_named.7,
-            asin: self.__unsafe_private_named.8,
-            availability: self.__unsafe_private_named.9,
-            availability_ends: self.__unsafe_private_named.10,
-            availability_starts: self.__unsafe_private_named.11,
-            available_at_or_from: self.__unsafe_private_named.12,
-            available_delivery_method: self.__unsafe_private_named.13,
-            business_function: self.__unsafe_private_named.14,
-            category: self.__unsafe_private_named.15,
-            checkout_page_url_template: self.__unsafe_private_named.16,
-            delivery_lead_time: self.__unsafe_private_named.17,
-            description: self.__unsafe_private_named.18,
-            disambiguating_description: self.__unsafe_private_named.19,
-            eligible_customer_type: self.__unsafe_private_named.20,
-            eligible_duration: self.__unsafe_private_named.21,
-            eligible_quantity: self.__unsafe_private_named.22,
-            eligible_region: self.__unsafe_private_named.23,
-            eligible_transaction_volume: self.__unsafe_private_named.24,
-            gtin: self.__unsafe_private_named.25,
-            gtin12: self.__unsafe_private_named.26,
-            gtin13: self.__unsafe_private_named.27,
-            gtin14: self.__unsafe_private_named.28,
-            gtin8: self.__unsafe_private_named.29,
-            has_adult_consideration: self.__unsafe_private_named.30,
-            has_gs1_digital_link: self.__unsafe_private_named.31,
-            has_measurement: self.__unsafe_private_named.32,
-            has_merchant_return_policy: self.__unsafe_private_named.33,
-            identifier: self.__unsafe_private_named.34,
-            image: self.__unsafe_private_named.35,
-            includes_object: self.__unsafe_private_named.36,
-            ineligible_region: self.__unsafe_private_named.37,
-            inventory_level: self.__unsafe_private_named.38,
-            is_family_friendly: self.__unsafe_private_named.39,
-            item_condition: self.__unsafe_private_named.40,
-            item_offered: self.__unsafe_private_named.41,
-            lease_length: self.__unsafe_private_named.42,
-            main_entity_of_page: self.__unsafe_private_named.43,
-            mobile_url: self.__unsafe_private_named.44,
-            mpn: self.__unsafe_private_named.45,
-            name: self.__unsafe_private_named.46,
-            offered_by: self.__unsafe_private_named.47,
-            potential_action: self.__unsafe_private_named.48,
-            price: self.__unsafe_private_named.49,
-            price_currency: self.__unsafe_private_named.50,
-            price_specification: self.__unsafe_private_named.51,
-            price_valid_until: self.__unsafe_private_named.52,
-            review: self.__unsafe_private_named.53,
-            reviews: self.__unsafe_private_named.54,
-            same_as: self.__unsafe_private_named.55,
-            seller: self.__unsafe_private_named.56,
-            serial_number: self.__unsafe_private_named.57,
-            shipping_details: self.__unsafe_private_named.58,
-            sku: self.__unsafe_private_named.59,
-            subject_of: self.__unsafe_private_named.60,
-            url: self.__unsafe_private_named.61,
-            valid_for_member_tier: self.__unsafe_private_named.62,
-            valid_from: self.__unsafe_private_named.63,
-            valid_through: self.__unsafe_private_named.64,
-            warranty: self.__unsafe_private_named.65,
+            accepted_payment_method: self._fields.0,
+            add_on: self._fields.1,
+            additional_property: self._fields.2,
+            additional_type: self._fields.3,
+            advance_booking_requirement: self._fields.4,
+            aggregate_rating: self._fields.5,
+            alternate_name: self._fields.6,
+            area_served: self._fields.7,
+            asin: self._fields.8,
+            availability: self._fields.9,
+            availability_ends: self._fields.10,
+            availability_starts: self._fields.11,
+            available_at_or_from: self._fields.12,
+            available_delivery_method: self._fields.13,
+            business_function: self._fields.14,
+            category: self._fields.15,
+            checkout_page_url_template: self._fields.16,
+            delivery_lead_time: self._fields.17,
+            description: self._fields.18,
+            disambiguating_description: self._fields.19,
+            eligible_customer_type: self._fields.20,
+            eligible_duration: self._fields.21,
+            eligible_quantity: self._fields.22,
+            eligible_region: self._fields.23,
+            eligible_transaction_volume: self._fields.24,
+            gtin: self._fields.25,
+            gtin12: self._fields.26,
+            gtin13: self._fields.27,
+            gtin14: self._fields.28,
+            gtin8: self._fields.29,
+            has_adult_consideration: self._fields.30,
+            has_gs1_digital_link: self._fields.31,
+            has_measurement: self._fields.32,
+            has_merchant_return_policy: self._fields.33,
+            identifier: self._fields.34,
+            image: self._fields.35,
+            includes_object: self._fields.36,
+            ineligible_region: self._fields.37,
+            inventory_level: self._fields.38,
+            is_family_friendly: self._fields.39,
+            item_condition: self._fields.40,
+            item_offered: self._fields.41,
+            lease_length: self._fields.42,
+            main_entity_of_page: self._fields.43,
+            mobile_url: self._fields.44,
+            mpn: self._fields.45,
+            name: self._fields.46,
+            offered_by: self._fields.47,
+            potential_action: self._fields.48,
+            price: self._fields.49,
+            price_currency: self._fields.50,
+            price_specification: self._fields.51,
+            price_valid_until: self._fields.52,
+            review: self._fields.53,
+            reviews: self._fields.54,
+            same_as: self._fields.55,
+            seller: self._fields.56,
+            serial_number: self._fields.57,
+            shipping_details: self._fields.58,
+            sku: self._fields.59,
+            subject_of: self._fields.60,
+            url: self._fields.61,
+            valid_for_member_tier: self._fields.62,
+            valid_from: self._fields.63,
+            valid_through: self._fields.64,
+            warranty: self._fields.65,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/organization.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/organization.rs
index 862b6854..a1980c7a 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/organization.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/organization.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -3869,8 +3872,8 @@ pub mod organization_state {
 
 /// Builder for constructing an instance of this type
 pub struct OrganizationBuilder<'a, S: organization_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<OrganizationAcceptedPaymentMethod<'a>>,
         Option<OrganizationActionableFeedbackPolicy<'a>>,
         Option<OrganizationAdditionalType<'a>>,
@@ -3961,7 +3964,7 @@ pub struct OrganizationBuilder<'a, S: organization_state::State> {
         Option<OrganizationUrl<'a>>,
         Option<OrganizationVatId<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Organization<'a> {
@@ -3975,8 +3978,8 @@ impl<'a> OrganizationBuilder<'a, organization_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         OrganizationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -4067,7 +4070,7 @@ impl<'a> OrganizationBuilder<'a, organization_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4078,7 +4081,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationAcceptedPaymentMethod<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `acceptedPaymentMethod` field to an Option value (optional)
@@ -4086,7 +4089,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationAcceptedPaymentMethod<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -4097,7 +4100,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationActionableFeedbackPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `actionableFeedbackPolicy` field to an Option value (optional)
@@ -4105,7 +4108,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationActionableFeedbackPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -4116,7 +4119,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -4124,7 +4127,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -4132,12 +4135,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `address` field (optional)
     pub fn address(mut self, value: impl Into<Option<OrganizationAddress<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `address` field to an Option value (optional)
     pub fn maybe_address(mut self, value: Option<OrganizationAddress<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -4148,7 +4151,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationAgentInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `agentInteractionStatistic` field to an Option value (optional)
@@ -4156,7 +4159,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationAgentInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -4167,7 +4170,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -4175,7 +4178,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -4186,7 +4189,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -4194,7 +4197,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -4202,12 +4205,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `alumni` field (optional)
     pub fn alumni(mut self, value: impl Into<Option<OrganizationAlumni<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `alumni` field to an Option value (optional)
     pub fn maybe_alumni(mut self, value: Option<OrganizationAlumni<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -4218,7 +4221,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationAreaServed<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `areaServed` field to an Option value (optional)
@@ -4226,7 +4229,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationAreaServed<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -4234,12 +4237,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<OrganizationAward<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<OrganizationAward<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -4247,12 +4250,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<OrganizationAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<OrganizationAwards<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -4260,12 +4263,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `brand` field (optional)
     pub fn brand(mut self, value: impl Into<Option<OrganizationBrand<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `brand` field to an Option value (optional)
     pub fn maybe_brand(mut self, value: Option<OrganizationBrand<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -4276,7 +4279,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationCompanyRegistration<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `companyRegistration` field to an Option value (optional)
@@ -4284,7 +4287,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationCompanyRegistration<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -4295,7 +4298,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationContactPoint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `contactPoint` field to an Option value (optional)
@@ -4303,7 +4306,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationContactPoint<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -4314,7 +4317,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationContactPoints<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `contactPoints` field to an Option value (optional)
@@ -4322,7 +4325,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationContactPoints<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -4333,7 +4336,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationCorrectionsPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `correctionsPolicy` field to an Option value (optional)
@@ -4341,7 +4344,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationCorrectionsPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -4352,7 +4355,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationDepartment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `department` field to an Option value (optional)
@@ -4360,7 +4363,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationDepartment<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -4371,7 +4374,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
@@ -4379,7 +4382,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -4390,7 +4393,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -4398,7 +4401,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -4409,7 +4412,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationDissolutionDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `dissolutionDate` field to an Option value (optional)
@@ -4417,7 +4420,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationDissolutionDate<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -4428,7 +4431,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationDiversityPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `diversityPolicy` field to an Option value (optional)
@@ -4436,7 +4439,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationDiversityPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -4447,7 +4450,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationDiversityStaffingReport<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `diversityStaffingReport` field to an Option value (optional)
@@ -4455,7 +4458,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationDiversityStaffingReport<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -4463,12 +4466,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `duns` field (optional)
     pub fn duns(mut self, value: impl Into<Option<OrganizationDuns<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `duns` field to an Option value (optional)
     pub fn maybe_duns(mut self, value: Option<OrganizationDuns<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -4476,12 +4479,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `email` field (optional)
     pub fn email(mut self, value: impl Into<Option<OrganizationEmail<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `email` field to an Option value (optional)
     pub fn maybe_email(mut self, value: Option<OrganizationEmail<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -4492,12 +4495,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationEmployee<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `employee` field to an Option value (optional)
     pub fn maybe_employee(mut self, value: Option<OrganizationEmployee<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -4508,12 +4511,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationEmployees<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `employees` field to an Option value (optional)
     pub fn maybe_employees(mut self, value: Option<OrganizationEmployees<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -4524,7 +4527,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationEthicsPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `ethicsPolicy` field to an Option value (optional)
@@ -4532,7 +4535,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationEthicsPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -4540,12 +4543,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `event` field (optional)
     pub fn event(mut self, value: impl Into<Option<OrganizationEvent<'a>>>) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `event` field to an Option value (optional)
     pub fn maybe_event(mut self, value: Option<OrganizationEvent<'a>>) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -4553,12 +4556,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `events` field (optional)
     pub fn events(mut self, value: impl Into<Option<OrganizationEvents<'a>>>) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `events` field to an Option value (optional)
     pub fn maybe_events(mut self, value: Option<OrganizationEvents<'a>>) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -4569,12 +4572,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationFaxNumber<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `faxNumber` field to an Option value (optional)
     pub fn maybe_fax_number(mut self, value: Option<OrganizationFaxNumber<'a>>) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -4582,12 +4585,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `founder` field (optional)
     pub fn founder(mut self, value: impl Into<Option<OrganizationFounder<'a>>>) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `founder` field to an Option value (optional)
     pub fn maybe_founder(mut self, value: Option<OrganizationFounder<'a>>) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -4598,12 +4601,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationFounders<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `founders` field to an Option value (optional)
     pub fn maybe_founders(mut self, value: Option<OrganizationFounders<'a>>) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -4614,7 +4617,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationFoundingDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `foundingDate` field to an Option value (optional)
@@ -4622,7 +4625,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationFoundingDate<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -4633,7 +4636,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationFoundingLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `foundingLocation` field to an Option value (optional)
@@ -4641,7 +4644,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationFoundingLocation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -4649,12 +4652,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<OrganizationFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<OrganizationFunder<'a>>) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -4662,12 +4665,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<OrganizationFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<OrganizationFunding<'a>>) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -4678,7 +4681,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationGlobalLocationNumber<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `globalLocationNumber` field to an Option value (optional)
@@ -4686,7 +4689,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationGlobalLocationNumber<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -4697,7 +4700,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationHasCertification<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `hasCertification` field to an Option value (optional)
@@ -4705,7 +4708,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationHasCertification<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -4716,7 +4719,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationHasCredential<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `hasCredential` field to an Option value (optional)
@@ -4724,7 +4727,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationHasCredential<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -4735,7 +4738,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationHasGs1DigitalLink<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `hasGS1DigitalLink` field to an Option value (optional)
@@ -4743,7 +4746,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationHasGs1DigitalLink<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -4754,7 +4757,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationHasMemberProgram<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `hasMemberProgram` field to an Option value (optional)
@@ -4762,7 +4765,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationHasMemberProgram<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -4773,7 +4776,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationHasMerchantReturnPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `hasMerchantReturnPolicy` field to an Option value (optional)
@@ -4781,7 +4784,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationHasMerchantReturnPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -4792,7 +4795,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationHasOfferCatalog<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `hasOfferCatalog` field to an Option value (optional)
@@ -4800,7 +4803,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationHasOfferCatalog<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -4808,12 +4811,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `hasPOS` field (optional)
     pub fn has_pos(mut self, value: impl Into<Option<OrganizationHasPos<'a>>>) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `hasPOS` field to an Option value (optional)
     pub fn maybe_has_pos(mut self, value: Option<OrganizationHasPos<'a>>) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -4824,7 +4827,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationHasProductReturnPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `hasProductReturnPolicy` field to an Option value (optional)
@@ -4832,7 +4835,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationHasProductReturnPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -4843,7 +4846,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationHasShippingService<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `hasShippingService` field to an Option value (optional)
@@ -4851,7 +4854,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationHasShippingService<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -4862,7 +4865,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationIdentifier<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
@@ -4870,7 +4873,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationIdentifier<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -4878,12 +4881,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<OrganizationImage<'a>>>) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<OrganizationImage<'a>>) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -4894,7 +4897,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -4902,7 +4905,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -4910,12 +4913,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `isicV4` field (optional)
     pub fn isic_v4(mut self, value: impl Into<Option<OrganizationIsicV4<'a>>>) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `isicV4` field to an Option value (optional)
     pub fn maybe_isic_v4(mut self, value: Option<OrganizationIsicV4<'a>>) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -4926,7 +4929,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationIso6523Code<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `iso6523Code` field to an Option value (optional)
@@ -4934,7 +4937,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationIso6523Code<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -4945,12 +4948,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationKeywords<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<OrganizationKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -4961,7 +4964,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationKnowsAbout<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `knowsAbout` field to an Option value (optional)
@@ -4969,7 +4972,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationKnowsAbout<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -4980,7 +4983,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationKnowsLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `knowsLanguage` field to an Option value (optional)
@@ -4988,7 +4991,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationKnowsLanguage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -4999,7 +5002,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationLegalAddress<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `legalAddress` field to an Option value (optional)
@@ -5007,7 +5010,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationLegalAddress<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -5018,12 +5021,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationLegalName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `legalName` field to an Option value (optional)
     pub fn maybe_legal_name(mut self, value: Option<OrganizationLegalName<'a>>) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -5034,7 +5037,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationLegalRepresentative<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `legalRepresentative` field to an Option value (optional)
@@ -5042,7 +5045,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationLegalRepresentative<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -5053,12 +5056,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationLeiCode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `leiCode` field to an Option value (optional)
     pub fn maybe_lei_code(mut self, value: Option<OrganizationLeiCode<'a>>) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -5069,12 +5072,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<OrganizationLocation<'a>>) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -5082,12 +5085,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `logo` field (optional)
     pub fn logo(mut self, value: impl Into<Option<OrganizationLogo<'a>>>) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `logo` field to an Option value (optional)
     pub fn maybe_logo(mut self, value: Option<OrganizationLogo<'a>>) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -5098,7 +5101,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -5106,7 +5109,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -5117,7 +5120,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationMakesOffer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `makesOffer` field to an Option value (optional)
@@ -5125,7 +5128,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationMakesOffer<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -5133,12 +5136,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `member` field (optional)
     pub fn member(mut self, value: impl Into<Option<OrganizationMember<'a>>>) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `member` field to an Option value (optional)
     pub fn maybe_member(mut self, value: Option<OrganizationMember<'a>>) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -5149,12 +5152,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationMemberOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `memberOf` field to an Option value (optional)
     pub fn maybe_member_of(mut self, value: Option<OrganizationMemberOf<'a>>) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -5162,12 +5165,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `members` field (optional)
     pub fn members(mut self, value: impl Into<Option<OrganizationMembers<'a>>>) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `members` field to an Option value (optional)
     pub fn maybe_members(mut self, value: Option<OrganizationMembers<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -5175,12 +5178,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `naics` field (optional)
     pub fn naics(mut self, value: impl Into<Option<OrganizationNaics<'a>>>) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `naics` field to an Option value (optional)
     pub fn maybe_naics(mut self, value: Option<OrganizationNaics<'a>>) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -5188,12 +5191,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<OrganizationName<'a>>>) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<OrganizationName<'a>>) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -5204,7 +5207,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationNonprofitStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `nonprofitStatus` field to an Option value (optional)
@@ -5212,7 +5215,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationNonprofitStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -5223,7 +5226,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationNumberOfEmployees<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `numberOfEmployees` field to an Option value (optional)
@@ -5231,7 +5234,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationNumberOfEmployees<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -5242,7 +5245,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationOwnershipFundingInfo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `ownershipFundingInfo` field to an Option value (optional)
@@ -5250,7 +5253,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationOwnershipFundingInfo<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -5258,12 +5261,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `owns` field (optional)
     pub fn owns(mut self, value: impl Into<Option<OrganizationOwns<'a>>>) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `owns` field to an Option value (optional)
     pub fn maybe_owns(mut self, value: Option<OrganizationOwns<'a>>) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -5274,7 +5277,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationParentOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `parentOrganization` field to an Option value (optional)
@@ -5282,7 +5285,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationParentOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -5293,7 +5296,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationPotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -5301,7 +5304,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationPotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -5312,7 +5315,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationPublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -5320,7 +5323,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationPublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -5328,12 +5331,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<OrganizationReview<'a>>>) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<OrganizationReview<'a>>) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -5341,12 +5344,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `reviews` field (optional)
     pub fn reviews(mut self, value: impl Into<Option<OrganizationReviews<'a>>>) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<OrganizationReviews<'a>>) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -5354,12 +5357,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<OrganizationSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<OrganizationSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -5367,12 +5370,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `seeks` field (optional)
     pub fn seeks(mut self, value: impl Into<Option<OrganizationSeeks<'a>>>) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `seeks` field to an Option value (optional)
     pub fn maybe_seeks(mut self, value: Option<OrganizationSeeks<'a>>) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -5383,7 +5386,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationServiceArea<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `serviceArea` field to an Option value (optional)
@@ -5391,7 +5394,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationServiceArea<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -5399,12 +5402,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `skills` field (optional)
     pub fn skills(mut self, value: impl Into<Option<OrganizationSkills<'a>>>) -> Self {
-        self.__unsafe_private_named.79 = value.into();
+        self._fields.79 = value.into();
         self
     }
     /// Set the `skills` field to an Option value (optional)
     pub fn maybe_skills(mut self, value: Option<OrganizationSkills<'a>>) -> Self {
-        self.__unsafe_private_named.79 = value;
+        self._fields.79 = value;
         self
     }
 }
@@ -5412,12 +5415,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `slogan` field (optional)
     pub fn slogan(mut self, value: impl Into<Option<OrganizationSlogan<'a>>>) -> Self {
-        self.__unsafe_private_named.80 = value.into();
+        self._fields.80 = value.into();
         self
     }
     /// Set the `slogan` field to an Option value (optional)
     pub fn maybe_slogan(mut self, value: Option<OrganizationSlogan<'a>>) -> Self {
-        self.__unsafe_private_named.80 = value;
+        self._fields.80 = value;
         self
     }
 }
@@ -5425,12 +5428,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `sponsor` field (optional)
     pub fn sponsor(mut self, value: impl Into<Option<OrganizationSponsor<'a>>>) -> Self {
-        self.__unsafe_private_named.81 = value.into();
+        self._fields.81 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<OrganizationSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.81 = value;
+        self._fields.81 = value;
         self
     }
 }
@@ -5441,7 +5444,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationSubOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value.into();
+        self._fields.82 = value.into();
         self
     }
     /// Set the `subOrganization` field to an Option value (optional)
@@ -5449,7 +5452,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationSubOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value;
+        self._fields.82 = value;
         self
     }
 }
@@ -5460,12 +5463,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationSubjectOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.83 = value.into();
+        self._fields.83 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<OrganizationSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.83 = value;
+        self._fields.83 = value;
         self
     }
 }
@@ -5473,12 +5476,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `taxID` field (optional)
     pub fn tax_id(mut self, value: impl Into<Option<OrganizationTaxId<'a>>>) -> Self {
-        self.__unsafe_private_named.84 = value.into();
+        self._fields.84 = value.into();
         self
     }
     /// Set the `taxID` field to an Option value (optional)
     pub fn maybe_tax_id(mut self, value: Option<OrganizationTaxId<'a>>) -> Self {
-        self.__unsafe_private_named.84 = value;
+        self._fields.84 = value;
         self
     }
 }
@@ -5489,12 +5492,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationTelephone<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.85 = value.into();
+        self._fields.85 = value.into();
         self
     }
     /// Set the `telephone` field to an Option value (optional)
     pub fn maybe_telephone(mut self, value: Option<OrganizationTelephone<'a>>) -> Self {
-        self.__unsafe_private_named.85 = value;
+        self._fields.85 = value;
         self
     }
 }
@@ -5505,7 +5508,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: impl Into<Option<OrganizationUnnamedSourcesPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.86 = value.into();
+        self._fields.86 = value.into();
         self
     }
     /// Set the `unnamedSourcesPolicy` field to an Option value (optional)
@@ -5513,7 +5516,7 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
         mut self,
         value: Option<OrganizationUnnamedSourcesPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.86 = value;
+        self._fields.86 = value;
         self
     }
 }
@@ -5521,12 +5524,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<OrganizationUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.87 = value.into();
+        self._fields.87 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<OrganizationUrl<'a>>) -> Self {
-        self.__unsafe_private_named.87 = value;
+        self._fields.87 = value;
         self
     }
 }
@@ -5534,12 +5537,12 @@ impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
 impl<'a, S: organization_state::State> OrganizationBuilder<'a, S> {
     /// Set the `vatID` field (optional)
     pub fn vat_id(mut self, value: impl Into<Option<OrganizationVatId<'a>>>) -> Self {
-        self.__unsafe_private_named.88 = value.into();
+        self._fields.88 = value.into();
         self
     }
     /// Set the `vatID` field to an Option value (optional)
     pub fn maybe_vat_id(mut self, value: Option<OrganizationVatId<'a>>) -> Self {
-        self.__unsafe_private_named.88 = value;
+        self._fields.88 = value;
         self
     }
 }
@@ -5551,95 +5554,95 @@ where
     /// Build the final struct
     pub fn build(self) -> Organization<'a> {
         Organization {
-            accepted_payment_method: self.__unsafe_private_named.0,
-            actionable_feedback_policy: self.__unsafe_private_named.1,
-            additional_type: self.__unsafe_private_named.2,
-            address: self.__unsafe_private_named.3,
-            agent_interaction_statistic: self.__unsafe_private_named.4,
-            aggregate_rating: self.__unsafe_private_named.5,
-            alternate_name: self.__unsafe_private_named.6,
-            alumni: self.__unsafe_private_named.7,
-            area_served: self.__unsafe_private_named.8,
-            award: self.__unsafe_private_named.9,
-            awards: self.__unsafe_private_named.10,
-            brand: self.__unsafe_private_named.11,
-            company_registration: self.__unsafe_private_named.12,
-            contact_point: self.__unsafe_private_named.13,
-            contact_points: self.__unsafe_private_named.14,
-            corrections_policy: self.__unsafe_private_named.15,
-            department: self.__unsafe_private_named.16,
-            description: self.__unsafe_private_named.17,
-            disambiguating_description: self.__unsafe_private_named.18,
-            dissolution_date: self.__unsafe_private_named.19,
-            diversity_policy: self.__unsafe_private_named.20,
-            diversity_staffing_report: self.__unsafe_private_named.21,
-            duns: self.__unsafe_private_named.22,
-            email: self.__unsafe_private_named.23,
-            employee: self.__unsafe_private_named.24,
-            employees: self.__unsafe_private_named.25,
-            ethics_policy: self.__unsafe_private_named.26,
-            event: self.__unsafe_private_named.27,
-            events: self.__unsafe_private_named.28,
-            fax_number: self.__unsafe_private_named.29,
-            founder: self.__unsafe_private_named.30,
-            founders: self.__unsafe_private_named.31,
-            founding_date: self.__unsafe_private_named.32,
-            founding_location: self.__unsafe_private_named.33,
-            funder: self.__unsafe_private_named.34,
-            funding: self.__unsafe_private_named.35,
-            global_location_number: self.__unsafe_private_named.36,
-            has_certification: self.__unsafe_private_named.37,
-            has_credential: self.__unsafe_private_named.38,
-            has_gs1_digital_link: self.__unsafe_private_named.39,
-            has_member_program: self.__unsafe_private_named.40,
-            has_merchant_return_policy: self.__unsafe_private_named.41,
-            has_offer_catalog: self.__unsafe_private_named.42,
-            has_pos: self.__unsafe_private_named.43,
-            has_product_return_policy: self.__unsafe_private_named.44,
-            has_shipping_service: self.__unsafe_private_named.45,
-            identifier: self.__unsafe_private_named.46,
-            image: self.__unsafe_private_named.47,
-            interaction_statistic: self.__unsafe_private_named.48,
-            isic_v4: self.__unsafe_private_named.49,
-            iso6523_code: self.__unsafe_private_named.50,
-            keywords: self.__unsafe_private_named.51,
-            knows_about: self.__unsafe_private_named.52,
-            knows_language: self.__unsafe_private_named.53,
-            legal_address: self.__unsafe_private_named.54,
-            legal_name: self.__unsafe_private_named.55,
-            legal_representative: self.__unsafe_private_named.56,
-            lei_code: self.__unsafe_private_named.57,
-            location: self.__unsafe_private_named.58,
-            logo: self.__unsafe_private_named.59,
-            main_entity_of_page: self.__unsafe_private_named.60,
-            makes_offer: self.__unsafe_private_named.61,
-            member: self.__unsafe_private_named.62,
-            member_of: self.__unsafe_private_named.63,
-            members: self.__unsafe_private_named.64,
-            naics: self.__unsafe_private_named.65,
-            name: self.__unsafe_private_named.66,
-            nonprofit_status: self.__unsafe_private_named.67,
-            number_of_employees: self.__unsafe_private_named.68,
-            ownership_funding_info: self.__unsafe_private_named.69,
-            owns: self.__unsafe_private_named.70,
-            parent_organization: self.__unsafe_private_named.71,
-            potential_action: self.__unsafe_private_named.72,
-            publishing_principles: self.__unsafe_private_named.73,
-            review: self.__unsafe_private_named.74,
-            reviews: self.__unsafe_private_named.75,
-            same_as: self.__unsafe_private_named.76,
-            seeks: self.__unsafe_private_named.77,
-            service_area: self.__unsafe_private_named.78,
-            skills: self.__unsafe_private_named.79,
-            slogan: self.__unsafe_private_named.80,
-            sponsor: self.__unsafe_private_named.81,
-            sub_organization: self.__unsafe_private_named.82,
-            subject_of: self.__unsafe_private_named.83,
-            tax_id: self.__unsafe_private_named.84,
-            telephone: self.__unsafe_private_named.85,
-            unnamed_sources_policy: self.__unsafe_private_named.86,
-            url: self.__unsafe_private_named.87,
-            vat_id: self.__unsafe_private_named.88,
+            accepted_payment_method: self._fields.0,
+            actionable_feedback_policy: self._fields.1,
+            additional_type: self._fields.2,
+            address: self._fields.3,
+            agent_interaction_statistic: self._fields.4,
+            aggregate_rating: self._fields.5,
+            alternate_name: self._fields.6,
+            alumni: self._fields.7,
+            area_served: self._fields.8,
+            award: self._fields.9,
+            awards: self._fields.10,
+            brand: self._fields.11,
+            company_registration: self._fields.12,
+            contact_point: self._fields.13,
+            contact_points: self._fields.14,
+            corrections_policy: self._fields.15,
+            department: self._fields.16,
+            description: self._fields.17,
+            disambiguating_description: self._fields.18,
+            dissolution_date: self._fields.19,
+            diversity_policy: self._fields.20,
+            diversity_staffing_report: self._fields.21,
+            duns: self._fields.22,
+            email: self._fields.23,
+            employee: self._fields.24,
+            employees: self._fields.25,
+            ethics_policy: self._fields.26,
+            event: self._fields.27,
+            events: self._fields.28,
+            fax_number: self._fields.29,
+            founder: self._fields.30,
+            founders: self._fields.31,
+            founding_date: self._fields.32,
+            founding_location: self._fields.33,
+            funder: self._fields.34,
+            funding: self._fields.35,
+            global_location_number: self._fields.36,
+            has_certification: self._fields.37,
+            has_credential: self._fields.38,
+            has_gs1_digital_link: self._fields.39,
+            has_member_program: self._fields.40,
+            has_merchant_return_policy: self._fields.41,
+            has_offer_catalog: self._fields.42,
+            has_pos: self._fields.43,
+            has_product_return_policy: self._fields.44,
+            has_shipping_service: self._fields.45,
+            identifier: self._fields.46,
+            image: self._fields.47,
+            interaction_statistic: self._fields.48,
+            isic_v4: self._fields.49,
+            iso6523_code: self._fields.50,
+            keywords: self._fields.51,
+            knows_about: self._fields.52,
+            knows_language: self._fields.53,
+            legal_address: self._fields.54,
+            legal_name: self._fields.55,
+            legal_representative: self._fields.56,
+            lei_code: self._fields.57,
+            location: self._fields.58,
+            logo: self._fields.59,
+            main_entity_of_page: self._fields.60,
+            makes_offer: self._fields.61,
+            member: self._fields.62,
+            member_of: self._fields.63,
+            members: self._fields.64,
+            naics: self._fields.65,
+            name: self._fields.66,
+            nonprofit_status: self._fields.67,
+            number_of_employees: self._fields.68,
+            ownership_funding_info: self._fields.69,
+            owns: self._fields.70,
+            parent_organization: self._fields.71,
+            potential_action: self._fields.72,
+            publishing_principles: self._fields.73,
+            review: self._fields.74,
+            reviews: self._fields.75,
+            same_as: self._fields.76,
+            seeks: self._fields.77,
+            service_area: self._fields.78,
+            skills: self._fields.79,
+            slogan: self._fields.80,
+            sponsor: self._fields.81,
+            sub_organization: self._fields.82,
+            subject_of: self._fields.83,
+            tax_id: self._fields.84,
+            telephone: self._fields.85,
+            unnamed_sources_policy: self._fields.86,
+            url: self._fields.87,
+            vat_id: self._fields.88,
             extra_data: Default::default(),
         }
     }
@@ -5649,95 +5652,95 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Organization<'a> {
         Organization {
-            accepted_payment_method: self.__unsafe_private_named.0,
-            actionable_feedback_policy: self.__unsafe_private_named.1,
-            additional_type: self.__unsafe_private_named.2,
-            address: self.__unsafe_private_named.3,
-            agent_interaction_statistic: self.__unsafe_private_named.4,
-            aggregate_rating: self.__unsafe_private_named.5,
-            alternate_name: self.__unsafe_private_named.6,
-            alumni: self.__unsafe_private_named.7,
-            area_served: self.__unsafe_private_named.8,
-            award: self.__unsafe_private_named.9,
-            awards: self.__unsafe_private_named.10,
-            brand: self.__unsafe_private_named.11,
-            company_registration: self.__unsafe_private_named.12,
-            contact_point: self.__unsafe_private_named.13,
-            contact_points: self.__unsafe_private_named.14,
-            corrections_policy: self.__unsafe_private_named.15,
-            department: self.__unsafe_private_named.16,
-            description: self.__unsafe_private_named.17,
-            disambiguating_description: self.__unsafe_private_named.18,
-            dissolution_date: self.__unsafe_private_named.19,
-            diversity_policy: self.__unsafe_private_named.20,
-            diversity_staffing_report: self.__unsafe_private_named.21,
-            duns: self.__unsafe_private_named.22,
-            email: self.__unsafe_private_named.23,
-            employee: self.__unsafe_private_named.24,
-            employees: self.__unsafe_private_named.25,
-            ethics_policy: self.__unsafe_private_named.26,
-            event: self.__unsafe_private_named.27,
-            events: self.__unsafe_private_named.28,
-            fax_number: self.__unsafe_private_named.29,
-            founder: self.__unsafe_private_named.30,
-            founders: self.__unsafe_private_named.31,
-            founding_date: self.__unsafe_private_named.32,
-            founding_location: self.__unsafe_private_named.33,
-            funder: self.__unsafe_private_named.34,
-            funding: self.__unsafe_private_named.35,
-            global_location_number: self.__unsafe_private_named.36,
-            has_certification: self.__unsafe_private_named.37,
-            has_credential: self.__unsafe_private_named.38,
-            has_gs1_digital_link: self.__unsafe_private_named.39,
-            has_member_program: self.__unsafe_private_named.40,
-            has_merchant_return_policy: self.__unsafe_private_named.41,
-            has_offer_catalog: self.__unsafe_private_named.42,
-            has_pos: self.__unsafe_private_named.43,
-            has_product_return_policy: self.__unsafe_private_named.44,
-            has_shipping_service: self.__unsafe_private_named.45,
-            identifier: self.__unsafe_private_named.46,
-            image: self.__unsafe_private_named.47,
-            interaction_statistic: self.__unsafe_private_named.48,
-            isic_v4: self.__unsafe_private_named.49,
-            iso6523_code: self.__unsafe_private_named.50,
-            keywords: self.__unsafe_private_named.51,
-            knows_about: self.__unsafe_private_named.52,
-            knows_language: self.__unsafe_private_named.53,
-            legal_address: self.__unsafe_private_named.54,
-            legal_name: self.__unsafe_private_named.55,
-            legal_representative: self.__unsafe_private_named.56,
-            lei_code: self.__unsafe_private_named.57,
-            location: self.__unsafe_private_named.58,
-            logo: self.__unsafe_private_named.59,
-            main_entity_of_page: self.__unsafe_private_named.60,
-            makes_offer: self.__unsafe_private_named.61,
-            member: self.__unsafe_private_named.62,
-            member_of: self.__unsafe_private_named.63,
-            members: self.__unsafe_private_named.64,
-            naics: self.__unsafe_private_named.65,
-            name: self.__unsafe_private_named.66,
-            nonprofit_status: self.__unsafe_private_named.67,
-            number_of_employees: self.__unsafe_private_named.68,
-            ownership_funding_info: self.__unsafe_private_named.69,
-            owns: self.__unsafe_private_named.70,
-            parent_organization: self.__unsafe_private_named.71,
-            potential_action: self.__unsafe_private_named.72,
-            publishing_principles: self.__unsafe_private_named.73,
-            review: self.__unsafe_private_named.74,
-            reviews: self.__unsafe_private_named.75,
-            same_as: self.__unsafe_private_named.76,
-            seeks: self.__unsafe_private_named.77,
-            service_area: self.__unsafe_private_named.78,
-            skills: self.__unsafe_private_named.79,
-            slogan: self.__unsafe_private_named.80,
-            sponsor: self.__unsafe_private_named.81,
-            sub_organization: self.__unsafe_private_named.82,
-            subject_of: self.__unsafe_private_named.83,
-            tax_id: self.__unsafe_private_named.84,
-            telephone: self.__unsafe_private_named.85,
-            unnamed_sources_policy: self.__unsafe_private_named.86,
-            url: self.__unsafe_private_named.87,
-            vat_id: self.__unsafe_private_named.88,
+            accepted_payment_method: self._fields.0,
+            actionable_feedback_policy: self._fields.1,
+            additional_type: self._fields.2,
+            address: self._fields.3,
+            agent_interaction_statistic: self._fields.4,
+            aggregate_rating: self._fields.5,
+            alternate_name: self._fields.6,
+            alumni: self._fields.7,
+            area_served: self._fields.8,
+            award: self._fields.9,
+            awards: self._fields.10,
+            brand: self._fields.11,
+            company_registration: self._fields.12,
+            contact_point: self._fields.13,
+            contact_points: self._fields.14,
+            corrections_policy: self._fields.15,
+            department: self._fields.16,
+            description: self._fields.17,
+            disambiguating_description: self._fields.18,
+            dissolution_date: self._fields.19,
+            diversity_policy: self._fields.20,
+            diversity_staffing_report: self._fields.21,
+            duns: self._fields.22,
+            email: self._fields.23,
+            employee: self._fields.24,
+            employees: self._fields.25,
+            ethics_policy: self._fields.26,
+            event: self._fields.27,
+            events: self._fields.28,
+            fax_number: self._fields.29,
+            founder: self._fields.30,
+            founders: self._fields.31,
+            founding_date: self._fields.32,
+            founding_location: self._fields.33,
+            funder: self._fields.34,
+            funding: self._fields.35,
+            global_location_number: self._fields.36,
+            has_certification: self._fields.37,
+            has_credential: self._fields.38,
+            has_gs1_digital_link: self._fields.39,
+            has_member_program: self._fields.40,
+            has_merchant_return_policy: self._fields.41,
+            has_offer_catalog: self._fields.42,
+            has_pos: self._fields.43,
+            has_product_return_policy: self._fields.44,
+            has_shipping_service: self._fields.45,
+            identifier: self._fields.46,
+            image: self._fields.47,
+            interaction_statistic: self._fields.48,
+            isic_v4: self._fields.49,
+            iso6523_code: self._fields.50,
+            keywords: self._fields.51,
+            knows_about: self._fields.52,
+            knows_language: self._fields.53,
+            legal_address: self._fields.54,
+            legal_name: self._fields.55,
+            legal_representative: self._fields.56,
+            lei_code: self._fields.57,
+            location: self._fields.58,
+            logo: self._fields.59,
+            main_entity_of_page: self._fields.60,
+            makes_offer: self._fields.61,
+            member: self._fields.62,
+            member_of: self._fields.63,
+            members: self._fields.64,
+            naics: self._fields.65,
+            name: self._fields.66,
+            nonprofit_status: self._fields.67,
+            number_of_employees: self._fields.68,
+            ownership_funding_info: self._fields.69,
+            owns: self._fields.70,
+            parent_organization: self._fields.71,
+            potential_action: self._fields.72,
+            publishing_principles: self._fields.73,
+            review: self._fields.74,
+            reviews: self._fields.75,
+            same_as: self._fields.76,
+            seeks: self._fields.77,
+            service_area: self._fields.78,
+            skills: self._fields.79,
+            slogan: self._fields.80,
+            sponsor: self._fields.81,
+            sub_organization: self._fields.82,
+            subject_of: self._fields.83,
+            tax_id: self._fields.84,
+            telephone: self._fields.85,
+            unnamed_sources_policy: self._fields.86,
+            url: self._fields.87,
+            vat_id: self._fields.88,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/person.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/person.rs
index 135df414..04e80d6e 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/person.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/person.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -3454,8 +3457,8 @@ pub mod person_state {
 
 /// Builder for constructing an instance of this type
 pub struct PersonBuilder<'a, S: person_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<PersonAdditionalName<'a>>,
         Option<PersonAdditionalType<'a>>,
         Option<PersonAddress<'a>>,
@@ -3536,7 +3539,7 @@ pub struct PersonBuilder<'a, S: person_state::State> {
         Option<PersonWorkLocation<'a>>,
         Option<PersonWorksFor<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Person<'a> {
@@ -3550,8 +3553,8 @@ impl<'a> PersonBuilder<'a, person_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PersonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -3632,7 +3635,7 @@ impl<'a> PersonBuilder<'a, person_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3643,7 +3646,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonAdditionalName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `additionalName` field to an Option value (optional)
@@ -3651,7 +3654,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonAdditionalName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -3662,7 +3665,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -3670,7 +3673,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3678,12 +3681,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `address` field (optional)
     pub fn address(mut self, value: impl Into<Option<PersonAddress<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `address` field to an Option value (optional)
     pub fn maybe_address(mut self, value: Option<PersonAddress<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -3694,12 +3697,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonAffiliation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `affiliation` field to an Option value (optional)
     pub fn maybe_affiliation(mut self, value: Option<PersonAffiliation<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -3710,7 +3713,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonAgentInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `agentInteractionStatistic` field to an Option value (optional)
@@ -3718,7 +3721,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonAgentInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -3729,7 +3732,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -3737,7 +3740,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -3745,12 +3748,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `alumniOf` field (optional)
     pub fn alumni_of(mut self, value: impl Into<Option<PersonAlumniOf<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `alumniOf` field to an Option value (optional)
     pub fn maybe_alumni_of(mut self, value: Option<PersonAlumniOf<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -3758,12 +3761,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<PersonAward<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<PersonAward<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -3771,12 +3774,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<PersonAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<PersonAwards<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -3784,12 +3787,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `birthDate` field (optional)
     pub fn birth_date(mut self, value: impl Into<Option<PersonBirthDate<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `birthDate` field to an Option value (optional)
     pub fn maybe_birth_date(mut self, value: Option<PersonBirthDate<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -3800,12 +3803,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonBirthPlace<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `birthPlace` field to an Option value (optional)
     pub fn maybe_birth_place(mut self, value: Option<PersonBirthPlace<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -3813,12 +3816,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `brand` field (optional)
     pub fn brand(mut self, value: impl Into<Option<PersonBrand<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `brand` field to an Option value (optional)
     pub fn maybe_brand(mut self, value: Option<PersonBrand<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -3826,12 +3829,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `callSign` field (optional)
     pub fn call_sign(mut self, value: impl Into<Option<PersonCallSign<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `callSign` field to an Option value (optional)
     pub fn maybe_call_sign(mut self, value: Option<PersonCallSign<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -3839,12 +3842,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `children` field (optional)
     pub fn children(mut self, value: impl Into<Option<PersonChildren<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `children` field to an Option value (optional)
     pub fn maybe_children(mut self, value: Option<PersonChildren<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -3852,12 +3855,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `colleague` field (optional)
     pub fn colleague(mut self, value: impl Into<Option<PersonColleague<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `colleague` field to an Option value (optional)
     pub fn maybe_colleague(mut self, value: Option<PersonColleague<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -3865,12 +3868,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `colleagues` field (optional)
     pub fn colleagues(mut self, value: impl Into<Option<PersonColleagues<'a>>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `colleagues` field to an Option value (optional)
     pub fn maybe_colleagues(mut self, value: Option<PersonColleagues<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -3881,12 +3884,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonContactPoint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `contactPoint` field to an Option value (optional)
     pub fn maybe_contact_point(mut self, value: Option<PersonContactPoint<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -3897,7 +3900,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonContactPoints<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `contactPoints` field to an Option value (optional)
@@ -3905,7 +3908,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonContactPoints<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -3913,12 +3916,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `deathDate` field (optional)
     pub fn death_date(mut self, value: impl Into<Option<PersonDeathDate<'a>>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `deathDate` field to an Option value (optional)
     pub fn maybe_death_date(mut self, value: Option<PersonDeathDate<'a>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -3929,12 +3932,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonDeathPlace<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `deathPlace` field to an Option value (optional)
     pub fn maybe_death_place(mut self, value: Option<PersonDeathPlace<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -3945,12 +3948,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<PersonDescription<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -3961,7 +3964,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -3969,7 +3972,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -3977,12 +3980,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `duns` field (optional)
     pub fn duns(mut self, value: impl Into<Option<PersonDuns<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `duns` field to an Option value (optional)
     pub fn maybe_duns(mut self, value: Option<PersonDuns<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -3990,12 +3993,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `email` field (optional)
     pub fn email(mut self, value: impl Into<Option<PersonEmail<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `email` field to an Option value (optional)
     pub fn maybe_email(mut self, value: Option<PersonEmail<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -4006,12 +4009,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonFamilyName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `familyName` field to an Option value (optional)
     pub fn maybe_family_name(mut self, value: Option<PersonFamilyName<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -4019,12 +4022,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `faxNumber` field (optional)
     pub fn fax_number(mut self, value: impl Into<Option<PersonFaxNumber<'a>>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `faxNumber` field to an Option value (optional)
     pub fn maybe_fax_number(mut self, value: Option<PersonFaxNumber<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -4032,12 +4035,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `follows` field (optional)
     pub fn follows(mut self, value: impl Into<Option<PersonFollows<'a>>>) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `follows` field to an Option value (optional)
     pub fn maybe_follows(mut self, value: Option<PersonFollows<'a>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -4045,12 +4048,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<PersonFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<PersonFunder<'a>>) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -4058,12 +4061,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<PersonFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<PersonFunding<'a>>) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -4071,12 +4074,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `gender` field (optional)
     pub fn gender(mut self, value: impl Into<Option<PersonGender<'a>>>) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `gender` field to an Option value (optional)
     pub fn maybe_gender(mut self, value: Option<PersonGender<'a>>) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -4084,12 +4087,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `givenName` field (optional)
     pub fn given_name(mut self, value: impl Into<Option<PersonGivenName<'a>>>) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `givenName` field to an Option value (optional)
     pub fn maybe_given_name(mut self, value: Option<PersonGivenName<'a>>) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -4100,7 +4103,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonGlobalLocationNumber<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `globalLocationNumber` field to an Option value (optional)
@@ -4108,7 +4111,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonGlobalLocationNumber<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -4119,7 +4122,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonHasCertification<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `hasCertification` field to an Option value (optional)
@@ -4127,7 +4130,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonHasCertification<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -4138,7 +4141,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonHasCredential<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `hasCredential` field to an Option value (optional)
@@ -4146,7 +4149,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonHasCredential<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -4157,7 +4160,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonHasOccupation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `hasOccupation` field to an Option value (optional)
@@ -4165,7 +4168,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonHasOccupation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -4176,7 +4179,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonHasOfferCatalog<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `hasOfferCatalog` field to an Option value (optional)
@@ -4184,7 +4187,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonHasOfferCatalog<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -4192,12 +4195,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `hasPOS` field (optional)
     pub fn has_pos(mut self, value: impl Into<Option<PersonHasPos<'a>>>) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `hasPOS` field to an Option value (optional)
     pub fn maybe_has_pos(mut self, value: Option<PersonHasPos<'a>>) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -4205,12 +4208,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `height` field (optional)
     pub fn height(mut self, value: impl Into<Option<PersonHeight<'a>>>) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `height` field to an Option value (optional)
     pub fn maybe_height(mut self, value: Option<PersonHeight<'a>>) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -4221,12 +4224,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonHomeLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `homeLocation` field to an Option value (optional)
     pub fn maybe_home_location(mut self, value: Option<PersonHomeLocation<'a>>) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -4237,7 +4240,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonHonorificPrefix<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `honorificPrefix` field to an Option value (optional)
@@ -4245,7 +4248,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonHonorificPrefix<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -4256,7 +4259,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonHonorificSuffix<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `honorificSuffix` field to an Option value (optional)
@@ -4264,7 +4267,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonHonorificSuffix<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -4272,12 +4275,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `identifier` field (optional)
     pub fn identifier(mut self, value: impl Into<Option<PersonIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<PersonIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -4285,12 +4288,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<PersonImage<'a>>>) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<PersonImage<'a>>) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -4301,7 +4304,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -4309,7 +4312,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -4317,12 +4320,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `isicV4` field (optional)
     pub fn isic_v4(mut self, value: impl Into<Option<PersonIsicV4<'a>>>) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `isicV4` field to an Option value (optional)
     pub fn maybe_isic_v4(mut self, value: Option<PersonIsicV4<'a>>) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -4330,12 +4333,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `jobTitle` field (optional)
     pub fn job_title(mut self, value: impl Into<Option<PersonJobTitle<'a>>>) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `jobTitle` field to an Option value (optional)
     pub fn maybe_job_title(mut self, value: Option<PersonJobTitle<'a>>) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -4343,12 +4346,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `knows` field (optional)
     pub fn knows(mut self, value: impl Into<Option<PersonKnows<'a>>>) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `knows` field to an Option value (optional)
     pub fn maybe_knows(mut self, value: Option<PersonKnows<'a>>) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -4359,12 +4362,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonKnowsAbout<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `knowsAbout` field to an Option value (optional)
     pub fn maybe_knows_about(mut self, value: Option<PersonKnowsAbout<'a>>) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -4375,7 +4378,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonKnowsLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `knowsLanguage` field to an Option value (optional)
@@ -4383,7 +4386,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonKnowsLanguage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -4394,7 +4397,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -4402,7 +4405,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -4413,12 +4416,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonMakesOffer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `makesOffer` field to an Option value (optional)
     pub fn maybe_makes_offer(mut self, value: Option<PersonMakesOffer<'a>>) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -4426,12 +4429,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `memberOf` field (optional)
     pub fn member_of(mut self, value: impl Into<Option<PersonMemberOf<'a>>>) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `memberOf` field to an Option value (optional)
     pub fn maybe_member_of(mut self, value: Option<PersonMemberOf<'a>>) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -4439,12 +4442,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `naics` field (optional)
     pub fn naics(mut self, value: impl Into<Option<PersonNaics<'a>>>) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `naics` field to an Option value (optional)
     pub fn maybe_naics(mut self, value: Option<PersonNaics<'a>>) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -4452,12 +4455,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<PersonName<'a>>>) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<PersonName<'a>>) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -4468,12 +4471,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonNationality<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `nationality` field to an Option value (optional)
     pub fn maybe_nationality(mut self, value: Option<PersonNationality<'a>>) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -4481,12 +4484,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `netWorth` field (optional)
     pub fn net_worth(mut self, value: impl Into<Option<PersonNetWorth<'a>>>) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `netWorth` field to an Option value (optional)
     pub fn maybe_net_worth(mut self, value: Option<PersonNetWorth<'a>>) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -4494,12 +4497,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `owns` field (optional)
     pub fn owns(mut self, value: impl Into<Option<PersonOwns<'a>>>) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `owns` field to an Option value (optional)
     pub fn maybe_owns(mut self, value: Option<PersonOwns<'a>>) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -4507,12 +4510,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `parent` field (optional)
     pub fn parent(mut self, value: impl Into<Option<PersonParent<'a>>>) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `parent` field to an Option value (optional)
     pub fn maybe_parent(mut self, value: Option<PersonParent<'a>>) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -4520,12 +4523,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `parents` field (optional)
     pub fn parents(mut self, value: impl Into<Option<PersonParents<'a>>>) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `parents` field to an Option value (optional)
     pub fn maybe_parents(mut self, value: Option<PersonParents<'a>>) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -4536,12 +4539,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonPerformerIn<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `performerIn` field to an Option value (optional)
     pub fn maybe_performer_in(mut self, value: Option<PersonPerformerIn<'a>>) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -4552,7 +4555,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonPotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -4560,7 +4563,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonPotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -4568,12 +4571,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `pronouns` field (optional)
     pub fn pronouns(mut self, value: impl Into<Option<PersonPronouns<'a>>>) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `pronouns` field to an Option value (optional)
     pub fn maybe_pronouns(mut self, value: Option<PersonPronouns<'a>>) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -4584,7 +4587,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonPublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -4592,7 +4595,7 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: Option<PersonPublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -4600,12 +4603,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `relatedTo` field (optional)
     pub fn related_to(mut self, value: impl Into<Option<PersonRelatedTo<'a>>>) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `relatedTo` field to an Option value (optional)
     pub fn maybe_related_to(mut self, value: Option<PersonRelatedTo<'a>>) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -4613,12 +4616,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<PersonSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<PersonSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -4626,12 +4629,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `seeks` field (optional)
     pub fn seeks(mut self, value: impl Into<Option<PersonSeeks<'a>>>) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `seeks` field to an Option value (optional)
     pub fn maybe_seeks(mut self, value: Option<PersonSeeks<'a>>) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -4639,12 +4642,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `sibling` field (optional)
     pub fn sibling(mut self, value: impl Into<Option<PersonSibling<'a>>>) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `sibling` field to an Option value (optional)
     pub fn maybe_sibling(mut self, value: Option<PersonSibling<'a>>) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -4652,12 +4655,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `siblings` field (optional)
     pub fn siblings(mut self, value: impl Into<Option<PersonSiblings<'a>>>) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `siblings` field to an Option value (optional)
     pub fn maybe_siblings(mut self, value: Option<PersonSiblings<'a>>) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -4665,12 +4668,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `skills` field (optional)
     pub fn skills(mut self, value: impl Into<Option<PersonSkills<'a>>>) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `skills` field to an Option value (optional)
     pub fn maybe_skills(mut self, value: Option<PersonSkills<'a>>) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -4678,12 +4681,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `sponsor` field (optional)
     pub fn sponsor(mut self, value: impl Into<Option<PersonSponsor<'a>>>) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<PersonSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -4691,12 +4694,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `spouse` field (optional)
     pub fn spouse(mut self, value: impl Into<Option<PersonSpouse<'a>>>) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `spouse` field to an Option value (optional)
     pub fn maybe_spouse(mut self, value: Option<PersonSpouse<'a>>) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -4704,12 +4707,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `subjectOf` field (optional)
     pub fn subject_of(mut self, value: impl Into<Option<PersonSubjectOf<'a>>>) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<PersonSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -4717,12 +4720,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `taxID` field (optional)
     pub fn tax_id(mut self, value: impl Into<Option<PersonTaxId<'a>>>) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `taxID` field to an Option value (optional)
     pub fn maybe_tax_id(mut self, value: Option<PersonTaxId<'a>>) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -4730,12 +4733,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `telephone` field (optional)
     pub fn telephone(mut self, value: impl Into<Option<PersonTelephone<'a>>>) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `telephone` field to an Option value (optional)
     pub fn maybe_telephone(mut self, value: Option<PersonTelephone<'a>>) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -4743,12 +4746,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<PersonUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<PersonUrl<'a>>) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -4756,12 +4759,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `vatID` field (optional)
     pub fn vat_id(mut self, value: impl Into<Option<PersonVatId<'a>>>) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `vatID` field to an Option value (optional)
     pub fn maybe_vat_id(mut self, value: Option<PersonVatId<'a>>) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -4769,12 +4772,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `weight` field (optional)
     pub fn weight(mut self, value: impl Into<Option<PersonWeight<'a>>>) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `weight` field to an Option value (optional)
     pub fn maybe_weight(mut self, value: Option<PersonWeight<'a>>) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -4785,12 +4788,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PersonWorkLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `workLocation` field to an Option value (optional)
     pub fn maybe_work_location(mut self, value: Option<PersonWorkLocation<'a>>) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -4798,12 +4801,12 @@ impl<'a, S: person_state::State> PersonBuilder<'a, S> {
 impl<'a, S: person_state::State> PersonBuilder<'a, S> {
     /// Set the `worksFor` field (optional)
     pub fn works_for(mut self, value: impl Into<Option<PersonWorksFor<'a>>>) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `worksFor` field to an Option value (optional)
     pub fn maybe_works_for(mut self, value: Option<PersonWorksFor<'a>>) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -4815,85 +4818,85 @@ where
     /// Build the final struct
     pub fn build(self) -> Person<'a> {
         Person {
-            additional_name: self.__unsafe_private_named.0,
-            additional_type: self.__unsafe_private_named.1,
-            address: self.__unsafe_private_named.2,
-            affiliation: self.__unsafe_private_named.3,
-            agent_interaction_statistic: self.__unsafe_private_named.4,
-            alternate_name: self.__unsafe_private_named.5,
-            alumni_of: self.__unsafe_private_named.6,
-            award: self.__unsafe_private_named.7,
-            awards: self.__unsafe_private_named.8,
-            birth_date: self.__unsafe_private_named.9,
-            birth_place: self.__unsafe_private_named.10,
-            brand: self.__unsafe_private_named.11,
-            call_sign: self.__unsafe_private_named.12,
-            children: self.__unsafe_private_named.13,
-            colleague: self.__unsafe_private_named.14,
-            colleagues: self.__unsafe_private_named.15,
-            contact_point: self.__unsafe_private_named.16,
-            contact_points: self.__unsafe_private_named.17,
-            death_date: self.__unsafe_private_named.18,
-            death_place: self.__unsafe_private_named.19,
-            description: self.__unsafe_private_named.20,
-            disambiguating_description: self.__unsafe_private_named.21,
-            duns: self.__unsafe_private_named.22,
-            email: self.__unsafe_private_named.23,
-            family_name: self.__unsafe_private_named.24,
-            fax_number: self.__unsafe_private_named.25,
-            follows: self.__unsafe_private_named.26,
-            funder: self.__unsafe_private_named.27,
-            funding: self.__unsafe_private_named.28,
-            gender: self.__unsafe_private_named.29,
-            given_name: self.__unsafe_private_named.30,
-            global_location_number: self.__unsafe_private_named.31,
-            has_certification: self.__unsafe_private_named.32,
-            has_credential: self.__unsafe_private_named.33,
-            has_occupation: self.__unsafe_private_named.34,
-            has_offer_catalog: self.__unsafe_private_named.35,
-            has_pos: self.__unsafe_private_named.36,
-            height: self.__unsafe_private_named.37,
-            home_location: self.__unsafe_private_named.38,
-            honorific_prefix: self.__unsafe_private_named.39,
-            honorific_suffix: self.__unsafe_private_named.40,
-            identifier: self.__unsafe_private_named.41,
-            image: self.__unsafe_private_named.42,
-            interaction_statistic: self.__unsafe_private_named.43,
-            isic_v4: self.__unsafe_private_named.44,
-            job_title: self.__unsafe_private_named.45,
-            knows: self.__unsafe_private_named.46,
-            knows_about: self.__unsafe_private_named.47,
-            knows_language: self.__unsafe_private_named.48,
-            main_entity_of_page: self.__unsafe_private_named.49,
-            makes_offer: self.__unsafe_private_named.50,
-            member_of: self.__unsafe_private_named.51,
-            naics: self.__unsafe_private_named.52,
-            name: self.__unsafe_private_named.53,
-            nationality: self.__unsafe_private_named.54,
-            net_worth: self.__unsafe_private_named.55,
-            owns: self.__unsafe_private_named.56,
-            parent: self.__unsafe_private_named.57,
-            parents: self.__unsafe_private_named.58,
-            performer_in: self.__unsafe_private_named.59,
-            potential_action: self.__unsafe_private_named.60,
-            pronouns: self.__unsafe_private_named.61,
-            publishing_principles: self.__unsafe_private_named.62,
-            related_to: self.__unsafe_private_named.63,
-            same_as: self.__unsafe_private_named.64,
-            seeks: self.__unsafe_private_named.65,
-            sibling: self.__unsafe_private_named.66,
-            siblings: self.__unsafe_private_named.67,
-            skills: self.__unsafe_private_named.68,
-            sponsor: self.__unsafe_private_named.69,
-            spouse: self.__unsafe_private_named.70,
-            subject_of: self.__unsafe_private_named.71,
-            tax_id: self.__unsafe_private_named.72,
-            telephone: self.__unsafe_private_named.73,
-            url: self.__unsafe_private_named.74,
-            vat_id: self.__unsafe_private_named.75,
-            weight: self.__unsafe_private_named.76,
-            work_location: self.__unsafe_private_named.77,
-            works_for: self.__unsafe_private_named.78,
+            additional_name: self._fields.0,
+            additional_type: self._fields.1,
+            address: self._fields.2,
+            affiliation: self._fields.3,
+            agent_interaction_statistic: self._fields.4,
+            alternate_name: self._fields.5,
+            alumni_of: self._fields.6,
+            award: self._fields.7,
+            awards: self._fields.8,
+            birth_date: self._fields.9,
+            birth_place: self._fields.10,
+            brand: self._fields.11,
+            call_sign: self._fields.12,
+            children: self._fields.13,
+            colleague: self._fields.14,
+            colleagues: self._fields.15,
+            contact_point: self._fields.16,
+            contact_points: self._fields.17,
+            death_date: self._fields.18,
+            death_place: self._fields.19,
+            description: self._fields.20,
+            disambiguating_description: self._fields.21,
+            duns: self._fields.22,
+            email: self._fields.23,
+            family_name: self._fields.24,
+            fax_number: self._fields.25,
+            follows: self._fields.26,
+            funder: self._fields.27,
+            funding: self._fields.28,
+            gender: self._fields.29,
+            given_name: self._fields.30,
+            global_location_number: self._fields.31,
+            has_certification: self._fields.32,
+            has_credential: self._fields.33,
+            has_occupation: self._fields.34,
+            has_offer_catalog: self._fields.35,
+            has_pos: self._fields.36,
+            height: self._fields.37,
+            home_location: self._fields.38,
+            honorific_prefix: self._fields.39,
+            honorific_suffix: self._fields.40,
+            identifier: self._fields.41,
+            image: self._fields.42,
+            interaction_statistic: self._fields.43,
+            isic_v4: self._fields.44,
+            job_title: self._fields.45,
+            knows: self._fields.46,
+            knows_about: self._fields.47,
+            knows_language: self._fields.48,
+            main_entity_of_page: self._fields.49,
+            makes_offer: self._fields.50,
+            member_of: self._fields.51,
+            naics: self._fields.52,
+            name: self._fields.53,
+            nationality: self._fields.54,
+            net_worth: self._fields.55,
+            owns: self._fields.56,
+            parent: self._fields.57,
+            parents: self._fields.58,
+            performer_in: self._fields.59,
+            potential_action: self._fields.60,
+            pronouns: self._fields.61,
+            publishing_principles: self._fields.62,
+            related_to: self._fields.63,
+            same_as: self._fields.64,
+            seeks: self._fields.65,
+            sibling: self._fields.66,
+            siblings: self._fields.67,
+            skills: self._fields.68,
+            sponsor: self._fields.69,
+            spouse: self._fields.70,
+            subject_of: self._fields.71,
+            tax_id: self._fields.72,
+            telephone: self._fields.73,
+            url: self._fields.74,
+            vat_id: self._fields.75,
+            weight: self._fields.76,
+            work_location: self._fields.77,
+            works_for: self._fields.78,
             extra_data: Default::default(),
         }
     }
@@ -4903,85 +4906,85 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Person<'a> {
         Person {
-            additional_name: self.__unsafe_private_named.0,
-            additional_type: self.__unsafe_private_named.1,
-            address: self.__unsafe_private_named.2,
-            affiliation: self.__unsafe_private_named.3,
-            agent_interaction_statistic: self.__unsafe_private_named.4,
-            alternate_name: self.__unsafe_private_named.5,
-            alumni_of: self.__unsafe_private_named.6,
-            award: self.__unsafe_private_named.7,
-            awards: self.__unsafe_private_named.8,
-            birth_date: self.__unsafe_private_named.9,
-            birth_place: self.__unsafe_private_named.10,
-            brand: self.__unsafe_private_named.11,
-            call_sign: self.__unsafe_private_named.12,
-            children: self.__unsafe_private_named.13,
-            colleague: self.__unsafe_private_named.14,
-            colleagues: self.__unsafe_private_named.15,
-            contact_point: self.__unsafe_private_named.16,
-            contact_points: self.__unsafe_private_named.17,
-            death_date: self.__unsafe_private_named.18,
-            death_place: self.__unsafe_private_named.19,
-            description: self.__unsafe_private_named.20,
-            disambiguating_description: self.__unsafe_private_named.21,
-            duns: self.__unsafe_private_named.22,
-            email: self.__unsafe_private_named.23,
-            family_name: self.__unsafe_private_named.24,
-            fax_number: self.__unsafe_private_named.25,
-            follows: self.__unsafe_private_named.26,
-            funder: self.__unsafe_private_named.27,
-            funding: self.__unsafe_private_named.28,
-            gender: self.__unsafe_private_named.29,
-            given_name: self.__unsafe_private_named.30,
-            global_location_number: self.__unsafe_private_named.31,
-            has_certification: self.__unsafe_private_named.32,
-            has_credential: self.__unsafe_private_named.33,
-            has_occupation: self.__unsafe_private_named.34,
-            has_offer_catalog: self.__unsafe_private_named.35,
-            has_pos: self.__unsafe_private_named.36,
-            height: self.__unsafe_private_named.37,
-            home_location: self.__unsafe_private_named.38,
-            honorific_prefix: self.__unsafe_private_named.39,
-            honorific_suffix: self.__unsafe_private_named.40,
-            identifier: self.__unsafe_private_named.41,
-            image: self.__unsafe_private_named.42,
-            interaction_statistic: self.__unsafe_private_named.43,
-            isic_v4: self.__unsafe_private_named.44,
-            job_title: self.__unsafe_private_named.45,
-            knows: self.__unsafe_private_named.46,
-            knows_about: self.__unsafe_private_named.47,
-            knows_language: self.__unsafe_private_named.48,
-            main_entity_of_page: self.__unsafe_private_named.49,
-            makes_offer: self.__unsafe_private_named.50,
-            member_of: self.__unsafe_private_named.51,
-            naics: self.__unsafe_private_named.52,
-            name: self.__unsafe_private_named.53,
-            nationality: self.__unsafe_private_named.54,
-            net_worth: self.__unsafe_private_named.55,
-            owns: self.__unsafe_private_named.56,
-            parent: self.__unsafe_private_named.57,
-            parents: self.__unsafe_private_named.58,
-            performer_in: self.__unsafe_private_named.59,
-            potential_action: self.__unsafe_private_named.60,
-            pronouns: self.__unsafe_private_named.61,
-            publishing_principles: self.__unsafe_private_named.62,
-            related_to: self.__unsafe_private_named.63,
-            same_as: self.__unsafe_private_named.64,
-            seeks: self.__unsafe_private_named.65,
-            sibling: self.__unsafe_private_named.66,
-            siblings: self.__unsafe_private_named.67,
-            skills: self.__unsafe_private_named.68,
-            sponsor: self.__unsafe_private_named.69,
-            spouse: self.__unsafe_private_named.70,
-            subject_of: self.__unsafe_private_named.71,
-            tax_id: self.__unsafe_private_named.72,
-            telephone: self.__unsafe_private_named.73,
-            url: self.__unsafe_private_named.74,
-            vat_id: self.__unsafe_private_named.75,
-            weight: self.__unsafe_private_named.76,
-            work_location: self.__unsafe_private_named.77,
-            works_for: self.__unsafe_private_named.78,
+            additional_name: self._fields.0,
+            additional_type: self._fields.1,
+            address: self._fields.2,
+            affiliation: self._fields.3,
+            agent_interaction_statistic: self._fields.4,
+            alternate_name: self._fields.5,
+            alumni_of: self._fields.6,
+            award: self._fields.7,
+            awards: self._fields.8,
+            birth_date: self._fields.9,
+            birth_place: self._fields.10,
+            brand: self._fields.11,
+            call_sign: self._fields.12,
+            children: self._fields.13,
+            colleague: self._fields.14,
+            colleagues: self._fields.15,
+            contact_point: self._fields.16,
+            contact_points: self._fields.17,
+            death_date: self._fields.18,
+            death_place: self._fields.19,
+            description: self._fields.20,
+            disambiguating_description: self._fields.21,
+            duns: self._fields.22,
+            email: self._fields.23,
+            family_name: self._fields.24,
+            fax_number: self._fields.25,
+            follows: self._fields.26,
+            funder: self._fields.27,
+            funding: self._fields.28,
+            gender: self._fields.29,
+            given_name: self._fields.30,
+            global_location_number: self._fields.31,
+            has_certification: self._fields.32,
+            has_credential: self._fields.33,
+            has_occupation: self._fields.34,
+            has_offer_catalog: self._fields.35,
+            has_pos: self._fields.36,
+            height: self._fields.37,
+            home_location: self._fields.38,
+            honorific_prefix: self._fields.39,
+            honorific_suffix: self._fields.40,
+            identifier: self._fields.41,
+            image: self._fields.42,
+            interaction_statistic: self._fields.43,
+            isic_v4: self._fields.44,
+            job_title: self._fields.45,
+            knows: self._fields.46,
+            knows_about: self._fields.47,
+            knows_language: self._fields.48,
+            main_entity_of_page: self._fields.49,
+            makes_offer: self._fields.50,
+            member_of: self._fields.51,
+            naics: self._fields.52,
+            name: self._fields.53,
+            nationality: self._fields.54,
+            net_worth: self._fields.55,
+            owns: self._fields.56,
+            parent: self._fields.57,
+            parents: self._fields.58,
+            performer_in: self._fields.59,
+            potential_action: self._fields.60,
+            pronouns: self._fields.61,
+            publishing_principles: self._fields.62,
+            related_to: self._fields.63,
+            same_as: self._fields.64,
+            seeks: self._fields.65,
+            sibling: self._fields.66,
+            siblings: self._fields.67,
+            skills: self._fields.68,
+            sponsor: self._fields.69,
+            spouse: self._fields.70,
+            subject_of: self._fields.71,
+            tax_id: self._fields.72,
+            telephone: self._fields.73,
+            url: self._fields.74,
+            vat_id: self._fields.75,
+            weight: self._fields.76,
+            work_location: self._fields.77,
+            works_for: self._fields.78,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/podcast_series.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/podcast_series.rs
index b9153c64..f9687379 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/podcast_series.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/podcast_series.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -5573,8 +5576,8 @@ pub mod podcast_series_state {
 
 /// Builder for constructing an instance of this type
 pub struct PodcastSeriesBuilder<'a, S: podcast_series_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<PodcastSeriesAbout<'a>>,
         Option<PodcastSeriesAbstract<'a>>,
         Option<PodcastSeriesAccessMode<'a>>,
@@ -5708,7 +5711,7 @@ pub struct PodcastSeriesBuilder<'a, S: podcast_series_state::State> {
         Option<PodcastSeriesWorkExample<'a>>,
         Option<PodcastSeriesWorkTranslation<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PodcastSeries<'a> {
@@ -5722,8 +5725,8 @@ impl<'a> PodcastSeriesBuilder<'a, podcast_series_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PodcastSeriesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -5857,7 +5860,7 @@ impl<'a> PodcastSeriesBuilder<'a, podcast_series_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5865,12 +5868,12 @@ impl<'a> PodcastSeriesBuilder<'a, podcast_series_state::Empty> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `about` field (optional)
     pub fn about(mut self, value: impl Into<Option<PodcastSeriesAbout<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `about` field to an Option value (optional)
     pub fn maybe_about(mut self, value: Option<PodcastSeriesAbout<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -5881,12 +5884,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesAbstract<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `abstract` field to an Option value (optional)
     pub fn maybe_abstract(mut self, value: Option<PodcastSeriesAbstract<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -5897,7 +5900,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesAccessMode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `accessMode` field to an Option value (optional)
@@ -5905,7 +5908,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesAccessMode<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -5916,7 +5919,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesAccessModeSufficient<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `accessModeSufficient` field to an Option value (optional)
@@ -5924,7 +5927,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesAccessModeSufficient<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -5935,7 +5938,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesAccessibilityApi<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `accessibilityAPI` field to an Option value (optional)
@@ -5943,7 +5946,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesAccessibilityApi<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -5954,7 +5957,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesAccessibilityControl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `accessibilityControl` field to an Option value (optional)
@@ -5962,7 +5965,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesAccessibilityControl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -5973,7 +5976,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesAccessibilityFeature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `accessibilityFeature` field to an Option value (optional)
@@ -5981,7 +5984,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesAccessibilityFeature<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -5992,7 +5995,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesAccessibilityHazard<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `accessibilityHazard` field to an Option value (optional)
@@ -6000,7 +6003,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesAccessibilityHazard<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -6011,7 +6014,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesAccessibilitySummary<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `accessibilitySummary` field to an Option value (optional)
@@ -6019,7 +6022,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesAccessibilitySummary<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -6030,7 +6033,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesAccountablePerson<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `accountablePerson` field to an Option value (optional)
@@ -6038,7 +6041,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesAccountablePerson<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -6049,7 +6052,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesAcquireLicensePage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `acquireLicensePage` field to an Option value (optional)
@@ -6057,7 +6060,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesAcquireLicensePage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -6065,12 +6068,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `actor` field (optional)
     pub fn actor(mut self, value: impl Into<Option<PodcastSeriesActor<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `actor` field to an Option value (optional)
     pub fn maybe_actor(mut self, value: Option<PodcastSeriesActor<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -6081,7 +6084,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -6089,7 +6092,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -6100,7 +6103,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -6108,7 +6111,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -6119,7 +6122,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -6127,7 +6130,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -6138,7 +6141,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesAlternativeHeadline<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `alternativeHeadline` field to an Option value (optional)
@@ -6146,7 +6149,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesAlternativeHeadline<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -6157,7 +6160,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesArchivedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `archivedAt` field to an Option value (optional)
@@ -6165,7 +6168,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesArchivedAt<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -6176,12 +6179,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesAssesses<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `assesses` field to an Option value (optional)
     pub fn maybe_assesses(mut self, value: Option<PodcastSeriesAssesses<'a>>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -6192,7 +6195,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesAssociatedMedia<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `associatedMedia` field to an Option value (optional)
@@ -6200,7 +6203,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesAssociatedMedia<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -6211,12 +6214,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesAudience<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `audience` field to an Option value (optional)
     pub fn maybe_audience(mut self, value: Option<PodcastSeriesAudience<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -6224,12 +6227,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `audio` field (optional)
     pub fn audio(mut self, value: impl Into<Option<PodcastSeriesAudio<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `audio` field to an Option value (optional)
     pub fn maybe_audio(mut self, value: Option<PodcastSeriesAudio<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -6237,12 +6240,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<PodcastSeriesAuthor<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<PodcastSeriesAuthor<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -6250,12 +6253,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<PodcastSeriesAward<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<PodcastSeriesAward<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -6263,12 +6266,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<PodcastSeriesAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<PodcastSeriesAwards<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -6279,12 +6282,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesCharacter<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `character` field to an Option value (optional)
     pub fn maybe_character(mut self, value: Option<PodcastSeriesCharacter<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -6295,12 +6298,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesCitation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `citation` field to an Option value (optional)
     pub fn maybe_citation(mut self, value: Option<PodcastSeriesCitation<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -6311,12 +6314,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesComment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<PodcastSeriesComment<'a>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -6327,7 +6330,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesCommentCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `commentCount` field to an Option value (optional)
@@ -6335,7 +6338,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesCommentCount<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -6346,7 +6349,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesConditionsOfAccess<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `conditionsOfAccess` field to an Option value (optional)
@@ -6354,7 +6357,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesConditionsOfAccess<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -6365,7 +6368,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesContentLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `contentLocation` field to an Option value (optional)
@@ -6373,7 +6376,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesContentLocation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -6384,7 +6387,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesContentRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `contentRating` field to an Option value (optional)
@@ -6392,7 +6395,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesContentRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -6403,7 +6406,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesContentReferenceTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `contentReferenceTime` field to an Option value (optional)
@@ -6411,7 +6414,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesContentReferenceTime<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -6422,7 +6425,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesContributor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `contributor` field to an Option value (optional)
@@ -6430,7 +6433,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesContributor<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -6441,7 +6444,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesCopyrightHolder<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `copyrightHolder` field to an Option value (optional)
@@ -6449,7 +6452,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesCopyrightHolder<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -6460,7 +6463,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesCopyrightNotice<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `copyrightNotice` field to an Option value (optional)
@@ -6468,7 +6471,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesCopyrightNotice<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -6479,7 +6482,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesCopyrightYear<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `copyrightYear` field to an Option value (optional)
@@ -6487,7 +6490,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesCopyrightYear<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -6498,7 +6501,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesCorrection<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `correction` field to an Option value (optional)
@@ -6506,7 +6509,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesCorrection<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -6517,7 +6520,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesCountryOfOrigin<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `countryOfOrigin` field to an Option value (optional)
@@ -6525,7 +6528,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesCountryOfOrigin<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -6536,7 +6539,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesCreativeWorkStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `creativeWorkStatus` field to an Option value (optional)
@@ -6544,7 +6547,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesCreativeWorkStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -6555,12 +6558,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesCreator<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `creator` field to an Option value (optional)
     pub fn maybe_creator(mut self, value: Option<PodcastSeriesCreator<'a>>) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -6571,7 +6574,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesCreditText<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `creditText` field to an Option value (optional)
@@ -6579,7 +6582,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesCreditText<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -6590,7 +6593,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesDateCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `dateCreated` field to an Option value (optional)
@@ -6598,7 +6601,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesDateCreated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -6609,7 +6612,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesDateModified<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `dateModified` field to an Option value (optional)
@@ -6617,7 +6620,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesDateModified<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -6628,7 +6631,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `datePublished` field to an Option value (optional)
@@ -6636,7 +6639,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -6647,7 +6650,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
@@ -6655,7 +6658,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -6666,7 +6669,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesDigitalSourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `digitalSourceType` field to an Option value (optional)
@@ -6674,7 +6677,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesDigitalSourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -6685,7 +6688,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -6693,7 +6696,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -6704,7 +6707,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesDiscussionUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `discussionUrl` field to an Option value (optional)
@@ -6712,7 +6715,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesDiscussionUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -6723,12 +6726,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesEditEidr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `editEIDR` field to an Option value (optional)
     pub fn maybe_edit_eidr(mut self, value: Option<PodcastSeriesEditEidr<'a>>) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -6736,12 +6739,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `editor` field (optional)
     pub fn editor(mut self, value: impl Into<Option<PodcastSeriesEditor<'a>>>) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `editor` field to an Option value (optional)
     pub fn maybe_editor(mut self, value: Option<PodcastSeriesEditor<'a>>) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -6752,7 +6755,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesEducationalAlignment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `educationalAlignment` field to an Option value (optional)
@@ -6760,7 +6763,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesEducationalAlignment<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -6771,7 +6774,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesEducationalLevel<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `educationalLevel` field to an Option value (optional)
@@ -6779,7 +6782,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesEducationalLevel<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -6790,7 +6793,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesEducationalUse<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `educationalUse` field to an Option value (optional)
@@ -6798,7 +6801,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesEducationalUse<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -6809,12 +6812,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesEncoding<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `encoding` field to an Option value (optional)
     pub fn maybe_encoding(mut self, value: Option<PodcastSeriesEncoding<'a>>) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -6825,7 +6828,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesEncodingFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `encodingFormat` field to an Option value (optional)
@@ -6833,7 +6836,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesEncodingFormat<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -6844,12 +6847,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesEncodings<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `encodings` field to an Option value (optional)
     pub fn maybe_encodings(mut self, value: Option<PodcastSeriesEncodings<'a>>) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -6860,12 +6863,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesEndDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `endDate` field to an Option value (optional)
     pub fn maybe_end_date(mut self, value: Option<PodcastSeriesEndDate<'a>>) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -6876,7 +6879,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesExampleOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `exampleOfWork` field to an Option value (optional)
@@ -6884,7 +6887,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesExampleOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -6895,12 +6898,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesExpires<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `expires` field to an Option value (optional)
     pub fn maybe_expires(mut self, value: Option<PodcastSeriesExpires<'a>>) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -6911,7 +6914,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesFileFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `fileFormat` field to an Option value (optional)
@@ -6919,7 +6922,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesFileFormat<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -6927,12 +6930,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<PodcastSeriesFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<PodcastSeriesFunder<'a>>) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -6943,12 +6946,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesFunding<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<PodcastSeriesFunding<'a>>) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -6956,12 +6959,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<PodcastSeriesGenre<'a>>>) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<PodcastSeriesGenre<'a>>) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -6972,12 +6975,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesHasPart<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `hasPart` field to an Option value (optional)
     pub fn maybe_has_part(mut self, value: Option<PodcastSeriesHasPart<'a>>) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -6988,12 +6991,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesHeadline<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `headline` field to an Option value (optional)
     pub fn maybe_headline(mut self, value: Option<PodcastSeriesHeadline<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -7004,7 +7007,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesIdentifier<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
@@ -7012,7 +7015,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesIdentifier<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -7020,12 +7023,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<PodcastSeriesImage<'a>>>) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<PodcastSeriesImage<'a>>) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -7036,7 +7039,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesInLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `inLanguage` field to an Option value (optional)
@@ -7044,7 +7047,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesInLanguage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -7055,7 +7058,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -7063,7 +7066,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -7074,7 +7077,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesInteractivityType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `interactivityType` field to an Option value (optional)
@@ -7082,7 +7085,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesInteractivityType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -7093,7 +7096,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesInterpretedAsClaim<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `interpretedAsClaim` field to an Option value (optional)
@@ -7101,7 +7104,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesInterpretedAsClaim<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -7112,7 +7115,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesIsAccessibleForFree<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `isAccessibleForFree` field to an Option value (optional)
@@ -7120,7 +7123,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesIsAccessibleForFree<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -7131,7 +7134,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesIsBasedOn<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `isBasedOn` field to an Option value (optional)
@@ -7139,7 +7142,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesIsBasedOn<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -7150,7 +7153,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesIsBasedOnUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `isBasedOnUrl` field to an Option value (optional)
@@ -7158,7 +7161,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesIsBasedOnUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -7169,7 +7172,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesIsFamilyFriendly<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `isFamilyFriendly` field to an Option value (optional)
@@ -7177,7 +7180,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesIsFamilyFriendly<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -7188,12 +7191,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesIsPartOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `isPartOf` field to an Option value (optional)
     pub fn maybe_is_part_of(mut self, value: Option<PodcastSeriesIsPartOf<'a>>) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -7201,12 +7204,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `issn` field (optional)
     pub fn issn(mut self, value: impl Into<Option<PodcastSeriesIssn<'a>>>) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `issn` field to an Option value (optional)
     pub fn maybe_issn(mut self, value: Option<PodcastSeriesIssn<'a>>) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -7217,12 +7220,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesKeywords<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<PodcastSeriesKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -7233,7 +7236,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesLearningResourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `learningResourceType` field to an Option value (optional)
@@ -7241,7 +7244,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesLearningResourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -7252,12 +7255,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesLicense<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value.into();
+        self._fields.79 = value.into();
         self
     }
     /// Set the `license` field to an Option value (optional)
     pub fn maybe_license(mut self, value: Option<PodcastSeriesLicense<'a>>) -> Self {
-        self.__unsafe_private_named.79 = value;
+        self._fields.79 = value;
         self
     }
 }
@@ -7268,7 +7271,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesLocationCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value.into();
+        self._fields.80 = value.into();
         self
     }
     /// Set the `locationCreated` field to an Option value (optional)
@@ -7276,7 +7279,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesLocationCreated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value;
+        self._fields.80 = value;
         self
     }
 }
@@ -7287,7 +7290,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesMainEntity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.81 = value.into();
+        self._fields.81 = value.into();
         self
     }
     /// Set the `mainEntity` field to an Option value (optional)
@@ -7295,7 +7298,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesMainEntity<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.81 = value;
+        self._fields.81 = value;
         self
     }
 }
@@ -7306,7 +7309,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value.into();
+        self._fields.82 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -7314,7 +7317,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value;
+        self._fields.82 = value;
         self
     }
 }
@@ -7325,7 +7328,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesMaintainer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.83 = value.into();
+        self._fields.83 = value.into();
         self
     }
     /// Set the `maintainer` field to an Option value (optional)
@@ -7333,7 +7336,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesMaintainer<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.83 = value;
+        self._fields.83 = value;
         self
     }
 }
@@ -7344,12 +7347,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesMaterial<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value.into();
+        self._fields.84 = value.into();
         self
     }
     /// Set the `material` field to an Option value (optional)
     pub fn maybe_material(mut self, value: Option<PodcastSeriesMaterial<'a>>) -> Self {
-        self.__unsafe_private_named.84 = value;
+        self._fields.84 = value;
         self
     }
 }
@@ -7360,7 +7363,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesMaterialExtent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.85 = value.into();
+        self._fields.85 = value.into();
         self
     }
     /// Set the `materialExtent` field to an Option value (optional)
@@ -7368,7 +7371,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesMaterialExtent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.85 = value;
+        self._fields.85 = value;
         self
     }
 }
@@ -7379,12 +7382,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesMentions<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.86 = value.into();
+        self._fields.86 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<PodcastSeriesMentions<'a>>) -> Self {
-        self.__unsafe_private_named.86 = value;
+        self._fields.86 = value;
         self
     }
 }
@@ -7392,12 +7395,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<PodcastSeriesName<'a>>>) -> Self {
-        self.__unsafe_private_named.87 = value.into();
+        self._fields.87 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<PodcastSeriesName<'a>>) -> Self {
-        self.__unsafe_private_named.87 = value;
+        self._fields.87 = value;
         self
     }
 }
@@ -7405,12 +7408,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `offers` field (optional)
     pub fn offers(mut self, value: impl Into<Option<PodcastSeriesOffers<'a>>>) -> Self {
-        self.__unsafe_private_named.88 = value.into();
+        self._fields.88 = value.into();
         self
     }
     /// Set the `offers` field to an Option value (optional)
     pub fn maybe_offers(mut self, value: Option<PodcastSeriesOffers<'a>>) -> Self {
-        self.__unsafe_private_named.88 = value;
+        self._fields.88 = value;
         self
     }
 }
@@ -7421,12 +7424,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesPattern<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.89 = value.into();
+        self._fields.89 = value.into();
         self
     }
     /// Set the `pattern` field to an Option value (optional)
     pub fn maybe_pattern(mut self, value: Option<PodcastSeriesPattern<'a>>) -> Self {
-        self.__unsafe_private_named.89 = value;
+        self._fields.89 = value;
         self
     }
 }
@@ -7437,12 +7440,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesPosition<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.90 = value.into();
+        self._fields.90 = value.into();
         self
     }
     /// Set the `position` field to an Option value (optional)
     pub fn maybe_position(mut self, value: Option<PodcastSeriesPosition<'a>>) -> Self {
-        self.__unsafe_private_named.90 = value;
+        self._fields.90 = value;
         self
     }
 }
@@ -7453,7 +7456,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesPotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.91 = value.into();
+        self._fields.91 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -7461,7 +7464,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesPotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.91 = value;
+        self._fields.91 = value;
         self
     }
 }
@@ -7472,12 +7475,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesProducer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.92 = value.into();
+        self._fields.92 = value.into();
         self
     }
     /// Set the `producer` field to an Option value (optional)
     pub fn maybe_producer(mut self, value: Option<PodcastSeriesProducer<'a>>) -> Self {
-        self.__unsafe_private_named.92 = value;
+        self._fields.92 = value;
         self
     }
 }
@@ -7488,12 +7491,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesProvider<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.93 = value.into();
+        self._fields.93 = value.into();
         self
     }
     /// Set the `provider` field to an Option value (optional)
     pub fn maybe_provider(mut self, value: Option<PodcastSeriesProvider<'a>>) -> Self {
-        self.__unsafe_private_named.93 = value;
+        self._fields.93 = value;
         self
     }
 }
@@ -7504,7 +7507,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesPublication<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value.into();
+        self._fields.94 = value.into();
         self
     }
     /// Set the `publication` field to an Option value (optional)
@@ -7512,7 +7515,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesPublication<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value;
+        self._fields.94 = value;
         self
     }
 }
@@ -7523,12 +7526,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesPublisher<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.95 = value.into();
+        self._fields.95 = value.into();
         self
     }
     /// Set the `publisher` field to an Option value (optional)
     pub fn maybe_publisher(mut self, value: Option<PodcastSeriesPublisher<'a>>) -> Self {
-        self.__unsafe_private_named.95 = value;
+        self._fields.95 = value;
         self
     }
 }
@@ -7539,7 +7542,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesPublisherImprint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.96 = value.into();
+        self._fields.96 = value.into();
         self
     }
     /// Set the `publisherImprint` field to an Option value (optional)
@@ -7547,7 +7550,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesPublisherImprint<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.96 = value;
+        self._fields.96 = value;
         self
     }
 }
@@ -7558,7 +7561,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesPublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.97 = value.into();
+        self._fields.97 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -7566,7 +7569,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesPublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.97 = value;
+        self._fields.97 = value;
         self
     }
 }
@@ -7577,7 +7580,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesRecordedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value.into();
+        self._fields.98 = value.into();
         self
     }
     /// Set the `recordedAt` field to an Option value (optional)
@@ -7585,7 +7588,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesRecordedAt<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value;
+        self._fields.98 = value;
         self
     }
 }
@@ -7596,7 +7599,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesReleasedEvent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.99 = value.into();
+        self._fields.99 = value.into();
         self
     }
     /// Set the `releasedEvent` field to an Option value (optional)
@@ -7604,7 +7607,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesReleasedEvent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.99 = value;
+        self._fields.99 = value;
         self
     }
 }
@@ -7612,12 +7615,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<PodcastSeriesReview<'a>>>) -> Self {
-        self.__unsafe_private_named.100 = value.into();
+        self._fields.100 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<PodcastSeriesReview<'a>>) -> Self {
-        self.__unsafe_private_named.100 = value;
+        self._fields.100 = value;
         self
     }
 }
@@ -7628,12 +7631,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesReviews<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value.into();
+        self._fields.101 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<PodcastSeriesReviews<'a>>) -> Self {
-        self.__unsafe_private_named.101 = value;
+        self._fields.101 = value;
         self
     }
 }
@@ -7641,12 +7644,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<PodcastSeriesSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.102 = value.into();
+        self._fields.102 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<PodcastSeriesSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.102 = value;
+        self._fields.102 = value;
         self
     }
 }
@@ -7657,7 +7660,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesSchemaVersion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.103 = value.into();
+        self._fields.103 = value.into();
         self
     }
     /// Set the `schemaVersion` field to an Option value (optional)
@@ -7665,7 +7668,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesSchemaVersion<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.103 = value;
+        self._fields.103 = value;
         self
     }
 }
@@ -7676,7 +7679,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesSdDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value.into();
+        self._fields.104 = value.into();
         self
     }
     /// Set the `sdDatePublished` field to an Option value (optional)
@@ -7684,7 +7687,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesSdDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value;
+        self._fields.104 = value;
         self
     }
 }
@@ -7695,7 +7698,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesSdLicense<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.105 = value.into();
+        self._fields.105 = value.into();
         self
     }
     /// Set the `sdLicense` field to an Option value (optional)
@@ -7703,7 +7706,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesSdLicense<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.105 = value;
+        self._fields.105 = value;
         self
     }
 }
@@ -7714,7 +7717,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesSdPublisher<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value.into();
+        self._fields.106 = value.into();
         self
     }
     /// Set the `sdPublisher` field to an Option value (optional)
@@ -7722,7 +7725,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesSdPublisher<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value;
+        self._fields.106 = value;
         self
     }
 }
@@ -7730,12 +7733,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<PodcastSeriesSize<'a>>>) -> Self {
-        self.__unsafe_private_named.107 = value.into();
+        self._fields.107 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<PodcastSeriesSize<'a>>) -> Self {
-        self.__unsafe_private_named.107 = value;
+        self._fields.107 = value;
         self
     }
 }
@@ -7746,7 +7749,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesSourceOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.108 = value.into();
+        self._fields.108 = value.into();
         self
     }
     /// Set the `sourceOrganization` field to an Option value (optional)
@@ -7754,7 +7757,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesSourceOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.108 = value;
+        self._fields.108 = value;
         self
     }
 }
@@ -7765,12 +7768,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesSpatial<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.109 = value.into();
+        self._fields.109 = value.into();
         self
     }
     /// Set the `spatial` field to an Option value (optional)
     pub fn maybe_spatial(mut self, value: Option<PodcastSeriesSpatial<'a>>) -> Self {
-        self.__unsafe_private_named.109 = value;
+        self._fields.109 = value;
         self
     }
 }
@@ -7781,7 +7784,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesSpatialCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.110 = value.into();
+        self._fields.110 = value.into();
         self
     }
     /// Set the `spatialCoverage` field to an Option value (optional)
@@ -7789,7 +7792,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesSpatialCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.110 = value;
+        self._fields.110 = value;
         self
     }
 }
@@ -7800,12 +7803,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesSponsor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.111 = value.into();
+        self._fields.111 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<PodcastSeriesSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.111 = value;
+        self._fields.111 = value;
         self
     }
 }
@@ -7816,7 +7819,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesStartDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value.into();
+        self._fields.112 = value.into();
         self
     }
     /// Set the `startDate` field to an Option value (optional)
@@ -7824,7 +7827,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesStartDate<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value;
+        self._fields.112 = value;
         self
     }
 }
@@ -7835,7 +7838,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesSubjectOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value.into();
+        self._fields.113 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
@@ -7843,7 +7846,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesSubjectOf<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value;
+        self._fields.113 = value;
         self
     }
 }
@@ -7854,12 +7857,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesTeaches<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.114 = value.into();
+        self._fields.114 = value.into();
         self
     }
     /// Set the `teaches` field to an Option value (optional)
     pub fn maybe_teaches(mut self, value: Option<PodcastSeriesTeaches<'a>>) -> Self {
-        self.__unsafe_private_named.114 = value;
+        self._fields.114 = value;
         self
     }
 }
@@ -7870,12 +7873,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesTemporal<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.115 = value.into();
+        self._fields.115 = value.into();
         self
     }
     /// Set the `temporal` field to an Option value (optional)
     pub fn maybe_temporal(mut self, value: Option<PodcastSeriesTemporal<'a>>) -> Self {
-        self.__unsafe_private_named.115 = value;
+        self._fields.115 = value;
         self
     }
 }
@@ -7886,7 +7889,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesTemporalCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.116 = value.into();
+        self._fields.116 = value.into();
         self
     }
     /// Set the `temporalCoverage` field to an Option value (optional)
@@ -7894,7 +7897,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesTemporalCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.116 = value;
+        self._fields.116 = value;
         self
     }
 }
@@ -7902,12 +7905,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<PodcastSeriesText<'a>>>) -> Self {
-        self.__unsafe_private_named.117 = value.into();
+        self._fields.117 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<PodcastSeriesText<'a>>) -> Self {
-        self.__unsafe_private_named.117 = value;
+        self._fields.117 = value;
         self
     }
 }
@@ -7918,12 +7921,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesThumbnail<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.118 = value.into();
+        self._fields.118 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<PodcastSeriesThumbnail<'a>>) -> Self {
-        self.__unsafe_private_named.118 = value;
+        self._fields.118 = value;
         self
     }
 }
@@ -7934,7 +7937,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesThumbnailUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.119 = value.into();
+        self._fields.119 = value.into();
         self
     }
     /// Set the `thumbnailUrl` field to an Option value (optional)
@@ -7942,7 +7945,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesThumbnailUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.119 = value;
+        self._fields.119 = value;
         self
     }
 }
@@ -7953,7 +7956,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesTimeRequired<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.120 = value.into();
+        self._fields.120 = value.into();
         self
     }
     /// Set the `timeRequired` field to an Option value (optional)
@@ -7961,7 +7964,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesTimeRequired<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.120 = value;
+        self._fields.120 = value;
         self
     }
 }
@@ -7972,7 +7975,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesTranslationOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.121 = value.into();
+        self._fields.121 = value.into();
         self
     }
     /// Set the `translationOfWork` field to an Option value (optional)
@@ -7980,7 +7983,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesTranslationOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.121 = value;
+        self._fields.121 = value;
         self
     }
 }
@@ -7991,7 +7994,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesTranslator<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.122 = value.into();
+        self._fields.122 = value.into();
         self
     }
     /// Set the `translator` field to an Option value (optional)
@@ -7999,7 +8002,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesTranslator<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.122 = value;
+        self._fields.122 = value;
         self
     }
 }
@@ -8010,7 +8013,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesTypicalAgeRange<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.123 = value.into();
+        self._fields.123 = value.into();
         self
     }
     /// Set the `typicalAgeRange` field to an Option value (optional)
@@ -8018,7 +8021,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesTypicalAgeRange<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.123 = value;
+        self._fields.123 = value;
         self
     }
 }
@@ -8026,12 +8029,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<PodcastSeriesUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.124 = value.into();
+        self._fields.124 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<PodcastSeriesUrl<'a>>) -> Self {
-        self.__unsafe_private_named.124 = value;
+        self._fields.124 = value;
         self
     }
 }
@@ -8042,7 +8045,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesUsageInfo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.125 = value.into();
+        self._fields.125 = value.into();
         self
     }
     /// Set the `usageInfo` field to an Option value (optional)
@@ -8050,7 +8053,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesUsageInfo<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.125 = value;
+        self._fields.125 = value;
         self
     }
 }
@@ -8061,12 +8064,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesVersion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.126 = value.into();
+        self._fields.126 = value.into();
         self
     }
     /// Set the `version` field to an Option value (optional)
     pub fn maybe_version(mut self, value: Option<PodcastSeriesVersion<'a>>) -> Self {
-        self.__unsafe_private_named.126 = value;
+        self._fields.126 = value;
         self
     }
 }
@@ -8074,12 +8077,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
 impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
     /// Set the `video` field (optional)
     pub fn video(mut self, value: impl Into<Option<PodcastSeriesVideo<'a>>>) -> Self {
-        self.__unsafe_private_named.127 = value.into();
+        self._fields.127 = value.into();
         self
     }
     /// Set the `video` field to an Option value (optional)
     pub fn maybe_video(mut self, value: Option<PodcastSeriesVideo<'a>>) -> Self {
-        self.__unsafe_private_named.127 = value;
+        self._fields.127 = value;
         self
     }
 }
@@ -8090,12 +8093,12 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesWebFeed<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.128 = value.into();
+        self._fields.128 = value.into();
         self
     }
     /// Set the `webFeed` field to an Option value (optional)
     pub fn maybe_web_feed(mut self, value: Option<PodcastSeriesWebFeed<'a>>) -> Self {
-        self.__unsafe_private_named.128 = value;
+        self._fields.128 = value;
         self
     }
 }
@@ -8106,7 +8109,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesWordCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.129 = value.into();
+        self._fields.129 = value.into();
         self
     }
     /// Set the `wordCount` field to an Option value (optional)
@@ -8114,7 +8117,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesWordCount<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.129 = value;
+        self._fields.129 = value;
         self
     }
 }
@@ -8125,7 +8128,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesWorkExample<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.130 = value.into();
+        self._fields.130 = value.into();
         self
     }
     /// Set the `workExample` field to an Option value (optional)
@@ -8133,7 +8136,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesWorkExample<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.130 = value;
+        self._fields.130 = value;
         self
     }
 }
@@ -8144,7 +8147,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<PodcastSeriesWorkTranslation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.131 = value.into();
+        self._fields.131 = value.into();
         self
     }
     /// Set the `workTranslation` field to an Option value (optional)
@@ -8152,7 +8155,7 @@ impl<'a, S: podcast_series_state::State> PodcastSeriesBuilder<'a, S> {
         mut self,
         value: Option<PodcastSeriesWorkTranslation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.131 = value;
+        self._fields.131 = value;
         self
     }
 }
@@ -8164,138 +8167,138 @@ where
     /// Build the final struct
     pub fn build(self) -> PodcastSeries<'a> {
         PodcastSeries {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            actor: self.__unsafe_private_named.11,
-            additional_type: self.__unsafe_private_named.12,
-            aggregate_rating: self.__unsafe_private_named.13,
-            alternate_name: self.__unsafe_private_named.14,
-            alternative_headline: self.__unsafe_private_named.15,
-            archived_at: self.__unsafe_private_named.16,
-            assesses: self.__unsafe_private_named.17,
-            associated_media: self.__unsafe_private_named.18,
-            audience: self.__unsafe_private_named.19,
-            audio: self.__unsafe_private_named.20,
-            author: self.__unsafe_private_named.21,
-            award: self.__unsafe_private_named.22,
-            awards: self.__unsafe_private_named.23,
-            character: self.__unsafe_private_named.24,
-            citation: self.__unsafe_private_named.25,
-            comment: self.__unsafe_private_named.26,
-            comment_count: self.__unsafe_private_named.27,
-            conditions_of_access: self.__unsafe_private_named.28,
-            content_location: self.__unsafe_private_named.29,
-            content_rating: self.__unsafe_private_named.30,
-            content_reference_time: self.__unsafe_private_named.31,
-            contributor: self.__unsafe_private_named.32,
-            copyright_holder: self.__unsafe_private_named.33,
-            copyright_notice: self.__unsafe_private_named.34,
-            copyright_year: self.__unsafe_private_named.35,
-            correction: self.__unsafe_private_named.36,
-            country_of_origin: self.__unsafe_private_named.37,
-            creative_work_status: self.__unsafe_private_named.38,
-            creator: self.__unsafe_private_named.39,
-            credit_text: self.__unsafe_private_named.40,
-            date_created: self.__unsafe_private_named.41,
-            date_modified: self.__unsafe_private_named.42,
-            date_published: self.__unsafe_private_named.43,
-            description: self.__unsafe_private_named.44,
-            digital_source_type: self.__unsafe_private_named.45,
-            disambiguating_description: self.__unsafe_private_named.46,
-            discussion_url: self.__unsafe_private_named.47,
-            edit_eidr: self.__unsafe_private_named.48,
-            editor: self.__unsafe_private_named.49,
-            educational_alignment: self.__unsafe_private_named.50,
-            educational_level: self.__unsafe_private_named.51,
-            educational_use: self.__unsafe_private_named.52,
-            encoding: self.__unsafe_private_named.53,
-            encoding_format: self.__unsafe_private_named.54,
-            encodings: self.__unsafe_private_named.55,
-            end_date: self.__unsafe_private_named.56,
-            example_of_work: self.__unsafe_private_named.57,
-            expires: self.__unsafe_private_named.58,
-            file_format: self.__unsafe_private_named.59,
-            funder: self.__unsafe_private_named.60,
-            funding: self.__unsafe_private_named.61,
-            genre: self.__unsafe_private_named.62,
-            has_part: self.__unsafe_private_named.63,
-            headline: self.__unsafe_private_named.64,
-            identifier: self.__unsafe_private_named.65,
-            image: self.__unsafe_private_named.66,
-            in_language: self.__unsafe_private_named.67,
-            interaction_statistic: self.__unsafe_private_named.68,
-            interactivity_type: self.__unsafe_private_named.69,
-            interpreted_as_claim: self.__unsafe_private_named.70,
-            is_accessible_for_free: self.__unsafe_private_named.71,
-            is_based_on: self.__unsafe_private_named.72,
-            is_based_on_url: self.__unsafe_private_named.73,
-            is_family_friendly: self.__unsafe_private_named.74,
-            is_part_of: self.__unsafe_private_named.75,
-            issn: self.__unsafe_private_named.76,
-            keywords: self.__unsafe_private_named.77,
-            learning_resource_type: self.__unsafe_private_named.78,
-            license: self.__unsafe_private_named.79,
-            location_created: self.__unsafe_private_named.80,
-            main_entity: self.__unsafe_private_named.81,
-            main_entity_of_page: self.__unsafe_private_named.82,
-            maintainer: self.__unsafe_private_named.83,
-            material: self.__unsafe_private_named.84,
-            material_extent: self.__unsafe_private_named.85,
-            mentions: self.__unsafe_private_named.86,
-            name: self.__unsafe_private_named.87,
-            offers: self.__unsafe_private_named.88,
-            pattern: self.__unsafe_private_named.89,
-            position: self.__unsafe_private_named.90,
-            potential_action: self.__unsafe_private_named.91,
-            producer: self.__unsafe_private_named.92,
-            provider: self.__unsafe_private_named.93,
-            publication: self.__unsafe_private_named.94,
-            publisher: self.__unsafe_private_named.95,
-            publisher_imprint: self.__unsafe_private_named.96,
-            publishing_principles: self.__unsafe_private_named.97,
-            recorded_at: self.__unsafe_private_named.98,
-            released_event: self.__unsafe_private_named.99,
-            review: self.__unsafe_private_named.100,
-            reviews: self.__unsafe_private_named.101,
-            same_as: self.__unsafe_private_named.102,
-            schema_version: self.__unsafe_private_named.103,
-            sd_date_published: self.__unsafe_private_named.104,
-            sd_license: self.__unsafe_private_named.105,
-            sd_publisher: self.__unsafe_private_named.106,
-            size: self.__unsafe_private_named.107,
-            source_organization: self.__unsafe_private_named.108,
-            spatial: self.__unsafe_private_named.109,
-            spatial_coverage: self.__unsafe_private_named.110,
-            sponsor: self.__unsafe_private_named.111,
-            start_date: self.__unsafe_private_named.112,
-            subject_of: self.__unsafe_private_named.113,
-            teaches: self.__unsafe_private_named.114,
-            temporal: self.__unsafe_private_named.115,
-            temporal_coverage: self.__unsafe_private_named.116,
-            text: self.__unsafe_private_named.117,
-            thumbnail: self.__unsafe_private_named.118,
-            thumbnail_url: self.__unsafe_private_named.119,
-            time_required: self.__unsafe_private_named.120,
-            translation_of_work: self.__unsafe_private_named.121,
-            translator: self.__unsafe_private_named.122,
-            typical_age_range: self.__unsafe_private_named.123,
-            url: self.__unsafe_private_named.124,
-            usage_info: self.__unsafe_private_named.125,
-            version: self.__unsafe_private_named.126,
-            video: self.__unsafe_private_named.127,
-            web_feed: self.__unsafe_private_named.128,
-            word_count: self.__unsafe_private_named.129,
-            work_example: self.__unsafe_private_named.130,
-            work_translation: self.__unsafe_private_named.131,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            actor: self._fields.11,
+            additional_type: self._fields.12,
+            aggregate_rating: self._fields.13,
+            alternate_name: self._fields.14,
+            alternative_headline: self._fields.15,
+            archived_at: self._fields.16,
+            assesses: self._fields.17,
+            associated_media: self._fields.18,
+            audience: self._fields.19,
+            audio: self._fields.20,
+            author: self._fields.21,
+            award: self._fields.22,
+            awards: self._fields.23,
+            character: self._fields.24,
+            citation: self._fields.25,
+            comment: self._fields.26,
+            comment_count: self._fields.27,
+            conditions_of_access: self._fields.28,
+            content_location: self._fields.29,
+            content_rating: self._fields.30,
+            content_reference_time: self._fields.31,
+            contributor: self._fields.32,
+            copyright_holder: self._fields.33,
+            copyright_notice: self._fields.34,
+            copyright_year: self._fields.35,
+            correction: self._fields.36,
+            country_of_origin: self._fields.37,
+            creative_work_status: self._fields.38,
+            creator: self._fields.39,
+            credit_text: self._fields.40,
+            date_created: self._fields.41,
+            date_modified: self._fields.42,
+            date_published: self._fields.43,
+            description: self._fields.44,
+            digital_source_type: self._fields.45,
+            disambiguating_description: self._fields.46,
+            discussion_url: self._fields.47,
+            edit_eidr: self._fields.48,
+            editor: self._fields.49,
+            educational_alignment: self._fields.50,
+            educational_level: self._fields.51,
+            educational_use: self._fields.52,
+            encoding: self._fields.53,
+            encoding_format: self._fields.54,
+            encodings: self._fields.55,
+            end_date: self._fields.56,
+            example_of_work: self._fields.57,
+            expires: self._fields.58,
+            file_format: self._fields.59,
+            funder: self._fields.60,
+            funding: self._fields.61,
+            genre: self._fields.62,
+            has_part: self._fields.63,
+            headline: self._fields.64,
+            identifier: self._fields.65,
+            image: self._fields.66,
+            in_language: self._fields.67,
+            interaction_statistic: self._fields.68,
+            interactivity_type: self._fields.69,
+            interpreted_as_claim: self._fields.70,
+            is_accessible_for_free: self._fields.71,
+            is_based_on: self._fields.72,
+            is_based_on_url: self._fields.73,
+            is_family_friendly: self._fields.74,
+            is_part_of: self._fields.75,
+            issn: self._fields.76,
+            keywords: self._fields.77,
+            learning_resource_type: self._fields.78,
+            license: self._fields.79,
+            location_created: self._fields.80,
+            main_entity: self._fields.81,
+            main_entity_of_page: self._fields.82,
+            maintainer: self._fields.83,
+            material: self._fields.84,
+            material_extent: self._fields.85,
+            mentions: self._fields.86,
+            name: self._fields.87,
+            offers: self._fields.88,
+            pattern: self._fields.89,
+            position: self._fields.90,
+            potential_action: self._fields.91,
+            producer: self._fields.92,
+            provider: self._fields.93,
+            publication: self._fields.94,
+            publisher: self._fields.95,
+            publisher_imprint: self._fields.96,
+            publishing_principles: self._fields.97,
+            recorded_at: self._fields.98,
+            released_event: self._fields.99,
+            review: self._fields.100,
+            reviews: self._fields.101,
+            same_as: self._fields.102,
+            schema_version: self._fields.103,
+            sd_date_published: self._fields.104,
+            sd_license: self._fields.105,
+            sd_publisher: self._fields.106,
+            size: self._fields.107,
+            source_organization: self._fields.108,
+            spatial: self._fields.109,
+            spatial_coverage: self._fields.110,
+            sponsor: self._fields.111,
+            start_date: self._fields.112,
+            subject_of: self._fields.113,
+            teaches: self._fields.114,
+            temporal: self._fields.115,
+            temporal_coverage: self._fields.116,
+            text: self._fields.117,
+            thumbnail: self._fields.118,
+            thumbnail_url: self._fields.119,
+            time_required: self._fields.120,
+            translation_of_work: self._fields.121,
+            translator: self._fields.122,
+            typical_age_range: self._fields.123,
+            url: self._fields.124,
+            usage_info: self._fields.125,
+            version: self._fields.126,
+            video: self._fields.127,
+            web_feed: self._fields.128,
+            word_count: self._fields.129,
+            work_example: self._fields.130,
+            work_translation: self._fields.131,
             extra_data: Default::default(),
         }
     }
@@ -8305,138 +8308,138 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> PodcastSeries<'a> {
         PodcastSeries {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            actor: self.__unsafe_private_named.11,
-            additional_type: self.__unsafe_private_named.12,
-            aggregate_rating: self.__unsafe_private_named.13,
-            alternate_name: self.__unsafe_private_named.14,
-            alternative_headline: self.__unsafe_private_named.15,
-            archived_at: self.__unsafe_private_named.16,
-            assesses: self.__unsafe_private_named.17,
-            associated_media: self.__unsafe_private_named.18,
-            audience: self.__unsafe_private_named.19,
-            audio: self.__unsafe_private_named.20,
-            author: self.__unsafe_private_named.21,
-            award: self.__unsafe_private_named.22,
-            awards: self.__unsafe_private_named.23,
-            character: self.__unsafe_private_named.24,
-            citation: self.__unsafe_private_named.25,
-            comment: self.__unsafe_private_named.26,
-            comment_count: self.__unsafe_private_named.27,
-            conditions_of_access: self.__unsafe_private_named.28,
-            content_location: self.__unsafe_private_named.29,
-            content_rating: self.__unsafe_private_named.30,
-            content_reference_time: self.__unsafe_private_named.31,
-            contributor: self.__unsafe_private_named.32,
-            copyright_holder: self.__unsafe_private_named.33,
-            copyright_notice: self.__unsafe_private_named.34,
-            copyright_year: self.__unsafe_private_named.35,
-            correction: self.__unsafe_private_named.36,
-            country_of_origin: self.__unsafe_private_named.37,
-            creative_work_status: self.__unsafe_private_named.38,
-            creator: self.__unsafe_private_named.39,
-            credit_text: self.__unsafe_private_named.40,
-            date_created: self.__unsafe_private_named.41,
-            date_modified: self.__unsafe_private_named.42,
-            date_published: self.__unsafe_private_named.43,
-            description: self.__unsafe_private_named.44,
-            digital_source_type: self.__unsafe_private_named.45,
-            disambiguating_description: self.__unsafe_private_named.46,
-            discussion_url: self.__unsafe_private_named.47,
-            edit_eidr: self.__unsafe_private_named.48,
-            editor: self.__unsafe_private_named.49,
-            educational_alignment: self.__unsafe_private_named.50,
-            educational_level: self.__unsafe_private_named.51,
-            educational_use: self.__unsafe_private_named.52,
-            encoding: self.__unsafe_private_named.53,
-            encoding_format: self.__unsafe_private_named.54,
-            encodings: self.__unsafe_private_named.55,
-            end_date: self.__unsafe_private_named.56,
-            example_of_work: self.__unsafe_private_named.57,
-            expires: self.__unsafe_private_named.58,
-            file_format: self.__unsafe_private_named.59,
-            funder: self.__unsafe_private_named.60,
-            funding: self.__unsafe_private_named.61,
-            genre: self.__unsafe_private_named.62,
-            has_part: self.__unsafe_private_named.63,
-            headline: self.__unsafe_private_named.64,
-            identifier: self.__unsafe_private_named.65,
-            image: self.__unsafe_private_named.66,
-            in_language: self.__unsafe_private_named.67,
-            interaction_statistic: self.__unsafe_private_named.68,
-            interactivity_type: self.__unsafe_private_named.69,
-            interpreted_as_claim: self.__unsafe_private_named.70,
-            is_accessible_for_free: self.__unsafe_private_named.71,
-            is_based_on: self.__unsafe_private_named.72,
-            is_based_on_url: self.__unsafe_private_named.73,
-            is_family_friendly: self.__unsafe_private_named.74,
-            is_part_of: self.__unsafe_private_named.75,
-            issn: self.__unsafe_private_named.76,
-            keywords: self.__unsafe_private_named.77,
-            learning_resource_type: self.__unsafe_private_named.78,
-            license: self.__unsafe_private_named.79,
-            location_created: self.__unsafe_private_named.80,
-            main_entity: self.__unsafe_private_named.81,
-            main_entity_of_page: self.__unsafe_private_named.82,
-            maintainer: self.__unsafe_private_named.83,
-            material: self.__unsafe_private_named.84,
-            material_extent: self.__unsafe_private_named.85,
-            mentions: self.__unsafe_private_named.86,
-            name: self.__unsafe_private_named.87,
-            offers: self.__unsafe_private_named.88,
-            pattern: self.__unsafe_private_named.89,
-            position: self.__unsafe_private_named.90,
-            potential_action: self.__unsafe_private_named.91,
-            producer: self.__unsafe_private_named.92,
-            provider: self.__unsafe_private_named.93,
-            publication: self.__unsafe_private_named.94,
-            publisher: self.__unsafe_private_named.95,
-            publisher_imprint: self.__unsafe_private_named.96,
-            publishing_principles: self.__unsafe_private_named.97,
-            recorded_at: self.__unsafe_private_named.98,
-            released_event: self.__unsafe_private_named.99,
-            review: self.__unsafe_private_named.100,
-            reviews: self.__unsafe_private_named.101,
-            same_as: self.__unsafe_private_named.102,
-            schema_version: self.__unsafe_private_named.103,
-            sd_date_published: self.__unsafe_private_named.104,
-            sd_license: self.__unsafe_private_named.105,
-            sd_publisher: self.__unsafe_private_named.106,
-            size: self.__unsafe_private_named.107,
-            source_organization: self.__unsafe_private_named.108,
-            spatial: self.__unsafe_private_named.109,
-            spatial_coverage: self.__unsafe_private_named.110,
-            sponsor: self.__unsafe_private_named.111,
-            start_date: self.__unsafe_private_named.112,
-            subject_of: self.__unsafe_private_named.113,
-            teaches: self.__unsafe_private_named.114,
-            temporal: self.__unsafe_private_named.115,
-            temporal_coverage: self.__unsafe_private_named.116,
-            text: self.__unsafe_private_named.117,
-            thumbnail: self.__unsafe_private_named.118,
-            thumbnail_url: self.__unsafe_private_named.119,
-            time_required: self.__unsafe_private_named.120,
-            translation_of_work: self.__unsafe_private_named.121,
-            translator: self.__unsafe_private_named.122,
-            typical_age_range: self.__unsafe_private_named.123,
-            url: self.__unsafe_private_named.124,
-            usage_info: self.__unsafe_private_named.125,
-            version: self.__unsafe_private_named.126,
-            video: self.__unsafe_private_named.127,
-            web_feed: self.__unsafe_private_named.128,
-            word_count: self.__unsafe_private_named.129,
-            work_example: self.__unsafe_private_named.130,
-            work_translation: self.__unsafe_private_named.131,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            actor: self._fields.11,
+            additional_type: self._fields.12,
+            aggregate_rating: self._fields.13,
+            alternate_name: self._fields.14,
+            alternative_headline: self._fields.15,
+            archived_at: self._fields.16,
+            assesses: self._fields.17,
+            associated_media: self._fields.18,
+            audience: self._fields.19,
+            audio: self._fields.20,
+            author: self._fields.21,
+            award: self._fields.22,
+            awards: self._fields.23,
+            character: self._fields.24,
+            citation: self._fields.25,
+            comment: self._fields.26,
+            comment_count: self._fields.27,
+            conditions_of_access: self._fields.28,
+            content_location: self._fields.29,
+            content_rating: self._fields.30,
+            content_reference_time: self._fields.31,
+            contributor: self._fields.32,
+            copyright_holder: self._fields.33,
+            copyright_notice: self._fields.34,
+            copyright_year: self._fields.35,
+            correction: self._fields.36,
+            country_of_origin: self._fields.37,
+            creative_work_status: self._fields.38,
+            creator: self._fields.39,
+            credit_text: self._fields.40,
+            date_created: self._fields.41,
+            date_modified: self._fields.42,
+            date_published: self._fields.43,
+            description: self._fields.44,
+            digital_source_type: self._fields.45,
+            disambiguating_description: self._fields.46,
+            discussion_url: self._fields.47,
+            edit_eidr: self._fields.48,
+            editor: self._fields.49,
+            educational_alignment: self._fields.50,
+            educational_level: self._fields.51,
+            educational_use: self._fields.52,
+            encoding: self._fields.53,
+            encoding_format: self._fields.54,
+            encodings: self._fields.55,
+            end_date: self._fields.56,
+            example_of_work: self._fields.57,
+            expires: self._fields.58,
+            file_format: self._fields.59,
+            funder: self._fields.60,
+            funding: self._fields.61,
+            genre: self._fields.62,
+            has_part: self._fields.63,
+            headline: self._fields.64,
+            identifier: self._fields.65,
+            image: self._fields.66,
+            in_language: self._fields.67,
+            interaction_statistic: self._fields.68,
+            interactivity_type: self._fields.69,
+            interpreted_as_claim: self._fields.70,
+            is_accessible_for_free: self._fields.71,
+            is_based_on: self._fields.72,
+            is_based_on_url: self._fields.73,
+            is_family_friendly: self._fields.74,
+            is_part_of: self._fields.75,
+            issn: self._fields.76,
+            keywords: self._fields.77,
+            learning_resource_type: self._fields.78,
+            license: self._fields.79,
+            location_created: self._fields.80,
+            main_entity: self._fields.81,
+            main_entity_of_page: self._fields.82,
+            maintainer: self._fields.83,
+            material: self._fields.84,
+            material_extent: self._fields.85,
+            mentions: self._fields.86,
+            name: self._fields.87,
+            offers: self._fields.88,
+            pattern: self._fields.89,
+            position: self._fields.90,
+            potential_action: self._fields.91,
+            producer: self._fields.92,
+            provider: self._fields.93,
+            publication: self._fields.94,
+            publisher: self._fields.95,
+            publisher_imprint: self._fields.96,
+            publishing_principles: self._fields.97,
+            recorded_at: self._fields.98,
+            released_event: self._fields.99,
+            review: self._fields.100,
+            reviews: self._fields.101,
+            same_as: self._fields.102,
+            schema_version: self._fields.103,
+            sd_date_published: self._fields.104,
+            sd_license: self._fields.105,
+            sd_publisher: self._fields.106,
+            size: self._fields.107,
+            source_organization: self._fields.108,
+            spatial: self._fields.109,
+            spatial_coverage: self._fields.110,
+            sponsor: self._fields.111,
+            start_date: self._fields.112,
+            subject_of: self._fields.113,
+            teaches: self._fields.114,
+            temporal: self._fields.115,
+            temporal_coverage: self._fields.116,
+            text: self._fields.117,
+            thumbnail: self._fields.118,
+            thumbnail_url: self._fields.119,
+            time_required: self._fields.120,
+            translation_of_work: self._fields.121,
+            translator: self._fields.122,
+            typical_age_range: self._fields.123,
+            url: self._fields.124,
+            usage_info: self._fields.125,
+            version: self._fields.126,
+            video: self._fields.127,
+            web_feed: self._fields.128,
+            word_count: self._fields.129,
+            work_example: self._fields.130,
+            work_translation: self._fields.131,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/product.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/product.rs
index bc1b0385..51fafe8d 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/product.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/product.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -3071,8 +3074,8 @@ pub mod product_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProductBuilder<'a, S: product_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProductAdditionalProperty<'a>>,
         Option<ProductAdditionalType<'a>>,
         Option<ProductAggregateRating<'a>>,
@@ -3145,7 +3148,7 @@ pub struct ProductBuilder<'a, S: product_state::State> {
         Option<ProductWeight<'a>>,
         Option<ProductWidth<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Product<'a> {
@@ -3159,8 +3162,8 @@ impl<'a> ProductBuilder<'a, product_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProductBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -3233,7 +3236,7 @@ impl<'a> ProductBuilder<'a, product_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3244,7 +3247,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductAdditionalProperty<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `additionalProperty` field to an Option value (optional)
@@ -3252,7 +3255,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductAdditionalProperty<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -3263,7 +3266,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -3271,7 +3274,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3282,7 +3285,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -3290,7 +3293,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -3301,7 +3304,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -3309,7 +3312,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -3317,12 +3320,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `asin` field (optional)
     pub fn asin(mut self, value: impl Into<Option<ProductAsin<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `asin` field to an Option value (optional)
     pub fn maybe_asin(mut self, value: Option<ProductAsin<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -3330,12 +3333,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `audience` field (optional)
     pub fn audience(mut self, value: impl Into<Option<ProductAudience<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `audience` field to an Option value (optional)
     pub fn maybe_audience(mut self, value: Option<ProductAudience<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -3343,12 +3346,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<ProductAward<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<ProductAward<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -3356,12 +3359,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<ProductAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<ProductAwards<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -3369,12 +3372,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `brand` field (optional)
     pub fn brand(mut self, value: impl Into<Option<ProductBrand<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `brand` field to an Option value (optional)
     pub fn maybe_brand(mut self, value: Option<ProductBrand<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -3382,12 +3385,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<ProductCategory<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<ProductCategory<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -3395,12 +3398,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `color` field (optional)
     pub fn color(mut self, value: impl Into<Option<ProductColor<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `color` field to an Option value (optional)
     pub fn maybe_color(mut self, value: Option<ProductColor<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -3411,12 +3414,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductColorSwatch<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `colorSwatch` field to an Option value (optional)
     pub fn maybe_color_swatch(mut self, value: Option<ProductColorSwatch<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -3427,7 +3430,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductCountryOfAssembly<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `countryOfAssembly` field to an Option value (optional)
@@ -3435,7 +3438,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductCountryOfAssembly<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -3446,7 +3449,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductCountryOfLastProcessing<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `countryOfLastProcessing` field to an Option value (optional)
@@ -3454,7 +3457,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductCountryOfLastProcessing<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -3465,7 +3468,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductCountryOfOrigin<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `countryOfOrigin` field to an Option value (optional)
@@ -3473,7 +3476,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductCountryOfOrigin<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -3481,12 +3484,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `depth` field (optional)
     pub fn depth(mut self, value: impl Into<Option<ProductDepth<'a>>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `depth` field to an Option value (optional)
     pub fn maybe_depth(mut self, value: Option<ProductDepth<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -3497,12 +3500,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<ProductDescription<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -3513,7 +3516,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -3521,7 +3524,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -3529,12 +3532,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<ProductFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<ProductFunding<'a>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -3542,12 +3545,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `gtin` field (optional)
     pub fn gtin(mut self, value: impl Into<Option<ProductGtin<'a>>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `gtin` field to an Option value (optional)
     pub fn maybe_gtin(mut self, value: Option<ProductGtin<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -3555,12 +3558,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `gtin12` field (optional)
     pub fn gtin12(mut self, value: impl Into<Option<ProductGtin12<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `gtin12` field to an Option value (optional)
     pub fn maybe_gtin12(mut self, value: Option<ProductGtin12<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -3568,12 +3571,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `gtin13` field (optional)
     pub fn gtin13(mut self, value: impl Into<Option<ProductGtin13<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `gtin13` field to an Option value (optional)
     pub fn maybe_gtin13(mut self, value: Option<ProductGtin13<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -3581,12 +3584,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `gtin14` field (optional)
     pub fn gtin14(mut self, value: impl Into<Option<ProductGtin14<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `gtin14` field to an Option value (optional)
     pub fn maybe_gtin14(mut self, value: Option<ProductGtin14<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -3594,12 +3597,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `gtin8` field (optional)
     pub fn gtin8(mut self, value: impl Into<Option<ProductGtin8<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `gtin8` field to an Option value (optional)
     pub fn maybe_gtin8(mut self, value: Option<ProductGtin8<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -3610,7 +3613,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductHasAdultConsideration<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `hasAdultConsideration` field to an Option value (optional)
@@ -3618,7 +3621,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductHasAdultConsideration<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -3629,7 +3632,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductHasCertification<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `hasCertification` field to an Option value (optional)
@@ -3637,7 +3640,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductHasCertification<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -3648,7 +3651,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductHasEnergyConsumptionDetails<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `hasEnergyConsumptionDetails` field to an Option value (optional)
@@ -3656,7 +3659,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductHasEnergyConsumptionDetails<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -3667,7 +3670,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductHasGs1DigitalLink<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `hasGS1DigitalLink` field to an Option value (optional)
@@ -3675,7 +3678,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductHasGs1DigitalLink<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -3686,7 +3689,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductHasMeasurement<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `hasMeasurement` field to an Option value (optional)
@@ -3694,7 +3697,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductHasMeasurement<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -3705,7 +3708,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductHasMerchantReturnPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `hasMerchantReturnPolicy` field to an Option value (optional)
@@ -3713,7 +3716,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductHasMerchantReturnPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -3724,7 +3727,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductHasProductReturnPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `hasProductReturnPolicy` field to an Option value (optional)
@@ -3732,7 +3735,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductHasProductReturnPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -3740,12 +3743,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `height` field (optional)
     pub fn height(mut self, value: impl Into<Option<ProductHeight<'a>>>) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `height` field to an Option value (optional)
     pub fn maybe_height(mut self, value: Option<ProductHeight<'a>>) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -3756,12 +3759,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductIdentifier<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<ProductIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -3769,12 +3772,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<ProductImage<'a>>>) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<ProductImage<'a>>) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -3785,7 +3788,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductInProductGroupWithId<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `inProductGroupWithID` field to an Option value (optional)
@@ -3793,7 +3796,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductInProductGroupWithId<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -3804,7 +3807,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductIsAccessoryOrSparePartFor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `isAccessoryOrSparePartFor` field to an Option value (optional)
@@ -3812,7 +3815,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductIsAccessoryOrSparePartFor<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -3823,7 +3826,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductIsConsumableFor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `isConsumableFor` field to an Option value (optional)
@@ -3831,7 +3834,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductIsConsumableFor<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -3842,7 +3845,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductIsFamilyFriendly<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `isFamilyFriendly` field to an Option value (optional)
@@ -3850,7 +3853,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductIsFamilyFriendly<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -3861,12 +3864,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductIsRelatedTo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `isRelatedTo` field to an Option value (optional)
     pub fn maybe_is_related_to(mut self, value: Option<ProductIsRelatedTo<'a>>) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -3877,12 +3880,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductIsSimilarTo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `isSimilarTo` field to an Option value (optional)
     pub fn maybe_is_similar_to(mut self, value: Option<ProductIsSimilarTo<'a>>) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -3893,12 +3896,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductIsVariantOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `isVariantOf` field to an Option value (optional)
     pub fn maybe_is_variant_of(mut self, value: Option<ProductIsVariantOf<'a>>) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -3909,7 +3912,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductItemCondition<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `itemCondition` field to an Option value (optional)
@@ -3917,7 +3920,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductItemCondition<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -3925,12 +3928,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<ProductKeywords<'a>>>) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<ProductKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -3938,12 +3941,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `logo` field (optional)
     pub fn logo(mut self, value: impl Into<Option<ProductLogo<'a>>>) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `logo` field to an Option value (optional)
     pub fn maybe_logo(mut self, value: Option<ProductLogo<'a>>) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -3954,7 +3957,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -3962,7 +3965,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -3973,12 +3976,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductManufacturer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `manufacturer` field to an Option value (optional)
     pub fn maybe_manufacturer(mut self, value: Option<ProductManufacturer<'a>>) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -3986,12 +3989,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `material` field (optional)
     pub fn material(mut self, value: impl Into<Option<ProductMaterial<'a>>>) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `material` field to an Option value (optional)
     pub fn maybe_material(mut self, value: Option<ProductMaterial<'a>>) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -3999,12 +4002,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `mobileUrl` field (optional)
     pub fn mobile_url(mut self, value: impl Into<Option<ProductMobileUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `mobileUrl` field to an Option value (optional)
     pub fn maybe_mobile_url(mut self, value: Option<ProductMobileUrl<'a>>) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -4012,12 +4015,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `model` field (optional)
     pub fn model(mut self, value: impl Into<Option<ProductModel<'a>>>) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `model` field to an Option value (optional)
     pub fn maybe_model(mut self, value: Option<ProductModel<'a>>) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -4025,12 +4028,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `mpn` field (optional)
     pub fn mpn(mut self, value: impl Into<Option<ProductMpn<'a>>>) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `mpn` field to an Option value (optional)
     pub fn maybe_mpn(mut self, value: Option<ProductMpn<'a>>) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -4038,12 +4041,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<ProductName<'a>>>) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<ProductName<'a>>) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -4054,7 +4057,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductNegativeNotes<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `negativeNotes` field to an Option value (optional)
@@ -4062,7 +4065,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductNegativeNotes<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -4070,12 +4073,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `nsn` field (optional)
     pub fn nsn(mut self, value: impl Into<Option<ProductNsn<'a>>>) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `nsn` field to an Option value (optional)
     pub fn maybe_nsn(mut self, value: Option<ProductNsn<'a>>) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -4083,12 +4086,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `offers` field (optional)
     pub fn offers(mut self, value: impl Into<Option<ProductOffers<'a>>>) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `offers` field to an Option value (optional)
     pub fn maybe_offers(mut self, value: Option<ProductOffers<'a>>) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -4096,12 +4099,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `pattern` field (optional)
     pub fn pattern(mut self, value: impl Into<Option<ProductPattern<'a>>>) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `pattern` field to an Option value (optional)
     pub fn maybe_pattern(mut self, value: Option<ProductPattern<'a>>) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -4112,7 +4115,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductPositiveNotes<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `positiveNotes` field to an Option value (optional)
@@ -4120,7 +4123,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductPositiveNotes<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -4131,7 +4134,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductPotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -4139,7 +4142,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductPotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -4147,12 +4150,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `productID` field (optional)
     pub fn product_id(mut self, value: impl Into<Option<ProductProductId<'a>>>) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `productID` field to an Option value (optional)
     pub fn maybe_product_id(mut self, value: Option<ProductProductId<'a>>) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -4163,7 +4166,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductProductionDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `productionDate` field to an Option value (optional)
@@ -4171,7 +4174,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductProductionDate<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -4182,7 +4185,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductPurchaseDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `purchaseDate` field to an Option value (optional)
@@ -4190,7 +4193,7 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: Option<ProductPurchaseDate<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -4201,12 +4204,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProductReleaseDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `releaseDate` field to an Option value (optional)
     pub fn maybe_release_date(mut self, value: Option<ProductReleaseDate<'a>>) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -4214,12 +4217,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<ProductReview<'a>>>) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<ProductReview<'a>>) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -4227,12 +4230,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `reviews` field (optional)
     pub fn reviews(mut self, value: impl Into<Option<ProductReviews<'a>>>) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<ProductReviews<'a>>) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -4240,12 +4243,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<ProductSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<ProductSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -4253,12 +4256,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<ProductSize<'a>>>) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<ProductSize<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -4266,12 +4269,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `sku` field (optional)
     pub fn sku(mut self, value: impl Into<Option<ProductSku<'a>>>) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `sku` field to an Option value (optional)
     pub fn maybe_sku(mut self, value: Option<ProductSku<'a>>) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -4279,12 +4282,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `slogan` field (optional)
     pub fn slogan(mut self, value: impl Into<Option<ProductSlogan<'a>>>) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `slogan` field to an Option value (optional)
     pub fn maybe_slogan(mut self, value: Option<ProductSlogan<'a>>) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -4292,12 +4295,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `subjectOf` field (optional)
     pub fn subject_of(mut self, value: impl Into<Option<ProductSubjectOf<'a>>>) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<ProductSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -4305,12 +4308,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<ProductUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<ProductUrl<'a>>) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -4318,12 +4321,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `weight` field (optional)
     pub fn weight(mut self, value: impl Into<Option<ProductWeight<'a>>>) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `weight` field to an Option value (optional)
     pub fn maybe_weight(mut self, value: Option<ProductWeight<'a>>) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -4331,12 +4334,12 @@ impl<'a, S: product_state::State> ProductBuilder<'a, S> {
 impl<'a, S: product_state::State> ProductBuilder<'a, S> {
     /// Set the `width` field (optional)
     pub fn width(mut self, value: impl Into<Option<ProductWidth<'a>>>) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `width` field to an Option value (optional)
     pub fn maybe_width(mut self, value: Option<ProductWidth<'a>>) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -4348,77 +4351,77 @@ where
     /// Build the final struct
     pub fn build(self) -> Product<'a> {
         Product {
-            additional_property: self.__unsafe_private_named.0,
-            additional_type: self.__unsafe_private_named.1,
-            aggregate_rating: self.__unsafe_private_named.2,
-            alternate_name: self.__unsafe_private_named.3,
-            asin: self.__unsafe_private_named.4,
-            audience: self.__unsafe_private_named.5,
-            award: self.__unsafe_private_named.6,
-            awards: self.__unsafe_private_named.7,
-            brand: self.__unsafe_private_named.8,
-            category: self.__unsafe_private_named.9,
-            color: self.__unsafe_private_named.10,
-            color_swatch: self.__unsafe_private_named.11,
-            country_of_assembly: self.__unsafe_private_named.12,
-            country_of_last_processing: self.__unsafe_private_named.13,
-            country_of_origin: self.__unsafe_private_named.14,
-            depth: self.__unsafe_private_named.15,
-            description: self.__unsafe_private_named.16,
-            disambiguating_description: self.__unsafe_private_named.17,
-            funding: self.__unsafe_private_named.18,
-            gtin: self.__unsafe_private_named.19,
-            gtin12: self.__unsafe_private_named.20,
-            gtin13: self.__unsafe_private_named.21,
-            gtin14: self.__unsafe_private_named.22,
-            gtin8: self.__unsafe_private_named.23,
-            has_adult_consideration: self.__unsafe_private_named.24,
-            has_certification: self.__unsafe_private_named.25,
-            has_energy_consumption_details: self.__unsafe_private_named.26,
-            has_gs1_digital_link: self.__unsafe_private_named.27,
-            has_measurement: self.__unsafe_private_named.28,
-            has_merchant_return_policy: self.__unsafe_private_named.29,
-            has_product_return_policy: self.__unsafe_private_named.30,
-            height: self.__unsafe_private_named.31,
-            identifier: self.__unsafe_private_named.32,
-            image: self.__unsafe_private_named.33,
-            in_product_group_with_id: self.__unsafe_private_named.34,
-            is_accessory_or_spare_part_for: self.__unsafe_private_named.35,
-            is_consumable_for: self.__unsafe_private_named.36,
-            is_family_friendly: self.__unsafe_private_named.37,
-            is_related_to: self.__unsafe_private_named.38,
-            is_similar_to: self.__unsafe_private_named.39,
-            is_variant_of: self.__unsafe_private_named.40,
-            item_condition: self.__unsafe_private_named.41,
-            keywords: self.__unsafe_private_named.42,
-            logo: self.__unsafe_private_named.43,
-            main_entity_of_page: self.__unsafe_private_named.44,
-            manufacturer: self.__unsafe_private_named.45,
-            material: self.__unsafe_private_named.46,
-            mobile_url: self.__unsafe_private_named.47,
-            model: self.__unsafe_private_named.48,
-            mpn: self.__unsafe_private_named.49,
-            name: self.__unsafe_private_named.50,
-            negative_notes: self.__unsafe_private_named.51,
-            nsn: self.__unsafe_private_named.52,
-            offers: self.__unsafe_private_named.53,
-            pattern: self.__unsafe_private_named.54,
-            positive_notes: self.__unsafe_private_named.55,
-            potential_action: self.__unsafe_private_named.56,
-            product_id: self.__unsafe_private_named.57,
-            production_date: self.__unsafe_private_named.58,
-            purchase_date: self.__unsafe_private_named.59,
-            release_date: self.__unsafe_private_named.60,
-            review: self.__unsafe_private_named.61,
-            reviews: self.__unsafe_private_named.62,
-            same_as: self.__unsafe_private_named.63,
-            size: self.__unsafe_private_named.64,
-            sku: self.__unsafe_private_named.65,
-            slogan: self.__unsafe_private_named.66,
-            subject_of: self.__unsafe_private_named.67,
-            url: self.__unsafe_private_named.68,
-            weight: self.__unsafe_private_named.69,
-            width: self.__unsafe_private_named.70,
+            additional_property: self._fields.0,
+            additional_type: self._fields.1,
+            aggregate_rating: self._fields.2,
+            alternate_name: self._fields.3,
+            asin: self._fields.4,
+            audience: self._fields.5,
+            award: self._fields.6,
+            awards: self._fields.7,
+            brand: self._fields.8,
+            category: self._fields.9,
+            color: self._fields.10,
+            color_swatch: self._fields.11,
+            country_of_assembly: self._fields.12,
+            country_of_last_processing: self._fields.13,
+            country_of_origin: self._fields.14,
+            depth: self._fields.15,
+            description: self._fields.16,
+            disambiguating_description: self._fields.17,
+            funding: self._fields.18,
+            gtin: self._fields.19,
+            gtin12: self._fields.20,
+            gtin13: self._fields.21,
+            gtin14: self._fields.22,
+            gtin8: self._fields.23,
+            has_adult_consideration: self._fields.24,
+            has_certification: self._fields.25,
+            has_energy_consumption_details: self._fields.26,
+            has_gs1_digital_link: self._fields.27,
+            has_measurement: self._fields.28,
+            has_merchant_return_policy: self._fields.29,
+            has_product_return_policy: self._fields.30,
+            height: self._fields.31,
+            identifier: self._fields.32,
+            image: self._fields.33,
+            in_product_group_with_id: self._fields.34,
+            is_accessory_or_spare_part_for: self._fields.35,
+            is_consumable_for: self._fields.36,
+            is_family_friendly: self._fields.37,
+            is_related_to: self._fields.38,
+            is_similar_to: self._fields.39,
+            is_variant_of: self._fields.40,
+            item_condition: self._fields.41,
+            keywords: self._fields.42,
+            logo: self._fields.43,
+            main_entity_of_page: self._fields.44,
+            manufacturer: self._fields.45,
+            material: self._fields.46,
+            mobile_url: self._fields.47,
+            model: self._fields.48,
+            mpn: self._fields.49,
+            name: self._fields.50,
+            negative_notes: self._fields.51,
+            nsn: self._fields.52,
+            offers: self._fields.53,
+            pattern: self._fields.54,
+            positive_notes: self._fields.55,
+            potential_action: self._fields.56,
+            product_id: self._fields.57,
+            production_date: self._fields.58,
+            purchase_date: self._fields.59,
+            release_date: self._fields.60,
+            review: self._fields.61,
+            reviews: self._fields.62,
+            same_as: self._fields.63,
+            size: self._fields.64,
+            sku: self._fields.65,
+            slogan: self._fields.66,
+            subject_of: self._fields.67,
+            url: self._fields.68,
+            weight: self._fields.69,
+            width: self._fields.70,
             extra_data: Default::default(),
         }
     }
@@ -4428,77 +4431,77 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Product<'a> {
         Product {
-            additional_property: self.__unsafe_private_named.0,
-            additional_type: self.__unsafe_private_named.1,
-            aggregate_rating: self.__unsafe_private_named.2,
-            alternate_name: self.__unsafe_private_named.3,
-            asin: self.__unsafe_private_named.4,
-            audience: self.__unsafe_private_named.5,
-            award: self.__unsafe_private_named.6,
-            awards: self.__unsafe_private_named.7,
-            brand: self.__unsafe_private_named.8,
-            category: self.__unsafe_private_named.9,
-            color: self.__unsafe_private_named.10,
-            color_swatch: self.__unsafe_private_named.11,
-            country_of_assembly: self.__unsafe_private_named.12,
-            country_of_last_processing: self.__unsafe_private_named.13,
-            country_of_origin: self.__unsafe_private_named.14,
-            depth: self.__unsafe_private_named.15,
-            description: self.__unsafe_private_named.16,
-            disambiguating_description: self.__unsafe_private_named.17,
-            funding: self.__unsafe_private_named.18,
-            gtin: self.__unsafe_private_named.19,
-            gtin12: self.__unsafe_private_named.20,
-            gtin13: self.__unsafe_private_named.21,
-            gtin14: self.__unsafe_private_named.22,
-            gtin8: self.__unsafe_private_named.23,
-            has_adult_consideration: self.__unsafe_private_named.24,
-            has_certification: self.__unsafe_private_named.25,
-            has_energy_consumption_details: self.__unsafe_private_named.26,
-            has_gs1_digital_link: self.__unsafe_private_named.27,
-            has_measurement: self.__unsafe_private_named.28,
-            has_merchant_return_policy: self.__unsafe_private_named.29,
-            has_product_return_policy: self.__unsafe_private_named.30,
-            height: self.__unsafe_private_named.31,
-            identifier: self.__unsafe_private_named.32,
-            image: self.__unsafe_private_named.33,
-            in_product_group_with_id: self.__unsafe_private_named.34,
-            is_accessory_or_spare_part_for: self.__unsafe_private_named.35,
-            is_consumable_for: self.__unsafe_private_named.36,
-            is_family_friendly: self.__unsafe_private_named.37,
-            is_related_to: self.__unsafe_private_named.38,
-            is_similar_to: self.__unsafe_private_named.39,
-            is_variant_of: self.__unsafe_private_named.40,
-            item_condition: self.__unsafe_private_named.41,
-            keywords: self.__unsafe_private_named.42,
-            logo: self.__unsafe_private_named.43,
-            main_entity_of_page: self.__unsafe_private_named.44,
-            manufacturer: self.__unsafe_private_named.45,
-            material: self.__unsafe_private_named.46,
-            mobile_url: self.__unsafe_private_named.47,
-            model: self.__unsafe_private_named.48,
-            mpn: self.__unsafe_private_named.49,
-            name: self.__unsafe_private_named.50,
-            negative_notes: self.__unsafe_private_named.51,
-            nsn: self.__unsafe_private_named.52,
-            offers: self.__unsafe_private_named.53,
-            pattern: self.__unsafe_private_named.54,
-            positive_notes: self.__unsafe_private_named.55,
-            potential_action: self.__unsafe_private_named.56,
-            product_id: self.__unsafe_private_named.57,
-            production_date: self.__unsafe_private_named.58,
-            purchase_date: self.__unsafe_private_named.59,
-            release_date: self.__unsafe_private_named.60,
-            review: self.__unsafe_private_named.61,
-            reviews: self.__unsafe_private_named.62,
-            same_as: self.__unsafe_private_named.63,
-            size: self.__unsafe_private_named.64,
-            sku: self.__unsafe_private_named.65,
-            slogan: self.__unsafe_private_named.66,
-            subject_of: self.__unsafe_private_named.67,
-            url: self.__unsafe_private_named.68,
-            weight: self.__unsafe_private_named.69,
-            width: self.__unsafe_private_named.70,
+            additional_property: self._fields.0,
+            additional_type: self._fields.1,
+            aggregate_rating: self._fields.2,
+            alternate_name: self._fields.3,
+            asin: self._fields.4,
+            audience: self._fields.5,
+            award: self._fields.6,
+            awards: self._fields.7,
+            brand: self._fields.8,
+            category: self._fields.9,
+            color: self._fields.10,
+            color_swatch: self._fields.11,
+            country_of_assembly: self._fields.12,
+            country_of_last_processing: self._fields.13,
+            country_of_origin: self._fields.14,
+            depth: self._fields.15,
+            description: self._fields.16,
+            disambiguating_description: self._fields.17,
+            funding: self._fields.18,
+            gtin: self._fields.19,
+            gtin12: self._fields.20,
+            gtin13: self._fields.21,
+            gtin14: self._fields.22,
+            gtin8: self._fields.23,
+            has_adult_consideration: self._fields.24,
+            has_certification: self._fields.25,
+            has_energy_consumption_details: self._fields.26,
+            has_gs1_digital_link: self._fields.27,
+            has_measurement: self._fields.28,
+            has_merchant_return_policy: self._fields.29,
+            has_product_return_policy: self._fields.30,
+            height: self._fields.31,
+            identifier: self._fields.32,
+            image: self._fields.33,
+            in_product_group_with_id: self._fields.34,
+            is_accessory_or_spare_part_for: self._fields.35,
+            is_consumable_for: self._fields.36,
+            is_family_friendly: self._fields.37,
+            is_related_to: self._fields.38,
+            is_similar_to: self._fields.39,
+            is_variant_of: self._fields.40,
+            item_condition: self._fields.41,
+            keywords: self._fields.42,
+            logo: self._fields.43,
+            main_entity_of_page: self._fields.44,
+            manufacturer: self._fields.45,
+            material: self._fields.46,
+            mobile_url: self._fields.47,
+            model: self._fields.48,
+            mpn: self._fields.49,
+            name: self._fields.50,
+            negative_notes: self._fields.51,
+            nsn: self._fields.52,
+            offers: self._fields.53,
+            pattern: self._fields.54,
+            positive_notes: self._fields.55,
+            potential_action: self._fields.56,
+            product_id: self._fields.57,
+            production_date: self._fields.58,
+            purchase_date: self._fields.59,
+            release_date: self._fields.60,
+            review: self._fields.61,
+            reviews: self._fields.62,
+            same_as: self._fields.63,
+            size: self._fields.64,
+            sku: self._fields.65,
+            slogan: self._fields.66,
+            subject_of: self._fields.67,
+            url: self._fields.68,
+            weight: self._fields.69,
+            width: self._fields.70,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/recipe.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/recipe.rs
index e2ba6aa8..f0791e8d 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/recipe.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/recipe.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -6123,8 +6126,8 @@ pub mod recipe_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecipeBuilder<'a, S: recipe_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<RecipeAbout<'a>>,
         Option<RecipeAbstract<'a>>,
         Option<RecipeAccessMode<'a>>,
@@ -6272,7 +6275,7 @@ pub struct RecipeBuilder<'a, S: recipe_state::State> {
         Option<RecipeWorkTranslation<'a>>,
         Option<RecipeYield<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Recipe<'a> {
@@ -6286,8 +6289,8 @@ impl<'a> RecipeBuilder<'a, recipe_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecipeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -6435,7 +6438,7 @@ impl<'a> RecipeBuilder<'a, recipe_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6443,12 +6446,12 @@ impl<'a> RecipeBuilder<'a, recipe_state::Empty> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `about` field (optional)
     pub fn about(mut self, value: impl Into<Option<RecipeAbout<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `about` field to an Option value (optional)
     pub fn maybe_about(mut self, value: Option<RecipeAbout<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -6456,12 +6459,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `abstract` field (optional)
     pub fn r#abstract(mut self, value: impl Into<Option<RecipeAbstract<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `abstract` field to an Option value (optional)
     pub fn maybe_abstract(mut self, value: Option<RecipeAbstract<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -6472,12 +6475,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeAccessMode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `accessMode` field to an Option value (optional)
     pub fn maybe_access_mode(mut self, value: Option<RecipeAccessMode<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -6488,7 +6491,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeAccessModeSufficient<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `accessModeSufficient` field to an Option value (optional)
@@ -6496,7 +6499,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeAccessModeSufficient<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -6507,7 +6510,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeAccessibilityApi<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `accessibilityAPI` field to an Option value (optional)
@@ -6515,7 +6518,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeAccessibilityApi<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -6526,7 +6529,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeAccessibilityControl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `accessibilityControl` field to an Option value (optional)
@@ -6534,7 +6537,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeAccessibilityControl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -6545,7 +6548,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeAccessibilityFeature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `accessibilityFeature` field to an Option value (optional)
@@ -6553,7 +6556,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeAccessibilityFeature<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -6564,7 +6567,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeAccessibilityHazard<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `accessibilityHazard` field to an Option value (optional)
@@ -6572,7 +6575,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeAccessibilityHazard<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -6583,7 +6586,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeAccessibilitySummary<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `accessibilitySummary` field to an Option value (optional)
@@ -6591,7 +6594,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeAccessibilitySummary<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -6602,7 +6605,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeAccountablePerson<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `accountablePerson` field to an Option value (optional)
@@ -6610,7 +6613,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeAccountablePerson<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -6621,7 +6624,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeAcquireLicensePage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `acquireLicensePage` field to an Option value (optional)
@@ -6629,7 +6632,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeAcquireLicensePage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -6640,7 +6643,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -6648,7 +6651,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -6659,7 +6662,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -6667,7 +6670,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -6678,7 +6681,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -6686,7 +6689,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -6697,7 +6700,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeAlternativeHeadline<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `alternativeHeadline` field to an Option value (optional)
@@ -6705,7 +6708,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeAlternativeHeadline<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -6716,12 +6719,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeArchivedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `archivedAt` field to an Option value (optional)
     pub fn maybe_archived_at(mut self, value: Option<RecipeArchivedAt<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -6729,12 +6732,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `assesses` field (optional)
     pub fn assesses(mut self, value: impl Into<Option<RecipeAssesses<'a>>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `assesses` field to an Option value (optional)
     pub fn maybe_assesses(mut self, value: Option<RecipeAssesses<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -6745,7 +6748,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeAssociatedMedia<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `associatedMedia` field to an Option value (optional)
@@ -6753,7 +6756,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeAssociatedMedia<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -6761,12 +6764,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `audience` field (optional)
     pub fn audience(mut self, value: impl Into<Option<RecipeAudience<'a>>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `audience` field to an Option value (optional)
     pub fn maybe_audience(mut self, value: Option<RecipeAudience<'a>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -6774,12 +6777,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `audio` field (optional)
     pub fn audio(mut self, value: impl Into<Option<RecipeAudio<'a>>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `audio` field to an Option value (optional)
     pub fn maybe_audio(mut self, value: Option<RecipeAudio<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -6787,12 +6790,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<RecipeAuthor<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<RecipeAuthor<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -6800,12 +6803,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<RecipeAward<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<RecipeAward<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -6813,12 +6816,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<RecipeAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<RecipeAwards<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -6826,12 +6829,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `character` field (optional)
     pub fn character(mut self, value: impl Into<Option<RecipeCharacter<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `character` field to an Option value (optional)
     pub fn maybe_character(mut self, value: Option<RecipeCharacter<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -6839,12 +6842,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `citation` field (optional)
     pub fn citation(mut self, value: impl Into<Option<RecipeCitation<'a>>>) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `citation` field to an Option value (optional)
     pub fn maybe_citation(mut self, value: Option<RecipeCitation<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -6852,12 +6855,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<RecipeComment<'a>>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<RecipeComment<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -6868,12 +6871,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeCommentCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `commentCount` field to an Option value (optional)
     pub fn maybe_comment_count(mut self, value: Option<RecipeCommentCount<'a>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -6884,7 +6887,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeConditionsOfAccess<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `conditionsOfAccess` field to an Option value (optional)
@@ -6892,7 +6895,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeConditionsOfAccess<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -6903,7 +6906,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeContentLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `contentLocation` field to an Option value (optional)
@@ -6911,7 +6914,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeContentLocation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -6922,7 +6925,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeContentRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `contentRating` field to an Option value (optional)
@@ -6930,7 +6933,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeContentRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -6941,7 +6944,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeContentReferenceTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `contentReferenceTime` field to an Option value (optional)
@@ -6949,7 +6952,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeContentReferenceTime<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -6960,12 +6963,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeContributor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `contributor` field to an Option value (optional)
     pub fn maybe_contributor(mut self, value: Option<RecipeContributor<'a>>) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -6973,12 +6976,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `cookTime` field (optional)
     pub fn cook_time(mut self, value: impl Into<Option<RecipeCookTime<'a>>>) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `cookTime` field to an Option value (optional)
     pub fn maybe_cook_time(mut self, value: Option<RecipeCookTime<'a>>) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -6989,7 +6992,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeCookingMethod<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `cookingMethod` field to an Option value (optional)
@@ -6997,7 +7000,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeCookingMethod<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -7008,7 +7011,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeCopyrightHolder<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `copyrightHolder` field to an Option value (optional)
@@ -7016,7 +7019,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeCopyrightHolder<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -7027,7 +7030,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeCopyrightNotice<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `copyrightNotice` field to an Option value (optional)
@@ -7035,7 +7038,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeCopyrightNotice<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -7046,7 +7049,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeCopyrightYear<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `copyrightYear` field to an Option value (optional)
@@ -7054,7 +7057,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeCopyrightYear<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -7062,12 +7065,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `correction` field (optional)
     pub fn correction(mut self, value: impl Into<Option<RecipeCorrection<'a>>>) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `correction` field to an Option value (optional)
     pub fn maybe_correction(mut self, value: Option<RecipeCorrection<'a>>) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -7078,7 +7081,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeCountryOfOrigin<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `countryOfOrigin` field to an Option value (optional)
@@ -7086,7 +7089,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeCountryOfOrigin<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -7097,7 +7100,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeCreativeWorkStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `creativeWorkStatus` field to an Option value (optional)
@@ -7105,7 +7108,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeCreativeWorkStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -7113,12 +7116,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `creator` field (optional)
     pub fn creator(mut self, value: impl Into<Option<RecipeCreator<'a>>>) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `creator` field to an Option value (optional)
     pub fn maybe_creator(mut self, value: Option<RecipeCreator<'a>>) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -7129,12 +7132,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeCreditText<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `creditText` field to an Option value (optional)
     pub fn maybe_credit_text(mut self, value: Option<RecipeCreditText<'a>>) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -7145,12 +7148,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeDateCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `dateCreated` field to an Option value (optional)
     pub fn maybe_date_created(mut self, value: Option<RecipeDateCreated<'a>>) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -7161,12 +7164,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeDateModified<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `dateModified` field to an Option value (optional)
     pub fn maybe_date_modified(mut self, value: Option<RecipeDateModified<'a>>) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -7177,7 +7180,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `datePublished` field to an Option value (optional)
@@ -7185,7 +7188,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -7196,12 +7199,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<RecipeDescription<'a>>) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -7212,7 +7215,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeDigitalSourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `digitalSourceType` field to an Option value (optional)
@@ -7220,7 +7223,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeDigitalSourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -7231,7 +7234,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -7239,7 +7242,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -7250,7 +7253,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeDiscussionUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `discussionUrl` field to an Option value (optional)
@@ -7258,7 +7261,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeDiscussionUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -7266,12 +7269,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `editEIDR` field (optional)
     pub fn edit_eidr(mut self, value: impl Into<Option<RecipeEditEidr<'a>>>) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `editEIDR` field to an Option value (optional)
     pub fn maybe_edit_eidr(mut self, value: Option<RecipeEditEidr<'a>>) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -7279,12 +7282,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `editor` field (optional)
     pub fn editor(mut self, value: impl Into<Option<RecipeEditor<'a>>>) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `editor` field to an Option value (optional)
     pub fn maybe_editor(mut self, value: Option<RecipeEditor<'a>>) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -7295,7 +7298,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeEducationalAlignment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `educationalAlignment` field to an Option value (optional)
@@ -7303,7 +7306,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeEducationalAlignment<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -7314,7 +7317,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeEducationalLevel<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `educationalLevel` field to an Option value (optional)
@@ -7322,7 +7325,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeEducationalLevel<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -7333,7 +7336,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeEducationalUse<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `educationalUse` field to an Option value (optional)
@@ -7341,7 +7344,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeEducationalUse<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -7349,12 +7352,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `encoding` field (optional)
     pub fn encoding(mut self, value: impl Into<Option<RecipeEncoding<'a>>>) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `encoding` field to an Option value (optional)
     pub fn maybe_encoding(mut self, value: Option<RecipeEncoding<'a>>) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -7365,7 +7368,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeEncodingFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `encodingFormat` field to an Option value (optional)
@@ -7373,7 +7376,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeEncodingFormat<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -7381,12 +7384,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `encodings` field (optional)
     pub fn encodings(mut self, value: impl Into<Option<RecipeEncodings<'a>>>) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `encodings` field to an Option value (optional)
     pub fn maybe_encodings(mut self, value: Option<RecipeEncodings<'a>>) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -7397,7 +7400,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeEstimatedCost<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `estimatedCost` field to an Option value (optional)
@@ -7405,7 +7408,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeEstimatedCost<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -7416,7 +7419,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeExampleOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `exampleOfWork` field to an Option value (optional)
@@ -7424,7 +7427,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeExampleOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -7432,12 +7435,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `expires` field (optional)
     pub fn expires(mut self, value: impl Into<Option<RecipeExpires<'a>>>) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `expires` field to an Option value (optional)
     pub fn maybe_expires(mut self, value: Option<RecipeExpires<'a>>) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -7448,12 +7451,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeFileFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `fileFormat` field to an Option value (optional)
     pub fn maybe_file_format(mut self, value: Option<RecipeFileFormat<'a>>) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -7461,12 +7464,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<RecipeFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<RecipeFunder<'a>>) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -7474,12 +7477,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<RecipeFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<RecipeFunding<'a>>) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -7487,12 +7490,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<RecipeGenre<'a>>>) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<RecipeGenre<'a>>) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -7500,12 +7503,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `hasPart` field (optional)
     pub fn has_part(mut self, value: impl Into<Option<RecipeHasPart<'a>>>) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `hasPart` field to an Option value (optional)
     pub fn maybe_has_part(mut self, value: Option<RecipeHasPart<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -7513,12 +7516,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `headline` field (optional)
     pub fn headline(mut self, value: impl Into<Option<RecipeHeadline<'a>>>) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `headline` field to an Option value (optional)
     pub fn maybe_headline(mut self, value: Option<RecipeHeadline<'a>>) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -7526,12 +7529,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `identifier` field (optional)
     pub fn identifier(mut self, value: impl Into<Option<RecipeIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<RecipeIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -7539,12 +7542,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<RecipeImage<'a>>>) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<RecipeImage<'a>>) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -7555,12 +7558,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeInLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `inLanguage` field to an Option value (optional)
     pub fn maybe_in_language(mut self, value: Option<RecipeInLanguage<'a>>) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -7571,12 +7574,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeIngredients<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `ingredients` field to an Option value (optional)
     pub fn maybe_ingredients(mut self, value: Option<RecipeIngredients<'a>>) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -7587,7 +7590,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -7595,7 +7598,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -7606,7 +7609,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeInteractivityType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `interactivityType` field to an Option value (optional)
@@ -7614,7 +7617,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeInteractivityType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -7625,7 +7628,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeInterpretedAsClaim<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `interpretedAsClaim` field to an Option value (optional)
@@ -7633,7 +7636,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeInterpretedAsClaim<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -7644,7 +7647,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeIsAccessibleForFree<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `isAccessibleForFree` field to an Option value (optional)
@@ -7652,7 +7655,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeIsAccessibleForFree<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -7660,12 +7663,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `isBasedOn` field (optional)
     pub fn is_based_on(mut self, value: impl Into<Option<RecipeIsBasedOn<'a>>>) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `isBasedOn` field to an Option value (optional)
     pub fn maybe_is_based_on(mut self, value: Option<RecipeIsBasedOn<'a>>) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -7676,7 +7679,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeIsBasedOnUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `isBasedOnUrl` field to an Option value (optional)
@@ -7684,7 +7687,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeIsBasedOnUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -7695,7 +7698,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeIsFamilyFriendly<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `isFamilyFriendly` field to an Option value (optional)
@@ -7703,7 +7706,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeIsFamilyFriendly<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -7711,12 +7714,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `isPartOf` field (optional)
     pub fn is_part_of(mut self, value: impl Into<Option<RecipeIsPartOf<'a>>>) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `isPartOf` field to an Option value (optional)
     pub fn maybe_is_part_of(mut self, value: Option<RecipeIsPartOf<'a>>) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -7724,12 +7727,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<RecipeKeywords<'a>>>) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<RecipeKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -7740,7 +7743,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeLearningResourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value.into();
+        self._fields.79 = value.into();
         self
     }
     /// Set the `learningResourceType` field to an Option value (optional)
@@ -7748,7 +7751,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeLearningResourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value;
+        self._fields.79 = value;
         self
     }
 }
@@ -7756,12 +7759,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `license` field (optional)
     pub fn license(mut self, value: impl Into<Option<RecipeLicense<'a>>>) -> Self {
-        self.__unsafe_private_named.80 = value.into();
+        self._fields.80 = value.into();
         self
     }
     /// Set the `license` field to an Option value (optional)
     pub fn maybe_license(mut self, value: Option<RecipeLicense<'a>>) -> Self {
-        self.__unsafe_private_named.80 = value;
+        self._fields.80 = value;
         self
     }
 }
@@ -7772,7 +7775,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeLocationCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.81 = value.into();
+        self._fields.81 = value.into();
         self
     }
     /// Set the `locationCreated` field to an Option value (optional)
@@ -7780,7 +7783,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeLocationCreated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.81 = value;
+        self._fields.81 = value;
         self
     }
 }
@@ -7791,12 +7794,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeMainEntity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value.into();
+        self._fields.82 = value.into();
         self
     }
     /// Set the `mainEntity` field to an Option value (optional)
     pub fn maybe_main_entity(mut self, value: Option<RecipeMainEntity<'a>>) -> Self {
-        self.__unsafe_private_named.82 = value;
+        self._fields.82 = value;
         self
     }
 }
@@ -7807,7 +7810,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.83 = value.into();
+        self._fields.83 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -7815,7 +7818,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.83 = value;
+        self._fields.83 = value;
         self
     }
 }
@@ -7823,12 +7826,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `maintainer` field (optional)
     pub fn maintainer(mut self, value: impl Into<Option<RecipeMaintainer<'a>>>) -> Self {
-        self.__unsafe_private_named.84 = value.into();
+        self._fields.84 = value.into();
         self
     }
     /// Set the `maintainer` field to an Option value (optional)
     pub fn maybe_maintainer(mut self, value: Option<RecipeMaintainer<'a>>) -> Self {
-        self.__unsafe_private_named.84 = value;
+        self._fields.84 = value;
         self
     }
 }
@@ -7836,12 +7839,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `material` field (optional)
     pub fn material(mut self, value: impl Into<Option<RecipeMaterial<'a>>>) -> Self {
-        self.__unsafe_private_named.85 = value.into();
+        self._fields.85 = value.into();
         self
     }
     /// Set the `material` field to an Option value (optional)
     pub fn maybe_material(mut self, value: Option<RecipeMaterial<'a>>) -> Self {
-        self.__unsafe_private_named.85 = value;
+        self._fields.85 = value;
         self
     }
 }
@@ -7852,7 +7855,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeMaterialExtent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.86 = value.into();
+        self._fields.86 = value.into();
         self
     }
     /// Set the `materialExtent` field to an Option value (optional)
@@ -7860,7 +7863,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeMaterialExtent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.86 = value;
+        self._fields.86 = value;
         self
     }
 }
@@ -7868,12 +7871,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `mentions` field (optional)
     pub fn mentions(mut self, value: impl Into<Option<RecipeMentions<'a>>>) -> Self {
-        self.__unsafe_private_named.87 = value.into();
+        self._fields.87 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<RecipeMentions<'a>>) -> Self {
-        self.__unsafe_private_named.87 = value;
+        self._fields.87 = value;
         self
     }
 }
@@ -7881,12 +7884,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<RecipeName<'a>>>) -> Self {
-        self.__unsafe_private_named.88 = value.into();
+        self._fields.88 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<RecipeName<'a>>) -> Self {
-        self.__unsafe_private_named.88 = value;
+        self._fields.88 = value;
         self
     }
 }
@@ -7894,12 +7897,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `nutrition` field (optional)
     pub fn nutrition(mut self, value: impl Into<Option<RecipeNutrition<'a>>>) -> Self {
-        self.__unsafe_private_named.89 = value.into();
+        self._fields.89 = value.into();
         self
     }
     /// Set the `nutrition` field to an Option value (optional)
     pub fn maybe_nutrition(mut self, value: Option<RecipeNutrition<'a>>) -> Self {
-        self.__unsafe_private_named.89 = value;
+        self._fields.89 = value;
         self
     }
 }
@@ -7907,12 +7910,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `offers` field (optional)
     pub fn offers(mut self, value: impl Into<Option<RecipeOffers<'a>>>) -> Self {
-        self.__unsafe_private_named.90 = value.into();
+        self._fields.90 = value.into();
         self
     }
     /// Set the `offers` field to an Option value (optional)
     pub fn maybe_offers(mut self, value: Option<RecipeOffers<'a>>) -> Self {
-        self.__unsafe_private_named.90 = value;
+        self._fields.90 = value;
         self
     }
 }
@@ -7920,12 +7923,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `pattern` field (optional)
     pub fn pattern(mut self, value: impl Into<Option<RecipePattern<'a>>>) -> Self {
-        self.__unsafe_private_named.91 = value.into();
+        self._fields.91 = value.into();
         self
     }
     /// Set the `pattern` field to an Option value (optional)
     pub fn maybe_pattern(mut self, value: Option<RecipePattern<'a>>) -> Self {
-        self.__unsafe_private_named.91 = value;
+        self._fields.91 = value;
         self
     }
 }
@@ -7936,12 +7939,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipePerformTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.92 = value.into();
+        self._fields.92 = value.into();
         self
     }
     /// Set the `performTime` field to an Option value (optional)
     pub fn maybe_perform_time(mut self, value: Option<RecipePerformTime<'a>>) -> Self {
-        self.__unsafe_private_named.92 = value;
+        self._fields.92 = value;
         self
     }
 }
@@ -7949,12 +7952,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `position` field (optional)
     pub fn position(mut self, value: impl Into<Option<RecipePosition<'a>>>) -> Self {
-        self.__unsafe_private_named.93 = value.into();
+        self._fields.93 = value.into();
         self
     }
     /// Set the `position` field to an Option value (optional)
     pub fn maybe_position(mut self, value: Option<RecipePosition<'a>>) -> Self {
-        self.__unsafe_private_named.93 = value;
+        self._fields.93 = value;
         self
     }
 }
@@ -7965,7 +7968,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipePotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value.into();
+        self._fields.94 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -7973,7 +7976,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipePotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value;
+        self._fields.94 = value;
         self
     }
 }
@@ -7981,12 +7984,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `prepTime` field (optional)
     pub fn prep_time(mut self, value: impl Into<Option<RecipePrepTime<'a>>>) -> Self {
-        self.__unsafe_private_named.95 = value.into();
+        self._fields.95 = value.into();
         self
     }
     /// Set the `prepTime` field to an Option value (optional)
     pub fn maybe_prep_time(mut self, value: Option<RecipePrepTime<'a>>) -> Self {
-        self.__unsafe_private_named.95 = value;
+        self._fields.95 = value;
         self
     }
 }
@@ -7994,12 +7997,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `producer` field (optional)
     pub fn producer(mut self, value: impl Into<Option<RecipeProducer<'a>>>) -> Self {
-        self.__unsafe_private_named.96 = value.into();
+        self._fields.96 = value.into();
         self
     }
     /// Set the `producer` field to an Option value (optional)
     pub fn maybe_producer(mut self, value: Option<RecipeProducer<'a>>) -> Self {
-        self.__unsafe_private_named.96 = value;
+        self._fields.96 = value;
         self
     }
 }
@@ -8007,12 +8010,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `provider` field (optional)
     pub fn provider(mut self, value: impl Into<Option<RecipeProvider<'a>>>) -> Self {
-        self.__unsafe_private_named.97 = value.into();
+        self._fields.97 = value.into();
         self
     }
     /// Set the `provider` field to an Option value (optional)
     pub fn maybe_provider(mut self, value: Option<RecipeProvider<'a>>) -> Self {
-        self.__unsafe_private_named.97 = value;
+        self._fields.97 = value;
         self
     }
 }
@@ -8023,12 +8026,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipePublication<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value.into();
+        self._fields.98 = value.into();
         self
     }
     /// Set the `publication` field to an Option value (optional)
     pub fn maybe_publication(mut self, value: Option<RecipePublication<'a>>) -> Self {
-        self.__unsafe_private_named.98 = value;
+        self._fields.98 = value;
         self
     }
 }
@@ -8036,12 +8039,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `publisher` field (optional)
     pub fn publisher(mut self, value: impl Into<Option<RecipePublisher<'a>>>) -> Self {
-        self.__unsafe_private_named.99 = value.into();
+        self._fields.99 = value.into();
         self
     }
     /// Set the `publisher` field to an Option value (optional)
     pub fn maybe_publisher(mut self, value: Option<RecipePublisher<'a>>) -> Self {
-        self.__unsafe_private_named.99 = value;
+        self._fields.99 = value;
         self
     }
 }
@@ -8052,7 +8055,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipePublisherImprint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value.into();
+        self._fields.100 = value.into();
         self
     }
     /// Set the `publisherImprint` field to an Option value (optional)
@@ -8060,7 +8063,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipePublisherImprint<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value;
+        self._fields.100 = value;
         self
     }
 }
@@ -8071,7 +8074,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipePublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value.into();
+        self._fields.101 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -8079,7 +8082,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipePublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value;
+        self._fields.101 = value;
         self
     }
 }
@@ -8090,7 +8093,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeRecipeCategory<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value.into();
+        self._fields.102 = value.into();
         self
     }
     /// Set the `recipeCategory` field to an Option value (optional)
@@ -8098,7 +8101,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeRecipeCategory<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value;
+        self._fields.102 = value;
         self
     }
 }
@@ -8109,7 +8112,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeRecipeCuisine<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.103 = value.into();
+        self._fields.103 = value.into();
         self
     }
     /// Set the `recipeCuisine` field to an Option value (optional)
@@ -8117,7 +8120,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeRecipeCuisine<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.103 = value;
+        self._fields.103 = value;
         self
     }
 }
@@ -8128,7 +8131,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeRecipeIngredient<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value.into();
+        self._fields.104 = value.into();
         self
     }
     /// Set the `recipeIngredient` field to an Option value (optional)
@@ -8136,7 +8139,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeRecipeIngredient<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value;
+        self._fields.104 = value;
         self
     }
 }
@@ -8147,7 +8150,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeRecipeInstructions<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.105 = value.into();
+        self._fields.105 = value.into();
         self
     }
     /// Set the `recipeInstructions` field to an Option value (optional)
@@ -8155,7 +8158,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeRecipeInstructions<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.105 = value;
+        self._fields.105 = value;
         self
     }
 }
@@ -8166,12 +8169,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeRecipeYield<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value.into();
+        self._fields.106 = value.into();
         self
     }
     /// Set the `recipeYield` field to an Option value (optional)
     pub fn maybe_recipe_yield(mut self, value: Option<RecipeRecipeYield<'a>>) -> Self {
-        self.__unsafe_private_named.106 = value;
+        self._fields.106 = value;
         self
     }
 }
@@ -8182,12 +8185,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeRecordedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value.into();
+        self._fields.107 = value.into();
         self
     }
     /// Set the `recordedAt` field to an Option value (optional)
     pub fn maybe_recorded_at(mut self, value: Option<RecipeRecordedAt<'a>>) -> Self {
-        self.__unsafe_private_named.107 = value;
+        self._fields.107 = value;
         self
     }
 }
@@ -8198,7 +8201,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeReleasedEvent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.108 = value.into();
+        self._fields.108 = value.into();
         self
     }
     /// Set the `releasedEvent` field to an Option value (optional)
@@ -8206,7 +8209,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeReleasedEvent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.108 = value;
+        self._fields.108 = value;
         self
     }
 }
@@ -8214,12 +8217,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<RecipeReview<'a>>>) -> Self {
-        self.__unsafe_private_named.109 = value.into();
+        self._fields.109 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<RecipeReview<'a>>) -> Self {
-        self.__unsafe_private_named.109 = value;
+        self._fields.109 = value;
         self
     }
 }
@@ -8227,12 +8230,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `reviews` field (optional)
     pub fn reviews(mut self, value: impl Into<Option<RecipeReviews<'a>>>) -> Self {
-        self.__unsafe_private_named.110 = value.into();
+        self._fields.110 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<RecipeReviews<'a>>) -> Self {
-        self.__unsafe_private_named.110 = value;
+        self._fields.110 = value;
         self
     }
 }
@@ -8240,12 +8243,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<RecipeSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.111 = value.into();
+        self._fields.111 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<RecipeSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.111 = value;
+        self._fields.111 = value;
         self
     }
 }
@@ -8256,7 +8259,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeSchemaVersion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value.into();
+        self._fields.112 = value.into();
         self
     }
     /// Set the `schemaVersion` field to an Option value (optional)
@@ -8264,7 +8267,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeSchemaVersion<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value;
+        self._fields.112 = value;
         self
     }
 }
@@ -8275,7 +8278,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeSdDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value.into();
+        self._fields.113 = value.into();
         self
     }
     /// Set the `sdDatePublished` field to an Option value (optional)
@@ -8283,7 +8286,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeSdDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value;
+        self._fields.113 = value;
         self
     }
 }
@@ -8291,12 +8294,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `sdLicense` field (optional)
     pub fn sd_license(mut self, value: impl Into<Option<RecipeSdLicense<'a>>>) -> Self {
-        self.__unsafe_private_named.114 = value.into();
+        self._fields.114 = value.into();
         self
     }
     /// Set the `sdLicense` field to an Option value (optional)
     pub fn maybe_sd_license(mut self, value: Option<RecipeSdLicense<'a>>) -> Self {
-        self.__unsafe_private_named.114 = value;
+        self._fields.114 = value;
         self
     }
 }
@@ -8307,12 +8310,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeSdPublisher<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.115 = value.into();
+        self._fields.115 = value.into();
         self
     }
     /// Set the `sdPublisher` field to an Option value (optional)
     pub fn maybe_sd_publisher(mut self, value: Option<RecipeSdPublisher<'a>>) -> Self {
-        self.__unsafe_private_named.115 = value;
+        self._fields.115 = value;
         self
     }
 }
@@ -8320,12 +8323,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<RecipeSize<'a>>>) -> Self {
-        self.__unsafe_private_named.116 = value.into();
+        self._fields.116 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<RecipeSize<'a>>) -> Self {
-        self.__unsafe_private_named.116 = value;
+        self._fields.116 = value;
         self
     }
 }
@@ -8336,7 +8339,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeSourceOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.117 = value.into();
+        self._fields.117 = value.into();
         self
     }
     /// Set the `sourceOrganization` field to an Option value (optional)
@@ -8344,7 +8347,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeSourceOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.117 = value;
+        self._fields.117 = value;
         self
     }
 }
@@ -8352,12 +8355,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `spatial` field (optional)
     pub fn spatial(mut self, value: impl Into<Option<RecipeSpatial<'a>>>) -> Self {
-        self.__unsafe_private_named.118 = value.into();
+        self._fields.118 = value.into();
         self
     }
     /// Set the `spatial` field to an Option value (optional)
     pub fn maybe_spatial(mut self, value: Option<RecipeSpatial<'a>>) -> Self {
-        self.__unsafe_private_named.118 = value;
+        self._fields.118 = value;
         self
     }
 }
@@ -8368,7 +8371,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeSpatialCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.119 = value.into();
+        self._fields.119 = value.into();
         self
     }
     /// Set the `spatialCoverage` field to an Option value (optional)
@@ -8376,7 +8379,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeSpatialCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.119 = value;
+        self._fields.119 = value;
         self
     }
 }
@@ -8384,12 +8387,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `sponsor` field (optional)
     pub fn sponsor(mut self, value: impl Into<Option<RecipeSponsor<'a>>>) -> Self {
-        self.__unsafe_private_named.120 = value.into();
+        self._fields.120 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<RecipeSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.120 = value;
+        self._fields.120 = value;
         self
     }
 }
@@ -8397,12 +8400,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `step` field (optional)
     pub fn step(mut self, value: impl Into<Option<RecipeStep<'a>>>) -> Self {
-        self.__unsafe_private_named.121 = value.into();
+        self._fields.121 = value.into();
         self
     }
     /// Set the `step` field to an Option value (optional)
     pub fn maybe_step(mut self, value: Option<RecipeStep<'a>>) -> Self {
-        self.__unsafe_private_named.121 = value;
+        self._fields.121 = value;
         self
     }
 }
@@ -8410,12 +8413,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `steps` field (optional)
     pub fn steps(mut self, value: impl Into<Option<RecipeSteps<'a>>>) -> Self {
-        self.__unsafe_private_named.122 = value.into();
+        self._fields.122 = value.into();
         self
     }
     /// Set the `steps` field to an Option value (optional)
     pub fn maybe_steps(mut self, value: Option<RecipeSteps<'a>>) -> Self {
-        self.__unsafe_private_named.122 = value;
+        self._fields.122 = value;
         self
     }
 }
@@ -8423,12 +8426,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `subjectOf` field (optional)
     pub fn subject_of(mut self, value: impl Into<Option<RecipeSubjectOf<'a>>>) -> Self {
-        self.__unsafe_private_named.123 = value.into();
+        self._fields.123 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<RecipeSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.123 = value;
+        self._fields.123 = value;
         self
     }
 }
@@ -8439,7 +8442,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeSuitableForDiet<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.124 = value.into();
+        self._fields.124 = value.into();
         self
     }
     /// Set the `suitableForDiet` field to an Option value (optional)
@@ -8447,7 +8450,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeSuitableForDiet<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.124 = value;
+        self._fields.124 = value;
         self
     }
 }
@@ -8455,12 +8458,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `supply` field (optional)
     pub fn supply(mut self, value: impl Into<Option<RecipeSupply<'a>>>) -> Self {
-        self.__unsafe_private_named.125 = value.into();
+        self._fields.125 = value.into();
         self
     }
     /// Set the `supply` field to an Option value (optional)
     pub fn maybe_supply(mut self, value: Option<RecipeSupply<'a>>) -> Self {
-        self.__unsafe_private_named.125 = value;
+        self._fields.125 = value;
         self
     }
 }
@@ -8468,12 +8471,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `teaches` field (optional)
     pub fn teaches(mut self, value: impl Into<Option<RecipeTeaches<'a>>>) -> Self {
-        self.__unsafe_private_named.126 = value.into();
+        self._fields.126 = value.into();
         self
     }
     /// Set the `teaches` field to an Option value (optional)
     pub fn maybe_teaches(mut self, value: Option<RecipeTeaches<'a>>) -> Self {
-        self.__unsafe_private_named.126 = value;
+        self._fields.126 = value;
         self
     }
 }
@@ -8481,12 +8484,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `temporal` field (optional)
     pub fn temporal(mut self, value: impl Into<Option<RecipeTemporal<'a>>>) -> Self {
-        self.__unsafe_private_named.127 = value.into();
+        self._fields.127 = value.into();
         self
     }
     /// Set the `temporal` field to an Option value (optional)
     pub fn maybe_temporal(mut self, value: Option<RecipeTemporal<'a>>) -> Self {
-        self.__unsafe_private_named.127 = value;
+        self._fields.127 = value;
         self
     }
 }
@@ -8497,7 +8500,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeTemporalCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.128 = value.into();
+        self._fields.128 = value.into();
         self
     }
     /// Set the `temporalCoverage` field to an Option value (optional)
@@ -8505,7 +8508,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeTemporalCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.128 = value;
+        self._fields.128 = value;
         self
     }
 }
@@ -8513,12 +8516,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<RecipeText<'a>>>) -> Self {
-        self.__unsafe_private_named.129 = value.into();
+        self._fields.129 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<RecipeText<'a>>) -> Self {
-        self.__unsafe_private_named.129 = value;
+        self._fields.129 = value;
         self
     }
 }
@@ -8526,12 +8529,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `thumbnail` field (optional)
     pub fn thumbnail(mut self, value: impl Into<Option<RecipeThumbnail<'a>>>) -> Self {
-        self.__unsafe_private_named.130 = value.into();
+        self._fields.130 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<RecipeThumbnail<'a>>) -> Self {
-        self.__unsafe_private_named.130 = value;
+        self._fields.130 = value;
         self
     }
 }
@@ -8542,12 +8545,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeThumbnailUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.131 = value.into();
+        self._fields.131 = value.into();
         self
     }
     /// Set the `thumbnailUrl` field to an Option value (optional)
     pub fn maybe_thumbnail_url(mut self, value: Option<RecipeThumbnailUrl<'a>>) -> Self {
-        self.__unsafe_private_named.131 = value;
+        self._fields.131 = value;
         self
     }
 }
@@ -8558,12 +8561,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeTimeRequired<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.132 = value.into();
+        self._fields.132 = value.into();
         self
     }
     /// Set the `timeRequired` field to an Option value (optional)
     pub fn maybe_time_required(mut self, value: Option<RecipeTimeRequired<'a>>) -> Self {
-        self.__unsafe_private_named.132 = value;
+        self._fields.132 = value;
         self
     }
 }
@@ -8571,12 +8574,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `tool` field (optional)
     pub fn tool(mut self, value: impl Into<Option<RecipeTool<'a>>>) -> Self {
-        self.__unsafe_private_named.133 = value.into();
+        self._fields.133 = value.into();
         self
     }
     /// Set the `tool` field to an Option value (optional)
     pub fn maybe_tool(mut self, value: Option<RecipeTool<'a>>) -> Self {
-        self.__unsafe_private_named.133 = value;
+        self._fields.133 = value;
         self
     }
 }
@@ -8584,12 +8587,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `totalTime` field (optional)
     pub fn total_time(mut self, value: impl Into<Option<RecipeTotalTime<'a>>>) -> Self {
-        self.__unsafe_private_named.134 = value.into();
+        self._fields.134 = value.into();
         self
     }
     /// Set the `totalTime` field to an Option value (optional)
     pub fn maybe_total_time(mut self, value: Option<RecipeTotalTime<'a>>) -> Self {
-        self.__unsafe_private_named.134 = value;
+        self._fields.134 = value;
         self
     }
 }
@@ -8600,7 +8603,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeTranslationOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.135 = value.into();
+        self._fields.135 = value.into();
         self
     }
     /// Set the `translationOfWork` field to an Option value (optional)
@@ -8608,7 +8611,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeTranslationOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.135 = value;
+        self._fields.135 = value;
         self
     }
 }
@@ -8616,12 +8619,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `translator` field (optional)
     pub fn translator(mut self, value: impl Into<Option<RecipeTranslator<'a>>>) -> Self {
-        self.__unsafe_private_named.136 = value.into();
+        self._fields.136 = value.into();
         self
     }
     /// Set the `translator` field to an Option value (optional)
     pub fn maybe_translator(mut self, value: Option<RecipeTranslator<'a>>) -> Self {
-        self.__unsafe_private_named.136 = value;
+        self._fields.136 = value;
         self
     }
 }
@@ -8632,7 +8635,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeTypicalAgeRange<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.137 = value.into();
+        self._fields.137 = value.into();
         self
     }
     /// Set the `typicalAgeRange` field to an Option value (optional)
@@ -8640,7 +8643,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeTypicalAgeRange<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.137 = value;
+        self._fields.137 = value;
         self
     }
 }
@@ -8648,12 +8651,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<RecipeUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.138 = value.into();
+        self._fields.138 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<RecipeUrl<'a>>) -> Self {
-        self.__unsafe_private_named.138 = value;
+        self._fields.138 = value;
         self
     }
 }
@@ -8661,12 +8664,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `usageInfo` field (optional)
     pub fn usage_info(mut self, value: impl Into<Option<RecipeUsageInfo<'a>>>) -> Self {
-        self.__unsafe_private_named.139 = value.into();
+        self._fields.139 = value.into();
         self
     }
     /// Set the `usageInfo` field to an Option value (optional)
     pub fn maybe_usage_info(mut self, value: Option<RecipeUsageInfo<'a>>) -> Self {
-        self.__unsafe_private_named.139 = value;
+        self._fields.139 = value;
         self
     }
 }
@@ -8674,12 +8677,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `version` field (optional)
     pub fn version(mut self, value: impl Into<Option<RecipeVersion<'a>>>) -> Self {
-        self.__unsafe_private_named.140 = value.into();
+        self._fields.140 = value.into();
         self
     }
     /// Set the `version` field to an Option value (optional)
     pub fn maybe_version(mut self, value: Option<RecipeVersion<'a>>) -> Self {
-        self.__unsafe_private_named.140 = value;
+        self._fields.140 = value;
         self
     }
 }
@@ -8687,12 +8690,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `video` field (optional)
     pub fn video(mut self, value: impl Into<Option<RecipeVideo<'a>>>) -> Self {
-        self.__unsafe_private_named.141 = value.into();
+        self._fields.141 = value.into();
         self
     }
     /// Set the `video` field to an Option value (optional)
     pub fn maybe_video(mut self, value: Option<RecipeVideo<'a>>) -> Self {
-        self.__unsafe_private_named.141 = value;
+        self._fields.141 = value;
         self
     }
 }
@@ -8700,12 +8703,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `wordCount` field (optional)
     pub fn word_count(mut self, value: impl Into<Option<RecipeWordCount<'a>>>) -> Self {
-        self.__unsafe_private_named.142 = value.into();
+        self._fields.142 = value.into();
         self
     }
     /// Set the `wordCount` field to an Option value (optional)
     pub fn maybe_word_count(mut self, value: Option<RecipeWordCount<'a>>) -> Self {
-        self.__unsafe_private_named.142 = value;
+        self._fields.142 = value;
         self
     }
 }
@@ -8716,12 +8719,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeWorkExample<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.143 = value.into();
+        self._fields.143 = value.into();
         self
     }
     /// Set the `workExample` field to an Option value (optional)
     pub fn maybe_work_example(mut self, value: Option<RecipeWorkExample<'a>>) -> Self {
-        self.__unsafe_private_named.143 = value;
+        self._fields.143 = value;
         self
     }
 }
@@ -8732,7 +8735,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<RecipeWorkTranslation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.144 = value.into();
+        self._fields.144 = value.into();
         self
     }
     /// Set the `workTranslation` field to an Option value (optional)
@@ -8740,7 +8743,7 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
         mut self,
         value: Option<RecipeWorkTranslation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.144 = value;
+        self._fields.144 = value;
         self
     }
 }
@@ -8748,12 +8751,12 @@ impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
 impl<'a, S: recipe_state::State> RecipeBuilder<'a, S> {
     /// Set the `yield` field (optional)
     pub fn r#yield(mut self, value: impl Into<Option<RecipeYield<'a>>>) -> Self {
-        self.__unsafe_private_named.145 = value.into();
+        self._fields.145 = value.into();
         self
     }
     /// Set the `yield` field to an Option value (optional)
     pub fn maybe_yield(mut self, value: Option<RecipeYield<'a>>) -> Self {
-        self.__unsafe_private_named.145 = value;
+        self._fields.145 = value;
         self
     }
 }
@@ -8765,152 +8768,152 @@ where
     /// Build the final struct
     pub fn build(self) -> Recipe<'a> {
         Recipe {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            additional_type: self.__unsafe_private_named.11,
-            aggregate_rating: self.__unsafe_private_named.12,
-            alternate_name: self.__unsafe_private_named.13,
-            alternative_headline: self.__unsafe_private_named.14,
-            archived_at: self.__unsafe_private_named.15,
-            assesses: self.__unsafe_private_named.16,
-            associated_media: self.__unsafe_private_named.17,
-            audience: self.__unsafe_private_named.18,
-            audio: self.__unsafe_private_named.19,
-            author: self.__unsafe_private_named.20,
-            award: self.__unsafe_private_named.21,
-            awards: self.__unsafe_private_named.22,
-            character: self.__unsafe_private_named.23,
-            citation: self.__unsafe_private_named.24,
-            comment: self.__unsafe_private_named.25,
-            comment_count: self.__unsafe_private_named.26,
-            conditions_of_access: self.__unsafe_private_named.27,
-            content_location: self.__unsafe_private_named.28,
-            content_rating: self.__unsafe_private_named.29,
-            content_reference_time: self.__unsafe_private_named.30,
-            contributor: self.__unsafe_private_named.31,
-            cook_time: self.__unsafe_private_named.32,
-            cooking_method: self.__unsafe_private_named.33,
-            copyright_holder: self.__unsafe_private_named.34,
-            copyright_notice: self.__unsafe_private_named.35,
-            copyright_year: self.__unsafe_private_named.36,
-            correction: self.__unsafe_private_named.37,
-            country_of_origin: self.__unsafe_private_named.38,
-            creative_work_status: self.__unsafe_private_named.39,
-            creator: self.__unsafe_private_named.40,
-            credit_text: self.__unsafe_private_named.41,
-            date_created: self.__unsafe_private_named.42,
-            date_modified: self.__unsafe_private_named.43,
-            date_published: self.__unsafe_private_named.44,
-            description: self.__unsafe_private_named.45,
-            digital_source_type: self.__unsafe_private_named.46,
-            disambiguating_description: self.__unsafe_private_named.47,
-            discussion_url: self.__unsafe_private_named.48,
-            edit_eidr: self.__unsafe_private_named.49,
-            editor: self.__unsafe_private_named.50,
-            educational_alignment: self.__unsafe_private_named.51,
-            educational_level: self.__unsafe_private_named.52,
-            educational_use: self.__unsafe_private_named.53,
-            encoding: self.__unsafe_private_named.54,
-            encoding_format: self.__unsafe_private_named.55,
-            encodings: self.__unsafe_private_named.56,
-            estimated_cost: self.__unsafe_private_named.57,
-            example_of_work: self.__unsafe_private_named.58,
-            expires: self.__unsafe_private_named.59,
-            file_format: self.__unsafe_private_named.60,
-            funder: self.__unsafe_private_named.61,
-            funding: self.__unsafe_private_named.62,
-            genre: self.__unsafe_private_named.63,
-            has_part: self.__unsafe_private_named.64,
-            headline: self.__unsafe_private_named.65,
-            identifier: self.__unsafe_private_named.66,
-            image: self.__unsafe_private_named.67,
-            in_language: self.__unsafe_private_named.68,
-            ingredients: self.__unsafe_private_named.69,
-            interaction_statistic: self.__unsafe_private_named.70,
-            interactivity_type: self.__unsafe_private_named.71,
-            interpreted_as_claim: self.__unsafe_private_named.72,
-            is_accessible_for_free: self.__unsafe_private_named.73,
-            is_based_on: self.__unsafe_private_named.74,
-            is_based_on_url: self.__unsafe_private_named.75,
-            is_family_friendly: self.__unsafe_private_named.76,
-            is_part_of: self.__unsafe_private_named.77,
-            keywords: self.__unsafe_private_named.78,
-            learning_resource_type: self.__unsafe_private_named.79,
-            license: self.__unsafe_private_named.80,
-            location_created: self.__unsafe_private_named.81,
-            main_entity: self.__unsafe_private_named.82,
-            main_entity_of_page: self.__unsafe_private_named.83,
-            maintainer: self.__unsafe_private_named.84,
-            material: self.__unsafe_private_named.85,
-            material_extent: self.__unsafe_private_named.86,
-            mentions: self.__unsafe_private_named.87,
-            name: self.__unsafe_private_named.88,
-            nutrition: self.__unsafe_private_named.89,
-            offers: self.__unsafe_private_named.90,
-            pattern: self.__unsafe_private_named.91,
-            perform_time: self.__unsafe_private_named.92,
-            position: self.__unsafe_private_named.93,
-            potential_action: self.__unsafe_private_named.94,
-            prep_time: self.__unsafe_private_named.95,
-            producer: self.__unsafe_private_named.96,
-            provider: self.__unsafe_private_named.97,
-            publication: self.__unsafe_private_named.98,
-            publisher: self.__unsafe_private_named.99,
-            publisher_imprint: self.__unsafe_private_named.100,
-            publishing_principles: self.__unsafe_private_named.101,
-            recipe_category: self.__unsafe_private_named.102,
-            recipe_cuisine: self.__unsafe_private_named.103,
-            recipe_ingredient: self.__unsafe_private_named.104,
-            recipe_instructions: self.__unsafe_private_named.105,
-            recipe_yield: self.__unsafe_private_named.106,
-            recorded_at: self.__unsafe_private_named.107,
-            released_event: self.__unsafe_private_named.108,
-            review: self.__unsafe_private_named.109,
-            reviews: self.__unsafe_private_named.110,
-            same_as: self.__unsafe_private_named.111,
-            schema_version: self.__unsafe_private_named.112,
-            sd_date_published: self.__unsafe_private_named.113,
-            sd_license: self.__unsafe_private_named.114,
-            sd_publisher: self.__unsafe_private_named.115,
-            size: self.__unsafe_private_named.116,
-            source_organization: self.__unsafe_private_named.117,
-            spatial: self.__unsafe_private_named.118,
-            spatial_coverage: self.__unsafe_private_named.119,
-            sponsor: self.__unsafe_private_named.120,
-            step: self.__unsafe_private_named.121,
-            steps: self.__unsafe_private_named.122,
-            subject_of: self.__unsafe_private_named.123,
-            suitable_for_diet: self.__unsafe_private_named.124,
-            supply: self.__unsafe_private_named.125,
-            teaches: self.__unsafe_private_named.126,
-            temporal: self.__unsafe_private_named.127,
-            temporal_coverage: self.__unsafe_private_named.128,
-            text: self.__unsafe_private_named.129,
-            thumbnail: self.__unsafe_private_named.130,
-            thumbnail_url: self.__unsafe_private_named.131,
-            time_required: self.__unsafe_private_named.132,
-            tool: self.__unsafe_private_named.133,
-            total_time: self.__unsafe_private_named.134,
-            translation_of_work: self.__unsafe_private_named.135,
-            translator: self.__unsafe_private_named.136,
-            typical_age_range: self.__unsafe_private_named.137,
-            url: self.__unsafe_private_named.138,
-            usage_info: self.__unsafe_private_named.139,
-            version: self.__unsafe_private_named.140,
-            video: self.__unsafe_private_named.141,
-            word_count: self.__unsafe_private_named.142,
-            work_example: self.__unsafe_private_named.143,
-            work_translation: self.__unsafe_private_named.144,
-            r#yield: self.__unsafe_private_named.145,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            additional_type: self._fields.11,
+            aggregate_rating: self._fields.12,
+            alternate_name: self._fields.13,
+            alternative_headline: self._fields.14,
+            archived_at: self._fields.15,
+            assesses: self._fields.16,
+            associated_media: self._fields.17,
+            audience: self._fields.18,
+            audio: self._fields.19,
+            author: self._fields.20,
+            award: self._fields.21,
+            awards: self._fields.22,
+            character: self._fields.23,
+            citation: self._fields.24,
+            comment: self._fields.25,
+            comment_count: self._fields.26,
+            conditions_of_access: self._fields.27,
+            content_location: self._fields.28,
+            content_rating: self._fields.29,
+            content_reference_time: self._fields.30,
+            contributor: self._fields.31,
+            cook_time: self._fields.32,
+            cooking_method: self._fields.33,
+            copyright_holder: self._fields.34,
+            copyright_notice: self._fields.35,
+            copyright_year: self._fields.36,
+            correction: self._fields.37,
+            country_of_origin: self._fields.38,
+            creative_work_status: self._fields.39,
+            creator: self._fields.40,
+            credit_text: self._fields.41,
+            date_created: self._fields.42,
+            date_modified: self._fields.43,
+            date_published: self._fields.44,
+            description: self._fields.45,
+            digital_source_type: self._fields.46,
+            disambiguating_description: self._fields.47,
+            discussion_url: self._fields.48,
+            edit_eidr: self._fields.49,
+            editor: self._fields.50,
+            educational_alignment: self._fields.51,
+            educational_level: self._fields.52,
+            educational_use: self._fields.53,
+            encoding: self._fields.54,
+            encoding_format: self._fields.55,
+            encodings: self._fields.56,
+            estimated_cost: self._fields.57,
+            example_of_work: self._fields.58,
+            expires: self._fields.59,
+            file_format: self._fields.60,
+            funder: self._fields.61,
+            funding: self._fields.62,
+            genre: self._fields.63,
+            has_part: self._fields.64,
+            headline: self._fields.65,
+            identifier: self._fields.66,
+            image: self._fields.67,
+            in_language: self._fields.68,
+            ingredients: self._fields.69,
+            interaction_statistic: self._fields.70,
+            interactivity_type: self._fields.71,
+            interpreted_as_claim: self._fields.72,
+            is_accessible_for_free: self._fields.73,
+            is_based_on: self._fields.74,
+            is_based_on_url: self._fields.75,
+            is_family_friendly: self._fields.76,
+            is_part_of: self._fields.77,
+            keywords: self._fields.78,
+            learning_resource_type: self._fields.79,
+            license: self._fields.80,
+            location_created: self._fields.81,
+            main_entity: self._fields.82,
+            main_entity_of_page: self._fields.83,
+            maintainer: self._fields.84,
+            material: self._fields.85,
+            material_extent: self._fields.86,
+            mentions: self._fields.87,
+            name: self._fields.88,
+            nutrition: self._fields.89,
+            offers: self._fields.90,
+            pattern: self._fields.91,
+            perform_time: self._fields.92,
+            position: self._fields.93,
+            potential_action: self._fields.94,
+            prep_time: self._fields.95,
+            producer: self._fields.96,
+            provider: self._fields.97,
+            publication: self._fields.98,
+            publisher: self._fields.99,
+            publisher_imprint: self._fields.100,
+            publishing_principles: self._fields.101,
+            recipe_category: self._fields.102,
+            recipe_cuisine: self._fields.103,
+            recipe_ingredient: self._fields.104,
+            recipe_instructions: self._fields.105,
+            recipe_yield: self._fields.106,
+            recorded_at: self._fields.107,
+            released_event: self._fields.108,
+            review: self._fields.109,
+            reviews: self._fields.110,
+            same_as: self._fields.111,
+            schema_version: self._fields.112,
+            sd_date_published: self._fields.113,
+            sd_license: self._fields.114,
+            sd_publisher: self._fields.115,
+            size: self._fields.116,
+            source_organization: self._fields.117,
+            spatial: self._fields.118,
+            spatial_coverage: self._fields.119,
+            sponsor: self._fields.120,
+            step: self._fields.121,
+            steps: self._fields.122,
+            subject_of: self._fields.123,
+            suitable_for_diet: self._fields.124,
+            supply: self._fields.125,
+            teaches: self._fields.126,
+            temporal: self._fields.127,
+            temporal_coverage: self._fields.128,
+            text: self._fields.129,
+            thumbnail: self._fields.130,
+            thumbnail_url: self._fields.131,
+            time_required: self._fields.132,
+            tool: self._fields.133,
+            total_time: self._fields.134,
+            translation_of_work: self._fields.135,
+            translator: self._fields.136,
+            typical_age_range: self._fields.137,
+            url: self._fields.138,
+            usage_info: self._fields.139,
+            version: self._fields.140,
+            video: self._fields.141,
+            word_count: self._fields.142,
+            work_example: self._fields.143,
+            work_translation: self._fields.144,
+            r#yield: self._fields.145,
             extra_data: Default::default(),
         }
     }
@@ -8920,152 +8923,152 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Recipe<'a> {
         Recipe {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            additional_type: self.__unsafe_private_named.11,
-            aggregate_rating: self.__unsafe_private_named.12,
-            alternate_name: self.__unsafe_private_named.13,
-            alternative_headline: self.__unsafe_private_named.14,
-            archived_at: self.__unsafe_private_named.15,
-            assesses: self.__unsafe_private_named.16,
-            associated_media: self.__unsafe_private_named.17,
-            audience: self.__unsafe_private_named.18,
-            audio: self.__unsafe_private_named.19,
-            author: self.__unsafe_private_named.20,
-            award: self.__unsafe_private_named.21,
-            awards: self.__unsafe_private_named.22,
-            character: self.__unsafe_private_named.23,
-            citation: self.__unsafe_private_named.24,
-            comment: self.__unsafe_private_named.25,
-            comment_count: self.__unsafe_private_named.26,
-            conditions_of_access: self.__unsafe_private_named.27,
-            content_location: self.__unsafe_private_named.28,
-            content_rating: self.__unsafe_private_named.29,
-            content_reference_time: self.__unsafe_private_named.30,
-            contributor: self.__unsafe_private_named.31,
-            cook_time: self.__unsafe_private_named.32,
-            cooking_method: self.__unsafe_private_named.33,
-            copyright_holder: self.__unsafe_private_named.34,
-            copyright_notice: self.__unsafe_private_named.35,
-            copyright_year: self.__unsafe_private_named.36,
-            correction: self.__unsafe_private_named.37,
-            country_of_origin: self.__unsafe_private_named.38,
-            creative_work_status: self.__unsafe_private_named.39,
-            creator: self.__unsafe_private_named.40,
-            credit_text: self.__unsafe_private_named.41,
-            date_created: self.__unsafe_private_named.42,
-            date_modified: self.__unsafe_private_named.43,
-            date_published: self.__unsafe_private_named.44,
-            description: self.__unsafe_private_named.45,
-            digital_source_type: self.__unsafe_private_named.46,
-            disambiguating_description: self.__unsafe_private_named.47,
-            discussion_url: self.__unsafe_private_named.48,
-            edit_eidr: self.__unsafe_private_named.49,
-            editor: self.__unsafe_private_named.50,
-            educational_alignment: self.__unsafe_private_named.51,
-            educational_level: self.__unsafe_private_named.52,
-            educational_use: self.__unsafe_private_named.53,
-            encoding: self.__unsafe_private_named.54,
-            encoding_format: self.__unsafe_private_named.55,
-            encodings: self.__unsafe_private_named.56,
-            estimated_cost: self.__unsafe_private_named.57,
-            example_of_work: self.__unsafe_private_named.58,
-            expires: self.__unsafe_private_named.59,
-            file_format: self.__unsafe_private_named.60,
-            funder: self.__unsafe_private_named.61,
-            funding: self.__unsafe_private_named.62,
-            genre: self.__unsafe_private_named.63,
-            has_part: self.__unsafe_private_named.64,
-            headline: self.__unsafe_private_named.65,
-            identifier: self.__unsafe_private_named.66,
-            image: self.__unsafe_private_named.67,
-            in_language: self.__unsafe_private_named.68,
-            ingredients: self.__unsafe_private_named.69,
-            interaction_statistic: self.__unsafe_private_named.70,
-            interactivity_type: self.__unsafe_private_named.71,
-            interpreted_as_claim: self.__unsafe_private_named.72,
-            is_accessible_for_free: self.__unsafe_private_named.73,
-            is_based_on: self.__unsafe_private_named.74,
-            is_based_on_url: self.__unsafe_private_named.75,
-            is_family_friendly: self.__unsafe_private_named.76,
-            is_part_of: self.__unsafe_private_named.77,
-            keywords: self.__unsafe_private_named.78,
-            learning_resource_type: self.__unsafe_private_named.79,
-            license: self.__unsafe_private_named.80,
-            location_created: self.__unsafe_private_named.81,
-            main_entity: self.__unsafe_private_named.82,
-            main_entity_of_page: self.__unsafe_private_named.83,
-            maintainer: self.__unsafe_private_named.84,
-            material: self.__unsafe_private_named.85,
-            material_extent: self.__unsafe_private_named.86,
-            mentions: self.__unsafe_private_named.87,
-            name: self.__unsafe_private_named.88,
-            nutrition: self.__unsafe_private_named.89,
-            offers: self.__unsafe_private_named.90,
-            pattern: self.__unsafe_private_named.91,
-            perform_time: self.__unsafe_private_named.92,
-            position: self.__unsafe_private_named.93,
-            potential_action: self.__unsafe_private_named.94,
-            prep_time: self.__unsafe_private_named.95,
-            producer: self.__unsafe_private_named.96,
-            provider: self.__unsafe_private_named.97,
-            publication: self.__unsafe_private_named.98,
-            publisher: self.__unsafe_private_named.99,
-            publisher_imprint: self.__unsafe_private_named.100,
-            publishing_principles: self.__unsafe_private_named.101,
-            recipe_category: self.__unsafe_private_named.102,
-            recipe_cuisine: self.__unsafe_private_named.103,
-            recipe_ingredient: self.__unsafe_private_named.104,
-            recipe_instructions: self.__unsafe_private_named.105,
-            recipe_yield: self.__unsafe_private_named.106,
-            recorded_at: self.__unsafe_private_named.107,
-            released_event: self.__unsafe_private_named.108,
-            review: self.__unsafe_private_named.109,
-            reviews: self.__unsafe_private_named.110,
-            same_as: self.__unsafe_private_named.111,
-            schema_version: self.__unsafe_private_named.112,
-            sd_date_published: self.__unsafe_private_named.113,
-            sd_license: self.__unsafe_private_named.114,
-            sd_publisher: self.__unsafe_private_named.115,
-            size: self.__unsafe_private_named.116,
-            source_organization: self.__unsafe_private_named.117,
-            spatial: self.__unsafe_private_named.118,
-            spatial_coverage: self.__unsafe_private_named.119,
-            sponsor: self.__unsafe_private_named.120,
-            step: self.__unsafe_private_named.121,
-            steps: self.__unsafe_private_named.122,
-            subject_of: self.__unsafe_private_named.123,
-            suitable_for_diet: self.__unsafe_private_named.124,
-            supply: self.__unsafe_private_named.125,
-            teaches: self.__unsafe_private_named.126,
-            temporal: self.__unsafe_private_named.127,
-            temporal_coverage: self.__unsafe_private_named.128,
-            text: self.__unsafe_private_named.129,
-            thumbnail: self.__unsafe_private_named.130,
-            thumbnail_url: self.__unsafe_private_named.131,
-            time_required: self.__unsafe_private_named.132,
-            tool: self.__unsafe_private_named.133,
-            total_time: self.__unsafe_private_named.134,
-            translation_of_work: self.__unsafe_private_named.135,
-            translator: self.__unsafe_private_named.136,
-            typical_age_range: self.__unsafe_private_named.137,
-            url: self.__unsafe_private_named.138,
-            usage_info: self.__unsafe_private_named.139,
-            version: self.__unsafe_private_named.140,
-            video: self.__unsafe_private_named.141,
-            word_count: self.__unsafe_private_named.142,
-            work_example: self.__unsafe_private_named.143,
-            work_translation: self.__unsafe_private_named.144,
-            r#yield: self.__unsafe_private_named.145,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            additional_type: self._fields.11,
+            aggregate_rating: self._fields.12,
+            alternate_name: self._fields.13,
+            alternative_headline: self._fields.14,
+            archived_at: self._fields.15,
+            assesses: self._fields.16,
+            associated_media: self._fields.17,
+            audience: self._fields.18,
+            audio: self._fields.19,
+            author: self._fields.20,
+            award: self._fields.21,
+            awards: self._fields.22,
+            character: self._fields.23,
+            citation: self._fields.24,
+            comment: self._fields.25,
+            comment_count: self._fields.26,
+            conditions_of_access: self._fields.27,
+            content_location: self._fields.28,
+            content_rating: self._fields.29,
+            content_reference_time: self._fields.30,
+            contributor: self._fields.31,
+            cook_time: self._fields.32,
+            cooking_method: self._fields.33,
+            copyright_holder: self._fields.34,
+            copyright_notice: self._fields.35,
+            copyright_year: self._fields.36,
+            correction: self._fields.37,
+            country_of_origin: self._fields.38,
+            creative_work_status: self._fields.39,
+            creator: self._fields.40,
+            credit_text: self._fields.41,
+            date_created: self._fields.42,
+            date_modified: self._fields.43,
+            date_published: self._fields.44,
+            description: self._fields.45,
+            digital_source_type: self._fields.46,
+            disambiguating_description: self._fields.47,
+            discussion_url: self._fields.48,
+            edit_eidr: self._fields.49,
+            editor: self._fields.50,
+            educational_alignment: self._fields.51,
+            educational_level: self._fields.52,
+            educational_use: self._fields.53,
+            encoding: self._fields.54,
+            encoding_format: self._fields.55,
+            encodings: self._fields.56,
+            estimated_cost: self._fields.57,
+            example_of_work: self._fields.58,
+            expires: self._fields.59,
+            file_format: self._fields.60,
+            funder: self._fields.61,
+            funding: self._fields.62,
+            genre: self._fields.63,
+            has_part: self._fields.64,
+            headline: self._fields.65,
+            identifier: self._fields.66,
+            image: self._fields.67,
+            in_language: self._fields.68,
+            ingredients: self._fields.69,
+            interaction_statistic: self._fields.70,
+            interactivity_type: self._fields.71,
+            interpreted_as_claim: self._fields.72,
+            is_accessible_for_free: self._fields.73,
+            is_based_on: self._fields.74,
+            is_based_on_url: self._fields.75,
+            is_family_friendly: self._fields.76,
+            is_part_of: self._fields.77,
+            keywords: self._fields.78,
+            learning_resource_type: self._fields.79,
+            license: self._fields.80,
+            location_created: self._fields.81,
+            main_entity: self._fields.82,
+            main_entity_of_page: self._fields.83,
+            maintainer: self._fields.84,
+            material: self._fields.85,
+            material_extent: self._fields.86,
+            mentions: self._fields.87,
+            name: self._fields.88,
+            nutrition: self._fields.89,
+            offers: self._fields.90,
+            pattern: self._fields.91,
+            perform_time: self._fields.92,
+            position: self._fields.93,
+            potential_action: self._fields.94,
+            prep_time: self._fields.95,
+            producer: self._fields.96,
+            provider: self._fields.97,
+            publication: self._fields.98,
+            publisher: self._fields.99,
+            publisher_imprint: self._fields.100,
+            publishing_principles: self._fields.101,
+            recipe_category: self._fields.102,
+            recipe_cuisine: self._fields.103,
+            recipe_ingredient: self._fields.104,
+            recipe_instructions: self._fields.105,
+            recipe_yield: self._fields.106,
+            recorded_at: self._fields.107,
+            released_event: self._fields.108,
+            review: self._fields.109,
+            reviews: self._fields.110,
+            same_as: self._fields.111,
+            schema_version: self._fields.112,
+            sd_date_published: self._fields.113,
+            sd_license: self._fields.114,
+            sd_publisher: self._fields.115,
+            size: self._fields.116,
+            source_organization: self._fields.117,
+            spatial: self._fields.118,
+            spatial_coverage: self._fields.119,
+            sponsor: self._fields.120,
+            step: self._fields.121,
+            steps: self._fields.122,
+            subject_of: self._fields.123,
+            suitable_for_diet: self._fields.124,
+            supply: self._fields.125,
+            teaches: self._fields.126,
+            temporal: self._fields.127,
+            temporal_coverage: self._fields.128,
+            text: self._fields.129,
+            thumbnail: self._fields.130,
+            thumbnail_url: self._fields.131,
+            time_required: self._fields.132,
+            tool: self._fields.133,
+            total_time: self._fields.134,
+            translation_of_work: self._fields.135,
+            translator: self._fields.136,
+            typical_age_range: self._fields.137,
+            url: self._fields.138,
+            usage_info: self._fields.139,
+            version: self._fields.140,
+            video: self._fields.141,
+            word_count: self._fields.142,
+            work_example: self._fields.143,
+            work_translation: self._fields.144,
+            r#yield: self._fields.145,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/social_media_posting.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/social_media_posting.rs
index efd6f004..78b1d274 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/social_media_posting.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/social_media_posting.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -5683,8 +5686,8 @@ pub mod social_media_posting_state {
 
 /// Builder for constructing an instance of this type
 pub struct SocialMediaPostingBuilder<'a, S: social_media_posting_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<SocialMediaPostingAbout<'a>>,
         Option<SocialMediaPostingAbstract<'a>>,
         Option<SocialMediaPostingAccessMode<'a>>,
@@ -5821,7 +5824,7 @@ pub struct SocialMediaPostingBuilder<'a, S: social_media_posting_state::State> {
         Option<SocialMediaPostingWorkExample<'a>>,
         Option<SocialMediaPostingWorkTranslation<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SocialMediaPosting<'a> {
@@ -5835,8 +5838,8 @@ impl<'a> SocialMediaPostingBuilder<'a, social_media_posting_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SocialMediaPostingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -5973,7 +5976,7 @@ impl<'a> SocialMediaPostingBuilder<'a, social_media_posting_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5984,12 +5987,12 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAbout<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `about` field to an Option value (optional)
     pub fn maybe_about(mut self, value: Option<SocialMediaPostingAbout<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -6000,7 +6003,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAbstract<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `abstract` field to an Option value (optional)
@@ -6008,7 +6011,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingAbstract<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -6019,7 +6022,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAccessMode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `accessMode` field to an Option value (optional)
@@ -6027,7 +6030,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingAccessMode<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -6038,7 +6041,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAccessModeSufficient<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `accessModeSufficient` field to an Option value (optional)
@@ -6046,7 +6049,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingAccessModeSufficient<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -6057,7 +6060,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAccessibilityApi<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `accessibilityAPI` field to an Option value (optional)
@@ -6065,7 +6068,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingAccessibilityApi<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -6076,7 +6079,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAccessibilityControl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `accessibilityControl` field to an Option value (optional)
@@ -6084,7 +6087,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingAccessibilityControl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -6095,7 +6098,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAccessibilityFeature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `accessibilityFeature` field to an Option value (optional)
@@ -6103,7 +6106,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingAccessibilityFeature<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -6114,7 +6117,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAccessibilityHazard<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `accessibilityHazard` field to an Option value (optional)
@@ -6122,7 +6125,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingAccessibilityHazard<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -6133,7 +6136,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAccessibilitySummary<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `accessibilitySummary` field to an Option value (optional)
@@ -6141,7 +6144,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingAccessibilitySummary<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -6152,7 +6155,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAccountablePerson<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `accountablePerson` field to an Option value (optional)
@@ -6160,7 +6163,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingAccountablePerson<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -6171,7 +6174,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAcquireLicensePage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `acquireLicensePage` field to an Option value (optional)
@@ -6179,7 +6182,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingAcquireLicensePage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -6190,7 +6193,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -6198,7 +6201,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -6209,7 +6212,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -6217,7 +6220,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -6228,7 +6231,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -6236,7 +6239,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -6247,7 +6250,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAlternativeHeadline<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `alternativeHeadline` field to an Option value (optional)
@@ -6255,7 +6258,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingAlternativeHeadline<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -6266,7 +6269,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingArchivedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `archivedAt` field to an Option value (optional)
@@ -6274,7 +6277,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingArchivedAt<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -6285,7 +6288,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingArticleBody<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `articleBody` field to an Option value (optional)
@@ -6293,7 +6296,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingArticleBody<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -6304,7 +6307,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingArticleSection<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `articleSection` field to an Option value (optional)
@@ -6312,7 +6315,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingArticleSection<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -6323,7 +6326,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAssesses<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `assesses` field to an Option value (optional)
@@ -6331,7 +6334,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingAssesses<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -6342,7 +6345,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAssociatedMedia<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `associatedMedia` field to an Option value (optional)
@@ -6350,7 +6353,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingAssociatedMedia<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -6361,7 +6364,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAudience<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `audience` field to an Option value (optional)
@@ -6369,7 +6372,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingAudience<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -6380,12 +6383,12 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAudio<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `audio` field to an Option value (optional)
     pub fn maybe_audio(mut self, value: Option<SocialMediaPostingAudio<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -6396,12 +6399,12 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAuthor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<SocialMediaPostingAuthor<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -6412,12 +6415,12 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAward<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<SocialMediaPostingAward<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -6428,12 +6431,12 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingAwards<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<SocialMediaPostingAwards<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -6444,7 +6447,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingBackstory<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `backstory` field to an Option value (optional)
@@ -6452,7 +6455,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingBackstory<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -6463,7 +6466,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingCharacter<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `character` field to an Option value (optional)
@@ -6471,7 +6474,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingCharacter<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -6482,7 +6485,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingCitation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `citation` field to an Option value (optional)
@@ -6490,7 +6493,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingCitation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -6501,7 +6504,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingComment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
@@ -6509,7 +6512,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingComment<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -6520,7 +6523,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingCommentCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `commentCount` field to an Option value (optional)
@@ -6528,7 +6531,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingCommentCount<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -6539,7 +6542,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingConditionsOfAccess<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `conditionsOfAccess` field to an Option value (optional)
@@ -6547,7 +6550,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingConditionsOfAccess<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -6558,7 +6561,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingContentLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `contentLocation` field to an Option value (optional)
@@ -6566,7 +6569,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingContentLocation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -6577,7 +6580,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingContentRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `contentRating` field to an Option value (optional)
@@ -6585,7 +6588,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingContentRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -6596,7 +6599,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingContentReferenceTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `contentReferenceTime` field to an Option value (optional)
@@ -6604,7 +6607,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingContentReferenceTime<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -6615,7 +6618,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingContributor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `contributor` field to an Option value (optional)
@@ -6623,7 +6626,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingContributor<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -6634,7 +6637,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingCopyrightHolder<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `copyrightHolder` field to an Option value (optional)
@@ -6642,7 +6645,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingCopyrightHolder<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -6653,7 +6656,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingCopyrightNotice<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `copyrightNotice` field to an Option value (optional)
@@ -6661,7 +6664,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingCopyrightNotice<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -6672,7 +6675,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingCopyrightYear<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `copyrightYear` field to an Option value (optional)
@@ -6680,7 +6683,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingCopyrightYear<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -6691,7 +6694,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingCorrection<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `correction` field to an Option value (optional)
@@ -6699,7 +6702,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingCorrection<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -6710,7 +6713,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingCountryOfOrigin<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `countryOfOrigin` field to an Option value (optional)
@@ -6718,7 +6721,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingCountryOfOrigin<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -6729,7 +6732,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingCreativeWorkStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `creativeWorkStatus` field to an Option value (optional)
@@ -6737,7 +6740,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingCreativeWorkStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -6748,7 +6751,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingCreator<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `creator` field to an Option value (optional)
@@ -6756,7 +6759,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingCreator<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -6767,7 +6770,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingCreditText<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `creditText` field to an Option value (optional)
@@ -6775,7 +6778,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingCreditText<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -6786,7 +6789,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingDateCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `dateCreated` field to an Option value (optional)
@@ -6794,7 +6797,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingDateCreated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -6805,7 +6808,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingDateModified<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `dateModified` field to an Option value (optional)
@@ -6813,7 +6816,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingDateModified<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -6824,7 +6827,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `datePublished` field to an Option value (optional)
@@ -6832,7 +6835,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -6843,7 +6846,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
@@ -6851,7 +6854,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -6862,7 +6865,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingDigitalSourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `digitalSourceType` field to an Option value (optional)
@@ -6870,7 +6873,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingDigitalSourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -6881,7 +6884,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -6889,7 +6892,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -6900,7 +6903,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingDiscussionUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `discussionUrl` field to an Option value (optional)
@@ -6908,7 +6911,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingDiscussionUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -6919,7 +6922,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingEditEidr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `editEIDR` field to an Option value (optional)
@@ -6927,7 +6930,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingEditEidr<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -6938,12 +6941,12 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingEditor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `editor` field to an Option value (optional)
     pub fn maybe_editor(mut self, value: Option<SocialMediaPostingEditor<'a>>) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -6954,7 +6957,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingEducationalAlignment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `educationalAlignment` field to an Option value (optional)
@@ -6962,7 +6965,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingEducationalAlignment<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -6973,7 +6976,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingEducationalLevel<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `educationalLevel` field to an Option value (optional)
@@ -6981,7 +6984,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingEducationalLevel<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -6992,7 +6995,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingEducationalUse<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `educationalUse` field to an Option value (optional)
@@ -7000,7 +7003,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingEducationalUse<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -7011,7 +7014,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingEncoding<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `encoding` field to an Option value (optional)
@@ -7019,7 +7022,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingEncoding<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -7030,7 +7033,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingEncodingFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `encodingFormat` field to an Option value (optional)
@@ -7038,7 +7041,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingEncodingFormat<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -7049,7 +7052,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingEncodings<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `encodings` field to an Option value (optional)
@@ -7057,7 +7060,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingEncodings<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -7068,7 +7071,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingExampleOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `exampleOfWork` field to an Option value (optional)
@@ -7076,7 +7079,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingExampleOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -7087,7 +7090,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingExpires<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `expires` field to an Option value (optional)
@@ -7095,7 +7098,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingExpires<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -7106,7 +7109,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingFileFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `fileFormat` field to an Option value (optional)
@@ -7114,7 +7117,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingFileFormat<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -7125,12 +7128,12 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingFunder<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<SocialMediaPostingFunder<'a>>) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -7141,7 +7144,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingFunding<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
@@ -7149,7 +7152,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingFunding<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -7160,12 +7163,12 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingGenre<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<SocialMediaPostingGenre<'a>>) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -7176,7 +7179,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingHasPart<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `hasPart` field to an Option value (optional)
@@ -7184,7 +7187,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingHasPart<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -7195,7 +7198,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingHeadline<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `headline` field to an Option value (optional)
@@ -7203,7 +7206,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingHeadline<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -7214,7 +7217,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingIdentifier<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
@@ -7222,7 +7225,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingIdentifier<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -7233,12 +7236,12 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingImage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<SocialMediaPostingImage<'a>>) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -7249,7 +7252,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingInLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `inLanguage` field to an Option value (optional)
@@ -7257,7 +7260,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingInLanguage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -7268,7 +7271,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -7276,7 +7279,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -7287,7 +7290,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingInteractivityType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `interactivityType` field to an Option value (optional)
@@ -7295,7 +7298,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingInteractivityType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -7306,7 +7309,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingInterpretedAsClaim<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `interpretedAsClaim` field to an Option value (optional)
@@ -7314,7 +7317,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingInterpretedAsClaim<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -7325,7 +7328,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingIsAccessibleForFree<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `isAccessibleForFree` field to an Option value (optional)
@@ -7333,7 +7336,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingIsAccessibleForFree<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -7344,7 +7347,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingIsBasedOn<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `isBasedOn` field to an Option value (optional)
@@ -7352,7 +7355,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingIsBasedOn<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -7363,7 +7366,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingIsBasedOnUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `isBasedOnUrl` field to an Option value (optional)
@@ -7371,7 +7374,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingIsBasedOnUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -7382,7 +7385,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingIsFamilyFriendly<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `isFamilyFriendly` field to an Option value (optional)
@@ -7390,7 +7393,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingIsFamilyFriendly<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -7401,7 +7404,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingIsPartOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `isPartOf` field to an Option value (optional)
@@ -7409,7 +7412,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingIsPartOf<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -7420,7 +7423,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingKeywords<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
@@ -7428,7 +7431,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingKeywords<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -7439,7 +7442,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingLearningResourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `learningResourceType` field to an Option value (optional)
@@ -7447,7 +7450,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingLearningResourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -7458,7 +7461,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingLicense<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value.into();
+        self._fields.79 = value.into();
         self
     }
     /// Set the `license` field to an Option value (optional)
@@ -7466,7 +7469,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingLicense<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value;
+        self._fields.79 = value;
         self
     }
 }
@@ -7477,7 +7480,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingLocationCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value.into();
+        self._fields.80 = value.into();
         self
     }
     /// Set the `locationCreated` field to an Option value (optional)
@@ -7485,7 +7488,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingLocationCreated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value;
+        self._fields.80 = value;
         self
     }
 }
@@ -7496,7 +7499,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingMainEntity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.81 = value.into();
+        self._fields.81 = value.into();
         self
     }
     /// Set the `mainEntity` field to an Option value (optional)
@@ -7504,7 +7507,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingMainEntity<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.81 = value;
+        self._fields.81 = value;
         self
     }
 }
@@ -7515,7 +7518,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value.into();
+        self._fields.82 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -7523,7 +7526,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value;
+        self._fields.82 = value;
         self
     }
 }
@@ -7534,7 +7537,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingMaintainer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.83 = value.into();
+        self._fields.83 = value.into();
         self
     }
     /// Set the `maintainer` field to an Option value (optional)
@@ -7542,7 +7545,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingMaintainer<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.83 = value;
+        self._fields.83 = value;
         self
     }
 }
@@ -7553,7 +7556,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingMaterial<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value.into();
+        self._fields.84 = value.into();
         self
     }
     /// Set the `material` field to an Option value (optional)
@@ -7561,7 +7564,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingMaterial<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value;
+        self._fields.84 = value;
         self
     }
 }
@@ -7572,7 +7575,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingMaterialExtent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.85 = value.into();
+        self._fields.85 = value.into();
         self
     }
     /// Set the `materialExtent` field to an Option value (optional)
@@ -7580,7 +7583,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingMaterialExtent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.85 = value;
+        self._fields.85 = value;
         self
     }
 }
@@ -7591,7 +7594,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingMentions<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.86 = value.into();
+        self._fields.86 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
@@ -7599,7 +7602,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingMentions<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.86 = value;
+        self._fields.86 = value;
         self
     }
 }
@@ -7607,12 +7610,12 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
 impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<SocialMediaPostingName<'a>>>) -> Self {
-        self.__unsafe_private_named.87 = value.into();
+        self._fields.87 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<SocialMediaPostingName<'a>>) -> Self {
-        self.__unsafe_private_named.87 = value;
+        self._fields.87 = value;
         self
     }
 }
@@ -7623,12 +7626,12 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingOffers<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.88 = value.into();
+        self._fields.88 = value.into();
         self
     }
     /// Set the `offers` field to an Option value (optional)
     pub fn maybe_offers(mut self, value: Option<SocialMediaPostingOffers<'a>>) -> Self {
-        self.__unsafe_private_named.88 = value;
+        self._fields.88 = value;
         self
     }
 }
@@ -7639,7 +7642,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingPageEnd<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.89 = value.into();
+        self._fields.89 = value.into();
         self
     }
     /// Set the `pageEnd` field to an Option value (optional)
@@ -7647,7 +7650,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingPageEnd<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.89 = value;
+        self._fields.89 = value;
         self
     }
 }
@@ -7658,7 +7661,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingPageStart<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.90 = value.into();
+        self._fields.90 = value.into();
         self
     }
     /// Set the `pageStart` field to an Option value (optional)
@@ -7666,7 +7669,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingPageStart<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.90 = value;
+        self._fields.90 = value;
         self
     }
 }
@@ -7677,7 +7680,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingPagination<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.91 = value.into();
+        self._fields.91 = value.into();
         self
     }
     /// Set the `pagination` field to an Option value (optional)
@@ -7685,7 +7688,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingPagination<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.91 = value;
+        self._fields.91 = value;
         self
     }
 }
@@ -7696,7 +7699,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingPattern<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.92 = value.into();
+        self._fields.92 = value.into();
         self
     }
     /// Set the `pattern` field to an Option value (optional)
@@ -7704,7 +7707,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingPattern<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.92 = value;
+        self._fields.92 = value;
         self
     }
 }
@@ -7715,7 +7718,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingPosition<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.93 = value.into();
+        self._fields.93 = value.into();
         self
     }
     /// Set the `position` field to an Option value (optional)
@@ -7723,7 +7726,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingPosition<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.93 = value;
+        self._fields.93 = value;
         self
     }
 }
@@ -7734,7 +7737,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingPotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value.into();
+        self._fields.94 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -7742,7 +7745,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingPotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value;
+        self._fields.94 = value;
         self
     }
 }
@@ -7753,7 +7756,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingProducer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.95 = value.into();
+        self._fields.95 = value.into();
         self
     }
     /// Set the `producer` field to an Option value (optional)
@@ -7761,7 +7764,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingProducer<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.95 = value;
+        self._fields.95 = value;
         self
     }
 }
@@ -7772,7 +7775,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingProvider<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.96 = value.into();
+        self._fields.96 = value.into();
         self
     }
     /// Set the `provider` field to an Option value (optional)
@@ -7780,7 +7783,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingProvider<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.96 = value;
+        self._fields.96 = value;
         self
     }
 }
@@ -7791,7 +7794,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingPublication<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.97 = value.into();
+        self._fields.97 = value.into();
         self
     }
     /// Set the `publication` field to an Option value (optional)
@@ -7799,7 +7802,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingPublication<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.97 = value;
+        self._fields.97 = value;
         self
     }
 }
@@ -7810,7 +7813,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingPublisher<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value.into();
+        self._fields.98 = value.into();
         self
     }
     /// Set the `publisher` field to an Option value (optional)
@@ -7818,7 +7821,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingPublisher<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value;
+        self._fields.98 = value;
         self
     }
 }
@@ -7829,7 +7832,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingPublisherImprint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.99 = value.into();
+        self._fields.99 = value.into();
         self
     }
     /// Set the `publisherImprint` field to an Option value (optional)
@@ -7837,7 +7840,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingPublisherImprint<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.99 = value;
+        self._fields.99 = value;
         self
     }
 }
@@ -7848,7 +7851,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingPublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value.into();
+        self._fields.100 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -7856,7 +7859,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingPublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value;
+        self._fields.100 = value;
         self
     }
 }
@@ -7867,7 +7870,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingRecordedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value.into();
+        self._fields.101 = value.into();
         self
     }
     /// Set the `recordedAt` field to an Option value (optional)
@@ -7875,7 +7878,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingRecordedAt<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value;
+        self._fields.101 = value;
         self
     }
 }
@@ -7886,7 +7889,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingReleasedEvent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value.into();
+        self._fields.102 = value.into();
         self
     }
     /// Set the `releasedEvent` field to an Option value (optional)
@@ -7894,7 +7897,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingReleasedEvent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value;
+        self._fields.102 = value;
         self
     }
 }
@@ -7905,12 +7908,12 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingReview<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.103 = value.into();
+        self._fields.103 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<SocialMediaPostingReview<'a>>) -> Self {
-        self.__unsafe_private_named.103 = value;
+        self._fields.103 = value;
         self
     }
 }
@@ -7921,7 +7924,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingReviews<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value.into();
+        self._fields.104 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
@@ -7929,7 +7932,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingReviews<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value;
+        self._fields.104 = value;
         self
     }
 }
@@ -7940,12 +7943,12 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingSameAs<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.105 = value.into();
+        self._fields.105 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<SocialMediaPostingSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.105 = value;
+        self._fields.105 = value;
         self
     }
 }
@@ -7956,7 +7959,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingSchemaVersion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value.into();
+        self._fields.106 = value.into();
         self
     }
     /// Set the `schemaVersion` field to an Option value (optional)
@@ -7964,7 +7967,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingSchemaVersion<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value;
+        self._fields.106 = value;
         self
     }
 }
@@ -7975,7 +7978,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingSdDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value.into();
+        self._fields.107 = value.into();
         self
     }
     /// Set the `sdDatePublished` field to an Option value (optional)
@@ -7983,7 +7986,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingSdDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value;
+        self._fields.107 = value;
         self
     }
 }
@@ -7994,7 +7997,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingSdLicense<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.108 = value.into();
+        self._fields.108 = value.into();
         self
     }
     /// Set the `sdLicense` field to an Option value (optional)
@@ -8002,7 +8005,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingSdLicense<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.108 = value;
+        self._fields.108 = value;
         self
     }
 }
@@ -8013,7 +8016,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingSdPublisher<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.109 = value.into();
+        self._fields.109 = value.into();
         self
     }
     /// Set the `sdPublisher` field to an Option value (optional)
@@ -8021,7 +8024,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingSdPublisher<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.109 = value;
+        self._fields.109 = value;
         self
     }
 }
@@ -8032,7 +8035,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingSharedContent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.110 = value.into();
+        self._fields.110 = value.into();
         self
     }
     /// Set the `sharedContent` field to an Option value (optional)
@@ -8040,7 +8043,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingSharedContent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.110 = value;
+        self._fields.110 = value;
         self
     }
 }
@@ -8048,12 +8051,12 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
 impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<SocialMediaPostingSize<'a>>>) -> Self {
-        self.__unsafe_private_named.111 = value.into();
+        self._fields.111 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<SocialMediaPostingSize<'a>>) -> Self {
-        self.__unsafe_private_named.111 = value;
+        self._fields.111 = value;
         self
     }
 }
@@ -8064,7 +8067,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingSourceOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value.into();
+        self._fields.112 = value.into();
         self
     }
     /// Set the `sourceOrganization` field to an Option value (optional)
@@ -8072,7 +8075,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingSourceOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value;
+        self._fields.112 = value;
         self
     }
 }
@@ -8083,7 +8086,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingSpatial<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value.into();
+        self._fields.113 = value.into();
         self
     }
     /// Set the `spatial` field to an Option value (optional)
@@ -8091,7 +8094,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingSpatial<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value;
+        self._fields.113 = value;
         self
     }
 }
@@ -8102,7 +8105,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingSpatialCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.114 = value.into();
+        self._fields.114 = value.into();
         self
     }
     /// Set the `spatialCoverage` field to an Option value (optional)
@@ -8110,7 +8113,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingSpatialCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.114 = value;
+        self._fields.114 = value;
         self
     }
 }
@@ -8121,7 +8124,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingSpeakable<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.115 = value.into();
+        self._fields.115 = value.into();
         self
     }
     /// Set the `speakable` field to an Option value (optional)
@@ -8129,7 +8132,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingSpeakable<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.115 = value;
+        self._fields.115 = value;
         self
     }
 }
@@ -8140,7 +8143,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingSponsor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.116 = value.into();
+        self._fields.116 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
@@ -8148,7 +8151,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingSponsor<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.116 = value;
+        self._fields.116 = value;
         self
     }
 }
@@ -8159,7 +8162,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingSubjectOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.117 = value.into();
+        self._fields.117 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
@@ -8167,7 +8170,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingSubjectOf<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.117 = value;
+        self._fields.117 = value;
         self
     }
 }
@@ -8178,7 +8181,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingTeaches<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.118 = value.into();
+        self._fields.118 = value.into();
         self
     }
     /// Set the `teaches` field to an Option value (optional)
@@ -8186,7 +8189,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingTeaches<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.118 = value;
+        self._fields.118 = value;
         self
     }
 }
@@ -8197,7 +8200,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingTemporal<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.119 = value.into();
+        self._fields.119 = value.into();
         self
     }
     /// Set the `temporal` field to an Option value (optional)
@@ -8205,7 +8208,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingTemporal<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.119 = value;
+        self._fields.119 = value;
         self
     }
 }
@@ -8216,7 +8219,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingTemporalCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.120 = value.into();
+        self._fields.120 = value.into();
         self
     }
     /// Set the `temporalCoverage` field to an Option value (optional)
@@ -8224,7 +8227,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingTemporalCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.120 = value;
+        self._fields.120 = value;
         self
     }
 }
@@ -8232,12 +8235,12 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
 impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<SocialMediaPostingText<'a>>>) -> Self {
-        self.__unsafe_private_named.121 = value.into();
+        self._fields.121 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<SocialMediaPostingText<'a>>) -> Self {
-        self.__unsafe_private_named.121 = value;
+        self._fields.121 = value;
         self
     }
 }
@@ -8248,7 +8251,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingThumbnail<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.122 = value.into();
+        self._fields.122 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
@@ -8256,7 +8259,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingThumbnail<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.122 = value;
+        self._fields.122 = value;
         self
     }
 }
@@ -8267,7 +8270,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingThumbnailUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.123 = value.into();
+        self._fields.123 = value.into();
         self
     }
     /// Set the `thumbnailUrl` field to an Option value (optional)
@@ -8275,7 +8278,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingThumbnailUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.123 = value;
+        self._fields.123 = value;
         self
     }
 }
@@ -8286,7 +8289,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingTimeRequired<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.124 = value.into();
+        self._fields.124 = value.into();
         self
     }
     /// Set the `timeRequired` field to an Option value (optional)
@@ -8294,7 +8297,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingTimeRequired<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.124 = value;
+        self._fields.124 = value;
         self
     }
 }
@@ -8305,7 +8308,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingTranslationOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.125 = value.into();
+        self._fields.125 = value.into();
         self
     }
     /// Set the `translationOfWork` field to an Option value (optional)
@@ -8313,7 +8316,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingTranslationOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.125 = value;
+        self._fields.125 = value;
         self
     }
 }
@@ -8324,7 +8327,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingTranslator<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.126 = value.into();
+        self._fields.126 = value.into();
         self
     }
     /// Set the `translator` field to an Option value (optional)
@@ -8332,7 +8335,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingTranslator<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.126 = value;
+        self._fields.126 = value;
         self
     }
 }
@@ -8343,7 +8346,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingTypicalAgeRange<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.127 = value.into();
+        self._fields.127 = value.into();
         self
     }
     /// Set the `typicalAgeRange` field to an Option value (optional)
@@ -8351,7 +8354,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingTypicalAgeRange<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.127 = value;
+        self._fields.127 = value;
         self
     }
 }
@@ -8359,12 +8362,12 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
 impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<SocialMediaPostingUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.128 = value.into();
+        self._fields.128 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<SocialMediaPostingUrl<'a>>) -> Self {
-        self.__unsafe_private_named.128 = value;
+        self._fields.128 = value;
         self
     }
 }
@@ -8375,7 +8378,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingUsageInfo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.129 = value.into();
+        self._fields.129 = value.into();
         self
     }
     /// Set the `usageInfo` field to an Option value (optional)
@@ -8383,7 +8386,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingUsageInfo<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.129 = value;
+        self._fields.129 = value;
         self
     }
 }
@@ -8394,7 +8397,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingVersion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.130 = value.into();
+        self._fields.130 = value.into();
         self
     }
     /// Set the `version` field to an Option value (optional)
@@ -8402,7 +8405,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingVersion<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.130 = value;
+        self._fields.130 = value;
         self
     }
 }
@@ -8413,12 +8416,12 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingVideo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.131 = value.into();
+        self._fields.131 = value.into();
         self
     }
     /// Set the `video` field to an Option value (optional)
     pub fn maybe_video(mut self, value: Option<SocialMediaPostingVideo<'a>>) -> Self {
-        self.__unsafe_private_named.131 = value;
+        self._fields.131 = value;
         self
     }
 }
@@ -8429,7 +8432,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingWordCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.132 = value.into();
+        self._fields.132 = value.into();
         self
     }
     /// Set the `wordCount` field to an Option value (optional)
@@ -8437,7 +8440,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingWordCount<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.132 = value;
+        self._fields.132 = value;
         self
     }
 }
@@ -8448,7 +8451,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingWorkExample<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.133 = value.into();
+        self._fields.133 = value.into();
         self
     }
     /// Set the `workExample` field to an Option value (optional)
@@ -8456,7 +8459,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingWorkExample<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.133 = value;
+        self._fields.133 = value;
         self
     }
 }
@@ -8467,7 +8470,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: impl Into<Option<SocialMediaPostingWorkTranslation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.134 = value.into();
+        self._fields.134 = value.into();
         self
     }
     /// Set the `workTranslation` field to an Option value (optional)
@@ -8475,7 +8478,7 @@ impl<'a, S: social_media_posting_state::State> SocialMediaPostingBuilder<'a, S>
         mut self,
         value: Option<SocialMediaPostingWorkTranslation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.134 = value;
+        self._fields.134 = value;
         self
     }
 }
@@ -8487,141 +8490,141 @@ where
     /// Build the final struct
     pub fn build(self) -> SocialMediaPosting<'a> {
         SocialMediaPosting {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            additional_type: self.__unsafe_private_named.11,
-            aggregate_rating: self.__unsafe_private_named.12,
-            alternate_name: self.__unsafe_private_named.13,
-            alternative_headline: self.__unsafe_private_named.14,
-            archived_at: self.__unsafe_private_named.15,
-            article_body: self.__unsafe_private_named.16,
-            article_section: self.__unsafe_private_named.17,
-            assesses: self.__unsafe_private_named.18,
-            associated_media: self.__unsafe_private_named.19,
-            audience: self.__unsafe_private_named.20,
-            audio: self.__unsafe_private_named.21,
-            author: self.__unsafe_private_named.22,
-            award: self.__unsafe_private_named.23,
-            awards: self.__unsafe_private_named.24,
-            backstory: self.__unsafe_private_named.25,
-            character: self.__unsafe_private_named.26,
-            citation: self.__unsafe_private_named.27,
-            comment: self.__unsafe_private_named.28,
-            comment_count: self.__unsafe_private_named.29,
-            conditions_of_access: self.__unsafe_private_named.30,
-            content_location: self.__unsafe_private_named.31,
-            content_rating: self.__unsafe_private_named.32,
-            content_reference_time: self.__unsafe_private_named.33,
-            contributor: self.__unsafe_private_named.34,
-            copyright_holder: self.__unsafe_private_named.35,
-            copyright_notice: self.__unsafe_private_named.36,
-            copyright_year: self.__unsafe_private_named.37,
-            correction: self.__unsafe_private_named.38,
-            country_of_origin: self.__unsafe_private_named.39,
-            creative_work_status: self.__unsafe_private_named.40,
-            creator: self.__unsafe_private_named.41,
-            credit_text: self.__unsafe_private_named.42,
-            date_created: self.__unsafe_private_named.43,
-            date_modified: self.__unsafe_private_named.44,
-            date_published: self.__unsafe_private_named.45,
-            description: self.__unsafe_private_named.46,
-            digital_source_type: self.__unsafe_private_named.47,
-            disambiguating_description: self.__unsafe_private_named.48,
-            discussion_url: self.__unsafe_private_named.49,
-            edit_eidr: self.__unsafe_private_named.50,
-            editor: self.__unsafe_private_named.51,
-            educational_alignment: self.__unsafe_private_named.52,
-            educational_level: self.__unsafe_private_named.53,
-            educational_use: self.__unsafe_private_named.54,
-            encoding: self.__unsafe_private_named.55,
-            encoding_format: self.__unsafe_private_named.56,
-            encodings: self.__unsafe_private_named.57,
-            example_of_work: self.__unsafe_private_named.58,
-            expires: self.__unsafe_private_named.59,
-            file_format: self.__unsafe_private_named.60,
-            funder: self.__unsafe_private_named.61,
-            funding: self.__unsafe_private_named.62,
-            genre: self.__unsafe_private_named.63,
-            has_part: self.__unsafe_private_named.64,
-            headline: self.__unsafe_private_named.65,
-            identifier: self.__unsafe_private_named.66,
-            image: self.__unsafe_private_named.67,
-            in_language: self.__unsafe_private_named.68,
-            interaction_statistic: self.__unsafe_private_named.69,
-            interactivity_type: self.__unsafe_private_named.70,
-            interpreted_as_claim: self.__unsafe_private_named.71,
-            is_accessible_for_free: self.__unsafe_private_named.72,
-            is_based_on: self.__unsafe_private_named.73,
-            is_based_on_url: self.__unsafe_private_named.74,
-            is_family_friendly: self.__unsafe_private_named.75,
-            is_part_of: self.__unsafe_private_named.76,
-            keywords: self.__unsafe_private_named.77,
-            learning_resource_type: self.__unsafe_private_named.78,
-            license: self.__unsafe_private_named.79,
-            location_created: self.__unsafe_private_named.80,
-            main_entity: self.__unsafe_private_named.81,
-            main_entity_of_page: self.__unsafe_private_named.82,
-            maintainer: self.__unsafe_private_named.83,
-            material: self.__unsafe_private_named.84,
-            material_extent: self.__unsafe_private_named.85,
-            mentions: self.__unsafe_private_named.86,
-            name: self.__unsafe_private_named.87,
-            offers: self.__unsafe_private_named.88,
-            page_end: self.__unsafe_private_named.89,
-            page_start: self.__unsafe_private_named.90,
-            pagination: self.__unsafe_private_named.91,
-            pattern: self.__unsafe_private_named.92,
-            position: self.__unsafe_private_named.93,
-            potential_action: self.__unsafe_private_named.94,
-            producer: self.__unsafe_private_named.95,
-            provider: self.__unsafe_private_named.96,
-            publication: self.__unsafe_private_named.97,
-            publisher: self.__unsafe_private_named.98,
-            publisher_imprint: self.__unsafe_private_named.99,
-            publishing_principles: self.__unsafe_private_named.100,
-            recorded_at: self.__unsafe_private_named.101,
-            released_event: self.__unsafe_private_named.102,
-            review: self.__unsafe_private_named.103,
-            reviews: self.__unsafe_private_named.104,
-            same_as: self.__unsafe_private_named.105,
-            schema_version: self.__unsafe_private_named.106,
-            sd_date_published: self.__unsafe_private_named.107,
-            sd_license: self.__unsafe_private_named.108,
-            sd_publisher: self.__unsafe_private_named.109,
-            shared_content: self.__unsafe_private_named.110,
-            size: self.__unsafe_private_named.111,
-            source_organization: self.__unsafe_private_named.112,
-            spatial: self.__unsafe_private_named.113,
-            spatial_coverage: self.__unsafe_private_named.114,
-            speakable: self.__unsafe_private_named.115,
-            sponsor: self.__unsafe_private_named.116,
-            subject_of: self.__unsafe_private_named.117,
-            teaches: self.__unsafe_private_named.118,
-            temporal: self.__unsafe_private_named.119,
-            temporal_coverage: self.__unsafe_private_named.120,
-            text: self.__unsafe_private_named.121,
-            thumbnail: self.__unsafe_private_named.122,
-            thumbnail_url: self.__unsafe_private_named.123,
-            time_required: self.__unsafe_private_named.124,
-            translation_of_work: self.__unsafe_private_named.125,
-            translator: self.__unsafe_private_named.126,
-            typical_age_range: self.__unsafe_private_named.127,
-            url: self.__unsafe_private_named.128,
-            usage_info: self.__unsafe_private_named.129,
-            version: self.__unsafe_private_named.130,
-            video: self.__unsafe_private_named.131,
-            word_count: self.__unsafe_private_named.132,
-            work_example: self.__unsafe_private_named.133,
-            work_translation: self.__unsafe_private_named.134,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            additional_type: self._fields.11,
+            aggregate_rating: self._fields.12,
+            alternate_name: self._fields.13,
+            alternative_headline: self._fields.14,
+            archived_at: self._fields.15,
+            article_body: self._fields.16,
+            article_section: self._fields.17,
+            assesses: self._fields.18,
+            associated_media: self._fields.19,
+            audience: self._fields.20,
+            audio: self._fields.21,
+            author: self._fields.22,
+            award: self._fields.23,
+            awards: self._fields.24,
+            backstory: self._fields.25,
+            character: self._fields.26,
+            citation: self._fields.27,
+            comment: self._fields.28,
+            comment_count: self._fields.29,
+            conditions_of_access: self._fields.30,
+            content_location: self._fields.31,
+            content_rating: self._fields.32,
+            content_reference_time: self._fields.33,
+            contributor: self._fields.34,
+            copyright_holder: self._fields.35,
+            copyright_notice: self._fields.36,
+            copyright_year: self._fields.37,
+            correction: self._fields.38,
+            country_of_origin: self._fields.39,
+            creative_work_status: self._fields.40,
+            creator: self._fields.41,
+            credit_text: self._fields.42,
+            date_created: self._fields.43,
+            date_modified: self._fields.44,
+            date_published: self._fields.45,
+            description: self._fields.46,
+            digital_source_type: self._fields.47,
+            disambiguating_description: self._fields.48,
+            discussion_url: self._fields.49,
+            edit_eidr: self._fields.50,
+            editor: self._fields.51,
+            educational_alignment: self._fields.52,
+            educational_level: self._fields.53,
+            educational_use: self._fields.54,
+            encoding: self._fields.55,
+            encoding_format: self._fields.56,
+            encodings: self._fields.57,
+            example_of_work: self._fields.58,
+            expires: self._fields.59,
+            file_format: self._fields.60,
+            funder: self._fields.61,
+            funding: self._fields.62,
+            genre: self._fields.63,
+            has_part: self._fields.64,
+            headline: self._fields.65,
+            identifier: self._fields.66,
+            image: self._fields.67,
+            in_language: self._fields.68,
+            interaction_statistic: self._fields.69,
+            interactivity_type: self._fields.70,
+            interpreted_as_claim: self._fields.71,
+            is_accessible_for_free: self._fields.72,
+            is_based_on: self._fields.73,
+            is_based_on_url: self._fields.74,
+            is_family_friendly: self._fields.75,
+            is_part_of: self._fields.76,
+            keywords: self._fields.77,
+            learning_resource_type: self._fields.78,
+            license: self._fields.79,
+            location_created: self._fields.80,
+            main_entity: self._fields.81,
+            main_entity_of_page: self._fields.82,
+            maintainer: self._fields.83,
+            material: self._fields.84,
+            material_extent: self._fields.85,
+            mentions: self._fields.86,
+            name: self._fields.87,
+            offers: self._fields.88,
+            page_end: self._fields.89,
+            page_start: self._fields.90,
+            pagination: self._fields.91,
+            pattern: self._fields.92,
+            position: self._fields.93,
+            potential_action: self._fields.94,
+            producer: self._fields.95,
+            provider: self._fields.96,
+            publication: self._fields.97,
+            publisher: self._fields.98,
+            publisher_imprint: self._fields.99,
+            publishing_principles: self._fields.100,
+            recorded_at: self._fields.101,
+            released_event: self._fields.102,
+            review: self._fields.103,
+            reviews: self._fields.104,
+            same_as: self._fields.105,
+            schema_version: self._fields.106,
+            sd_date_published: self._fields.107,
+            sd_license: self._fields.108,
+            sd_publisher: self._fields.109,
+            shared_content: self._fields.110,
+            size: self._fields.111,
+            source_organization: self._fields.112,
+            spatial: self._fields.113,
+            spatial_coverage: self._fields.114,
+            speakable: self._fields.115,
+            sponsor: self._fields.116,
+            subject_of: self._fields.117,
+            teaches: self._fields.118,
+            temporal: self._fields.119,
+            temporal_coverage: self._fields.120,
+            text: self._fields.121,
+            thumbnail: self._fields.122,
+            thumbnail_url: self._fields.123,
+            time_required: self._fields.124,
+            translation_of_work: self._fields.125,
+            translator: self._fields.126,
+            typical_age_range: self._fields.127,
+            url: self._fields.128,
+            usage_info: self._fields.129,
+            version: self._fields.130,
+            video: self._fields.131,
+            word_count: self._fields.132,
+            work_example: self._fields.133,
+            work_translation: self._fields.134,
             extra_data: Default::default(),
         }
     }
@@ -8631,141 +8634,141 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> SocialMediaPosting<'a> {
         SocialMediaPosting {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            additional_type: self.__unsafe_private_named.11,
-            aggregate_rating: self.__unsafe_private_named.12,
-            alternate_name: self.__unsafe_private_named.13,
-            alternative_headline: self.__unsafe_private_named.14,
-            archived_at: self.__unsafe_private_named.15,
-            article_body: self.__unsafe_private_named.16,
-            article_section: self.__unsafe_private_named.17,
-            assesses: self.__unsafe_private_named.18,
-            associated_media: self.__unsafe_private_named.19,
-            audience: self.__unsafe_private_named.20,
-            audio: self.__unsafe_private_named.21,
-            author: self.__unsafe_private_named.22,
-            award: self.__unsafe_private_named.23,
-            awards: self.__unsafe_private_named.24,
-            backstory: self.__unsafe_private_named.25,
-            character: self.__unsafe_private_named.26,
-            citation: self.__unsafe_private_named.27,
-            comment: self.__unsafe_private_named.28,
-            comment_count: self.__unsafe_private_named.29,
-            conditions_of_access: self.__unsafe_private_named.30,
-            content_location: self.__unsafe_private_named.31,
-            content_rating: self.__unsafe_private_named.32,
-            content_reference_time: self.__unsafe_private_named.33,
-            contributor: self.__unsafe_private_named.34,
-            copyright_holder: self.__unsafe_private_named.35,
-            copyright_notice: self.__unsafe_private_named.36,
-            copyright_year: self.__unsafe_private_named.37,
-            correction: self.__unsafe_private_named.38,
-            country_of_origin: self.__unsafe_private_named.39,
-            creative_work_status: self.__unsafe_private_named.40,
-            creator: self.__unsafe_private_named.41,
-            credit_text: self.__unsafe_private_named.42,
-            date_created: self.__unsafe_private_named.43,
-            date_modified: self.__unsafe_private_named.44,
-            date_published: self.__unsafe_private_named.45,
-            description: self.__unsafe_private_named.46,
-            digital_source_type: self.__unsafe_private_named.47,
-            disambiguating_description: self.__unsafe_private_named.48,
-            discussion_url: self.__unsafe_private_named.49,
-            edit_eidr: self.__unsafe_private_named.50,
-            editor: self.__unsafe_private_named.51,
-            educational_alignment: self.__unsafe_private_named.52,
-            educational_level: self.__unsafe_private_named.53,
-            educational_use: self.__unsafe_private_named.54,
-            encoding: self.__unsafe_private_named.55,
-            encoding_format: self.__unsafe_private_named.56,
-            encodings: self.__unsafe_private_named.57,
-            example_of_work: self.__unsafe_private_named.58,
-            expires: self.__unsafe_private_named.59,
-            file_format: self.__unsafe_private_named.60,
-            funder: self.__unsafe_private_named.61,
-            funding: self.__unsafe_private_named.62,
-            genre: self.__unsafe_private_named.63,
-            has_part: self.__unsafe_private_named.64,
-            headline: self.__unsafe_private_named.65,
-            identifier: self.__unsafe_private_named.66,
-            image: self.__unsafe_private_named.67,
-            in_language: self.__unsafe_private_named.68,
-            interaction_statistic: self.__unsafe_private_named.69,
-            interactivity_type: self.__unsafe_private_named.70,
-            interpreted_as_claim: self.__unsafe_private_named.71,
-            is_accessible_for_free: self.__unsafe_private_named.72,
-            is_based_on: self.__unsafe_private_named.73,
-            is_based_on_url: self.__unsafe_private_named.74,
-            is_family_friendly: self.__unsafe_private_named.75,
-            is_part_of: self.__unsafe_private_named.76,
-            keywords: self.__unsafe_private_named.77,
-            learning_resource_type: self.__unsafe_private_named.78,
-            license: self.__unsafe_private_named.79,
-            location_created: self.__unsafe_private_named.80,
-            main_entity: self.__unsafe_private_named.81,
-            main_entity_of_page: self.__unsafe_private_named.82,
-            maintainer: self.__unsafe_private_named.83,
-            material: self.__unsafe_private_named.84,
-            material_extent: self.__unsafe_private_named.85,
-            mentions: self.__unsafe_private_named.86,
-            name: self.__unsafe_private_named.87,
-            offers: self.__unsafe_private_named.88,
-            page_end: self.__unsafe_private_named.89,
-            page_start: self.__unsafe_private_named.90,
-            pagination: self.__unsafe_private_named.91,
-            pattern: self.__unsafe_private_named.92,
-            position: self.__unsafe_private_named.93,
-            potential_action: self.__unsafe_private_named.94,
-            producer: self.__unsafe_private_named.95,
-            provider: self.__unsafe_private_named.96,
-            publication: self.__unsafe_private_named.97,
-            publisher: self.__unsafe_private_named.98,
-            publisher_imprint: self.__unsafe_private_named.99,
-            publishing_principles: self.__unsafe_private_named.100,
-            recorded_at: self.__unsafe_private_named.101,
-            released_event: self.__unsafe_private_named.102,
-            review: self.__unsafe_private_named.103,
-            reviews: self.__unsafe_private_named.104,
-            same_as: self.__unsafe_private_named.105,
-            schema_version: self.__unsafe_private_named.106,
-            sd_date_published: self.__unsafe_private_named.107,
-            sd_license: self.__unsafe_private_named.108,
-            sd_publisher: self.__unsafe_private_named.109,
-            shared_content: self.__unsafe_private_named.110,
-            size: self.__unsafe_private_named.111,
-            source_organization: self.__unsafe_private_named.112,
-            spatial: self.__unsafe_private_named.113,
-            spatial_coverage: self.__unsafe_private_named.114,
-            speakable: self.__unsafe_private_named.115,
-            sponsor: self.__unsafe_private_named.116,
-            subject_of: self.__unsafe_private_named.117,
-            teaches: self.__unsafe_private_named.118,
-            temporal: self.__unsafe_private_named.119,
-            temporal_coverage: self.__unsafe_private_named.120,
-            text: self.__unsafe_private_named.121,
-            thumbnail: self.__unsafe_private_named.122,
-            thumbnail_url: self.__unsafe_private_named.123,
-            time_required: self.__unsafe_private_named.124,
-            translation_of_work: self.__unsafe_private_named.125,
-            translator: self.__unsafe_private_named.126,
-            typical_age_range: self.__unsafe_private_named.127,
-            url: self.__unsafe_private_named.128,
-            usage_info: self.__unsafe_private_named.129,
-            version: self.__unsafe_private_named.130,
-            video: self.__unsafe_private_named.131,
-            word_count: self.__unsafe_private_named.132,
-            work_example: self.__unsafe_private_named.133,
-            work_translation: self.__unsafe_private_named.134,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            additional_type: self._fields.11,
+            aggregate_rating: self._fields.12,
+            alternate_name: self._fields.13,
+            alternative_headline: self._fields.14,
+            archived_at: self._fields.15,
+            article_body: self._fields.16,
+            article_section: self._fields.17,
+            assesses: self._fields.18,
+            associated_media: self._fields.19,
+            audience: self._fields.20,
+            audio: self._fields.21,
+            author: self._fields.22,
+            award: self._fields.23,
+            awards: self._fields.24,
+            backstory: self._fields.25,
+            character: self._fields.26,
+            citation: self._fields.27,
+            comment: self._fields.28,
+            comment_count: self._fields.29,
+            conditions_of_access: self._fields.30,
+            content_location: self._fields.31,
+            content_rating: self._fields.32,
+            content_reference_time: self._fields.33,
+            contributor: self._fields.34,
+            copyright_holder: self._fields.35,
+            copyright_notice: self._fields.36,
+            copyright_year: self._fields.37,
+            correction: self._fields.38,
+            country_of_origin: self._fields.39,
+            creative_work_status: self._fields.40,
+            creator: self._fields.41,
+            credit_text: self._fields.42,
+            date_created: self._fields.43,
+            date_modified: self._fields.44,
+            date_published: self._fields.45,
+            description: self._fields.46,
+            digital_source_type: self._fields.47,
+            disambiguating_description: self._fields.48,
+            discussion_url: self._fields.49,
+            edit_eidr: self._fields.50,
+            editor: self._fields.51,
+            educational_alignment: self._fields.52,
+            educational_level: self._fields.53,
+            educational_use: self._fields.54,
+            encoding: self._fields.55,
+            encoding_format: self._fields.56,
+            encodings: self._fields.57,
+            example_of_work: self._fields.58,
+            expires: self._fields.59,
+            file_format: self._fields.60,
+            funder: self._fields.61,
+            funding: self._fields.62,
+            genre: self._fields.63,
+            has_part: self._fields.64,
+            headline: self._fields.65,
+            identifier: self._fields.66,
+            image: self._fields.67,
+            in_language: self._fields.68,
+            interaction_statistic: self._fields.69,
+            interactivity_type: self._fields.70,
+            interpreted_as_claim: self._fields.71,
+            is_accessible_for_free: self._fields.72,
+            is_based_on: self._fields.73,
+            is_based_on_url: self._fields.74,
+            is_family_friendly: self._fields.75,
+            is_part_of: self._fields.76,
+            keywords: self._fields.77,
+            learning_resource_type: self._fields.78,
+            license: self._fields.79,
+            location_created: self._fields.80,
+            main_entity: self._fields.81,
+            main_entity_of_page: self._fields.82,
+            maintainer: self._fields.83,
+            material: self._fields.84,
+            material_extent: self._fields.85,
+            mentions: self._fields.86,
+            name: self._fields.87,
+            offers: self._fields.88,
+            page_end: self._fields.89,
+            page_start: self._fields.90,
+            pagination: self._fields.91,
+            pattern: self._fields.92,
+            position: self._fields.93,
+            potential_action: self._fields.94,
+            producer: self._fields.95,
+            provider: self._fields.96,
+            publication: self._fields.97,
+            publisher: self._fields.98,
+            publisher_imprint: self._fields.99,
+            publishing_principles: self._fields.100,
+            recorded_at: self._fields.101,
+            released_event: self._fields.102,
+            review: self._fields.103,
+            reviews: self._fields.104,
+            same_as: self._fields.105,
+            schema_version: self._fields.106,
+            sd_date_published: self._fields.107,
+            sd_license: self._fields.108,
+            sd_publisher: self._fields.109,
+            shared_content: self._fields.110,
+            size: self._fields.111,
+            source_organization: self._fields.112,
+            spatial: self._fields.113,
+            spatial_coverage: self._fields.114,
+            speakable: self._fields.115,
+            sponsor: self._fields.116,
+            subject_of: self._fields.117,
+            teaches: self._fields.118,
+            temporal: self._fields.119,
+            temporal_coverage: self._fields.120,
+            text: self._fields.121,
+            thumbnail: self._fields.122,
+            thumbnail_url: self._fields.123,
+            time_required: self._fields.124,
+            translation_of_work: self._fields.125,
+            translator: self._fields.126,
+            typical_age_range: self._fields.127,
+            url: self._fields.128,
+            usage_info: self._fields.129,
+            version: self._fields.130,
+            video: self._fields.131,
+            word_count: self._fields.132,
+            work_example: self._fields.133,
+            work_translation: self._fields.134,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/store.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/store.rs
index be634521..0d1832c3 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/store.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/store.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -5323,8 +5326,8 @@ pub mod store_state {
 
 /// Builder for constructing an instance of this type
 pub struct StoreBuilder<'a, S: store_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<StoreAcceptedPaymentMethod<'a>>,
         Option<StoreActionableFeedbackPolicy<'a>>,
         Option<StoreAdditionalProperty<'a>>,
@@ -5452,7 +5455,7 @@ pub struct StoreBuilder<'a, S: store_state::State> {
         Option<StoreUrl<'a>>,
         Option<StoreVatId<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Store<'a> {
@@ -5466,8 +5469,8 @@ impl<'a> StoreBuilder<'a, store_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -5595,7 +5598,7 @@ impl<'a> StoreBuilder<'a, store_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5606,7 +5609,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreAcceptedPaymentMethod<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `acceptedPaymentMethod` field to an Option value (optional)
@@ -5614,7 +5617,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreAcceptedPaymentMethod<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -5625,7 +5628,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreActionableFeedbackPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `actionableFeedbackPolicy` field to an Option value (optional)
@@ -5633,7 +5636,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreActionableFeedbackPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -5644,7 +5647,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreAdditionalProperty<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `additionalProperty` field to an Option value (optional)
@@ -5652,7 +5655,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreAdditionalProperty<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -5663,7 +5666,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -5671,7 +5674,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -5679,12 +5682,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `address` field (optional)
     pub fn address(mut self, value: impl Into<Option<StoreAddress<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `address` field to an Option value (optional)
     pub fn maybe_address(mut self, value: Option<StoreAddress<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -5695,7 +5698,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreAgentInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `agentInteractionStatistic` field to an Option value (optional)
@@ -5703,7 +5706,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreAgentInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -5714,7 +5717,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -5722,7 +5725,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -5733,7 +5736,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -5741,7 +5744,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -5749,12 +5752,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `alumni` field (optional)
     pub fn alumni(mut self, value: impl Into<Option<StoreAlumni<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `alumni` field to an Option value (optional)
     pub fn maybe_alumni(mut self, value: Option<StoreAlumni<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -5765,7 +5768,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreAmenityFeature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `amenityFeature` field to an Option value (optional)
@@ -5773,7 +5776,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreAmenityFeature<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -5781,12 +5784,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `areaServed` field (optional)
     pub fn area_served(mut self, value: impl Into<Option<StoreAreaServed<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `areaServed` field to an Option value (optional)
     pub fn maybe_area_served(mut self, value: Option<StoreAreaServed<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -5794,12 +5797,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<StoreAward<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<StoreAward<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -5807,12 +5810,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<StoreAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<StoreAwards<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -5820,12 +5823,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `branchCode` field (optional)
     pub fn branch_code(mut self, value: impl Into<Option<StoreBranchCode<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `branchCode` field to an Option value (optional)
     pub fn maybe_branch_code(mut self, value: Option<StoreBranchCode<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -5833,12 +5836,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `branchOf` field (optional)
     pub fn branch_of(mut self, value: impl Into<Option<StoreBranchOf<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `branchOf` field to an Option value (optional)
     pub fn maybe_branch_of(mut self, value: Option<StoreBranchOf<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -5846,12 +5849,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `brand` field (optional)
     pub fn brand(mut self, value: impl Into<Option<StoreBrand<'a>>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `brand` field to an Option value (optional)
     pub fn maybe_brand(mut self, value: Option<StoreBrand<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -5862,7 +5865,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreCompanyRegistration<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `companyRegistration` field to an Option value (optional)
@@ -5870,7 +5873,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreCompanyRegistration<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -5881,12 +5884,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreContactPoint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `contactPoint` field to an Option value (optional)
     pub fn maybe_contact_point(mut self, value: Option<StoreContactPoint<'a>>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -5897,7 +5900,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreContactPoints<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `contactPoints` field to an Option value (optional)
@@ -5905,7 +5908,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreContactPoints<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -5916,12 +5919,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreContainedIn<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `containedIn` field to an Option value (optional)
     pub fn maybe_contained_in(mut self, value: Option<StoreContainedIn<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -5932,7 +5935,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreContainedInPlace<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `containedInPlace` field to an Option value (optional)
@@ -5940,7 +5943,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreContainedInPlace<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -5951,7 +5954,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreContainsPlace<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `containsPlace` field to an Option value (optional)
@@ -5959,7 +5962,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreContainsPlace<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -5970,7 +5973,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreCorrectionsPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `correctionsPolicy` field to an Option value (optional)
@@ -5978,7 +5981,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreCorrectionsPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -5989,7 +5992,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreCurrenciesAccepted<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `currenciesAccepted` field to an Option value (optional)
@@ -5997,7 +6000,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreCurrenciesAccepted<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -6005,12 +6008,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `department` field (optional)
     pub fn department(mut self, value: impl Into<Option<StoreDepartment<'a>>>) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `department` field to an Option value (optional)
     pub fn maybe_department(mut self, value: Option<StoreDepartment<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -6021,12 +6024,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<StoreDescription<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -6037,7 +6040,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -6045,7 +6048,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -6056,7 +6059,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreDissolutionDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `dissolutionDate` field to an Option value (optional)
@@ -6064,7 +6067,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreDissolutionDate<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -6075,7 +6078,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreDiversityPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `diversityPolicy` field to an Option value (optional)
@@ -6083,7 +6086,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreDiversityPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -6094,7 +6097,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreDiversityStaffingReport<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `diversityStaffingReport` field to an Option value (optional)
@@ -6102,7 +6105,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreDiversityStaffingReport<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -6110,12 +6113,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `duns` field (optional)
     pub fn duns(mut self, value: impl Into<Option<StoreDuns<'a>>>) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `duns` field to an Option value (optional)
     pub fn maybe_duns(mut self, value: Option<StoreDuns<'a>>) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -6123,12 +6126,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `email` field (optional)
     pub fn email(mut self, value: impl Into<Option<StoreEmail<'a>>>) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `email` field to an Option value (optional)
     pub fn maybe_email(mut self, value: Option<StoreEmail<'a>>) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -6136,12 +6139,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `employee` field (optional)
     pub fn employee(mut self, value: impl Into<Option<StoreEmployee<'a>>>) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `employee` field to an Option value (optional)
     pub fn maybe_employee(mut self, value: Option<StoreEmployee<'a>>) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -6149,12 +6152,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `employees` field (optional)
     pub fn employees(mut self, value: impl Into<Option<StoreEmployees<'a>>>) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `employees` field to an Option value (optional)
     pub fn maybe_employees(mut self, value: Option<StoreEmployees<'a>>) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -6165,12 +6168,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreEthicsPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `ethicsPolicy` field to an Option value (optional)
     pub fn maybe_ethics_policy(mut self, value: Option<StoreEthicsPolicy<'a>>) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -6178,12 +6181,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `event` field (optional)
     pub fn event(mut self, value: impl Into<Option<StoreEvent<'a>>>) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `event` field to an Option value (optional)
     pub fn maybe_event(mut self, value: Option<StoreEvent<'a>>) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -6191,12 +6194,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `events` field (optional)
     pub fn events(mut self, value: impl Into<Option<StoreEvents<'a>>>) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `events` field to an Option value (optional)
     pub fn maybe_events(mut self, value: Option<StoreEvents<'a>>) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -6204,12 +6207,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `faxNumber` field (optional)
     pub fn fax_number(mut self, value: impl Into<Option<StoreFaxNumber<'a>>>) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `faxNumber` field to an Option value (optional)
     pub fn maybe_fax_number(mut self, value: Option<StoreFaxNumber<'a>>) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -6217,12 +6220,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `founder` field (optional)
     pub fn founder(mut self, value: impl Into<Option<StoreFounder<'a>>>) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `founder` field to an Option value (optional)
     pub fn maybe_founder(mut self, value: Option<StoreFounder<'a>>) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -6230,12 +6233,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `founders` field (optional)
     pub fn founders(mut self, value: impl Into<Option<StoreFounders<'a>>>) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `founders` field to an Option value (optional)
     pub fn maybe_founders(mut self, value: Option<StoreFounders<'a>>) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -6246,12 +6249,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreFoundingDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `foundingDate` field to an Option value (optional)
     pub fn maybe_founding_date(mut self, value: Option<StoreFoundingDate<'a>>) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -6262,7 +6265,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreFoundingLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `foundingLocation` field to an Option value (optional)
@@ -6270,7 +6273,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreFoundingLocation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -6278,12 +6281,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<StoreFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<StoreFunder<'a>>) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -6291,12 +6294,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<StoreFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<StoreFunding<'a>>) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -6304,12 +6307,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `geo` field (optional)
     pub fn geo(mut self, value: impl Into<Option<StoreGeo<'a>>>) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `geo` field to an Option value (optional)
     pub fn maybe_geo(mut self, value: Option<StoreGeo<'a>>) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -6320,12 +6323,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreGeoContains<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `geoContains` field to an Option value (optional)
     pub fn maybe_geo_contains(mut self, value: Option<StoreGeoContains<'a>>) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -6336,12 +6339,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreGeoCoveredBy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `geoCoveredBy` field to an Option value (optional)
     pub fn maybe_geo_covered_by(mut self, value: Option<StoreGeoCoveredBy<'a>>) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -6349,12 +6352,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `geoCovers` field (optional)
     pub fn geo_covers(mut self, value: impl Into<Option<StoreGeoCovers<'a>>>) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `geoCovers` field to an Option value (optional)
     pub fn maybe_geo_covers(mut self, value: Option<StoreGeoCovers<'a>>) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -6362,12 +6365,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `geoCrosses` field (optional)
     pub fn geo_crosses(mut self, value: impl Into<Option<StoreGeoCrosses<'a>>>) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `geoCrosses` field to an Option value (optional)
     pub fn maybe_geo_crosses(mut self, value: Option<StoreGeoCrosses<'a>>) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -6378,12 +6381,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreGeoDisjoint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `geoDisjoint` field to an Option value (optional)
     pub fn maybe_geo_disjoint(mut self, value: Option<StoreGeoDisjoint<'a>>) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -6391,12 +6394,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `geoEquals` field (optional)
     pub fn geo_equals(mut self, value: impl Into<Option<StoreGeoEquals<'a>>>) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `geoEquals` field to an Option value (optional)
     pub fn maybe_geo_equals(mut self, value: Option<StoreGeoEquals<'a>>) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -6407,7 +6410,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreGeoIntersects<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `geoIntersects` field to an Option value (optional)
@@ -6415,7 +6418,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreGeoIntersects<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -6426,12 +6429,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreGeoOverlaps<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `geoOverlaps` field to an Option value (optional)
     pub fn maybe_geo_overlaps(mut self, value: Option<StoreGeoOverlaps<'a>>) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -6439,12 +6442,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `geoTouches` field (optional)
     pub fn geo_touches(mut self, value: impl Into<Option<StoreGeoTouches<'a>>>) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `geoTouches` field to an Option value (optional)
     pub fn maybe_geo_touches(mut self, value: Option<StoreGeoTouches<'a>>) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -6452,12 +6455,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `geoWithin` field (optional)
     pub fn geo_within(mut self, value: impl Into<Option<StoreGeoWithin<'a>>>) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `geoWithin` field to an Option value (optional)
     pub fn maybe_geo_within(mut self, value: Option<StoreGeoWithin<'a>>) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -6468,7 +6471,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreGlobalLocationNumber<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `globalLocationNumber` field to an Option value (optional)
@@ -6476,7 +6479,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreGlobalLocationNumber<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -6487,7 +6490,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreHasCertification<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `hasCertification` field to an Option value (optional)
@@ -6495,7 +6498,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreHasCertification<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -6506,7 +6509,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreHasCredential<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `hasCredential` field to an Option value (optional)
@@ -6514,7 +6517,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreHasCredential<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -6525,7 +6528,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreHasDriveThroughService<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `hasDriveThroughService` field to an Option value (optional)
@@ -6533,7 +6536,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreHasDriveThroughService<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -6544,7 +6547,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreHasGs1DigitalLink<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `hasGS1DigitalLink` field to an Option value (optional)
@@ -6552,7 +6555,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreHasGs1DigitalLink<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -6560,12 +6563,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `hasMap` field (optional)
     pub fn has_map(mut self, value: impl Into<Option<StoreHasMap<'a>>>) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `hasMap` field to an Option value (optional)
     pub fn maybe_has_map(mut self, value: Option<StoreHasMap<'a>>) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -6576,7 +6579,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreHasMemberProgram<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `hasMemberProgram` field to an Option value (optional)
@@ -6584,7 +6587,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreHasMemberProgram<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -6595,7 +6598,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreHasMerchantReturnPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `hasMerchantReturnPolicy` field to an Option value (optional)
@@ -6603,7 +6606,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreHasMerchantReturnPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -6614,7 +6617,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreHasOfferCatalog<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `hasOfferCatalog` field to an Option value (optional)
@@ -6622,7 +6625,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreHasOfferCatalog<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -6630,12 +6633,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `hasPOS` field (optional)
     pub fn has_pos(mut self, value: impl Into<Option<StoreHasPos<'a>>>) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `hasPOS` field to an Option value (optional)
     pub fn maybe_has_pos(mut self, value: Option<StoreHasPos<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -6646,7 +6649,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreHasProductReturnPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `hasProductReturnPolicy` field to an Option value (optional)
@@ -6654,7 +6657,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreHasProductReturnPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -6665,7 +6668,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreHasShippingService<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `hasShippingService` field to an Option value (optional)
@@ -6673,7 +6676,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreHasShippingService<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -6681,12 +6684,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `identifier` field (optional)
     pub fn identifier(mut self, value: impl Into<Option<StoreIdentifier<'a>>>) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<StoreIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -6694,12 +6697,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<StoreImage<'a>>>) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<StoreImage<'a>>) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -6710,7 +6713,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -6718,7 +6721,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -6729,7 +6732,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreIsAccessibleForFree<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `isAccessibleForFree` field to an Option value (optional)
@@ -6737,7 +6740,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreIsAccessibleForFree<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -6745,12 +6748,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `isicV4` field (optional)
     pub fn isic_v4(mut self, value: impl Into<Option<StoreIsicV4<'a>>>) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `isicV4` field to an Option value (optional)
     pub fn maybe_isic_v4(mut self, value: Option<StoreIsicV4<'a>>) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -6761,12 +6764,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreIso6523Code<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `iso6523Code` field to an Option value (optional)
     pub fn maybe_iso6523_code(mut self, value: Option<StoreIso6523Code<'a>>) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -6774,12 +6777,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<StoreKeywords<'a>>>) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<StoreKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -6787,12 +6790,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `knowsAbout` field (optional)
     pub fn knows_about(mut self, value: impl Into<Option<StoreKnowsAbout<'a>>>) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `knowsAbout` field to an Option value (optional)
     pub fn maybe_knows_about(mut self, value: Option<StoreKnowsAbout<'a>>) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -6803,7 +6806,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreKnowsLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `knowsLanguage` field to an Option value (optional)
@@ -6811,7 +6814,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreKnowsLanguage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -6819,12 +6822,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `latitude` field (optional)
     pub fn latitude(mut self, value: impl Into<Option<StoreLatitude<'a>>>) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `latitude` field to an Option value (optional)
     pub fn maybe_latitude(mut self, value: Option<StoreLatitude<'a>>) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -6835,12 +6838,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreLegalAddress<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `legalAddress` field to an Option value (optional)
     pub fn maybe_legal_address(mut self, value: Option<StoreLegalAddress<'a>>) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -6848,12 +6851,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `legalName` field (optional)
     pub fn legal_name(mut self, value: impl Into<Option<StoreLegalName<'a>>>) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `legalName` field to an Option value (optional)
     pub fn maybe_legal_name(mut self, value: Option<StoreLegalName<'a>>) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -6864,7 +6867,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreLegalRepresentative<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value.into();
+        self._fields.79 = value.into();
         self
     }
     /// Set the `legalRepresentative` field to an Option value (optional)
@@ -6872,7 +6875,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreLegalRepresentative<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value;
+        self._fields.79 = value;
         self
     }
 }
@@ -6880,12 +6883,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `leiCode` field (optional)
     pub fn lei_code(mut self, value: impl Into<Option<StoreLeiCode<'a>>>) -> Self {
-        self.__unsafe_private_named.80 = value.into();
+        self._fields.80 = value.into();
         self
     }
     /// Set the `leiCode` field to an Option value (optional)
     pub fn maybe_lei_code(mut self, value: Option<StoreLeiCode<'a>>) -> Self {
-        self.__unsafe_private_named.80 = value;
+        self._fields.80 = value;
         self
     }
 }
@@ -6893,12 +6896,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `location` field (optional)
     pub fn location(mut self, value: impl Into<Option<StoreLocation<'a>>>) -> Self {
-        self.__unsafe_private_named.81 = value.into();
+        self._fields.81 = value.into();
         self
     }
     /// Set the `location` field to an Option value (optional)
     pub fn maybe_location(mut self, value: Option<StoreLocation<'a>>) -> Self {
-        self.__unsafe_private_named.81 = value;
+        self._fields.81 = value;
         self
     }
 }
@@ -6906,12 +6909,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `logo` field (optional)
     pub fn logo(mut self, value: impl Into<Option<StoreLogo<'a>>>) -> Self {
-        self.__unsafe_private_named.82 = value.into();
+        self._fields.82 = value.into();
         self
     }
     /// Set the `logo` field to an Option value (optional)
     pub fn maybe_logo(mut self, value: Option<StoreLogo<'a>>) -> Self {
-        self.__unsafe_private_named.82 = value;
+        self._fields.82 = value;
         self
     }
 }
@@ -6919,12 +6922,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `longitude` field (optional)
     pub fn longitude(mut self, value: impl Into<Option<StoreLongitude<'a>>>) -> Self {
-        self.__unsafe_private_named.83 = value.into();
+        self._fields.83 = value.into();
         self
     }
     /// Set the `longitude` field to an Option value (optional)
     pub fn maybe_longitude(mut self, value: Option<StoreLongitude<'a>>) -> Self {
-        self.__unsafe_private_named.83 = value;
+        self._fields.83 = value;
         self
     }
 }
@@ -6935,7 +6938,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value.into();
+        self._fields.84 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -6943,7 +6946,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value;
+        self._fields.84 = value;
         self
     }
 }
@@ -6951,12 +6954,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `makesOffer` field (optional)
     pub fn makes_offer(mut self, value: impl Into<Option<StoreMakesOffer<'a>>>) -> Self {
-        self.__unsafe_private_named.85 = value.into();
+        self._fields.85 = value.into();
         self
     }
     /// Set the `makesOffer` field to an Option value (optional)
     pub fn maybe_makes_offer(mut self, value: Option<StoreMakesOffer<'a>>) -> Self {
-        self.__unsafe_private_named.85 = value;
+        self._fields.85 = value;
         self
     }
 }
@@ -6964,12 +6967,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `map` field (optional)
     pub fn map(mut self, value: impl Into<Option<StoreMap<'a>>>) -> Self {
-        self.__unsafe_private_named.86 = value.into();
+        self._fields.86 = value.into();
         self
     }
     /// Set the `map` field to an Option value (optional)
     pub fn maybe_map(mut self, value: Option<StoreMap<'a>>) -> Self {
-        self.__unsafe_private_named.86 = value;
+        self._fields.86 = value;
         self
     }
 }
@@ -6977,12 +6980,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `maps` field (optional)
     pub fn maps(mut self, value: impl Into<Option<StoreMaps<'a>>>) -> Self {
-        self.__unsafe_private_named.87 = value.into();
+        self._fields.87 = value.into();
         self
     }
     /// Set the `maps` field to an Option value (optional)
     pub fn maybe_maps(mut self, value: Option<StoreMaps<'a>>) -> Self {
-        self.__unsafe_private_named.87 = value;
+        self._fields.87 = value;
         self
     }
 }
@@ -6993,7 +6996,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreMaximumAttendeeCapacity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.88 = value.into();
+        self._fields.88 = value.into();
         self
     }
     /// Set the `maximumAttendeeCapacity` field to an Option value (optional)
@@ -7001,7 +7004,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreMaximumAttendeeCapacity<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.88 = value;
+        self._fields.88 = value;
         self
     }
 }
@@ -7009,12 +7012,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `member` field (optional)
     pub fn member(mut self, value: impl Into<Option<StoreMember<'a>>>) -> Self {
-        self.__unsafe_private_named.89 = value.into();
+        self._fields.89 = value.into();
         self
     }
     /// Set the `member` field to an Option value (optional)
     pub fn maybe_member(mut self, value: Option<StoreMember<'a>>) -> Self {
-        self.__unsafe_private_named.89 = value;
+        self._fields.89 = value;
         self
     }
 }
@@ -7022,12 +7025,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `memberOf` field (optional)
     pub fn member_of(mut self, value: impl Into<Option<StoreMemberOf<'a>>>) -> Self {
-        self.__unsafe_private_named.90 = value.into();
+        self._fields.90 = value.into();
         self
     }
     /// Set the `memberOf` field to an Option value (optional)
     pub fn maybe_member_of(mut self, value: Option<StoreMemberOf<'a>>) -> Self {
-        self.__unsafe_private_named.90 = value;
+        self._fields.90 = value;
         self
     }
 }
@@ -7035,12 +7038,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `members` field (optional)
     pub fn members(mut self, value: impl Into<Option<StoreMembers<'a>>>) -> Self {
-        self.__unsafe_private_named.91 = value.into();
+        self._fields.91 = value.into();
         self
     }
     /// Set the `members` field to an Option value (optional)
     pub fn maybe_members(mut self, value: Option<StoreMembers<'a>>) -> Self {
-        self.__unsafe_private_named.91 = value;
+        self._fields.91 = value;
         self
     }
 }
@@ -7048,12 +7051,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `naics` field (optional)
     pub fn naics(mut self, value: impl Into<Option<StoreNaics<'a>>>) -> Self {
-        self.__unsafe_private_named.92 = value.into();
+        self._fields.92 = value.into();
         self
     }
     /// Set the `naics` field to an Option value (optional)
     pub fn maybe_naics(mut self, value: Option<StoreNaics<'a>>) -> Self {
-        self.__unsafe_private_named.92 = value;
+        self._fields.92 = value;
         self
     }
 }
@@ -7061,12 +7064,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<StoreName<'a>>>) -> Self {
-        self.__unsafe_private_named.93 = value.into();
+        self._fields.93 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<StoreName<'a>>) -> Self {
-        self.__unsafe_private_named.93 = value;
+        self._fields.93 = value;
         self
     }
 }
@@ -7077,7 +7080,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreNonprofitStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value.into();
+        self._fields.94 = value.into();
         self
     }
     /// Set the `nonprofitStatus` field to an Option value (optional)
@@ -7085,7 +7088,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreNonprofitStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value;
+        self._fields.94 = value;
         self
     }
 }
@@ -7096,7 +7099,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreNumberOfEmployees<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.95 = value.into();
+        self._fields.95 = value.into();
         self
     }
     /// Set the `numberOfEmployees` field to an Option value (optional)
@@ -7104,7 +7107,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreNumberOfEmployees<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.95 = value;
+        self._fields.95 = value;
         self
     }
 }
@@ -7115,12 +7118,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreOpeningHours<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.96 = value.into();
+        self._fields.96 = value.into();
         self
     }
     /// Set the `openingHours` field to an Option value (optional)
     pub fn maybe_opening_hours(mut self, value: Option<StoreOpeningHours<'a>>) -> Self {
-        self.__unsafe_private_named.96 = value;
+        self._fields.96 = value;
         self
     }
 }
@@ -7131,7 +7134,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreOpeningHoursSpecification<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.97 = value.into();
+        self._fields.97 = value.into();
         self
     }
     /// Set the `openingHoursSpecification` field to an Option value (optional)
@@ -7139,7 +7142,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreOpeningHoursSpecification<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.97 = value;
+        self._fields.97 = value;
         self
     }
 }
@@ -7150,7 +7153,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreOwnershipFundingInfo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value.into();
+        self._fields.98 = value.into();
         self
     }
     /// Set the `ownershipFundingInfo` field to an Option value (optional)
@@ -7158,7 +7161,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreOwnershipFundingInfo<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value;
+        self._fields.98 = value;
         self
     }
 }
@@ -7166,12 +7169,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `owns` field (optional)
     pub fn owns(mut self, value: impl Into<Option<StoreOwns<'a>>>) -> Self {
-        self.__unsafe_private_named.99 = value.into();
+        self._fields.99 = value.into();
         self
     }
     /// Set the `owns` field to an Option value (optional)
     pub fn maybe_owns(mut self, value: Option<StoreOwns<'a>>) -> Self {
-        self.__unsafe_private_named.99 = value;
+        self._fields.99 = value;
         self
     }
 }
@@ -7182,7 +7185,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreParentOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value.into();
+        self._fields.100 = value.into();
         self
     }
     /// Set the `parentOrganization` field to an Option value (optional)
@@ -7190,7 +7193,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreParentOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value;
+        self._fields.100 = value;
         self
     }
 }
@@ -7201,7 +7204,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StorePaymentAccepted<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value.into();
+        self._fields.101 = value.into();
         self
     }
     /// Set the `paymentAccepted` field to an Option value (optional)
@@ -7209,7 +7212,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StorePaymentAccepted<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value;
+        self._fields.101 = value;
         self
     }
 }
@@ -7217,12 +7220,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `photo` field (optional)
     pub fn photo(mut self, value: impl Into<Option<StorePhoto<'a>>>) -> Self {
-        self.__unsafe_private_named.102 = value.into();
+        self._fields.102 = value.into();
         self
     }
     /// Set the `photo` field to an Option value (optional)
     pub fn maybe_photo(mut self, value: Option<StorePhoto<'a>>) -> Self {
-        self.__unsafe_private_named.102 = value;
+        self._fields.102 = value;
         self
     }
 }
@@ -7230,12 +7233,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `photos` field (optional)
     pub fn photos(mut self, value: impl Into<Option<StorePhotos<'a>>>) -> Self {
-        self.__unsafe_private_named.103 = value.into();
+        self._fields.103 = value.into();
         self
     }
     /// Set the `photos` field to an Option value (optional)
     pub fn maybe_photos(mut self, value: Option<StorePhotos<'a>>) -> Self {
-        self.__unsafe_private_named.103 = value;
+        self._fields.103 = value;
         self
     }
 }
@@ -7246,7 +7249,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StorePotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value.into();
+        self._fields.104 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -7254,7 +7257,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StorePotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value;
+        self._fields.104 = value;
         self
     }
 }
@@ -7262,12 +7265,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `priceRange` field (optional)
     pub fn price_range(mut self, value: impl Into<Option<StorePriceRange<'a>>>) -> Self {
-        self.__unsafe_private_named.105 = value.into();
+        self._fields.105 = value.into();
         self
     }
     /// Set the `priceRange` field to an Option value (optional)
     pub fn maybe_price_range(mut self, value: Option<StorePriceRange<'a>>) -> Self {
-        self.__unsafe_private_named.105 = value;
+        self._fields.105 = value;
         self
     }
 }
@@ -7278,12 +7281,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StorePublicAccess<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value.into();
+        self._fields.106 = value.into();
         self
     }
     /// Set the `publicAccess` field to an Option value (optional)
     pub fn maybe_public_access(mut self, value: Option<StorePublicAccess<'a>>) -> Self {
-        self.__unsafe_private_named.106 = value;
+        self._fields.106 = value;
         self
     }
 }
@@ -7294,7 +7297,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StorePublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value.into();
+        self._fields.107 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -7302,7 +7305,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StorePublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value;
+        self._fields.107 = value;
         self
     }
 }
@@ -7310,12 +7313,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<StoreReview<'a>>>) -> Self {
-        self.__unsafe_private_named.108 = value.into();
+        self._fields.108 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<StoreReview<'a>>) -> Self {
-        self.__unsafe_private_named.108 = value;
+        self._fields.108 = value;
         self
     }
 }
@@ -7323,12 +7326,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `reviews` field (optional)
     pub fn reviews(mut self, value: impl Into<Option<StoreReviews<'a>>>) -> Self {
-        self.__unsafe_private_named.109 = value.into();
+        self._fields.109 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<StoreReviews<'a>>) -> Self {
-        self.__unsafe_private_named.109 = value;
+        self._fields.109 = value;
         self
     }
 }
@@ -7336,12 +7339,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<StoreSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.110 = value.into();
+        self._fields.110 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<StoreSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.110 = value;
+        self._fields.110 = value;
         self
     }
 }
@@ -7349,12 +7352,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `seeks` field (optional)
     pub fn seeks(mut self, value: impl Into<Option<StoreSeeks<'a>>>) -> Self {
-        self.__unsafe_private_named.111 = value.into();
+        self._fields.111 = value.into();
         self
     }
     /// Set the `seeks` field to an Option value (optional)
     pub fn maybe_seeks(mut self, value: Option<StoreSeeks<'a>>) -> Self {
-        self.__unsafe_private_named.111 = value;
+        self._fields.111 = value;
         self
     }
 }
@@ -7365,12 +7368,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreServiceArea<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value.into();
+        self._fields.112 = value.into();
         self
     }
     /// Set the `serviceArea` field to an Option value (optional)
     pub fn maybe_service_area(mut self, value: Option<StoreServiceArea<'a>>) -> Self {
-        self.__unsafe_private_named.112 = value;
+        self._fields.112 = value;
         self
     }
 }
@@ -7378,12 +7381,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `skills` field (optional)
     pub fn skills(mut self, value: impl Into<Option<StoreSkills<'a>>>) -> Self {
-        self.__unsafe_private_named.113 = value.into();
+        self._fields.113 = value.into();
         self
     }
     /// Set the `skills` field to an Option value (optional)
     pub fn maybe_skills(mut self, value: Option<StoreSkills<'a>>) -> Self {
-        self.__unsafe_private_named.113 = value;
+        self._fields.113 = value;
         self
     }
 }
@@ -7391,12 +7394,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `slogan` field (optional)
     pub fn slogan(mut self, value: impl Into<Option<StoreSlogan<'a>>>) -> Self {
-        self.__unsafe_private_named.114 = value.into();
+        self._fields.114 = value.into();
         self
     }
     /// Set the `slogan` field to an Option value (optional)
     pub fn maybe_slogan(mut self, value: Option<StoreSlogan<'a>>) -> Self {
-        self.__unsafe_private_named.114 = value;
+        self._fields.114 = value;
         self
     }
 }
@@ -7407,7 +7410,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreSmokingAllowed<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.115 = value.into();
+        self._fields.115 = value.into();
         self
     }
     /// Set the `smokingAllowed` field to an Option value (optional)
@@ -7415,7 +7418,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreSmokingAllowed<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.115 = value;
+        self._fields.115 = value;
         self
     }
 }
@@ -7426,7 +7429,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreSpecialOpeningHoursSpecification<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.116 = value.into();
+        self._fields.116 = value.into();
         self
     }
     /// Set the `specialOpeningHoursSpecification` field to an Option value (optional)
@@ -7434,7 +7437,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreSpecialOpeningHoursSpecification<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.116 = value;
+        self._fields.116 = value;
         self
     }
 }
@@ -7442,12 +7445,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `sponsor` field (optional)
     pub fn sponsor(mut self, value: impl Into<Option<StoreSponsor<'a>>>) -> Self {
-        self.__unsafe_private_named.117 = value.into();
+        self._fields.117 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<StoreSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.117 = value;
+        self._fields.117 = value;
         self
     }
 }
@@ -7458,7 +7461,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreSubOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.118 = value.into();
+        self._fields.118 = value.into();
         self
     }
     /// Set the `subOrganization` field to an Option value (optional)
@@ -7466,7 +7469,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreSubOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.118 = value;
+        self._fields.118 = value;
         self
     }
 }
@@ -7474,12 +7477,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `subjectOf` field (optional)
     pub fn subject_of(mut self, value: impl Into<Option<StoreSubjectOf<'a>>>) -> Self {
-        self.__unsafe_private_named.119 = value.into();
+        self._fields.119 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<StoreSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.119 = value;
+        self._fields.119 = value;
         self
     }
 }
@@ -7487,12 +7490,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `taxID` field (optional)
     pub fn tax_id(mut self, value: impl Into<Option<StoreTaxId<'a>>>) -> Self {
-        self.__unsafe_private_named.120 = value.into();
+        self._fields.120 = value.into();
         self
     }
     /// Set the `taxID` field to an Option value (optional)
     pub fn maybe_tax_id(mut self, value: Option<StoreTaxId<'a>>) -> Self {
-        self.__unsafe_private_named.120 = value;
+        self._fields.120 = value;
         self
     }
 }
@@ -7500,12 +7503,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `telephone` field (optional)
     pub fn telephone(mut self, value: impl Into<Option<StoreTelephone<'a>>>) -> Self {
-        self.__unsafe_private_named.121 = value.into();
+        self._fields.121 = value.into();
         self
     }
     /// Set the `telephone` field to an Option value (optional)
     pub fn maybe_telephone(mut self, value: Option<StoreTelephone<'a>>) -> Self {
-        self.__unsafe_private_named.121 = value;
+        self._fields.121 = value;
         self
     }
 }
@@ -7516,7 +7519,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreTourBookingPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.122 = value.into();
+        self._fields.122 = value.into();
         self
     }
     /// Set the `tourBookingPage` field to an Option value (optional)
@@ -7524,7 +7527,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreTourBookingPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.122 = value;
+        self._fields.122 = value;
         self
     }
 }
@@ -7535,7 +7538,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: impl Into<Option<StoreUnnamedSourcesPolicy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.123 = value.into();
+        self._fields.123 = value.into();
         self
     }
     /// Set the `unnamedSourcesPolicy` field to an Option value (optional)
@@ -7543,7 +7546,7 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
         mut self,
         value: Option<StoreUnnamedSourcesPolicy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.123 = value;
+        self._fields.123 = value;
         self
     }
 }
@@ -7551,12 +7554,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<StoreUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.124 = value.into();
+        self._fields.124 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<StoreUrl<'a>>) -> Self {
-        self.__unsafe_private_named.124 = value;
+        self._fields.124 = value;
         self
     }
 }
@@ -7564,12 +7567,12 @@ impl<'a, S: store_state::State> StoreBuilder<'a, S> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `vatID` field (optional)
     pub fn vat_id(mut self, value: impl Into<Option<StoreVatId<'a>>>) -> Self {
-        self.__unsafe_private_named.125 = value.into();
+        self._fields.125 = value.into();
         self
     }
     /// Set the `vatID` field to an Option value (optional)
     pub fn maybe_vat_id(mut self, value: Option<StoreVatId<'a>>) -> Self {
-        self.__unsafe_private_named.125 = value;
+        self._fields.125 = value;
         self
     }
 }
@@ -7581,132 +7584,132 @@ where
     /// Build the final struct
     pub fn build(self) -> Store<'a> {
         Store {
-            accepted_payment_method: self.__unsafe_private_named.0,
-            actionable_feedback_policy: self.__unsafe_private_named.1,
-            additional_property: self.__unsafe_private_named.2,
-            additional_type: self.__unsafe_private_named.3,
-            address: self.__unsafe_private_named.4,
-            agent_interaction_statistic: self.__unsafe_private_named.5,
-            aggregate_rating: self.__unsafe_private_named.6,
-            alternate_name: self.__unsafe_private_named.7,
-            alumni: self.__unsafe_private_named.8,
-            amenity_feature: self.__unsafe_private_named.9,
-            area_served: self.__unsafe_private_named.10,
-            award: self.__unsafe_private_named.11,
-            awards: self.__unsafe_private_named.12,
-            branch_code: self.__unsafe_private_named.13,
-            branch_of: self.__unsafe_private_named.14,
-            brand: self.__unsafe_private_named.15,
-            company_registration: self.__unsafe_private_named.16,
-            contact_point: self.__unsafe_private_named.17,
-            contact_points: self.__unsafe_private_named.18,
-            contained_in: self.__unsafe_private_named.19,
-            contained_in_place: self.__unsafe_private_named.20,
-            contains_place: self.__unsafe_private_named.21,
-            corrections_policy: self.__unsafe_private_named.22,
-            currencies_accepted: self.__unsafe_private_named.23,
-            department: self.__unsafe_private_named.24,
-            description: self.__unsafe_private_named.25,
-            disambiguating_description: self.__unsafe_private_named.26,
-            dissolution_date: self.__unsafe_private_named.27,
-            diversity_policy: self.__unsafe_private_named.28,
-            diversity_staffing_report: self.__unsafe_private_named.29,
-            duns: self.__unsafe_private_named.30,
-            email: self.__unsafe_private_named.31,
-            employee: self.__unsafe_private_named.32,
-            employees: self.__unsafe_private_named.33,
-            ethics_policy: self.__unsafe_private_named.34,
-            event: self.__unsafe_private_named.35,
-            events: self.__unsafe_private_named.36,
-            fax_number: self.__unsafe_private_named.37,
-            founder: self.__unsafe_private_named.38,
-            founders: self.__unsafe_private_named.39,
-            founding_date: self.__unsafe_private_named.40,
-            founding_location: self.__unsafe_private_named.41,
-            funder: self.__unsafe_private_named.42,
-            funding: self.__unsafe_private_named.43,
-            geo: self.__unsafe_private_named.44,
-            geo_contains: self.__unsafe_private_named.45,
-            geo_covered_by: self.__unsafe_private_named.46,
-            geo_covers: self.__unsafe_private_named.47,
-            geo_crosses: self.__unsafe_private_named.48,
-            geo_disjoint: self.__unsafe_private_named.49,
-            geo_equals: self.__unsafe_private_named.50,
-            geo_intersects: self.__unsafe_private_named.51,
-            geo_overlaps: self.__unsafe_private_named.52,
-            geo_touches: self.__unsafe_private_named.53,
-            geo_within: self.__unsafe_private_named.54,
-            global_location_number: self.__unsafe_private_named.55,
-            has_certification: self.__unsafe_private_named.56,
-            has_credential: self.__unsafe_private_named.57,
-            has_drive_through_service: self.__unsafe_private_named.58,
-            has_gs1_digital_link: self.__unsafe_private_named.59,
-            has_map: self.__unsafe_private_named.60,
-            has_member_program: self.__unsafe_private_named.61,
-            has_merchant_return_policy: self.__unsafe_private_named.62,
-            has_offer_catalog: self.__unsafe_private_named.63,
-            has_pos: self.__unsafe_private_named.64,
-            has_product_return_policy: self.__unsafe_private_named.65,
-            has_shipping_service: self.__unsafe_private_named.66,
-            identifier: self.__unsafe_private_named.67,
-            image: self.__unsafe_private_named.68,
-            interaction_statistic: self.__unsafe_private_named.69,
-            is_accessible_for_free: self.__unsafe_private_named.70,
-            isic_v4: self.__unsafe_private_named.71,
-            iso6523_code: self.__unsafe_private_named.72,
-            keywords: self.__unsafe_private_named.73,
-            knows_about: self.__unsafe_private_named.74,
-            knows_language: self.__unsafe_private_named.75,
-            latitude: self.__unsafe_private_named.76,
-            legal_address: self.__unsafe_private_named.77,
-            legal_name: self.__unsafe_private_named.78,
-            legal_representative: self.__unsafe_private_named.79,
-            lei_code: self.__unsafe_private_named.80,
-            location: self.__unsafe_private_named.81,
-            logo: self.__unsafe_private_named.82,
-            longitude: self.__unsafe_private_named.83,
-            main_entity_of_page: self.__unsafe_private_named.84,
-            makes_offer: self.__unsafe_private_named.85,
-            map: self.__unsafe_private_named.86,
-            maps: self.__unsafe_private_named.87,
-            maximum_attendee_capacity: self.__unsafe_private_named.88,
-            member: self.__unsafe_private_named.89,
-            member_of: self.__unsafe_private_named.90,
-            members: self.__unsafe_private_named.91,
-            naics: self.__unsafe_private_named.92,
-            name: self.__unsafe_private_named.93,
-            nonprofit_status: self.__unsafe_private_named.94,
-            number_of_employees: self.__unsafe_private_named.95,
-            opening_hours: self.__unsafe_private_named.96,
-            opening_hours_specification: self.__unsafe_private_named.97,
-            ownership_funding_info: self.__unsafe_private_named.98,
-            owns: self.__unsafe_private_named.99,
-            parent_organization: self.__unsafe_private_named.100,
-            payment_accepted: self.__unsafe_private_named.101,
-            photo: self.__unsafe_private_named.102,
-            photos: self.__unsafe_private_named.103,
-            potential_action: self.__unsafe_private_named.104,
-            price_range: self.__unsafe_private_named.105,
-            public_access: self.__unsafe_private_named.106,
-            publishing_principles: self.__unsafe_private_named.107,
-            review: self.__unsafe_private_named.108,
-            reviews: self.__unsafe_private_named.109,
-            same_as: self.__unsafe_private_named.110,
-            seeks: self.__unsafe_private_named.111,
-            service_area: self.__unsafe_private_named.112,
-            skills: self.__unsafe_private_named.113,
-            slogan: self.__unsafe_private_named.114,
-            smoking_allowed: self.__unsafe_private_named.115,
-            special_opening_hours_specification: self.__unsafe_private_named.116,
-            sponsor: self.__unsafe_private_named.117,
-            sub_organization: self.__unsafe_private_named.118,
-            subject_of: self.__unsafe_private_named.119,
-            tax_id: self.__unsafe_private_named.120,
-            telephone: self.__unsafe_private_named.121,
-            tour_booking_page: self.__unsafe_private_named.122,
-            unnamed_sources_policy: self.__unsafe_private_named.123,
-            url: self.__unsafe_private_named.124,
-            vat_id: self.__unsafe_private_named.125,
+            accepted_payment_method: self._fields.0,
+            actionable_feedback_policy: self._fields.1,
+            additional_property: self._fields.2,
+            additional_type: self._fields.3,
+            address: self._fields.4,
+            agent_interaction_statistic: self._fields.5,
+            aggregate_rating: self._fields.6,
+            alternate_name: self._fields.7,
+            alumni: self._fields.8,
+            amenity_feature: self._fields.9,
+            area_served: self._fields.10,
+            award: self._fields.11,
+            awards: self._fields.12,
+            branch_code: self._fields.13,
+            branch_of: self._fields.14,
+            brand: self._fields.15,
+            company_registration: self._fields.16,
+            contact_point: self._fields.17,
+            contact_points: self._fields.18,
+            contained_in: self._fields.19,
+            contained_in_place: self._fields.20,
+            contains_place: self._fields.21,
+            corrections_policy: self._fields.22,
+            currencies_accepted: self._fields.23,
+            department: self._fields.24,
+            description: self._fields.25,
+            disambiguating_description: self._fields.26,
+            dissolution_date: self._fields.27,
+            diversity_policy: self._fields.28,
+            diversity_staffing_report: self._fields.29,
+            duns: self._fields.30,
+            email: self._fields.31,
+            employee: self._fields.32,
+            employees: self._fields.33,
+            ethics_policy: self._fields.34,
+            event: self._fields.35,
+            events: self._fields.36,
+            fax_number: self._fields.37,
+            founder: self._fields.38,
+            founders: self._fields.39,
+            founding_date: self._fields.40,
+            founding_location: self._fields.41,
+            funder: self._fields.42,
+            funding: self._fields.43,
+            geo: self._fields.44,
+            geo_contains: self._fields.45,
+            geo_covered_by: self._fields.46,
+            geo_covers: self._fields.47,
+            geo_crosses: self._fields.48,
+            geo_disjoint: self._fields.49,
+            geo_equals: self._fields.50,
+            geo_intersects: self._fields.51,
+            geo_overlaps: self._fields.52,
+            geo_touches: self._fields.53,
+            geo_within: self._fields.54,
+            global_location_number: self._fields.55,
+            has_certification: self._fields.56,
+            has_credential: self._fields.57,
+            has_drive_through_service: self._fields.58,
+            has_gs1_digital_link: self._fields.59,
+            has_map: self._fields.60,
+            has_member_program: self._fields.61,
+            has_merchant_return_policy: self._fields.62,
+            has_offer_catalog: self._fields.63,
+            has_pos: self._fields.64,
+            has_product_return_policy: self._fields.65,
+            has_shipping_service: self._fields.66,
+            identifier: self._fields.67,
+            image: self._fields.68,
+            interaction_statistic: self._fields.69,
+            is_accessible_for_free: self._fields.70,
+            isic_v4: self._fields.71,
+            iso6523_code: self._fields.72,
+            keywords: self._fields.73,
+            knows_about: self._fields.74,
+            knows_language: self._fields.75,
+            latitude: self._fields.76,
+            legal_address: self._fields.77,
+            legal_name: self._fields.78,
+            legal_representative: self._fields.79,
+            lei_code: self._fields.80,
+            location: self._fields.81,
+            logo: self._fields.82,
+            longitude: self._fields.83,
+            main_entity_of_page: self._fields.84,
+            makes_offer: self._fields.85,
+            map: self._fields.86,
+            maps: self._fields.87,
+            maximum_attendee_capacity: self._fields.88,
+            member: self._fields.89,
+            member_of: self._fields.90,
+            members: self._fields.91,
+            naics: self._fields.92,
+            name: self._fields.93,
+            nonprofit_status: self._fields.94,
+            number_of_employees: self._fields.95,
+            opening_hours: self._fields.96,
+            opening_hours_specification: self._fields.97,
+            ownership_funding_info: self._fields.98,
+            owns: self._fields.99,
+            parent_organization: self._fields.100,
+            payment_accepted: self._fields.101,
+            photo: self._fields.102,
+            photos: self._fields.103,
+            potential_action: self._fields.104,
+            price_range: self._fields.105,
+            public_access: self._fields.106,
+            publishing_principles: self._fields.107,
+            review: self._fields.108,
+            reviews: self._fields.109,
+            same_as: self._fields.110,
+            seeks: self._fields.111,
+            service_area: self._fields.112,
+            skills: self._fields.113,
+            slogan: self._fields.114,
+            smoking_allowed: self._fields.115,
+            special_opening_hours_specification: self._fields.116,
+            sponsor: self._fields.117,
+            sub_organization: self._fields.118,
+            subject_of: self._fields.119,
+            tax_id: self._fields.120,
+            telephone: self._fields.121,
+            tour_booking_page: self._fields.122,
+            unnamed_sources_policy: self._fields.123,
+            url: self._fields.124,
+            vat_id: self._fields.125,
             extra_data: Default::default(),
         }
     }
@@ -7716,132 +7719,132 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Store<'a> {
         Store {
-            accepted_payment_method: self.__unsafe_private_named.0,
-            actionable_feedback_policy: self.__unsafe_private_named.1,
-            additional_property: self.__unsafe_private_named.2,
-            additional_type: self.__unsafe_private_named.3,
-            address: self.__unsafe_private_named.4,
-            agent_interaction_statistic: self.__unsafe_private_named.5,
-            aggregate_rating: self.__unsafe_private_named.6,
-            alternate_name: self.__unsafe_private_named.7,
-            alumni: self.__unsafe_private_named.8,
-            amenity_feature: self.__unsafe_private_named.9,
-            area_served: self.__unsafe_private_named.10,
-            award: self.__unsafe_private_named.11,
-            awards: self.__unsafe_private_named.12,
-            branch_code: self.__unsafe_private_named.13,
-            branch_of: self.__unsafe_private_named.14,
-            brand: self.__unsafe_private_named.15,
-            company_registration: self.__unsafe_private_named.16,
-            contact_point: self.__unsafe_private_named.17,
-            contact_points: self.__unsafe_private_named.18,
-            contained_in: self.__unsafe_private_named.19,
-            contained_in_place: self.__unsafe_private_named.20,
-            contains_place: self.__unsafe_private_named.21,
-            corrections_policy: self.__unsafe_private_named.22,
-            currencies_accepted: self.__unsafe_private_named.23,
-            department: self.__unsafe_private_named.24,
-            description: self.__unsafe_private_named.25,
-            disambiguating_description: self.__unsafe_private_named.26,
-            dissolution_date: self.__unsafe_private_named.27,
-            diversity_policy: self.__unsafe_private_named.28,
-            diversity_staffing_report: self.__unsafe_private_named.29,
-            duns: self.__unsafe_private_named.30,
-            email: self.__unsafe_private_named.31,
-            employee: self.__unsafe_private_named.32,
-            employees: self.__unsafe_private_named.33,
-            ethics_policy: self.__unsafe_private_named.34,
-            event: self.__unsafe_private_named.35,
-            events: self.__unsafe_private_named.36,
-            fax_number: self.__unsafe_private_named.37,
-            founder: self.__unsafe_private_named.38,
-            founders: self.__unsafe_private_named.39,
-            founding_date: self.__unsafe_private_named.40,
-            founding_location: self.__unsafe_private_named.41,
-            funder: self.__unsafe_private_named.42,
-            funding: self.__unsafe_private_named.43,
-            geo: self.__unsafe_private_named.44,
-            geo_contains: self.__unsafe_private_named.45,
-            geo_covered_by: self.__unsafe_private_named.46,
-            geo_covers: self.__unsafe_private_named.47,
-            geo_crosses: self.__unsafe_private_named.48,
-            geo_disjoint: self.__unsafe_private_named.49,
-            geo_equals: self.__unsafe_private_named.50,
-            geo_intersects: self.__unsafe_private_named.51,
-            geo_overlaps: self.__unsafe_private_named.52,
-            geo_touches: self.__unsafe_private_named.53,
-            geo_within: self.__unsafe_private_named.54,
-            global_location_number: self.__unsafe_private_named.55,
-            has_certification: self.__unsafe_private_named.56,
-            has_credential: self.__unsafe_private_named.57,
-            has_drive_through_service: self.__unsafe_private_named.58,
-            has_gs1_digital_link: self.__unsafe_private_named.59,
-            has_map: self.__unsafe_private_named.60,
-            has_member_program: self.__unsafe_private_named.61,
-            has_merchant_return_policy: self.__unsafe_private_named.62,
-            has_offer_catalog: self.__unsafe_private_named.63,
-            has_pos: self.__unsafe_private_named.64,
-            has_product_return_policy: self.__unsafe_private_named.65,
-            has_shipping_service: self.__unsafe_private_named.66,
-            identifier: self.__unsafe_private_named.67,
-            image: self.__unsafe_private_named.68,
-            interaction_statistic: self.__unsafe_private_named.69,
-            is_accessible_for_free: self.__unsafe_private_named.70,
-            isic_v4: self.__unsafe_private_named.71,
-            iso6523_code: self.__unsafe_private_named.72,
-            keywords: self.__unsafe_private_named.73,
-            knows_about: self.__unsafe_private_named.74,
-            knows_language: self.__unsafe_private_named.75,
-            latitude: self.__unsafe_private_named.76,
-            legal_address: self.__unsafe_private_named.77,
-            legal_name: self.__unsafe_private_named.78,
-            legal_representative: self.__unsafe_private_named.79,
-            lei_code: self.__unsafe_private_named.80,
-            location: self.__unsafe_private_named.81,
-            logo: self.__unsafe_private_named.82,
-            longitude: self.__unsafe_private_named.83,
-            main_entity_of_page: self.__unsafe_private_named.84,
-            makes_offer: self.__unsafe_private_named.85,
-            map: self.__unsafe_private_named.86,
-            maps: self.__unsafe_private_named.87,
-            maximum_attendee_capacity: self.__unsafe_private_named.88,
-            member: self.__unsafe_private_named.89,
-            member_of: self.__unsafe_private_named.90,
-            members: self.__unsafe_private_named.91,
-            naics: self.__unsafe_private_named.92,
-            name: self.__unsafe_private_named.93,
-            nonprofit_status: self.__unsafe_private_named.94,
-            number_of_employees: self.__unsafe_private_named.95,
-            opening_hours: self.__unsafe_private_named.96,
-            opening_hours_specification: self.__unsafe_private_named.97,
-            ownership_funding_info: self.__unsafe_private_named.98,
-            owns: self.__unsafe_private_named.99,
-            parent_organization: self.__unsafe_private_named.100,
-            payment_accepted: self.__unsafe_private_named.101,
-            photo: self.__unsafe_private_named.102,
-            photos: self.__unsafe_private_named.103,
-            potential_action: self.__unsafe_private_named.104,
-            price_range: self.__unsafe_private_named.105,
-            public_access: self.__unsafe_private_named.106,
-            publishing_principles: self.__unsafe_private_named.107,
-            review: self.__unsafe_private_named.108,
-            reviews: self.__unsafe_private_named.109,
-            same_as: self.__unsafe_private_named.110,
-            seeks: self.__unsafe_private_named.111,
-            service_area: self.__unsafe_private_named.112,
-            skills: self.__unsafe_private_named.113,
-            slogan: self.__unsafe_private_named.114,
-            smoking_allowed: self.__unsafe_private_named.115,
-            special_opening_hours_specification: self.__unsafe_private_named.116,
-            sponsor: self.__unsafe_private_named.117,
-            sub_organization: self.__unsafe_private_named.118,
-            subject_of: self.__unsafe_private_named.119,
-            tax_id: self.__unsafe_private_named.120,
-            telephone: self.__unsafe_private_named.121,
-            tour_booking_page: self.__unsafe_private_named.122,
-            unnamed_sources_policy: self.__unsafe_private_named.123,
-            url: self.__unsafe_private_named.124,
-            vat_id: self.__unsafe_private_named.125,
+            accepted_payment_method: self._fields.0,
+            actionable_feedback_policy: self._fields.1,
+            additional_property: self._fields.2,
+            additional_type: self._fields.3,
+            address: self._fields.4,
+            agent_interaction_statistic: self._fields.5,
+            aggregate_rating: self._fields.6,
+            alternate_name: self._fields.7,
+            alumni: self._fields.8,
+            amenity_feature: self._fields.9,
+            area_served: self._fields.10,
+            award: self._fields.11,
+            awards: self._fields.12,
+            branch_code: self._fields.13,
+            branch_of: self._fields.14,
+            brand: self._fields.15,
+            company_registration: self._fields.16,
+            contact_point: self._fields.17,
+            contact_points: self._fields.18,
+            contained_in: self._fields.19,
+            contained_in_place: self._fields.20,
+            contains_place: self._fields.21,
+            corrections_policy: self._fields.22,
+            currencies_accepted: self._fields.23,
+            department: self._fields.24,
+            description: self._fields.25,
+            disambiguating_description: self._fields.26,
+            dissolution_date: self._fields.27,
+            diversity_policy: self._fields.28,
+            diversity_staffing_report: self._fields.29,
+            duns: self._fields.30,
+            email: self._fields.31,
+            employee: self._fields.32,
+            employees: self._fields.33,
+            ethics_policy: self._fields.34,
+            event: self._fields.35,
+            events: self._fields.36,
+            fax_number: self._fields.37,
+            founder: self._fields.38,
+            founders: self._fields.39,
+            founding_date: self._fields.40,
+            founding_location: self._fields.41,
+            funder: self._fields.42,
+            funding: self._fields.43,
+            geo: self._fields.44,
+            geo_contains: self._fields.45,
+            geo_covered_by: self._fields.46,
+            geo_covers: self._fields.47,
+            geo_crosses: self._fields.48,
+            geo_disjoint: self._fields.49,
+            geo_equals: self._fields.50,
+            geo_intersects: self._fields.51,
+            geo_overlaps: self._fields.52,
+            geo_touches: self._fields.53,
+            geo_within: self._fields.54,
+            global_location_number: self._fields.55,
+            has_certification: self._fields.56,
+            has_credential: self._fields.57,
+            has_drive_through_service: self._fields.58,
+            has_gs1_digital_link: self._fields.59,
+            has_map: self._fields.60,
+            has_member_program: self._fields.61,
+            has_merchant_return_policy: self._fields.62,
+            has_offer_catalog: self._fields.63,
+            has_pos: self._fields.64,
+            has_product_return_policy: self._fields.65,
+            has_shipping_service: self._fields.66,
+            identifier: self._fields.67,
+            image: self._fields.68,
+            interaction_statistic: self._fields.69,
+            is_accessible_for_free: self._fields.70,
+            isic_v4: self._fields.71,
+            iso6523_code: self._fields.72,
+            keywords: self._fields.73,
+            knows_about: self._fields.74,
+            knows_language: self._fields.75,
+            latitude: self._fields.76,
+            legal_address: self._fields.77,
+            legal_name: self._fields.78,
+            legal_representative: self._fields.79,
+            lei_code: self._fields.80,
+            location: self._fields.81,
+            logo: self._fields.82,
+            longitude: self._fields.83,
+            main_entity_of_page: self._fields.84,
+            makes_offer: self._fields.85,
+            map: self._fields.86,
+            maps: self._fields.87,
+            maximum_attendee_capacity: self._fields.88,
+            member: self._fields.89,
+            member_of: self._fields.90,
+            members: self._fields.91,
+            naics: self._fields.92,
+            name: self._fields.93,
+            nonprofit_status: self._fields.94,
+            number_of_employees: self._fields.95,
+            opening_hours: self._fields.96,
+            opening_hours_specification: self._fields.97,
+            ownership_funding_info: self._fields.98,
+            owns: self._fields.99,
+            parent_organization: self._fields.100,
+            payment_accepted: self._fields.101,
+            photo: self._fields.102,
+            photos: self._fields.103,
+            potential_action: self._fields.104,
+            price_range: self._fields.105,
+            public_access: self._fields.106,
+            publishing_principles: self._fields.107,
+            review: self._fields.108,
+            reviews: self._fields.109,
+            same_as: self._fields.110,
+            seeks: self._fields.111,
+            service_area: self._fields.112,
+            skills: self._fields.113,
+            slogan: self._fields.114,
+            smoking_allowed: self._fields.115,
+            special_opening_hours_specification: self._fields.116,
+            sponsor: self._fields.117,
+            sub_organization: self._fields.118,
+            subject_of: self._fields.119,
+            tax_id: self._fields.120,
+            telephone: self._fields.121,
+            tour_booking_page: self._fields.122,
+            unnamed_sources_policy: self._fields.123,
+            url: self._fields.124,
+            vat_id: self._fields.125,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/tv_episode.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/tv_episode.rs
index 5a40bc9c..c299aeea 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/tv_episode.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/tv_episode.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -5973,8 +5976,8 @@ pub mod tv_episode_state {
 
 /// Builder for constructing an instance of this type
 pub struct TvEpisodeBuilder<'a, S: tv_episode_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<TvEpisodeAbout<'a>>,
         Option<TvEpisodeAbstract<'a>>,
         Option<TvEpisodeAccessMode<'a>>,
@@ -6117,7 +6120,7 @@ pub struct TvEpisodeBuilder<'a, S: tv_episode_state::State> {
         Option<TvEpisodeWorkExample<'a>>,
         Option<TvEpisodeWorkTranslation<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TvEpisode<'a> {
@@ -6131,8 +6134,8 @@ impl<'a> TvEpisodeBuilder<'a, tv_episode_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TvEpisodeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -6275,7 +6278,7 @@ impl<'a> TvEpisodeBuilder<'a, tv_episode_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6283,12 +6286,12 @@ impl<'a> TvEpisodeBuilder<'a, tv_episode_state::Empty> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `about` field (optional)
     pub fn about(mut self, value: impl Into<Option<TvEpisodeAbout<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `about` field to an Option value (optional)
     pub fn maybe_about(mut self, value: Option<TvEpisodeAbout<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -6299,12 +6302,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeAbstract<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `abstract` field to an Option value (optional)
     pub fn maybe_abstract(mut self, value: Option<TvEpisodeAbstract<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -6315,12 +6318,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeAccessMode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `accessMode` field to an Option value (optional)
     pub fn maybe_access_mode(mut self, value: Option<TvEpisodeAccessMode<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -6331,7 +6334,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeAccessModeSufficient<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `accessModeSufficient` field to an Option value (optional)
@@ -6339,7 +6342,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeAccessModeSufficient<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -6350,7 +6353,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeAccessibilityApi<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `accessibilityAPI` field to an Option value (optional)
@@ -6358,7 +6361,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeAccessibilityApi<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -6369,7 +6372,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeAccessibilityControl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `accessibilityControl` field to an Option value (optional)
@@ -6377,7 +6380,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeAccessibilityControl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -6388,7 +6391,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeAccessibilityFeature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `accessibilityFeature` field to an Option value (optional)
@@ -6396,7 +6399,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeAccessibilityFeature<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -6407,7 +6410,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeAccessibilityHazard<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `accessibilityHazard` field to an Option value (optional)
@@ -6415,7 +6418,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeAccessibilityHazard<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -6426,7 +6429,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeAccessibilitySummary<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `accessibilitySummary` field to an Option value (optional)
@@ -6434,7 +6437,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeAccessibilitySummary<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -6445,7 +6448,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeAccountablePerson<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `accountablePerson` field to an Option value (optional)
@@ -6453,7 +6456,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeAccountablePerson<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -6464,7 +6467,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeAcquireLicensePage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `acquireLicensePage` field to an Option value (optional)
@@ -6472,7 +6475,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeAcquireLicensePage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -6480,12 +6483,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `actor` field (optional)
     pub fn actor(mut self, value: impl Into<Option<TvEpisodeActor<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `actor` field to an Option value (optional)
     pub fn maybe_actor(mut self, value: Option<TvEpisodeActor<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -6493,12 +6496,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `actors` field (optional)
     pub fn actors(mut self, value: impl Into<Option<TvEpisodeActors<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `actors` field to an Option value (optional)
     pub fn maybe_actors(mut self, value: Option<TvEpisodeActors<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -6509,7 +6512,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -6517,7 +6520,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -6528,7 +6531,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -6536,7 +6539,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -6547,7 +6550,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -6555,7 +6558,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -6566,7 +6569,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeAlternativeHeadline<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `alternativeHeadline` field to an Option value (optional)
@@ -6574,7 +6577,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeAlternativeHeadline<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -6585,12 +6588,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeArchivedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `archivedAt` field to an Option value (optional)
     pub fn maybe_archived_at(mut self, value: Option<TvEpisodeArchivedAt<'a>>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -6598,12 +6601,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `assesses` field (optional)
     pub fn assesses(mut self, value: impl Into<Option<TvEpisodeAssesses<'a>>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `assesses` field to an Option value (optional)
     pub fn maybe_assesses(mut self, value: Option<TvEpisodeAssesses<'a>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -6614,7 +6617,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeAssociatedMedia<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `associatedMedia` field to an Option value (optional)
@@ -6622,7 +6625,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeAssociatedMedia<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -6630,12 +6633,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `audience` field (optional)
     pub fn audience(mut self, value: impl Into<Option<TvEpisodeAudience<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `audience` field to an Option value (optional)
     pub fn maybe_audience(mut self, value: Option<TvEpisodeAudience<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -6643,12 +6646,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `audio` field (optional)
     pub fn audio(mut self, value: impl Into<Option<TvEpisodeAudio<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `audio` field to an Option value (optional)
     pub fn maybe_audio(mut self, value: Option<TvEpisodeAudio<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -6656,12 +6659,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<TvEpisodeAuthor<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<TvEpisodeAuthor<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -6669,12 +6672,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<TvEpisodeAward<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<TvEpisodeAward<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -6682,12 +6685,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<TvEpisodeAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<TvEpisodeAwards<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -6698,12 +6701,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeCharacter<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `character` field to an Option value (optional)
     pub fn maybe_character(mut self, value: Option<TvEpisodeCharacter<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -6711,12 +6714,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `citation` field (optional)
     pub fn citation(mut self, value: impl Into<Option<TvEpisodeCitation<'a>>>) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `citation` field to an Option value (optional)
     pub fn maybe_citation(mut self, value: Option<TvEpisodeCitation<'a>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -6724,12 +6727,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<TvEpisodeComment<'a>>>) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<TvEpisodeComment<'a>>) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -6740,7 +6743,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeCommentCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `commentCount` field to an Option value (optional)
@@ -6748,7 +6751,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeCommentCount<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -6759,7 +6762,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeConditionsOfAccess<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `conditionsOfAccess` field to an Option value (optional)
@@ -6767,7 +6770,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeConditionsOfAccess<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -6778,7 +6781,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeContentLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `contentLocation` field to an Option value (optional)
@@ -6786,7 +6789,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeContentLocation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -6797,7 +6800,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeContentRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `contentRating` field to an Option value (optional)
@@ -6805,7 +6808,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeContentRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -6816,7 +6819,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeContentReferenceTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `contentReferenceTime` field to an Option value (optional)
@@ -6824,7 +6827,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeContentReferenceTime<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -6835,12 +6838,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeContributor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `contributor` field to an Option value (optional)
     pub fn maybe_contributor(mut self, value: Option<TvEpisodeContributor<'a>>) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -6851,7 +6854,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeCopyrightHolder<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `copyrightHolder` field to an Option value (optional)
@@ -6859,7 +6862,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeCopyrightHolder<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -6870,7 +6873,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeCopyrightNotice<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `copyrightNotice` field to an Option value (optional)
@@ -6878,7 +6881,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeCopyrightNotice<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -6889,7 +6892,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeCopyrightYear<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `copyrightYear` field to an Option value (optional)
@@ -6897,7 +6900,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeCopyrightYear<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -6908,12 +6911,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeCorrection<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `correction` field to an Option value (optional)
     pub fn maybe_correction(mut self, value: Option<TvEpisodeCorrection<'a>>) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -6924,7 +6927,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeCountryOfOrigin<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `countryOfOrigin` field to an Option value (optional)
@@ -6932,7 +6935,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeCountryOfOrigin<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -6943,7 +6946,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeCreativeWorkStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `creativeWorkStatus` field to an Option value (optional)
@@ -6951,7 +6954,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeCreativeWorkStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -6959,12 +6962,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `creator` field (optional)
     pub fn creator(mut self, value: impl Into<Option<TvEpisodeCreator<'a>>>) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `creator` field to an Option value (optional)
     pub fn maybe_creator(mut self, value: Option<TvEpisodeCreator<'a>>) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -6975,12 +6978,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeCreditText<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `creditText` field to an Option value (optional)
     pub fn maybe_credit_text(mut self, value: Option<TvEpisodeCreditText<'a>>) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -6991,7 +6994,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeDateCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `dateCreated` field to an Option value (optional)
@@ -6999,7 +7002,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeDateCreated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -7010,7 +7013,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeDateModified<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `dateModified` field to an Option value (optional)
@@ -7018,7 +7021,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeDateModified<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -7029,7 +7032,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `datePublished` field to an Option value (optional)
@@ -7037,7 +7040,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -7048,12 +7051,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<TvEpisodeDescription<'a>>) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -7064,7 +7067,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeDigitalSourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `digitalSourceType` field to an Option value (optional)
@@ -7072,7 +7075,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeDigitalSourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -7080,12 +7083,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `director` field (optional)
     pub fn director(mut self, value: impl Into<Option<TvEpisodeDirector<'a>>>) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `director` field to an Option value (optional)
     pub fn maybe_director(mut self, value: Option<TvEpisodeDirector<'a>>) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -7096,12 +7099,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeDirectors<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `directors` field to an Option value (optional)
     pub fn maybe_directors(mut self, value: Option<TvEpisodeDirectors<'a>>) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -7112,7 +7115,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -7120,7 +7123,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -7131,7 +7134,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeDiscussionUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `discussionUrl` field to an Option value (optional)
@@ -7139,7 +7142,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeDiscussionUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -7147,12 +7150,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `duration` field (optional)
     pub fn duration(mut self, value: impl Into<Option<TvEpisodeDuration<'a>>>) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `duration` field to an Option value (optional)
     pub fn maybe_duration(mut self, value: Option<TvEpisodeDuration<'a>>) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -7160,12 +7163,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `editEIDR` field (optional)
     pub fn edit_eidr(mut self, value: impl Into<Option<TvEpisodeEditEidr<'a>>>) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `editEIDR` field to an Option value (optional)
     pub fn maybe_edit_eidr(mut self, value: Option<TvEpisodeEditEidr<'a>>) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -7173,12 +7176,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `editor` field (optional)
     pub fn editor(mut self, value: impl Into<Option<TvEpisodeEditor<'a>>>) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `editor` field to an Option value (optional)
     pub fn maybe_editor(mut self, value: Option<TvEpisodeEditor<'a>>) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -7189,7 +7192,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeEducationalAlignment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `educationalAlignment` field to an Option value (optional)
@@ -7197,7 +7200,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeEducationalAlignment<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -7208,7 +7211,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeEducationalLevel<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `educationalLevel` field to an Option value (optional)
@@ -7216,7 +7219,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeEducationalLevel<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -7227,7 +7230,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeEducationalUse<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `educationalUse` field to an Option value (optional)
@@ -7235,7 +7238,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeEducationalUse<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -7243,12 +7246,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `encoding` field (optional)
     pub fn encoding(mut self, value: impl Into<Option<TvEpisodeEncoding<'a>>>) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `encoding` field to an Option value (optional)
     pub fn maybe_encoding(mut self, value: Option<TvEpisodeEncoding<'a>>) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -7259,7 +7262,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeEncodingFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `encodingFormat` field to an Option value (optional)
@@ -7267,7 +7270,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeEncodingFormat<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -7278,12 +7281,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeEncodings<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `encodings` field to an Option value (optional)
     pub fn maybe_encodings(mut self, value: Option<TvEpisodeEncodings<'a>>) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -7294,7 +7297,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeEpisodeNumber<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `episodeNumber` field to an Option value (optional)
@@ -7302,7 +7305,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeEpisodeNumber<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -7313,7 +7316,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeExampleOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `exampleOfWork` field to an Option value (optional)
@@ -7321,7 +7324,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeExampleOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -7329,12 +7332,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `expires` field (optional)
     pub fn expires(mut self, value: impl Into<Option<TvEpisodeExpires<'a>>>) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `expires` field to an Option value (optional)
     pub fn maybe_expires(mut self, value: Option<TvEpisodeExpires<'a>>) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -7345,12 +7348,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeFileFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `fileFormat` field to an Option value (optional)
     pub fn maybe_file_format(mut self, value: Option<TvEpisodeFileFormat<'a>>) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -7358,12 +7361,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<TvEpisodeFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<TvEpisodeFunder<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -7371,12 +7374,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<TvEpisodeFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<TvEpisodeFunding<'a>>) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -7384,12 +7387,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<TvEpisodeGenre<'a>>>) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<TvEpisodeGenre<'a>>) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -7397,12 +7400,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `hasPart` field (optional)
     pub fn has_part(mut self, value: impl Into<Option<TvEpisodeHasPart<'a>>>) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `hasPart` field to an Option value (optional)
     pub fn maybe_has_part(mut self, value: Option<TvEpisodeHasPart<'a>>) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -7410,12 +7413,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `headline` field (optional)
     pub fn headline(mut self, value: impl Into<Option<TvEpisodeHeadline<'a>>>) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `headline` field to an Option value (optional)
     pub fn maybe_headline(mut self, value: Option<TvEpisodeHeadline<'a>>) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -7426,12 +7429,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeIdentifier<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<TvEpisodeIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -7439,12 +7442,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<TvEpisodeImage<'a>>>) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<TvEpisodeImage<'a>>) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -7455,12 +7458,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeInLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `inLanguage` field to an Option value (optional)
     pub fn maybe_in_language(mut self, value: Option<TvEpisodeInLanguage<'a>>) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -7471,7 +7474,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -7479,7 +7482,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -7490,7 +7493,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeInteractivityType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `interactivityType` field to an Option value (optional)
@@ -7498,7 +7501,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeInteractivityType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -7509,7 +7512,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeInterpretedAsClaim<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `interpretedAsClaim` field to an Option value (optional)
@@ -7517,7 +7520,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeInterpretedAsClaim<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -7528,7 +7531,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeIsAccessibleForFree<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `isAccessibleForFree` field to an Option value (optional)
@@ -7536,7 +7539,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeIsAccessibleForFree<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -7547,12 +7550,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeIsBasedOn<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `isBasedOn` field to an Option value (optional)
     pub fn maybe_is_based_on(mut self, value: Option<TvEpisodeIsBasedOn<'a>>) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -7563,7 +7566,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeIsBasedOnUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `isBasedOnUrl` field to an Option value (optional)
@@ -7571,7 +7574,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeIsBasedOnUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -7582,7 +7585,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeIsFamilyFriendly<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `isFamilyFriendly` field to an Option value (optional)
@@ -7590,7 +7593,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeIsFamilyFriendly<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -7601,12 +7604,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeIsPartOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value.into();
+        self._fields.79 = value.into();
         self
     }
     /// Set the `isPartOf` field to an Option value (optional)
     pub fn maybe_is_part_of(mut self, value: Option<TvEpisodeIsPartOf<'a>>) -> Self {
-        self.__unsafe_private_named.79 = value;
+        self._fields.79 = value;
         self
     }
 }
@@ -7614,12 +7617,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<TvEpisodeKeywords<'a>>>) -> Self {
-        self.__unsafe_private_named.80 = value.into();
+        self._fields.80 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<TvEpisodeKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.80 = value;
+        self._fields.80 = value;
         self
     }
 }
@@ -7630,7 +7633,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeLearningResourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.81 = value.into();
+        self._fields.81 = value.into();
         self
     }
     /// Set the `learningResourceType` field to an Option value (optional)
@@ -7638,7 +7641,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeLearningResourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.81 = value;
+        self._fields.81 = value;
         self
     }
 }
@@ -7646,12 +7649,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `license` field (optional)
     pub fn license(mut self, value: impl Into<Option<TvEpisodeLicense<'a>>>) -> Self {
-        self.__unsafe_private_named.82 = value.into();
+        self._fields.82 = value.into();
         self
     }
     /// Set the `license` field to an Option value (optional)
     pub fn maybe_license(mut self, value: Option<TvEpisodeLicense<'a>>) -> Self {
-        self.__unsafe_private_named.82 = value;
+        self._fields.82 = value;
         self
     }
 }
@@ -7662,7 +7665,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeLocationCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.83 = value.into();
+        self._fields.83 = value.into();
         self
     }
     /// Set the `locationCreated` field to an Option value (optional)
@@ -7670,7 +7673,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeLocationCreated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.83 = value;
+        self._fields.83 = value;
         self
     }
 }
@@ -7681,12 +7684,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeMainEntity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value.into();
+        self._fields.84 = value.into();
         self
     }
     /// Set the `mainEntity` field to an Option value (optional)
     pub fn maybe_main_entity(mut self, value: Option<TvEpisodeMainEntity<'a>>) -> Self {
-        self.__unsafe_private_named.84 = value;
+        self._fields.84 = value;
         self
     }
 }
@@ -7697,7 +7700,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.85 = value.into();
+        self._fields.85 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -7705,7 +7708,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.85 = value;
+        self._fields.85 = value;
         self
     }
 }
@@ -7716,12 +7719,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeMaintainer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.86 = value.into();
+        self._fields.86 = value.into();
         self
     }
     /// Set the `maintainer` field to an Option value (optional)
     pub fn maybe_maintainer(mut self, value: Option<TvEpisodeMaintainer<'a>>) -> Self {
-        self.__unsafe_private_named.86 = value;
+        self._fields.86 = value;
         self
     }
 }
@@ -7729,12 +7732,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `material` field (optional)
     pub fn material(mut self, value: impl Into<Option<TvEpisodeMaterial<'a>>>) -> Self {
-        self.__unsafe_private_named.87 = value.into();
+        self._fields.87 = value.into();
         self
     }
     /// Set the `material` field to an Option value (optional)
     pub fn maybe_material(mut self, value: Option<TvEpisodeMaterial<'a>>) -> Self {
-        self.__unsafe_private_named.87 = value;
+        self._fields.87 = value;
         self
     }
 }
@@ -7745,7 +7748,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeMaterialExtent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.88 = value.into();
+        self._fields.88 = value.into();
         self
     }
     /// Set the `materialExtent` field to an Option value (optional)
@@ -7753,7 +7756,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeMaterialExtent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.88 = value;
+        self._fields.88 = value;
         self
     }
 }
@@ -7761,12 +7764,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `mentions` field (optional)
     pub fn mentions(mut self, value: impl Into<Option<TvEpisodeMentions<'a>>>) -> Self {
-        self.__unsafe_private_named.89 = value.into();
+        self._fields.89 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<TvEpisodeMentions<'a>>) -> Self {
-        self.__unsafe_private_named.89 = value;
+        self._fields.89 = value;
         self
     }
 }
@@ -7774,12 +7777,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `musicBy` field (optional)
     pub fn music_by(mut self, value: impl Into<Option<TvEpisodeMusicBy<'a>>>) -> Self {
-        self.__unsafe_private_named.90 = value.into();
+        self._fields.90 = value.into();
         self
     }
     /// Set the `musicBy` field to an Option value (optional)
     pub fn maybe_music_by(mut self, value: Option<TvEpisodeMusicBy<'a>>) -> Self {
-        self.__unsafe_private_named.90 = value;
+        self._fields.90 = value;
         self
     }
 }
@@ -7787,12 +7790,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<TvEpisodeName<'a>>>) -> Self {
-        self.__unsafe_private_named.91 = value.into();
+        self._fields.91 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<TvEpisodeName<'a>>) -> Self {
-        self.__unsafe_private_named.91 = value;
+        self._fields.91 = value;
         self
     }
 }
@@ -7800,12 +7803,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `offers` field (optional)
     pub fn offers(mut self, value: impl Into<Option<TvEpisodeOffers<'a>>>) -> Self {
-        self.__unsafe_private_named.92 = value.into();
+        self._fields.92 = value.into();
         self
     }
     /// Set the `offers` field to an Option value (optional)
     pub fn maybe_offers(mut self, value: Option<TvEpisodeOffers<'a>>) -> Self {
-        self.__unsafe_private_named.92 = value;
+        self._fields.92 = value;
         self
     }
 }
@@ -7816,7 +7819,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodePartOfSeason<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.93 = value.into();
+        self._fields.93 = value.into();
         self
     }
     /// Set the `partOfSeason` field to an Option value (optional)
@@ -7824,7 +7827,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodePartOfSeason<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.93 = value;
+        self._fields.93 = value;
         self
     }
 }
@@ -7835,7 +7838,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodePartOfSeries<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value.into();
+        self._fields.94 = value.into();
         self
     }
     /// Set the `partOfSeries` field to an Option value (optional)
@@ -7843,7 +7846,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodePartOfSeries<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value;
+        self._fields.94 = value;
         self
     }
 }
@@ -7854,7 +7857,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodePartOfTvSeries<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.95 = value.into();
+        self._fields.95 = value.into();
         self
     }
     /// Set the `partOfTVSeries` field to an Option value (optional)
@@ -7862,7 +7865,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodePartOfTvSeries<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.95 = value;
+        self._fields.95 = value;
         self
     }
 }
@@ -7870,12 +7873,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `pattern` field (optional)
     pub fn pattern(mut self, value: impl Into<Option<TvEpisodePattern<'a>>>) -> Self {
-        self.__unsafe_private_named.96 = value.into();
+        self._fields.96 = value.into();
         self
     }
     /// Set the `pattern` field to an Option value (optional)
     pub fn maybe_pattern(mut self, value: Option<TvEpisodePattern<'a>>) -> Self {
-        self.__unsafe_private_named.96 = value;
+        self._fields.96 = value;
         self
     }
 }
@@ -7883,12 +7886,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `position` field (optional)
     pub fn position(mut self, value: impl Into<Option<TvEpisodePosition<'a>>>) -> Self {
-        self.__unsafe_private_named.97 = value.into();
+        self._fields.97 = value.into();
         self
     }
     /// Set the `position` field to an Option value (optional)
     pub fn maybe_position(mut self, value: Option<TvEpisodePosition<'a>>) -> Self {
-        self.__unsafe_private_named.97 = value;
+        self._fields.97 = value;
         self
     }
 }
@@ -7899,7 +7902,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodePotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value.into();
+        self._fields.98 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -7907,7 +7910,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodePotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value;
+        self._fields.98 = value;
         self
     }
 }
@@ -7915,12 +7918,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `producer` field (optional)
     pub fn producer(mut self, value: impl Into<Option<TvEpisodeProducer<'a>>>) -> Self {
-        self.__unsafe_private_named.99 = value.into();
+        self._fields.99 = value.into();
         self
     }
     /// Set the `producer` field to an Option value (optional)
     pub fn maybe_producer(mut self, value: Option<TvEpisodeProducer<'a>>) -> Self {
-        self.__unsafe_private_named.99 = value;
+        self._fields.99 = value;
         self
     }
 }
@@ -7931,7 +7934,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeProductionCompany<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value.into();
+        self._fields.100 = value.into();
         self
     }
     /// Set the `productionCompany` field to an Option value (optional)
@@ -7939,7 +7942,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeProductionCompany<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value;
+        self._fields.100 = value;
         self
     }
 }
@@ -7947,12 +7950,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `provider` field (optional)
     pub fn provider(mut self, value: impl Into<Option<TvEpisodeProvider<'a>>>) -> Self {
-        self.__unsafe_private_named.101 = value.into();
+        self._fields.101 = value.into();
         self
     }
     /// Set the `provider` field to an Option value (optional)
     pub fn maybe_provider(mut self, value: Option<TvEpisodeProvider<'a>>) -> Self {
-        self.__unsafe_private_named.101 = value;
+        self._fields.101 = value;
         self
     }
 }
@@ -7963,12 +7966,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodePublication<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value.into();
+        self._fields.102 = value.into();
         self
     }
     /// Set the `publication` field to an Option value (optional)
     pub fn maybe_publication(mut self, value: Option<TvEpisodePublication<'a>>) -> Self {
-        self.__unsafe_private_named.102 = value;
+        self._fields.102 = value;
         self
     }
 }
@@ -7979,12 +7982,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodePublisher<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.103 = value.into();
+        self._fields.103 = value.into();
         self
     }
     /// Set the `publisher` field to an Option value (optional)
     pub fn maybe_publisher(mut self, value: Option<TvEpisodePublisher<'a>>) -> Self {
-        self.__unsafe_private_named.103 = value;
+        self._fields.103 = value;
         self
     }
 }
@@ -7995,7 +7998,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodePublisherImprint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value.into();
+        self._fields.104 = value.into();
         self
     }
     /// Set the `publisherImprint` field to an Option value (optional)
@@ -8003,7 +8006,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodePublisherImprint<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value;
+        self._fields.104 = value;
         self
     }
 }
@@ -8014,7 +8017,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodePublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.105 = value.into();
+        self._fields.105 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -8022,7 +8025,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodePublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.105 = value;
+        self._fields.105 = value;
         self
     }
 }
@@ -8033,12 +8036,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeRecordedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value.into();
+        self._fields.106 = value.into();
         self
     }
     /// Set the `recordedAt` field to an Option value (optional)
     pub fn maybe_recorded_at(mut self, value: Option<TvEpisodeRecordedAt<'a>>) -> Self {
-        self.__unsafe_private_named.106 = value;
+        self._fields.106 = value;
         self
     }
 }
@@ -8049,7 +8052,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeReleasedEvent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value.into();
+        self._fields.107 = value.into();
         self
     }
     /// Set the `releasedEvent` field to an Option value (optional)
@@ -8057,7 +8060,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeReleasedEvent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value;
+        self._fields.107 = value;
         self
     }
 }
@@ -8065,12 +8068,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<TvEpisodeReview<'a>>>) -> Self {
-        self.__unsafe_private_named.108 = value.into();
+        self._fields.108 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<TvEpisodeReview<'a>>) -> Self {
-        self.__unsafe_private_named.108 = value;
+        self._fields.108 = value;
         self
     }
 }
@@ -8078,12 +8081,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `reviews` field (optional)
     pub fn reviews(mut self, value: impl Into<Option<TvEpisodeReviews<'a>>>) -> Self {
-        self.__unsafe_private_named.109 = value.into();
+        self._fields.109 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<TvEpisodeReviews<'a>>) -> Self {
-        self.__unsafe_private_named.109 = value;
+        self._fields.109 = value;
         self
     }
 }
@@ -8091,12 +8094,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<TvEpisodeSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.110 = value.into();
+        self._fields.110 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<TvEpisodeSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.110 = value;
+        self._fields.110 = value;
         self
     }
 }
@@ -8107,7 +8110,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeSchemaVersion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.111 = value.into();
+        self._fields.111 = value.into();
         self
     }
     /// Set the `schemaVersion` field to an Option value (optional)
@@ -8115,7 +8118,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeSchemaVersion<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.111 = value;
+        self._fields.111 = value;
         self
     }
 }
@@ -8126,7 +8129,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeSdDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value.into();
+        self._fields.112 = value.into();
         self
     }
     /// Set the `sdDatePublished` field to an Option value (optional)
@@ -8134,7 +8137,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeSdDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value;
+        self._fields.112 = value;
         self
     }
 }
@@ -8145,12 +8148,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeSdLicense<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value.into();
+        self._fields.113 = value.into();
         self
     }
     /// Set the `sdLicense` field to an Option value (optional)
     pub fn maybe_sd_license(mut self, value: Option<TvEpisodeSdLicense<'a>>) -> Self {
-        self.__unsafe_private_named.113 = value;
+        self._fields.113 = value;
         self
     }
 }
@@ -8161,7 +8164,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeSdPublisher<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.114 = value.into();
+        self._fields.114 = value.into();
         self
     }
     /// Set the `sdPublisher` field to an Option value (optional)
@@ -8169,7 +8172,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeSdPublisher<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.114 = value;
+        self._fields.114 = value;
         self
     }
 }
@@ -8177,12 +8180,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<TvEpisodeSize<'a>>>) -> Self {
-        self.__unsafe_private_named.115 = value.into();
+        self._fields.115 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<TvEpisodeSize<'a>>) -> Self {
-        self.__unsafe_private_named.115 = value;
+        self._fields.115 = value;
         self
     }
 }
@@ -8193,7 +8196,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeSourceOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.116 = value.into();
+        self._fields.116 = value.into();
         self
     }
     /// Set the `sourceOrganization` field to an Option value (optional)
@@ -8201,7 +8204,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeSourceOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.116 = value;
+        self._fields.116 = value;
         self
     }
 }
@@ -8209,12 +8212,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `spatial` field (optional)
     pub fn spatial(mut self, value: impl Into<Option<TvEpisodeSpatial<'a>>>) -> Self {
-        self.__unsafe_private_named.117 = value.into();
+        self._fields.117 = value.into();
         self
     }
     /// Set the `spatial` field to an Option value (optional)
     pub fn maybe_spatial(mut self, value: Option<TvEpisodeSpatial<'a>>) -> Self {
-        self.__unsafe_private_named.117 = value;
+        self._fields.117 = value;
         self
     }
 }
@@ -8225,7 +8228,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeSpatialCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.118 = value.into();
+        self._fields.118 = value.into();
         self
     }
     /// Set the `spatialCoverage` field to an Option value (optional)
@@ -8233,7 +8236,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeSpatialCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.118 = value;
+        self._fields.118 = value;
         self
     }
 }
@@ -8241,12 +8244,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `sponsor` field (optional)
     pub fn sponsor(mut self, value: impl Into<Option<TvEpisodeSponsor<'a>>>) -> Self {
-        self.__unsafe_private_named.119 = value.into();
+        self._fields.119 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<TvEpisodeSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.119 = value;
+        self._fields.119 = value;
         self
     }
 }
@@ -8257,12 +8260,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeSubjectOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.120 = value.into();
+        self._fields.120 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<TvEpisodeSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.120 = value;
+        self._fields.120 = value;
         self
     }
 }
@@ -8273,7 +8276,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeSubtitleLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.121 = value.into();
+        self._fields.121 = value.into();
         self
     }
     /// Set the `subtitleLanguage` field to an Option value (optional)
@@ -8281,7 +8284,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeSubtitleLanguage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.121 = value;
+        self._fields.121 = value;
         self
     }
 }
@@ -8289,12 +8292,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `teaches` field (optional)
     pub fn teaches(mut self, value: impl Into<Option<TvEpisodeTeaches<'a>>>) -> Self {
-        self.__unsafe_private_named.122 = value.into();
+        self._fields.122 = value.into();
         self
     }
     /// Set the `teaches` field to an Option value (optional)
     pub fn maybe_teaches(mut self, value: Option<TvEpisodeTeaches<'a>>) -> Self {
-        self.__unsafe_private_named.122 = value;
+        self._fields.122 = value;
         self
     }
 }
@@ -8302,12 +8305,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `temporal` field (optional)
     pub fn temporal(mut self, value: impl Into<Option<TvEpisodeTemporal<'a>>>) -> Self {
-        self.__unsafe_private_named.123 = value.into();
+        self._fields.123 = value.into();
         self
     }
     /// Set the `temporal` field to an Option value (optional)
     pub fn maybe_temporal(mut self, value: Option<TvEpisodeTemporal<'a>>) -> Self {
-        self.__unsafe_private_named.123 = value;
+        self._fields.123 = value;
         self
     }
 }
@@ -8318,7 +8321,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeTemporalCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.124 = value.into();
+        self._fields.124 = value.into();
         self
     }
     /// Set the `temporalCoverage` field to an Option value (optional)
@@ -8326,7 +8329,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeTemporalCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.124 = value;
+        self._fields.124 = value;
         self
     }
 }
@@ -8334,12 +8337,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<TvEpisodeText<'a>>>) -> Self {
-        self.__unsafe_private_named.125 = value.into();
+        self._fields.125 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<TvEpisodeText<'a>>) -> Self {
-        self.__unsafe_private_named.125 = value;
+        self._fields.125 = value;
         self
     }
 }
@@ -8350,12 +8353,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeThumbnail<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.126 = value.into();
+        self._fields.126 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<TvEpisodeThumbnail<'a>>) -> Self {
-        self.__unsafe_private_named.126 = value;
+        self._fields.126 = value;
         self
     }
 }
@@ -8366,7 +8369,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeThumbnailUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.127 = value.into();
+        self._fields.127 = value.into();
         self
     }
     /// Set the `thumbnailUrl` field to an Option value (optional)
@@ -8374,7 +8377,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeThumbnailUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.127 = value;
+        self._fields.127 = value;
         self
     }
 }
@@ -8385,7 +8388,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeTimeRequired<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.128 = value.into();
+        self._fields.128 = value.into();
         self
     }
     /// Set the `timeRequired` field to an Option value (optional)
@@ -8393,7 +8396,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeTimeRequired<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.128 = value;
+        self._fields.128 = value;
         self
     }
 }
@@ -8404,12 +8407,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeTitleEidr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.129 = value.into();
+        self._fields.129 = value.into();
         self
     }
     /// Set the `titleEIDR` field to an Option value (optional)
     pub fn maybe_title_eidr(mut self, value: Option<TvEpisodeTitleEidr<'a>>) -> Self {
-        self.__unsafe_private_named.129 = value;
+        self._fields.129 = value;
         self
     }
 }
@@ -8417,12 +8420,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `trailer` field (optional)
     pub fn trailer(mut self, value: impl Into<Option<TvEpisodeTrailer<'a>>>) -> Self {
-        self.__unsafe_private_named.130 = value.into();
+        self._fields.130 = value.into();
         self
     }
     /// Set the `trailer` field to an Option value (optional)
     pub fn maybe_trailer(mut self, value: Option<TvEpisodeTrailer<'a>>) -> Self {
-        self.__unsafe_private_named.130 = value;
+        self._fields.130 = value;
         self
     }
 }
@@ -8433,7 +8436,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeTranslationOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.131 = value.into();
+        self._fields.131 = value.into();
         self
     }
     /// Set the `translationOfWork` field to an Option value (optional)
@@ -8441,7 +8444,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeTranslationOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.131 = value;
+        self._fields.131 = value;
         self
     }
 }
@@ -8452,12 +8455,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeTranslator<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.132 = value.into();
+        self._fields.132 = value.into();
         self
     }
     /// Set the `translator` field to an Option value (optional)
     pub fn maybe_translator(mut self, value: Option<TvEpisodeTranslator<'a>>) -> Self {
-        self.__unsafe_private_named.132 = value;
+        self._fields.132 = value;
         self
     }
 }
@@ -8468,7 +8471,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeTypicalAgeRange<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.133 = value.into();
+        self._fields.133 = value.into();
         self
     }
     /// Set the `typicalAgeRange` field to an Option value (optional)
@@ -8476,7 +8479,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeTypicalAgeRange<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.133 = value;
+        self._fields.133 = value;
         self
     }
 }
@@ -8484,12 +8487,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<TvEpisodeUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.134 = value.into();
+        self._fields.134 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<TvEpisodeUrl<'a>>) -> Self {
-        self.__unsafe_private_named.134 = value;
+        self._fields.134 = value;
         self
     }
 }
@@ -8500,12 +8503,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeUsageInfo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.135 = value.into();
+        self._fields.135 = value.into();
         self
     }
     /// Set the `usageInfo` field to an Option value (optional)
     pub fn maybe_usage_info(mut self, value: Option<TvEpisodeUsageInfo<'a>>) -> Self {
-        self.__unsafe_private_named.135 = value;
+        self._fields.135 = value;
         self
     }
 }
@@ -8513,12 +8516,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `version` field (optional)
     pub fn version(mut self, value: impl Into<Option<TvEpisodeVersion<'a>>>) -> Self {
-        self.__unsafe_private_named.136 = value.into();
+        self._fields.136 = value.into();
         self
     }
     /// Set the `version` field to an Option value (optional)
     pub fn maybe_version(mut self, value: Option<TvEpisodeVersion<'a>>) -> Self {
-        self.__unsafe_private_named.136 = value;
+        self._fields.136 = value;
         self
     }
 }
@@ -8526,12 +8529,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
 impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
     /// Set the `video` field (optional)
     pub fn video(mut self, value: impl Into<Option<TvEpisodeVideo<'a>>>) -> Self {
-        self.__unsafe_private_named.137 = value.into();
+        self._fields.137 = value.into();
         self
     }
     /// Set the `video` field to an Option value (optional)
     pub fn maybe_video(mut self, value: Option<TvEpisodeVideo<'a>>) -> Self {
-        self.__unsafe_private_named.137 = value;
+        self._fields.137 = value;
         self
     }
 }
@@ -8542,12 +8545,12 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeWordCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.138 = value.into();
+        self._fields.138 = value.into();
         self
     }
     /// Set the `wordCount` field to an Option value (optional)
     pub fn maybe_word_count(mut self, value: Option<TvEpisodeWordCount<'a>>) -> Self {
-        self.__unsafe_private_named.138 = value;
+        self._fields.138 = value;
         self
     }
 }
@@ -8558,7 +8561,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeWorkExample<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.139 = value.into();
+        self._fields.139 = value.into();
         self
     }
     /// Set the `workExample` field to an Option value (optional)
@@ -8566,7 +8569,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeWorkExample<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.139 = value;
+        self._fields.139 = value;
         self
     }
 }
@@ -8577,7 +8580,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvEpisodeWorkTranslation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.140 = value.into();
+        self._fields.140 = value.into();
         self
     }
     /// Set the `workTranslation` field to an Option value (optional)
@@ -8585,7 +8588,7 @@ impl<'a, S: tv_episode_state::State> TvEpisodeBuilder<'a, S> {
         mut self,
         value: Option<TvEpisodeWorkTranslation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.140 = value;
+        self._fields.140 = value;
         self
     }
 }
@@ -8597,147 +8600,147 @@ where
     /// Build the final struct
     pub fn build(self) -> TvEpisode<'a> {
         TvEpisode {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            actor: self.__unsafe_private_named.11,
-            actors: self.__unsafe_private_named.12,
-            additional_type: self.__unsafe_private_named.13,
-            aggregate_rating: self.__unsafe_private_named.14,
-            alternate_name: self.__unsafe_private_named.15,
-            alternative_headline: self.__unsafe_private_named.16,
-            archived_at: self.__unsafe_private_named.17,
-            assesses: self.__unsafe_private_named.18,
-            associated_media: self.__unsafe_private_named.19,
-            audience: self.__unsafe_private_named.20,
-            audio: self.__unsafe_private_named.21,
-            author: self.__unsafe_private_named.22,
-            award: self.__unsafe_private_named.23,
-            awards: self.__unsafe_private_named.24,
-            character: self.__unsafe_private_named.25,
-            citation: self.__unsafe_private_named.26,
-            comment: self.__unsafe_private_named.27,
-            comment_count: self.__unsafe_private_named.28,
-            conditions_of_access: self.__unsafe_private_named.29,
-            content_location: self.__unsafe_private_named.30,
-            content_rating: self.__unsafe_private_named.31,
-            content_reference_time: self.__unsafe_private_named.32,
-            contributor: self.__unsafe_private_named.33,
-            copyright_holder: self.__unsafe_private_named.34,
-            copyright_notice: self.__unsafe_private_named.35,
-            copyright_year: self.__unsafe_private_named.36,
-            correction: self.__unsafe_private_named.37,
-            country_of_origin: self.__unsafe_private_named.38,
-            creative_work_status: self.__unsafe_private_named.39,
-            creator: self.__unsafe_private_named.40,
-            credit_text: self.__unsafe_private_named.41,
-            date_created: self.__unsafe_private_named.42,
-            date_modified: self.__unsafe_private_named.43,
-            date_published: self.__unsafe_private_named.44,
-            description: self.__unsafe_private_named.45,
-            digital_source_type: self.__unsafe_private_named.46,
-            director: self.__unsafe_private_named.47,
-            directors: self.__unsafe_private_named.48,
-            disambiguating_description: self.__unsafe_private_named.49,
-            discussion_url: self.__unsafe_private_named.50,
-            duration: self.__unsafe_private_named.51,
-            edit_eidr: self.__unsafe_private_named.52,
-            editor: self.__unsafe_private_named.53,
-            educational_alignment: self.__unsafe_private_named.54,
-            educational_level: self.__unsafe_private_named.55,
-            educational_use: self.__unsafe_private_named.56,
-            encoding: self.__unsafe_private_named.57,
-            encoding_format: self.__unsafe_private_named.58,
-            encodings: self.__unsafe_private_named.59,
-            episode_number: self.__unsafe_private_named.60,
-            example_of_work: self.__unsafe_private_named.61,
-            expires: self.__unsafe_private_named.62,
-            file_format: self.__unsafe_private_named.63,
-            funder: self.__unsafe_private_named.64,
-            funding: self.__unsafe_private_named.65,
-            genre: self.__unsafe_private_named.66,
-            has_part: self.__unsafe_private_named.67,
-            headline: self.__unsafe_private_named.68,
-            identifier: self.__unsafe_private_named.69,
-            image: self.__unsafe_private_named.70,
-            in_language: self.__unsafe_private_named.71,
-            interaction_statistic: self.__unsafe_private_named.72,
-            interactivity_type: self.__unsafe_private_named.73,
-            interpreted_as_claim: self.__unsafe_private_named.74,
-            is_accessible_for_free: self.__unsafe_private_named.75,
-            is_based_on: self.__unsafe_private_named.76,
-            is_based_on_url: self.__unsafe_private_named.77,
-            is_family_friendly: self.__unsafe_private_named.78,
-            is_part_of: self.__unsafe_private_named.79,
-            keywords: self.__unsafe_private_named.80,
-            learning_resource_type: self.__unsafe_private_named.81,
-            license: self.__unsafe_private_named.82,
-            location_created: self.__unsafe_private_named.83,
-            main_entity: self.__unsafe_private_named.84,
-            main_entity_of_page: self.__unsafe_private_named.85,
-            maintainer: self.__unsafe_private_named.86,
-            material: self.__unsafe_private_named.87,
-            material_extent: self.__unsafe_private_named.88,
-            mentions: self.__unsafe_private_named.89,
-            music_by: self.__unsafe_private_named.90,
-            name: self.__unsafe_private_named.91,
-            offers: self.__unsafe_private_named.92,
-            part_of_season: self.__unsafe_private_named.93,
-            part_of_series: self.__unsafe_private_named.94,
-            part_of_tv_series: self.__unsafe_private_named.95,
-            pattern: self.__unsafe_private_named.96,
-            position: self.__unsafe_private_named.97,
-            potential_action: self.__unsafe_private_named.98,
-            producer: self.__unsafe_private_named.99,
-            production_company: self.__unsafe_private_named.100,
-            provider: self.__unsafe_private_named.101,
-            publication: self.__unsafe_private_named.102,
-            publisher: self.__unsafe_private_named.103,
-            publisher_imprint: self.__unsafe_private_named.104,
-            publishing_principles: self.__unsafe_private_named.105,
-            recorded_at: self.__unsafe_private_named.106,
-            released_event: self.__unsafe_private_named.107,
-            review: self.__unsafe_private_named.108,
-            reviews: self.__unsafe_private_named.109,
-            same_as: self.__unsafe_private_named.110,
-            schema_version: self.__unsafe_private_named.111,
-            sd_date_published: self.__unsafe_private_named.112,
-            sd_license: self.__unsafe_private_named.113,
-            sd_publisher: self.__unsafe_private_named.114,
-            size: self.__unsafe_private_named.115,
-            source_organization: self.__unsafe_private_named.116,
-            spatial: self.__unsafe_private_named.117,
-            spatial_coverage: self.__unsafe_private_named.118,
-            sponsor: self.__unsafe_private_named.119,
-            subject_of: self.__unsafe_private_named.120,
-            subtitle_language: self.__unsafe_private_named.121,
-            teaches: self.__unsafe_private_named.122,
-            temporal: self.__unsafe_private_named.123,
-            temporal_coverage: self.__unsafe_private_named.124,
-            text: self.__unsafe_private_named.125,
-            thumbnail: self.__unsafe_private_named.126,
-            thumbnail_url: self.__unsafe_private_named.127,
-            time_required: self.__unsafe_private_named.128,
-            title_eidr: self.__unsafe_private_named.129,
-            trailer: self.__unsafe_private_named.130,
-            translation_of_work: self.__unsafe_private_named.131,
-            translator: self.__unsafe_private_named.132,
-            typical_age_range: self.__unsafe_private_named.133,
-            url: self.__unsafe_private_named.134,
-            usage_info: self.__unsafe_private_named.135,
-            version: self.__unsafe_private_named.136,
-            video: self.__unsafe_private_named.137,
-            word_count: self.__unsafe_private_named.138,
-            work_example: self.__unsafe_private_named.139,
-            work_translation: self.__unsafe_private_named.140,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            actor: self._fields.11,
+            actors: self._fields.12,
+            additional_type: self._fields.13,
+            aggregate_rating: self._fields.14,
+            alternate_name: self._fields.15,
+            alternative_headline: self._fields.16,
+            archived_at: self._fields.17,
+            assesses: self._fields.18,
+            associated_media: self._fields.19,
+            audience: self._fields.20,
+            audio: self._fields.21,
+            author: self._fields.22,
+            award: self._fields.23,
+            awards: self._fields.24,
+            character: self._fields.25,
+            citation: self._fields.26,
+            comment: self._fields.27,
+            comment_count: self._fields.28,
+            conditions_of_access: self._fields.29,
+            content_location: self._fields.30,
+            content_rating: self._fields.31,
+            content_reference_time: self._fields.32,
+            contributor: self._fields.33,
+            copyright_holder: self._fields.34,
+            copyright_notice: self._fields.35,
+            copyright_year: self._fields.36,
+            correction: self._fields.37,
+            country_of_origin: self._fields.38,
+            creative_work_status: self._fields.39,
+            creator: self._fields.40,
+            credit_text: self._fields.41,
+            date_created: self._fields.42,
+            date_modified: self._fields.43,
+            date_published: self._fields.44,
+            description: self._fields.45,
+            digital_source_type: self._fields.46,
+            director: self._fields.47,
+            directors: self._fields.48,
+            disambiguating_description: self._fields.49,
+            discussion_url: self._fields.50,
+            duration: self._fields.51,
+            edit_eidr: self._fields.52,
+            editor: self._fields.53,
+            educational_alignment: self._fields.54,
+            educational_level: self._fields.55,
+            educational_use: self._fields.56,
+            encoding: self._fields.57,
+            encoding_format: self._fields.58,
+            encodings: self._fields.59,
+            episode_number: self._fields.60,
+            example_of_work: self._fields.61,
+            expires: self._fields.62,
+            file_format: self._fields.63,
+            funder: self._fields.64,
+            funding: self._fields.65,
+            genre: self._fields.66,
+            has_part: self._fields.67,
+            headline: self._fields.68,
+            identifier: self._fields.69,
+            image: self._fields.70,
+            in_language: self._fields.71,
+            interaction_statistic: self._fields.72,
+            interactivity_type: self._fields.73,
+            interpreted_as_claim: self._fields.74,
+            is_accessible_for_free: self._fields.75,
+            is_based_on: self._fields.76,
+            is_based_on_url: self._fields.77,
+            is_family_friendly: self._fields.78,
+            is_part_of: self._fields.79,
+            keywords: self._fields.80,
+            learning_resource_type: self._fields.81,
+            license: self._fields.82,
+            location_created: self._fields.83,
+            main_entity: self._fields.84,
+            main_entity_of_page: self._fields.85,
+            maintainer: self._fields.86,
+            material: self._fields.87,
+            material_extent: self._fields.88,
+            mentions: self._fields.89,
+            music_by: self._fields.90,
+            name: self._fields.91,
+            offers: self._fields.92,
+            part_of_season: self._fields.93,
+            part_of_series: self._fields.94,
+            part_of_tv_series: self._fields.95,
+            pattern: self._fields.96,
+            position: self._fields.97,
+            potential_action: self._fields.98,
+            producer: self._fields.99,
+            production_company: self._fields.100,
+            provider: self._fields.101,
+            publication: self._fields.102,
+            publisher: self._fields.103,
+            publisher_imprint: self._fields.104,
+            publishing_principles: self._fields.105,
+            recorded_at: self._fields.106,
+            released_event: self._fields.107,
+            review: self._fields.108,
+            reviews: self._fields.109,
+            same_as: self._fields.110,
+            schema_version: self._fields.111,
+            sd_date_published: self._fields.112,
+            sd_license: self._fields.113,
+            sd_publisher: self._fields.114,
+            size: self._fields.115,
+            source_organization: self._fields.116,
+            spatial: self._fields.117,
+            spatial_coverage: self._fields.118,
+            sponsor: self._fields.119,
+            subject_of: self._fields.120,
+            subtitle_language: self._fields.121,
+            teaches: self._fields.122,
+            temporal: self._fields.123,
+            temporal_coverage: self._fields.124,
+            text: self._fields.125,
+            thumbnail: self._fields.126,
+            thumbnail_url: self._fields.127,
+            time_required: self._fields.128,
+            title_eidr: self._fields.129,
+            trailer: self._fields.130,
+            translation_of_work: self._fields.131,
+            translator: self._fields.132,
+            typical_age_range: self._fields.133,
+            url: self._fields.134,
+            usage_info: self._fields.135,
+            version: self._fields.136,
+            video: self._fields.137,
+            word_count: self._fields.138,
+            work_example: self._fields.139,
+            work_translation: self._fields.140,
             extra_data: Default::default(),
         }
     }
@@ -8747,147 +8750,147 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> TvEpisode<'a> {
         TvEpisode {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            actor: self.__unsafe_private_named.11,
-            actors: self.__unsafe_private_named.12,
-            additional_type: self.__unsafe_private_named.13,
-            aggregate_rating: self.__unsafe_private_named.14,
-            alternate_name: self.__unsafe_private_named.15,
-            alternative_headline: self.__unsafe_private_named.16,
-            archived_at: self.__unsafe_private_named.17,
-            assesses: self.__unsafe_private_named.18,
-            associated_media: self.__unsafe_private_named.19,
-            audience: self.__unsafe_private_named.20,
-            audio: self.__unsafe_private_named.21,
-            author: self.__unsafe_private_named.22,
-            award: self.__unsafe_private_named.23,
-            awards: self.__unsafe_private_named.24,
-            character: self.__unsafe_private_named.25,
-            citation: self.__unsafe_private_named.26,
-            comment: self.__unsafe_private_named.27,
-            comment_count: self.__unsafe_private_named.28,
-            conditions_of_access: self.__unsafe_private_named.29,
-            content_location: self.__unsafe_private_named.30,
-            content_rating: self.__unsafe_private_named.31,
-            content_reference_time: self.__unsafe_private_named.32,
-            contributor: self.__unsafe_private_named.33,
-            copyright_holder: self.__unsafe_private_named.34,
-            copyright_notice: self.__unsafe_private_named.35,
-            copyright_year: self.__unsafe_private_named.36,
-            correction: self.__unsafe_private_named.37,
-            country_of_origin: self.__unsafe_private_named.38,
-            creative_work_status: self.__unsafe_private_named.39,
-            creator: self.__unsafe_private_named.40,
-            credit_text: self.__unsafe_private_named.41,
-            date_created: self.__unsafe_private_named.42,
-            date_modified: self.__unsafe_private_named.43,
-            date_published: self.__unsafe_private_named.44,
-            description: self.__unsafe_private_named.45,
-            digital_source_type: self.__unsafe_private_named.46,
-            director: self.__unsafe_private_named.47,
-            directors: self.__unsafe_private_named.48,
-            disambiguating_description: self.__unsafe_private_named.49,
-            discussion_url: self.__unsafe_private_named.50,
-            duration: self.__unsafe_private_named.51,
-            edit_eidr: self.__unsafe_private_named.52,
-            editor: self.__unsafe_private_named.53,
-            educational_alignment: self.__unsafe_private_named.54,
-            educational_level: self.__unsafe_private_named.55,
-            educational_use: self.__unsafe_private_named.56,
-            encoding: self.__unsafe_private_named.57,
-            encoding_format: self.__unsafe_private_named.58,
-            encodings: self.__unsafe_private_named.59,
-            episode_number: self.__unsafe_private_named.60,
-            example_of_work: self.__unsafe_private_named.61,
-            expires: self.__unsafe_private_named.62,
-            file_format: self.__unsafe_private_named.63,
-            funder: self.__unsafe_private_named.64,
-            funding: self.__unsafe_private_named.65,
-            genre: self.__unsafe_private_named.66,
-            has_part: self.__unsafe_private_named.67,
-            headline: self.__unsafe_private_named.68,
-            identifier: self.__unsafe_private_named.69,
-            image: self.__unsafe_private_named.70,
-            in_language: self.__unsafe_private_named.71,
-            interaction_statistic: self.__unsafe_private_named.72,
-            interactivity_type: self.__unsafe_private_named.73,
-            interpreted_as_claim: self.__unsafe_private_named.74,
-            is_accessible_for_free: self.__unsafe_private_named.75,
-            is_based_on: self.__unsafe_private_named.76,
-            is_based_on_url: self.__unsafe_private_named.77,
-            is_family_friendly: self.__unsafe_private_named.78,
-            is_part_of: self.__unsafe_private_named.79,
-            keywords: self.__unsafe_private_named.80,
-            learning_resource_type: self.__unsafe_private_named.81,
-            license: self.__unsafe_private_named.82,
-            location_created: self.__unsafe_private_named.83,
-            main_entity: self.__unsafe_private_named.84,
-            main_entity_of_page: self.__unsafe_private_named.85,
-            maintainer: self.__unsafe_private_named.86,
-            material: self.__unsafe_private_named.87,
-            material_extent: self.__unsafe_private_named.88,
-            mentions: self.__unsafe_private_named.89,
-            music_by: self.__unsafe_private_named.90,
-            name: self.__unsafe_private_named.91,
-            offers: self.__unsafe_private_named.92,
-            part_of_season: self.__unsafe_private_named.93,
-            part_of_series: self.__unsafe_private_named.94,
-            part_of_tv_series: self.__unsafe_private_named.95,
-            pattern: self.__unsafe_private_named.96,
-            position: self.__unsafe_private_named.97,
-            potential_action: self.__unsafe_private_named.98,
-            producer: self.__unsafe_private_named.99,
-            production_company: self.__unsafe_private_named.100,
-            provider: self.__unsafe_private_named.101,
-            publication: self.__unsafe_private_named.102,
-            publisher: self.__unsafe_private_named.103,
-            publisher_imprint: self.__unsafe_private_named.104,
-            publishing_principles: self.__unsafe_private_named.105,
-            recorded_at: self.__unsafe_private_named.106,
-            released_event: self.__unsafe_private_named.107,
-            review: self.__unsafe_private_named.108,
-            reviews: self.__unsafe_private_named.109,
-            same_as: self.__unsafe_private_named.110,
-            schema_version: self.__unsafe_private_named.111,
-            sd_date_published: self.__unsafe_private_named.112,
-            sd_license: self.__unsafe_private_named.113,
-            sd_publisher: self.__unsafe_private_named.114,
-            size: self.__unsafe_private_named.115,
-            source_organization: self.__unsafe_private_named.116,
-            spatial: self.__unsafe_private_named.117,
-            spatial_coverage: self.__unsafe_private_named.118,
-            sponsor: self.__unsafe_private_named.119,
-            subject_of: self.__unsafe_private_named.120,
-            subtitle_language: self.__unsafe_private_named.121,
-            teaches: self.__unsafe_private_named.122,
-            temporal: self.__unsafe_private_named.123,
-            temporal_coverage: self.__unsafe_private_named.124,
-            text: self.__unsafe_private_named.125,
-            thumbnail: self.__unsafe_private_named.126,
-            thumbnail_url: self.__unsafe_private_named.127,
-            time_required: self.__unsafe_private_named.128,
-            title_eidr: self.__unsafe_private_named.129,
-            trailer: self.__unsafe_private_named.130,
-            translation_of_work: self.__unsafe_private_named.131,
-            translator: self.__unsafe_private_named.132,
-            typical_age_range: self.__unsafe_private_named.133,
-            url: self.__unsafe_private_named.134,
-            usage_info: self.__unsafe_private_named.135,
-            version: self.__unsafe_private_named.136,
-            video: self.__unsafe_private_named.137,
-            word_count: self.__unsafe_private_named.138,
-            work_example: self.__unsafe_private_named.139,
-            work_translation: self.__unsafe_private_named.140,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            actor: self._fields.11,
+            actors: self._fields.12,
+            additional_type: self._fields.13,
+            aggregate_rating: self._fields.14,
+            alternate_name: self._fields.15,
+            alternative_headline: self._fields.16,
+            archived_at: self._fields.17,
+            assesses: self._fields.18,
+            associated_media: self._fields.19,
+            audience: self._fields.20,
+            audio: self._fields.21,
+            author: self._fields.22,
+            award: self._fields.23,
+            awards: self._fields.24,
+            character: self._fields.25,
+            citation: self._fields.26,
+            comment: self._fields.27,
+            comment_count: self._fields.28,
+            conditions_of_access: self._fields.29,
+            content_location: self._fields.30,
+            content_rating: self._fields.31,
+            content_reference_time: self._fields.32,
+            contributor: self._fields.33,
+            copyright_holder: self._fields.34,
+            copyright_notice: self._fields.35,
+            copyright_year: self._fields.36,
+            correction: self._fields.37,
+            country_of_origin: self._fields.38,
+            creative_work_status: self._fields.39,
+            creator: self._fields.40,
+            credit_text: self._fields.41,
+            date_created: self._fields.42,
+            date_modified: self._fields.43,
+            date_published: self._fields.44,
+            description: self._fields.45,
+            digital_source_type: self._fields.46,
+            director: self._fields.47,
+            directors: self._fields.48,
+            disambiguating_description: self._fields.49,
+            discussion_url: self._fields.50,
+            duration: self._fields.51,
+            edit_eidr: self._fields.52,
+            editor: self._fields.53,
+            educational_alignment: self._fields.54,
+            educational_level: self._fields.55,
+            educational_use: self._fields.56,
+            encoding: self._fields.57,
+            encoding_format: self._fields.58,
+            encodings: self._fields.59,
+            episode_number: self._fields.60,
+            example_of_work: self._fields.61,
+            expires: self._fields.62,
+            file_format: self._fields.63,
+            funder: self._fields.64,
+            funding: self._fields.65,
+            genre: self._fields.66,
+            has_part: self._fields.67,
+            headline: self._fields.68,
+            identifier: self._fields.69,
+            image: self._fields.70,
+            in_language: self._fields.71,
+            interaction_statistic: self._fields.72,
+            interactivity_type: self._fields.73,
+            interpreted_as_claim: self._fields.74,
+            is_accessible_for_free: self._fields.75,
+            is_based_on: self._fields.76,
+            is_based_on_url: self._fields.77,
+            is_family_friendly: self._fields.78,
+            is_part_of: self._fields.79,
+            keywords: self._fields.80,
+            learning_resource_type: self._fields.81,
+            license: self._fields.82,
+            location_created: self._fields.83,
+            main_entity: self._fields.84,
+            main_entity_of_page: self._fields.85,
+            maintainer: self._fields.86,
+            material: self._fields.87,
+            material_extent: self._fields.88,
+            mentions: self._fields.89,
+            music_by: self._fields.90,
+            name: self._fields.91,
+            offers: self._fields.92,
+            part_of_season: self._fields.93,
+            part_of_series: self._fields.94,
+            part_of_tv_series: self._fields.95,
+            pattern: self._fields.96,
+            position: self._fields.97,
+            potential_action: self._fields.98,
+            producer: self._fields.99,
+            production_company: self._fields.100,
+            provider: self._fields.101,
+            publication: self._fields.102,
+            publisher: self._fields.103,
+            publisher_imprint: self._fields.104,
+            publishing_principles: self._fields.105,
+            recorded_at: self._fields.106,
+            released_event: self._fields.107,
+            review: self._fields.108,
+            reviews: self._fields.109,
+            same_as: self._fields.110,
+            schema_version: self._fields.111,
+            sd_date_published: self._fields.112,
+            sd_license: self._fields.113,
+            sd_publisher: self._fields.114,
+            size: self._fields.115,
+            source_organization: self._fields.116,
+            spatial: self._fields.117,
+            spatial_coverage: self._fields.118,
+            sponsor: self._fields.119,
+            subject_of: self._fields.120,
+            subtitle_language: self._fields.121,
+            teaches: self._fields.122,
+            temporal: self._fields.123,
+            temporal_coverage: self._fields.124,
+            text: self._fields.125,
+            thumbnail: self._fields.126,
+            thumbnail_url: self._fields.127,
+            time_required: self._fields.128,
+            title_eidr: self._fields.129,
+            trailer: self._fields.130,
+            translation_of_work: self._fields.131,
+            translator: self._fields.132,
+            typical_age_range: self._fields.133,
+            url: self._fields.134,
+            usage_info: self._fields.135,
+            version: self._fields.136,
+            video: self._fields.137,
+            word_count: self._fields.138,
+            work_example: self._fields.139,
+            work_translation: self._fields.140,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/tv_season.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/tv_season.rs
index b33383a7..20612e7a 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/tv_season.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/tv_season.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -5917,8 +5920,8 @@ pub mod tv_season_state {
 
 /// Builder for constructing an instance of this type
 pub struct TvSeasonBuilder<'a, S: tv_season_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<TvSeasonAbout<'a>>,
         Option<TvSeasonAbstract<'a>>,
         Option<TvSeasonAccessMode<'a>>,
@@ -6060,7 +6063,7 @@ pub struct TvSeasonBuilder<'a, S: tv_season_state::State> {
         Option<TvSeasonWorkExample<'a>>,
         Option<TvSeasonWorkTranslation<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TvSeason<'a> {
@@ -6074,8 +6077,8 @@ impl<'a> TvSeasonBuilder<'a, tv_season_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TvSeasonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -6217,7 +6220,7 @@ impl<'a> TvSeasonBuilder<'a, tv_season_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6225,12 +6228,12 @@ impl<'a> TvSeasonBuilder<'a, tv_season_state::Empty> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `about` field (optional)
     pub fn about(mut self, value: impl Into<Option<TvSeasonAbout<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `about` field to an Option value (optional)
     pub fn maybe_about(mut self, value: Option<TvSeasonAbout<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -6238,12 +6241,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `abstract` field (optional)
     pub fn r#abstract(mut self, value: impl Into<Option<TvSeasonAbstract<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `abstract` field to an Option value (optional)
     pub fn maybe_abstract(mut self, value: Option<TvSeasonAbstract<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -6254,12 +6257,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonAccessMode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `accessMode` field to an Option value (optional)
     pub fn maybe_access_mode(mut self, value: Option<TvSeasonAccessMode<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -6270,7 +6273,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonAccessModeSufficient<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `accessModeSufficient` field to an Option value (optional)
@@ -6278,7 +6281,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonAccessModeSufficient<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -6289,7 +6292,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonAccessibilityApi<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `accessibilityAPI` field to an Option value (optional)
@@ -6297,7 +6300,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonAccessibilityApi<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -6308,7 +6311,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonAccessibilityControl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `accessibilityControl` field to an Option value (optional)
@@ -6316,7 +6319,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonAccessibilityControl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -6327,7 +6330,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonAccessibilityFeature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `accessibilityFeature` field to an Option value (optional)
@@ -6335,7 +6338,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonAccessibilityFeature<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -6346,7 +6349,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonAccessibilityHazard<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `accessibilityHazard` field to an Option value (optional)
@@ -6354,7 +6357,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonAccessibilityHazard<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -6365,7 +6368,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonAccessibilitySummary<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `accessibilitySummary` field to an Option value (optional)
@@ -6373,7 +6376,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonAccessibilitySummary<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -6384,7 +6387,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonAccountablePerson<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `accountablePerson` field to an Option value (optional)
@@ -6392,7 +6395,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonAccountablePerson<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -6403,7 +6406,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonAcquireLicensePage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `acquireLicensePage` field to an Option value (optional)
@@ -6411,7 +6414,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonAcquireLicensePage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -6419,12 +6422,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `actor` field (optional)
     pub fn actor(mut self, value: impl Into<Option<TvSeasonActor<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `actor` field to an Option value (optional)
     pub fn maybe_actor(mut self, value: Option<TvSeasonActor<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -6435,7 +6438,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -6443,7 +6446,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -6454,7 +6457,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -6462,7 +6465,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -6473,7 +6476,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -6481,7 +6484,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -6492,7 +6495,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonAlternativeHeadline<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `alternativeHeadline` field to an Option value (optional)
@@ -6500,7 +6503,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonAlternativeHeadline<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -6511,12 +6514,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonArchivedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `archivedAt` field to an Option value (optional)
     pub fn maybe_archived_at(mut self, value: Option<TvSeasonArchivedAt<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -6524,12 +6527,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `assesses` field (optional)
     pub fn assesses(mut self, value: impl Into<Option<TvSeasonAssesses<'a>>>) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `assesses` field to an Option value (optional)
     pub fn maybe_assesses(mut self, value: Option<TvSeasonAssesses<'a>>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -6540,7 +6543,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonAssociatedMedia<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `associatedMedia` field to an Option value (optional)
@@ -6548,7 +6551,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonAssociatedMedia<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -6556,12 +6559,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `audience` field (optional)
     pub fn audience(mut self, value: impl Into<Option<TvSeasonAudience<'a>>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `audience` field to an Option value (optional)
     pub fn maybe_audience(mut self, value: Option<TvSeasonAudience<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -6569,12 +6572,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `audio` field (optional)
     pub fn audio(mut self, value: impl Into<Option<TvSeasonAudio<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `audio` field to an Option value (optional)
     pub fn maybe_audio(mut self, value: Option<TvSeasonAudio<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -6582,12 +6585,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<TvSeasonAuthor<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<TvSeasonAuthor<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -6595,12 +6598,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<TvSeasonAward<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<TvSeasonAward<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -6608,12 +6611,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<TvSeasonAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<TvSeasonAwards<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -6621,12 +6624,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `character` field (optional)
     pub fn character(mut self, value: impl Into<Option<TvSeasonCharacter<'a>>>) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `character` field to an Option value (optional)
     pub fn maybe_character(mut self, value: Option<TvSeasonCharacter<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -6634,12 +6637,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `citation` field (optional)
     pub fn citation(mut self, value: impl Into<Option<TvSeasonCitation<'a>>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `citation` field to an Option value (optional)
     pub fn maybe_citation(mut self, value: Option<TvSeasonCitation<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -6647,12 +6650,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<TvSeasonComment<'a>>>) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<TvSeasonComment<'a>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -6663,7 +6666,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonCommentCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `commentCount` field to an Option value (optional)
@@ -6671,7 +6674,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonCommentCount<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -6682,7 +6685,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonConditionsOfAccess<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `conditionsOfAccess` field to an Option value (optional)
@@ -6690,7 +6693,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonConditionsOfAccess<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -6701,7 +6704,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonContentLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `contentLocation` field to an Option value (optional)
@@ -6709,7 +6712,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonContentLocation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -6720,7 +6723,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonContentRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `contentRating` field to an Option value (optional)
@@ -6728,7 +6731,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonContentRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -6739,7 +6742,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonContentReferenceTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `contentReferenceTime` field to an Option value (optional)
@@ -6747,7 +6750,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonContentReferenceTime<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -6758,12 +6761,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonContributor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `contributor` field to an Option value (optional)
     pub fn maybe_contributor(mut self, value: Option<TvSeasonContributor<'a>>) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -6774,7 +6777,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonCopyrightHolder<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `copyrightHolder` field to an Option value (optional)
@@ -6782,7 +6785,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonCopyrightHolder<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -6793,7 +6796,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonCopyrightNotice<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `copyrightNotice` field to an Option value (optional)
@@ -6801,7 +6804,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonCopyrightNotice<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -6812,7 +6815,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonCopyrightYear<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `copyrightYear` field to an Option value (optional)
@@ -6820,7 +6823,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonCopyrightYear<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -6831,12 +6834,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonCorrection<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `correction` field to an Option value (optional)
     pub fn maybe_correction(mut self, value: Option<TvSeasonCorrection<'a>>) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -6847,7 +6850,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonCountryOfOrigin<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `countryOfOrigin` field to an Option value (optional)
@@ -6855,7 +6858,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonCountryOfOrigin<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -6866,7 +6869,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonCreativeWorkStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `creativeWorkStatus` field to an Option value (optional)
@@ -6874,7 +6877,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonCreativeWorkStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -6882,12 +6885,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `creator` field (optional)
     pub fn creator(mut self, value: impl Into<Option<TvSeasonCreator<'a>>>) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `creator` field to an Option value (optional)
     pub fn maybe_creator(mut self, value: Option<TvSeasonCreator<'a>>) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -6898,12 +6901,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonCreditText<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `creditText` field to an Option value (optional)
     pub fn maybe_credit_text(mut self, value: Option<TvSeasonCreditText<'a>>) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -6914,12 +6917,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonDateCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `dateCreated` field to an Option value (optional)
     pub fn maybe_date_created(mut self, value: Option<TvSeasonDateCreated<'a>>) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -6930,7 +6933,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonDateModified<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `dateModified` field to an Option value (optional)
@@ -6938,7 +6941,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonDateModified<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -6949,7 +6952,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `datePublished` field to an Option value (optional)
@@ -6957,7 +6960,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -6968,12 +6971,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<TvSeasonDescription<'a>>) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -6984,7 +6987,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonDigitalSourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `digitalSourceType` field to an Option value (optional)
@@ -6992,7 +6995,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonDigitalSourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -7000,12 +7003,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `director` field (optional)
     pub fn director(mut self, value: impl Into<Option<TvSeasonDirector<'a>>>) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `director` field to an Option value (optional)
     pub fn maybe_director(mut self, value: Option<TvSeasonDirector<'a>>) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -7016,7 +7019,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -7024,7 +7027,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -7035,7 +7038,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonDiscussionUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `discussionUrl` field to an Option value (optional)
@@ -7043,7 +7046,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonDiscussionUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -7051,12 +7054,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `editEIDR` field (optional)
     pub fn edit_eidr(mut self, value: impl Into<Option<TvSeasonEditEidr<'a>>>) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `editEIDR` field to an Option value (optional)
     pub fn maybe_edit_eidr(mut self, value: Option<TvSeasonEditEidr<'a>>) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -7064,12 +7067,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `editor` field (optional)
     pub fn editor(mut self, value: impl Into<Option<TvSeasonEditor<'a>>>) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `editor` field to an Option value (optional)
     pub fn maybe_editor(mut self, value: Option<TvSeasonEditor<'a>>) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -7080,7 +7083,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonEducationalAlignment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `educationalAlignment` field to an Option value (optional)
@@ -7088,7 +7091,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonEducationalAlignment<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -7099,7 +7102,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonEducationalLevel<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `educationalLevel` field to an Option value (optional)
@@ -7107,7 +7110,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonEducationalLevel<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -7118,7 +7121,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonEducationalUse<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `educationalUse` field to an Option value (optional)
@@ -7126,7 +7129,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonEducationalUse<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -7134,12 +7137,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `encoding` field (optional)
     pub fn encoding(mut self, value: impl Into<Option<TvSeasonEncoding<'a>>>) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `encoding` field to an Option value (optional)
     pub fn maybe_encoding(mut self, value: Option<TvSeasonEncoding<'a>>) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -7150,7 +7153,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonEncodingFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `encodingFormat` field to an Option value (optional)
@@ -7158,7 +7161,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonEncodingFormat<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -7166,12 +7169,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `encodings` field (optional)
     pub fn encodings(mut self, value: impl Into<Option<TvSeasonEncodings<'a>>>) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `encodings` field to an Option value (optional)
     pub fn maybe_encodings(mut self, value: Option<TvSeasonEncodings<'a>>) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -7179,12 +7182,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `endDate` field (optional)
     pub fn end_date(mut self, value: impl Into<Option<TvSeasonEndDate<'a>>>) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `endDate` field to an Option value (optional)
     pub fn maybe_end_date(mut self, value: Option<TvSeasonEndDate<'a>>) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -7192,12 +7195,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `episode` field (optional)
     pub fn episode(mut self, value: impl Into<Option<TvSeasonEpisode<'a>>>) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `episode` field to an Option value (optional)
     pub fn maybe_episode(mut self, value: Option<TvSeasonEpisode<'a>>) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -7205,12 +7208,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `episodes` field (optional)
     pub fn episodes(mut self, value: impl Into<Option<TvSeasonEpisodes<'a>>>) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `episodes` field to an Option value (optional)
     pub fn maybe_episodes(mut self, value: Option<TvSeasonEpisodes<'a>>) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -7221,7 +7224,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonExampleOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `exampleOfWork` field to an Option value (optional)
@@ -7229,7 +7232,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonExampleOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -7237,12 +7240,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `expires` field (optional)
     pub fn expires(mut self, value: impl Into<Option<TvSeasonExpires<'a>>>) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `expires` field to an Option value (optional)
     pub fn maybe_expires(mut self, value: Option<TvSeasonExpires<'a>>) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -7253,12 +7256,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonFileFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `fileFormat` field to an Option value (optional)
     pub fn maybe_file_format(mut self, value: Option<TvSeasonFileFormat<'a>>) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -7266,12 +7269,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<TvSeasonFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<TvSeasonFunder<'a>>) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -7279,12 +7282,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<TvSeasonFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<TvSeasonFunding<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -7292,12 +7295,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<TvSeasonGenre<'a>>>) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<TvSeasonGenre<'a>>) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -7305,12 +7308,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `hasPart` field (optional)
     pub fn has_part(mut self, value: impl Into<Option<TvSeasonHasPart<'a>>>) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `hasPart` field to an Option value (optional)
     pub fn maybe_has_part(mut self, value: Option<TvSeasonHasPart<'a>>) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -7318,12 +7321,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `headline` field (optional)
     pub fn headline(mut self, value: impl Into<Option<TvSeasonHeadline<'a>>>) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `headline` field to an Option value (optional)
     pub fn maybe_headline(mut self, value: Option<TvSeasonHeadline<'a>>) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -7334,12 +7337,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonIdentifier<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<TvSeasonIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -7347,12 +7350,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<TvSeasonImage<'a>>>) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<TvSeasonImage<'a>>) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -7363,12 +7366,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonInLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `inLanguage` field to an Option value (optional)
     pub fn maybe_in_language(mut self, value: Option<TvSeasonInLanguage<'a>>) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -7379,7 +7382,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -7387,7 +7390,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -7398,7 +7401,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonInteractivityType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `interactivityType` field to an Option value (optional)
@@ -7406,7 +7409,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonInteractivityType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -7417,7 +7420,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonInterpretedAsClaim<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `interpretedAsClaim` field to an Option value (optional)
@@ -7425,7 +7428,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonInterpretedAsClaim<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -7436,7 +7439,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonIsAccessibleForFree<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `isAccessibleForFree` field to an Option value (optional)
@@ -7444,7 +7447,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonIsAccessibleForFree<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -7455,12 +7458,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonIsBasedOn<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `isBasedOn` field to an Option value (optional)
     pub fn maybe_is_based_on(mut self, value: Option<TvSeasonIsBasedOn<'a>>) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -7471,7 +7474,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonIsBasedOnUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `isBasedOnUrl` field to an Option value (optional)
@@ -7479,7 +7482,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonIsBasedOnUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -7490,7 +7493,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonIsFamilyFriendly<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `isFamilyFriendly` field to an Option value (optional)
@@ -7498,7 +7501,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonIsFamilyFriendly<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -7506,12 +7509,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `isPartOf` field (optional)
     pub fn is_part_of(mut self, value: impl Into<Option<TvSeasonIsPartOf<'a>>>) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `isPartOf` field to an Option value (optional)
     pub fn maybe_is_part_of(mut self, value: Option<TvSeasonIsPartOf<'a>>) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -7519,12 +7522,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<TvSeasonKeywords<'a>>>) -> Self {
-        self.__unsafe_private_named.79 = value.into();
+        self._fields.79 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<TvSeasonKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.79 = value;
+        self._fields.79 = value;
         self
     }
 }
@@ -7535,7 +7538,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonLearningResourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value.into();
+        self._fields.80 = value.into();
         self
     }
     /// Set the `learningResourceType` field to an Option value (optional)
@@ -7543,7 +7546,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonLearningResourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value;
+        self._fields.80 = value;
         self
     }
 }
@@ -7551,12 +7554,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `license` field (optional)
     pub fn license(mut self, value: impl Into<Option<TvSeasonLicense<'a>>>) -> Self {
-        self.__unsafe_private_named.81 = value.into();
+        self._fields.81 = value.into();
         self
     }
     /// Set the `license` field to an Option value (optional)
     pub fn maybe_license(mut self, value: Option<TvSeasonLicense<'a>>) -> Self {
-        self.__unsafe_private_named.81 = value;
+        self._fields.81 = value;
         self
     }
 }
@@ -7567,7 +7570,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonLocationCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value.into();
+        self._fields.82 = value.into();
         self
     }
     /// Set the `locationCreated` field to an Option value (optional)
@@ -7575,7 +7578,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonLocationCreated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.82 = value;
+        self._fields.82 = value;
         self
     }
 }
@@ -7586,12 +7589,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonMainEntity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.83 = value.into();
+        self._fields.83 = value.into();
         self
     }
     /// Set the `mainEntity` field to an Option value (optional)
     pub fn maybe_main_entity(mut self, value: Option<TvSeasonMainEntity<'a>>) -> Self {
-        self.__unsafe_private_named.83 = value;
+        self._fields.83 = value;
         self
     }
 }
@@ -7602,7 +7605,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value.into();
+        self._fields.84 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -7610,7 +7613,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value;
+        self._fields.84 = value;
         self
     }
 }
@@ -7621,12 +7624,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonMaintainer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.85 = value.into();
+        self._fields.85 = value.into();
         self
     }
     /// Set the `maintainer` field to an Option value (optional)
     pub fn maybe_maintainer(mut self, value: Option<TvSeasonMaintainer<'a>>) -> Self {
-        self.__unsafe_private_named.85 = value;
+        self._fields.85 = value;
         self
     }
 }
@@ -7634,12 +7637,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `material` field (optional)
     pub fn material(mut self, value: impl Into<Option<TvSeasonMaterial<'a>>>) -> Self {
-        self.__unsafe_private_named.86 = value.into();
+        self._fields.86 = value.into();
         self
     }
     /// Set the `material` field to an Option value (optional)
     pub fn maybe_material(mut self, value: Option<TvSeasonMaterial<'a>>) -> Self {
-        self.__unsafe_private_named.86 = value;
+        self._fields.86 = value;
         self
     }
 }
@@ -7650,7 +7653,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonMaterialExtent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.87 = value.into();
+        self._fields.87 = value.into();
         self
     }
     /// Set the `materialExtent` field to an Option value (optional)
@@ -7658,7 +7661,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonMaterialExtent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.87 = value;
+        self._fields.87 = value;
         self
     }
 }
@@ -7666,12 +7669,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `mentions` field (optional)
     pub fn mentions(mut self, value: impl Into<Option<TvSeasonMentions<'a>>>) -> Self {
-        self.__unsafe_private_named.88 = value.into();
+        self._fields.88 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<TvSeasonMentions<'a>>) -> Self {
-        self.__unsafe_private_named.88 = value;
+        self._fields.88 = value;
         self
     }
 }
@@ -7679,12 +7682,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<TvSeasonName<'a>>>) -> Self {
-        self.__unsafe_private_named.89 = value.into();
+        self._fields.89 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<TvSeasonName<'a>>) -> Self {
-        self.__unsafe_private_named.89 = value;
+        self._fields.89 = value;
         self
     }
 }
@@ -7695,7 +7698,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonNumberOfEpisodes<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.90 = value.into();
+        self._fields.90 = value.into();
         self
     }
     /// Set the `numberOfEpisodes` field to an Option value (optional)
@@ -7703,7 +7706,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonNumberOfEpisodes<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.90 = value;
+        self._fields.90 = value;
         self
     }
 }
@@ -7711,12 +7714,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `offers` field (optional)
     pub fn offers(mut self, value: impl Into<Option<TvSeasonOffers<'a>>>) -> Self {
-        self.__unsafe_private_named.91 = value.into();
+        self._fields.91 = value.into();
         self
     }
     /// Set the `offers` field to an Option value (optional)
     pub fn maybe_offers(mut self, value: Option<TvSeasonOffers<'a>>) -> Self {
-        self.__unsafe_private_named.91 = value;
+        self._fields.91 = value;
         self
     }
 }
@@ -7727,7 +7730,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonPartOfSeries<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.92 = value.into();
+        self._fields.92 = value.into();
         self
     }
     /// Set the `partOfSeries` field to an Option value (optional)
@@ -7735,7 +7738,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonPartOfSeries<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.92 = value;
+        self._fields.92 = value;
         self
     }
 }
@@ -7746,7 +7749,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonPartOfTvSeries<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.93 = value.into();
+        self._fields.93 = value.into();
         self
     }
     /// Set the `partOfTVSeries` field to an Option value (optional)
@@ -7754,7 +7757,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonPartOfTvSeries<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.93 = value;
+        self._fields.93 = value;
         self
     }
 }
@@ -7762,12 +7765,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `pattern` field (optional)
     pub fn pattern(mut self, value: impl Into<Option<TvSeasonPattern<'a>>>) -> Self {
-        self.__unsafe_private_named.94 = value.into();
+        self._fields.94 = value.into();
         self
     }
     /// Set the `pattern` field to an Option value (optional)
     pub fn maybe_pattern(mut self, value: Option<TvSeasonPattern<'a>>) -> Self {
-        self.__unsafe_private_named.94 = value;
+        self._fields.94 = value;
         self
     }
 }
@@ -7775,12 +7778,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `position` field (optional)
     pub fn position(mut self, value: impl Into<Option<TvSeasonPosition<'a>>>) -> Self {
-        self.__unsafe_private_named.95 = value.into();
+        self._fields.95 = value.into();
         self
     }
     /// Set the `position` field to an Option value (optional)
     pub fn maybe_position(mut self, value: Option<TvSeasonPosition<'a>>) -> Self {
-        self.__unsafe_private_named.95 = value;
+        self._fields.95 = value;
         self
     }
 }
@@ -7791,7 +7794,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonPotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.96 = value.into();
+        self._fields.96 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -7799,7 +7802,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonPotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.96 = value;
+        self._fields.96 = value;
         self
     }
 }
@@ -7807,12 +7810,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `producer` field (optional)
     pub fn producer(mut self, value: impl Into<Option<TvSeasonProducer<'a>>>) -> Self {
-        self.__unsafe_private_named.97 = value.into();
+        self._fields.97 = value.into();
         self
     }
     /// Set the `producer` field to an Option value (optional)
     pub fn maybe_producer(mut self, value: Option<TvSeasonProducer<'a>>) -> Self {
-        self.__unsafe_private_named.97 = value;
+        self._fields.97 = value;
         self
     }
 }
@@ -7823,7 +7826,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonProductionCompany<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value.into();
+        self._fields.98 = value.into();
         self
     }
     /// Set the `productionCompany` field to an Option value (optional)
@@ -7831,7 +7834,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonProductionCompany<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.98 = value;
+        self._fields.98 = value;
         self
     }
 }
@@ -7839,12 +7842,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `provider` field (optional)
     pub fn provider(mut self, value: impl Into<Option<TvSeasonProvider<'a>>>) -> Self {
-        self.__unsafe_private_named.99 = value.into();
+        self._fields.99 = value.into();
         self
     }
     /// Set the `provider` field to an Option value (optional)
     pub fn maybe_provider(mut self, value: Option<TvSeasonProvider<'a>>) -> Self {
-        self.__unsafe_private_named.99 = value;
+        self._fields.99 = value;
         self
     }
 }
@@ -7855,12 +7858,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonPublication<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value.into();
+        self._fields.100 = value.into();
         self
     }
     /// Set the `publication` field to an Option value (optional)
     pub fn maybe_publication(mut self, value: Option<TvSeasonPublication<'a>>) -> Self {
-        self.__unsafe_private_named.100 = value;
+        self._fields.100 = value;
         self
     }
 }
@@ -7868,12 +7871,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `publisher` field (optional)
     pub fn publisher(mut self, value: impl Into<Option<TvSeasonPublisher<'a>>>) -> Self {
-        self.__unsafe_private_named.101 = value.into();
+        self._fields.101 = value.into();
         self
     }
     /// Set the `publisher` field to an Option value (optional)
     pub fn maybe_publisher(mut self, value: Option<TvSeasonPublisher<'a>>) -> Self {
-        self.__unsafe_private_named.101 = value;
+        self._fields.101 = value;
         self
     }
 }
@@ -7884,7 +7887,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonPublisherImprint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value.into();
+        self._fields.102 = value.into();
         self
     }
     /// Set the `publisherImprint` field to an Option value (optional)
@@ -7892,7 +7895,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonPublisherImprint<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value;
+        self._fields.102 = value;
         self
     }
 }
@@ -7903,7 +7906,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonPublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.103 = value.into();
+        self._fields.103 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -7911,7 +7914,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonPublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.103 = value;
+        self._fields.103 = value;
         self
     }
 }
@@ -7922,12 +7925,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonRecordedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value.into();
+        self._fields.104 = value.into();
         self
     }
     /// Set the `recordedAt` field to an Option value (optional)
     pub fn maybe_recorded_at(mut self, value: Option<TvSeasonRecordedAt<'a>>) -> Self {
-        self.__unsafe_private_named.104 = value;
+        self._fields.104 = value;
         self
     }
 }
@@ -7938,7 +7941,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonReleasedEvent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.105 = value.into();
+        self._fields.105 = value.into();
         self
     }
     /// Set the `releasedEvent` field to an Option value (optional)
@@ -7946,7 +7949,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonReleasedEvent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.105 = value;
+        self._fields.105 = value;
         self
     }
 }
@@ -7954,12 +7957,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<TvSeasonReview<'a>>>) -> Self {
-        self.__unsafe_private_named.106 = value.into();
+        self._fields.106 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<TvSeasonReview<'a>>) -> Self {
-        self.__unsafe_private_named.106 = value;
+        self._fields.106 = value;
         self
     }
 }
@@ -7967,12 +7970,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `reviews` field (optional)
     pub fn reviews(mut self, value: impl Into<Option<TvSeasonReviews<'a>>>) -> Self {
-        self.__unsafe_private_named.107 = value.into();
+        self._fields.107 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<TvSeasonReviews<'a>>) -> Self {
-        self.__unsafe_private_named.107 = value;
+        self._fields.107 = value;
         self
     }
 }
@@ -7980,12 +7983,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<TvSeasonSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.108 = value.into();
+        self._fields.108 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<TvSeasonSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.108 = value;
+        self._fields.108 = value;
         self
     }
 }
@@ -7996,7 +7999,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonSchemaVersion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.109 = value.into();
+        self._fields.109 = value.into();
         self
     }
     /// Set the `schemaVersion` field to an Option value (optional)
@@ -8004,7 +8007,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonSchemaVersion<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.109 = value;
+        self._fields.109 = value;
         self
     }
 }
@@ -8015,7 +8018,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonSdDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.110 = value.into();
+        self._fields.110 = value.into();
         self
     }
     /// Set the `sdDatePublished` field to an Option value (optional)
@@ -8023,7 +8026,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonSdDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.110 = value;
+        self._fields.110 = value;
         self
     }
 }
@@ -8034,12 +8037,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonSdLicense<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.111 = value.into();
+        self._fields.111 = value.into();
         self
     }
     /// Set the `sdLicense` field to an Option value (optional)
     pub fn maybe_sd_license(mut self, value: Option<TvSeasonSdLicense<'a>>) -> Self {
-        self.__unsafe_private_named.111 = value;
+        self._fields.111 = value;
         self
     }
 }
@@ -8050,12 +8053,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonSdPublisher<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.112 = value.into();
+        self._fields.112 = value.into();
         self
     }
     /// Set the `sdPublisher` field to an Option value (optional)
     pub fn maybe_sd_publisher(mut self, value: Option<TvSeasonSdPublisher<'a>>) -> Self {
-        self.__unsafe_private_named.112 = value;
+        self._fields.112 = value;
         self
     }
 }
@@ -8066,7 +8069,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonSeasonNumber<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value.into();
+        self._fields.113 = value.into();
         self
     }
     /// Set the `seasonNumber` field to an Option value (optional)
@@ -8074,7 +8077,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonSeasonNumber<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value;
+        self._fields.113 = value;
         self
     }
 }
@@ -8082,12 +8085,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<TvSeasonSize<'a>>>) -> Self {
-        self.__unsafe_private_named.114 = value.into();
+        self._fields.114 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<TvSeasonSize<'a>>) -> Self {
-        self.__unsafe_private_named.114 = value;
+        self._fields.114 = value;
         self
     }
 }
@@ -8098,7 +8101,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonSourceOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.115 = value.into();
+        self._fields.115 = value.into();
         self
     }
     /// Set the `sourceOrganization` field to an Option value (optional)
@@ -8106,7 +8109,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonSourceOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.115 = value;
+        self._fields.115 = value;
         self
     }
 }
@@ -8114,12 +8117,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `spatial` field (optional)
     pub fn spatial(mut self, value: impl Into<Option<TvSeasonSpatial<'a>>>) -> Self {
-        self.__unsafe_private_named.116 = value.into();
+        self._fields.116 = value.into();
         self
     }
     /// Set the `spatial` field to an Option value (optional)
     pub fn maybe_spatial(mut self, value: Option<TvSeasonSpatial<'a>>) -> Self {
-        self.__unsafe_private_named.116 = value;
+        self._fields.116 = value;
         self
     }
 }
@@ -8130,7 +8133,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonSpatialCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.117 = value.into();
+        self._fields.117 = value.into();
         self
     }
     /// Set the `spatialCoverage` field to an Option value (optional)
@@ -8138,7 +8141,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonSpatialCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.117 = value;
+        self._fields.117 = value;
         self
     }
 }
@@ -8146,12 +8149,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `sponsor` field (optional)
     pub fn sponsor(mut self, value: impl Into<Option<TvSeasonSponsor<'a>>>) -> Self {
-        self.__unsafe_private_named.118 = value.into();
+        self._fields.118 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<TvSeasonSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.118 = value;
+        self._fields.118 = value;
         self
     }
 }
@@ -8162,12 +8165,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonStartDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.119 = value.into();
+        self._fields.119 = value.into();
         self
     }
     /// Set the `startDate` field to an Option value (optional)
     pub fn maybe_start_date(mut self, value: Option<TvSeasonStartDate<'a>>) -> Self {
-        self.__unsafe_private_named.119 = value;
+        self._fields.119 = value;
         self
     }
 }
@@ -8178,12 +8181,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonSubjectOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.120 = value.into();
+        self._fields.120 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<TvSeasonSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.120 = value;
+        self._fields.120 = value;
         self
     }
 }
@@ -8191,12 +8194,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `teaches` field (optional)
     pub fn teaches(mut self, value: impl Into<Option<TvSeasonTeaches<'a>>>) -> Self {
-        self.__unsafe_private_named.121 = value.into();
+        self._fields.121 = value.into();
         self
     }
     /// Set the `teaches` field to an Option value (optional)
     pub fn maybe_teaches(mut self, value: Option<TvSeasonTeaches<'a>>) -> Self {
-        self.__unsafe_private_named.121 = value;
+        self._fields.121 = value;
         self
     }
 }
@@ -8204,12 +8207,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `temporal` field (optional)
     pub fn temporal(mut self, value: impl Into<Option<TvSeasonTemporal<'a>>>) -> Self {
-        self.__unsafe_private_named.122 = value.into();
+        self._fields.122 = value.into();
         self
     }
     /// Set the `temporal` field to an Option value (optional)
     pub fn maybe_temporal(mut self, value: Option<TvSeasonTemporal<'a>>) -> Self {
-        self.__unsafe_private_named.122 = value;
+        self._fields.122 = value;
         self
     }
 }
@@ -8220,7 +8223,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonTemporalCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.123 = value.into();
+        self._fields.123 = value.into();
         self
     }
     /// Set the `temporalCoverage` field to an Option value (optional)
@@ -8228,7 +8231,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonTemporalCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.123 = value;
+        self._fields.123 = value;
         self
     }
 }
@@ -8236,12 +8239,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<TvSeasonText<'a>>>) -> Self {
-        self.__unsafe_private_named.124 = value.into();
+        self._fields.124 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<TvSeasonText<'a>>) -> Self {
-        self.__unsafe_private_named.124 = value;
+        self._fields.124 = value;
         self
     }
 }
@@ -8249,12 +8252,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `thumbnail` field (optional)
     pub fn thumbnail(mut self, value: impl Into<Option<TvSeasonThumbnail<'a>>>) -> Self {
-        self.__unsafe_private_named.125 = value.into();
+        self._fields.125 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<TvSeasonThumbnail<'a>>) -> Self {
-        self.__unsafe_private_named.125 = value;
+        self._fields.125 = value;
         self
     }
 }
@@ -8265,7 +8268,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonThumbnailUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.126 = value.into();
+        self._fields.126 = value.into();
         self
     }
     /// Set the `thumbnailUrl` field to an Option value (optional)
@@ -8273,7 +8276,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonThumbnailUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.126 = value;
+        self._fields.126 = value;
         self
     }
 }
@@ -8284,7 +8287,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonTimeRequired<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.127 = value.into();
+        self._fields.127 = value.into();
         self
     }
     /// Set the `timeRequired` field to an Option value (optional)
@@ -8292,7 +8295,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonTimeRequired<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.127 = value;
+        self._fields.127 = value;
         self
     }
 }
@@ -8303,12 +8306,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonTitleEidr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.128 = value.into();
+        self._fields.128 = value.into();
         self
     }
     /// Set the `titleEIDR` field to an Option value (optional)
     pub fn maybe_title_eidr(mut self, value: Option<TvSeasonTitleEidr<'a>>) -> Self {
-        self.__unsafe_private_named.128 = value;
+        self._fields.128 = value;
         self
     }
 }
@@ -8316,12 +8319,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `trailer` field (optional)
     pub fn trailer(mut self, value: impl Into<Option<TvSeasonTrailer<'a>>>) -> Self {
-        self.__unsafe_private_named.129 = value.into();
+        self._fields.129 = value.into();
         self
     }
     /// Set the `trailer` field to an Option value (optional)
     pub fn maybe_trailer(mut self, value: Option<TvSeasonTrailer<'a>>) -> Self {
-        self.__unsafe_private_named.129 = value;
+        self._fields.129 = value;
         self
     }
 }
@@ -8332,7 +8335,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonTranslationOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.130 = value.into();
+        self._fields.130 = value.into();
         self
     }
     /// Set the `translationOfWork` field to an Option value (optional)
@@ -8340,7 +8343,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonTranslationOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.130 = value;
+        self._fields.130 = value;
         self
     }
 }
@@ -8351,12 +8354,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonTranslator<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.131 = value.into();
+        self._fields.131 = value.into();
         self
     }
     /// Set the `translator` field to an Option value (optional)
     pub fn maybe_translator(mut self, value: Option<TvSeasonTranslator<'a>>) -> Self {
-        self.__unsafe_private_named.131 = value;
+        self._fields.131 = value;
         self
     }
 }
@@ -8367,7 +8370,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonTypicalAgeRange<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.132 = value.into();
+        self._fields.132 = value.into();
         self
     }
     /// Set the `typicalAgeRange` field to an Option value (optional)
@@ -8375,7 +8378,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonTypicalAgeRange<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.132 = value;
+        self._fields.132 = value;
         self
     }
 }
@@ -8383,12 +8386,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<TvSeasonUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.133 = value.into();
+        self._fields.133 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<TvSeasonUrl<'a>>) -> Self {
-        self.__unsafe_private_named.133 = value;
+        self._fields.133 = value;
         self
     }
 }
@@ -8399,12 +8402,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonUsageInfo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.134 = value.into();
+        self._fields.134 = value.into();
         self
     }
     /// Set the `usageInfo` field to an Option value (optional)
     pub fn maybe_usage_info(mut self, value: Option<TvSeasonUsageInfo<'a>>) -> Self {
-        self.__unsafe_private_named.134 = value;
+        self._fields.134 = value;
         self
     }
 }
@@ -8412,12 +8415,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `version` field (optional)
     pub fn version(mut self, value: impl Into<Option<TvSeasonVersion<'a>>>) -> Self {
-        self.__unsafe_private_named.135 = value.into();
+        self._fields.135 = value.into();
         self
     }
     /// Set the `version` field to an Option value (optional)
     pub fn maybe_version(mut self, value: Option<TvSeasonVersion<'a>>) -> Self {
-        self.__unsafe_private_named.135 = value;
+        self._fields.135 = value;
         self
     }
 }
@@ -8425,12 +8428,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
 impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
     /// Set the `video` field (optional)
     pub fn video(mut self, value: impl Into<Option<TvSeasonVideo<'a>>>) -> Self {
-        self.__unsafe_private_named.136 = value.into();
+        self._fields.136 = value.into();
         self
     }
     /// Set the `video` field to an Option value (optional)
     pub fn maybe_video(mut self, value: Option<TvSeasonVideo<'a>>) -> Self {
-        self.__unsafe_private_named.136 = value;
+        self._fields.136 = value;
         self
     }
 }
@@ -8441,12 +8444,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonWordCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.137 = value.into();
+        self._fields.137 = value.into();
         self
     }
     /// Set the `wordCount` field to an Option value (optional)
     pub fn maybe_word_count(mut self, value: Option<TvSeasonWordCount<'a>>) -> Self {
-        self.__unsafe_private_named.137 = value;
+        self._fields.137 = value;
         self
     }
 }
@@ -8457,12 +8460,12 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonWorkExample<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.138 = value.into();
+        self._fields.138 = value.into();
         self
     }
     /// Set the `workExample` field to an Option value (optional)
     pub fn maybe_work_example(mut self, value: Option<TvSeasonWorkExample<'a>>) -> Self {
-        self.__unsafe_private_named.138 = value;
+        self._fields.138 = value;
         self
     }
 }
@@ -8473,7 +8476,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeasonWorkTranslation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.139 = value.into();
+        self._fields.139 = value.into();
         self
     }
     /// Set the `workTranslation` field to an Option value (optional)
@@ -8481,7 +8484,7 @@ impl<'a, S: tv_season_state::State> TvSeasonBuilder<'a, S> {
         mut self,
         value: Option<TvSeasonWorkTranslation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.139 = value;
+        self._fields.139 = value;
         self
     }
 }
@@ -8493,146 +8496,146 @@ where
     /// Build the final struct
     pub fn build(self) -> TvSeason<'a> {
         TvSeason {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            actor: self.__unsafe_private_named.11,
-            additional_type: self.__unsafe_private_named.12,
-            aggregate_rating: self.__unsafe_private_named.13,
-            alternate_name: self.__unsafe_private_named.14,
-            alternative_headline: self.__unsafe_private_named.15,
-            archived_at: self.__unsafe_private_named.16,
-            assesses: self.__unsafe_private_named.17,
-            associated_media: self.__unsafe_private_named.18,
-            audience: self.__unsafe_private_named.19,
-            audio: self.__unsafe_private_named.20,
-            author: self.__unsafe_private_named.21,
-            award: self.__unsafe_private_named.22,
-            awards: self.__unsafe_private_named.23,
-            character: self.__unsafe_private_named.24,
-            citation: self.__unsafe_private_named.25,
-            comment: self.__unsafe_private_named.26,
-            comment_count: self.__unsafe_private_named.27,
-            conditions_of_access: self.__unsafe_private_named.28,
-            content_location: self.__unsafe_private_named.29,
-            content_rating: self.__unsafe_private_named.30,
-            content_reference_time: self.__unsafe_private_named.31,
-            contributor: self.__unsafe_private_named.32,
-            copyright_holder: self.__unsafe_private_named.33,
-            copyright_notice: self.__unsafe_private_named.34,
-            copyright_year: self.__unsafe_private_named.35,
-            correction: self.__unsafe_private_named.36,
-            country_of_origin: self.__unsafe_private_named.37,
-            creative_work_status: self.__unsafe_private_named.38,
-            creator: self.__unsafe_private_named.39,
-            credit_text: self.__unsafe_private_named.40,
-            date_created: self.__unsafe_private_named.41,
-            date_modified: self.__unsafe_private_named.42,
-            date_published: self.__unsafe_private_named.43,
-            description: self.__unsafe_private_named.44,
-            digital_source_type: self.__unsafe_private_named.45,
-            director: self.__unsafe_private_named.46,
-            disambiguating_description: self.__unsafe_private_named.47,
-            discussion_url: self.__unsafe_private_named.48,
-            edit_eidr: self.__unsafe_private_named.49,
-            editor: self.__unsafe_private_named.50,
-            educational_alignment: self.__unsafe_private_named.51,
-            educational_level: self.__unsafe_private_named.52,
-            educational_use: self.__unsafe_private_named.53,
-            encoding: self.__unsafe_private_named.54,
-            encoding_format: self.__unsafe_private_named.55,
-            encodings: self.__unsafe_private_named.56,
-            end_date: self.__unsafe_private_named.57,
-            episode: self.__unsafe_private_named.58,
-            episodes: self.__unsafe_private_named.59,
-            example_of_work: self.__unsafe_private_named.60,
-            expires: self.__unsafe_private_named.61,
-            file_format: self.__unsafe_private_named.62,
-            funder: self.__unsafe_private_named.63,
-            funding: self.__unsafe_private_named.64,
-            genre: self.__unsafe_private_named.65,
-            has_part: self.__unsafe_private_named.66,
-            headline: self.__unsafe_private_named.67,
-            identifier: self.__unsafe_private_named.68,
-            image: self.__unsafe_private_named.69,
-            in_language: self.__unsafe_private_named.70,
-            interaction_statistic: self.__unsafe_private_named.71,
-            interactivity_type: self.__unsafe_private_named.72,
-            interpreted_as_claim: self.__unsafe_private_named.73,
-            is_accessible_for_free: self.__unsafe_private_named.74,
-            is_based_on: self.__unsafe_private_named.75,
-            is_based_on_url: self.__unsafe_private_named.76,
-            is_family_friendly: self.__unsafe_private_named.77,
-            is_part_of: self.__unsafe_private_named.78,
-            keywords: self.__unsafe_private_named.79,
-            learning_resource_type: self.__unsafe_private_named.80,
-            license: self.__unsafe_private_named.81,
-            location_created: self.__unsafe_private_named.82,
-            main_entity: self.__unsafe_private_named.83,
-            main_entity_of_page: self.__unsafe_private_named.84,
-            maintainer: self.__unsafe_private_named.85,
-            material: self.__unsafe_private_named.86,
-            material_extent: self.__unsafe_private_named.87,
-            mentions: self.__unsafe_private_named.88,
-            name: self.__unsafe_private_named.89,
-            number_of_episodes: self.__unsafe_private_named.90,
-            offers: self.__unsafe_private_named.91,
-            part_of_series: self.__unsafe_private_named.92,
-            part_of_tv_series: self.__unsafe_private_named.93,
-            pattern: self.__unsafe_private_named.94,
-            position: self.__unsafe_private_named.95,
-            potential_action: self.__unsafe_private_named.96,
-            producer: self.__unsafe_private_named.97,
-            production_company: self.__unsafe_private_named.98,
-            provider: self.__unsafe_private_named.99,
-            publication: self.__unsafe_private_named.100,
-            publisher: self.__unsafe_private_named.101,
-            publisher_imprint: self.__unsafe_private_named.102,
-            publishing_principles: self.__unsafe_private_named.103,
-            recorded_at: self.__unsafe_private_named.104,
-            released_event: self.__unsafe_private_named.105,
-            review: self.__unsafe_private_named.106,
-            reviews: self.__unsafe_private_named.107,
-            same_as: self.__unsafe_private_named.108,
-            schema_version: self.__unsafe_private_named.109,
-            sd_date_published: self.__unsafe_private_named.110,
-            sd_license: self.__unsafe_private_named.111,
-            sd_publisher: self.__unsafe_private_named.112,
-            season_number: self.__unsafe_private_named.113,
-            size: self.__unsafe_private_named.114,
-            source_organization: self.__unsafe_private_named.115,
-            spatial: self.__unsafe_private_named.116,
-            spatial_coverage: self.__unsafe_private_named.117,
-            sponsor: self.__unsafe_private_named.118,
-            start_date: self.__unsafe_private_named.119,
-            subject_of: self.__unsafe_private_named.120,
-            teaches: self.__unsafe_private_named.121,
-            temporal: self.__unsafe_private_named.122,
-            temporal_coverage: self.__unsafe_private_named.123,
-            text: self.__unsafe_private_named.124,
-            thumbnail: self.__unsafe_private_named.125,
-            thumbnail_url: self.__unsafe_private_named.126,
-            time_required: self.__unsafe_private_named.127,
-            title_eidr: self.__unsafe_private_named.128,
-            trailer: self.__unsafe_private_named.129,
-            translation_of_work: self.__unsafe_private_named.130,
-            translator: self.__unsafe_private_named.131,
-            typical_age_range: self.__unsafe_private_named.132,
-            url: self.__unsafe_private_named.133,
-            usage_info: self.__unsafe_private_named.134,
-            version: self.__unsafe_private_named.135,
-            video: self.__unsafe_private_named.136,
-            word_count: self.__unsafe_private_named.137,
-            work_example: self.__unsafe_private_named.138,
-            work_translation: self.__unsafe_private_named.139,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            actor: self._fields.11,
+            additional_type: self._fields.12,
+            aggregate_rating: self._fields.13,
+            alternate_name: self._fields.14,
+            alternative_headline: self._fields.15,
+            archived_at: self._fields.16,
+            assesses: self._fields.17,
+            associated_media: self._fields.18,
+            audience: self._fields.19,
+            audio: self._fields.20,
+            author: self._fields.21,
+            award: self._fields.22,
+            awards: self._fields.23,
+            character: self._fields.24,
+            citation: self._fields.25,
+            comment: self._fields.26,
+            comment_count: self._fields.27,
+            conditions_of_access: self._fields.28,
+            content_location: self._fields.29,
+            content_rating: self._fields.30,
+            content_reference_time: self._fields.31,
+            contributor: self._fields.32,
+            copyright_holder: self._fields.33,
+            copyright_notice: self._fields.34,
+            copyright_year: self._fields.35,
+            correction: self._fields.36,
+            country_of_origin: self._fields.37,
+            creative_work_status: self._fields.38,
+            creator: self._fields.39,
+            credit_text: self._fields.40,
+            date_created: self._fields.41,
+            date_modified: self._fields.42,
+            date_published: self._fields.43,
+            description: self._fields.44,
+            digital_source_type: self._fields.45,
+            director: self._fields.46,
+            disambiguating_description: self._fields.47,
+            discussion_url: self._fields.48,
+            edit_eidr: self._fields.49,
+            editor: self._fields.50,
+            educational_alignment: self._fields.51,
+            educational_level: self._fields.52,
+            educational_use: self._fields.53,
+            encoding: self._fields.54,
+            encoding_format: self._fields.55,
+            encodings: self._fields.56,
+            end_date: self._fields.57,
+            episode: self._fields.58,
+            episodes: self._fields.59,
+            example_of_work: self._fields.60,
+            expires: self._fields.61,
+            file_format: self._fields.62,
+            funder: self._fields.63,
+            funding: self._fields.64,
+            genre: self._fields.65,
+            has_part: self._fields.66,
+            headline: self._fields.67,
+            identifier: self._fields.68,
+            image: self._fields.69,
+            in_language: self._fields.70,
+            interaction_statistic: self._fields.71,
+            interactivity_type: self._fields.72,
+            interpreted_as_claim: self._fields.73,
+            is_accessible_for_free: self._fields.74,
+            is_based_on: self._fields.75,
+            is_based_on_url: self._fields.76,
+            is_family_friendly: self._fields.77,
+            is_part_of: self._fields.78,
+            keywords: self._fields.79,
+            learning_resource_type: self._fields.80,
+            license: self._fields.81,
+            location_created: self._fields.82,
+            main_entity: self._fields.83,
+            main_entity_of_page: self._fields.84,
+            maintainer: self._fields.85,
+            material: self._fields.86,
+            material_extent: self._fields.87,
+            mentions: self._fields.88,
+            name: self._fields.89,
+            number_of_episodes: self._fields.90,
+            offers: self._fields.91,
+            part_of_series: self._fields.92,
+            part_of_tv_series: self._fields.93,
+            pattern: self._fields.94,
+            position: self._fields.95,
+            potential_action: self._fields.96,
+            producer: self._fields.97,
+            production_company: self._fields.98,
+            provider: self._fields.99,
+            publication: self._fields.100,
+            publisher: self._fields.101,
+            publisher_imprint: self._fields.102,
+            publishing_principles: self._fields.103,
+            recorded_at: self._fields.104,
+            released_event: self._fields.105,
+            review: self._fields.106,
+            reviews: self._fields.107,
+            same_as: self._fields.108,
+            schema_version: self._fields.109,
+            sd_date_published: self._fields.110,
+            sd_license: self._fields.111,
+            sd_publisher: self._fields.112,
+            season_number: self._fields.113,
+            size: self._fields.114,
+            source_organization: self._fields.115,
+            spatial: self._fields.116,
+            spatial_coverage: self._fields.117,
+            sponsor: self._fields.118,
+            start_date: self._fields.119,
+            subject_of: self._fields.120,
+            teaches: self._fields.121,
+            temporal: self._fields.122,
+            temporal_coverage: self._fields.123,
+            text: self._fields.124,
+            thumbnail: self._fields.125,
+            thumbnail_url: self._fields.126,
+            time_required: self._fields.127,
+            title_eidr: self._fields.128,
+            trailer: self._fields.129,
+            translation_of_work: self._fields.130,
+            translator: self._fields.131,
+            typical_age_range: self._fields.132,
+            url: self._fields.133,
+            usage_info: self._fields.134,
+            version: self._fields.135,
+            video: self._fields.136,
+            word_count: self._fields.137,
+            work_example: self._fields.138,
+            work_translation: self._fields.139,
             extra_data: Default::default(),
         }
     }
@@ -8642,146 +8645,146 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> TvSeason<'a> {
         TvSeason {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            actor: self.__unsafe_private_named.11,
-            additional_type: self.__unsafe_private_named.12,
-            aggregate_rating: self.__unsafe_private_named.13,
-            alternate_name: self.__unsafe_private_named.14,
-            alternative_headline: self.__unsafe_private_named.15,
-            archived_at: self.__unsafe_private_named.16,
-            assesses: self.__unsafe_private_named.17,
-            associated_media: self.__unsafe_private_named.18,
-            audience: self.__unsafe_private_named.19,
-            audio: self.__unsafe_private_named.20,
-            author: self.__unsafe_private_named.21,
-            award: self.__unsafe_private_named.22,
-            awards: self.__unsafe_private_named.23,
-            character: self.__unsafe_private_named.24,
-            citation: self.__unsafe_private_named.25,
-            comment: self.__unsafe_private_named.26,
-            comment_count: self.__unsafe_private_named.27,
-            conditions_of_access: self.__unsafe_private_named.28,
-            content_location: self.__unsafe_private_named.29,
-            content_rating: self.__unsafe_private_named.30,
-            content_reference_time: self.__unsafe_private_named.31,
-            contributor: self.__unsafe_private_named.32,
-            copyright_holder: self.__unsafe_private_named.33,
-            copyright_notice: self.__unsafe_private_named.34,
-            copyright_year: self.__unsafe_private_named.35,
-            correction: self.__unsafe_private_named.36,
-            country_of_origin: self.__unsafe_private_named.37,
-            creative_work_status: self.__unsafe_private_named.38,
-            creator: self.__unsafe_private_named.39,
-            credit_text: self.__unsafe_private_named.40,
-            date_created: self.__unsafe_private_named.41,
-            date_modified: self.__unsafe_private_named.42,
-            date_published: self.__unsafe_private_named.43,
-            description: self.__unsafe_private_named.44,
-            digital_source_type: self.__unsafe_private_named.45,
-            director: self.__unsafe_private_named.46,
-            disambiguating_description: self.__unsafe_private_named.47,
-            discussion_url: self.__unsafe_private_named.48,
-            edit_eidr: self.__unsafe_private_named.49,
-            editor: self.__unsafe_private_named.50,
-            educational_alignment: self.__unsafe_private_named.51,
-            educational_level: self.__unsafe_private_named.52,
-            educational_use: self.__unsafe_private_named.53,
-            encoding: self.__unsafe_private_named.54,
-            encoding_format: self.__unsafe_private_named.55,
-            encodings: self.__unsafe_private_named.56,
-            end_date: self.__unsafe_private_named.57,
-            episode: self.__unsafe_private_named.58,
-            episodes: self.__unsafe_private_named.59,
-            example_of_work: self.__unsafe_private_named.60,
-            expires: self.__unsafe_private_named.61,
-            file_format: self.__unsafe_private_named.62,
-            funder: self.__unsafe_private_named.63,
-            funding: self.__unsafe_private_named.64,
-            genre: self.__unsafe_private_named.65,
-            has_part: self.__unsafe_private_named.66,
-            headline: self.__unsafe_private_named.67,
-            identifier: self.__unsafe_private_named.68,
-            image: self.__unsafe_private_named.69,
-            in_language: self.__unsafe_private_named.70,
-            interaction_statistic: self.__unsafe_private_named.71,
-            interactivity_type: self.__unsafe_private_named.72,
-            interpreted_as_claim: self.__unsafe_private_named.73,
-            is_accessible_for_free: self.__unsafe_private_named.74,
-            is_based_on: self.__unsafe_private_named.75,
-            is_based_on_url: self.__unsafe_private_named.76,
-            is_family_friendly: self.__unsafe_private_named.77,
-            is_part_of: self.__unsafe_private_named.78,
-            keywords: self.__unsafe_private_named.79,
-            learning_resource_type: self.__unsafe_private_named.80,
-            license: self.__unsafe_private_named.81,
-            location_created: self.__unsafe_private_named.82,
-            main_entity: self.__unsafe_private_named.83,
-            main_entity_of_page: self.__unsafe_private_named.84,
-            maintainer: self.__unsafe_private_named.85,
-            material: self.__unsafe_private_named.86,
-            material_extent: self.__unsafe_private_named.87,
-            mentions: self.__unsafe_private_named.88,
-            name: self.__unsafe_private_named.89,
-            number_of_episodes: self.__unsafe_private_named.90,
-            offers: self.__unsafe_private_named.91,
-            part_of_series: self.__unsafe_private_named.92,
-            part_of_tv_series: self.__unsafe_private_named.93,
-            pattern: self.__unsafe_private_named.94,
-            position: self.__unsafe_private_named.95,
-            potential_action: self.__unsafe_private_named.96,
-            producer: self.__unsafe_private_named.97,
-            production_company: self.__unsafe_private_named.98,
-            provider: self.__unsafe_private_named.99,
-            publication: self.__unsafe_private_named.100,
-            publisher: self.__unsafe_private_named.101,
-            publisher_imprint: self.__unsafe_private_named.102,
-            publishing_principles: self.__unsafe_private_named.103,
-            recorded_at: self.__unsafe_private_named.104,
-            released_event: self.__unsafe_private_named.105,
-            review: self.__unsafe_private_named.106,
-            reviews: self.__unsafe_private_named.107,
-            same_as: self.__unsafe_private_named.108,
-            schema_version: self.__unsafe_private_named.109,
-            sd_date_published: self.__unsafe_private_named.110,
-            sd_license: self.__unsafe_private_named.111,
-            sd_publisher: self.__unsafe_private_named.112,
-            season_number: self.__unsafe_private_named.113,
-            size: self.__unsafe_private_named.114,
-            source_organization: self.__unsafe_private_named.115,
-            spatial: self.__unsafe_private_named.116,
-            spatial_coverage: self.__unsafe_private_named.117,
-            sponsor: self.__unsafe_private_named.118,
-            start_date: self.__unsafe_private_named.119,
-            subject_of: self.__unsafe_private_named.120,
-            teaches: self.__unsafe_private_named.121,
-            temporal: self.__unsafe_private_named.122,
-            temporal_coverage: self.__unsafe_private_named.123,
-            text: self.__unsafe_private_named.124,
-            thumbnail: self.__unsafe_private_named.125,
-            thumbnail_url: self.__unsafe_private_named.126,
-            time_required: self.__unsafe_private_named.127,
-            title_eidr: self.__unsafe_private_named.128,
-            trailer: self.__unsafe_private_named.129,
-            translation_of_work: self.__unsafe_private_named.130,
-            translator: self.__unsafe_private_named.131,
-            typical_age_range: self.__unsafe_private_named.132,
-            url: self.__unsafe_private_named.133,
-            usage_info: self.__unsafe_private_named.134,
-            version: self.__unsafe_private_named.135,
-            video: self.__unsafe_private_named.136,
-            word_count: self.__unsafe_private_named.137,
-            work_example: self.__unsafe_private_named.138,
-            work_translation: self.__unsafe_private_named.139,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            actor: self._fields.11,
+            additional_type: self._fields.12,
+            aggregate_rating: self._fields.13,
+            alternate_name: self._fields.14,
+            alternative_headline: self._fields.15,
+            archived_at: self._fields.16,
+            assesses: self._fields.17,
+            associated_media: self._fields.18,
+            audience: self._fields.19,
+            audio: self._fields.20,
+            author: self._fields.21,
+            award: self._fields.22,
+            awards: self._fields.23,
+            character: self._fields.24,
+            citation: self._fields.25,
+            comment: self._fields.26,
+            comment_count: self._fields.27,
+            conditions_of_access: self._fields.28,
+            content_location: self._fields.29,
+            content_rating: self._fields.30,
+            content_reference_time: self._fields.31,
+            contributor: self._fields.32,
+            copyright_holder: self._fields.33,
+            copyright_notice: self._fields.34,
+            copyright_year: self._fields.35,
+            correction: self._fields.36,
+            country_of_origin: self._fields.37,
+            creative_work_status: self._fields.38,
+            creator: self._fields.39,
+            credit_text: self._fields.40,
+            date_created: self._fields.41,
+            date_modified: self._fields.42,
+            date_published: self._fields.43,
+            description: self._fields.44,
+            digital_source_type: self._fields.45,
+            director: self._fields.46,
+            disambiguating_description: self._fields.47,
+            discussion_url: self._fields.48,
+            edit_eidr: self._fields.49,
+            editor: self._fields.50,
+            educational_alignment: self._fields.51,
+            educational_level: self._fields.52,
+            educational_use: self._fields.53,
+            encoding: self._fields.54,
+            encoding_format: self._fields.55,
+            encodings: self._fields.56,
+            end_date: self._fields.57,
+            episode: self._fields.58,
+            episodes: self._fields.59,
+            example_of_work: self._fields.60,
+            expires: self._fields.61,
+            file_format: self._fields.62,
+            funder: self._fields.63,
+            funding: self._fields.64,
+            genre: self._fields.65,
+            has_part: self._fields.66,
+            headline: self._fields.67,
+            identifier: self._fields.68,
+            image: self._fields.69,
+            in_language: self._fields.70,
+            interaction_statistic: self._fields.71,
+            interactivity_type: self._fields.72,
+            interpreted_as_claim: self._fields.73,
+            is_accessible_for_free: self._fields.74,
+            is_based_on: self._fields.75,
+            is_based_on_url: self._fields.76,
+            is_family_friendly: self._fields.77,
+            is_part_of: self._fields.78,
+            keywords: self._fields.79,
+            learning_resource_type: self._fields.80,
+            license: self._fields.81,
+            location_created: self._fields.82,
+            main_entity: self._fields.83,
+            main_entity_of_page: self._fields.84,
+            maintainer: self._fields.85,
+            material: self._fields.86,
+            material_extent: self._fields.87,
+            mentions: self._fields.88,
+            name: self._fields.89,
+            number_of_episodes: self._fields.90,
+            offers: self._fields.91,
+            part_of_series: self._fields.92,
+            part_of_tv_series: self._fields.93,
+            pattern: self._fields.94,
+            position: self._fields.95,
+            potential_action: self._fields.96,
+            producer: self._fields.97,
+            production_company: self._fields.98,
+            provider: self._fields.99,
+            publication: self._fields.100,
+            publisher: self._fields.101,
+            publisher_imprint: self._fields.102,
+            publishing_principles: self._fields.103,
+            recorded_at: self._fields.104,
+            released_event: self._fields.105,
+            review: self._fields.106,
+            reviews: self._fields.107,
+            same_as: self._fields.108,
+            schema_version: self._fields.109,
+            sd_date_published: self._fields.110,
+            sd_license: self._fields.111,
+            sd_publisher: self._fields.112,
+            season_number: self._fields.113,
+            size: self._fields.114,
+            source_organization: self._fields.115,
+            spatial: self._fields.116,
+            spatial_coverage: self._fields.117,
+            sponsor: self._fields.118,
+            start_date: self._fields.119,
+            subject_of: self._fields.120,
+            teaches: self._fields.121,
+            temporal: self._fields.122,
+            temporal_coverage: self._fields.123,
+            text: self._fields.124,
+            thumbnail: self._fields.125,
+            thumbnail_url: self._fields.126,
+            time_required: self._fields.127,
+            title_eidr: self._fields.128,
+            trailer: self._fields.129,
+            translation_of_work: self._fields.130,
+            translator: self._fields.131,
+            typical_age_range: self._fields.132,
+            url: self._fields.133,
+            usage_info: self._fields.134,
+            version: self._fields.135,
+            video: self._fields.136,
+            word_count: self._fields.137,
+            work_example: self._fields.138,
+            work_translation: self._fields.139,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/tv_series.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/tv_series.rs
index 16c5e34c..bbea152b 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/tv_series.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/tv_series.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -6131,8 +6134,8 @@ pub mod tv_series_state {
 
 /// Builder for constructing an instance of this type
 pub struct TvSeriesBuilder<'a, S: tv_series_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<TvSeriesAbout<'a>>,
         Option<TvSeriesAbstract<'a>>,
         Option<TvSeriesAccessMode<'a>>,
@@ -6279,7 +6282,7 @@ pub struct TvSeriesBuilder<'a, S: tv_series_state::State> {
         Option<TvSeriesWorkExample<'a>>,
         Option<TvSeriesWorkTranslation<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TvSeries<'a> {
@@ -6293,8 +6296,8 @@ impl<'a> TvSeriesBuilder<'a, tv_series_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TvSeriesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -6441,7 +6444,7 @@ impl<'a> TvSeriesBuilder<'a, tv_series_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6449,12 +6452,12 @@ impl<'a> TvSeriesBuilder<'a, tv_series_state::Empty> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `about` field (optional)
     pub fn about(mut self, value: impl Into<Option<TvSeriesAbout<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `about` field to an Option value (optional)
     pub fn maybe_about(mut self, value: Option<TvSeriesAbout<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -6462,12 +6465,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `abstract` field (optional)
     pub fn r#abstract(mut self, value: impl Into<Option<TvSeriesAbstract<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `abstract` field to an Option value (optional)
     pub fn maybe_abstract(mut self, value: Option<TvSeriesAbstract<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -6478,12 +6481,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesAccessMode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `accessMode` field to an Option value (optional)
     pub fn maybe_access_mode(mut self, value: Option<TvSeriesAccessMode<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -6494,7 +6497,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesAccessModeSufficient<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `accessModeSufficient` field to an Option value (optional)
@@ -6502,7 +6505,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesAccessModeSufficient<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -6513,7 +6516,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesAccessibilityApi<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `accessibilityAPI` field to an Option value (optional)
@@ -6521,7 +6524,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesAccessibilityApi<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -6532,7 +6535,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesAccessibilityControl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `accessibilityControl` field to an Option value (optional)
@@ -6540,7 +6543,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesAccessibilityControl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -6551,7 +6554,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesAccessibilityFeature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `accessibilityFeature` field to an Option value (optional)
@@ -6559,7 +6562,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesAccessibilityFeature<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -6570,7 +6573,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesAccessibilityHazard<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `accessibilityHazard` field to an Option value (optional)
@@ -6578,7 +6581,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesAccessibilityHazard<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -6589,7 +6592,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesAccessibilitySummary<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `accessibilitySummary` field to an Option value (optional)
@@ -6597,7 +6600,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesAccessibilitySummary<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -6608,7 +6611,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesAccountablePerson<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `accountablePerson` field to an Option value (optional)
@@ -6616,7 +6619,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesAccountablePerson<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -6627,7 +6630,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesAcquireLicensePage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `acquireLicensePage` field to an Option value (optional)
@@ -6635,7 +6638,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesAcquireLicensePage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -6643,12 +6646,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `actor` field (optional)
     pub fn actor(mut self, value: impl Into<Option<TvSeriesActor<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `actor` field to an Option value (optional)
     pub fn maybe_actor(mut self, value: Option<TvSeriesActor<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -6656,12 +6659,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `actors` field (optional)
     pub fn actors(mut self, value: impl Into<Option<TvSeriesActors<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `actors` field to an Option value (optional)
     pub fn maybe_actors(mut self, value: Option<TvSeriesActors<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -6672,7 +6675,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -6680,7 +6683,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -6691,7 +6694,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -6699,7 +6702,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -6710,7 +6713,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -6718,7 +6721,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -6729,7 +6732,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesAlternativeHeadline<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `alternativeHeadline` field to an Option value (optional)
@@ -6737,7 +6740,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesAlternativeHeadline<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -6748,12 +6751,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesArchivedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `archivedAt` field to an Option value (optional)
     pub fn maybe_archived_at(mut self, value: Option<TvSeriesArchivedAt<'a>>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -6761,12 +6764,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `assesses` field (optional)
     pub fn assesses(mut self, value: impl Into<Option<TvSeriesAssesses<'a>>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `assesses` field to an Option value (optional)
     pub fn maybe_assesses(mut self, value: Option<TvSeriesAssesses<'a>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -6777,7 +6780,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesAssociatedMedia<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `associatedMedia` field to an Option value (optional)
@@ -6785,7 +6788,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesAssociatedMedia<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -6793,12 +6796,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `audience` field (optional)
     pub fn audience(mut self, value: impl Into<Option<TvSeriesAudience<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `audience` field to an Option value (optional)
     pub fn maybe_audience(mut self, value: Option<TvSeriesAudience<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -6806,12 +6809,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `audio` field (optional)
     pub fn audio(mut self, value: impl Into<Option<TvSeriesAudio<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `audio` field to an Option value (optional)
     pub fn maybe_audio(mut self, value: Option<TvSeriesAudio<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -6819,12 +6822,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<TvSeriesAuthor<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<TvSeriesAuthor<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -6832,12 +6835,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<TvSeriesAward<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<TvSeriesAward<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -6845,12 +6848,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<TvSeriesAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<TvSeriesAwards<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -6858,12 +6861,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `character` field (optional)
     pub fn character(mut self, value: impl Into<Option<TvSeriesCharacter<'a>>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `character` field to an Option value (optional)
     pub fn maybe_character(mut self, value: Option<TvSeriesCharacter<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -6871,12 +6874,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `citation` field (optional)
     pub fn citation(mut self, value: impl Into<Option<TvSeriesCitation<'a>>>) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `citation` field to an Option value (optional)
     pub fn maybe_citation(mut self, value: Option<TvSeriesCitation<'a>>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -6884,12 +6887,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<TvSeriesComment<'a>>>) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<TvSeriesComment<'a>>) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -6900,7 +6903,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesCommentCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `commentCount` field to an Option value (optional)
@@ -6908,7 +6911,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesCommentCount<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -6919,7 +6922,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesConditionsOfAccess<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `conditionsOfAccess` field to an Option value (optional)
@@ -6927,7 +6930,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesConditionsOfAccess<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -6938,7 +6941,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesContainsSeason<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `containsSeason` field to an Option value (optional)
@@ -6946,7 +6949,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesContainsSeason<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -6957,7 +6960,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesContentLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `contentLocation` field to an Option value (optional)
@@ -6965,7 +6968,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesContentLocation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -6976,7 +6979,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesContentRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `contentRating` field to an Option value (optional)
@@ -6984,7 +6987,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesContentRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -6995,7 +6998,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesContentReferenceTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `contentReferenceTime` field to an Option value (optional)
@@ -7003,7 +7006,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesContentReferenceTime<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -7014,12 +7017,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesContributor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `contributor` field to an Option value (optional)
     pub fn maybe_contributor(mut self, value: Option<TvSeriesContributor<'a>>) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -7030,7 +7033,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesCopyrightHolder<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `copyrightHolder` field to an Option value (optional)
@@ -7038,7 +7041,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesCopyrightHolder<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -7049,7 +7052,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesCopyrightNotice<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `copyrightNotice` field to an Option value (optional)
@@ -7057,7 +7060,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesCopyrightNotice<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -7068,7 +7071,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesCopyrightYear<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `copyrightYear` field to an Option value (optional)
@@ -7076,7 +7079,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesCopyrightYear<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -7087,12 +7090,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesCorrection<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `correction` field to an Option value (optional)
     pub fn maybe_correction(mut self, value: Option<TvSeriesCorrection<'a>>) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -7103,7 +7106,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesCountryOfOrigin<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `countryOfOrigin` field to an Option value (optional)
@@ -7111,7 +7114,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesCountryOfOrigin<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -7122,7 +7125,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesCreativeWorkStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `creativeWorkStatus` field to an Option value (optional)
@@ -7130,7 +7133,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesCreativeWorkStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -7138,12 +7141,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `creator` field (optional)
     pub fn creator(mut self, value: impl Into<Option<TvSeriesCreator<'a>>>) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `creator` field to an Option value (optional)
     pub fn maybe_creator(mut self, value: Option<TvSeriesCreator<'a>>) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -7154,12 +7157,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesCreditText<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `creditText` field to an Option value (optional)
     pub fn maybe_credit_text(mut self, value: Option<TvSeriesCreditText<'a>>) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -7170,12 +7173,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesDateCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `dateCreated` field to an Option value (optional)
     pub fn maybe_date_created(mut self, value: Option<TvSeriesDateCreated<'a>>) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -7186,7 +7189,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesDateModified<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `dateModified` field to an Option value (optional)
@@ -7194,7 +7197,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesDateModified<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -7205,7 +7208,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `datePublished` field to an Option value (optional)
@@ -7213,7 +7216,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -7224,12 +7227,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<TvSeriesDescription<'a>>) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -7240,7 +7243,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesDigitalSourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `digitalSourceType` field to an Option value (optional)
@@ -7248,7 +7251,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesDigitalSourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -7256,12 +7259,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `director` field (optional)
     pub fn director(mut self, value: impl Into<Option<TvSeriesDirector<'a>>>) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `director` field to an Option value (optional)
     pub fn maybe_director(mut self, value: Option<TvSeriesDirector<'a>>) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -7269,12 +7272,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `directors` field (optional)
     pub fn directors(mut self, value: impl Into<Option<TvSeriesDirectors<'a>>>) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `directors` field to an Option value (optional)
     pub fn maybe_directors(mut self, value: Option<TvSeriesDirectors<'a>>) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -7285,7 +7288,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -7293,7 +7296,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -7304,7 +7307,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesDiscussionUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `discussionUrl` field to an Option value (optional)
@@ -7312,7 +7315,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesDiscussionUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -7320,12 +7323,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `editEIDR` field (optional)
     pub fn edit_eidr(mut self, value: impl Into<Option<TvSeriesEditEidr<'a>>>) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `editEIDR` field to an Option value (optional)
     pub fn maybe_edit_eidr(mut self, value: Option<TvSeriesEditEidr<'a>>) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -7333,12 +7336,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `editor` field (optional)
     pub fn editor(mut self, value: impl Into<Option<TvSeriesEditor<'a>>>) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `editor` field to an Option value (optional)
     pub fn maybe_editor(mut self, value: Option<TvSeriesEditor<'a>>) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -7349,7 +7352,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesEducationalAlignment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `educationalAlignment` field to an Option value (optional)
@@ -7357,7 +7360,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesEducationalAlignment<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -7368,7 +7371,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesEducationalLevel<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `educationalLevel` field to an Option value (optional)
@@ -7376,7 +7379,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesEducationalLevel<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -7387,7 +7390,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesEducationalUse<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `educationalUse` field to an Option value (optional)
@@ -7395,7 +7398,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesEducationalUse<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -7403,12 +7406,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `encoding` field (optional)
     pub fn encoding(mut self, value: impl Into<Option<TvSeriesEncoding<'a>>>) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `encoding` field to an Option value (optional)
     pub fn maybe_encoding(mut self, value: Option<TvSeriesEncoding<'a>>) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -7419,7 +7422,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesEncodingFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `encodingFormat` field to an Option value (optional)
@@ -7427,7 +7430,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesEncodingFormat<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -7435,12 +7438,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `encodings` field (optional)
     pub fn encodings(mut self, value: impl Into<Option<TvSeriesEncodings<'a>>>) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `encodings` field to an Option value (optional)
     pub fn maybe_encodings(mut self, value: Option<TvSeriesEncodings<'a>>) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -7448,12 +7451,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `endDate` field (optional)
     pub fn end_date(mut self, value: impl Into<Option<TvSeriesEndDate<'a>>>) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `endDate` field to an Option value (optional)
     pub fn maybe_end_date(mut self, value: Option<TvSeriesEndDate<'a>>) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -7461,12 +7464,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `episode` field (optional)
     pub fn episode(mut self, value: impl Into<Option<TvSeriesEpisode<'a>>>) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `episode` field to an Option value (optional)
     pub fn maybe_episode(mut self, value: Option<TvSeriesEpisode<'a>>) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -7474,12 +7477,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `episodes` field (optional)
     pub fn episodes(mut self, value: impl Into<Option<TvSeriesEpisodes<'a>>>) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `episodes` field to an Option value (optional)
     pub fn maybe_episodes(mut self, value: Option<TvSeriesEpisodes<'a>>) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -7490,7 +7493,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesExampleOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `exampleOfWork` field to an Option value (optional)
@@ -7498,7 +7501,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesExampleOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -7506,12 +7509,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `expires` field (optional)
     pub fn expires(mut self, value: impl Into<Option<TvSeriesExpires<'a>>>) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `expires` field to an Option value (optional)
     pub fn maybe_expires(mut self, value: Option<TvSeriesExpires<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -7522,12 +7525,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesFileFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `fileFormat` field to an Option value (optional)
     pub fn maybe_file_format(mut self, value: Option<TvSeriesFileFormat<'a>>) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -7535,12 +7538,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<TvSeriesFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<TvSeriesFunder<'a>>) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -7548,12 +7551,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<TvSeriesFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<TvSeriesFunding<'a>>) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -7561,12 +7564,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<TvSeriesGenre<'a>>>) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<TvSeriesGenre<'a>>) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -7574,12 +7577,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `hasPart` field (optional)
     pub fn has_part(mut self, value: impl Into<Option<TvSeriesHasPart<'a>>>) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `hasPart` field to an Option value (optional)
     pub fn maybe_has_part(mut self, value: Option<TvSeriesHasPart<'a>>) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -7587,12 +7590,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `headline` field (optional)
     pub fn headline(mut self, value: impl Into<Option<TvSeriesHeadline<'a>>>) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `headline` field to an Option value (optional)
     pub fn maybe_headline(mut self, value: Option<TvSeriesHeadline<'a>>) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -7603,12 +7606,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesIdentifier<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<TvSeriesIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -7616,12 +7619,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<TvSeriesImage<'a>>>) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<TvSeriesImage<'a>>) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -7632,12 +7635,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesInLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `inLanguage` field to an Option value (optional)
     pub fn maybe_in_language(mut self, value: Option<TvSeriesInLanguage<'a>>) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -7648,7 +7651,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -7656,7 +7659,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -7667,7 +7670,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesInteractivityType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `interactivityType` field to an Option value (optional)
@@ -7675,7 +7678,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesInteractivityType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -7686,7 +7689,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesInterpretedAsClaim<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `interpretedAsClaim` field to an Option value (optional)
@@ -7694,7 +7697,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesInterpretedAsClaim<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -7705,7 +7708,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesIsAccessibleForFree<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `isAccessibleForFree` field to an Option value (optional)
@@ -7713,7 +7716,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesIsAccessibleForFree<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -7724,12 +7727,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesIsBasedOn<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `isBasedOn` field to an Option value (optional)
     pub fn maybe_is_based_on(mut self, value: Option<TvSeriesIsBasedOn<'a>>) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -7740,7 +7743,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesIsBasedOnUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value.into();
+        self._fields.79 = value.into();
         self
     }
     /// Set the `isBasedOnUrl` field to an Option value (optional)
@@ -7748,7 +7751,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesIsBasedOnUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value;
+        self._fields.79 = value;
         self
     }
 }
@@ -7759,7 +7762,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesIsFamilyFriendly<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value.into();
+        self._fields.80 = value.into();
         self
     }
     /// Set the `isFamilyFriendly` field to an Option value (optional)
@@ -7767,7 +7770,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesIsFamilyFriendly<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value;
+        self._fields.80 = value;
         self
     }
 }
@@ -7775,12 +7778,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `isPartOf` field (optional)
     pub fn is_part_of(mut self, value: impl Into<Option<TvSeriesIsPartOf<'a>>>) -> Self {
-        self.__unsafe_private_named.81 = value.into();
+        self._fields.81 = value.into();
         self
     }
     /// Set the `isPartOf` field to an Option value (optional)
     pub fn maybe_is_part_of(mut self, value: Option<TvSeriesIsPartOf<'a>>) -> Self {
-        self.__unsafe_private_named.81 = value;
+        self._fields.81 = value;
         self
     }
 }
@@ -7788,12 +7791,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `issn` field (optional)
     pub fn issn(mut self, value: impl Into<Option<TvSeriesIssn<'a>>>) -> Self {
-        self.__unsafe_private_named.82 = value.into();
+        self._fields.82 = value.into();
         self
     }
     /// Set the `issn` field to an Option value (optional)
     pub fn maybe_issn(mut self, value: Option<TvSeriesIssn<'a>>) -> Self {
-        self.__unsafe_private_named.82 = value;
+        self._fields.82 = value;
         self
     }
 }
@@ -7801,12 +7804,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<TvSeriesKeywords<'a>>>) -> Self {
-        self.__unsafe_private_named.83 = value.into();
+        self._fields.83 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<TvSeriesKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.83 = value;
+        self._fields.83 = value;
         self
     }
 }
@@ -7817,7 +7820,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesLearningResourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value.into();
+        self._fields.84 = value.into();
         self
     }
     /// Set the `learningResourceType` field to an Option value (optional)
@@ -7825,7 +7828,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesLearningResourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.84 = value;
+        self._fields.84 = value;
         self
     }
 }
@@ -7833,12 +7836,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `license` field (optional)
     pub fn license(mut self, value: impl Into<Option<TvSeriesLicense<'a>>>) -> Self {
-        self.__unsafe_private_named.85 = value.into();
+        self._fields.85 = value.into();
         self
     }
     /// Set the `license` field to an Option value (optional)
     pub fn maybe_license(mut self, value: Option<TvSeriesLicense<'a>>) -> Self {
-        self.__unsafe_private_named.85 = value;
+        self._fields.85 = value;
         self
     }
 }
@@ -7849,7 +7852,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesLocationCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.86 = value.into();
+        self._fields.86 = value.into();
         self
     }
     /// Set the `locationCreated` field to an Option value (optional)
@@ -7857,7 +7860,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesLocationCreated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.86 = value;
+        self._fields.86 = value;
         self
     }
 }
@@ -7868,12 +7871,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesMainEntity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.87 = value.into();
+        self._fields.87 = value.into();
         self
     }
     /// Set the `mainEntity` field to an Option value (optional)
     pub fn maybe_main_entity(mut self, value: Option<TvSeriesMainEntity<'a>>) -> Self {
-        self.__unsafe_private_named.87 = value;
+        self._fields.87 = value;
         self
     }
 }
@@ -7884,7 +7887,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.88 = value.into();
+        self._fields.88 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -7892,7 +7895,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.88 = value;
+        self._fields.88 = value;
         self
     }
 }
@@ -7903,12 +7906,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesMaintainer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.89 = value.into();
+        self._fields.89 = value.into();
         self
     }
     /// Set the `maintainer` field to an Option value (optional)
     pub fn maybe_maintainer(mut self, value: Option<TvSeriesMaintainer<'a>>) -> Self {
-        self.__unsafe_private_named.89 = value;
+        self._fields.89 = value;
         self
     }
 }
@@ -7916,12 +7919,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `material` field (optional)
     pub fn material(mut self, value: impl Into<Option<TvSeriesMaterial<'a>>>) -> Self {
-        self.__unsafe_private_named.90 = value.into();
+        self._fields.90 = value.into();
         self
     }
     /// Set the `material` field to an Option value (optional)
     pub fn maybe_material(mut self, value: Option<TvSeriesMaterial<'a>>) -> Self {
-        self.__unsafe_private_named.90 = value;
+        self._fields.90 = value;
         self
     }
 }
@@ -7932,7 +7935,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesMaterialExtent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.91 = value.into();
+        self._fields.91 = value.into();
         self
     }
     /// Set the `materialExtent` field to an Option value (optional)
@@ -7940,7 +7943,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesMaterialExtent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.91 = value;
+        self._fields.91 = value;
         self
     }
 }
@@ -7948,12 +7951,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `mentions` field (optional)
     pub fn mentions(mut self, value: impl Into<Option<TvSeriesMentions<'a>>>) -> Self {
-        self.__unsafe_private_named.92 = value.into();
+        self._fields.92 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<TvSeriesMentions<'a>>) -> Self {
-        self.__unsafe_private_named.92 = value;
+        self._fields.92 = value;
         self
     }
 }
@@ -7961,12 +7964,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `musicBy` field (optional)
     pub fn music_by(mut self, value: impl Into<Option<TvSeriesMusicBy<'a>>>) -> Self {
-        self.__unsafe_private_named.93 = value.into();
+        self._fields.93 = value.into();
         self
     }
     /// Set the `musicBy` field to an Option value (optional)
     pub fn maybe_music_by(mut self, value: Option<TvSeriesMusicBy<'a>>) -> Self {
-        self.__unsafe_private_named.93 = value;
+        self._fields.93 = value;
         self
     }
 }
@@ -7974,12 +7977,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<TvSeriesName<'a>>>) -> Self {
-        self.__unsafe_private_named.94 = value.into();
+        self._fields.94 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<TvSeriesName<'a>>) -> Self {
-        self.__unsafe_private_named.94 = value;
+        self._fields.94 = value;
         self
     }
 }
@@ -7990,7 +7993,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesNumberOfEpisodes<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.95 = value.into();
+        self._fields.95 = value.into();
         self
     }
     /// Set the `numberOfEpisodes` field to an Option value (optional)
@@ -7998,7 +8001,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesNumberOfEpisodes<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.95 = value;
+        self._fields.95 = value;
         self
     }
 }
@@ -8009,7 +8012,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesNumberOfSeasons<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.96 = value.into();
+        self._fields.96 = value.into();
         self
     }
     /// Set the `numberOfSeasons` field to an Option value (optional)
@@ -8017,7 +8020,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesNumberOfSeasons<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.96 = value;
+        self._fields.96 = value;
         self
     }
 }
@@ -8025,12 +8028,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `offers` field (optional)
     pub fn offers(mut self, value: impl Into<Option<TvSeriesOffers<'a>>>) -> Self {
-        self.__unsafe_private_named.97 = value.into();
+        self._fields.97 = value.into();
         self
     }
     /// Set the `offers` field to an Option value (optional)
     pub fn maybe_offers(mut self, value: Option<TvSeriesOffers<'a>>) -> Self {
-        self.__unsafe_private_named.97 = value;
+        self._fields.97 = value;
         self
     }
 }
@@ -8038,12 +8041,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `pattern` field (optional)
     pub fn pattern(mut self, value: impl Into<Option<TvSeriesPattern<'a>>>) -> Self {
-        self.__unsafe_private_named.98 = value.into();
+        self._fields.98 = value.into();
         self
     }
     /// Set the `pattern` field to an Option value (optional)
     pub fn maybe_pattern(mut self, value: Option<TvSeriesPattern<'a>>) -> Self {
-        self.__unsafe_private_named.98 = value;
+        self._fields.98 = value;
         self
     }
 }
@@ -8051,12 +8054,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `position` field (optional)
     pub fn position(mut self, value: impl Into<Option<TvSeriesPosition<'a>>>) -> Self {
-        self.__unsafe_private_named.99 = value.into();
+        self._fields.99 = value.into();
         self
     }
     /// Set the `position` field to an Option value (optional)
     pub fn maybe_position(mut self, value: Option<TvSeriesPosition<'a>>) -> Self {
-        self.__unsafe_private_named.99 = value;
+        self._fields.99 = value;
         self
     }
 }
@@ -8067,7 +8070,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesPotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value.into();
+        self._fields.100 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -8075,7 +8078,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesPotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.100 = value;
+        self._fields.100 = value;
         self
     }
 }
@@ -8083,12 +8086,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `producer` field (optional)
     pub fn producer(mut self, value: impl Into<Option<TvSeriesProducer<'a>>>) -> Self {
-        self.__unsafe_private_named.101 = value.into();
+        self._fields.101 = value.into();
         self
     }
     /// Set the `producer` field to an Option value (optional)
     pub fn maybe_producer(mut self, value: Option<TvSeriesProducer<'a>>) -> Self {
-        self.__unsafe_private_named.101 = value;
+        self._fields.101 = value;
         self
     }
 }
@@ -8099,7 +8102,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesProductionCompany<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value.into();
+        self._fields.102 = value.into();
         self
     }
     /// Set the `productionCompany` field to an Option value (optional)
@@ -8107,7 +8110,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesProductionCompany<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value;
+        self._fields.102 = value;
         self
     }
 }
@@ -8115,12 +8118,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `provider` field (optional)
     pub fn provider(mut self, value: impl Into<Option<TvSeriesProvider<'a>>>) -> Self {
-        self.__unsafe_private_named.103 = value.into();
+        self._fields.103 = value.into();
         self
     }
     /// Set the `provider` field to an Option value (optional)
     pub fn maybe_provider(mut self, value: Option<TvSeriesProvider<'a>>) -> Self {
-        self.__unsafe_private_named.103 = value;
+        self._fields.103 = value;
         self
     }
 }
@@ -8131,12 +8134,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesPublication<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value.into();
+        self._fields.104 = value.into();
         self
     }
     /// Set the `publication` field to an Option value (optional)
     pub fn maybe_publication(mut self, value: Option<TvSeriesPublication<'a>>) -> Self {
-        self.__unsafe_private_named.104 = value;
+        self._fields.104 = value;
         self
     }
 }
@@ -8144,12 +8147,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `publisher` field (optional)
     pub fn publisher(mut self, value: impl Into<Option<TvSeriesPublisher<'a>>>) -> Self {
-        self.__unsafe_private_named.105 = value.into();
+        self._fields.105 = value.into();
         self
     }
     /// Set the `publisher` field to an Option value (optional)
     pub fn maybe_publisher(mut self, value: Option<TvSeriesPublisher<'a>>) -> Self {
-        self.__unsafe_private_named.105 = value;
+        self._fields.105 = value;
         self
     }
 }
@@ -8160,7 +8163,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesPublisherImprint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value.into();
+        self._fields.106 = value.into();
         self
     }
     /// Set the `publisherImprint` field to an Option value (optional)
@@ -8168,7 +8171,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesPublisherImprint<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value;
+        self._fields.106 = value;
         self
     }
 }
@@ -8179,7 +8182,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesPublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value.into();
+        self._fields.107 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -8187,7 +8190,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesPublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.107 = value;
+        self._fields.107 = value;
         self
     }
 }
@@ -8198,12 +8201,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesRecordedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.108 = value.into();
+        self._fields.108 = value.into();
         self
     }
     /// Set the `recordedAt` field to an Option value (optional)
     pub fn maybe_recorded_at(mut self, value: Option<TvSeriesRecordedAt<'a>>) -> Self {
-        self.__unsafe_private_named.108 = value;
+        self._fields.108 = value;
         self
     }
 }
@@ -8214,7 +8217,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesReleasedEvent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.109 = value.into();
+        self._fields.109 = value.into();
         self
     }
     /// Set the `releasedEvent` field to an Option value (optional)
@@ -8222,7 +8225,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesReleasedEvent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.109 = value;
+        self._fields.109 = value;
         self
     }
 }
@@ -8230,12 +8233,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<TvSeriesReview<'a>>>) -> Self {
-        self.__unsafe_private_named.110 = value.into();
+        self._fields.110 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<TvSeriesReview<'a>>) -> Self {
-        self.__unsafe_private_named.110 = value;
+        self._fields.110 = value;
         self
     }
 }
@@ -8243,12 +8246,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `reviews` field (optional)
     pub fn reviews(mut self, value: impl Into<Option<TvSeriesReviews<'a>>>) -> Self {
-        self.__unsafe_private_named.111 = value.into();
+        self._fields.111 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<TvSeriesReviews<'a>>) -> Self {
-        self.__unsafe_private_named.111 = value;
+        self._fields.111 = value;
         self
     }
 }
@@ -8256,12 +8259,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<TvSeriesSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.112 = value.into();
+        self._fields.112 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<TvSeriesSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.112 = value;
+        self._fields.112 = value;
         self
     }
 }
@@ -8272,7 +8275,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesSchemaVersion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value.into();
+        self._fields.113 = value.into();
         self
     }
     /// Set the `schemaVersion` field to an Option value (optional)
@@ -8280,7 +8283,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesSchemaVersion<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value;
+        self._fields.113 = value;
         self
     }
 }
@@ -8291,7 +8294,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesSdDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.114 = value.into();
+        self._fields.114 = value.into();
         self
     }
     /// Set the `sdDatePublished` field to an Option value (optional)
@@ -8299,7 +8302,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesSdDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.114 = value;
+        self._fields.114 = value;
         self
     }
 }
@@ -8310,12 +8313,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesSdLicense<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.115 = value.into();
+        self._fields.115 = value.into();
         self
     }
     /// Set the `sdLicense` field to an Option value (optional)
     pub fn maybe_sd_license(mut self, value: Option<TvSeriesSdLicense<'a>>) -> Self {
-        self.__unsafe_private_named.115 = value;
+        self._fields.115 = value;
         self
     }
 }
@@ -8326,12 +8329,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesSdPublisher<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.116 = value.into();
+        self._fields.116 = value.into();
         self
     }
     /// Set the `sdPublisher` field to an Option value (optional)
     pub fn maybe_sd_publisher(mut self, value: Option<TvSeriesSdPublisher<'a>>) -> Self {
-        self.__unsafe_private_named.116 = value;
+        self._fields.116 = value;
         self
     }
 }
@@ -8339,12 +8342,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `season` field (optional)
     pub fn season(mut self, value: impl Into<Option<TvSeriesSeason<'a>>>) -> Self {
-        self.__unsafe_private_named.117 = value.into();
+        self._fields.117 = value.into();
         self
     }
     /// Set the `season` field to an Option value (optional)
     pub fn maybe_season(mut self, value: Option<TvSeriesSeason<'a>>) -> Self {
-        self.__unsafe_private_named.117 = value;
+        self._fields.117 = value;
         self
     }
 }
@@ -8352,12 +8355,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `seasons` field (optional)
     pub fn seasons(mut self, value: impl Into<Option<TvSeriesSeasons<'a>>>) -> Self {
-        self.__unsafe_private_named.118 = value.into();
+        self._fields.118 = value.into();
         self
     }
     /// Set the `seasons` field to an Option value (optional)
     pub fn maybe_seasons(mut self, value: Option<TvSeriesSeasons<'a>>) -> Self {
-        self.__unsafe_private_named.118 = value;
+        self._fields.118 = value;
         self
     }
 }
@@ -8365,12 +8368,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<TvSeriesSize<'a>>>) -> Self {
-        self.__unsafe_private_named.119 = value.into();
+        self._fields.119 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<TvSeriesSize<'a>>) -> Self {
-        self.__unsafe_private_named.119 = value;
+        self._fields.119 = value;
         self
     }
 }
@@ -8381,7 +8384,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesSourceOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.120 = value.into();
+        self._fields.120 = value.into();
         self
     }
     /// Set the `sourceOrganization` field to an Option value (optional)
@@ -8389,7 +8392,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesSourceOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.120 = value;
+        self._fields.120 = value;
         self
     }
 }
@@ -8397,12 +8400,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `spatial` field (optional)
     pub fn spatial(mut self, value: impl Into<Option<TvSeriesSpatial<'a>>>) -> Self {
-        self.__unsafe_private_named.121 = value.into();
+        self._fields.121 = value.into();
         self
     }
     /// Set the `spatial` field to an Option value (optional)
     pub fn maybe_spatial(mut self, value: Option<TvSeriesSpatial<'a>>) -> Self {
-        self.__unsafe_private_named.121 = value;
+        self._fields.121 = value;
         self
     }
 }
@@ -8413,7 +8416,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesSpatialCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.122 = value.into();
+        self._fields.122 = value.into();
         self
     }
     /// Set the `spatialCoverage` field to an Option value (optional)
@@ -8421,7 +8424,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesSpatialCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.122 = value;
+        self._fields.122 = value;
         self
     }
 }
@@ -8429,12 +8432,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `sponsor` field (optional)
     pub fn sponsor(mut self, value: impl Into<Option<TvSeriesSponsor<'a>>>) -> Self {
-        self.__unsafe_private_named.123 = value.into();
+        self._fields.123 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<TvSeriesSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.123 = value;
+        self._fields.123 = value;
         self
     }
 }
@@ -8445,12 +8448,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesStartDate<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.124 = value.into();
+        self._fields.124 = value.into();
         self
     }
     /// Set the `startDate` field to an Option value (optional)
     pub fn maybe_start_date(mut self, value: Option<TvSeriesStartDate<'a>>) -> Self {
-        self.__unsafe_private_named.124 = value;
+        self._fields.124 = value;
         self
     }
 }
@@ -8461,12 +8464,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesSubjectOf<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.125 = value.into();
+        self._fields.125 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<TvSeriesSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.125 = value;
+        self._fields.125 = value;
         self
     }
 }
@@ -8474,12 +8477,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `teaches` field (optional)
     pub fn teaches(mut self, value: impl Into<Option<TvSeriesTeaches<'a>>>) -> Self {
-        self.__unsafe_private_named.126 = value.into();
+        self._fields.126 = value.into();
         self
     }
     /// Set the `teaches` field to an Option value (optional)
     pub fn maybe_teaches(mut self, value: Option<TvSeriesTeaches<'a>>) -> Self {
-        self.__unsafe_private_named.126 = value;
+        self._fields.126 = value;
         self
     }
 }
@@ -8487,12 +8490,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `temporal` field (optional)
     pub fn temporal(mut self, value: impl Into<Option<TvSeriesTemporal<'a>>>) -> Self {
-        self.__unsafe_private_named.127 = value.into();
+        self._fields.127 = value.into();
         self
     }
     /// Set the `temporal` field to an Option value (optional)
     pub fn maybe_temporal(mut self, value: Option<TvSeriesTemporal<'a>>) -> Self {
-        self.__unsafe_private_named.127 = value;
+        self._fields.127 = value;
         self
     }
 }
@@ -8503,7 +8506,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesTemporalCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.128 = value.into();
+        self._fields.128 = value.into();
         self
     }
     /// Set the `temporalCoverage` field to an Option value (optional)
@@ -8511,7 +8514,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesTemporalCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.128 = value;
+        self._fields.128 = value;
         self
     }
 }
@@ -8519,12 +8522,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<TvSeriesText<'a>>>) -> Self {
-        self.__unsafe_private_named.129 = value.into();
+        self._fields.129 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<TvSeriesText<'a>>) -> Self {
-        self.__unsafe_private_named.129 = value;
+        self._fields.129 = value;
         self
     }
 }
@@ -8532,12 +8535,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `thumbnail` field (optional)
     pub fn thumbnail(mut self, value: impl Into<Option<TvSeriesThumbnail<'a>>>) -> Self {
-        self.__unsafe_private_named.130 = value.into();
+        self._fields.130 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<TvSeriesThumbnail<'a>>) -> Self {
-        self.__unsafe_private_named.130 = value;
+        self._fields.130 = value;
         self
     }
 }
@@ -8548,7 +8551,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesThumbnailUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.131 = value.into();
+        self._fields.131 = value.into();
         self
     }
     /// Set the `thumbnailUrl` field to an Option value (optional)
@@ -8556,7 +8559,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesThumbnailUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.131 = value;
+        self._fields.131 = value;
         self
     }
 }
@@ -8567,7 +8570,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesTimeRequired<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.132 = value.into();
+        self._fields.132 = value.into();
         self
     }
     /// Set the `timeRequired` field to an Option value (optional)
@@ -8575,7 +8578,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesTimeRequired<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.132 = value;
+        self._fields.132 = value;
         self
     }
 }
@@ -8586,12 +8589,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesTitleEidr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.133 = value.into();
+        self._fields.133 = value.into();
         self
     }
     /// Set the `titleEIDR` field to an Option value (optional)
     pub fn maybe_title_eidr(mut self, value: Option<TvSeriesTitleEidr<'a>>) -> Self {
-        self.__unsafe_private_named.133 = value;
+        self._fields.133 = value;
         self
     }
 }
@@ -8599,12 +8602,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `trailer` field (optional)
     pub fn trailer(mut self, value: impl Into<Option<TvSeriesTrailer<'a>>>) -> Self {
-        self.__unsafe_private_named.134 = value.into();
+        self._fields.134 = value.into();
         self
     }
     /// Set the `trailer` field to an Option value (optional)
     pub fn maybe_trailer(mut self, value: Option<TvSeriesTrailer<'a>>) -> Self {
-        self.__unsafe_private_named.134 = value;
+        self._fields.134 = value;
         self
     }
 }
@@ -8615,7 +8618,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesTranslationOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.135 = value.into();
+        self._fields.135 = value.into();
         self
     }
     /// Set the `translationOfWork` field to an Option value (optional)
@@ -8623,7 +8626,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesTranslationOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.135 = value;
+        self._fields.135 = value;
         self
     }
 }
@@ -8634,12 +8637,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesTranslator<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.136 = value.into();
+        self._fields.136 = value.into();
         self
     }
     /// Set the `translator` field to an Option value (optional)
     pub fn maybe_translator(mut self, value: Option<TvSeriesTranslator<'a>>) -> Self {
-        self.__unsafe_private_named.136 = value;
+        self._fields.136 = value;
         self
     }
 }
@@ -8650,7 +8653,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesTypicalAgeRange<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.137 = value.into();
+        self._fields.137 = value.into();
         self
     }
     /// Set the `typicalAgeRange` field to an Option value (optional)
@@ -8658,7 +8661,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesTypicalAgeRange<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.137 = value;
+        self._fields.137 = value;
         self
     }
 }
@@ -8666,12 +8669,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<TvSeriesUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.138 = value.into();
+        self._fields.138 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<TvSeriesUrl<'a>>) -> Self {
-        self.__unsafe_private_named.138 = value;
+        self._fields.138 = value;
         self
     }
 }
@@ -8682,12 +8685,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesUsageInfo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.139 = value.into();
+        self._fields.139 = value.into();
         self
     }
     /// Set the `usageInfo` field to an Option value (optional)
     pub fn maybe_usage_info(mut self, value: Option<TvSeriesUsageInfo<'a>>) -> Self {
-        self.__unsafe_private_named.139 = value;
+        self._fields.139 = value;
         self
     }
 }
@@ -8695,12 +8698,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `version` field (optional)
     pub fn version(mut self, value: impl Into<Option<TvSeriesVersion<'a>>>) -> Self {
-        self.__unsafe_private_named.140 = value.into();
+        self._fields.140 = value.into();
         self
     }
     /// Set the `version` field to an Option value (optional)
     pub fn maybe_version(mut self, value: Option<TvSeriesVersion<'a>>) -> Self {
-        self.__unsafe_private_named.140 = value;
+        self._fields.140 = value;
         self
     }
 }
@@ -8708,12 +8711,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
 impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
     /// Set the `video` field (optional)
     pub fn video(mut self, value: impl Into<Option<TvSeriesVideo<'a>>>) -> Self {
-        self.__unsafe_private_named.141 = value.into();
+        self._fields.141 = value.into();
         self
     }
     /// Set the `video` field to an Option value (optional)
     pub fn maybe_video(mut self, value: Option<TvSeriesVideo<'a>>) -> Self {
-        self.__unsafe_private_named.141 = value;
+        self._fields.141 = value;
         self
     }
 }
@@ -8724,12 +8727,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesWordCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.142 = value.into();
+        self._fields.142 = value.into();
         self
     }
     /// Set the `wordCount` field to an Option value (optional)
     pub fn maybe_word_count(mut self, value: Option<TvSeriesWordCount<'a>>) -> Self {
-        self.__unsafe_private_named.142 = value;
+        self._fields.142 = value;
         self
     }
 }
@@ -8740,12 +8743,12 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesWorkExample<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.143 = value.into();
+        self._fields.143 = value.into();
         self
     }
     /// Set the `workExample` field to an Option value (optional)
     pub fn maybe_work_example(mut self, value: Option<TvSeriesWorkExample<'a>>) -> Self {
-        self.__unsafe_private_named.143 = value;
+        self._fields.143 = value;
         self
     }
 }
@@ -8756,7 +8759,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<TvSeriesWorkTranslation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.144 = value.into();
+        self._fields.144 = value.into();
         self
     }
     /// Set the `workTranslation` field to an Option value (optional)
@@ -8764,7 +8767,7 @@ impl<'a, S: tv_series_state::State> TvSeriesBuilder<'a, S> {
         mut self,
         value: Option<TvSeriesWorkTranslation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.144 = value;
+        self._fields.144 = value;
         self
     }
 }
@@ -8776,151 +8779,151 @@ where
     /// Build the final struct
     pub fn build(self) -> TvSeries<'a> {
         TvSeries {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            actor: self.__unsafe_private_named.11,
-            actors: self.__unsafe_private_named.12,
-            additional_type: self.__unsafe_private_named.13,
-            aggregate_rating: self.__unsafe_private_named.14,
-            alternate_name: self.__unsafe_private_named.15,
-            alternative_headline: self.__unsafe_private_named.16,
-            archived_at: self.__unsafe_private_named.17,
-            assesses: self.__unsafe_private_named.18,
-            associated_media: self.__unsafe_private_named.19,
-            audience: self.__unsafe_private_named.20,
-            audio: self.__unsafe_private_named.21,
-            author: self.__unsafe_private_named.22,
-            award: self.__unsafe_private_named.23,
-            awards: self.__unsafe_private_named.24,
-            character: self.__unsafe_private_named.25,
-            citation: self.__unsafe_private_named.26,
-            comment: self.__unsafe_private_named.27,
-            comment_count: self.__unsafe_private_named.28,
-            conditions_of_access: self.__unsafe_private_named.29,
-            contains_season: self.__unsafe_private_named.30,
-            content_location: self.__unsafe_private_named.31,
-            content_rating: self.__unsafe_private_named.32,
-            content_reference_time: self.__unsafe_private_named.33,
-            contributor: self.__unsafe_private_named.34,
-            copyright_holder: self.__unsafe_private_named.35,
-            copyright_notice: self.__unsafe_private_named.36,
-            copyright_year: self.__unsafe_private_named.37,
-            correction: self.__unsafe_private_named.38,
-            country_of_origin: self.__unsafe_private_named.39,
-            creative_work_status: self.__unsafe_private_named.40,
-            creator: self.__unsafe_private_named.41,
-            credit_text: self.__unsafe_private_named.42,
-            date_created: self.__unsafe_private_named.43,
-            date_modified: self.__unsafe_private_named.44,
-            date_published: self.__unsafe_private_named.45,
-            description: self.__unsafe_private_named.46,
-            digital_source_type: self.__unsafe_private_named.47,
-            director: self.__unsafe_private_named.48,
-            directors: self.__unsafe_private_named.49,
-            disambiguating_description: self.__unsafe_private_named.50,
-            discussion_url: self.__unsafe_private_named.51,
-            edit_eidr: self.__unsafe_private_named.52,
-            editor: self.__unsafe_private_named.53,
-            educational_alignment: self.__unsafe_private_named.54,
-            educational_level: self.__unsafe_private_named.55,
-            educational_use: self.__unsafe_private_named.56,
-            encoding: self.__unsafe_private_named.57,
-            encoding_format: self.__unsafe_private_named.58,
-            encodings: self.__unsafe_private_named.59,
-            end_date: self.__unsafe_private_named.60,
-            episode: self.__unsafe_private_named.61,
-            episodes: self.__unsafe_private_named.62,
-            example_of_work: self.__unsafe_private_named.63,
-            expires: self.__unsafe_private_named.64,
-            file_format: self.__unsafe_private_named.65,
-            funder: self.__unsafe_private_named.66,
-            funding: self.__unsafe_private_named.67,
-            genre: self.__unsafe_private_named.68,
-            has_part: self.__unsafe_private_named.69,
-            headline: self.__unsafe_private_named.70,
-            identifier: self.__unsafe_private_named.71,
-            image: self.__unsafe_private_named.72,
-            in_language: self.__unsafe_private_named.73,
-            interaction_statistic: self.__unsafe_private_named.74,
-            interactivity_type: self.__unsafe_private_named.75,
-            interpreted_as_claim: self.__unsafe_private_named.76,
-            is_accessible_for_free: self.__unsafe_private_named.77,
-            is_based_on: self.__unsafe_private_named.78,
-            is_based_on_url: self.__unsafe_private_named.79,
-            is_family_friendly: self.__unsafe_private_named.80,
-            is_part_of: self.__unsafe_private_named.81,
-            issn: self.__unsafe_private_named.82,
-            keywords: self.__unsafe_private_named.83,
-            learning_resource_type: self.__unsafe_private_named.84,
-            license: self.__unsafe_private_named.85,
-            location_created: self.__unsafe_private_named.86,
-            main_entity: self.__unsafe_private_named.87,
-            main_entity_of_page: self.__unsafe_private_named.88,
-            maintainer: self.__unsafe_private_named.89,
-            material: self.__unsafe_private_named.90,
-            material_extent: self.__unsafe_private_named.91,
-            mentions: self.__unsafe_private_named.92,
-            music_by: self.__unsafe_private_named.93,
-            name: self.__unsafe_private_named.94,
-            number_of_episodes: self.__unsafe_private_named.95,
-            number_of_seasons: self.__unsafe_private_named.96,
-            offers: self.__unsafe_private_named.97,
-            pattern: self.__unsafe_private_named.98,
-            position: self.__unsafe_private_named.99,
-            potential_action: self.__unsafe_private_named.100,
-            producer: self.__unsafe_private_named.101,
-            production_company: self.__unsafe_private_named.102,
-            provider: self.__unsafe_private_named.103,
-            publication: self.__unsafe_private_named.104,
-            publisher: self.__unsafe_private_named.105,
-            publisher_imprint: self.__unsafe_private_named.106,
-            publishing_principles: self.__unsafe_private_named.107,
-            recorded_at: self.__unsafe_private_named.108,
-            released_event: self.__unsafe_private_named.109,
-            review: self.__unsafe_private_named.110,
-            reviews: self.__unsafe_private_named.111,
-            same_as: self.__unsafe_private_named.112,
-            schema_version: self.__unsafe_private_named.113,
-            sd_date_published: self.__unsafe_private_named.114,
-            sd_license: self.__unsafe_private_named.115,
-            sd_publisher: self.__unsafe_private_named.116,
-            season: self.__unsafe_private_named.117,
-            seasons: self.__unsafe_private_named.118,
-            size: self.__unsafe_private_named.119,
-            source_organization: self.__unsafe_private_named.120,
-            spatial: self.__unsafe_private_named.121,
-            spatial_coverage: self.__unsafe_private_named.122,
-            sponsor: self.__unsafe_private_named.123,
-            start_date: self.__unsafe_private_named.124,
-            subject_of: self.__unsafe_private_named.125,
-            teaches: self.__unsafe_private_named.126,
-            temporal: self.__unsafe_private_named.127,
-            temporal_coverage: self.__unsafe_private_named.128,
-            text: self.__unsafe_private_named.129,
-            thumbnail: self.__unsafe_private_named.130,
-            thumbnail_url: self.__unsafe_private_named.131,
-            time_required: self.__unsafe_private_named.132,
-            title_eidr: self.__unsafe_private_named.133,
-            trailer: self.__unsafe_private_named.134,
-            translation_of_work: self.__unsafe_private_named.135,
-            translator: self.__unsafe_private_named.136,
-            typical_age_range: self.__unsafe_private_named.137,
-            url: self.__unsafe_private_named.138,
-            usage_info: self.__unsafe_private_named.139,
-            version: self.__unsafe_private_named.140,
-            video: self.__unsafe_private_named.141,
-            word_count: self.__unsafe_private_named.142,
-            work_example: self.__unsafe_private_named.143,
-            work_translation: self.__unsafe_private_named.144,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            actor: self._fields.11,
+            actors: self._fields.12,
+            additional_type: self._fields.13,
+            aggregate_rating: self._fields.14,
+            alternate_name: self._fields.15,
+            alternative_headline: self._fields.16,
+            archived_at: self._fields.17,
+            assesses: self._fields.18,
+            associated_media: self._fields.19,
+            audience: self._fields.20,
+            audio: self._fields.21,
+            author: self._fields.22,
+            award: self._fields.23,
+            awards: self._fields.24,
+            character: self._fields.25,
+            citation: self._fields.26,
+            comment: self._fields.27,
+            comment_count: self._fields.28,
+            conditions_of_access: self._fields.29,
+            contains_season: self._fields.30,
+            content_location: self._fields.31,
+            content_rating: self._fields.32,
+            content_reference_time: self._fields.33,
+            contributor: self._fields.34,
+            copyright_holder: self._fields.35,
+            copyright_notice: self._fields.36,
+            copyright_year: self._fields.37,
+            correction: self._fields.38,
+            country_of_origin: self._fields.39,
+            creative_work_status: self._fields.40,
+            creator: self._fields.41,
+            credit_text: self._fields.42,
+            date_created: self._fields.43,
+            date_modified: self._fields.44,
+            date_published: self._fields.45,
+            description: self._fields.46,
+            digital_source_type: self._fields.47,
+            director: self._fields.48,
+            directors: self._fields.49,
+            disambiguating_description: self._fields.50,
+            discussion_url: self._fields.51,
+            edit_eidr: self._fields.52,
+            editor: self._fields.53,
+            educational_alignment: self._fields.54,
+            educational_level: self._fields.55,
+            educational_use: self._fields.56,
+            encoding: self._fields.57,
+            encoding_format: self._fields.58,
+            encodings: self._fields.59,
+            end_date: self._fields.60,
+            episode: self._fields.61,
+            episodes: self._fields.62,
+            example_of_work: self._fields.63,
+            expires: self._fields.64,
+            file_format: self._fields.65,
+            funder: self._fields.66,
+            funding: self._fields.67,
+            genre: self._fields.68,
+            has_part: self._fields.69,
+            headline: self._fields.70,
+            identifier: self._fields.71,
+            image: self._fields.72,
+            in_language: self._fields.73,
+            interaction_statistic: self._fields.74,
+            interactivity_type: self._fields.75,
+            interpreted_as_claim: self._fields.76,
+            is_accessible_for_free: self._fields.77,
+            is_based_on: self._fields.78,
+            is_based_on_url: self._fields.79,
+            is_family_friendly: self._fields.80,
+            is_part_of: self._fields.81,
+            issn: self._fields.82,
+            keywords: self._fields.83,
+            learning_resource_type: self._fields.84,
+            license: self._fields.85,
+            location_created: self._fields.86,
+            main_entity: self._fields.87,
+            main_entity_of_page: self._fields.88,
+            maintainer: self._fields.89,
+            material: self._fields.90,
+            material_extent: self._fields.91,
+            mentions: self._fields.92,
+            music_by: self._fields.93,
+            name: self._fields.94,
+            number_of_episodes: self._fields.95,
+            number_of_seasons: self._fields.96,
+            offers: self._fields.97,
+            pattern: self._fields.98,
+            position: self._fields.99,
+            potential_action: self._fields.100,
+            producer: self._fields.101,
+            production_company: self._fields.102,
+            provider: self._fields.103,
+            publication: self._fields.104,
+            publisher: self._fields.105,
+            publisher_imprint: self._fields.106,
+            publishing_principles: self._fields.107,
+            recorded_at: self._fields.108,
+            released_event: self._fields.109,
+            review: self._fields.110,
+            reviews: self._fields.111,
+            same_as: self._fields.112,
+            schema_version: self._fields.113,
+            sd_date_published: self._fields.114,
+            sd_license: self._fields.115,
+            sd_publisher: self._fields.116,
+            season: self._fields.117,
+            seasons: self._fields.118,
+            size: self._fields.119,
+            source_organization: self._fields.120,
+            spatial: self._fields.121,
+            spatial_coverage: self._fields.122,
+            sponsor: self._fields.123,
+            start_date: self._fields.124,
+            subject_of: self._fields.125,
+            teaches: self._fields.126,
+            temporal: self._fields.127,
+            temporal_coverage: self._fields.128,
+            text: self._fields.129,
+            thumbnail: self._fields.130,
+            thumbnail_url: self._fields.131,
+            time_required: self._fields.132,
+            title_eidr: self._fields.133,
+            trailer: self._fields.134,
+            translation_of_work: self._fields.135,
+            translator: self._fields.136,
+            typical_age_range: self._fields.137,
+            url: self._fields.138,
+            usage_info: self._fields.139,
+            version: self._fields.140,
+            video: self._fields.141,
+            word_count: self._fields.142,
+            work_example: self._fields.143,
+            work_translation: self._fields.144,
             extra_data: Default::default(),
         }
     }
@@ -8930,151 +8933,151 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> TvSeries<'a> {
         TvSeries {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            actor: self.__unsafe_private_named.11,
-            actors: self.__unsafe_private_named.12,
-            additional_type: self.__unsafe_private_named.13,
-            aggregate_rating: self.__unsafe_private_named.14,
-            alternate_name: self.__unsafe_private_named.15,
-            alternative_headline: self.__unsafe_private_named.16,
-            archived_at: self.__unsafe_private_named.17,
-            assesses: self.__unsafe_private_named.18,
-            associated_media: self.__unsafe_private_named.19,
-            audience: self.__unsafe_private_named.20,
-            audio: self.__unsafe_private_named.21,
-            author: self.__unsafe_private_named.22,
-            award: self.__unsafe_private_named.23,
-            awards: self.__unsafe_private_named.24,
-            character: self.__unsafe_private_named.25,
-            citation: self.__unsafe_private_named.26,
-            comment: self.__unsafe_private_named.27,
-            comment_count: self.__unsafe_private_named.28,
-            conditions_of_access: self.__unsafe_private_named.29,
-            contains_season: self.__unsafe_private_named.30,
-            content_location: self.__unsafe_private_named.31,
-            content_rating: self.__unsafe_private_named.32,
-            content_reference_time: self.__unsafe_private_named.33,
-            contributor: self.__unsafe_private_named.34,
-            copyright_holder: self.__unsafe_private_named.35,
-            copyright_notice: self.__unsafe_private_named.36,
-            copyright_year: self.__unsafe_private_named.37,
-            correction: self.__unsafe_private_named.38,
-            country_of_origin: self.__unsafe_private_named.39,
-            creative_work_status: self.__unsafe_private_named.40,
-            creator: self.__unsafe_private_named.41,
-            credit_text: self.__unsafe_private_named.42,
-            date_created: self.__unsafe_private_named.43,
-            date_modified: self.__unsafe_private_named.44,
-            date_published: self.__unsafe_private_named.45,
-            description: self.__unsafe_private_named.46,
-            digital_source_type: self.__unsafe_private_named.47,
-            director: self.__unsafe_private_named.48,
-            directors: self.__unsafe_private_named.49,
-            disambiguating_description: self.__unsafe_private_named.50,
-            discussion_url: self.__unsafe_private_named.51,
-            edit_eidr: self.__unsafe_private_named.52,
-            editor: self.__unsafe_private_named.53,
-            educational_alignment: self.__unsafe_private_named.54,
-            educational_level: self.__unsafe_private_named.55,
-            educational_use: self.__unsafe_private_named.56,
-            encoding: self.__unsafe_private_named.57,
-            encoding_format: self.__unsafe_private_named.58,
-            encodings: self.__unsafe_private_named.59,
-            end_date: self.__unsafe_private_named.60,
-            episode: self.__unsafe_private_named.61,
-            episodes: self.__unsafe_private_named.62,
-            example_of_work: self.__unsafe_private_named.63,
-            expires: self.__unsafe_private_named.64,
-            file_format: self.__unsafe_private_named.65,
-            funder: self.__unsafe_private_named.66,
-            funding: self.__unsafe_private_named.67,
-            genre: self.__unsafe_private_named.68,
-            has_part: self.__unsafe_private_named.69,
-            headline: self.__unsafe_private_named.70,
-            identifier: self.__unsafe_private_named.71,
-            image: self.__unsafe_private_named.72,
-            in_language: self.__unsafe_private_named.73,
-            interaction_statistic: self.__unsafe_private_named.74,
-            interactivity_type: self.__unsafe_private_named.75,
-            interpreted_as_claim: self.__unsafe_private_named.76,
-            is_accessible_for_free: self.__unsafe_private_named.77,
-            is_based_on: self.__unsafe_private_named.78,
-            is_based_on_url: self.__unsafe_private_named.79,
-            is_family_friendly: self.__unsafe_private_named.80,
-            is_part_of: self.__unsafe_private_named.81,
-            issn: self.__unsafe_private_named.82,
-            keywords: self.__unsafe_private_named.83,
-            learning_resource_type: self.__unsafe_private_named.84,
-            license: self.__unsafe_private_named.85,
-            location_created: self.__unsafe_private_named.86,
-            main_entity: self.__unsafe_private_named.87,
-            main_entity_of_page: self.__unsafe_private_named.88,
-            maintainer: self.__unsafe_private_named.89,
-            material: self.__unsafe_private_named.90,
-            material_extent: self.__unsafe_private_named.91,
-            mentions: self.__unsafe_private_named.92,
-            music_by: self.__unsafe_private_named.93,
-            name: self.__unsafe_private_named.94,
-            number_of_episodes: self.__unsafe_private_named.95,
-            number_of_seasons: self.__unsafe_private_named.96,
-            offers: self.__unsafe_private_named.97,
-            pattern: self.__unsafe_private_named.98,
-            position: self.__unsafe_private_named.99,
-            potential_action: self.__unsafe_private_named.100,
-            producer: self.__unsafe_private_named.101,
-            production_company: self.__unsafe_private_named.102,
-            provider: self.__unsafe_private_named.103,
-            publication: self.__unsafe_private_named.104,
-            publisher: self.__unsafe_private_named.105,
-            publisher_imprint: self.__unsafe_private_named.106,
-            publishing_principles: self.__unsafe_private_named.107,
-            recorded_at: self.__unsafe_private_named.108,
-            released_event: self.__unsafe_private_named.109,
-            review: self.__unsafe_private_named.110,
-            reviews: self.__unsafe_private_named.111,
-            same_as: self.__unsafe_private_named.112,
-            schema_version: self.__unsafe_private_named.113,
-            sd_date_published: self.__unsafe_private_named.114,
-            sd_license: self.__unsafe_private_named.115,
-            sd_publisher: self.__unsafe_private_named.116,
-            season: self.__unsafe_private_named.117,
-            seasons: self.__unsafe_private_named.118,
-            size: self.__unsafe_private_named.119,
-            source_organization: self.__unsafe_private_named.120,
-            spatial: self.__unsafe_private_named.121,
-            spatial_coverage: self.__unsafe_private_named.122,
-            sponsor: self.__unsafe_private_named.123,
-            start_date: self.__unsafe_private_named.124,
-            subject_of: self.__unsafe_private_named.125,
-            teaches: self.__unsafe_private_named.126,
-            temporal: self.__unsafe_private_named.127,
-            temporal_coverage: self.__unsafe_private_named.128,
-            text: self.__unsafe_private_named.129,
-            thumbnail: self.__unsafe_private_named.130,
-            thumbnail_url: self.__unsafe_private_named.131,
-            time_required: self.__unsafe_private_named.132,
-            title_eidr: self.__unsafe_private_named.133,
-            trailer: self.__unsafe_private_named.134,
-            translation_of_work: self.__unsafe_private_named.135,
-            translator: self.__unsafe_private_named.136,
-            typical_age_range: self.__unsafe_private_named.137,
-            url: self.__unsafe_private_named.138,
-            usage_info: self.__unsafe_private_named.139,
-            version: self.__unsafe_private_named.140,
-            video: self.__unsafe_private_named.141,
-            word_count: self.__unsafe_private_named.142,
-            work_example: self.__unsafe_private_named.143,
-            work_translation: self.__unsafe_private_named.144,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            actor: self._fields.11,
+            actors: self._fields.12,
+            additional_type: self._fields.13,
+            aggregate_rating: self._fields.14,
+            alternate_name: self._fields.15,
+            alternative_headline: self._fields.16,
+            archived_at: self._fields.17,
+            assesses: self._fields.18,
+            associated_media: self._fields.19,
+            audience: self._fields.20,
+            audio: self._fields.21,
+            author: self._fields.22,
+            award: self._fields.23,
+            awards: self._fields.24,
+            character: self._fields.25,
+            citation: self._fields.26,
+            comment: self._fields.27,
+            comment_count: self._fields.28,
+            conditions_of_access: self._fields.29,
+            contains_season: self._fields.30,
+            content_location: self._fields.31,
+            content_rating: self._fields.32,
+            content_reference_time: self._fields.33,
+            contributor: self._fields.34,
+            copyright_holder: self._fields.35,
+            copyright_notice: self._fields.36,
+            copyright_year: self._fields.37,
+            correction: self._fields.38,
+            country_of_origin: self._fields.39,
+            creative_work_status: self._fields.40,
+            creator: self._fields.41,
+            credit_text: self._fields.42,
+            date_created: self._fields.43,
+            date_modified: self._fields.44,
+            date_published: self._fields.45,
+            description: self._fields.46,
+            digital_source_type: self._fields.47,
+            director: self._fields.48,
+            directors: self._fields.49,
+            disambiguating_description: self._fields.50,
+            discussion_url: self._fields.51,
+            edit_eidr: self._fields.52,
+            editor: self._fields.53,
+            educational_alignment: self._fields.54,
+            educational_level: self._fields.55,
+            educational_use: self._fields.56,
+            encoding: self._fields.57,
+            encoding_format: self._fields.58,
+            encodings: self._fields.59,
+            end_date: self._fields.60,
+            episode: self._fields.61,
+            episodes: self._fields.62,
+            example_of_work: self._fields.63,
+            expires: self._fields.64,
+            file_format: self._fields.65,
+            funder: self._fields.66,
+            funding: self._fields.67,
+            genre: self._fields.68,
+            has_part: self._fields.69,
+            headline: self._fields.70,
+            identifier: self._fields.71,
+            image: self._fields.72,
+            in_language: self._fields.73,
+            interaction_statistic: self._fields.74,
+            interactivity_type: self._fields.75,
+            interpreted_as_claim: self._fields.76,
+            is_accessible_for_free: self._fields.77,
+            is_based_on: self._fields.78,
+            is_based_on_url: self._fields.79,
+            is_family_friendly: self._fields.80,
+            is_part_of: self._fields.81,
+            issn: self._fields.82,
+            keywords: self._fields.83,
+            learning_resource_type: self._fields.84,
+            license: self._fields.85,
+            location_created: self._fields.86,
+            main_entity: self._fields.87,
+            main_entity_of_page: self._fields.88,
+            maintainer: self._fields.89,
+            material: self._fields.90,
+            material_extent: self._fields.91,
+            mentions: self._fields.92,
+            music_by: self._fields.93,
+            name: self._fields.94,
+            number_of_episodes: self._fields.95,
+            number_of_seasons: self._fields.96,
+            offers: self._fields.97,
+            pattern: self._fields.98,
+            position: self._fields.99,
+            potential_action: self._fields.100,
+            producer: self._fields.101,
+            production_company: self._fields.102,
+            provider: self._fields.103,
+            publication: self._fields.104,
+            publisher: self._fields.105,
+            publisher_imprint: self._fields.106,
+            publishing_principles: self._fields.107,
+            recorded_at: self._fields.108,
+            released_event: self._fields.109,
+            review: self._fields.110,
+            reviews: self._fields.111,
+            same_as: self._fields.112,
+            schema_version: self._fields.113,
+            sd_date_published: self._fields.114,
+            sd_license: self._fields.115,
+            sd_publisher: self._fields.116,
+            season: self._fields.117,
+            seasons: self._fields.118,
+            size: self._fields.119,
+            source_organization: self._fields.120,
+            spatial: self._fields.121,
+            spatial_coverage: self._fields.122,
+            sponsor: self._fields.123,
+            start_date: self._fields.124,
+            subject_of: self._fields.125,
+            teaches: self._fields.126,
+            temporal: self._fields.127,
+            temporal_coverage: self._fields.128,
+            text: self._fields.129,
+            thumbnail: self._fields.130,
+            thumbnail_url: self._fields.131,
+            time_required: self._fields.132,
+            title_eidr: self._fields.133,
+            trailer: self._fields.134,
+            translation_of_work: self._fields.135,
+            translator: self._fields.136,
+            typical_age_range: self._fields.137,
+            url: self._fields.138,
+            usage_info: self._fields.139,
+            version: self._fields.140,
+            video: self._fields.141,
+            word_count: self._fields.142,
+            work_example: self._fields.143,
+            work_translation: self._fields.144,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/type/web_site.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/type/web_site.rs
index c301e778..c2abca08 100644
--- a/crates/jacquard-api/src/social_flockfeeds/lexical/type/web_site.rs
+++ b/crates/jacquard-api/src/social_flockfeeds/lexical/type/web_site.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -5409,8 +5412,8 @@ pub mod web_site_state {
 
 /// Builder for constructing an instance of this type
 pub struct WebSiteBuilder<'a, S: web_site_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<WebSiteAbout<'a>>,
         Option<WebSiteAbstract<'a>>,
         Option<WebSiteAccessMode<'a>>,
@@ -5540,7 +5543,7 @@ pub struct WebSiteBuilder<'a, S: web_site_state::State> {
         Option<WebSiteWorkExample<'a>>,
         Option<WebSiteWorkTranslation<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> WebSite<'a> {
@@ -5554,8 +5557,8 @@ impl<'a> WebSiteBuilder<'a, web_site_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WebSiteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -5685,7 +5688,7 @@ impl<'a> WebSiteBuilder<'a, web_site_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -5693,12 +5696,12 @@ impl<'a> WebSiteBuilder<'a, web_site_state::Empty> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `about` field (optional)
     pub fn about(mut self, value: impl Into<Option<WebSiteAbout<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `about` field to an Option value (optional)
     pub fn maybe_about(mut self, value: Option<WebSiteAbout<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -5706,12 +5709,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `abstract` field (optional)
     pub fn r#abstract(mut self, value: impl Into<Option<WebSiteAbstract<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `abstract` field to an Option value (optional)
     pub fn maybe_abstract(mut self, value: Option<WebSiteAbstract<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -5722,12 +5725,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteAccessMode<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `accessMode` field to an Option value (optional)
     pub fn maybe_access_mode(mut self, value: Option<WebSiteAccessMode<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -5738,7 +5741,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteAccessModeSufficient<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `accessModeSufficient` field to an Option value (optional)
@@ -5746,7 +5749,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteAccessModeSufficient<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -5757,7 +5760,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteAccessibilityApi<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `accessibilityAPI` field to an Option value (optional)
@@ -5765,7 +5768,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteAccessibilityApi<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -5776,7 +5779,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteAccessibilityControl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `accessibilityControl` field to an Option value (optional)
@@ -5784,7 +5787,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteAccessibilityControl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -5795,7 +5798,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteAccessibilityFeature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `accessibilityFeature` field to an Option value (optional)
@@ -5803,7 +5806,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteAccessibilityFeature<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -5814,7 +5817,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteAccessibilityHazard<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `accessibilityHazard` field to an Option value (optional)
@@ -5822,7 +5825,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteAccessibilityHazard<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -5833,7 +5836,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteAccessibilitySummary<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `accessibilitySummary` field to an Option value (optional)
@@ -5841,7 +5844,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteAccessibilitySummary<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -5852,7 +5855,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteAccountablePerson<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `accountablePerson` field to an Option value (optional)
@@ -5860,7 +5863,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteAccountablePerson<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -5871,7 +5874,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteAcquireLicensePage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `acquireLicensePage` field to an Option value (optional)
@@ -5879,7 +5882,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteAcquireLicensePage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -5890,7 +5893,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteAdditionalType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `additionalType` field to an Option value (optional)
@@ -5898,7 +5901,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteAdditionalType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -5909,7 +5912,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteAggregateRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `aggregateRating` field to an Option value (optional)
@@ -5917,7 +5920,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteAggregateRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -5928,7 +5931,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteAlternateName<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `alternateName` field to an Option value (optional)
@@ -5936,7 +5939,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteAlternateName<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -5947,7 +5950,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteAlternativeHeadline<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `alternativeHeadline` field to an Option value (optional)
@@ -5955,7 +5958,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteAlternativeHeadline<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -5966,12 +5969,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteArchivedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `archivedAt` field to an Option value (optional)
     pub fn maybe_archived_at(mut self, value: Option<WebSiteArchivedAt<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -5979,12 +5982,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `assesses` field (optional)
     pub fn assesses(mut self, value: impl Into<Option<WebSiteAssesses<'a>>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `assesses` field to an Option value (optional)
     pub fn maybe_assesses(mut self, value: Option<WebSiteAssesses<'a>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -5995,7 +5998,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteAssociatedMedia<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `associatedMedia` field to an Option value (optional)
@@ -6003,7 +6006,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteAssociatedMedia<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -6011,12 +6014,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `audience` field (optional)
     pub fn audience(mut self, value: impl Into<Option<WebSiteAudience<'a>>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `audience` field to an Option value (optional)
     pub fn maybe_audience(mut self, value: Option<WebSiteAudience<'a>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -6024,12 +6027,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `audio` field (optional)
     pub fn audio(mut self, value: impl Into<Option<WebSiteAudio<'a>>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `audio` field to an Option value (optional)
     pub fn maybe_audio(mut self, value: Option<WebSiteAudio<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -6037,12 +6040,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `author` field (optional)
     pub fn author(mut self, value: impl Into<Option<WebSiteAuthor<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `author` field to an Option value (optional)
     pub fn maybe_author(mut self, value: Option<WebSiteAuthor<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -6050,12 +6053,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `award` field (optional)
     pub fn award(mut self, value: impl Into<Option<WebSiteAward<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `award` field to an Option value (optional)
     pub fn maybe_award(mut self, value: Option<WebSiteAward<'a>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -6063,12 +6066,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `awards` field (optional)
     pub fn awards(mut self, value: impl Into<Option<WebSiteAwards<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `awards` field to an Option value (optional)
     pub fn maybe_awards(mut self, value: Option<WebSiteAwards<'a>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -6076,12 +6079,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `character` field (optional)
     pub fn character(mut self, value: impl Into<Option<WebSiteCharacter<'a>>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `character` field to an Option value (optional)
     pub fn maybe_character(mut self, value: Option<WebSiteCharacter<'a>>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -6089,12 +6092,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `citation` field (optional)
     pub fn citation(mut self, value: impl Into<Option<WebSiteCitation<'a>>>) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `citation` field to an Option value (optional)
     pub fn maybe_citation(mut self, value: Option<WebSiteCitation<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -6102,12 +6105,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<WebSiteComment<'a>>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<WebSiteComment<'a>>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -6118,7 +6121,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteCommentCount<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `commentCount` field to an Option value (optional)
@@ -6126,7 +6129,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteCommentCount<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -6137,7 +6140,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteConditionsOfAccess<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `conditionsOfAccess` field to an Option value (optional)
@@ -6145,7 +6148,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteConditionsOfAccess<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -6156,7 +6159,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteContentLocation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `contentLocation` field to an Option value (optional)
@@ -6164,7 +6167,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteContentLocation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -6175,7 +6178,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteContentRating<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `contentRating` field to an Option value (optional)
@@ -6183,7 +6186,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteContentRating<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -6194,7 +6197,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteContentReferenceTime<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `contentReferenceTime` field to an Option value (optional)
@@ -6202,7 +6205,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteContentReferenceTime<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -6213,12 +6216,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteContributor<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `contributor` field to an Option value (optional)
     pub fn maybe_contributor(mut self, value: Option<WebSiteContributor<'a>>) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -6229,7 +6232,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteCopyrightHolder<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `copyrightHolder` field to an Option value (optional)
@@ -6237,7 +6240,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteCopyrightHolder<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -6248,7 +6251,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteCopyrightNotice<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `copyrightNotice` field to an Option value (optional)
@@ -6256,7 +6259,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteCopyrightNotice<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -6267,7 +6270,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteCopyrightYear<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `copyrightYear` field to an Option value (optional)
@@ -6275,7 +6278,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteCopyrightYear<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -6286,12 +6289,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteCorrection<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `correction` field to an Option value (optional)
     pub fn maybe_correction(mut self, value: Option<WebSiteCorrection<'a>>) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -6302,7 +6305,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteCountryOfOrigin<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value.into();
+        self._fields.36 = value.into();
         self
     }
     /// Set the `countryOfOrigin` field to an Option value (optional)
@@ -6310,7 +6313,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteCountryOfOrigin<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.36 = value;
+        self._fields.36 = value;
         self
     }
 }
@@ -6321,7 +6324,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteCreativeWorkStatus<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value.into();
+        self._fields.37 = value.into();
         self
     }
     /// Set the `creativeWorkStatus` field to an Option value (optional)
@@ -6329,7 +6332,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteCreativeWorkStatus<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.37 = value;
+        self._fields.37 = value;
         self
     }
 }
@@ -6337,12 +6340,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `creator` field (optional)
     pub fn creator(mut self, value: impl Into<Option<WebSiteCreator<'a>>>) -> Self {
-        self.__unsafe_private_named.38 = value.into();
+        self._fields.38 = value.into();
         self
     }
     /// Set the `creator` field to an Option value (optional)
     pub fn maybe_creator(mut self, value: Option<WebSiteCreator<'a>>) -> Self {
-        self.__unsafe_private_named.38 = value;
+        self._fields.38 = value;
         self
     }
 }
@@ -6353,12 +6356,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteCreditText<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.39 = value.into();
+        self._fields.39 = value.into();
         self
     }
     /// Set the `creditText` field to an Option value (optional)
     pub fn maybe_credit_text(mut self, value: Option<WebSiteCreditText<'a>>) -> Self {
-        self.__unsafe_private_named.39 = value;
+        self._fields.39 = value;
         self
     }
 }
@@ -6369,12 +6372,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteDateCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.40 = value.into();
+        self._fields.40 = value.into();
         self
     }
     /// Set the `dateCreated` field to an Option value (optional)
     pub fn maybe_date_created(mut self, value: Option<WebSiteDateCreated<'a>>) -> Self {
-        self.__unsafe_private_named.40 = value;
+        self._fields.40 = value;
         self
     }
 }
@@ -6385,7 +6388,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteDateModified<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value.into();
+        self._fields.41 = value.into();
         self
     }
     /// Set the `dateModified` field to an Option value (optional)
@@ -6393,7 +6396,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteDateModified<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.41 = value;
+        self._fields.41 = value;
         self
     }
 }
@@ -6404,7 +6407,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value.into();
+        self._fields.42 = value.into();
         self
     }
     /// Set the `datePublished` field to an Option value (optional)
@@ -6412,7 +6415,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.42 = value;
+        self._fields.42 = value;
         self
     }
 }
@@ -6423,12 +6426,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.43 = value.into();
+        self._fields.43 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<WebSiteDescription<'a>>) -> Self {
-        self.__unsafe_private_named.43 = value;
+        self._fields.43 = value;
         self
     }
 }
@@ -6439,7 +6442,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteDigitalSourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value.into();
+        self._fields.44 = value.into();
         self
     }
     /// Set the `digitalSourceType` field to an Option value (optional)
@@ -6447,7 +6450,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteDigitalSourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.44 = value;
+        self._fields.44 = value;
         self
     }
 }
@@ -6458,7 +6461,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteDisambiguatingDescription<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value.into();
+        self._fields.45 = value.into();
         self
     }
     /// Set the `disambiguatingDescription` field to an Option value (optional)
@@ -6466,7 +6469,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteDisambiguatingDescription<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.45 = value;
+        self._fields.45 = value;
         self
     }
 }
@@ -6477,7 +6480,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteDiscussionUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value.into();
+        self._fields.46 = value.into();
         self
     }
     /// Set the `discussionUrl` field to an Option value (optional)
@@ -6485,7 +6488,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteDiscussionUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.46 = value;
+        self._fields.46 = value;
         self
     }
 }
@@ -6493,12 +6496,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `editEIDR` field (optional)
     pub fn edit_eidr(mut self, value: impl Into<Option<WebSiteEditEidr<'a>>>) -> Self {
-        self.__unsafe_private_named.47 = value.into();
+        self._fields.47 = value.into();
         self
     }
     /// Set the `editEIDR` field to an Option value (optional)
     pub fn maybe_edit_eidr(mut self, value: Option<WebSiteEditEidr<'a>>) -> Self {
-        self.__unsafe_private_named.47 = value;
+        self._fields.47 = value;
         self
     }
 }
@@ -6506,12 +6509,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `editor` field (optional)
     pub fn editor(mut self, value: impl Into<Option<WebSiteEditor<'a>>>) -> Self {
-        self.__unsafe_private_named.48 = value.into();
+        self._fields.48 = value.into();
         self
     }
     /// Set the `editor` field to an Option value (optional)
     pub fn maybe_editor(mut self, value: Option<WebSiteEditor<'a>>) -> Self {
-        self.__unsafe_private_named.48 = value;
+        self._fields.48 = value;
         self
     }
 }
@@ -6522,7 +6525,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteEducationalAlignment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value.into();
+        self._fields.49 = value.into();
         self
     }
     /// Set the `educationalAlignment` field to an Option value (optional)
@@ -6530,7 +6533,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteEducationalAlignment<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.49 = value;
+        self._fields.49 = value;
         self
     }
 }
@@ -6541,7 +6544,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteEducationalLevel<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value.into();
+        self._fields.50 = value.into();
         self
     }
     /// Set the `educationalLevel` field to an Option value (optional)
@@ -6549,7 +6552,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteEducationalLevel<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.50 = value;
+        self._fields.50 = value;
         self
     }
 }
@@ -6560,7 +6563,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteEducationalUse<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value.into();
+        self._fields.51 = value.into();
         self
     }
     /// Set the `educationalUse` field to an Option value (optional)
@@ -6568,7 +6571,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteEducationalUse<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.51 = value;
+        self._fields.51 = value;
         self
     }
 }
@@ -6576,12 +6579,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `encoding` field (optional)
     pub fn encoding(mut self, value: impl Into<Option<WebSiteEncoding<'a>>>) -> Self {
-        self.__unsafe_private_named.52 = value.into();
+        self._fields.52 = value.into();
         self
     }
     /// Set the `encoding` field to an Option value (optional)
     pub fn maybe_encoding(mut self, value: Option<WebSiteEncoding<'a>>) -> Self {
-        self.__unsafe_private_named.52 = value;
+        self._fields.52 = value;
         self
     }
 }
@@ -6592,7 +6595,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteEncodingFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value.into();
+        self._fields.53 = value.into();
         self
     }
     /// Set the `encodingFormat` field to an Option value (optional)
@@ -6600,7 +6603,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteEncodingFormat<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.53 = value;
+        self._fields.53 = value;
         self
     }
 }
@@ -6608,12 +6611,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `encodings` field (optional)
     pub fn encodings(mut self, value: impl Into<Option<WebSiteEncodings<'a>>>) -> Self {
-        self.__unsafe_private_named.54 = value.into();
+        self._fields.54 = value.into();
         self
     }
     /// Set the `encodings` field to an Option value (optional)
     pub fn maybe_encodings(mut self, value: Option<WebSiteEncodings<'a>>) -> Self {
-        self.__unsafe_private_named.54 = value;
+        self._fields.54 = value;
         self
     }
 }
@@ -6624,7 +6627,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteExampleOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value.into();
+        self._fields.55 = value.into();
         self
     }
     /// Set the `exampleOfWork` field to an Option value (optional)
@@ -6632,7 +6635,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteExampleOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.55 = value;
+        self._fields.55 = value;
         self
     }
 }
@@ -6640,12 +6643,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `expires` field (optional)
     pub fn expires(mut self, value: impl Into<Option<WebSiteExpires<'a>>>) -> Self {
-        self.__unsafe_private_named.56 = value.into();
+        self._fields.56 = value.into();
         self
     }
     /// Set the `expires` field to an Option value (optional)
     pub fn maybe_expires(mut self, value: Option<WebSiteExpires<'a>>) -> Self {
-        self.__unsafe_private_named.56 = value;
+        self._fields.56 = value;
         self
     }
 }
@@ -6656,12 +6659,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteFileFormat<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.57 = value.into();
+        self._fields.57 = value.into();
         self
     }
     /// Set the `fileFormat` field to an Option value (optional)
     pub fn maybe_file_format(mut self, value: Option<WebSiteFileFormat<'a>>) -> Self {
-        self.__unsafe_private_named.57 = value;
+        self._fields.57 = value;
         self
     }
 }
@@ -6669,12 +6672,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `funder` field (optional)
     pub fn funder(mut self, value: impl Into<Option<WebSiteFunder<'a>>>) -> Self {
-        self.__unsafe_private_named.58 = value.into();
+        self._fields.58 = value.into();
         self
     }
     /// Set the `funder` field to an Option value (optional)
     pub fn maybe_funder(mut self, value: Option<WebSiteFunder<'a>>) -> Self {
-        self.__unsafe_private_named.58 = value;
+        self._fields.58 = value;
         self
     }
 }
@@ -6682,12 +6685,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `funding` field (optional)
     pub fn funding(mut self, value: impl Into<Option<WebSiteFunding<'a>>>) -> Self {
-        self.__unsafe_private_named.59 = value.into();
+        self._fields.59 = value.into();
         self
     }
     /// Set the `funding` field to an Option value (optional)
     pub fn maybe_funding(mut self, value: Option<WebSiteFunding<'a>>) -> Self {
-        self.__unsafe_private_named.59 = value;
+        self._fields.59 = value;
         self
     }
 }
@@ -6695,12 +6698,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `genre` field (optional)
     pub fn genre(mut self, value: impl Into<Option<WebSiteGenre<'a>>>) -> Self {
-        self.__unsafe_private_named.60 = value.into();
+        self._fields.60 = value.into();
         self
     }
     /// Set the `genre` field to an Option value (optional)
     pub fn maybe_genre(mut self, value: Option<WebSiteGenre<'a>>) -> Self {
-        self.__unsafe_private_named.60 = value;
+        self._fields.60 = value;
         self
     }
 }
@@ -6708,12 +6711,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `hasPart` field (optional)
     pub fn has_part(mut self, value: impl Into<Option<WebSiteHasPart<'a>>>) -> Self {
-        self.__unsafe_private_named.61 = value.into();
+        self._fields.61 = value.into();
         self
     }
     /// Set the `hasPart` field to an Option value (optional)
     pub fn maybe_has_part(mut self, value: Option<WebSiteHasPart<'a>>) -> Self {
-        self.__unsafe_private_named.61 = value;
+        self._fields.61 = value;
         self
     }
 }
@@ -6721,12 +6724,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `headline` field (optional)
     pub fn headline(mut self, value: impl Into<Option<WebSiteHeadline<'a>>>) -> Self {
-        self.__unsafe_private_named.62 = value.into();
+        self._fields.62 = value.into();
         self
     }
     /// Set the `headline` field to an Option value (optional)
     pub fn maybe_headline(mut self, value: Option<WebSiteHeadline<'a>>) -> Self {
-        self.__unsafe_private_named.62 = value;
+        self._fields.62 = value;
         self
     }
 }
@@ -6737,12 +6740,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteIdentifier<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.63 = value.into();
+        self._fields.63 = value.into();
         self
     }
     /// Set the `identifier` field to an Option value (optional)
     pub fn maybe_identifier(mut self, value: Option<WebSiteIdentifier<'a>>) -> Self {
-        self.__unsafe_private_named.63 = value;
+        self._fields.63 = value;
         self
     }
 }
@@ -6750,12 +6753,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `image` field (optional)
     pub fn image(mut self, value: impl Into<Option<WebSiteImage<'a>>>) -> Self {
-        self.__unsafe_private_named.64 = value.into();
+        self._fields.64 = value.into();
         self
     }
     /// Set the `image` field to an Option value (optional)
     pub fn maybe_image(mut self, value: Option<WebSiteImage<'a>>) -> Self {
-        self.__unsafe_private_named.64 = value;
+        self._fields.64 = value;
         self
     }
 }
@@ -6766,12 +6769,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteInLanguage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.65 = value.into();
+        self._fields.65 = value.into();
         self
     }
     /// Set the `inLanguage` field to an Option value (optional)
     pub fn maybe_in_language(mut self, value: Option<WebSiteInLanguage<'a>>) -> Self {
-        self.__unsafe_private_named.65 = value;
+        self._fields.65 = value;
         self
     }
 }
@@ -6782,7 +6785,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteInteractionStatistic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.66 = value.into();
+        self._fields.66 = value.into();
         self
     }
     /// Set the `interactionStatistic` field to an Option value (optional)
@@ -6790,7 +6793,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteInteractionStatistic<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.66 = value;
+        self._fields.66 = value;
         self
     }
 }
@@ -6801,7 +6804,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteInteractivityType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.67 = value.into();
+        self._fields.67 = value.into();
         self
     }
     /// Set the `interactivityType` field to an Option value (optional)
@@ -6809,7 +6812,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteInteractivityType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.67 = value;
+        self._fields.67 = value;
         self
     }
 }
@@ -6820,7 +6823,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteInterpretedAsClaim<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.68 = value.into();
+        self._fields.68 = value.into();
         self
     }
     /// Set the `interpretedAsClaim` field to an Option value (optional)
@@ -6828,7 +6831,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteInterpretedAsClaim<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.68 = value;
+        self._fields.68 = value;
         self
     }
 }
@@ -6839,7 +6842,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteIsAccessibleForFree<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value.into();
+        self._fields.69 = value.into();
         self
     }
     /// Set the `isAccessibleForFree` field to an Option value (optional)
@@ -6847,7 +6850,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteIsAccessibleForFree<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.69 = value;
+        self._fields.69 = value;
         self
     }
 }
@@ -6858,12 +6861,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteIsBasedOn<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.70 = value.into();
+        self._fields.70 = value.into();
         self
     }
     /// Set the `isBasedOn` field to an Option value (optional)
     pub fn maybe_is_based_on(mut self, value: Option<WebSiteIsBasedOn<'a>>) -> Self {
-        self.__unsafe_private_named.70 = value;
+        self._fields.70 = value;
         self
     }
 }
@@ -6874,7 +6877,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteIsBasedOnUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value.into();
+        self._fields.71 = value.into();
         self
     }
     /// Set the `isBasedOnUrl` field to an Option value (optional)
@@ -6882,7 +6885,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteIsBasedOnUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.71 = value;
+        self._fields.71 = value;
         self
     }
 }
@@ -6893,7 +6896,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteIsFamilyFriendly<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value.into();
+        self._fields.72 = value.into();
         self
     }
     /// Set the `isFamilyFriendly` field to an Option value (optional)
@@ -6901,7 +6904,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteIsFamilyFriendly<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.72 = value;
+        self._fields.72 = value;
         self
     }
 }
@@ -6909,12 +6912,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `isPartOf` field (optional)
     pub fn is_part_of(mut self, value: impl Into<Option<WebSiteIsPartOf<'a>>>) -> Self {
-        self.__unsafe_private_named.73 = value.into();
+        self._fields.73 = value.into();
         self
     }
     /// Set the `isPartOf` field to an Option value (optional)
     pub fn maybe_is_part_of(mut self, value: Option<WebSiteIsPartOf<'a>>) -> Self {
-        self.__unsafe_private_named.73 = value;
+        self._fields.73 = value;
         self
     }
 }
@@ -6922,12 +6925,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `issn` field (optional)
     pub fn issn(mut self, value: impl Into<Option<WebSiteIssn<'a>>>) -> Self {
-        self.__unsafe_private_named.74 = value.into();
+        self._fields.74 = value.into();
         self
     }
     /// Set the `issn` field to an Option value (optional)
     pub fn maybe_issn(mut self, value: Option<WebSiteIssn<'a>>) -> Self {
-        self.__unsafe_private_named.74 = value;
+        self._fields.74 = value;
         self
     }
 }
@@ -6935,12 +6938,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `keywords` field (optional)
     pub fn keywords(mut self, value: impl Into<Option<WebSiteKeywords<'a>>>) -> Self {
-        self.__unsafe_private_named.75 = value.into();
+        self._fields.75 = value.into();
         self
     }
     /// Set the `keywords` field to an Option value (optional)
     pub fn maybe_keywords(mut self, value: Option<WebSiteKeywords<'a>>) -> Self {
-        self.__unsafe_private_named.75 = value;
+        self._fields.75 = value;
         self
     }
 }
@@ -6951,7 +6954,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteLearningResourceType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value.into();
+        self._fields.76 = value.into();
         self
     }
     /// Set the `learningResourceType` field to an Option value (optional)
@@ -6959,7 +6962,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteLearningResourceType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.76 = value;
+        self._fields.76 = value;
         self
     }
 }
@@ -6967,12 +6970,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `license` field (optional)
     pub fn license(mut self, value: impl Into<Option<WebSiteLicense<'a>>>) -> Self {
-        self.__unsafe_private_named.77 = value.into();
+        self._fields.77 = value.into();
         self
     }
     /// Set the `license` field to an Option value (optional)
     pub fn maybe_license(mut self, value: Option<WebSiteLicense<'a>>) -> Self {
-        self.__unsafe_private_named.77 = value;
+        self._fields.77 = value;
         self
     }
 }
@@ -6983,7 +6986,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteLocationCreated<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value.into();
+        self._fields.78 = value.into();
         self
     }
     /// Set the `locationCreated` field to an Option value (optional)
@@ -6991,7 +6994,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteLocationCreated<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.78 = value;
+        self._fields.78 = value;
         self
     }
 }
@@ -7002,12 +7005,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteMainEntity<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.79 = value.into();
+        self._fields.79 = value.into();
         self
     }
     /// Set the `mainEntity` field to an Option value (optional)
     pub fn maybe_main_entity(mut self, value: Option<WebSiteMainEntity<'a>>) -> Self {
-        self.__unsafe_private_named.79 = value;
+        self._fields.79 = value;
         self
     }
 }
@@ -7018,7 +7021,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteMainEntityOfPage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value.into();
+        self._fields.80 = value.into();
         self
     }
     /// Set the `mainEntityOfPage` field to an Option value (optional)
@@ -7026,7 +7029,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteMainEntityOfPage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.80 = value;
+        self._fields.80 = value;
         self
     }
 }
@@ -7037,12 +7040,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteMaintainer<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.81 = value.into();
+        self._fields.81 = value.into();
         self
     }
     /// Set the `maintainer` field to an Option value (optional)
     pub fn maybe_maintainer(mut self, value: Option<WebSiteMaintainer<'a>>) -> Self {
-        self.__unsafe_private_named.81 = value;
+        self._fields.81 = value;
         self
     }
 }
@@ -7050,12 +7053,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `material` field (optional)
     pub fn material(mut self, value: impl Into<Option<WebSiteMaterial<'a>>>) -> Self {
-        self.__unsafe_private_named.82 = value.into();
+        self._fields.82 = value.into();
         self
     }
     /// Set the `material` field to an Option value (optional)
     pub fn maybe_material(mut self, value: Option<WebSiteMaterial<'a>>) -> Self {
-        self.__unsafe_private_named.82 = value;
+        self._fields.82 = value;
         self
     }
 }
@@ -7066,7 +7069,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteMaterialExtent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.83 = value.into();
+        self._fields.83 = value.into();
         self
     }
     /// Set the `materialExtent` field to an Option value (optional)
@@ -7074,7 +7077,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteMaterialExtent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.83 = value;
+        self._fields.83 = value;
         self
     }
 }
@@ -7082,12 +7085,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `mentions` field (optional)
     pub fn mentions(mut self, value: impl Into<Option<WebSiteMentions<'a>>>) -> Self {
-        self.__unsafe_private_named.84 = value.into();
+        self._fields.84 = value.into();
         self
     }
     /// Set the `mentions` field to an Option value (optional)
     pub fn maybe_mentions(mut self, value: Option<WebSiteMentions<'a>>) -> Self {
-        self.__unsafe_private_named.84 = value;
+        self._fields.84 = value;
         self
     }
 }
@@ -7095,12 +7098,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<WebSiteName<'a>>>) -> Self {
-        self.__unsafe_private_named.85 = value.into();
+        self._fields.85 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<WebSiteName<'a>>) -> Self {
-        self.__unsafe_private_named.85 = value;
+        self._fields.85 = value;
         self
     }
 }
@@ -7108,12 +7111,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `offers` field (optional)
     pub fn offers(mut self, value: impl Into<Option<WebSiteOffers<'a>>>) -> Self {
-        self.__unsafe_private_named.86 = value.into();
+        self._fields.86 = value.into();
         self
     }
     /// Set the `offers` field to an Option value (optional)
     pub fn maybe_offers(mut self, value: Option<WebSiteOffers<'a>>) -> Self {
-        self.__unsafe_private_named.86 = value;
+        self._fields.86 = value;
         self
     }
 }
@@ -7121,12 +7124,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `pattern` field (optional)
     pub fn pattern(mut self, value: impl Into<Option<WebSitePattern<'a>>>) -> Self {
-        self.__unsafe_private_named.87 = value.into();
+        self._fields.87 = value.into();
         self
     }
     /// Set the `pattern` field to an Option value (optional)
     pub fn maybe_pattern(mut self, value: Option<WebSitePattern<'a>>) -> Self {
-        self.__unsafe_private_named.87 = value;
+        self._fields.87 = value;
         self
     }
 }
@@ -7134,12 +7137,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `position` field (optional)
     pub fn position(mut self, value: impl Into<Option<WebSitePosition<'a>>>) -> Self {
-        self.__unsafe_private_named.88 = value.into();
+        self._fields.88 = value.into();
         self
     }
     /// Set the `position` field to an Option value (optional)
     pub fn maybe_position(mut self, value: Option<WebSitePosition<'a>>) -> Self {
-        self.__unsafe_private_named.88 = value;
+        self._fields.88 = value;
         self
     }
 }
@@ -7150,7 +7153,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSitePotentialAction<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.89 = value.into();
+        self._fields.89 = value.into();
         self
     }
     /// Set the `potentialAction` field to an Option value (optional)
@@ -7158,7 +7161,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSitePotentialAction<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.89 = value;
+        self._fields.89 = value;
         self
     }
 }
@@ -7166,12 +7169,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `producer` field (optional)
     pub fn producer(mut self, value: impl Into<Option<WebSiteProducer<'a>>>) -> Self {
-        self.__unsafe_private_named.90 = value.into();
+        self._fields.90 = value.into();
         self
     }
     /// Set the `producer` field to an Option value (optional)
     pub fn maybe_producer(mut self, value: Option<WebSiteProducer<'a>>) -> Self {
-        self.__unsafe_private_named.90 = value;
+        self._fields.90 = value;
         self
     }
 }
@@ -7179,12 +7182,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `provider` field (optional)
     pub fn provider(mut self, value: impl Into<Option<WebSiteProvider<'a>>>) -> Self {
-        self.__unsafe_private_named.91 = value.into();
+        self._fields.91 = value.into();
         self
     }
     /// Set the `provider` field to an Option value (optional)
     pub fn maybe_provider(mut self, value: Option<WebSiteProvider<'a>>) -> Self {
-        self.__unsafe_private_named.91 = value;
+        self._fields.91 = value;
         self
     }
 }
@@ -7195,12 +7198,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSitePublication<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.92 = value.into();
+        self._fields.92 = value.into();
         self
     }
     /// Set the `publication` field to an Option value (optional)
     pub fn maybe_publication(mut self, value: Option<WebSitePublication<'a>>) -> Self {
-        self.__unsafe_private_named.92 = value;
+        self._fields.92 = value;
         self
     }
 }
@@ -7208,12 +7211,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `publisher` field (optional)
     pub fn publisher(mut self, value: impl Into<Option<WebSitePublisher<'a>>>) -> Self {
-        self.__unsafe_private_named.93 = value.into();
+        self._fields.93 = value.into();
         self
     }
     /// Set the `publisher` field to an Option value (optional)
     pub fn maybe_publisher(mut self, value: Option<WebSitePublisher<'a>>) -> Self {
-        self.__unsafe_private_named.93 = value;
+        self._fields.93 = value;
         self
     }
 }
@@ -7224,7 +7227,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSitePublisherImprint<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value.into();
+        self._fields.94 = value.into();
         self
     }
     /// Set the `publisherImprint` field to an Option value (optional)
@@ -7232,7 +7235,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSitePublisherImprint<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.94 = value;
+        self._fields.94 = value;
         self
     }
 }
@@ -7243,7 +7246,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSitePublishingPrinciples<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.95 = value.into();
+        self._fields.95 = value.into();
         self
     }
     /// Set the `publishingPrinciples` field to an Option value (optional)
@@ -7251,7 +7254,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSitePublishingPrinciples<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.95 = value;
+        self._fields.95 = value;
         self
     }
 }
@@ -7262,12 +7265,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteRecordedAt<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.96 = value.into();
+        self._fields.96 = value.into();
         self
     }
     /// Set the `recordedAt` field to an Option value (optional)
     pub fn maybe_recorded_at(mut self, value: Option<WebSiteRecordedAt<'a>>) -> Self {
-        self.__unsafe_private_named.96 = value;
+        self._fields.96 = value;
         self
     }
 }
@@ -7278,7 +7281,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteReleasedEvent<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.97 = value.into();
+        self._fields.97 = value.into();
         self
     }
     /// Set the `releasedEvent` field to an Option value (optional)
@@ -7286,7 +7289,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteReleasedEvent<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.97 = value;
+        self._fields.97 = value;
         self
     }
 }
@@ -7294,12 +7297,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `review` field (optional)
     pub fn review(mut self, value: impl Into<Option<WebSiteReview<'a>>>) -> Self {
-        self.__unsafe_private_named.98 = value.into();
+        self._fields.98 = value.into();
         self
     }
     /// Set the `review` field to an Option value (optional)
     pub fn maybe_review(mut self, value: Option<WebSiteReview<'a>>) -> Self {
-        self.__unsafe_private_named.98 = value;
+        self._fields.98 = value;
         self
     }
 }
@@ -7307,12 +7310,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `reviews` field (optional)
     pub fn reviews(mut self, value: impl Into<Option<WebSiteReviews<'a>>>) -> Self {
-        self.__unsafe_private_named.99 = value.into();
+        self._fields.99 = value.into();
         self
     }
     /// Set the `reviews` field to an Option value (optional)
     pub fn maybe_reviews(mut self, value: Option<WebSiteReviews<'a>>) -> Self {
-        self.__unsafe_private_named.99 = value;
+        self._fields.99 = value;
         self
     }
 }
@@ -7320,12 +7323,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `sameAs` field (optional)
     pub fn same_as(mut self, value: impl Into<Option<WebSiteSameAs<'a>>>) -> Self {
-        self.__unsafe_private_named.100 = value.into();
+        self._fields.100 = value.into();
         self
     }
     /// Set the `sameAs` field to an Option value (optional)
     pub fn maybe_same_as(mut self, value: Option<WebSiteSameAs<'a>>) -> Self {
-        self.__unsafe_private_named.100 = value;
+        self._fields.100 = value;
         self
     }
 }
@@ -7336,7 +7339,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteSchemaVersion<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value.into();
+        self._fields.101 = value.into();
         self
     }
     /// Set the `schemaVersion` field to an Option value (optional)
@@ -7344,7 +7347,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteSchemaVersion<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.101 = value;
+        self._fields.101 = value;
         self
     }
 }
@@ -7355,7 +7358,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteSdDatePublished<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value.into();
+        self._fields.102 = value.into();
         self
     }
     /// Set the `sdDatePublished` field to an Option value (optional)
@@ -7363,7 +7366,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteSdDatePublished<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.102 = value;
+        self._fields.102 = value;
         self
     }
 }
@@ -7371,12 +7374,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `sdLicense` field (optional)
     pub fn sd_license(mut self, value: impl Into<Option<WebSiteSdLicense<'a>>>) -> Self {
-        self.__unsafe_private_named.103 = value.into();
+        self._fields.103 = value.into();
         self
     }
     /// Set the `sdLicense` field to an Option value (optional)
     pub fn maybe_sd_license(mut self, value: Option<WebSiteSdLicense<'a>>) -> Self {
-        self.__unsafe_private_named.103 = value;
+        self._fields.103 = value;
         self
     }
 }
@@ -7387,12 +7390,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteSdPublisher<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.104 = value.into();
+        self._fields.104 = value.into();
         self
     }
     /// Set the `sdPublisher` field to an Option value (optional)
     pub fn maybe_sd_publisher(mut self, value: Option<WebSiteSdPublisher<'a>>) -> Self {
-        self.__unsafe_private_named.104 = value;
+        self._fields.104 = value;
         self
     }
 }
@@ -7400,12 +7403,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `size` field (optional)
     pub fn size(mut self, value: impl Into<Option<WebSiteSize<'a>>>) -> Self {
-        self.__unsafe_private_named.105 = value.into();
+        self._fields.105 = value.into();
         self
     }
     /// Set the `size` field to an Option value (optional)
     pub fn maybe_size(mut self, value: Option<WebSiteSize<'a>>) -> Self {
-        self.__unsafe_private_named.105 = value;
+        self._fields.105 = value;
         self
     }
 }
@@ -7416,7 +7419,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteSourceOrganization<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value.into();
+        self._fields.106 = value.into();
         self
     }
     /// Set the `sourceOrganization` field to an Option value (optional)
@@ -7424,7 +7427,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteSourceOrganization<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.106 = value;
+        self._fields.106 = value;
         self
     }
 }
@@ -7432,12 +7435,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `spatial` field (optional)
     pub fn spatial(mut self, value: impl Into<Option<WebSiteSpatial<'a>>>) -> Self {
-        self.__unsafe_private_named.107 = value.into();
+        self._fields.107 = value.into();
         self
     }
     /// Set the `spatial` field to an Option value (optional)
     pub fn maybe_spatial(mut self, value: Option<WebSiteSpatial<'a>>) -> Self {
-        self.__unsafe_private_named.107 = value;
+        self._fields.107 = value;
         self
     }
 }
@@ -7448,7 +7451,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteSpatialCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.108 = value.into();
+        self._fields.108 = value.into();
         self
     }
     /// Set the `spatialCoverage` field to an Option value (optional)
@@ -7456,7 +7459,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteSpatialCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.108 = value;
+        self._fields.108 = value;
         self
     }
 }
@@ -7464,12 +7467,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `sponsor` field (optional)
     pub fn sponsor(mut self, value: impl Into<Option<WebSiteSponsor<'a>>>) -> Self {
-        self.__unsafe_private_named.109 = value.into();
+        self._fields.109 = value.into();
         self
     }
     /// Set the `sponsor` field to an Option value (optional)
     pub fn maybe_sponsor(mut self, value: Option<WebSiteSponsor<'a>>) -> Self {
-        self.__unsafe_private_named.109 = value;
+        self._fields.109 = value;
         self
     }
 }
@@ -7477,12 +7480,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `subjectOf` field (optional)
     pub fn subject_of(mut self, value: impl Into<Option<WebSiteSubjectOf<'a>>>) -> Self {
-        self.__unsafe_private_named.110 = value.into();
+        self._fields.110 = value.into();
         self
     }
     /// Set the `subjectOf` field to an Option value (optional)
     pub fn maybe_subject_of(mut self, value: Option<WebSiteSubjectOf<'a>>) -> Self {
-        self.__unsafe_private_named.110 = value;
+        self._fields.110 = value;
         self
     }
 }
@@ -7490,12 +7493,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `teaches` field (optional)
     pub fn teaches(mut self, value: impl Into<Option<WebSiteTeaches<'a>>>) -> Self {
-        self.__unsafe_private_named.111 = value.into();
+        self._fields.111 = value.into();
         self
     }
     /// Set the `teaches` field to an Option value (optional)
     pub fn maybe_teaches(mut self, value: Option<WebSiteTeaches<'a>>) -> Self {
-        self.__unsafe_private_named.111 = value;
+        self._fields.111 = value;
         self
     }
 }
@@ -7503,12 +7506,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `temporal` field (optional)
     pub fn temporal(mut self, value: impl Into<Option<WebSiteTemporal<'a>>>) -> Self {
-        self.__unsafe_private_named.112 = value.into();
+        self._fields.112 = value.into();
         self
     }
     /// Set the `temporal` field to an Option value (optional)
     pub fn maybe_temporal(mut self, value: Option<WebSiteTemporal<'a>>) -> Self {
-        self.__unsafe_private_named.112 = value;
+        self._fields.112 = value;
         self
     }
 }
@@ -7519,7 +7522,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteTemporalCoverage<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value.into();
+        self._fields.113 = value.into();
         self
     }
     /// Set the `temporalCoverage` field to an Option value (optional)
@@ -7527,7 +7530,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteTemporalCoverage<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.113 = value;
+        self._fields.113 = value;
         self
     }
 }
@@ -7535,12 +7538,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<WebSiteText<'a>>>) -> Self {
-        self.__unsafe_private_named.114 = value.into();
+        self._fields.114 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<WebSiteText<'a>>) -> Self {
-        self.__unsafe_private_named.114 = value;
+        self._fields.114 = value;
         self
     }
 }
@@ -7548,12 +7551,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `thumbnail` field (optional)
     pub fn thumbnail(mut self, value: impl Into<Option<WebSiteThumbnail<'a>>>) -> Self {
-        self.__unsafe_private_named.115 = value.into();
+        self._fields.115 = value.into();
         self
     }
     /// Set the `thumbnail` field to an Option value (optional)
     pub fn maybe_thumbnail(mut self, value: Option<WebSiteThumbnail<'a>>) -> Self {
-        self.__unsafe_private_named.115 = value;
+        self._fields.115 = value;
         self
     }
 }
@@ -7564,7 +7567,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteThumbnailUrl<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.116 = value.into();
+        self._fields.116 = value.into();
         self
     }
     /// Set the `thumbnailUrl` field to an Option value (optional)
@@ -7572,7 +7575,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteThumbnailUrl<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.116 = value;
+        self._fields.116 = value;
         self
     }
 }
@@ -7583,7 +7586,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteTimeRequired<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.117 = value.into();
+        self._fields.117 = value.into();
         self
     }
     /// Set the `timeRequired` field to an Option value (optional)
@@ -7591,7 +7594,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteTimeRequired<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.117 = value;
+        self._fields.117 = value;
         self
     }
 }
@@ -7602,7 +7605,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteTranslationOfWork<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.118 = value.into();
+        self._fields.118 = value.into();
         self
     }
     /// Set the `translationOfWork` field to an Option value (optional)
@@ -7610,7 +7613,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteTranslationOfWork<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.118 = value;
+        self._fields.118 = value;
         self
     }
 }
@@ -7621,12 +7624,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteTranslator<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.119 = value.into();
+        self._fields.119 = value.into();
         self
     }
     /// Set the `translator` field to an Option value (optional)
     pub fn maybe_translator(mut self, value: Option<WebSiteTranslator<'a>>) -> Self {
-        self.__unsafe_private_named.119 = value;
+        self._fields.119 = value;
         self
     }
 }
@@ -7637,7 +7640,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteTypicalAgeRange<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.120 = value.into();
+        self._fields.120 = value.into();
         self
     }
     /// Set the `typicalAgeRange` field to an Option value (optional)
@@ -7645,7 +7648,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteTypicalAgeRange<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.120 = value;
+        self._fields.120 = value;
         self
     }
 }
@@ -7653,12 +7656,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `url` field (optional)
     pub fn url(mut self, value: impl Into<Option<WebSiteUrl<'a>>>) -> Self {
-        self.__unsafe_private_named.121 = value.into();
+        self._fields.121 = value.into();
         self
     }
     /// Set the `url` field to an Option value (optional)
     pub fn maybe_url(mut self, value: Option<WebSiteUrl<'a>>) -> Self {
-        self.__unsafe_private_named.121 = value;
+        self._fields.121 = value;
         self
     }
 }
@@ -7666,12 +7669,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `usageInfo` field (optional)
     pub fn usage_info(mut self, value: impl Into<Option<WebSiteUsageInfo<'a>>>) -> Self {
-        self.__unsafe_private_named.122 = value.into();
+        self._fields.122 = value.into();
         self
     }
     /// Set the `usageInfo` field to an Option value (optional)
     pub fn maybe_usage_info(mut self, value: Option<WebSiteUsageInfo<'a>>) -> Self {
-        self.__unsafe_private_named.122 = value;
+        self._fields.122 = value;
         self
     }
 }
@@ -7679,12 +7682,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `version` field (optional)
     pub fn version(mut self, value: impl Into<Option<WebSiteVersion<'a>>>) -> Self {
-        self.__unsafe_private_named.123 = value.into();
+        self._fields.123 = value.into();
         self
     }
     /// Set the `version` field to an Option value (optional)
     pub fn maybe_version(mut self, value: Option<WebSiteVersion<'a>>) -> Self {
-        self.__unsafe_private_named.123 = value;
+        self._fields.123 = value;
         self
     }
 }
@@ -7692,12 +7695,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `video` field (optional)
     pub fn video(mut self, value: impl Into<Option<WebSiteVideo<'a>>>) -> Self {
-        self.__unsafe_private_named.124 = value.into();
+        self._fields.124 = value.into();
         self
     }
     /// Set the `video` field to an Option value (optional)
     pub fn maybe_video(mut self, value: Option<WebSiteVideo<'a>>) -> Self {
-        self.__unsafe_private_named.124 = value;
+        self._fields.124 = value;
         self
     }
 }
@@ -7705,12 +7708,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
 impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
     /// Set the `wordCount` field (optional)
     pub fn word_count(mut self, value: impl Into<Option<WebSiteWordCount<'a>>>) -> Self {
-        self.__unsafe_private_named.125 = value.into();
+        self._fields.125 = value.into();
         self
     }
     /// Set the `wordCount` field to an Option value (optional)
     pub fn maybe_word_count(mut self, value: Option<WebSiteWordCount<'a>>) -> Self {
-        self.__unsafe_private_named.125 = value;
+        self._fields.125 = value;
         self
     }
 }
@@ -7721,12 +7724,12 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteWorkExample<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.126 = value.into();
+        self._fields.126 = value.into();
         self
     }
     /// Set the `workExample` field to an Option value (optional)
     pub fn maybe_work_example(mut self, value: Option<WebSiteWorkExample<'a>>) -> Self {
-        self.__unsafe_private_named.126 = value;
+        self._fields.126 = value;
         self
     }
 }
@@ -7737,7 +7740,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<WebSiteWorkTranslation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.127 = value.into();
+        self._fields.127 = value.into();
         self
     }
     /// Set the `workTranslation` field to an Option value (optional)
@@ -7745,7 +7748,7 @@ impl<'a, S: web_site_state::State> WebSiteBuilder<'a, S> {
         mut self,
         value: Option<WebSiteWorkTranslation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.127 = value;
+        self._fields.127 = value;
         self
     }
 }
@@ -7757,134 +7760,134 @@ where
     /// Build the final struct
     pub fn build(self) -> WebSite<'a> {
         WebSite {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            additional_type: self.__unsafe_private_named.11,
-            aggregate_rating: self.__unsafe_private_named.12,
-            alternate_name: self.__unsafe_private_named.13,
-            alternative_headline: self.__unsafe_private_named.14,
-            archived_at: self.__unsafe_private_named.15,
-            assesses: self.__unsafe_private_named.16,
-            associated_media: self.__unsafe_private_named.17,
-            audience: self.__unsafe_private_named.18,
-            audio: self.__unsafe_private_named.19,
-            author: self.__unsafe_private_named.20,
-            award: self.__unsafe_private_named.21,
-            awards: self.__unsafe_private_named.22,
-            character: self.__unsafe_private_named.23,
-            citation: self.__unsafe_private_named.24,
-            comment: self.__unsafe_private_named.25,
-            comment_count: self.__unsafe_private_named.26,
-            conditions_of_access: self.__unsafe_private_named.27,
-            content_location: self.__unsafe_private_named.28,
-            content_rating: self.__unsafe_private_named.29,
-            content_reference_time: self.__unsafe_private_named.30,
-            contributor: self.__unsafe_private_named.31,
-            copyright_holder: self.__unsafe_private_named.32,
-            copyright_notice: self.__unsafe_private_named.33,
-            copyright_year: self.__unsafe_private_named.34,
-            correction: self.__unsafe_private_named.35,
-            country_of_origin: self.__unsafe_private_named.36,
-            creative_work_status: self.__unsafe_private_named.37,
-            creator: self.__unsafe_private_named.38,
-            credit_text: self.__unsafe_private_named.39,
-            date_created: self.__unsafe_private_named.40,
-            date_modified: self.__unsafe_private_named.41,
-            date_published: self.__unsafe_private_named.42,
-            description: self.__unsafe_private_named.43,
-            digital_source_type: self.__unsafe_private_named.44,
-            disambiguating_description: self.__unsafe_private_named.45,
-            discussion_url: self.__unsafe_private_named.46,
-            edit_eidr: self.__unsafe_private_named.47,
-            editor: self.__unsafe_private_named.48,
-            educational_alignment: self.__unsafe_private_named.49,
-            educational_level: self.__unsafe_private_named.50,
-            educational_use: self.__unsafe_private_named.51,
-            encoding: self.__unsafe_private_named.52,
-            encoding_format: self.__unsafe_private_named.53,
-            encodings: self.__unsafe_private_named.54,
-            example_of_work: self.__unsafe_private_named.55,
-            expires: self.__unsafe_private_named.56,
-            file_format: self.__unsafe_private_named.57,
-            funder: self.__unsafe_private_named.58,
-            funding: self.__unsafe_private_named.59,
-            genre: self.__unsafe_private_named.60,
-            has_part: self.__unsafe_private_named.61,
-            headline: self.__unsafe_private_named.62,
-            identifier: self.__unsafe_private_named.63,
-            image: self.__unsafe_private_named.64,
-            in_language: self.__unsafe_private_named.65,
-            interaction_statistic: self.__unsafe_private_named.66,
-            interactivity_type: self.__unsafe_private_named.67,
-            interpreted_as_claim: self.__unsafe_private_named.68,
-            is_accessible_for_free: self.__unsafe_private_named.69,
-            is_based_on: self.__unsafe_private_named.70,
-            is_based_on_url: self.__unsafe_private_named.71,
-            is_family_friendly: self.__unsafe_private_named.72,
-            is_part_of: self.__unsafe_private_named.73,
-            issn: self.__unsafe_private_named.74,
-            keywords: self.__unsafe_private_named.75,
-            learning_resource_type: self.__unsafe_private_named.76,
-            license: self.__unsafe_private_named.77,
-            location_created: self.__unsafe_private_named.78,
-            main_entity: self.__unsafe_private_named.79,
-            main_entity_of_page: self.__unsafe_private_named.80,
-            maintainer: self.__unsafe_private_named.81,
-            material: self.__unsafe_private_named.82,
-            material_extent: self.__unsafe_private_named.83,
-            mentions: self.__unsafe_private_named.84,
-            name: self.__unsafe_private_named.85,
-            offers: self.__unsafe_private_named.86,
-            pattern: self.__unsafe_private_named.87,
-            position: self.__unsafe_private_named.88,
-            potential_action: self.__unsafe_private_named.89,
-            producer: self.__unsafe_private_named.90,
-            provider: self.__unsafe_private_named.91,
-            publication: self.__unsafe_private_named.92,
-            publisher: self.__unsafe_private_named.93,
-            publisher_imprint: self.__unsafe_private_named.94,
-            publishing_principles: self.__unsafe_private_named.95,
-            recorded_at: self.__unsafe_private_named.96,
-            released_event: self.__unsafe_private_named.97,
-            review: self.__unsafe_private_named.98,
-            reviews: self.__unsafe_private_named.99,
-            same_as: self.__unsafe_private_named.100,
-            schema_version: self.__unsafe_private_named.101,
-            sd_date_published: self.__unsafe_private_named.102,
-            sd_license: self.__unsafe_private_named.103,
-            sd_publisher: self.__unsafe_private_named.104,
-            size: self.__unsafe_private_named.105,
-            source_organization: self.__unsafe_private_named.106,
-            spatial: self.__unsafe_private_named.107,
-            spatial_coverage: self.__unsafe_private_named.108,
-            sponsor: self.__unsafe_private_named.109,
-            subject_of: self.__unsafe_private_named.110,
-            teaches: self.__unsafe_private_named.111,
-            temporal: self.__unsafe_private_named.112,
-            temporal_coverage: self.__unsafe_private_named.113,
-            text: self.__unsafe_private_named.114,
-            thumbnail: self.__unsafe_private_named.115,
-            thumbnail_url: self.__unsafe_private_named.116,
-            time_required: self.__unsafe_private_named.117,
-            translation_of_work: self.__unsafe_private_named.118,
-            translator: self.__unsafe_private_named.119,
-            typical_age_range: self.__unsafe_private_named.120,
-            url: self.__unsafe_private_named.121,
-            usage_info: self.__unsafe_private_named.122,
-            version: self.__unsafe_private_named.123,
-            video: self.__unsafe_private_named.124,
-            word_count: self.__unsafe_private_named.125,
-            work_example: self.__unsafe_private_named.126,
-            work_translation: self.__unsafe_private_named.127,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            additional_type: self._fields.11,
+            aggregate_rating: self._fields.12,
+            alternate_name: self._fields.13,
+            alternative_headline: self._fields.14,
+            archived_at: self._fields.15,
+            assesses: self._fields.16,
+            associated_media: self._fields.17,
+            audience: self._fields.18,
+            audio: self._fields.19,
+            author: self._fields.20,
+            award: self._fields.21,
+            awards: self._fields.22,
+            character: self._fields.23,
+            citation: self._fields.24,
+            comment: self._fields.25,
+            comment_count: self._fields.26,
+            conditions_of_access: self._fields.27,
+            content_location: self._fields.28,
+            content_rating: self._fields.29,
+            content_reference_time: self._fields.30,
+            contributor: self._fields.31,
+            copyright_holder: self._fields.32,
+            copyright_notice: self._fields.33,
+            copyright_year: self._fields.34,
+            correction: self._fields.35,
+            country_of_origin: self._fields.36,
+            creative_work_status: self._fields.37,
+            creator: self._fields.38,
+            credit_text: self._fields.39,
+            date_created: self._fields.40,
+            date_modified: self._fields.41,
+            date_published: self._fields.42,
+            description: self._fields.43,
+            digital_source_type: self._fields.44,
+            disambiguating_description: self._fields.45,
+            discussion_url: self._fields.46,
+            edit_eidr: self._fields.47,
+            editor: self._fields.48,
+            educational_alignment: self._fields.49,
+            educational_level: self._fields.50,
+            educational_use: self._fields.51,
+            encoding: self._fields.52,
+            encoding_format: self._fields.53,
+            encodings: self._fields.54,
+            example_of_work: self._fields.55,
+            expires: self._fields.56,
+            file_format: self._fields.57,
+            funder: self._fields.58,
+            funding: self._fields.59,
+            genre: self._fields.60,
+            has_part: self._fields.61,
+            headline: self._fields.62,
+            identifier: self._fields.63,
+            image: self._fields.64,
+            in_language: self._fields.65,
+            interaction_statistic: self._fields.66,
+            interactivity_type: self._fields.67,
+            interpreted_as_claim: self._fields.68,
+            is_accessible_for_free: self._fields.69,
+            is_based_on: self._fields.70,
+            is_based_on_url: self._fields.71,
+            is_family_friendly: self._fields.72,
+            is_part_of: self._fields.73,
+            issn: self._fields.74,
+            keywords: self._fields.75,
+            learning_resource_type: self._fields.76,
+            license: self._fields.77,
+            location_created: self._fields.78,
+            main_entity: self._fields.79,
+            main_entity_of_page: self._fields.80,
+            maintainer: self._fields.81,
+            material: self._fields.82,
+            material_extent: self._fields.83,
+            mentions: self._fields.84,
+            name: self._fields.85,
+            offers: self._fields.86,
+            pattern: self._fields.87,
+            position: self._fields.88,
+            potential_action: self._fields.89,
+            producer: self._fields.90,
+            provider: self._fields.91,
+            publication: self._fields.92,
+            publisher: self._fields.93,
+            publisher_imprint: self._fields.94,
+            publishing_principles: self._fields.95,
+            recorded_at: self._fields.96,
+            released_event: self._fields.97,
+            review: self._fields.98,
+            reviews: self._fields.99,
+            same_as: self._fields.100,
+            schema_version: self._fields.101,
+            sd_date_published: self._fields.102,
+            sd_license: self._fields.103,
+            sd_publisher: self._fields.104,
+            size: self._fields.105,
+            source_organization: self._fields.106,
+            spatial: self._fields.107,
+            spatial_coverage: self._fields.108,
+            sponsor: self._fields.109,
+            subject_of: self._fields.110,
+            teaches: self._fields.111,
+            temporal: self._fields.112,
+            temporal_coverage: self._fields.113,
+            text: self._fields.114,
+            thumbnail: self._fields.115,
+            thumbnail_url: self._fields.116,
+            time_required: self._fields.117,
+            translation_of_work: self._fields.118,
+            translator: self._fields.119,
+            typical_age_range: self._fields.120,
+            url: self._fields.121,
+            usage_info: self._fields.122,
+            version: self._fields.123,
+            video: self._fields.124,
+            word_count: self._fields.125,
+            work_example: self._fields.126,
+            work_translation: self._fields.127,
             extra_data: Default::default(),
         }
     }
@@ -7894,134 +7897,134 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> WebSite<'a> {
         WebSite {
-            about: self.__unsafe_private_named.0,
-            r#abstract: self.__unsafe_private_named.1,
-            access_mode: self.__unsafe_private_named.2,
-            access_mode_sufficient: self.__unsafe_private_named.3,
-            accessibility_api: self.__unsafe_private_named.4,
-            accessibility_control: self.__unsafe_private_named.5,
-            accessibility_feature: self.__unsafe_private_named.6,
-            accessibility_hazard: self.__unsafe_private_named.7,
-            accessibility_summary: self.__unsafe_private_named.8,
-            accountable_person: self.__unsafe_private_named.9,
-            acquire_license_page: self.__unsafe_private_named.10,
-            additional_type: self.__unsafe_private_named.11,
-            aggregate_rating: self.__unsafe_private_named.12,
-            alternate_name: self.__unsafe_private_named.13,
-            alternative_headline: self.__unsafe_private_named.14,
-            archived_at: self.__unsafe_private_named.15,
-            assesses: self.__unsafe_private_named.16,
-            associated_media: self.__unsafe_private_named.17,
-            audience: self.__unsafe_private_named.18,
-            audio: self.__unsafe_private_named.19,
-            author: self.__unsafe_private_named.20,
-            award: self.__unsafe_private_named.21,
-            awards: self.__unsafe_private_named.22,
-            character: self.__unsafe_private_named.23,
-            citation: self.__unsafe_private_named.24,
-            comment: self.__unsafe_private_named.25,
-            comment_count: self.__unsafe_private_named.26,
-            conditions_of_access: self.__unsafe_private_named.27,
-            content_location: self.__unsafe_private_named.28,
-            content_rating: self.__unsafe_private_named.29,
-            content_reference_time: self.__unsafe_private_named.30,
-            contributor: self.__unsafe_private_named.31,
-            copyright_holder: self.__unsafe_private_named.32,
-            copyright_notice: self.__unsafe_private_named.33,
-            copyright_year: self.__unsafe_private_named.34,
-            correction: self.__unsafe_private_named.35,
-            country_of_origin: self.__unsafe_private_named.36,
-            creative_work_status: self.__unsafe_private_named.37,
-            creator: self.__unsafe_private_named.38,
-            credit_text: self.__unsafe_private_named.39,
-            date_created: self.__unsafe_private_named.40,
-            date_modified: self.__unsafe_private_named.41,
-            date_published: self.__unsafe_private_named.42,
-            description: self.__unsafe_private_named.43,
-            digital_source_type: self.__unsafe_private_named.44,
-            disambiguating_description: self.__unsafe_private_named.45,
-            discussion_url: self.__unsafe_private_named.46,
-            edit_eidr: self.__unsafe_private_named.47,
-            editor: self.__unsafe_private_named.48,
-            educational_alignment: self.__unsafe_private_named.49,
-            educational_level: self.__unsafe_private_named.50,
-            educational_use: self.__unsafe_private_named.51,
-            encoding: self.__unsafe_private_named.52,
-            encoding_format: self.__unsafe_private_named.53,
-            encodings: self.__unsafe_private_named.54,
-            example_of_work: self.__unsafe_private_named.55,
-            expires: self.__unsafe_private_named.56,
-            file_format: self.__unsafe_private_named.57,
-            funder: self.__unsafe_private_named.58,
-            funding: self.__unsafe_private_named.59,
-            genre: self.__unsafe_private_named.60,
-            has_part: self.__unsafe_private_named.61,
-            headline: self.__unsafe_private_named.62,
-            identifier: self.__unsafe_private_named.63,
-            image: self.__unsafe_private_named.64,
-            in_language: self.__unsafe_private_named.65,
-            interaction_statistic: self.__unsafe_private_named.66,
-            interactivity_type: self.__unsafe_private_named.67,
-            interpreted_as_claim: self.__unsafe_private_named.68,
-            is_accessible_for_free: self.__unsafe_private_named.69,
-            is_based_on: self.__unsafe_private_named.70,
-            is_based_on_url: self.__unsafe_private_named.71,
-            is_family_friendly: self.__unsafe_private_named.72,
-            is_part_of: self.__unsafe_private_named.73,
-            issn: self.__unsafe_private_named.74,
-            keywords: self.__unsafe_private_named.75,
-            learning_resource_type: self.__unsafe_private_named.76,
-            license: self.__unsafe_private_named.77,
-            location_created: self.__unsafe_private_named.78,
-            main_entity: self.__unsafe_private_named.79,
-            main_entity_of_page: self.__unsafe_private_named.80,
-            maintainer: self.__unsafe_private_named.81,
-            material: self.__unsafe_private_named.82,
-            material_extent: self.__unsafe_private_named.83,
-            mentions: self.__unsafe_private_named.84,
-            name: self.__unsafe_private_named.85,
-            offers: self.__unsafe_private_named.86,
-            pattern: self.__unsafe_private_named.87,
-            position: self.__unsafe_private_named.88,
-            potential_action: self.__unsafe_private_named.89,
-            producer: self.__unsafe_private_named.90,
-            provider: self.__unsafe_private_named.91,
-            publication: self.__unsafe_private_named.92,
-            publisher: self.__unsafe_private_named.93,
-            publisher_imprint: self.__unsafe_private_named.94,
-            publishing_principles: self.__unsafe_private_named.95,
-            recorded_at: self.__unsafe_private_named.96,
-            released_event: self.__unsafe_private_named.97,
-            review: self.__unsafe_private_named.98,
-            reviews: self.__unsafe_private_named.99,
-            same_as: self.__unsafe_private_named.100,
-            schema_version: self.__unsafe_private_named.101,
-            sd_date_published: self.__unsafe_private_named.102,
-            sd_license: self.__unsafe_private_named.103,
-            sd_publisher: self.__unsafe_private_named.104,
-            size: self.__unsafe_private_named.105,
-            source_organization: self.__unsafe_private_named.106,
-            spatial: self.__unsafe_private_named.107,
-            spatial_coverage: self.__unsafe_private_named.108,
-            sponsor: self.__unsafe_private_named.109,
-            subject_of: self.__unsafe_private_named.110,
-            teaches: self.__unsafe_private_named.111,
-            temporal: self.__unsafe_private_named.112,
-            temporal_coverage: self.__unsafe_private_named.113,
-            text: self.__unsafe_private_named.114,
-            thumbnail: self.__unsafe_private_named.115,
-            thumbnail_url: self.__unsafe_private_named.116,
-            time_required: self.__unsafe_private_named.117,
-            translation_of_work: self.__unsafe_private_named.118,
-            translator: self.__unsafe_private_named.119,
-            typical_age_range: self.__unsafe_private_named.120,
-            url: self.__unsafe_private_named.121,
-            usage_info: self.__unsafe_private_named.122,
-            version: self.__unsafe_private_named.123,
-            video: self.__unsafe_private_named.124,
-            word_count: self.__unsafe_private_named.125,
-            work_example: self.__unsafe_private_named.126,
-            work_translation: self.__unsafe_private_named.127,
+            about: self._fields.0,
+            r#abstract: self._fields.1,
+            access_mode: self._fields.2,
+            access_mode_sufficient: self._fields.3,
+            accessibility_api: self._fields.4,
+            accessibility_control: self._fields.5,
+            accessibility_feature: self._fields.6,
+            accessibility_hazard: self._fields.7,
+            accessibility_summary: self._fields.8,
+            accountable_person: self._fields.9,
+            acquire_license_page: self._fields.10,
+            additional_type: self._fields.11,
+            aggregate_rating: self._fields.12,
+            alternate_name: self._fields.13,
+            alternative_headline: self._fields.14,
+            archived_at: self._fields.15,
+            assesses: self._fields.16,
+            associated_media: self._fields.17,
+            audience: self._fields.18,
+            audio: self._fields.19,
+            author: self._fields.20,
+            award: self._fields.21,
+            awards: self._fields.22,
+            character: self._fields.23,
+            citation: self._fields.24,
+            comment: self._fields.25,
+            comment_count: self._fields.26,
+            conditions_of_access: self._fields.27,
+            content_location: self._fields.28,
+            content_rating: self._fields.29,
+            content_reference_time: self._fields.30,
+            contributor: self._fields.31,
+            copyright_holder: self._fields.32,
+            copyright_notice: self._fields.33,
+            copyright_year: self._fields.34,
+            correction: self._fields.35,
+            country_of_origin: self._fields.36,
+            creative_work_status: self._fields.37,
+            creator: self._fields.38,
+            credit_text: self._fields.39,
+            date_created: self._fields.40,
+            date_modified: self._fields.41,
+            date_published: self._fields.42,
+            description: self._fields.43,
+            digital_source_type: self._fields.44,
+            disambiguating_description: self._fields.45,
+            discussion_url: self._fields.46,
+            edit_eidr: self._fields.47,
+            editor: self._fields.48,
+            educational_alignment: self._fields.49,
+            educational_level: self._fields.50,
+            educational_use: self._fields.51,
+            encoding: self._fields.52,
+            encoding_format: self._fields.53,
+            encodings: self._fields.54,
+            example_of_work: self._fields.55,
+            expires: self._fields.56,
+            file_format: self._fields.57,
+            funder: self._fields.58,
+            funding: self._fields.59,
+            genre: self._fields.60,
+            has_part: self._fields.61,
+            headline: self._fields.62,
+            identifier: self._fields.63,
+            image: self._fields.64,
+            in_language: self._fields.65,
+            interaction_statistic: self._fields.66,
+            interactivity_type: self._fields.67,
+            interpreted_as_claim: self._fields.68,
+            is_accessible_for_free: self._fields.69,
+            is_based_on: self._fields.70,
+            is_based_on_url: self._fields.71,
+            is_family_friendly: self._fields.72,
+            is_part_of: self._fields.73,
+            issn: self._fields.74,
+            keywords: self._fields.75,
+            learning_resource_type: self._fields.76,
+            license: self._fields.77,
+            location_created: self._fields.78,
+            main_entity: self._fields.79,
+            main_entity_of_page: self._fields.80,
+            maintainer: self._fields.81,
+            material: self._fields.82,
+            material_extent: self._fields.83,
+            mentions: self._fields.84,
+            name: self._fields.85,
+            offers: self._fields.86,
+            pattern: self._fields.87,
+            position: self._fields.88,
+            potential_action: self._fields.89,
+            producer: self._fields.90,
+            provider: self._fields.91,
+            publication: self._fields.92,
+            publisher: self._fields.93,
+            publisher_imprint: self._fields.94,
+            publishing_principles: self._fields.95,
+            recorded_at: self._fields.96,
+            released_event: self._fields.97,
+            review: self._fields.98,
+            reviews: self._fields.99,
+            same_as: self._fields.100,
+            schema_version: self._fields.101,
+            sd_date_published: self._fields.102,
+            sd_license: self._fields.103,
+            sd_publisher: self._fields.104,
+            size: self._fields.105,
+            source_organization: self._fields.106,
+            spatial: self._fields.107,
+            spatial_coverage: self._fields.108,
+            sponsor: self._fields.109,
+            subject_of: self._fields.110,
+            teaches: self._fields.111,
+            temporal: self._fields.112,
+            temporal_coverage: self._fields.113,
+            text: self._fields.114,
+            thumbnail: self._fields.115,
+            thumbnail_url: self._fields.116,
+            time_required: self._fields.117,
+            translation_of_work: self._fields.118,
+            translator: self._fields.119,
+            typical_age_range: self._fields.120,
+            url: self._fields.121,
+            usage_info: self._fields.122,
+            version: self._fields.123,
+            video: self._fields.124,
+            word_count: self._fields.125,
+            work_example: self._fields.126,
+            work_translation: self._fields.127,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_grain.rs b/crates/jacquard-api/src/social_grain.rs
index bc497b21..d8d2bb0b 100644
--- a/crates/jacquard-api/src/social_grain.rs
+++ b/crates/jacquard-api/src/social_grain.rs
@@ -10,7 +10,11 @@ pub mod favorite;
 pub mod gallery;
 pub mod photo;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -113,9 +117,9 @@ pub mod aspect_ratio_state {
 
 /// Builder for constructing an instance of this type
 pub struct AspectRatioBuilder<'a, S: aspect_ratio_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AspectRatio<'a> {
@@ -129,9 +133,9 @@ impl<'a> AspectRatioBuilder<'a, aspect_ratio_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -146,11 +150,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -165,11 +169,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetWidth<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,8 +187,8 @@ where
     /// Build the final struct
     pub fn build(self) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -197,8 +201,8 @@ where
         >,
     ) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_grain/actor.rs b/crates/jacquard-api/src/social_grain/actor.rs
index 1d4477c4..f8c0f216 100644
--- a/crates/jacquard-api/src/social_grain/actor.rs
+++ b/crates/jacquard-api/src/social_grain/actor.rs
@@ -7,7 +7,11 @@
 
 pub mod profile;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -116,44 +120,44 @@ pub mod profile_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Did;
         type Handle;
+        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Did = Unset;
         type Handle = Unset;
-    }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Did = Set<members::did>;
-        type Handle = S::Handle;
+        type Did = Unset;
     }
     ///State transition - sets the `handle` field to Set
     pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHandle<S> {}
     impl<S: State> State for SetHandle<S> {
-        type Did = S::Did;
         type Handle = Set<members::handle>;
+        type Did = S::Did;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Handle = S::Handle;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `handle` field
         pub struct handle(());
+        ///Marker type for the `did` field
+        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ProfileViewBuilder<'a, S: profile_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<UriValue<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -162,7 +166,7 @@ pub struct ProfileViewBuilder<'a, S: profile_view_state::State> {
         Option<Handle<'a>>,
         Option<Vec<Label<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ProfileView<'a> {
@@ -176,9 +180,9 @@ impl<'a> ProfileViewBuilder<'a, profile_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -186,12 +190,12 @@ impl<'a> ProfileViewBuilder<'a, profile_view_state::Empty> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -199,12 +203,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -212,12 +216,12 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -232,11 +236,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ProfileViewBuilder<'a, profile_view_state::SetDid<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,12 +248,12 @@ where
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -264,11 +268,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> ProfileViewBuilder<'a, profile_view_state::SetHandle<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ProfileViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -276,12 +280,12 @@ where
 impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -289,19 +293,19 @@ impl<'a, S: profile_view_state::State> ProfileViewBuilder<'a, S> {
 impl<'a, S> ProfileViewBuilder<'a, S>
 where
     S: profile_view_state::State,
-    S::Did: profile_view_state::IsSet,
     S::Handle: profile_view_state::IsSet,
+    S::Did: profile_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ProfileView<'a> {
         ProfileView {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            did: self.__unsafe_private_named.3.unwrap(),
-            display_name: self.__unsafe_private_named.4,
-            handle: self.__unsafe_private_named.5.unwrap(),
-            labels: self.__unsafe_private_named.6,
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            description: self._fields.2,
+            did: self._fields.3.unwrap(),
+            display_name: self._fields.4,
+            handle: self._fields.5.unwrap(),
+            labels: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -314,13 +318,13 @@ where
         >,
     ) -> ProfileView<'a> {
         ProfileView {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            did: self.__unsafe_private_named.3.unwrap(),
-            display_name: self.__unsafe_private_named.4,
-            handle: self.__unsafe_private_named.5.unwrap(),
-            labels: self.__unsafe_private_named.6,
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            description: self._fields.2,
+            did: self._fields.3.unwrap(),
+            display_name: self._fields.4,
+            handle: self._fields.5.unwrap(),
+            labels: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_grain/actor/profile.rs b/crates/jacquard-api/src/social_grain/actor/profile.rs
index ba577698..bf3f16e0 100644
--- a/crates/jacquard-api/src/social_grain/actor/profile.rs
+++ b/crates/jacquard-api/src/social_grain/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -214,14 +217,14 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -235,9 +238,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -245,12 +248,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -258,12 +261,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -271,12 +274,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -284,12 +287,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -301,10 +304,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3,
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            description: self._fields.2,
+            display_name: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -317,10 +320,10 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1,
-            description: self.__unsafe_private_named.2,
-            display_name: self.__unsafe_private_named.3,
+            avatar: self._fields.0,
+            created_at: self._fields.1,
+            description: self._fields.2,
+            display_name: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_grain/favorite.rs b/crates/jacquard-api/src/social_grain/favorite.rs
index dd9c3481..fa1c4042 100644
--- a/crates/jacquard-api/src/social_grain/favorite.rs
+++ b/crates/jacquard-api/src/social_grain/favorite.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -107,45 +110,45 @@ pub mod favorite_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subject;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subject = S::Subject;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FavoriteBuilder<'a, S: favorite_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Favorite<'a> {
@@ -159,9 +162,9 @@ impl<'a> FavoriteBuilder<'a, favorite_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FavoriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -176,11 +179,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FavoriteBuilder<'a, favorite_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FavoriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -195,11 +198,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> FavoriteBuilder<'a, favorite_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FavoriteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -207,14 +210,14 @@ where
 impl<'a, S> FavoriteBuilder<'a, S>
 where
     S: favorite_state::State,
-    S::CreatedAt: favorite_state::IsSet,
     S::Subject: favorite_state::IsSet,
+    S::CreatedAt: favorite_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Favorite<'a> {
         Favorite {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -227,8 +230,8 @@ where
         >,
     ) -> Favorite<'a> {
         Favorite {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_grain/gallery.rs b/crates/jacquard-api/src/social_grain/gallery.rs
index 489f136f..b1c3b633 100644
--- a/crates/jacquard-api/src/social_grain/gallery.rs
+++ b/crates/jacquard-api/src/social_grain/gallery.rs
@@ -7,7 +7,11 @@
 
 pub mod item;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -179,50 +183,50 @@ pub mod gallery_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Title;
         type CreatedAt;
+        type Title;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Title = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Title = Set<members::title>;
-        type CreatedAt = S::CreatedAt;
+        type Title = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Title = S::Title;
         type CreatedAt = Set<members::created_at>;
+        type Title = S::Title;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type CreatedAt = S::CreatedAt;
+        type Title = Set<members::title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `title` field
-        pub struct title(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `title` field
+        pub struct title(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GalleryBuilder<'a, S: gallery_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<SelfLabels<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Gallery<'a> {
@@ -236,9 +240,9 @@ impl<'a> GalleryBuilder<'a, gallery_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GalleryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,11 +257,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> GalleryBuilder<'a, gallery_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GalleryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -265,12 +269,12 @@ where
 impl<'a, S: gallery_state::State> GalleryBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -278,12 +282,12 @@ impl<'a, S: gallery_state::State> GalleryBuilder<'a, S> {
 impl<'a, S: gallery_state::State> GalleryBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -298,11 +302,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GalleryBuilder<'a, gallery_state::SetTitle<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         GalleryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -310,16 +314,16 @@ where
 impl<'a, S> GalleryBuilder<'a, S>
 where
     S: gallery_state::State,
-    S::Title: gallery_state::IsSet,
     S::CreatedAt: gallery_state::IsSet,
+    S::Title: gallery_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Gallery<'a> {
         Gallery {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            labels: self.__unsafe_private_named.2,
-            title: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            labels: self._fields.2,
+            title: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -329,10 +333,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Gallery<'a> {
         Gallery {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            labels: self.__unsafe_private_named.2,
-            title: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            labels: self._fields.2,
+            title: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -420,92 +424,92 @@ pub mod gallery_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
-        type Creator;
         type Cid;
         type Record;
+        type Creator;
         type IndexedAt;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
-        type Creator = Unset;
         type Cid = Unset;
         type Record = Unset;
+        type Creator = Unset;
         type IndexedAt = Unset;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Creator = S::Creator;
-        type Cid = S::Cid;
-        type Record = S::Record;
-        type IndexedAt = S::IndexedAt;
-    }
-    ///State transition - sets the `creator` field to Set
-    pub struct SetCreator<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreator<S> {}
-    impl<S: State> State for SetCreator<S> {
-        type Uri = S::Uri;
-        type Creator = Set<members::creator>;
-        type Cid = S::Cid;
-        type Record = S::Record;
-        type IndexedAt = S::IndexedAt;
+        type Uri = Unset;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type Uri = S::Uri;
-        type Creator = S::Creator;
         type Cid = Set<members::cid>;
         type Record = S::Record;
+        type Creator = S::Creator;
         type IndexedAt = S::IndexedAt;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `record` field to Set
     pub struct SetRecord<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRecord<S> {}
     impl<S: State> State for SetRecord<S> {
-        type Uri = S::Uri;
-        type Creator = S::Creator;
         type Cid = S::Cid;
         type Record = Set<members::record>;
+        type Creator = S::Creator;
         type IndexedAt = S::IndexedAt;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `creator` field to Set
+    pub struct SetCreator<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreator<S> {}
+    impl<S: State> State for SetCreator<S> {
+        type Cid = S::Cid;
+        type Record = S::Record;
+        type Creator = Set<members::creator>;
+        type IndexedAt = S::IndexedAt;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `indexed_at` field to Set
     pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
     impl<S: State> State for SetIndexedAt<S> {
-        type Uri = S::Uri;
-        type Creator = S::Creator;
         type Cid = S::Cid;
         type Record = S::Record;
+        type Creator = S::Creator;
         type IndexedAt = Set<members::indexed_at>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Cid = S::Cid;
+        type Record = S::Record;
+        type Creator = S::Creator;
+        type IndexedAt = S::IndexedAt;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
-        ///Marker type for the `creator` field
-        pub struct creator(());
         ///Marker type for the `cid` field
         pub struct cid(());
         ///Marker type for the `record` field
         pub struct record(());
+        ///Marker type for the `creator` field
+        pub struct creator(());
         ///Marker type for the `indexed_at` field
         pub struct indexed_at(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GalleryViewBuilder<'a, S: gallery_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<ProfileView<'a>>,
         Option<Datetime>,
@@ -514,7 +518,7 @@ pub struct GalleryViewBuilder<'a, S: gallery_view_state::State> {
         Option<Data<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GalleryView<'a> {
@@ -528,9 +532,9 @@ impl<'a> GalleryViewBuilder<'a, gallery_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GalleryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -545,11 +549,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> GalleryViewBuilder<'a, gallery_view_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GalleryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -564,11 +568,11 @@ where
         mut self,
         value: impl Into<ProfileView<'a>>,
     ) -> GalleryViewBuilder<'a, gallery_view_state::SetCreator<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GalleryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -583,11 +587,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> GalleryViewBuilder<'a, gallery_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GalleryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -595,12 +599,12 @@ where
 impl<'a, S: gallery_view_state::State> GalleryViewBuilder<'a, S> {
     /// Set the `items` field (optional)
     pub fn items(mut self, value: impl Into<Option<Vec<PhotoView<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `items` field to an Option value (optional)
     pub fn maybe_items(mut self, value: Option<Vec<PhotoView<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -608,12 +612,12 @@ impl<'a, S: gallery_view_state::State> GalleryViewBuilder<'a, S> {
 impl<'a, S: gallery_view_state::State> GalleryViewBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -628,11 +632,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> GalleryViewBuilder<'a, gallery_view_state::SetRecord<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         GalleryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -647,11 +651,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GalleryViewBuilder<'a, gallery_view_state::SetUri<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         GalleryViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -659,22 +663,22 @@ where
 impl<'a, S> GalleryViewBuilder<'a, S>
 where
     S: gallery_view_state::State,
-    S::Uri: gallery_view_state::IsSet,
-    S::Creator: gallery_view_state::IsSet,
     S::Cid: gallery_view_state::IsSet,
     S::Record: gallery_view_state::IsSet,
+    S::Creator: gallery_view_state::IsSet,
     S::IndexedAt: gallery_view_state::IsSet,
+    S::Uri: gallery_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GalleryView<'a> {
         GalleryView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            creator: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            items: self.__unsafe_private_named.3,
-            labels: self.__unsafe_private_named.4,
-            record: self.__unsafe_private_named.5.unwrap(),
-            uri: self.__unsafe_private_named.6.unwrap(),
+            cid: self._fields.0.unwrap(),
+            creator: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            items: self._fields.3,
+            labels: self._fields.4,
+            record: self._fields.5.unwrap(),
+            uri: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -684,13 +688,13 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> GalleryView<'a> {
         GalleryView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            creator: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            items: self.__unsafe_private_named.3,
-            labels: self.__unsafe_private_named.4,
-            record: self.__unsafe_private_named.5.unwrap(),
-            uri: self.__unsafe_private_named.6.unwrap(),
+            cid: self._fields.0.unwrap(),
+            creator: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            items: self._fields.3,
+            labels: self._fields.4,
+            record: self._fields.5.unwrap(),
+            uri: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_grain/gallery/item.rs b/crates/jacquard-api/src/social_grain/gallery/item.rs
index 4647757a..13e0260f 100644
--- a/crates/jacquard-api/src/social_grain/gallery/item.rs
+++ b/crates/jacquard-api/src/social_grain/gallery/item.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -117,64 +120,59 @@ pub mod item_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type CreatedAt;
         type Gallery;
         type Item;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type CreatedAt = Unset;
         type Gallery = Unset;
         type Item = Unset;
-        type CreatedAt = Unset;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type Gallery = S::Gallery;
+        type Item = S::Item;
     }
     ///State transition - sets the `gallery` field to Set
     pub struct SetGallery<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetGallery<S> {}
     impl<S: State> State for SetGallery<S> {
+        type CreatedAt = S::CreatedAt;
         type Gallery = Set<members::gallery>;
         type Item = S::Item;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `item` field to Set
     pub struct SetItem<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetItem<S> {}
     impl<S: State> State for SetItem<S> {
-        type Gallery = S::Gallery;
-        type Item = Set<members::item>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type Gallery = S::Gallery;
-        type Item = S::Item;
-        type CreatedAt = Set<members::created_at>;
+        type Item = Set<members::item>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `gallery` field
         pub struct gallery(());
         ///Marker type for the `item` field
         pub struct item(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ItemBuilder<'a, S: item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<AtUri<'a>>,
-        Option<AtUri<'a>>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>, Option<AtUri<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Item<'a> {
@@ -188,9 +186,9 @@ impl<'a> ItemBuilder<'a, item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -205,11 +203,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ItemBuilder<'a, item_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -224,11 +222,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ItemBuilder<'a, item_state::SetGallery<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -243,11 +241,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ItemBuilder<'a, item_state::SetItem<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -255,12 +253,12 @@ where
 impl<'a, S: item_state::State> ItemBuilder<'a, S> {
     /// Set the `position` field (optional)
     pub fn position(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `position` field to an Option value (optional)
     pub fn maybe_position(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -268,17 +266,17 @@ impl<'a, S: item_state::State> ItemBuilder<'a, S> {
 impl<'a, S> ItemBuilder<'a, S>
 where
     S: item_state::State,
+    S::CreatedAt: item_state::IsSet,
     S::Gallery: item_state::IsSet,
     S::Item: item_state::IsSet,
-    S::CreatedAt: item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Item<'a> {
         Item {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            gallery: self.__unsafe_private_named.1.unwrap(),
-            item: self.__unsafe_private_named.2.unwrap(),
-            position: self.__unsafe_private_named.3.or_else(|| Some(0i64)),
+            created_at: self._fields.0.unwrap(),
+            gallery: self._fields.1.unwrap(),
+            item: self._fields.2.unwrap(),
+            position: self._fields.3.or_else(|| Some(0i64)),
             extra_data: Default::default(),
         }
     }
@@ -291,10 +289,10 @@ where
         >,
     ) -> Item<'a> {
         Item {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            gallery: self.__unsafe_private_named.1.unwrap(),
-            item: self.__unsafe_private_named.2.unwrap(),
-            position: self.__unsafe_private_named.3.or_else(|| Some(0i64)),
+            created_at: self._fields.0.unwrap(),
+            gallery: self._fields.1.unwrap(),
+            item: self._fields.2.unwrap(),
+            position: self._fields.3.or_else(|| Some(0i64)),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_grain/photo.rs b/crates/jacquard-api/src/social_grain/photo.rs
index 2ffdda37..65e30f86 100644
--- a/crates/jacquard-api/src/social_grain/photo.rs
+++ b/crates/jacquard-api/src/social_grain/photo.rs
@@ -7,7 +7,11 @@
 
 pub mod exif;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -297,14 +301,14 @@ pub mod photo_state {
 
 /// Builder for constructing an instance of this type
 pub struct PhotoBuilder<'a, S: photo_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<AspectRatio<'a>>,
         Option<Datetime>,
         Option<BlobRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Photo<'a> {
@@ -318,9 +322,9 @@ impl<'a> PhotoBuilder<'a, photo_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PhotoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -335,11 +339,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PhotoBuilder<'a, photo_state::SetAlt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PhotoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -347,12 +351,12 @@ where
 impl<'a, S: photo_state::State> PhotoBuilder<'a, S> {
     /// Set the `aspectRatio` field (optional)
     pub fn aspect_ratio(mut self, value: impl Into<Option<AspectRatio<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
     pub fn maybe_aspect_ratio(mut self, value: Option<AspectRatio<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -360,12 +364,12 @@ impl<'a, S: photo_state::State> PhotoBuilder<'a, S> {
 impl<'a, S: photo_state::State> PhotoBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -380,11 +384,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> PhotoBuilder<'a, photo_state::SetPhoto<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PhotoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -398,10 +402,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Photo<'a> {
         Photo {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            aspect_ratio: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            photo: self.__unsafe_private_named.3.unwrap(),
+            alt: self._fields.0.unwrap(),
+            aspect_ratio: self._fields.1,
+            created_at: self._fields.2,
+            photo: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -414,10 +418,10 @@ where
         >,
     ) -> Photo<'a> {
         Photo {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            aspect_ratio: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            photo: self.__unsafe_private_named.3.unwrap(),
+            alt: self._fields.0.unwrap(),
+            aspect_ratio: self._fields.1,
+            created_at: self._fields.2,
+            photo: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -534,8 +538,8 @@ pub mod exif_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ExifViewBuilder<'a, S: exif_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -551,7 +555,7 @@ pub struct ExifViewBuilder<'a, S: exif_view_state::State> {
         Option<AtUri<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ExifView<'a> {
@@ -565,8 +569,8 @@ impl<'a> ExifViewBuilder<'a, exif_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExifViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -582,7 +586,7 @@ impl<'a> ExifViewBuilder<'a, exif_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -590,12 +594,12 @@ impl<'a> ExifViewBuilder<'a, exif_view_state::Empty> {
 impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -610,11 +614,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ExifViewBuilder<'a, exif_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ExifViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -622,12 +626,12 @@ where
 impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
     /// Set the `dateTimeOriginal` field (optional)
     pub fn date_time_original(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `dateTimeOriginal` field to an Option value (optional)
     pub fn maybe_date_time_original(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -635,12 +639,12 @@ impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
 impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
     /// Set the `exposureTime` field (optional)
     pub fn exposure_time(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `exposureTime` field to an Option value (optional)
     pub fn maybe_exposure_time(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -648,12 +652,12 @@ impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
 impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
     /// Set the `fNumber` field (optional)
     pub fn f_number(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `fNumber` field to an Option value (optional)
     pub fn maybe_f_number(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -661,12 +665,12 @@ impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
 impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
     /// Set the `flash` field (optional)
     pub fn flash(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `flash` field to an Option value (optional)
     pub fn maybe_flash(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -677,7 +681,7 @@ impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<CowStr<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `focalLengthIn35mmFormat` field to an Option value (optional)
@@ -685,7 +689,7 @@ impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
         mut self,
         value: Option<CowStr<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -693,12 +697,12 @@ impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
 impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
     /// Set the `iSO` field (optional)
     pub fn i_so(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `iSO` field to an Option value (optional)
     pub fn maybe_i_so(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -706,12 +710,12 @@ impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
 impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
     /// Set the `lensMake` field (optional)
     pub fn lens_make(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `lensMake` field to an Option value (optional)
     pub fn maybe_lens_make(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -719,12 +723,12 @@ impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
 impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
     /// Set the `lensModel` field (optional)
     pub fn lens_model(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `lensModel` field to an Option value (optional)
     pub fn maybe_lens_model(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -732,12 +736,12 @@ impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
 impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
     /// Set the `make` field (optional)
     pub fn make(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `make` field to an Option value (optional)
     pub fn maybe_make(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -745,12 +749,12 @@ impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
 impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
     /// Set the `model` field (optional)
     pub fn model(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `model` field to an Option value (optional)
     pub fn maybe_model(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -765,11 +769,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ExifViewBuilder<'a, exif_view_state::SetPhoto<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         ExifViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -777,12 +781,12 @@ where
 impl<'a, S: exif_view_state::State> ExifViewBuilder<'a, S> {
     /// Set the `uri` field (optional)
     pub fn uri(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `uri` field to an Option value (optional)
     pub fn maybe_uri(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -796,20 +800,20 @@ where
     /// Build the final struct
     pub fn build(self) -> ExifView<'a> {
         ExifView {
-            cid: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            date_time_original: self.__unsafe_private_named.2,
-            exposure_time: self.__unsafe_private_named.3,
-            f_number: self.__unsafe_private_named.4,
-            flash: self.__unsafe_private_named.5,
-            focal_length_in35mm_format: self.__unsafe_private_named.6,
-            i_so: self.__unsafe_private_named.7,
-            lens_make: self.__unsafe_private_named.8,
-            lens_model: self.__unsafe_private_named.9,
-            make: self.__unsafe_private_named.10,
-            model: self.__unsafe_private_named.11,
-            photo: self.__unsafe_private_named.12.unwrap(),
-            uri: self.__unsafe_private_named.13,
+            cid: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            date_time_original: self._fields.2,
+            exposure_time: self._fields.3,
+            f_number: self._fields.4,
+            flash: self._fields.5,
+            focal_length_in35mm_format: self._fields.6,
+            i_so: self._fields.7,
+            lens_make: self._fields.8,
+            lens_model: self._fields.9,
+            make: self._fields.10,
+            model: self._fields.11,
+            photo: self._fields.12.unwrap(),
+            uri: self._fields.13,
             extra_data: Default::default(),
         }
     }
@@ -822,20 +826,20 @@ where
         >,
     ) -> ExifView<'a> {
         ExifView {
-            cid: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            date_time_original: self.__unsafe_private_named.2,
-            exposure_time: self.__unsafe_private_named.3,
-            f_number: self.__unsafe_private_named.4,
-            flash: self.__unsafe_private_named.5,
-            focal_length_in35mm_format: self.__unsafe_private_named.6,
-            i_so: self.__unsafe_private_named.7,
-            lens_make: self.__unsafe_private_named.8,
-            lens_model: self.__unsafe_private_named.9,
-            make: self.__unsafe_private_named.10,
-            model: self.__unsafe_private_named.11,
-            photo: self.__unsafe_private_named.12.unwrap(),
-            uri: self.__unsafe_private_named.13,
+            cid: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            date_time_original: self._fields.2,
+            exposure_time: self._fields.3,
+            f_number: self._fields.4,
+            flash: self._fields.5,
+            focal_length_in35mm_format: self._fields.6,
+            i_so: self._fields.7,
+            lens_make: self._fields.8,
+            lens_model: self._fields.9,
+            make: self._fields.10,
+            model: self._fields.11,
+            photo: self._fields.12.unwrap(),
+            uri: self._fields.13,
             extra_data: Some(extra_data),
         }
     }
@@ -1037,92 +1041,92 @@ pub mod photo_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Thumb;
+        type Cid;
         type Fullsize;
         type Alt;
-        type Cid;
         type Uri;
+        type Thumb;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Thumb = Unset;
+        type Cid = Unset;
         type Fullsize = Unset;
         type Alt = Unset;
-        type Cid = Unset;
         type Uri = Unset;
+        type Thumb = Unset;
     }
-    ///State transition - sets the `thumb` field to Set
-    pub struct SetThumb<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetThumb<S> {}
-    impl<S: State> State for SetThumb<S> {
-        type Thumb = Set<members::thumb>;
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Cid = Set<members::cid>;
         type Fullsize = S::Fullsize;
         type Alt = S::Alt;
-        type Cid = S::Cid;
         type Uri = S::Uri;
+        type Thumb = S::Thumb;
     }
     ///State transition - sets the `fullsize` field to Set
     pub struct SetFullsize<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetFullsize<S> {}
     impl<S: State> State for SetFullsize<S> {
-        type Thumb = S::Thumb;
+        type Cid = S::Cid;
         type Fullsize = Set<members::fullsize>;
         type Alt = S::Alt;
-        type Cid = S::Cid;
         type Uri = S::Uri;
+        type Thumb = S::Thumb;
     }
     ///State transition - sets the `alt` field to Set
     pub struct SetAlt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAlt<S> {}
     impl<S: State> State for SetAlt<S> {
-        type Thumb = S::Thumb;
+        type Cid = S::Cid;
         type Fullsize = S::Fullsize;
         type Alt = Set<members::alt>;
-        type Cid = S::Cid;
         type Uri = S::Uri;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
         type Thumb = S::Thumb;
-        type Fullsize = S::Fullsize;
-        type Alt = S::Alt;
-        type Cid = Set<members::cid>;
-        type Uri = S::Uri;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Thumb = S::Thumb;
+        type Cid = S::Cid;
         type Fullsize = S::Fullsize;
         type Alt = S::Alt;
-        type Cid = S::Cid;
         type Uri = Set<members::uri>;
+        type Thumb = S::Thumb;
+    }
+    ///State transition - sets the `thumb` field to Set
+    pub struct SetThumb<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetThumb<S> {}
+    impl<S: State> State for SetThumb<S> {
+        type Cid = S::Cid;
+        type Fullsize = S::Fullsize;
+        type Alt = S::Alt;
+        type Uri = S::Uri;
+        type Thumb = Set<members::thumb>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `thumb` field
-        pub struct thumb(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
         ///Marker type for the `fullsize` field
         pub struct fullsize(());
         ///Marker type for the `alt` field
         pub struct alt(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `thumb` field
+        pub struct thumb(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PhotoViewBuilder<'a, S: photo_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<AspectRatio<'a>>,
         Option<Cid<'a>>,
@@ -1131,7 +1135,7 @@ pub struct PhotoViewBuilder<'a, S: photo_view_state::State> {
         Option<UriValue<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PhotoView<'a> {
@@ -1145,9 +1149,9 @@ impl<'a> PhotoViewBuilder<'a, photo_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PhotoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1162,11 +1166,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PhotoViewBuilder<'a, photo_view_state::SetAlt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PhotoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1174,12 +1178,12 @@ where
 impl<'a, S: photo_view_state::State> PhotoViewBuilder<'a, S> {
     /// Set the `aspectRatio` field (optional)
     pub fn aspect_ratio(mut self, value: impl Into<Option<AspectRatio<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
     pub fn maybe_aspect_ratio(mut self, value: Option<AspectRatio<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1194,11 +1198,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> PhotoViewBuilder<'a, photo_view_state::SetCid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PhotoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1206,12 +1210,12 @@ where
 impl<'a, S: photo_view_state::State> PhotoViewBuilder<'a, S> {
     /// Set the `exif` field (optional)
     pub fn exif(mut self, value: impl Into<Option<photo::ExifView<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `exif` field to an Option value (optional)
     pub fn maybe_exif(mut self, value: Option<photo::ExifView<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1226,11 +1230,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> PhotoViewBuilder<'a, photo_view_state::SetFullsize<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PhotoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1245,11 +1249,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> PhotoViewBuilder<'a, photo_view_state::SetThumb<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         PhotoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1264,11 +1268,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PhotoViewBuilder<'a, photo_view_state::SetUri<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         PhotoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1276,22 +1280,22 @@ where
 impl<'a, S> PhotoViewBuilder<'a, S>
 where
     S: photo_view_state::State,
-    S::Thumb: photo_view_state::IsSet,
+    S::Cid: photo_view_state::IsSet,
     S::Fullsize: photo_view_state::IsSet,
     S::Alt: photo_view_state::IsSet,
-    S::Cid: photo_view_state::IsSet,
     S::Uri: photo_view_state::IsSet,
+    S::Thumb: photo_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PhotoView<'a> {
         PhotoView {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            aspect_ratio: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            exif: self.__unsafe_private_named.3,
-            fullsize: self.__unsafe_private_named.4.unwrap(),
-            thumb: self.__unsafe_private_named.5.unwrap(),
-            uri: self.__unsafe_private_named.6.unwrap(),
+            alt: self._fields.0.unwrap(),
+            aspect_ratio: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            exif: self._fields.3,
+            fullsize: self._fields.4.unwrap(),
+            thumb: self._fields.5.unwrap(),
+            uri: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1304,13 +1308,13 @@ where
         >,
     ) -> PhotoView<'a> {
         PhotoView {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            aspect_ratio: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            exif: self.__unsafe_private_named.3,
-            fullsize: self.__unsafe_private_named.4.unwrap(),
-            thumb: self.__unsafe_private_named.5.unwrap(),
-            uri: self.__unsafe_private_named.6.unwrap(),
+            alt: self._fields.0.unwrap(),
+            aspect_ratio: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            exif: self._fields.3,
+            fullsize: self._fields.4.unwrap(),
+            thumb: self._fields.5.unwrap(),
+            uri: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_grain/photo/exif.rs b/crates/jacquard-api/src/social_grain/photo/exif.rs
index 1f432840..7909a406 100644
--- a/crates/jacquard-api/src/social_grain/photo/exif.rs
+++ b/crates/jacquard-api/src/social_grain/photo/exif.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -133,44 +136,44 @@ pub mod exif_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Photo;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Photo = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Photo = S::Photo;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `photo` field to Set
     pub struct SetPhoto<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPhoto<S> {}
     impl<S: State> State for SetPhoto<S> {
-        type CreatedAt = S::CreatedAt;
         type Photo = Set<members::photo>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Photo = S::Photo;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `photo` field
         pub struct photo(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ExifBuilder<'a, S: exif_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<i64>,
@@ -184,7 +187,7 @@ pub struct ExifBuilder<'a, S: exif_state::State> {
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Exif<'a> {
@@ -198,8 +201,8 @@ impl<'a> ExifBuilder<'a, exif_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ExifBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -213,7 +216,7 @@ impl<'a> ExifBuilder<'a, exif_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -228,11 +231,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ExifBuilder<'a, exif_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ExifBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -240,12 +243,12 @@ where
 impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
     /// Set the `dateTimeOriginal` field (optional)
     pub fn date_time_original(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `dateTimeOriginal` field to an Option value (optional)
     pub fn maybe_date_time_original(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -253,12 +256,12 @@ impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
 impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
     /// Set the `exposureTime` field (optional)
     pub fn exposure_time(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `exposureTime` field to an Option value (optional)
     pub fn maybe_exposure_time(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -266,12 +269,12 @@ impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
 impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
     /// Set the `fNumber` field (optional)
     pub fn f_number(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `fNumber` field to an Option value (optional)
     pub fn maybe_f_number(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -279,12 +282,12 @@ impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
 impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
     /// Set the `flash` field (optional)
     pub fn flash(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `flash` field to an Option value (optional)
     pub fn maybe_flash(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -292,12 +295,12 @@ impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
 impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
     /// Set the `focalLengthIn35mmFormat` field (optional)
     pub fn focal_length_in35mm_format(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `focalLengthIn35mmFormat` field to an Option value (optional)
     pub fn maybe_focal_length_in35mm_format(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -305,12 +308,12 @@ impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
 impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
     /// Set the `iSO` field (optional)
     pub fn i_so(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `iSO` field to an Option value (optional)
     pub fn maybe_i_so(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -318,12 +321,12 @@ impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
 impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
     /// Set the `lensMake` field (optional)
     pub fn lens_make(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `lensMake` field to an Option value (optional)
     pub fn maybe_lens_make(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -331,12 +334,12 @@ impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
 impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
     /// Set the `lensModel` field (optional)
     pub fn lens_model(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `lensModel` field to an Option value (optional)
     pub fn maybe_lens_model(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -344,12 +347,12 @@ impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
 impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
     /// Set the `make` field (optional)
     pub fn make(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `make` field to an Option value (optional)
     pub fn maybe_make(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -357,12 +360,12 @@ impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
 impl<'a, S: exif_state::State> ExifBuilder<'a, S> {
     /// Set the `model` field (optional)
     pub fn model(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `model` field to an Option value (optional)
     pub fn maybe_model(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -377,11 +380,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ExifBuilder<'a, exif_state::SetPhoto<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         ExifBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -389,24 +392,24 @@ where
 impl<'a, S> ExifBuilder<'a, S>
 where
     S: exif_state::State,
-    S::CreatedAt: exif_state::IsSet,
     S::Photo: exif_state::IsSet,
+    S::CreatedAt: exif_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Exif<'a> {
         Exif {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            date_time_original: self.__unsafe_private_named.1,
-            exposure_time: self.__unsafe_private_named.2,
-            f_number: self.__unsafe_private_named.3,
-            flash: self.__unsafe_private_named.4,
-            focal_length_in35mm_format: self.__unsafe_private_named.5,
-            i_so: self.__unsafe_private_named.6,
-            lens_make: self.__unsafe_private_named.7,
-            lens_model: self.__unsafe_private_named.8,
-            make: self.__unsafe_private_named.9,
-            model: self.__unsafe_private_named.10,
-            photo: self.__unsafe_private_named.11.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            date_time_original: self._fields.1,
+            exposure_time: self._fields.2,
+            f_number: self._fields.3,
+            flash: self._fields.4,
+            focal_length_in35mm_format: self._fields.5,
+            i_so: self._fields.6,
+            lens_make: self._fields.7,
+            lens_model: self._fields.8,
+            make: self._fields.9,
+            model: self._fields.10,
+            photo: self._fields.11.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -419,18 +422,18 @@ where
         >,
     ) -> Exif<'a> {
         Exif {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            date_time_original: self.__unsafe_private_named.1,
-            exposure_time: self.__unsafe_private_named.2,
-            f_number: self.__unsafe_private_named.3,
-            flash: self.__unsafe_private_named.4,
-            focal_length_in35mm_format: self.__unsafe_private_named.5,
-            i_so: self.__unsafe_private_named.6,
-            lens_make: self.__unsafe_private_named.7,
-            lens_model: self.__unsafe_private_named.8,
-            make: self.__unsafe_private_named.9,
-            model: self.__unsafe_private_named.10,
-            photo: self.__unsafe_private_named.11.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            date_time_original: self._fields.1,
+            exposure_time: self._fields.2,
+            f_number: self._fields.3,
+            flash: self._fields.4,
+            focal_length_in35mm_format: self._fields.5,
+            i_so: self._fields.6,
+            lens_make: self._fields.7,
+            lens_model: self._fields.8,
+            make: self._fields.9,
+            model: self._fields.10,
+            photo: self._fields.11.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_lexical/works/collection.rs b/crates/jacquard-api/src/social_lexical/works/collection.rs
index edda4f06..188a8968 100644
--- a/crates/jacquard-api/src/social_lexical/works/collection.rs
+++ b/crates/jacquard-api/src/social_lexical/works/collection.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -172,13 +175,9 @@ pub mod collection_state {
 
 /// Builder for constructing an instance of this type
 pub struct CollectionBuilder<'a, S: collection_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<Vec<CowStr<'a>>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Vec<CowStr<'a>>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Collection<'a> {
@@ -192,9 +191,9 @@ impl<'a> CollectionBuilder<'a, collection_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,11 +208,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionBuilder<'a, collection_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,12 +220,12 @@ where
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -241,11 +240,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CollectionBuilder<'a, collection_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -259,9 +258,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Collection<'a> {
         Collection {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            labels: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            labels: self._fields.1,
+            name: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -274,9 +273,9 @@ where
         >,
     ) -> Collection<'a> {
         Collection {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            labels: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            labels: self._fields.1,
+            name: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_lexical/works/collectionitem.rs b/crates/jacquard-api/src/social_lexical/works/collectionitem.rs
index 04520317..e3bd2caf 100644
--- a/crates/jacquard-api/src/social_lexical/works/collectionitem.rs
+++ b/crates/jacquard-api/src/social_lexical/works/collectionitem.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -163,9 +166,9 @@ pub mod collectionitem_state {
 
 /// Builder for constructing an instance of this type
 pub struct CollectionitemBuilder<'a, S: collectionitem_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<AtUri<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<AtUri<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Collectionitem<'a> {
@@ -179,9 +182,9 @@ impl<'a> CollectionitemBuilder<'a, collectionitem_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionitemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionitemBuilder<'a, collectionitem_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionitemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CollectionitemBuilder<'a, collectionitem_state::SetList<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CollectionitemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CollectionitemBuilder<'a, collectionitem_state::SetWork<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CollectionitemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,9 +256,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Collectionitem<'a> {
         Collectionitem {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            list: self.__unsafe_private_named.1.unwrap(),
-            work: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            list: self._fields.1.unwrap(),
+            work: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -268,9 +271,9 @@ where
         >,
     ) -> Collectionitem<'a> {
         Collectionitem {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            list: self.__unsafe_private_named.1.unwrap(),
-            work: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            list: self._fields.1.unwrap(),
+            work: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_lexical/works/identifiers.rs b/crates/jacquard-api/src/social_lexical/works/identifiers.rs
index 78269afd..f5561371 100644
--- a/crates/jacquard-api/src/social_lexical/works/identifiers.rs
+++ b/crates/jacquard-api/src/social_lexical/works/identifiers.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -344,48 +347,45 @@ pub mod identifiers_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Identifiers;
         type Work;
+        type Identifiers;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Identifiers = Unset;
         type Work = Unset;
-    }
-    ///State transition - sets the `identifiers` field to Set
-    pub struct SetIdentifiers<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIdentifiers<S> {}
-    impl<S: State> State for SetIdentifiers<S> {
-        type Identifiers = Set<members::identifiers>;
-        type Work = S::Work;
+        type Identifiers = Unset;
     }
     ///State transition - sets the `work` field to Set
     pub struct SetWork<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWork<S> {}
     impl<S: State> State for SetWork<S> {
-        type Identifiers = S::Identifiers;
         type Work = Set<members::work>;
+        type Identifiers = S::Identifiers;
+    }
+    ///State transition - sets the `identifiers` field to Set
+    pub struct SetIdentifiers<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIdentifiers<S> {}
+    impl<S: State> State for SetIdentifiers<S> {
+        type Work = S::Work;
+        type Identifiers = Set<members::identifiers>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `identifiers` field
-        pub struct identifiers(());
         ///Marker type for the `work` field
         pub struct work(());
+        ///Marker type for the `identifiers` field
+        pub struct identifiers(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct IdentifiersBuilder<'a, S: identifiers_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<identifiers::Identifier<'a>>>,
-        Option<AtUri<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<identifiers::Identifier<'a>>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Identifiers<'a> {
@@ -399,9 +399,9 @@ impl<'a> IdentifiersBuilder<'a, identifiers_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IdentifiersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -416,11 +416,11 @@ where
         mut self,
         value: impl Into<Vec<identifiers::Identifier<'a>>>,
     ) -> IdentifiersBuilder<'a, identifiers_state::SetIdentifiers<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         IdentifiersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -435,11 +435,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> IdentifiersBuilder<'a, identifiers_state::SetWork<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         IdentifiersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -447,14 +447,14 @@ where
 impl<'a, S> IdentifiersBuilder<'a, S>
 where
     S: identifiers_state::State,
-    S::Identifiers: identifiers_state::IsSet,
     S::Work: identifiers_state::IsSet,
+    S::Identifiers: identifiers_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Identifiers<'a> {
         Identifiers {
-            identifiers: self.__unsafe_private_named.0.unwrap(),
-            work: self.__unsafe_private_named.1.unwrap(),
+            identifiers: self._fields.0.unwrap(),
+            work: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -467,8 +467,8 @@ where
         >,
     ) -> Identifiers<'a> {
         Identifiers {
-            identifiers: self.__unsafe_private_named.0.unwrap(),
-            work: self.__unsafe_private_named.1.unwrap(),
+            identifiers: self._fields.0.unwrap(),
+            work: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_lexical/works/work.rs b/crates/jacquard-api/src/social_lexical/works/work.rs
index 69525619..3aae2969 100644
--- a/crates/jacquard-api/src/social_lexical/works/work.rs
+++ b/crates/jacquard-api/src/social_lexical/works/work.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -291,50 +294,50 @@ pub mod work_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type WorkType;
         type Title;
+        type WorkType;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type WorkType = Unset;
         type Title = Unset;
-    }
-    ///State transition - sets the `work_type` field to Set
-    pub struct SetWorkType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetWorkType<S> {}
-    impl<S: State> State for SetWorkType<S> {
-        type WorkType = Set<members::work_type>;
-        type Title = S::Title;
+        type WorkType = Unset;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type WorkType = S::WorkType;
         type Title = Set<members::title>;
+        type WorkType = S::WorkType;
+    }
+    ///State transition - sets the `work_type` field to Set
+    pub struct SetWorkType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetWorkType<S> {}
+    impl<S: State> State for SetWorkType<S> {
+        type Title = S::Title;
+        type WorkType = Set<members::work_type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `work_type` field
-        pub struct work_type(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `work_type` field
+        pub struct work_type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct WorkBuilder<'a, S: work_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<WorkWorkType<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Work<'a> {
@@ -348,9 +351,9 @@ impl<'a> WorkBuilder<'a, work_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         WorkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -358,12 +361,12 @@ impl<'a> WorkBuilder<'a, work_state::Empty> {
 impl<'a, S: work_state::State> WorkBuilder<'a, S> {
     /// Set the `id` field (optional)
     pub fn id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `id` field to an Option value (optional)
     pub fn maybe_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -378,11 +381,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> WorkBuilder<'a, work_state::SetTitle<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         WorkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -397,11 +400,11 @@ where
         mut self,
         value: impl Into<WorkWorkType<'a>>,
     ) -> WorkBuilder<'a, work_state::SetWorkType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         WorkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -409,12 +412,12 @@ where
 impl<'a, S: work_state::State> WorkBuilder<'a, S> {
     /// Set the `year` field (optional)
     pub fn year(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `year` field to an Option value (optional)
     pub fn maybe_year(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -422,16 +425,16 @@ impl<'a, S: work_state::State> WorkBuilder<'a, S> {
 impl<'a, S> WorkBuilder<'a, S>
 where
     S: work_state::State,
-    S::WorkType: work_state::IsSet,
     S::Title: work_state::IsSet,
+    S::WorkType: work_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Work<'a> {
         Work {
-            id: self.__unsafe_private_named.0,
-            title: self.__unsafe_private_named.1.unwrap(),
-            work_type: self.__unsafe_private_named.2.unwrap(),
-            year: self.__unsafe_private_named.3,
+            id: self._fields.0,
+            title: self._fields.1.unwrap(),
+            work_type: self._fields.2.unwrap(),
+            year: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -444,10 +447,10 @@ where
         >,
     ) -> Work<'a> {
         Work {
-            id: self.__unsafe_private_named.0,
-            title: self.__unsafe_private_named.1.unwrap(),
-            work_type: self.__unsafe_private_named.2.unwrap(),
-            year: self.__unsafe_private_named.3,
+            id: self._fields.0,
+            title: self._fields.1.unwrap(),
+            work_type: self._fields.2.unwrap(),
+            year: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_octosphere/publication.rs b/crates/jacquard-api/src/social_octosphere/publication.rs
index 9d0f7425..fa309174 100644
--- a/crates/jacquard-api/src/social_octosphere/publication.rs
+++ b/crates/jacquard-api/src/social_octosphere/publication.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -393,274 +396,274 @@ pub mod publication_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type CreatedAt;
+        type UpdatedAt;
         type Citations;
+        type Status;
+        type OctopusId;
+        type ContentHtml;
         type LinkedTo;
         type VersionId;
-        type Status;
-        type UpdatedAt;
+        type Title;
         type LinkedFrom;
-        type CreatedAt;
-        type ContentHtml;
-        type ContentText;
         type PublicationType;
-        type OctopusId;
-        type Title;
+        type ContentText;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type CreatedAt = Unset;
+        type UpdatedAt = Unset;
         type Citations = Unset;
+        type Status = Unset;
+        type OctopusId = Unset;
+        type ContentHtml = Unset;
         type LinkedTo = Unset;
         type VersionId = Unset;
-        type Status = Unset;
-        type UpdatedAt = Unset;
+        type Title = Unset;
         type LinkedFrom = Unset;
-        type CreatedAt = Unset;
-        type ContentHtml = Unset;
-        type ContentText = Unset;
         type PublicationType = Unset;
-        type OctopusId = Unset;
-        type Title = Unset;
+        type ContentText = Unset;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type UpdatedAt = S::UpdatedAt;
+        type Citations = S::Citations;
+        type Status = S::Status;
+        type OctopusId = S::OctopusId;
+        type ContentHtml = S::ContentHtml;
+        type LinkedTo = S::LinkedTo;
+        type VersionId = S::VersionId;
+        type Title = S::Title;
+        type LinkedFrom = S::LinkedFrom;
+        type PublicationType = S::PublicationType;
+        type ContentText = S::ContentText;
+    }
+    ///State transition - sets the `updated_at` field to Set
+    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
+    impl<S: State> State for SetUpdatedAt<S> {
+        type CreatedAt = S::CreatedAt;
+        type UpdatedAt = Set<members::updated_at>;
+        type Citations = S::Citations;
+        type Status = S::Status;
+        type OctopusId = S::OctopusId;
+        type ContentHtml = S::ContentHtml;
+        type LinkedTo = S::LinkedTo;
+        type VersionId = S::VersionId;
+        type Title = S::Title;
+        type LinkedFrom = S::LinkedFrom;
+        type PublicationType = S::PublicationType;
+        type ContentText = S::ContentText;
     }
     ///State transition - sets the `citations` field to Set
     pub struct SetCitations<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCitations<S> {}
     impl<S: State> State for SetCitations<S> {
+        type CreatedAt = S::CreatedAt;
+        type UpdatedAt = S::UpdatedAt;
         type Citations = Set<members::citations>;
+        type Status = S::Status;
+        type OctopusId = S::OctopusId;
+        type ContentHtml = S::ContentHtml;
         type LinkedTo = S::LinkedTo;
         type VersionId = S::VersionId;
-        type Status = S::Status;
-        type UpdatedAt = S::UpdatedAt;
+        type Title = S::Title;
         type LinkedFrom = S::LinkedFrom;
+        type PublicationType = S::PublicationType;
+        type ContentText = S::ContentText;
+    }
+    ///State transition - sets the `status` field to Set
+    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStatus<S> {}
+    impl<S: State> State for SetStatus<S> {
         type CreatedAt = S::CreatedAt;
+        type UpdatedAt = S::UpdatedAt;
+        type Citations = S::Citations;
+        type Status = Set<members::status>;
+        type OctopusId = S::OctopusId;
         type ContentHtml = S::ContentHtml;
+        type LinkedTo = S::LinkedTo;
+        type VersionId = S::VersionId;
+        type Title = S::Title;
+        type LinkedFrom = S::LinkedFrom;
+        type PublicationType = S::PublicationType;
         type ContentText = S::ContentText;
+    }
+    ///State transition - sets the `octopus_id` field to Set
+    pub struct SetOctopusId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetOctopusId<S> {}
+    impl<S: State> State for SetOctopusId<S> {
+        type CreatedAt = S::CreatedAt;
+        type UpdatedAt = S::UpdatedAt;
+        type Citations = S::Citations;
+        type Status = S::Status;
+        type OctopusId = Set<members::octopus_id>;
+        type ContentHtml = S::ContentHtml;
+        type LinkedTo = S::LinkedTo;
+        type VersionId = S::VersionId;
+        type Title = S::Title;
+        type LinkedFrom = S::LinkedFrom;
         type PublicationType = S::PublicationType;
+        type ContentText = S::ContentText;
+    }
+    ///State transition - sets the `content_html` field to Set
+    pub struct SetContentHtml<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContentHtml<S> {}
+    impl<S: State> State for SetContentHtml<S> {
+        type CreatedAt = S::CreatedAt;
+        type UpdatedAt = S::UpdatedAt;
+        type Citations = S::Citations;
+        type Status = S::Status;
         type OctopusId = S::OctopusId;
+        type ContentHtml = Set<members::content_html>;
+        type LinkedTo = S::LinkedTo;
+        type VersionId = S::VersionId;
         type Title = S::Title;
+        type LinkedFrom = S::LinkedFrom;
+        type PublicationType = S::PublicationType;
+        type ContentText = S::ContentText;
     }
     ///State transition - sets the `linked_to` field to Set
     pub struct SetLinkedTo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLinkedTo<S> {}
     impl<S: State> State for SetLinkedTo<S> {
+        type CreatedAt = S::CreatedAt;
+        type UpdatedAt = S::UpdatedAt;
         type Citations = S::Citations;
+        type Status = S::Status;
+        type OctopusId = S::OctopusId;
+        type ContentHtml = S::ContentHtml;
         type LinkedTo = Set<members::linked_to>;
         type VersionId = S::VersionId;
-        type Status = S::Status;
-        type UpdatedAt = S::UpdatedAt;
+        type Title = S::Title;
         type LinkedFrom = S::LinkedFrom;
-        type CreatedAt = S::CreatedAt;
-        type ContentHtml = S::ContentHtml;
-        type ContentText = S::ContentText;
         type PublicationType = S::PublicationType;
-        type OctopusId = S::OctopusId;
-        type Title = S::Title;
+        type ContentText = S::ContentText;
     }
     ///State transition - sets the `version_id` field to Set
     pub struct SetVersionId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetVersionId<S> {}
     impl<S: State> State for SetVersionId<S> {
+        type CreatedAt = S::CreatedAt;
+        type UpdatedAt = S::UpdatedAt;
         type Citations = S::Citations;
-        type LinkedTo = S::LinkedTo;
-        type VersionId = Set<members::version_id>;
         type Status = S::Status;
-        type UpdatedAt = S::UpdatedAt;
-        type LinkedFrom = S::LinkedFrom;
-        type CreatedAt = S::CreatedAt;
-        type ContentHtml = S::ContentHtml;
-        type ContentText = S::ContentText;
-        type PublicationType = S::PublicationType;
         type OctopusId = S::OctopusId;
-        type Title = S::Title;
-    }
-    ///State transition - sets the `status` field to Set
-    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStatus<S> {}
-    impl<S: State> State for SetStatus<S> {
-        type Citations = S::Citations;
+        type ContentHtml = S::ContentHtml;
         type LinkedTo = S::LinkedTo;
-        type VersionId = S::VersionId;
-        type Status = Set<members::status>;
-        type UpdatedAt = S::UpdatedAt;
+        type VersionId = Set<members::version_id>;
+        type Title = S::Title;
         type LinkedFrom = S::LinkedFrom;
-        type CreatedAt = S::CreatedAt;
-        type ContentHtml = S::ContentHtml;
-        type ContentText = S::ContentText;
         type PublicationType = S::PublicationType;
-        type OctopusId = S::OctopusId;
-        type Title = S::Title;
+        type ContentText = S::ContentText;
     }
-    ///State transition - sets the `updated_at` field to Set
-    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
-    impl<S: State> State for SetUpdatedAt<S> {
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type CreatedAt = S::CreatedAt;
+        type UpdatedAt = S::UpdatedAt;
         type Citations = S::Citations;
+        type Status = S::Status;
+        type OctopusId = S::OctopusId;
+        type ContentHtml = S::ContentHtml;
         type LinkedTo = S::LinkedTo;
         type VersionId = S::VersionId;
-        type Status = S::Status;
-        type UpdatedAt = Set<members::updated_at>;
+        type Title = Set<members::title>;
         type LinkedFrom = S::LinkedFrom;
-        type CreatedAt = S::CreatedAt;
-        type ContentHtml = S::ContentHtml;
-        type ContentText = S::ContentText;
         type PublicationType = S::PublicationType;
-        type OctopusId = S::OctopusId;
-        type Title = S::Title;
+        type ContentText = S::ContentText;
     }
     ///State transition - sets the `linked_from` field to Set
     pub struct SetLinkedFrom<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLinkedFrom<S> {}
     impl<S: State> State for SetLinkedFrom<S> {
+        type CreatedAt = S::CreatedAt;
+        type UpdatedAt = S::UpdatedAt;
         type Citations = S::Citations;
+        type Status = S::Status;
+        type OctopusId = S::OctopusId;
+        type ContentHtml = S::ContentHtml;
         type LinkedTo = S::LinkedTo;
         type VersionId = S::VersionId;
-        type Status = S::Status;
-        type UpdatedAt = S::UpdatedAt;
+        type Title = S::Title;
         type LinkedFrom = Set<members::linked_from>;
-        type CreatedAt = S::CreatedAt;
-        type ContentHtml = S::ContentHtml;
-        type ContentText = S::ContentText;
         type PublicationType = S::PublicationType;
-        type OctopusId = S::OctopusId;
-        type Title = S::Title;
+        type ContentText = S::ContentText;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+    ///State transition - sets the `publication_type` field to Set
+    pub struct SetPublicationType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPublicationType<S> {}
+    impl<S: State> State for SetPublicationType<S> {
+        type CreatedAt = S::CreatedAt;
+        type UpdatedAt = S::UpdatedAt;
         type Citations = S::Citations;
-        type LinkedTo = S::LinkedTo;
-        type VersionId = S::VersionId;
         type Status = S::Status;
-        type UpdatedAt = S::UpdatedAt;
-        type LinkedFrom = S::LinkedFrom;
-        type CreatedAt = Set<members::created_at>;
-        type ContentHtml = S::ContentHtml;
-        type ContentText = S::ContentText;
-        type PublicationType = S::PublicationType;
         type OctopusId = S::OctopusId;
-        type Title = S::Title;
-    }
-    ///State transition - sets the `content_html` field to Set
-    pub struct SetContentHtml<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContentHtml<S> {}
-    impl<S: State> State for SetContentHtml<S> {
-        type Citations = S::Citations;
+        type ContentHtml = S::ContentHtml;
         type LinkedTo = S::LinkedTo;
         type VersionId = S::VersionId;
-        type Status = S::Status;
-        type UpdatedAt = S::UpdatedAt;
+        type Title = S::Title;
         type LinkedFrom = S::LinkedFrom;
-        type CreatedAt = S::CreatedAt;
-        type ContentHtml = Set<members::content_html>;
+        type PublicationType = Set<members::publication_type>;
         type ContentText = S::ContentText;
-        type PublicationType = S::PublicationType;
-        type OctopusId = S::OctopusId;
-        type Title = S::Title;
     }
     ///State transition - sets the `content_text` field to Set
     pub struct SetContentText<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContentText<S> {}
     impl<S: State> State for SetContentText<S> {
-        type Citations = S::Citations;
-        type LinkedTo = S::LinkedTo;
-        type VersionId = S::VersionId;
-        type Status = S::Status;
-        type UpdatedAt = S::UpdatedAt;
-        type LinkedFrom = S::LinkedFrom;
         type CreatedAt = S::CreatedAt;
-        type ContentHtml = S::ContentHtml;
-        type ContentText = Set<members::content_text>;
-        type PublicationType = S::PublicationType;
-        type OctopusId = S::OctopusId;
-        type Title = S::Title;
-    }
-    ///State transition - sets the `publication_type` field to Set
-    pub struct SetPublicationType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPublicationType<S> {}
-    impl<S: State> State for SetPublicationType<S> {
-        type Citations = S::Citations;
-        type LinkedTo = S::LinkedTo;
-        type VersionId = S::VersionId;
-        type Status = S::Status;
         type UpdatedAt = S::UpdatedAt;
-        type LinkedFrom = S::LinkedFrom;
-        type CreatedAt = S::CreatedAt;
-        type ContentHtml = S::ContentHtml;
-        type ContentText = S::ContentText;
-        type PublicationType = Set<members::publication_type>;
-        type OctopusId = S::OctopusId;
-        type Title = S::Title;
-    }
-    ///State transition - sets the `octopus_id` field to Set
-    pub struct SetOctopusId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetOctopusId<S> {}
-    impl<S: State> State for SetOctopusId<S> {
         type Citations = S::Citations;
-        type LinkedTo = S::LinkedTo;
-        type VersionId = S::VersionId;
         type Status = S::Status;
-        type UpdatedAt = S::UpdatedAt;
-        type LinkedFrom = S::LinkedFrom;
-        type CreatedAt = S::CreatedAt;
+        type OctopusId = S::OctopusId;
         type ContentHtml = S::ContentHtml;
-        type ContentText = S::ContentText;
-        type PublicationType = S::PublicationType;
-        type OctopusId = Set<members::octopus_id>;
-        type Title = S::Title;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Citations = S::Citations;
         type LinkedTo = S::LinkedTo;
         type VersionId = S::VersionId;
-        type Status = S::Status;
-        type UpdatedAt = S::UpdatedAt;
+        type Title = S::Title;
         type LinkedFrom = S::LinkedFrom;
-        type CreatedAt = S::CreatedAt;
-        type ContentHtml = S::ContentHtml;
-        type ContentText = S::ContentText;
         type PublicationType = S::PublicationType;
-        type OctopusId = S::OctopusId;
-        type Title = Set<members::title>;
+        type ContentText = Set<members::content_text>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `updated_at` field
+        pub struct updated_at(());
         ///Marker type for the `citations` field
         pub struct citations(());
+        ///Marker type for the `status` field
+        pub struct status(());
+        ///Marker type for the `octopus_id` field
+        pub struct octopus_id(());
+        ///Marker type for the `content_html` field
+        pub struct content_html(());
         ///Marker type for the `linked_to` field
         pub struct linked_to(());
         ///Marker type for the `version_id` field
         pub struct version_id(());
-        ///Marker type for the `status` field
-        pub struct status(());
-        ///Marker type for the `updated_at` field
-        pub struct updated_at(());
+        ///Marker type for the `title` field
+        pub struct title(());
         ///Marker type for the `linked_from` field
         pub struct linked_from(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `content_html` field
-        pub struct content_html(());
-        ///Marker type for the `content_text` field
-        pub struct content_text(());
         ///Marker type for the `publication_type` field
         pub struct publication_type(());
-        ///Marker type for the `octopus_id` field
-        pub struct octopus_id(());
-        ///Marker type for the `title` field
-        pub struct title(());
+        ///Marker type for the `content_text` field
+        pub struct content_text(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PublicationBuilder<'a, S: publication_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<UriValue<'a>>,
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
@@ -678,7 +681,7 @@ pub struct PublicationBuilder<'a, S: publication_state::State> {
         Option<Datetime>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Publication<'a> {
@@ -692,8 +695,8 @@ impl<'a> PublicationBuilder<'a, publication_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -711,7 +714,7 @@ impl<'a> PublicationBuilder<'a, publication_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -719,12 +722,12 @@ impl<'a> PublicationBuilder<'a, publication_state::Empty> {
 impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
     /// Set the `canonicalUrl` field (optional)
     pub fn canonical_url(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `canonicalUrl` field to an Option value (optional)
     pub fn maybe_canonical_url(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -739,11 +742,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> PublicationBuilder<'a, publication_state::SetCitations<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -758,11 +761,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PublicationBuilder<'a, publication_state::SetContentHtml<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -777,11 +780,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PublicationBuilder<'a, publication_state::SetContentText<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -796,11 +799,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PublicationBuilder<'a, publication_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -808,12 +811,12 @@ where
 impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
     /// Set the `doi` field (optional)
     pub fn doi(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `doi` field to an Option value (optional)
     pub fn maybe_doi(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -828,11 +831,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> PublicationBuilder<'a, publication_state::SetLinkedFrom<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -847,11 +850,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> PublicationBuilder<'a, publication_state::SetLinkedTo<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -866,11 +869,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PublicationBuilder<'a, publication_state::SetOctopusId<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -878,12 +881,12 @@ where
 impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
     /// Set the `ownerOrcid` field (optional)
     pub fn owner_orcid(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `ownerOrcid` field to an Option value (optional)
     pub fn maybe_owner_orcid(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -891,12 +894,12 @@ impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
 impl<'a, S: publication_state::State> PublicationBuilder<'a, S> {
     /// Set the `peerReviewOf` field (optional)
     pub fn peer_review_of(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `peerReviewOf` field to an Option value (optional)
     pub fn maybe_peer_review_of(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -911,11 +914,11 @@ where
         mut self,
         value: impl Into<PublicationPublicationType<'a>>,
     ) -> PublicationBuilder<'a, publication_state::SetPublicationType<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -930,11 +933,11 @@ where
         mut self,
         value: impl Into<PublicationStatus<'a>>,
     ) -> PublicationBuilder<'a, publication_state::SetStatus<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -949,11 +952,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PublicationBuilder<'a, publication_state::SetTitle<S>> {
-        self.__unsafe_private_named.13 = Option::Some(value.into());
+        self._fields.13 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -968,11 +971,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PublicationBuilder<'a, publication_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.14 = Option::Some(value.into());
+        self._fields.14 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -987,11 +990,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PublicationBuilder<'a, publication_state::SetVersionId<S>> {
-        self.__unsafe_private_named.15 = Option::Some(value.into());
+        self._fields.15 = Option::Some(value.into());
         PublicationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -999,38 +1002,38 @@ where
 impl<'a, S> PublicationBuilder<'a, S>
 where
     S: publication_state::State,
+    S::CreatedAt: publication_state::IsSet,
+    S::UpdatedAt: publication_state::IsSet,
     S::Citations: publication_state::IsSet,
+    S::Status: publication_state::IsSet,
+    S::OctopusId: publication_state::IsSet,
+    S::ContentHtml: publication_state::IsSet,
     S::LinkedTo: publication_state::IsSet,
     S::VersionId: publication_state::IsSet,
-    S::Status: publication_state::IsSet,
-    S::UpdatedAt: publication_state::IsSet,
+    S::Title: publication_state::IsSet,
     S::LinkedFrom: publication_state::IsSet,
-    S::CreatedAt: publication_state::IsSet,
-    S::ContentHtml: publication_state::IsSet,
-    S::ContentText: publication_state::IsSet,
     S::PublicationType: publication_state::IsSet,
-    S::OctopusId: publication_state::IsSet,
-    S::Title: publication_state::IsSet,
+    S::ContentText: publication_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Publication<'a> {
         Publication {
-            canonical_url: self.__unsafe_private_named.0,
-            citations: self.__unsafe_private_named.1.unwrap(),
-            content_html: self.__unsafe_private_named.2.unwrap(),
-            content_text: self.__unsafe_private_named.3.unwrap(),
-            created_at: self.__unsafe_private_named.4.unwrap(),
-            doi: self.__unsafe_private_named.5,
-            linked_from: self.__unsafe_private_named.6.unwrap(),
-            linked_to: self.__unsafe_private_named.7.unwrap(),
-            octopus_id: self.__unsafe_private_named.8.unwrap(),
-            owner_orcid: self.__unsafe_private_named.9,
-            peer_review_of: self.__unsafe_private_named.10,
-            publication_type: self.__unsafe_private_named.11.unwrap(),
-            status: self.__unsafe_private_named.12.unwrap(),
-            title: self.__unsafe_private_named.13.unwrap(),
-            updated_at: self.__unsafe_private_named.14.unwrap(),
-            version_id: self.__unsafe_private_named.15.unwrap(),
+            canonical_url: self._fields.0,
+            citations: self._fields.1.unwrap(),
+            content_html: self._fields.2.unwrap(),
+            content_text: self._fields.3.unwrap(),
+            created_at: self._fields.4.unwrap(),
+            doi: self._fields.5,
+            linked_from: self._fields.6.unwrap(),
+            linked_to: self._fields.7.unwrap(),
+            octopus_id: self._fields.8.unwrap(),
+            owner_orcid: self._fields.9,
+            peer_review_of: self._fields.10,
+            publication_type: self._fields.11.unwrap(),
+            status: self._fields.12.unwrap(),
+            title: self._fields.13.unwrap(),
+            updated_at: self._fields.14.unwrap(),
+            version_id: self._fields.15.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1043,22 +1046,22 @@ where
         >,
     ) -> Publication<'a> {
         Publication {
-            canonical_url: self.__unsafe_private_named.0,
-            citations: self.__unsafe_private_named.1.unwrap(),
-            content_html: self.__unsafe_private_named.2.unwrap(),
-            content_text: self.__unsafe_private_named.3.unwrap(),
-            created_at: self.__unsafe_private_named.4.unwrap(),
-            doi: self.__unsafe_private_named.5,
-            linked_from: self.__unsafe_private_named.6.unwrap(),
-            linked_to: self.__unsafe_private_named.7.unwrap(),
-            octopus_id: self.__unsafe_private_named.8.unwrap(),
-            owner_orcid: self.__unsafe_private_named.9,
-            peer_review_of: self.__unsafe_private_named.10,
-            publication_type: self.__unsafe_private_named.11.unwrap(),
-            status: self.__unsafe_private_named.12.unwrap(),
-            title: self.__unsafe_private_named.13.unwrap(),
-            updated_at: self.__unsafe_private_named.14.unwrap(),
-            version_id: self.__unsafe_private_named.15.unwrap(),
+            canonical_url: self._fields.0,
+            citations: self._fields.1.unwrap(),
+            content_html: self._fields.2.unwrap(),
+            content_text: self._fields.3.unwrap(),
+            created_at: self._fields.4.unwrap(),
+            doi: self._fields.5,
+            linked_from: self._fields.6.unwrap(),
+            linked_to: self._fields.7.unwrap(),
+            octopus_id: self._fields.8.unwrap(),
+            owner_orcid: self._fields.9,
+            peer_review_of: self._fields.10,
+            publication_type: self._fields.11.unwrap(),
+            status: self._fields.12.unwrap(),
+            title: self._fields.13.unwrap(),
+            updated_at: self._fields.14.unwrap(),
+            version_id: self._fields.15.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_pace/daily/ring.rs b/crates/jacquard-api/src/social_pace/daily/ring.rs
index 08dfe507..33330090 100644
--- a/crates/jacquard-api/src/social_pace/daily/ring.rs
+++ b/crates/jacquard-api/src/social_pace/daily/ring.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -118,134 +121,134 @@ pub mod ring_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type StandGoal;
         type Exercise;
-        type Move;
-        type StandHours;
         type ExerciseGoal;
-        type StandGoal;
-        type MoveGoal;
+        type Move;
         type CreatedAt;
+        type MoveGoal;
+        type StandHours;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type StandGoal = Unset;
         type Exercise = Unset;
-        type Move = Unset;
-        type StandHours = Unset;
         type ExerciseGoal = Unset;
-        type StandGoal = Unset;
-        type MoveGoal = Unset;
+        type Move = Unset;
         type CreatedAt = Unset;
+        type MoveGoal = Unset;
+        type StandHours = Unset;
+    }
+    ///State transition - sets the `stand_goal` field to Set
+    pub struct SetStandGoal<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStandGoal<S> {}
+    impl<S: State> State for SetStandGoal<S> {
+        type StandGoal = Set<members::stand_goal>;
+        type Exercise = S::Exercise;
+        type ExerciseGoal = S::ExerciseGoal;
+        type Move = S::Move;
+        type CreatedAt = S::CreatedAt;
+        type MoveGoal = S::MoveGoal;
+        type StandHours = S::StandHours;
     }
     ///State transition - sets the `exercise` field to Set
     pub struct SetExercise<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetExercise<S> {}
     impl<S: State> State for SetExercise<S> {
+        type StandGoal = S::StandGoal;
         type Exercise = Set<members::exercise>;
+        type ExerciseGoal = S::ExerciseGoal;
         type Move = S::Move;
+        type CreatedAt = S::CreatedAt;
+        type MoveGoal = S::MoveGoal;
         type StandHours = S::StandHours;
-        type ExerciseGoal = S::ExerciseGoal;
+    }
+    ///State transition - sets the `exercise_goal` field to Set
+    pub struct SetExerciseGoal<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetExerciseGoal<S> {}
+    impl<S: State> State for SetExerciseGoal<S> {
         type StandGoal = S::StandGoal;
-        type MoveGoal = S::MoveGoal;
+        type Exercise = S::Exercise;
+        type ExerciseGoal = Set<members::exercise_goal>;
+        type Move = S::Move;
         type CreatedAt = S::CreatedAt;
+        type MoveGoal = S::MoveGoal;
+        type StandHours = S::StandHours;
     }
     ///State transition - sets the `move` field to Set
     pub struct SetMove<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMove<S> {}
     impl<S: State> State for SetMove<S> {
-        type Exercise = S::Exercise;
-        type Move = Set<members::r#move>;
-        type StandHours = S::StandHours;
-        type ExerciseGoal = S::ExerciseGoal;
         type StandGoal = S::StandGoal;
-        type MoveGoal = S::MoveGoal;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `stand_hours` field to Set
-    pub struct SetStandHours<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStandHours<S> {}
-    impl<S: State> State for SetStandHours<S> {
         type Exercise = S::Exercise;
-        type Move = S::Move;
-        type StandHours = Set<members::stand_hours>;
         type ExerciseGoal = S::ExerciseGoal;
-        type StandGoal = S::StandGoal;
-        type MoveGoal = S::MoveGoal;
+        type Move = Set<members::r#move>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `exercise_goal` field to Set
-    pub struct SetExerciseGoal<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetExerciseGoal<S> {}
-    impl<S: State> State for SetExerciseGoal<S> {
-        type Exercise = S::Exercise;
-        type Move = S::Move;
-        type StandHours = S::StandHours;
-        type ExerciseGoal = Set<members::exercise_goal>;
-        type StandGoal = S::StandGoal;
         type MoveGoal = S::MoveGoal;
-        type CreatedAt = S::CreatedAt;
+        type StandHours = S::StandHours;
     }
-    ///State transition - sets the `stand_goal` field to Set
-    pub struct SetStandGoal<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStandGoal<S> {}
-    impl<S: State> State for SetStandGoal<S> {
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type StandGoal = S::StandGoal;
         type Exercise = S::Exercise;
-        type Move = S::Move;
-        type StandHours = S::StandHours;
         type ExerciseGoal = S::ExerciseGoal;
-        type StandGoal = Set<members::stand_goal>;
+        type Move = S::Move;
+        type CreatedAt = Set<members::created_at>;
         type MoveGoal = S::MoveGoal;
-        type CreatedAt = S::CreatedAt;
+        type StandHours = S::StandHours;
     }
     ///State transition - sets the `move_goal` field to Set
     pub struct SetMoveGoal<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMoveGoal<S> {}
     impl<S: State> State for SetMoveGoal<S> {
+        type StandGoal = S::StandGoal;
         type Exercise = S::Exercise;
-        type Move = S::Move;
-        type StandHours = S::StandHours;
         type ExerciseGoal = S::ExerciseGoal;
-        type StandGoal = S::StandGoal;
-        type MoveGoal = Set<members::move_goal>;
+        type Move = S::Move;
         type CreatedAt = S::CreatedAt;
+        type MoveGoal = Set<members::move_goal>;
+        type StandHours = S::StandHours;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+    ///State transition - sets the `stand_hours` field to Set
+    pub struct SetStandHours<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStandHours<S> {}
+    impl<S: State> State for SetStandHours<S> {
+        type StandGoal = S::StandGoal;
         type Exercise = S::Exercise;
-        type Move = S::Move;
-        type StandHours = S::StandHours;
         type ExerciseGoal = S::ExerciseGoal;
-        type StandGoal = S::StandGoal;
+        type Move = S::Move;
+        type CreatedAt = S::CreatedAt;
         type MoveGoal = S::MoveGoal;
-        type CreatedAt = Set<members::created_at>;
+        type StandHours = Set<members::stand_hours>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `stand_goal` field
+        pub struct stand_goal(());
         ///Marker type for the `exercise` field
         pub struct exercise(());
-        ///Marker type for the `move` field
-        pub struct r#move(());
-        ///Marker type for the `stand_hours` field
-        pub struct stand_hours(());
         ///Marker type for the `exercise_goal` field
         pub struct exercise_goal(());
-        ///Marker type for the `stand_goal` field
-        pub struct stand_goal(());
-        ///Marker type for the `move_goal` field
-        pub struct move_goal(());
+        ///Marker type for the `move` field
+        pub struct r#move(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `move_goal` field
+        pub struct move_goal(());
+        ///Marker type for the `stand_hours` field
+        pub struct stand_hours(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RingBuilder<'a, S: ring_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<i64>,
         Option<i64>,
@@ -254,7 +257,7 @@ pub struct RingBuilder<'a, S: ring_state::State> {
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Ring<'a> {
@@ -268,9 +271,9 @@ impl<'a> RingBuilder<'a, ring_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -285,11 +288,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RingBuilder<'a, ring_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -304,11 +307,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingBuilder<'a, ring_state::SetExercise<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -323,11 +326,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingBuilder<'a, ring_state::SetExerciseGoal<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -342,11 +345,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingBuilder<'a, ring_state::SetMove<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -361,11 +364,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingBuilder<'a, ring_state::SetMoveGoal<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -380,11 +383,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingBuilder<'a, ring_state::SetStandGoal<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -399,11 +402,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingBuilder<'a, ring_state::SetStandHours<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -411,24 +414,24 @@ where
 impl<'a, S> RingBuilder<'a, S>
 where
     S: ring_state::State,
+    S::StandGoal: ring_state::IsSet,
     S::Exercise: ring_state::IsSet,
-    S::Move: ring_state::IsSet,
-    S::StandHours: ring_state::IsSet,
     S::ExerciseGoal: ring_state::IsSet,
-    S::StandGoal: ring_state::IsSet,
-    S::MoveGoal: ring_state::IsSet,
+    S::Move: ring_state::IsSet,
     S::CreatedAt: ring_state::IsSet,
+    S::MoveGoal: ring_state::IsSet,
+    S::StandHours: ring_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Ring<'a> {
         Ring {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            exercise: self.__unsafe_private_named.1.unwrap(),
-            exercise_goal: self.__unsafe_private_named.2.unwrap(),
-            r#move: self.__unsafe_private_named.3.unwrap(),
-            move_goal: self.__unsafe_private_named.4.unwrap(),
-            stand_goal: self.__unsafe_private_named.5.unwrap(),
-            stand_hours: self.__unsafe_private_named.6.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            exercise: self._fields.1.unwrap(),
+            exercise_goal: self._fields.2.unwrap(),
+            r#move: self._fields.3.unwrap(),
+            move_goal: self._fields.4.unwrap(),
+            stand_goal: self._fields.5.unwrap(),
+            stand_hours: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -441,13 +444,13 @@ where
         >,
     ) -> Ring<'a> {
         Ring {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            exercise: self.__unsafe_private_named.1.unwrap(),
-            exercise_goal: self.__unsafe_private_named.2.unwrap(),
-            r#move: self.__unsafe_private_named.3.unwrap(),
-            move_goal: self.__unsafe_private_named.4.unwrap(),
-            stand_goal: self.__unsafe_private_named.5.unwrap(),
-            stand_hours: self.__unsafe_private_named.6.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            exercise: self._fields.1.unwrap(),
+            exercise_goal: self._fields.2.unwrap(),
+            r#move: self._fields.3.unwrap(),
+            move_goal: self._fields.4.unwrap(),
+            stand_goal: self._fields.5.unwrap(),
+            stand_hours: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_pace/daily/step.rs b/crates/jacquard-api/src/social_pace/daily/step.rs
index a3de12d5..d6ba18c7 100644
--- a/crates/jacquard-api/src/social_pace/daily/step.rs
+++ b/crates/jacquard-api/src/social_pace/daily/step.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -161,9 +164,9 @@ pub mod step_state {
 
 /// Builder for constructing an instance of this type
 pub struct StepBuilder<'a, S: step_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<i64>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<i64>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Step<'a> {
@@ -177,9 +180,9 @@ impl<'a> StepBuilder<'a, step_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StepBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -194,11 +197,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StepBuilder<'a, step_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StepBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,11 +216,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> StepBuilder<'a, step_state::SetSteps<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StepBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,11 +235,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StepBuilder<'a, step_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         StepBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -251,9 +254,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Step<'a> {
         Step {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            steps: self.__unsafe_private_named.1.unwrap(),
-            updated_at: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            steps: self._fields.1.unwrap(),
+            updated_at: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -266,9 +269,9 @@ where
         >,
     ) -> Step<'a> {
         Step {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            steps: self.__unsafe_private_named.1.unwrap(),
-            updated_at: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            steps: self._fields.1.unwrap(),
+            updated_at: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_pace/feed.rs b/crates/jacquard-api/src/social_pace/feed.rs
index 2abaed49..63dc3a1f 100644
--- a/crates/jacquard-api/src/social_pace/feed.rs
+++ b/crates/jacquard-api/src/social_pace/feed.rs
@@ -7,7 +7,11 @@
 
 pub mod activity;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -319,49 +323,49 @@ pub mod split_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Duration;
         type Order;
+        type Duration;
         type Distance;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Duration = Unset;
         type Order = Unset;
+        type Duration = Unset;
         type Distance = Unset;
     }
-    ///State transition - sets the `duration` field to Set
-    pub struct SetDuration<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDuration<S> {}
-    impl<S: State> State for SetDuration<S> {
-        type Duration = Set<members::duration>;
-        type Order = S::Order;
-        type Distance = S::Distance;
-    }
     ///State transition - sets the `order` field to Set
     pub struct SetOrder<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetOrder<S> {}
     impl<S: State> State for SetOrder<S> {
-        type Duration = S::Duration;
         type Order = Set<members::order>;
+        type Duration = S::Duration;
+        type Distance = S::Distance;
+    }
+    ///State transition - sets the `duration` field to Set
+    pub struct SetDuration<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDuration<S> {}
+    impl<S: State> State for SetDuration<S> {
+        type Order = S::Order;
+        type Duration = Set<members::duration>;
         type Distance = S::Distance;
     }
     ///State transition - sets the `distance` field to Set
     pub struct SetDistance<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDistance<S> {}
     impl<S: State> State for SetDistance<S> {
-        type Duration = S::Duration;
         type Order = S::Order;
+        type Duration = S::Duration;
         type Distance = Set<members::distance>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `duration` field
-        pub struct duration(());
         ///Marker type for the `order` field
         pub struct order(());
+        ///Marker type for the `duration` field
+        pub struct duration(());
         ///Marker type for the `distance` field
         pub struct distance(());
     }
@@ -369,9 +373,9 @@ pub mod split_state {
 
 /// Builder for constructing an instance of this type
 pub struct SplitBuilder<'a, S: split_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Split<'a> {
@@ -385,9 +389,9 @@ impl<'a> SplitBuilder<'a, split_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SplitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -402,11 +406,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SplitBuilder<'a, split_state::SetDistance<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SplitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -421,11 +425,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SplitBuilder<'a, split_state::SetDuration<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SplitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -440,11 +444,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SplitBuilder<'a, split_state::SetOrder<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SplitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -452,16 +456,16 @@ where
 impl<'a, S> SplitBuilder<'a, S>
 where
     S: split_state::State,
-    S::Duration: split_state::IsSet,
     S::Order: split_state::IsSet,
+    S::Duration: split_state::IsSet,
     S::Distance: split_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Split<'a> {
         Split {
-            distance: self.__unsafe_private_named.0.unwrap(),
-            duration: self.__unsafe_private_named.1.unwrap(),
-            order: self.__unsafe_private_named.2.unwrap(),
+            distance: self._fields.0.unwrap(),
+            duration: self._fields.1.unwrap(),
+            order: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -474,9 +478,9 @@ where
         >,
     ) -> Split<'a> {
         Split {
-            distance: self.__unsafe_private_named.0.unwrap(),
-            duration: self.__unsafe_private_named.1.unwrap(),
-            order: self.__unsafe_private_named.2.unwrap(),
+            distance: self._fields.0.unwrap(),
+            duration: self._fields.1.unwrap(),
+            order: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_pace/feed/activity.rs b/crates/jacquard-api/src/social_pace/feed/activity.rs
index 1c2c8e59..667a9ef0 100644
--- a/crates/jacquard-api/src/social_pace/feed/activity.rs
+++ b/crates/jacquard-api/src/social_pace/feed/activity.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -180,8 +183,8 @@ pub mod activity_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Type;
         type StartedAt;
+        type Type;
         type EndedAt;
         type CreatedAt;
     }
@@ -189,26 +192,26 @@ pub mod activity_state {
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Type = Unset;
         type StartedAt = Unset;
+        type Type = Unset;
         type EndedAt = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `type` field to Set
-    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetType<S> {}
-    impl<S: State> State for SetType<S> {
-        type Type = Set<members::r#type>;
-        type StartedAt = S::StartedAt;
-        type EndedAt = S::EndedAt;
-        type CreatedAt = S::CreatedAt;
-    }
     ///State transition - sets the `started_at` field to Set
     pub struct SetStartedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStartedAt<S> {}
     impl<S: State> State for SetStartedAt<S> {
-        type Type = S::Type;
         type StartedAt = Set<members::started_at>;
+        type Type = S::Type;
+        type EndedAt = S::EndedAt;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `type` field to Set
+    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetType<S> {}
+    impl<S: State> State for SetType<S> {
+        type StartedAt = S::StartedAt;
+        type Type = Set<members::r#type>;
         type EndedAt = S::EndedAt;
         type CreatedAt = S::CreatedAt;
     }
@@ -216,8 +219,8 @@ pub mod activity_state {
     pub struct SetEndedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEndedAt<S> {}
     impl<S: State> State for SetEndedAt<S> {
-        type Type = S::Type;
         type StartedAt = S::StartedAt;
+        type Type = S::Type;
         type EndedAt = Set<members::ended_at>;
         type CreatedAt = S::CreatedAt;
     }
@@ -225,18 +228,18 @@ pub mod activity_state {
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Type = S::Type;
         type StartedAt = S::StartedAt;
+        type Type = S::Type;
         type EndedAt = S::EndedAt;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `type` field
-        pub struct r#type(());
         ///Marker type for the `started_at` field
         pub struct started_at(());
+        ///Marker type for the `type` field
+        pub struct r#type(());
         ///Marker type for the `ended_at` field
         pub struct ended_at(());
         ///Marker type for the `created_at` field
@@ -246,8 +249,8 @@ pub mod activity_state {
 
 /// Builder for constructing an instance of this type
 pub struct ActivityBuilder<'a, S: activity_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -259,7 +262,7 @@ pub struct ActivityBuilder<'a, S: activity_state::State> {
         Option<i64>,
         Option<ActivityType<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Activity<'a> {
@@ -273,20 +276,9 @@ impl<'a> ActivityBuilder<'a, activity_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -294,12 +286,12 @@ impl<'a> ActivityBuilder<'a, activity_state::Empty> {
 impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
     /// Set the `calories` field (optional)
     pub fn calories(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `calories` field to an Option value (optional)
     pub fn maybe_calories(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -314,11 +306,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ActivityBuilder<'a, activity_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -326,12 +318,12 @@ where
 impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
     /// Set the `distance` field (optional)
     pub fn distance(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `distance` field to an Option value (optional)
     pub fn maybe_distance(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -339,12 +331,12 @@ impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
 impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
     /// Set the `distanceUnits` field (optional)
     pub fn distance_units(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `distanceUnits` field to an Option value (optional)
     pub fn maybe_distance_units(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -359,11 +351,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ActivityBuilder<'a, activity_state::SetEndedAt<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -371,12 +363,12 @@ where
 impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
     /// Set the `route` field (optional)
     pub fn route(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `route` field to an Option value (optional)
     pub fn maybe_route(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -384,12 +376,12 @@ impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
 impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
     /// Set the `splits` field (optional)
     pub fn splits(mut self, value: impl Into<Option<Vec<Split<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `splits` field to an Option value (optional)
     pub fn maybe_splits(mut self, value: Option<Vec<Split<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -404,11 +396,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ActivityBuilder<'a, activity_state::SetStartedAt<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -416,12 +408,12 @@ where
 impl<'a, S: activity_state::State> ActivityBuilder<'a, S> {
     /// Set the `steps` field (optional)
     pub fn steps(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `steps` field to an Option value (optional)
     pub fn maybe_steps(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -436,11 +428,11 @@ where
         mut self,
         value: impl Into<ActivityType<'a>>,
     ) -> ActivityBuilder<'a, activity_state::SetType<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ActivityBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -448,24 +440,24 @@ where
 impl<'a, S> ActivityBuilder<'a, S>
 where
     S: activity_state::State,
-    S::Type: activity_state::IsSet,
     S::StartedAt: activity_state::IsSet,
+    S::Type: activity_state::IsSet,
     S::EndedAt: activity_state::IsSet,
     S::CreatedAt: activity_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Activity<'a> {
         Activity {
-            calories: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            distance: self.__unsafe_private_named.2,
-            distance_units: self.__unsafe_private_named.3,
-            ended_at: self.__unsafe_private_named.4.unwrap(),
-            route: self.__unsafe_private_named.5,
-            splits: self.__unsafe_private_named.6,
-            started_at: self.__unsafe_private_named.7.unwrap(),
-            steps: self.__unsafe_private_named.8,
-            r#type: self.__unsafe_private_named.9.unwrap(),
+            calories: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            distance: self._fields.2,
+            distance_units: self._fields.3,
+            ended_at: self._fields.4.unwrap(),
+            route: self._fields.5,
+            splits: self._fields.6,
+            started_at: self._fields.7.unwrap(),
+            steps: self._fields.8,
+            r#type: self._fields.9.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -478,16 +470,16 @@ where
         >,
     ) -> Activity<'a> {
         Activity {
-            calories: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            distance: self.__unsafe_private_named.2,
-            distance_units: self.__unsafe_private_named.3,
-            ended_at: self.__unsafe_private_named.4.unwrap(),
-            route: self.__unsafe_private_named.5,
-            splits: self.__unsafe_private_named.6,
-            started_at: self.__unsafe_private_named.7.unwrap(),
-            steps: self.__unsafe_private_named.8,
-            r#type: self.__unsafe_private_named.9.unwrap(),
+            calories: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            distance: self._fields.2,
+            distance_units: self._fields.3,
+            ended_at: self._fields.4.unwrap(),
+            route: self._fields.5,
+            splits: self._fields.6,
+            started_at: self._fields.7.unwrap(),
+            steps: self._fields.8,
+            r#type: self._fields.9.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_pace/goal/ring.rs b/crates/jacquard-api/src/social_pace/goal/ring.rs
index d856d6c9..4dc6540c 100644
--- a/crates/jacquard-api/src/social_pace/goal/ring.rs
+++ b/crates/jacquard-api/src/social_pace/goal/ring.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -118,11 +121,11 @@ pub mod ring_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type StandHours;
         type ExerciseGoal;
+        type Exercise;
         type Move;
         type MoveGoal;
-        type Exercise;
-        type StandHours;
         type StandGoal;
         type CreatedAt;
     }
@@ -130,23 +133,47 @@ pub mod ring_state {
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type StandHours = Unset;
         type ExerciseGoal = Unset;
+        type Exercise = Unset;
         type Move = Unset;
         type MoveGoal = Unset;
-        type Exercise = Unset;
-        type StandHours = Unset;
         type StandGoal = Unset;
         type CreatedAt = Unset;
     }
+    ///State transition - sets the `stand_hours` field to Set
+    pub struct SetStandHours<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStandHours<S> {}
+    impl<S: State> State for SetStandHours<S> {
+        type StandHours = Set<members::stand_hours>;
+        type ExerciseGoal = S::ExerciseGoal;
+        type Exercise = S::Exercise;
+        type Move = S::Move;
+        type MoveGoal = S::MoveGoal;
+        type StandGoal = S::StandGoal;
+        type CreatedAt = S::CreatedAt;
+    }
     ///State transition - sets the `exercise_goal` field to Set
     pub struct SetExerciseGoal<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetExerciseGoal<S> {}
     impl<S: State> State for SetExerciseGoal<S> {
+        type StandHours = S::StandHours;
         type ExerciseGoal = Set<members::exercise_goal>;
+        type Exercise = S::Exercise;
         type Move = S::Move;
         type MoveGoal = S::MoveGoal;
-        type Exercise = S::Exercise;
+        type StandGoal = S::StandGoal;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `exercise` field to Set
+    pub struct SetExercise<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetExercise<S> {}
+    impl<S: State> State for SetExercise<S> {
         type StandHours = S::StandHours;
+        type ExerciseGoal = S::ExerciseGoal;
+        type Exercise = Set<members::exercise>;
+        type Move = S::Move;
+        type MoveGoal = S::MoveGoal;
         type StandGoal = S::StandGoal;
         type CreatedAt = S::CreatedAt;
     }
@@ -154,11 +181,11 @@ pub mod ring_state {
     pub struct SetMove<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMove<S> {}
     impl<S: State> State for SetMove<S> {
+        type StandHours = S::StandHours;
         type ExerciseGoal = S::ExerciseGoal;
+        type Exercise = S::Exercise;
         type Move = Set<members::r#move>;
         type MoveGoal = S::MoveGoal;
-        type Exercise = S::Exercise;
-        type StandHours = S::StandHours;
         type StandGoal = S::StandGoal;
         type CreatedAt = S::CreatedAt;
     }
@@ -166,35 +193,11 @@ pub mod ring_state {
     pub struct SetMoveGoal<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMoveGoal<S> {}
     impl<S: State> State for SetMoveGoal<S> {
-        type ExerciseGoal = S::ExerciseGoal;
-        type Move = S::Move;
-        type MoveGoal = Set<members::move_goal>;
-        type Exercise = S::Exercise;
         type StandHours = S::StandHours;
-        type StandGoal = S::StandGoal;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `exercise` field to Set
-    pub struct SetExercise<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetExercise<S> {}
-    impl<S: State> State for SetExercise<S> {
-        type ExerciseGoal = S::ExerciseGoal;
-        type Move = S::Move;
-        type MoveGoal = S::MoveGoal;
-        type Exercise = Set<members::exercise>;
-        type StandHours = S::StandHours;
-        type StandGoal = S::StandGoal;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `stand_hours` field to Set
-    pub struct SetStandHours<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStandHours<S> {}
-    impl<S: State> State for SetStandHours<S> {
         type ExerciseGoal = S::ExerciseGoal;
-        type Move = S::Move;
-        type MoveGoal = S::MoveGoal;
         type Exercise = S::Exercise;
-        type StandHours = Set<members::stand_hours>;
+        type Move = S::Move;
+        type MoveGoal = Set<members::move_goal>;
         type StandGoal = S::StandGoal;
         type CreatedAt = S::CreatedAt;
     }
@@ -202,11 +205,11 @@ pub mod ring_state {
     pub struct SetStandGoal<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStandGoal<S> {}
     impl<S: State> State for SetStandGoal<S> {
+        type StandHours = S::StandHours;
         type ExerciseGoal = S::ExerciseGoal;
+        type Exercise = S::Exercise;
         type Move = S::Move;
         type MoveGoal = S::MoveGoal;
-        type Exercise = S::Exercise;
-        type StandHours = S::StandHours;
         type StandGoal = Set<members::stand_goal>;
         type CreatedAt = S::CreatedAt;
     }
@@ -214,27 +217,27 @@ pub mod ring_state {
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type StandHours = S::StandHours;
         type ExerciseGoal = S::ExerciseGoal;
+        type Exercise = S::Exercise;
         type Move = S::Move;
         type MoveGoal = S::MoveGoal;
-        type Exercise = S::Exercise;
-        type StandHours = S::StandHours;
         type StandGoal = S::StandGoal;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `stand_hours` field
+        pub struct stand_hours(());
         ///Marker type for the `exercise_goal` field
         pub struct exercise_goal(());
+        ///Marker type for the `exercise` field
+        pub struct exercise(());
         ///Marker type for the `move` field
         pub struct r#move(());
         ///Marker type for the `move_goal` field
         pub struct move_goal(());
-        ///Marker type for the `exercise` field
-        pub struct exercise(());
-        ///Marker type for the `stand_hours` field
-        pub struct stand_hours(());
         ///Marker type for the `stand_goal` field
         pub struct stand_goal(());
         ///Marker type for the `created_at` field
@@ -244,8 +247,8 @@ pub mod ring_state {
 
 /// Builder for constructing an instance of this type
 pub struct RingBuilder<'a, S: ring_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<i64>,
         Option<i64>,
@@ -254,7 +257,7 @@ pub struct RingBuilder<'a, S: ring_state::State> {
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Ring<'a> {
@@ -268,9 +271,9 @@ impl<'a> RingBuilder<'a, ring_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -285,11 +288,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RingBuilder<'a, ring_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -304,11 +307,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingBuilder<'a, ring_state::SetExercise<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -323,11 +326,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingBuilder<'a, ring_state::SetExerciseGoal<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -342,11 +345,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingBuilder<'a, ring_state::SetMove<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -361,11 +364,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingBuilder<'a, ring_state::SetMoveGoal<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -380,11 +383,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingBuilder<'a, ring_state::SetStandGoal<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -399,11 +402,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> RingBuilder<'a, ring_state::SetStandHours<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         RingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -411,24 +414,24 @@ where
 impl<'a, S> RingBuilder<'a, S>
 where
     S: ring_state::State,
+    S::StandHours: ring_state::IsSet,
     S::ExerciseGoal: ring_state::IsSet,
+    S::Exercise: ring_state::IsSet,
     S::Move: ring_state::IsSet,
     S::MoveGoal: ring_state::IsSet,
-    S::Exercise: ring_state::IsSet,
-    S::StandHours: ring_state::IsSet,
     S::StandGoal: ring_state::IsSet,
     S::CreatedAt: ring_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Ring<'a> {
         Ring {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            exercise: self.__unsafe_private_named.1.unwrap(),
-            exercise_goal: self.__unsafe_private_named.2.unwrap(),
-            r#move: self.__unsafe_private_named.3.unwrap(),
-            move_goal: self.__unsafe_private_named.4.unwrap(),
-            stand_goal: self.__unsafe_private_named.5.unwrap(),
-            stand_hours: self.__unsafe_private_named.6.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            exercise: self._fields.1.unwrap(),
+            exercise_goal: self._fields.2.unwrap(),
+            r#move: self._fields.3.unwrap(),
+            move_goal: self._fields.4.unwrap(),
+            stand_goal: self._fields.5.unwrap(),
+            stand_hours: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -441,13 +444,13 @@ where
         >,
     ) -> Ring<'a> {
         Ring {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            exercise: self.__unsafe_private_named.1.unwrap(),
-            exercise_goal: self.__unsafe_private_named.2.unwrap(),
-            r#move: self.__unsafe_private_named.3.unwrap(),
-            move_goal: self.__unsafe_private_named.4.unwrap(),
-            stand_goal: self.__unsafe_private_named.5.unwrap(),
-            stand_hours: self.__unsafe_private_named.6.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            exercise: self._fields.1.unwrap(),
+            exercise_goal: self._fields.2.unwrap(),
+            r#move: self._fields.3.unwrap(),
+            move_goal: self._fields.4.unwrap(),
+            stand_goal: self._fields.5.unwrap(),
+            stand_hours: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_pace/goal/step.rs b/crates/jacquard-api/src/social_pace/goal/step.rs
index ae96fce1..885f69f0 100644
--- a/crates/jacquard-api/src/social_pace/goal/step.rs
+++ b/crates/jacquard-api/src/social_pace/goal/step.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -161,9 +164,9 @@ pub mod step_state {
 
 /// Builder for constructing an instance of this type
 pub struct StepBuilder<'a, S: step_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<i64>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<i64>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Step<'a> {
@@ -177,9 +180,9 @@ impl<'a> StepBuilder<'a, step_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StepBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -194,11 +197,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StepBuilder<'a, step_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StepBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,11 +216,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> StepBuilder<'a, step_state::SetSteps<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StepBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,11 +235,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> StepBuilder<'a, step_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         StepBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -251,9 +254,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Step<'a> {
         Step {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            steps: self.__unsafe_private_named.1.unwrap(),
-            updated_at: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            steps: self._fields.1.unwrap(),
+            updated_at: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -266,9 +269,9 @@ where
         >,
     ) -> Step<'a> {
         Step {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            steps: self.__unsafe_private_named.1.unwrap(),
-            updated_at: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            steps: self._fields.1.unwrap(),
+            updated_at: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_pmsky/proposal.rs b/crates/jacquard-api/src/social_pmsky/proposal.rs
index 790da962..5774ac9b 100644
--- a/crates/jacquard-api/src/social_pmsky/proposal.rs
+++ b/crates/jacquard-api/src/social_pmsky/proposal.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -154,91 +157,91 @@ pub mod proposal_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Uri;
+        type Val;
         type Typ;
-        type Cts;
         type Src;
-        type Val;
+        type Cts;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Uri = Unset;
+        type Val = Unset;
         type Typ = Unset;
-        type Cts = Unset;
         type Src = Unset;
-        type Val = Unset;
+        type Cts = Unset;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
         type Uri = Set<members::uri>;
+        type Val = S::Val;
         type Typ = S::Typ;
+        type Src = S::Src;
         type Cts = S::Cts;
+    }
+    ///State transition - sets the `val` field to Set
+    pub struct SetVal<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetVal<S> {}
+    impl<S: State> State for SetVal<S> {
+        type Uri = S::Uri;
+        type Val = Set<members::val>;
+        type Typ = S::Typ;
         type Src = S::Src;
-        type Val = S::Val;
+        type Cts = S::Cts;
     }
     ///State transition - sets the `typ` field to Set
     pub struct SetTyp<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTyp<S> {}
     impl<S: State> State for SetTyp<S> {
         type Uri = S::Uri;
-        type Typ = Set<members::typ>;
-        type Cts = S::Cts;
-        type Src = S::Src;
         type Val = S::Val;
-    }
-    ///State transition - sets the `cts` field to Set
-    pub struct SetCts<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCts<S> {}
-    impl<S: State> State for SetCts<S> {
-        type Uri = S::Uri;
-        type Typ = S::Typ;
-        type Cts = Set<members::cts>;
+        type Typ = Set<members::typ>;
         type Src = S::Src;
-        type Val = S::Val;
+        type Cts = S::Cts;
     }
     ///State transition - sets the `src` field to Set
     pub struct SetSrc<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSrc<S> {}
     impl<S: State> State for SetSrc<S> {
         type Uri = S::Uri;
+        type Val = S::Val;
         type Typ = S::Typ;
-        type Cts = S::Cts;
         type Src = Set<members::src>;
-        type Val = S::Val;
+        type Cts = S::Cts;
     }
-    ///State transition - sets the `val` field to Set
-    pub struct SetVal<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetVal<S> {}
-    impl<S: State> State for SetVal<S> {
+    ///State transition - sets the `cts` field to Set
+    pub struct SetCts<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCts<S> {}
+    impl<S: State> State for SetCts<S> {
         type Uri = S::Uri;
+        type Val = S::Val;
         type Typ = S::Typ;
-        type Cts = S::Cts;
         type Src = S::Src;
-        type Val = Set<members::val>;
+        type Cts = Set<members::cts>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `val` field
+        pub struct val(());
         ///Marker type for the `typ` field
         pub struct typ(());
-        ///Marker type for the `cts` field
-        pub struct cts(());
         ///Marker type for the `src` field
         pub struct src(());
-        ///Marker type for the `val` field
-        pub struct val(());
+        ///Marker type for the `cts` field
+        pub struct cts(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ProposalBuilder<'a, S: proposal_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Cid<'a>>,
         Option<Datetime>,
@@ -251,7 +254,7 @@ pub struct ProposalBuilder<'a, S: proposal_state::State> {
         Option<CowStr<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Proposal<'a> {
@@ -265,21 +268,9 @@ impl<'a> ProposalBuilder<'a, proposal_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProposalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -287,12 +278,12 @@ impl<'a> ProposalBuilder<'a, proposal_state::Empty> {
 impl<'a, S: proposal_state::State> ProposalBuilder<'a, S> {
     /// Set the `aid` field (optional)
     pub fn aid(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `aid` field to an Option value (optional)
     pub fn maybe_aid(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -300,12 +291,12 @@ impl<'a, S: proposal_state::State> ProposalBuilder<'a, S> {
 impl<'a, S: proposal_state::State> ProposalBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -320,11 +311,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ProposalBuilder<'a, proposal_state::SetCts<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ProposalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -332,12 +323,12 @@ where
 impl<'a, S: proposal_state::State> ProposalBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -345,12 +336,12 @@ impl<'a, S: proposal_state::State> ProposalBuilder<'a, S> {
 impl<'a, S: proposal_state::State> ProposalBuilder<'a, S> {
     /// Set the `reasons` field (optional)
     pub fn reasons(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `reasons` field to an Option value (optional)
     pub fn maybe_reasons(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -358,12 +349,12 @@ impl<'a, S: proposal_state::State> ProposalBuilder<'a, S> {
 impl<'a, S: proposal_state::State> ProposalBuilder<'a, S> {
     /// Set the `sig` field (optional)
     pub fn sig(mut self, value: impl Into<Option<Bytes>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `sig` field to an Option value (optional)
     pub fn maybe_sig(mut self, value: Option<Bytes>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -378,11 +369,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ProposalBuilder<'a, proposal_state::SetSrc<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ProposalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -397,11 +388,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProposalBuilder<'a, proposal_state::SetTyp<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ProposalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -416,11 +407,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> ProposalBuilder<'a, proposal_state::SetUri<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         ProposalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -435,11 +426,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProposalBuilder<'a, proposal_state::SetVal<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ProposalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -447,12 +438,12 @@ where
 impl<'a, S: proposal_state::State> ProposalBuilder<'a, S> {
     /// Set the `ver` field (optional)
     pub fn ver(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `ver` field to an Option value (optional)
     pub fn maybe_ver(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -461,25 +452,25 @@ impl<'a, S> ProposalBuilder<'a, S>
 where
     S: proposal_state::State,
     S::Uri: proposal_state::IsSet,
+    S::Val: proposal_state::IsSet,
     S::Typ: proposal_state::IsSet,
-    S::Cts: proposal_state::IsSet,
     S::Src: proposal_state::IsSet,
-    S::Val: proposal_state::IsSet,
+    S::Cts: proposal_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Proposal<'a> {
         Proposal {
-            aid: self.__unsafe_private_named.0,
-            cid: self.__unsafe_private_named.1,
-            cts: self.__unsafe_private_named.2.unwrap(),
-            note: self.__unsafe_private_named.3,
-            reasons: self.__unsafe_private_named.4,
-            sig: self.__unsafe_private_named.5,
-            src: self.__unsafe_private_named.6.unwrap(),
-            typ: self.__unsafe_private_named.7.unwrap(),
-            uri: self.__unsafe_private_named.8.unwrap(),
-            val: self.__unsafe_private_named.9.unwrap(),
-            ver: self.__unsafe_private_named.10,
+            aid: self._fields.0,
+            cid: self._fields.1,
+            cts: self._fields.2.unwrap(),
+            note: self._fields.3,
+            reasons: self._fields.4,
+            sig: self._fields.5,
+            src: self._fields.6.unwrap(),
+            typ: self._fields.7.unwrap(),
+            uri: self._fields.8.unwrap(),
+            val: self._fields.9.unwrap(),
+            ver: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -492,17 +483,17 @@ where
         >,
     ) -> Proposal<'a> {
         Proposal {
-            aid: self.__unsafe_private_named.0,
-            cid: self.__unsafe_private_named.1,
-            cts: self.__unsafe_private_named.2.unwrap(),
-            note: self.__unsafe_private_named.3,
-            reasons: self.__unsafe_private_named.4,
-            sig: self.__unsafe_private_named.5,
-            src: self.__unsafe_private_named.6.unwrap(),
-            typ: self.__unsafe_private_named.7.unwrap(),
-            uri: self.__unsafe_private_named.8.unwrap(),
-            val: self.__unsafe_private_named.9.unwrap(),
-            ver: self.__unsafe_private_named.10,
+            aid: self._fields.0,
+            cid: self._fields.1,
+            cts: self._fields.2.unwrap(),
+            note: self._fields.3,
+            reasons: self._fields.4,
+            sig: self._fields.5,
+            src: self._fields.6.unwrap(),
+            typ: self._fields.7.unwrap(),
+            uri: self._fields.8.unwrap(),
+            val: self._fields.9.unwrap(),
+            ver: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_pmsky/vote.rs b/crates/jacquard-api/src/social_pmsky/vote.rs
index d9e2f11d..e33f2bde 100644
--- a/crates/jacquard-api/src/social_pmsky/vote.rs
+++ b/crates/jacquard-api/src/social_pmsky/vote.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -131,8 +134,8 @@ pub mod vote_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Src;
         type Uri;
+        type Src;
         type Cts;
         type Val;
     }
@@ -140,26 +143,26 @@ pub mod vote_state {
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Src = Unset;
         type Uri = Unset;
+        type Src = Unset;
         type Cts = Unset;
         type Val = Unset;
     }
-    ///State transition - sets the `src` field to Set
-    pub struct SetSrc<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSrc<S> {}
-    impl<S: State> State for SetSrc<S> {
-        type Src = Set<members::src>;
-        type Uri = S::Uri;
-        type Cts = S::Cts;
-        type Val = S::Val;
-    }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Src = S::Src;
         type Uri = Set<members::uri>;
+        type Src = S::Src;
+        type Cts = S::Cts;
+        type Val = S::Val;
+    }
+    ///State transition - sets the `src` field to Set
+    pub struct SetSrc<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSrc<S> {}
+    impl<S: State> State for SetSrc<S> {
+        type Uri = S::Uri;
+        type Src = Set<members::src>;
         type Cts = S::Cts;
         type Val = S::Val;
     }
@@ -167,8 +170,8 @@ pub mod vote_state {
     pub struct SetCts<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCts<S> {}
     impl<S: State> State for SetCts<S> {
-        type Src = S::Src;
         type Uri = S::Uri;
+        type Src = S::Src;
         type Cts = Set<members::cts>;
         type Val = S::Val;
     }
@@ -176,18 +179,18 @@ pub mod vote_state {
     pub struct SetVal<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetVal<S> {}
     impl<S: State> State for SetVal<S> {
-        type Src = S::Src;
         type Uri = S::Uri;
+        type Src = S::Src;
         type Cts = S::Cts;
         type Val = Set<members::val>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `src` field
-        pub struct src(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `src` field
+        pub struct src(());
         ///Marker type for the `cts` field
         pub struct cts(());
         ///Marker type for the `val` field
@@ -197,8 +200,8 @@ pub mod vote_state {
 
 /// Builder for constructing an instance of this type
 pub struct VoteBuilder<'a, S: vote_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Cid<'a>>,
         Option<Datetime>,
@@ -208,7 +211,7 @@ pub struct VoteBuilder<'a, S: vote_state::State> {
         Option<UriValue<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Vote<'a> {
@@ -222,9 +225,9 @@ impl<'a> VoteBuilder<'a, vote_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,12 +235,12 @@ impl<'a> VoteBuilder<'a, vote_state::Empty> {
 impl<'a, S: vote_state::State> VoteBuilder<'a, S> {
     /// Set the `aid` field (optional)
     pub fn aid(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `aid` field to an Option value (optional)
     pub fn maybe_aid(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -245,12 +248,12 @@ impl<'a, S: vote_state::State> VoteBuilder<'a, S> {
 impl<'a, S: vote_state::State> VoteBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -265,11 +268,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> VoteBuilder<'a, vote_state::SetCts<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -277,12 +280,12 @@ where
 impl<'a, S: vote_state::State> VoteBuilder<'a, S> {
     /// Set the `reasons` field (optional)
     pub fn reasons(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `reasons` field to an Option value (optional)
     pub fn maybe_reasons(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -290,12 +293,12 @@ impl<'a, S: vote_state::State> VoteBuilder<'a, S> {
 impl<'a, S: vote_state::State> VoteBuilder<'a, S> {
     /// Set the `sig` field (optional)
     pub fn sig(mut self, value: impl Into<Option<Bytes>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `sig` field to an Option value (optional)
     pub fn maybe_sig(mut self, value: Option<Bytes>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -310,11 +313,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> VoteBuilder<'a, vote_state::SetSrc<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -329,11 +332,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> VoteBuilder<'a, vote_state::SetUri<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -348,11 +351,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> VoteBuilder<'a, vote_state::SetVal<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -360,22 +363,22 @@ where
 impl<'a, S> VoteBuilder<'a, S>
 where
     S: vote_state::State,
-    S::Src: vote_state::IsSet,
     S::Uri: vote_state::IsSet,
+    S::Src: vote_state::IsSet,
     S::Cts: vote_state::IsSet,
     S::Val: vote_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Vote<'a> {
         Vote {
-            aid: self.__unsafe_private_named.0,
-            cid: self.__unsafe_private_named.1,
-            cts: self.__unsafe_private_named.2.unwrap(),
-            reasons: self.__unsafe_private_named.3,
-            sig: self.__unsafe_private_named.4,
-            src: self.__unsafe_private_named.5.unwrap(),
-            uri: self.__unsafe_private_named.6.unwrap(),
-            val: self.__unsafe_private_named.7.unwrap(),
+            aid: self._fields.0,
+            cid: self._fields.1,
+            cts: self._fields.2.unwrap(),
+            reasons: self._fields.3,
+            sig: self._fields.4,
+            src: self._fields.5.unwrap(),
+            uri: self._fields.6.unwrap(),
+            val: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -388,14 +391,14 @@ where
         >,
     ) -> Vote<'a> {
         Vote {
-            aid: self.__unsafe_private_named.0,
-            cid: self.__unsafe_private_named.1,
-            cts: self.__unsafe_private_named.2.unwrap(),
-            reasons: self.__unsafe_private_named.3,
-            sig: self.__unsafe_private_named.4,
-            src: self.__unsafe_private_named.5.unwrap(),
-            uri: self.__unsafe_private_named.6.unwrap(),
-            val: self.__unsafe_private_named.7.unwrap(),
+            aid: self._fields.0,
+            cid: self._fields.1,
+            cts: self._fields.2.unwrap(),
+            reasons: self._fields.3,
+            sig: self._fields.4,
+            src: self._fields.5.unwrap(),
+            uri: self._fields.6.unwrap(),
+            val: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_psky/actor/profile.rs b/crates/jacquard-api/src/social_psky/actor/profile.rs
index bba79915..981c747d 100644
--- a/crates/jacquard-api/src/social_psky/actor/profile.rs
+++ b/crates/jacquard-api/src/social_psky/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -141,9 +144,9 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -157,9 +160,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -167,12 +170,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `nickname` field (optional)
     pub fn nickname(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `nickname` field to an Option value (optional)
     pub fn maybe_nickname(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -184,7 +187,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            nickname: self.__unsafe_private_named.0,
+            nickname: self._fields.0,
             extra_data: Default::default(),
         }
     }
@@ -197,7 +200,7 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            nickname: self.__unsafe_private_named.0,
+            nickname: self._fields.0,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_psky/chat/message.rs b/crates/jacquard-api/src/social_psky/chat/message.rs
index 20a8c933..67da4d9b 100644
--- a/crates/jacquard-api/src/social_psky/chat/message.rs
+++ b/crates/jacquard-api/src/social_psky/chat/message.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -179,14 +182,14 @@ pub mod message_state {
 
 /// Builder for constructing an instance of this type
 pub struct MessageBuilder<'a, S: message_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Vec<Facet<'a>>>,
         Option<StrongRef<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Message<'a> {
@@ -200,9 +203,9 @@ impl<'a> MessageBuilder<'a, message_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -217,11 +220,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MessageBuilder<'a, message_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -229,12 +232,12 @@ where
 impl<'a, S: message_state::State> MessageBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -242,12 +245,12 @@ impl<'a, S: message_state::State> MessageBuilder<'a, S> {
 impl<'a, S: message_state::State> MessageBuilder<'a, S> {
     /// Set the `reply` field (optional)
     pub fn reply(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `reply` field to an Option value (optional)
     pub fn maybe_reply(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -262,11 +265,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> MessageBuilder<'a, message_state::SetRoom<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         MessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -280,10 +283,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Message<'a> {
         Message {
-            content: self.__unsafe_private_named.0.unwrap(),
-            facets: self.__unsafe_private_named.1,
-            reply: self.__unsafe_private_named.2,
-            room: self.__unsafe_private_named.3.unwrap(),
+            content: self._fields.0.unwrap(),
+            facets: self._fields.1,
+            reply: self._fields.2,
+            room: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -296,10 +299,10 @@ where
         >,
     ) -> Message<'a> {
         Message {
-            content: self.__unsafe_private_named.0.unwrap(),
-            facets: self.__unsafe_private_named.1,
-            reply: self.__unsafe_private_named.2,
-            room: self.__unsafe_private_named.3.unwrap(),
+            content: self._fields.0.unwrap(),
+            facets: self._fields.1,
+            reply: self._fields.2,
+            room: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_psky/chat/room.rs b/crates/jacquard-api/src/social_psky/chat/room.rs
index f7c4db2f..ec3ccadd 100644
--- a/crates/jacquard-api/src/social_psky/chat/room.rs
+++ b/crates/jacquard-api/src/social_psky/chat/room.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -242,8 +245,8 @@ pub mod room_state {
 
 /// Builder for constructing an instance of this type
 pub struct RoomBuilder<'a, S: room_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<room::ModlistRef<'a>>,
         Option<room::ModlistRef<'a>>,
         Option<Vec<Language>>,
@@ -251,7 +254,7 @@ pub struct RoomBuilder<'a, S: room_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Room<'a> {
@@ -265,9 +268,9 @@ impl<'a> RoomBuilder<'a, room_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RoomBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -275,12 +278,12 @@ impl<'a> RoomBuilder<'a, room_state::Empty> {
 impl<'a, S: room_state::State> RoomBuilder<'a, S> {
     /// Set the `allowlist` field (optional)
     pub fn allowlist(mut self, value: impl Into<Option<room::ModlistRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `allowlist` field to an Option value (optional)
     pub fn maybe_allowlist(mut self, value: Option<room::ModlistRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -288,12 +291,12 @@ impl<'a, S: room_state::State> RoomBuilder<'a, S> {
 impl<'a, S: room_state::State> RoomBuilder<'a, S> {
     /// Set the `denylist` field (optional)
     pub fn denylist(mut self, value: impl Into<Option<room::ModlistRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `denylist` field to an Option value (optional)
     pub fn maybe_denylist(mut self, value: Option<room::ModlistRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -301,12 +304,12 @@ impl<'a, S: room_state::State> RoomBuilder<'a, S> {
 impl<'a, S: room_state::State> RoomBuilder<'a, S> {
     /// Set the `languages` field (optional)
     pub fn languages(mut self, value: impl Into<Option<Vec<Language>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `languages` field to an Option value (optional)
     pub fn maybe_languages(mut self, value: Option<Vec<Language>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -321,11 +324,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RoomBuilder<'a, room_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RoomBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -333,12 +336,12 @@ where
 impl<'a, S: room_state::State> RoomBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -346,12 +349,12 @@ impl<'a, S: room_state::State> RoomBuilder<'a, S> {
 impl<'a, S: room_state::State> RoomBuilder<'a, S> {
     /// Set the `topic` field (optional)
     pub fn topic(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `topic` field to an Option value (optional)
     pub fn maybe_topic(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -364,12 +367,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Room<'a> {
         Room {
-            allowlist: self.__unsafe_private_named.0,
-            denylist: self.__unsafe_private_named.1,
-            languages: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            tags: self.__unsafe_private_named.4,
-            topic: self.__unsafe_private_named.5,
+            allowlist: self._fields.0,
+            denylist: self._fields.1,
+            languages: self._fields.2,
+            name: self._fields.3.unwrap(),
+            tags: self._fields.4,
+            topic: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -382,12 +385,12 @@ where
         >,
     ) -> Room<'a> {
         Room {
-            allowlist: self.__unsafe_private_named.0,
-            denylist: self.__unsafe_private_named.1,
-            languages: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3.unwrap(),
-            tags: self.__unsafe_private_named.4,
-            topic: self.__unsafe_private_named.5,
+            allowlist: self._fields.0,
+            denylist: self._fields.1,
+            languages: self._fields.2,
+            name: self._fields.3.unwrap(),
+            tags: self._fields.4,
+            topic: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
@@ -562,9 +565,9 @@ pub mod modlist_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct ModlistRefBuilder<'a, S: modlist_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<Vec<Did<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<Vec<Did<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ModlistRef<'a> {
@@ -578,9 +581,9 @@ impl<'a> ModlistRefBuilder<'a, modlist_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ModlistRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -595,11 +598,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ModlistRefBuilder<'a, modlist_ref_state::SetActive<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ModlistRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -614,11 +617,11 @@ where
         mut self,
         value: impl Into<Vec<Did<'a>>>,
     ) -> ModlistRefBuilder<'a, modlist_ref_state::SetUsers<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ModlistRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -632,8 +635,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ModlistRef<'a> {
         ModlistRef {
-            active: self.__unsafe_private_named.0.unwrap(),
-            users: self.__unsafe_private_named.1.unwrap(),
+            active: self._fields.0.unwrap(),
+            users: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -646,8 +649,8 @@ where
         >,
     ) -> ModlistRef<'a> {
         ModlistRef {
-            active: self.__unsafe_private_named.0.unwrap(),
-            users: self.__unsafe_private_named.1.unwrap(),
+            active: self._fields.0.unwrap(),
+            users: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_psky/richtext/facet.rs b/crates/jacquard-api/src/social_psky/richtext/facet.rs
index 84b672e3..beb9fd72 100644
--- a/crates/jacquard-api/src/social_psky/richtext/facet.rs
+++ b/crates/jacquard-api/src/social_psky/richtext/facet.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -215,45 +218,45 @@ pub mod byte_slice_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ByteEnd;
         type ByteStart;
+        type ByteEnd;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ByteEnd = Unset;
         type ByteStart = Unset;
-    }
-    ///State transition - sets the `byte_end` field to Set
-    pub struct SetByteEnd<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetByteEnd<S> {}
-    impl<S: State> State for SetByteEnd<S> {
-        type ByteEnd = Set<members::byte_end>;
-        type ByteStart = S::ByteStart;
+        type ByteEnd = Unset;
     }
     ///State transition - sets the `byte_start` field to Set
     pub struct SetByteStart<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetByteStart<S> {}
     impl<S: State> State for SetByteStart<S> {
-        type ByteEnd = S::ByteEnd;
         type ByteStart = Set<members::byte_start>;
+        type ByteEnd = S::ByteEnd;
+    }
+    ///State transition - sets the `byte_end` field to Set
+    pub struct SetByteEnd<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetByteEnd<S> {}
+    impl<S: State> State for SetByteEnd<S> {
+        type ByteStart = S::ByteStart;
+        type ByteEnd = Set<members::byte_end>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `byte_end` field
-        pub struct byte_end(());
         ///Marker type for the `byte_start` field
         pub struct byte_start(());
+        ///Marker type for the `byte_end` field
+        pub struct byte_end(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ByteSliceBuilder<'a, S: byte_slice_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ByteSlice<'a> {
@@ -267,9 +270,9 @@ impl<'a> ByteSliceBuilder<'a, byte_slice_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -284,11 +287,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteEnd<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -303,11 +306,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ByteSliceBuilder<'a, byte_slice_state::SetByteStart<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ByteSliceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -315,14 +318,14 @@ where
 impl<'a, S> ByteSliceBuilder<'a, S>
 where
     S: byte_slice_state::State,
-    S::ByteEnd: byte_slice_state::IsSet,
     S::ByteStart: byte_slice_state::IsSet,
+    S::ByteEnd: byte_slice_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -335,8 +338,8 @@ where
         >,
     ) -> ByteSlice<'a> {
         ByteSlice {
-            byte_end: self.__unsafe_private_named.0.unwrap(),
-            byte_start: self.__unsafe_private_named.1.unwrap(),
+            byte_end: self._fields.0.unwrap(),
+            byte_start: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -542,9 +545,9 @@ pub mod link_state {
 
 /// Builder for constructing an instance of this type
 pub struct LinkBuilder<'a, S: link_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<UriValue<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<UriValue<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Link<'a> {
@@ -558,9 +561,9 @@ impl<'a> LinkBuilder<'a, link_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -575,11 +578,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> LinkBuilder<'a, link_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LinkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -592,7 +595,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Link<'a> {
         Link {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -605,7 +608,7 @@ where
         >,
     ) -> Link<'a> {
         Link {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -657,12 +660,9 @@ pub mod facet_state {
 
 /// Builder for constructing an instance of this type
 pub struct FacetBuilder<'a, S: facet_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<FacetFeaturesItem<'a>>>,
-        Option<facet::ByteSlice<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<FacetFeaturesItem<'a>>>, Option<facet::ByteSlice<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Facet<'a> {
@@ -676,9 +676,9 @@ impl<'a> FacetBuilder<'a, facet_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -693,11 +693,11 @@ where
         mut self,
         value: impl Into<Vec<FacetFeaturesItem<'a>>>,
     ) -> FacetBuilder<'a, facet_state::SetFeatures<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -712,11 +712,11 @@ where
         mut self,
         value: impl Into<facet::ByteSlice<'a>>,
     ) -> FacetBuilder<'a, facet_state::SetIndex<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FacetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -730,8 +730,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -744,8 +744,8 @@ where
         >,
     ) -> Facet<'a> {
         Facet {
-            features: self.__unsafe_private_named.0.unwrap(),
-            index: self.__unsafe_private_named.1.unwrap(),
+            features: self._fields.0.unwrap(),
+            index: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -785,9 +785,9 @@ pub mod mention_state {
 
 /// Builder for constructing an instance of this type
 pub struct MentionBuilder<'a, S: mention_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Mention<'a> {
@@ -801,9 +801,9 @@ impl<'a> MentionBuilder<'a, mention_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -818,11 +818,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MentionBuilder<'a, mention_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MentionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -835,7 +835,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Mention<'a> {
         Mention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -848,7 +848,7 @@ where
         >,
     ) -> Mention<'a> {
         Mention {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_showcase.rs b/crates/jacquard-api/src/social_showcase.rs
index e3f90f4f..8c534675 100644
--- a/crates/jacquard-api/src/social_showcase.rs
+++ b/crates/jacquard-api/src/social_showcase.rs
@@ -11,7 +11,11 @@ pub mod graph;
 pub mod library;
 pub mod profile;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -1377,63 +1381,59 @@ pub mod activity_settings_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ShareActivity;
         type RetentionDays;
         type ShareNewItems;
+        type ShareActivity;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ShareActivity = Unset;
         type RetentionDays = Unset;
         type ShareNewItems = Unset;
-    }
-    ///State transition - sets the `share_activity` field to Set
-    pub struct SetShareActivity<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetShareActivity<S> {}
-    impl<S: State> State for SetShareActivity<S> {
-        type ShareActivity = Set<members::share_activity>;
-        type RetentionDays = S::RetentionDays;
-        type ShareNewItems = S::ShareNewItems;
+        type ShareActivity = Unset;
     }
     ///State transition - sets the `retention_days` field to Set
     pub struct SetRetentionDays<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRetentionDays<S> {}
     impl<S: State> State for SetRetentionDays<S> {
-        type ShareActivity = S::ShareActivity;
         type RetentionDays = Set<members::retention_days>;
         type ShareNewItems = S::ShareNewItems;
+        type ShareActivity = S::ShareActivity;
     }
     ///State transition - sets the `share_new_items` field to Set
     pub struct SetShareNewItems<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetShareNewItems<S> {}
     impl<S: State> State for SetShareNewItems<S> {
-        type ShareActivity = S::ShareActivity;
         type RetentionDays = S::RetentionDays;
         type ShareNewItems = Set<members::share_new_items>;
+        type ShareActivity = S::ShareActivity;
+    }
+    ///State transition - sets the `share_activity` field to Set
+    pub struct SetShareActivity<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetShareActivity<S> {}
+    impl<S: State> State for SetShareActivity<S> {
+        type RetentionDays = S::RetentionDays;
+        type ShareNewItems = S::ShareNewItems;
+        type ShareActivity = Set<members::share_activity>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `share_activity` field
-        pub struct share_activity(());
         ///Marker type for the `retention_days` field
         pub struct retention_days(());
         ///Marker type for the `share_new_items` field
         pub struct share_new_items(());
+        ///Marker type for the `share_activity` field
+        pub struct share_activity(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ActivitySettingsBuilder<'a, S: activity_settings_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<i64>,
-        Option<ActivitySettingsShareActivity<'a>>,
-        Option<bool>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<ActivitySettingsShareActivity<'a>>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ActivitySettings<'a> {
@@ -1447,9 +1447,9 @@ impl<'a> ActivitySettingsBuilder<'a, activity_settings_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ActivitySettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1464,11 +1464,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ActivitySettingsBuilder<'a, activity_settings_state::SetRetentionDays<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ActivitySettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1483,11 +1483,11 @@ where
         mut self,
         value: impl Into<ActivitySettingsShareActivity<'a>>,
     ) -> ActivitySettingsBuilder<'a, activity_settings_state::SetShareActivity<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ActivitySettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1502,11 +1502,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> ActivitySettingsBuilder<'a, activity_settings_state::SetShareNewItems<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ActivitySettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1514,16 +1514,16 @@ where
 impl<'a, S> ActivitySettingsBuilder<'a, S>
 where
     S: activity_settings_state::State,
-    S::ShareActivity: activity_settings_state::IsSet,
     S::RetentionDays: activity_settings_state::IsSet,
     S::ShareNewItems: activity_settings_state::IsSet,
+    S::ShareActivity: activity_settings_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ActivitySettings<'a> {
         ActivitySettings {
-            retention_days: self.__unsafe_private_named.0.unwrap(),
-            share_activity: self.__unsafe_private_named.1.unwrap(),
-            share_new_items: self.__unsafe_private_named.2.unwrap(),
+            retention_days: self._fields.0.unwrap(),
+            share_activity: self._fields.1.unwrap(),
+            share_new_items: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1533,9 +1533,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ActivitySettings<'a> {
         ActivitySettings {
-            retention_days: self.__unsafe_private_named.0.unwrap(),
-            share_activity: self.__unsafe_private_named.1.unwrap(),
-            share_new_items: self.__unsafe_private_named.2.unwrap(),
+            retention_days: self._fields.0.unwrap(),
+            share_activity: self._fields.1.unwrap(),
+            share_new_items: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2287,58 +2287,58 @@ pub mod collection_item_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Order;
-        type Uri;
         type AddedAt;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Order = Unset;
-        type Uri = Unset;
         type AddedAt = Unset;
+        type Uri = Unset;
     }
     ///State transition - sets the `order` field to Set
     pub struct SetOrder<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetOrder<S> {}
     impl<S: State> State for SetOrder<S> {
         type Order = Set<members::order>;
-        type Uri = S::Uri;
-        type AddedAt = S::AddedAt;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Order = S::Order;
-        type Uri = Set<members::uri>;
         type AddedAt = S::AddedAt;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `added_at` field to Set
     pub struct SetAddedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAddedAt<S> {}
     impl<S: State> State for SetAddedAt<S> {
         type Order = S::Order;
-        type Uri = S::Uri;
         type AddedAt = Set<members::added_at>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Order = S::Order;
+        type AddedAt = S::AddedAt;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `order` field
         pub struct order(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `added_at` field
         pub struct added_at(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CollectionItemBuilder<'a, S: collection_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CollectionItem<'a> {
@@ -2352,9 +2352,9 @@ impl<'a> CollectionItemBuilder<'a, collection_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2369,11 +2369,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionItemBuilder<'a, collection_item_state::SetAddedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2388,11 +2388,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CollectionItemBuilder<'a, collection_item_state::SetOrder<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2407,11 +2407,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CollectionItemBuilder<'a, collection_item_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2420,15 +2420,15 @@ impl<'a, S> CollectionItemBuilder<'a, S>
 where
     S: collection_item_state::State,
     S::Order: collection_item_state::IsSet,
-    S::Uri: collection_item_state::IsSet,
     S::AddedAt: collection_item_state::IsSet,
+    S::Uri: collection_item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CollectionItem<'a> {
         CollectionItem {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            order: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            added_at: self._fields.0.unwrap(),
+            order: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2438,9 +2438,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> CollectionItem<'a> {
         CollectionItem {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            order: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            added_at: self._fields.0.unwrap(),
+            order: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2457,12 +2457,12 @@ pub mod collection_view_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Name;
-        type Tags;
-        type CreatedAt;
         type Type;
         type Uri;
         type Cid;
+        type Tags;
         type Author;
+        type CreatedAt;
         type Visibility;
     }
     /// Empty state - all required fields are unset
@@ -2470,12 +2470,12 @@ pub mod collection_view_state {
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Name = Unset;
-        type Tags = Unset;
-        type CreatedAt = Unset;
         type Type = Unset;
         type Uri = Unset;
         type Cid = Unset;
+        type Tags = Unset;
         type Author = Unset;
+        type CreatedAt = Unset;
         type Visibility = Unset;
     }
     ///State transition - sets the `name` field to Set
@@ -2483,38 +2483,12 @@ pub mod collection_view_state {
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
         type Name = Set<members::name>;
-        type Tags = S::Tags;
-        type CreatedAt = S::CreatedAt;
-        type Type = S::Type;
-        type Uri = S::Uri;
-        type Cid = S::Cid;
-        type Author = S::Author;
-        type Visibility = S::Visibility;
-    }
-    ///State transition - sets the `tags` field to Set
-    pub struct SetTags<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTags<S> {}
-    impl<S: State> State for SetTags<S> {
-        type Name = S::Name;
-        type Tags = Set<members::tags>;
-        type CreatedAt = S::CreatedAt;
         type Type = S::Type;
         type Uri = S::Uri;
         type Cid = S::Cid;
-        type Author = S::Author;
-        type Visibility = S::Visibility;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type Name = S::Name;
         type Tags = S::Tags;
-        type CreatedAt = Set<members::created_at>;
-        type Type = S::Type;
-        type Uri = S::Uri;
-        type Cid = S::Cid;
         type Author = S::Author;
+        type CreatedAt = S::CreatedAt;
         type Visibility = S::Visibility;
     }
     ///State transition - sets the `type` field to Set
@@ -2522,12 +2496,12 @@ pub mod collection_view_state {
     impl<S: State> sealed::Sealed for SetType<S> {}
     impl<S: State> State for SetType<S> {
         type Name = S::Name;
-        type Tags = S::Tags;
-        type CreatedAt = S::CreatedAt;
         type Type = Set<members::r#type>;
         type Uri = S::Uri;
         type Cid = S::Cid;
+        type Tags = S::Tags;
         type Author = S::Author;
+        type CreatedAt = S::CreatedAt;
         type Visibility = S::Visibility;
     }
     ///State transition - sets the `uri` field to Set
@@ -2535,12 +2509,12 @@ pub mod collection_view_state {
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
         type Name = S::Name;
-        type Tags = S::Tags;
-        type CreatedAt = S::CreatedAt;
         type Type = S::Type;
         type Uri = Set<members::uri>;
         type Cid = S::Cid;
+        type Tags = S::Tags;
         type Author = S::Author;
+        type CreatedAt = S::CreatedAt;
         type Visibility = S::Visibility;
     }
     ///State transition - sets the `cid` field to Set
@@ -2548,12 +2522,25 @@ pub mod collection_view_state {
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
         type Name = S::Name;
+        type Type = S::Type;
+        type Uri = S::Uri;
+        type Cid = Set<members::cid>;
         type Tags = S::Tags;
+        type Author = S::Author;
         type CreatedAt = S::CreatedAt;
+        type Visibility = S::Visibility;
+    }
+    ///State transition - sets the `tags` field to Set
+    pub struct SetTags<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTags<S> {}
+    impl<S: State> State for SetTags<S> {
+        type Name = S::Name;
         type Type = S::Type;
         type Uri = S::Uri;
-        type Cid = Set<members::cid>;
+        type Cid = S::Cid;
+        type Tags = Set<members::tags>;
         type Author = S::Author;
+        type CreatedAt = S::CreatedAt;
         type Visibility = S::Visibility;
     }
     ///State transition - sets the `author` field to Set
@@ -2561,12 +2548,25 @@ pub mod collection_view_state {
     impl<S: State> sealed::Sealed for SetAuthor<S> {}
     impl<S: State> State for SetAuthor<S> {
         type Name = S::Name;
+        type Type = S::Type;
+        type Uri = S::Uri;
+        type Cid = S::Cid;
         type Tags = S::Tags;
+        type Author = Set<members::author>;
         type CreatedAt = S::CreatedAt;
+        type Visibility = S::Visibility;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Name = S::Name;
         type Type = S::Type;
         type Uri = S::Uri;
         type Cid = S::Cid;
-        type Author = Set<members::author>;
+        type Tags = S::Tags;
+        type Author = S::Author;
+        type CreatedAt = Set<members::created_at>;
         type Visibility = S::Visibility;
     }
     ///State transition - sets the `visibility` field to Set
@@ -2574,12 +2574,12 @@ pub mod collection_view_state {
     impl<S: State> sealed::Sealed for SetVisibility<S> {}
     impl<S: State> State for SetVisibility<S> {
         type Name = S::Name;
-        type Tags = S::Tags;
-        type CreatedAt = S::CreatedAt;
         type Type = S::Type;
         type Uri = S::Uri;
         type Cid = S::Cid;
+        type Tags = S::Tags;
         type Author = S::Author;
+        type CreatedAt = S::CreatedAt;
         type Visibility = Set<members::visibility>;
     }
     /// Marker types for field names
@@ -2587,18 +2587,18 @@ pub mod collection_view_state {
     pub mod members {
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `tags` field
-        pub struct tags(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `type` field
         pub struct r#type(());
         ///Marker type for the `uri` field
         pub struct uri(());
         ///Marker type for the `cid` field
         pub struct cid(());
+        ///Marker type for the `tags` field
+        pub struct tags(());
         ///Marker type for the `author` field
         pub struct author(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `visibility` field
         pub struct visibility(());
     }
@@ -2606,8 +2606,8 @@ pub mod collection_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct CollectionViewBuilder<'a, S: collection_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<social_showcase::ProfileView<'a>>,
         Option<Cid<'a>>,
         Option<BlobRef<'a>>,
@@ -2622,7 +2622,7 @@ pub struct CollectionViewBuilder<'a, S: collection_view_state::State> {
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CollectionView<'a> {
@@ -2636,8 +2636,8 @@ impl<'a> CollectionViewBuilder<'a, collection_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -2652,7 +2652,7 @@ impl<'a> CollectionViewBuilder<'a, collection_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2667,11 +2667,11 @@ where
         mut self,
         value: impl Into<social_showcase::ProfileView<'a>>,
     ) -> CollectionViewBuilder<'a, collection_view_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2686,11 +2686,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> CollectionViewBuilder<'a, collection_view_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CollectionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2698,12 +2698,12 @@ where
 impl<'a, S: collection_view_state::State> CollectionViewBuilder<'a, S> {
     /// Set the `coverImage` field (optional)
     pub fn cover_image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `coverImage` field to an Option value (optional)
     pub fn maybe_cover_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -2718,11 +2718,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionViewBuilder<'a, collection_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CollectionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2730,12 +2730,12 @@ where
 impl<'a, S: collection_view_state::State> CollectionViewBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -2743,12 +2743,12 @@ impl<'a, S: collection_view_state::State> CollectionViewBuilder<'a, S> {
 impl<'a, S: collection_view_state::State> CollectionViewBuilder<'a, S> {
     /// Set the `itemCount` field (optional)
     pub fn item_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `itemCount` field to an Option value (optional)
     pub fn maybe_item_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -2759,7 +2759,7 @@ impl<'a, S: collection_view_state::State> CollectionViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<social_showcase::ItemView<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `items` field to an Option value (optional)
@@ -2767,7 +2767,7 @@ impl<'a, S: collection_view_state::State> CollectionViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<social_showcase::ItemView<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -2782,11 +2782,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CollectionViewBuilder<'a, collection_view_state::SetName<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         CollectionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2801,11 +2801,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> CollectionViewBuilder<'a, collection_view_state::SetTags<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         CollectionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2820,11 +2820,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CollectionViewBuilder<'a, collection_view_state::SetType<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         CollectionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2832,12 +2832,12 @@ where
 impl<'a, S: collection_view_state::State> CollectionViewBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -2852,11 +2852,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CollectionViewBuilder<'a, collection_view_state::SetUri<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         CollectionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2871,11 +2871,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CollectionViewBuilder<'a, collection_view_state::SetVisibility<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         CollectionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2884,30 +2884,30 @@ impl<'a, S> CollectionViewBuilder<'a, S>
 where
     S: collection_view_state::State,
     S::Name: collection_view_state::IsSet,
-    S::Tags: collection_view_state::IsSet,
-    S::CreatedAt: collection_view_state::IsSet,
     S::Type: collection_view_state::IsSet,
     S::Uri: collection_view_state::IsSet,
     S::Cid: collection_view_state::IsSet,
+    S::Tags: collection_view_state::IsSet,
     S::Author: collection_view_state::IsSet,
+    S::CreatedAt: collection_view_state::IsSet,
     S::Visibility: collection_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CollectionView<'a> {
         CollectionView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            cover_image: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            description: self.__unsafe_private_named.4,
-            item_count: self.__unsafe_private_named.5,
-            items: self.__unsafe_private_named.6,
-            name: self.__unsafe_private_named.7.unwrap(),
-            tags: self.__unsafe_private_named.8.unwrap(),
-            r#type: self.__unsafe_private_named.9.unwrap(),
-            updated_at: self.__unsafe_private_named.10,
-            uri: self.__unsafe_private_named.11.unwrap(),
-            visibility: self.__unsafe_private_named.12.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            cover_image: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            description: self._fields.4,
+            item_count: self._fields.5,
+            items: self._fields.6,
+            name: self._fields.7.unwrap(),
+            tags: self._fields.8.unwrap(),
+            r#type: self._fields.9.unwrap(),
+            updated_at: self._fields.10,
+            uri: self._fields.11.unwrap(),
+            visibility: self._fields.12.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2917,19 +2917,19 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> CollectionView<'a> {
         CollectionView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            cover_image: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            description: self.__unsafe_private_named.4,
-            item_count: self.__unsafe_private_named.5,
-            items: self.__unsafe_private_named.6,
-            name: self.__unsafe_private_named.7.unwrap(),
-            tags: self.__unsafe_private_named.8.unwrap(),
-            r#type: self.__unsafe_private_named.9.unwrap(),
-            updated_at: self.__unsafe_private_named.10,
-            uri: self.__unsafe_private_named.11.unwrap(),
-            visibility: self.__unsafe_private_named.12.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            cover_image: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            description: self._fields.4,
+            item_count: self._fields.5,
+            items: self._fields.6,
+            name: self._fields.7.unwrap(),
+            tags: self._fields.8.unwrap(),
+            r#type: self._fields.9.unwrap(),
+            updated_at: self._fields.10,
+            uri: self._fields.11.unwrap(),
+            visibility: self._fields.12.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2969,13 +2969,13 @@ pub mod item_image_state {
 
 /// Builder for constructing an instance of this type
 pub struct ItemImageBuilder<'a, S: item_image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<social_showcase::AspectRatio<'a>>,
         Option<BlobRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ItemImage<'a> {
@@ -2989,9 +2989,9 @@ impl<'a> ItemImageBuilder<'a, item_image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ItemImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2999,12 +2999,12 @@ impl<'a> ItemImageBuilder<'a, item_image_state::Empty> {
 impl<'a, S: item_image_state::State> ItemImageBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -3015,7 +3015,7 @@ impl<'a, S: item_image_state::State> ItemImageBuilder<'a, S> {
         mut self,
         value: impl Into<Option<social_showcase::AspectRatio<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `aspectRatio` field to an Option value (optional)
@@ -3023,7 +3023,7 @@ impl<'a, S: item_image_state::State> ItemImageBuilder<'a, S> {
         mut self,
         value: Option<social_showcase::AspectRatio<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3038,11 +3038,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ItemImageBuilder<'a, item_image_state::SetBlob<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ItemImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3055,9 +3055,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ItemImage<'a> {
         ItemImage {
-            alt: self.__unsafe_private_named.0,
-            aspect_ratio: self.__unsafe_private_named.1,
-            blob: self.__unsafe_private_named.2.unwrap(),
+            alt: self._fields.0,
+            aspect_ratio: self._fields.1,
+            blob: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3067,9 +3067,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ItemImage<'a> {
         ItemImage {
-            alt: self.__unsafe_private_named.0,
-            aspect_ratio: self.__unsafe_private_named.1,
-            blob: self.__unsafe_private_named.2.unwrap(),
+            alt: self._fields.0,
+            aspect_ratio: self._fields.1,
+            blob: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -3085,149 +3085,149 @@ pub mod item_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
-        type Tags;
         type Visibility;
         type Images;
+        type Author;
         type Cid;
+        type Tags;
+        type Uri;
         type Title;
-        type Author;
         type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
-        type Tags = Unset;
         type Visibility = Unset;
         type Images = Unset;
+        type Author = Unset;
         type Cid = Unset;
+        type Tags = Unset;
+        type Uri = Unset;
         type Title = Unset;
-        type Author = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Tags = S::Tags;
-        type Visibility = S::Visibility;
-        type Images = S::Images;
-        type Cid = S::Cid;
-        type Title = S::Title;
-        type Author = S::Author;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `tags` field to Set
-    pub struct SetTags<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTags<S> {}
-    impl<S: State> State for SetTags<S> {
-        type Uri = S::Uri;
-        type Tags = Set<members::tags>;
-        type Visibility = S::Visibility;
-        type Images = S::Images;
-        type Cid = S::Cid;
-        type Title = S::Title;
-        type Author = S::Author;
-        type CreatedAt = S::CreatedAt;
-    }
     ///State transition - sets the `visibility` field to Set
     pub struct SetVisibility<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetVisibility<S> {}
     impl<S: State> State for SetVisibility<S> {
-        type Uri = S::Uri;
-        type Tags = S::Tags;
         type Visibility = Set<members::visibility>;
         type Images = S::Images;
+        type Author = S::Author;
         type Cid = S::Cid;
+        type Tags = S::Tags;
+        type Uri = S::Uri;
         type Title = S::Title;
-        type Author = S::Author;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `images` field to Set
     pub struct SetImages<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetImages<S> {}
     impl<S: State> State for SetImages<S> {
-        type Uri = S::Uri;
-        type Tags = S::Tags;
         type Visibility = S::Visibility;
         type Images = Set<members::images>;
+        type Author = S::Author;
         type Cid = S::Cid;
+        type Tags = S::Tags;
+        type Uri = S::Uri;
+        type Title = S::Title;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `author` field to Set
+    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAuthor<S> {}
+    impl<S: State> State for SetAuthor<S> {
+        type Visibility = S::Visibility;
+        type Images = S::Images;
+        type Author = Set<members::author>;
+        type Cid = S::Cid;
+        type Tags = S::Tags;
+        type Uri = S::Uri;
         type Title = S::Title;
-        type Author = S::Author;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type Uri = S::Uri;
-        type Tags = S::Tags;
         type Visibility = S::Visibility;
         type Images = S::Images;
+        type Author = S::Author;
         type Cid = Set<members::cid>;
+        type Tags = S::Tags;
+        type Uri = S::Uri;
         type Title = S::Title;
-        type Author = S::Author;
         type CreatedAt = S::CreatedAt;
     }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Uri = S::Uri;
-        type Tags = S::Tags;
+    ///State transition - sets the `tags` field to Set
+    pub struct SetTags<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTags<S> {}
+    impl<S: State> State for SetTags<S> {
         type Visibility = S::Visibility;
         type Images = S::Images;
-        type Cid = S::Cid;
-        type Title = Set<members::title>;
         type Author = S::Author;
+        type Cid = S::Cid;
+        type Tags = Set<members::tags>;
+        type Uri = S::Uri;
+        type Title = S::Title;
         type CreatedAt = S::CreatedAt;
     }
-    ///State transition - sets the `author` field to Set
-    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAuthor<S> {}
-    impl<S: State> State for SetAuthor<S> {
-        type Uri = S::Uri;
-        type Tags = S::Tags;
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
         type Visibility = S::Visibility;
         type Images = S::Images;
+        type Author = S::Author;
         type Cid = S::Cid;
+        type Tags = S::Tags;
+        type Uri = Set<members::uri>;
         type Title = S::Title;
-        type Author = Set<members::author>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type Visibility = S::Visibility;
+        type Images = S::Images;
+        type Author = S::Author;
+        type Cid = S::Cid;
+        type Tags = S::Tags;
+        type Uri = S::Uri;
+        type Title = Set<members::title>;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Uri = S::Uri;
-        type Tags = S::Tags;
         type Visibility = S::Visibility;
         type Images = S::Images;
+        type Author = S::Author;
         type Cid = S::Cid;
+        type Tags = S::Tags;
+        type Uri = S::Uri;
         type Title = S::Title;
-        type Author = S::Author;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
-        ///Marker type for the `tags` field
-        pub struct tags(());
         ///Marker type for the `visibility` field
         pub struct visibility(());
         ///Marker type for the `images` field
         pub struct images(());
+        ///Marker type for the `author` field
+        pub struct author(());
         ///Marker type for the `cid` field
         pub struct cid(());
+        ///Marker type for the `tags` field
+        pub struct tags(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
         ///Marker type for the `title` field
         pub struct title(());
-        ///Marker type for the `author` field
-        pub struct author(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
     }
@@ -3235,8 +3235,8 @@ pub mod item_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ItemViewBuilder<'a, S: item_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<social_showcase::ProfileView<'a>>,
         Option<CowStr<'a>>,
         Option<Cid<'a>>,
@@ -3252,7 +3252,7 @@ pub struct ItemViewBuilder<'a, S: item_view_state::State> {
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ItemView<'a> {
@@ -3266,8 +3266,8 @@ impl<'a> ItemViewBuilder<'a, item_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ItemViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -3283,7 +3283,7 @@ impl<'a> ItemViewBuilder<'a, item_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3298,11 +3298,11 @@ where
         mut self,
         value: impl Into<social_showcase::ProfileView<'a>>,
     ) -> ItemViewBuilder<'a, item_view_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ItemViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3310,12 +3310,12 @@ where
 impl<'a, S: item_view_state::State> ItemViewBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3330,11 +3330,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> ItemViewBuilder<'a, item_view_state::SetCid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ItemViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3349,11 +3349,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ItemViewBuilder<'a, item_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ItemViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3361,12 +3361,12 @@ where
 impl<'a, S: item_view_state::State> ItemViewBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -3374,12 +3374,12 @@ impl<'a, S: item_view_state::State> ItemViewBuilder<'a, S> {
 impl<'a, S: item_view_state::State> ItemViewBuilder<'a, S> {
     /// Set the `externalLink` field (optional)
     pub fn external_link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `externalLink` field to an Option value (optional)
     pub fn maybe_external_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -3394,11 +3394,11 @@ where
         mut self,
         value: impl Into<Vec<social_showcase::ItemImage<'a>>>,
     ) -> ItemViewBuilder<'a, item_view_state::SetImages<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ItemViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3406,12 +3406,12 @@ where
 impl<'a, S: item_view_state::State> ItemViewBuilder<'a, S> {
     /// Set the `metadata` field (optional)
     pub fn metadata(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `metadata` field to an Option value (optional)
     pub fn maybe_metadata(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -3419,12 +3419,12 @@ impl<'a, S: item_view_state::State> ItemViewBuilder<'a, S> {
 impl<'a, S: item_view_state::State> ItemViewBuilder<'a, S> {
     /// Set the `reactionCount` field (optional)
     pub fn reaction_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `reactionCount` field to an Option value (optional)
     pub fn maybe_reaction_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -3439,11 +3439,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> ItemViewBuilder<'a, item_view_state::SetTags<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ItemViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3458,11 +3458,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ItemViewBuilder<'a, item_view_state::SetTitle<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         ItemViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3470,12 +3470,12 @@ where
 impl<'a, S: item_view_state::State> ItemViewBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -3490,11 +3490,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ItemViewBuilder<'a, item_view_state::SetUri<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         ItemViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3509,11 +3509,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ItemViewBuilder<'a, item_view_state::SetVisibility<S>> {
-        self.__unsafe_private_named.13 = Option::Some(value.into());
+        self._fields.13 = Option::Some(value.into());
         ItemViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3521,32 +3521,32 @@ where
 impl<'a, S> ItemViewBuilder<'a, S>
 where
     S: item_view_state::State,
-    S::Uri: item_view_state::IsSet,
-    S::Tags: item_view_state::IsSet,
     S::Visibility: item_view_state::IsSet,
     S::Images: item_view_state::IsSet,
+    S::Author: item_view_state::IsSet,
     S::Cid: item_view_state::IsSet,
+    S::Tags: item_view_state::IsSet,
+    S::Uri: item_view_state::IsSet,
     S::Title: item_view_state::IsSet,
-    S::Author: item_view_state::IsSet,
     S::CreatedAt: item_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ItemView<'a> {
         ItemView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            category: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            description: self.__unsafe_private_named.4,
-            external_link: self.__unsafe_private_named.5,
-            images: self.__unsafe_private_named.6.unwrap(),
-            metadata: self.__unsafe_private_named.7,
-            reaction_count: self.__unsafe_private_named.8,
-            tags: self.__unsafe_private_named.9.unwrap(),
-            title: self.__unsafe_private_named.10.unwrap(),
-            updated_at: self.__unsafe_private_named.11,
-            uri: self.__unsafe_private_named.12.unwrap(),
-            visibility: self.__unsafe_private_named.13.unwrap(),
+            author: self._fields.0.unwrap(),
+            category: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            created_at: self._fields.3.unwrap(),
+            description: self._fields.4,
+            external_link: self._fields.5,
+            images: self._fields.6.unwrap(),
+            metadata: self._fields.7,
+            reaction_count: self._fields.8,
+            tags: self._fields.9.unwrap(),
+            title: self._fields.10.unwrap(),
+            updated_at: self._fields.11,
+            uri: self._fields.12.unwrap(),
+            visibility: self._fields.13.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3556,20 +3556,20 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ItemView<'a> {
         ItemView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            category: self.__unsafe_private_named.1,
-            cid: self.__unsafe_private_named.2.unwrap(),
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            description: self.__unsafe_private_named.4,
-            external_link: self.__unsafe_private_named.5,
-            images: self.__unsafe_private_named.6.unwrap(),
-            metadata: self.__unsafe_private_named.7,
-            reaction_count: self.__unsafe_private_named.8,
-            tags: self.__unsafe_private_named.9.unwrap(),
-            title: self.__unsafe_private_named.10.unwrap(),
-            updated_at: self.__unsafe_private_named.11,
-            uri: self.__unsafe_private_named.12.unwrap(),
-            visibility: self.__unsafe_private_named.13.unwrap(),
+            author: self._fields.0.unwrap(),
+            category: self._fields.1,
+            cid: self._fields.2.unwrap(),
+            created_at: self._fields.3.unwrap(),
+            description: self._fields.4,
+            external_link: self._fields.5,
+            images: self._fields.6.unwrap(),
+            metadata: self._fields.7,
+            reaction_count: self._fields.8,
+            tags: self._fields.9.unwrap(),
+            title: self._fields.10.unwrap(),
+            updated_at: self._fields.11,
+            uri: self._fields.12.unwrap(),
+            visibility: self._fields.13.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -3635,9 +3635,9 @@ pub mod notification_settings_state {
 
 /// Builder for constructing an instance of this type
 pub struct NotificationSettingsBuilder<'a, S: notification_settings_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<bool>, Option<bool>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<bool>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> NotificationSettings<'a> {
@@ -3651,9 +3651,9 @@ impl<'a> NotificationSettingsBuilder<'a, notification_settings_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NotificationSettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3668,11 +3668,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> NotificationSettingsBuilder<'a, notification_settings_state::SetComments<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NotificationSettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3687,11 +3687,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> NotificationSettingsBuilder<'a, notification_settings_state::SetFollows<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         NotificationSettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3706,11 +3706,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> NotificationSettingsBuilder<'a, notification_settings_state::SetReactions<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         NotificationSettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3725,9 +3725,9 @@ where
     /// Build the final struct
     pub fn build(self) -> NotificationSettings<'a> {
         NotificationSettings {
-            comments: self.__unsafe_private_named.0.unwrap(),
-            follows: self.__unsafe_private_named.1.unwrap(),
-            reactions: self.__unsafe_private_named.2.unwrap(),
+            comments: self._fields.0.unwrap(),
+            follows: self._fields.1.unwrap(),
+            reactions: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3737,9 +3737,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> NotificationSettings<'a> {
         NotificationSettings {
-            comments: self.__unsafe_private_named.0.unwrap(),
-            follows: self.__unsafe_private_named.1.unwrap(),
-            reactions: self.__unsafe_private_named.2.unwrap(),
+            comments: self._fields.0.unwrap(),
+            follows: self._fields.1.unwrap(),
+            reactions: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -3756,58 +3756,58 @@ pub mod privacy_settings_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Indexable;
-        type AllowComments;
         type AllowReactions;
+        type AllowComments;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Indexable = Unset;
-        type AllowComments = Unset;
         type AllowReactions = Unset;
+        type AllowComments = Unset;
     }
     ///State transition - sets the `indexable` field to Set
     pub struct SetIndexable<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIndexable<S> {}
     impl<S: State> State for SetIndexable<S> {
         type Indexable = Set<members::indexable>;
-        type AllowComments = S::AllowComments;
-        type AllowReactions = S::AllowReactions;
-    }
-    ///State transition - sets the `allow_comments` field to Set
-    pub struct SetAllowComments<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAllowComments<S> {}
-    impl<S: State> State for SetAllowComments<S> {
-        type Indexable = S::Indexable;
-        type AllowComments = Set<members::allow_comments>;
         type AllowReactions = S::AllowReactions;
+        type AllowComments = S::AllowComments;
     }
     ///State transition - sets the `allow_reactions` field to Set
     pub struct SetAllowReactions<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAllowReactions<S> {}
     impl<S: State> State for SetAllowReactions<S> {
         type Indexable = S::Indexable;
-        type AllowComments = S::AllowComments;
         type AllowReactions = Set<members::allow_reactions>;
+        type AllowComments = S::AllowComments;
+    }
+    ///State transition - sets the `allow_comments` field to Set
+    pub struct SetAllowComments<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAllowComments<S> {}
+    impl<S: State> State for SetAllowComments<S> {
+        type Indexable = S::Indexable;
+        type AllowReactions = S::AllowReactions;
+        type AllowComments = Set<members::allow_comments>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `indexable` field
         pub struct indexable(());
-        ///Marker type for the `allow_comments` field
-        pub struct allow_comments(());
         ///Marker type for the `allow_reactions` field
         pub struct allow_reactions(());
+        ///Marker type for the `allow_comments` field
+        pub struct allow_comments(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PrivacySettingsBuilder<'a, S: privacy_settings_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<bool>, Option<bool>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<bool>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PrivacySettings<'a> {
@@ -3821,9 +3821,9 @@ impl<'a> PrivacySettingsBuilder<'a, privacy_settings_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PrivacySettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3838,11 +3838,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> PrivacySettingsBuilder<'a, privacy_settings_state::SetAllowComments<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PrivacySettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3857,11 +3857,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> PrivacySettingsBuilder<'a, privacy_settings_state::SetAllowReactions<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PrivacySettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3876,11 +3876,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> PrivacySettingsBuilder<'a, privacy_settings_state::SetIndexable<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PrivacySettingsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3889,15 +3889,15 @@ impl<'a, S> PrivacySettingsBuilder<'a, S>
 where
     S: privacy_settings_state::State,
     S::Indexable: privacy_settings_state::IsSet,
-    S::AllowComments: privacy_settings_state::IsSet,
     S::AllowReactions: privacy_settings_state::IsSet,
+    S::AllowComments: privacy_settings_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PrivacySettings<'a> {
         PrivacySettings {
-            allow_comments: self.__unsafe_private_named.0.unwrap(),
-            allow_reactions: self.__unsafe_private_named.1.unwrap(),
-            indexable: self.__unsafe_private_named.2.unwrap(),
+            allow_comments: self._fields.0.unwrap(),
+            allow_reactions: self._fields.1.unwrap(),
+            indexable: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3907,9 +3907,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> PrivacySettings<'a> {
         PrivacySettings {
-            allow_comments: self.__unsafe_private_named.0.unwrap(),
-            allow_reactions: self.__unsafe_private_named.1.unwrap(),
-            indexable: self.__unsafe_private_named.2.unwrap(),
+            allow_comments: self._fields.0.unwrap(),
+            allow_reactions: self._fields.1.unwrap(),
+            indexable: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -3925,45 +3925,45 @@ pub mod reaction_subject_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type Cid;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type Cid = Unset;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Cid = S::Cid;
+        type Uri = Unset;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type Uri = S::Uri;
         type Cid = Set<members::cid>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Cid = S::Cid;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `cid` field
         pub struct cid(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReactionSubjectBuilder<'a, S: reaction_subject_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReactionSubject<'a> {
@@ -3977,9 +3977,9 @@ impl<'a> ReactionSubjectBuilder<'a, reaction_subject_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReactionSubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3994,11 +3994,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> ReactionSubjectBuilder<'a, reaction_subject_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReactionSubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4013,11 +4013,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ReactionSubjectBuilder<'a, reaction_subject_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReactionSubjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4025,14 +4025,14 @@ where
 impl<'a, S> ReactionSubjectBuilder<'a, S>
 where
     S: reaction_subject_state::State,
-    S::Uri: reaction_subject_state::IsSet,
     S::Cid: reaction_subject_state::IsSet,
+    S::Uri: reaction_subject_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ReactionSubject<'a> {
         ReactionSubject {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -4042,8 +4042,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ReactionSubject<'a> {
         ReactionSubject {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -4059,99 +4059,99 @@ pub mod reaction_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type Uri;
         type Actor;
-        type Type;
         type CreatedAt;
+        type Subject;
+        type Type;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type Uri = Unset;
         type Actor = Unset;
-        type Type = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type Uri = S::Uri;
-        type Actor = S::Actor;
-        type Type = S::Type;
-        type CreatedAt = S::CreatedAt;
+        type Subject = Unset;
+        type Type = Unset;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Subject = S::Subject;
         type Uri = Set<members::uri>;
         type Actor = S::Actor;
-        type Type = S::Type;
         type CreatedAt = S::CreatedAt;
+        type Subject = S::Subject;
+        type Type = S::Type;
     }
     ///State transition - sets the `actor` field to Set
     pub struct SetActor<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetActor<S> {}
     impl<S: State> State for SetActor<S> {
-        type Subject = S::Subject;
         type Uri = S::Uri;
         type Actor = Set<members::actor>;
-        type Type = S::Type;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `type` field to Set
-    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetType<S> {}
-    impl<S: State> State for SetType<S> {
         type Subject = S::Subject;
-        type Uri = S::Uri;
-        type Actor = S::Actor;
-        type Type = Set<members::r#type>;
-        type CreatedAt = S::CreatedAt;
+        type Type = S::Type;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Uri = S::Uri;
+        type Actor = S::Actor;
+        type CreatedAt = Set<members::created_at>;
         type Subject = S::Subject;
+        type Type = S::Type;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
         type Uri = S::Uri;
         type Actor = S::Actor;
+        type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
         type Type = S::Type;
-        type CreatedAt = Set<members::created_at>;
+    }
+    ///State transition - sets the `type` field to Set
+    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetType<S> {}
+    impl<S: State> State for SetType<S> {
+        type Uri = S::Uri;
+        type Actor = S::Actor;
+        type CreatedAt = S::CreatedAt;
+        type Subject = S::Subject;
+        type Type = Set<members::r#type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `uri` field
         pub struct uri(());
         ///Marker type for the `actor` field
         pub struct actor(());
-        ///Marker type for the `type` field
-        pub struct r#type(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
+        ///Marker type for the `type` field
+        pub struct r#type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReactionViewBuilder<'a, S: reaction_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<social_showcase::ProfileView<'a>>,
         Option<Datetime>,
         Option<social_showcase::ReactionSubject<'a>>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReactionView<'a> {
@@ -4165,9 +4165,9 @@ impl<'a> ReactionViewBuilder<'a, reaction_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReactionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4182,11 +4182,11 @@ where
         mut self,
         value: impl Into<social_showcase::ProfileView<'a>>,
     ) -> ReactionViewBuilder<'a, reaction_view_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReactionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4201,11 +4201,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReactionViewBuilder<'a, reaction_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReactionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4220,11 +4220,11 @@ where
         mut self,
         value: impl Into<social_showcase::ReactionSubject<'a>>,
     ) -> ReactionViewBuilder<'a, reaction_view_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReactionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4239,11 +4239,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReactionViewBuilder<'a, reaction_view_state::SetType<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ReactionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4258,11 +4258,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ReactionViewBuilder<'a, reaction_view_state::SetUri<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ReactionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4270,20 +4270,20 @@ where
 impl<'a, S> ReactionViewBuilder<'a, S>
 where
     S: reaction_view_state::State,
-    S::Subject: reaction_view_state::IsSet,
     S::Uri: reaction_view_state::IsSet,
     S::Actor: reaction_view_state::IsSet,
-    S::Type: reaction_view_state::IsSet,
     S::CreatedAt: reaction_view_state::IsSet,
+    S::Subject: reaction_view_state::IsSet,
+    S::Type: reaction_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ReactionView<'a> {
         ReactionView {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
-            r#type: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            actor: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
+            r#type: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -4293,11 +4293,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ReactionView<'a> {
         ReactionView {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            subject: self.__unsafe_private_named.2.unwrap(),
-            r#type: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            actor: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            subject: self._fields.2.unwrap(),
+            r#type: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -4313,59 +4313,59 @@ pub mod showcase_item_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type AddedAt;
-        type Order;
         type Uri;
+        type Order;
+        type AddedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type AddedAt = Unset;
-        type Order = Unset;
         type Uri = Unset;
+        type Order = Unset;
+        type AddedAt = Unset;
     }
-    ///State transition - sets the `added_at` field to Set
-    pub struct SetAddedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAddedAt<S> {}
-    impl<S: State> State for SetAddedAt<S> {
-        type AddedAt = Set<members::added_at>;
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Uri = Set<members::uri>;
         type Order = S::Order;
-        type Uri = S::Uri;
+        type AddedAt = S::AddedAt;
     }
     ///State transition - sets the `order` field to Set
     pub struct SetOrder<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetOrder<S> {}
     impl<S: State> State for SetOrder<S> {
-        type AddedAt = S::AddedAt;
-        type Order = Set<members::order>;
         type Uri = S::Uri;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
+        type Order = Set<members::order>;
         type AddedAt = S::AddedAt;
+    }
+    ///State transition - sets the `added_at` field to Set
+    pub struct SetAddedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAddedAt<S> {}
+    impl<S: State> State for SetAddedAt<S> {
+        type Uri = S::Uri;
         type Order = S::Order;
-        type Uri = Set<members::uri>;
+        type AddedAt = Set<members::added_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `added_at` field
-        pub struct added_at(());
-        ///Marker type for the `order` field
-        pub struct order(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `order` field
+        pub struct order(());
+        ///Marker type for the `added_at` field
+        pub struct added_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ShowcaseItemBuilder<'a, S: showcase_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<i64>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<i64>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ShowcaseItem<'a> {
@@ -4379,9 +4379,9 @@ impl<'a> ShowcaseItemBuilder<'a, showcase_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ShowcaseItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4396,11 +4396,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ShowcaseItemBuilder<'a, showcase_item_state::SetAddedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ShowcaseItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4415,11 +4415,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ShowcaseItemBuilder<'a, showcase_item_state::SetOrder<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ShowcaseItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4434,11 +4434,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ShowcaseItemBuilder<'a, showcase_item_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ShowcaseItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -4446,16 +4446,16 @@ where
 impl<'a, S> ShowcaseItemBuilder<'a, S>
 where
     S: showcase_item_state::State,
-    S::AddedAt: showcase_item_state::IsSet,
-    S::Order: showcase_item_state::IsSet,
     S::Uri: showcase_item_state::IsSet,
+    S::Order: showcase_item_state::IsSet,
+    S::AddedAt: showcase_item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ShowcaseItem<'a> {
         ShowcaseItem {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            order: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            added_at: self._fields.0.unwrap(),
+            order: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -4465,9 +4465,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ShowcaseItem<'a> {
         ShowcaseItem {
-            added_at: self.__unsafe_private_named.0.unwrap(),
-            order: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
+            added_at: self._fields.0.unwrap(),
+            order: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_showcase/collection/delete_collection.rs b/crates/jacquard-api/src/social_showcase/collection/delete_collection.rs
index e33eccd1..caabbd7f 100644
--- a/crates/jacquard-api/src/social_showcase/collection/delete_collection.rs
+++ b/crates/jacquard-api/src/social_showcase/collection/delete_collection.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::deps::bytes::Bytes;
 use jacquard_common::types::string::AtUri;
@@ -90,9 +93,9 @@ pub mod delete_collection_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeleteCollectionBuilder<'a, S: delete_collection_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeleteCollection<'a> {
@@ -106,9 +109,9 @@ impl<'a> DeleteCollectionBuilder<'a, delete_collection_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteCollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -123,11 +126,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> DeleteCollectionBuilder<'a, delete_collection_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeleteCollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -140,7 +143,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DeleteCollection<'a> {
         DeleteCollection {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -153,7 +156,7 @@ where
         >,
     ) -> DeleteCollection<'a> {
         DeleteCollection {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_showcase/collection/get_collection.rs b/crates/jacquard-api/src/social_showcase/collection/get_collection.rs
index 2888fd7a..6a5fb90e 100644
--- a/crates/jacquard-api/src/social_showcase/collection/get_collection.rs
+++ b/crates/jacquard-api/src/social_showcase/collection/get_collection.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_collection_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetCollectionBuilder<'a, S: get_collection_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetCollection<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetCollectionBuilder<'a, get_collection_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetCollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetCollectionBuilder<'a, get_collection_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetCollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetCollection<'a> {
         GetCollection {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_showcase/collection/list_collections.rs b/crates/jacquard-api/src/social_showcase/collection/list_collections.rs
index 12a3fe84..cddacf9c 100644
--- a/crates/jacquard-api/src/social_showcase/collection/list_collections.rs
+++ b/crates/jacquard-api/src/social_showcase/collection/list_collections.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -102,9 +105,9 @@ pub mod list_collections_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListCollectionsBuilder<'a, S: list_collections_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListCollections<'a> {
@@ -118,9 +121,9 @@ impl<'a> ListCollectionsBuilder<'a, list_collections_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListCollectionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -135,11 +138,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> ListCollectionsBuilder<'a, list_collections_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListCollectionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -147,12 +150,12 @@ where
 impl<'a, S: list_collections_state::State> ListCollectionsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -160,12 +163,12 @@ impl<'a, S: list_collections_state::State> ListCollectionsBuilder<'a, S> {
 impl<'a, S: list_collections_state::State> ListCollectionsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -178,9 +181,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ListCollections<'a> {
         ListCollections {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_showcase/collection/update_collection.rs b/crates/jacquard-api/src/social_showcase/collection/update_collection.rs
index bc8f0cab..623a7f71 100644
--- a/crates/jacquard-api/src/social_showcase/collection/update_collection.rs
+++ b/crates/jacquard-api/src/social_showcase/collection/update_collection.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::blob::BlobRef;
@@ -205,8 +208,8 @@ pub mod update_collection_state {
 
 /// Builder for constructing an instance of this type
 pub struct UpdateCollectionBuilder<'a, S: update_collection_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<Vec<CollectionItem<'a>>>,
@@ -215,7 +218,7 @@ pub struct UpdateCollectionBuilder<'a, S: update_collection_state::State> {
         Option<AtUri<'a>>,
         Option<UpdateCollectionVisibility<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateCollection<'a> {
@@ -229,9 +232,9 @@ impl<'a> UpdateCollectionBuilder<'a, update_collection_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateCollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,12 +242,12 @@ impl<'a> UpdateCollectionBuilder<'a, update_collection_state::Empty> {
 impl<'a, S: update_collection_state::State> UpdateCollectionBuilder<'a, S> {
     /// Set the `coverImage` field (optional)
     pub fn cover_image(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `coverImage` field to an Option value (optional)
     pub fn maybe_cover_image(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -252,12 +255,12 @@ impl<'a, S: update_collection_state::State> UpdateCollectionBuilder<'a, S> {
 impl<'a, S: update_collection_state::State> UpdateCollectionBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -265,12 +268,12 @@ impl<'a, S: update_collection_state::State> UpdateCollectionBuilder<'a, S> {
 impl<'a, S: update_collection_state::State> UpdateCollectionBuilder<'a, S> {
     /// Set the `items` field (optional)
     pub fn items(mut self, value: impl Into<Option<Vec<CollectionItem<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `items` field to an Option value (optional)
     pub fn maybe_items(mut self, value: Option<Vec<CollectionItem<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -278,12 +281,12 @@ impl<'a, S: update_collection_state::State> UpdateCollectionBuilder<'a, S> {
 impl<'a, S: update_collection_state::State> UpdateCollectionBuilder<'a, S> {
     /// Set the `name` field (optional)
     pub fn name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `name` field to an Option value (optional)
     pub fn maybe_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -291,12 +294,12 @@ impl<'a, S: update_collection_state::State> UpdateCollectionBuilder<'a, S> {
 impl<'a, S: update_collection_state::State> UpdateCollectionBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -311,11 +314,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> UpdateCollectionBuilder<'a, update_collection_state::SetUri<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         UpdateCollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -326,7 +329,7 @@ impl<'a, S: update_collection_state::State> UpdateCollectionBuilder<'a, S> {
         mut self,
         value: impl Into<Option<UpdateCollectionVisibility<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `visibility` field to an Option value (optional)
@@ -334,7 +337,7 @@ impl<'a, S: update_collection_state::State> UpdateCollectionBuilder<'a, S> {
         mut self,
         value: Option<UpdateCollectionVisibility<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -347,13 +350,13 @@ where
     /// Build the final struct
     pub fn build(self) -> UpdateCollection<'a> {
         UpdateCollection {
-            cover_image: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            items: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3,
-            tags: self.__unsafe_private_named.4,
-            uri: self.__unsafe_private_named.5.unwrap(),
-            visibility: self.__unsafe_private_named.6,
+            cover_image: self._fields.0,
+            description: self._fields.1,
+            items: self._fields.2,
+            name: self._fields.3,
+            tags: self._fields.4,
+            uri: self._fields.5.unwrap(),
+            visibility: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -366,13 +369,13 @@ where
         >,
     ) -> UpdateCollection<'a> {
         UpdateCollection {
-            cover_image: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            items: self.__unsafe_private_named.2,
-            name: self.__unsafe_private_named.3,
-            tags: self.__unsafe_private_named.4,
-            uri: self.__unsafe_private_named.5.unwrap(),
-            visibility: self.__unsafe_private_named.6,
+            cover_image: self._fields.0,
+            description: self._fields.1,
+            items: self._fields.2,
+            name: self._fields.3,
+            tags: self._fields.4,
+            uri: self._fields.5.unwrap(),
+            visibility: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_showcase/feed/get_author_feed.rs b/crates/jacquard-api/src/social_showcase/feed/get_author_feed.rs
index 2dea635a..cd5ebc2b 100644
--- a/crates/jacquard-api/src/social_showcase/feed/get_author_feed.rs
+++ b/crates/jacquard-api/src/social_showcase/feed/get_author_feed.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -102,9 +105,9 @@ pub mod get_author_feed_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetAuthorFeedBuilder<'a, S: get_author_feed_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetAuthorFeed<'a> {
@@ -118,9 +121,9 @@ impl<'a> GetAuthorFeedBuilder<'a, get_author_feed_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetAuthorFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -135,11 +138,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetAuthorFeedBuilder<'a, get_author_feed_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetAuthorFeedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -147,12 +150,12 @@ where
 impl<'a, S: get_author_feed_state::State> GetAuthorFeedBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -160,12 +163,12 @@ impl<'a, S: get_author_feed_state::State> GetAuthorFeedBuilder<'a, S> {
 impl<'a, S: get_author_feed_state::State> GetAuthorFeedBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -178,9 +181,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetAuthorFeed<'a> {
         GetAuthorFeed {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_showcase/feed/get_timeline.rs b/crates/jacquard-api/src/social_showcase/feed/get_timeline.rs
index b63c36b5..e389bd30 100644
--- a/crates/jacquard-api/src/social_showcase/feed/get_timeline.rs
+++ b/crates/jacquard-api/src/social_showcase/feed/get_timeline.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_timeline_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetTimelineBuilder<'a, S: get_timeline_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetTimeline<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetTimelineBuilder<'a, get_timeline_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetTimelineBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -112,12 +115,12 @@ impl<'a> GetTimelineBuilder<'a, get_timeline_state::Empty> {
 impl<'a, S: get_timeline_state::State> GetTimelineBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -125,12 +128,12 @@ impl<'a, S: get_timeline_state::State> GetTimelineBuilder<'a, S> {
 impl<'a, S: get_timeline_state::State> GetTimelineBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -142,8 +145,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetTimeline<'a> {
         GetTimeline {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_showcase/feed/reaction.rs b/crates/jacquard-api/src/social_showcase/feed/reaction.rs
index f54a0baf..89c2a1f6 100644
--- a/crates/jacquard-api/src/social_showcase/feed/reaction.rs
+++ b/crates/jacquard-api/src/social_showcase/feed/reaction.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -123,63 +126,59 @@ pub mod reaction_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type CreatedAt;
         type Type;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type CreatedAt = Unset;
         type Type = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
-        type Type = S::Type;
+        type Subject = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
         type Type = S::Type;
+        type Subject = S::Subject;
     }
     ///State transition - sets the `type` field to Set
     pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetType<S> {}
     impl<S: State> State for SetType<S> {
-        type Subject = S::Subject;
         type CreatedAt = S::CreatedAt;
         type Type = Set<members::r#type>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
+        type Type = S::Type;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `type` field
         pub struct r#type(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReactionBuilder<'a, S: reaction_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<ReactionSubject<'a>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<ReactionSubject<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Reaction<'a> {
@@ -193,9 +192,9 @@ impl<'a> ReactionBuilder<'a, reaction_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -210,11 +209,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReactionBuilder<'a, reaction_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -229,11 +228,11 @@ where
         mut self,
         value: impl Into<ReactionSubject<'a>>,
     ) -> ReactionBuilder<'a, reaction_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -248,11 +247,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReactionBuilder<'a, reaction_state::SetType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -260,16 +259,16 @@ where
 impl<'a, S> ReactionBuilder<'a, S>
 where
     S: reaction_state::State,
-    S::Subject: reaction_state::IsSet,
     S::CreatedAt: reaction_state::IsSet,
     S::Type: reaction_state::IsSet,
+    S::Subject: reaction_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Reaction<'a> {
         Reaction {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -282,9 +281,9 @@ where
         >,
     ) -> Reaction<'a> {
         Reaction {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_showcase/feed/search_posts.rs b/crates/jacquard-api/src/social_showcase/feed/search_posts.rs
index 868c2359..1b8590c6 100644
--- a/crates/jacquard-api/src/social_showcase/feed/search_posts.rs
+++ b/crates/jacquard-api/src/social_showcase/feed/search_posts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -121,14 +124,9 @@ pub mod search_posts_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchPostsBuilder<'a, S: search_posts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<i64>,
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchPosts<'a> {
@@ -142,9 +140,9 @@ impl<'a> SearchPostsBuilder<'a, search_posts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchPostsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -152,12 +150,12 @@ impl<'a> SearchPostsBuilder<'a, search_posts_state::Empty> {
 impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -165,12 +163,12 @@ impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
 impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -185,11 +183,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SearchPostsBuilder<'a, search_posts_state::SetQ<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SearchPostsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,12 +195,12 @@ where
 impl<'a, S: search_posts_state::State> SearchPostsBuilder<'a, S> {
     /// Set the `type` field (optional)
     pub fn r#type(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `type` field to an Option value (optional)
     pub fn maybe_type(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -215,10 +213,10 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchPosts<'a> {
         SearchPosts {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            q: self.__unsafe_private_named.2.unwrap(),
-            r#type: self.__unsafe_private_named.3,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            q: self._fields.2.unwrap(),
+            r#type: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_showcase/graph/block.rs b/crates/jacquard-api/src/social_showcase/graph/block.rs
index 300a9c77..b7de4064 100644
--- a/crates/jacquard-api/src/social_showcase/graph/block.rs
+++ b/crates/jacquard-api/src/social_showcase/graph/block.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -145,9 +148,9 @@ pub mod block_state {
 
 /// Builder for constructing an instance of this type
 pub struct BlockBuilder<'a, S: block_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Block<'a> {
@@ -161,9 +164,9 @@ impl<'a> BlockBuilder<'a, block_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BlockBuilder<'a, block_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> BlockBuilder<'a, block_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BlockBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,8 +218,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Block<'a> {
         Block {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -229,8 +232,8 @@ where
         >,
     ) -> Block<'a> {
         Block {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_showcase/graph/follow.rs b/crates/jacquard-api/src/social_showcase/graph/follow.rs
index 61477be9..5cf95582 100644
--- a/crates/jacquard-api/src/social_showcase/graph/follow.rs
+++ b/crates/jacquard-api/src/social_showcase/graph/follow.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -109,45 +112,45 @@ pub mod follow_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type CreatedAt;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type CreatedAt = S::CreatedAt;
+        type Subject = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Subject = S::Subject;
         type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type CreatedAt = S::CreatedAt;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FollowBuilder<'a, S: follow_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Follow<'a> {
@@ -161,9 +164,9 @@ impl<'a> FollowBuilder<'a, follow_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> FollowBuilder<'a, follow_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> FollowBuilder<'a, follow_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FollowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,14 +212,14 @@ where
 impl<'a, S> FollowBuilder<'a, S>
 where
     S: follow_state::State,
-    S::Subject: follow_state::IsSet,
     S::CreatedAt: follow_state::IsSet,
+    S::Subject: follow_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -229,8 +232,8 @@ where
         >,
     ) -> Follow<'a> {
         Follow {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_showcase/graph/get_blocks.rs b/crates/jacquard-api/src/social_showcase/graph/get_blocks.rs
index 77f00984..74f1612a 100644
--- a/crates/jacquard-api/src/social_showcase/graph/get_blocks.rs
+++ b/crates/jacquard-api/src/social_showcase/graph/get_blocks.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_blocks_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetBlocksBuilder<'a, S: get_blocks_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetBlocks<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetBlocksBuilder<'a, get_blocks_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetBlocksBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -112,12 +115,12 @@ impl<'a> GetBlocksBuilder<'a, get_blocks_state::Empty> {
 impl<'a, S: get_blocks_state::State> GetBlocksBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -125,12 +128,12 @@ impl<'a, S: get_blocks_state::State> GetBlocksBuilder<'a, S> {
 impl<'a, S: get_blocks_state::State> GetBlocksBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -142,8 +145,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetBlocks<'a> {
         GetBlocks {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
+            cursor: self._fields.0,
+            limit: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_showcase/graph/get_followers.rs b/crates/jacquard-api/src/social_showcase/graph/get_followers.rs
index 8567bdc8..3af9978d 100644
--- a/crates/jacquard-api/src/social_showcase/graph/get_followers.rs
+++ b/crates/jacquard-api/src/social_showcase/graph/get_followers.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -102,9 +105,9 @@ pub mod get_followers_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFollowersBuilder<'a, S: get_followers_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFollowers<'a> {
@@ -118,9 +121,9 @@ impl<'a> GetFollowersBuilder<'a, get_followers_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFollowersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -135,11 +138,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetFollowersBuilder<'a, get_followers_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetFollowersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -147,12 +150,12 @@ where
 impl<'a, S: get_followers_state::State> GetFollowersBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -160,12 +163,12 @@ impl<'a, S: get_followers_state::State> GetFollowersBuilder<'a, S> {
 impl<'a, S: get_followers_state::State> GetFollowersBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -178,9 +181,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFollowers<'a> {
         GetFollowers {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_showcase/graph/get_following.rs b/crates/jacquard-api/src/social_showcase/graph/get_following.rs
index a6b40917..6dccc48f 100644
--- a/crates/jacquard-api/src/social_showcase/graph/get_following.rs
+++ b/crates/jacquard-api/src/social_showcase/graph/get_following.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -102,9 +105,9 @@ pub mod get_following_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetFollowingBuilder<'a, S: get_following_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetFollowing<'a> {
@@ -118,9 +121,9 @@ impl<'a> GetFollowingBuilder<'a, get_following_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetFollowingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -135,11 +138,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetFollowingBuilder<'a, get_following_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetFollowingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -147,12 +150,12 @@ where
 impl<'a, S: get_following_state::State> GetFollowingBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -160,12 +163,12 @@ impl<'a, S: get_following_state::State> GetFollowingBuilder<'a, S> {
 impl<'a, S: get_following_state::State> GetFollowingBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -178,9 +181,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetFollowing<'a> {
         GetFollowing {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_showcase/library/create_item.rs b/crates/jacquard-api/src/social_showcase/library/create_item.rs
index b1ef2719..970615b1 100644
--- a/crates/jacquard-api/src/social_showcase/library/create_item.rs
+++ b/crates/jacquard-api/src/social_showcase/library/create_item.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::UriValue;
@@ -185,74 +188,74 @@ pub mod create_item_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Visibility;
         type Title;
-        type Tags;
         type Images;
+        type Visibility;
+        type Tags;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Visibility = Unset;
         type Title = Unset;
-        type Tags = Unset;
         type Images = Unset;
-    }
-    ///State transition - sets the `visibility` field to Set
-    pub struct SetVisibility<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetVisibility<S> {}
-    impl<S: State> State for SetVisibility<S> {
-        type Visibility = Set<members::visibility>;
-        type Title = S::Title;
-        type Tags = S::Tags;
-        type Images = S::Images;
+        type Visibility = Unset;
+        type Tags = Unset;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type Visibility = S::Visibility;
         type Title = Set<members::title>;
-        type Tags = S::Tags;
         type Images = S::Images;
-    }
-    ///State transition - sets the `tags` field to Set
-    pub struct SetTags<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTags<S> {}
-    impl<S: State> State for SetTags<S> {
         type Visibility = S::Visibility;
-        type Title = S::Title;
-        type Tags = Set<members::tags>;
-        type Images = S::Images;
+        type Tags = S::Tags;
     }
     ///State transition - sets the `images` field to Set
     pub struct SetImages<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetImages<S> {}
     impl<S: State> State for SetImages<S> {
+        type Title = S::Title;
+        type Images = Set<members::images>;
         type Visibility = S::Visibility;
+        type Tags = S::Tags;
+    }
+    ///State transition - sets the `visibility` field to Set
+    pub struct SetVisibility<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetVisibility<S> {}
+    impl<S: State> State for SetVisibility<S> {
         type Title = S::Title;
+        type Images = S::Images;
+        type Visibility = Set<members::visibility>;
         type Tags = S::Tags;
-        type Images = Set<members::images>;
+    }
+    ///State transition - sets the `tags` field to Set
+    pub struct SetTags<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTags<S> {}
+    impl<S: State> State for SetTags<S> {
+        type Title = S::Title;
+        type Images = S::Images;
+        type Visibility = S::Visibility;
+        type Tags = Set<members::tags>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `visibility` field
-        pub struct visibility(());
         ///Marker type for the `title` field
         pub struct title(());
-        ///Marker type for the `tags` field
-        pub struct tags(());
         ///Marker type for the `images` field
         pub struct images(());
+        ///Marker type for the `visibility` field
+        pub struct visibility(());
+        ///Marker type for the `tags` field
+        pub struct tags(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CreateItemBuilder<'a, S: create_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
@@ -262,7 +265,7 @@ pub struct CreateItemBuilder<'a, S: create_item_state::State> {
         Option<CowStr<'a>>,
         Option<CreateItemVisibility<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CreateItem<'a> {
@@ -276,9 +279,9 @@ impl<'a> CreateItemBuilder<'a, create_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CreateItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -286,12 +289,12 @@ impl<'a> CreateItemBuilder<'a, create_item_state::Empty> {
 impl<'a, S: create_item_state::State> CreateItemBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -299,12 +302,12 @@ impl<'a, S: create_item_state::State> CreateItemBuilder<'a, S> {
 impl<'a, S: create_item_state::State> CreateItemBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -312,12 +315,12 @@ impl<'a, S: create_item_state::State> CreateItemBuilder<'a, S> {
 impl<'a, S: create_item_state::State> CreateItemBuilder<'a, S> {
     /// Set the `externalLink` field (optional)
     pub fn external_link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `externalLink` field to an Option value (optional)
     pub fn maybe_external_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -332,11 +335,11 @@ where
         mut self,
         value: impl Into<Vec<ItemImage<'a>>>,
     ) -> CreateItemBuilder<'a, create_item_state::SetImages<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CreateItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -344,12 +347,12 @@ where
 impl<'a, S: create_item_state::State> CreateItemBuilder<'a, S> {
     /// Set the `metadata` field (optional)
     pub fn metadata(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `metadata` field to an Option value (optional)
     pub fn maybe_metadata(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -364,11 +367,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> CreateItemBuilder<'a, create_item_state::SetTags<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         CreateItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -383,11 +386,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CreateItemBuilder<'a, create_item_state::SetTitle<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         CreateItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -402,11 +405,11 @@ where
         mut self,
         value: impl Into<CreateItemVisibility<'a>>,
     ) -> CreateItemBuilder<'a, create_item_state::SetVisibility<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         CreateItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -414,22 +417,22 @@ where
 impl<'a, S> CreateItemBuilder<'a, S>
 where
     S: create_item_state::State,
-    S::Visibility: create_item_state::IsSet,
     S::Title: create_item_state::IsSet,
-    S::Tags: create_item_state::IsSet,
     S::Images: create_item_state::IsSet,
+    S::Visibility: create_item_state::IsSet,
+    S::Tags: create_item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CreateItem<'a> {
         CreateItem {
-            category: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            external_link: self.__unsafe_private_named.2,
-            images: self.__unsafe_private_named.3.unwrap(),
-            metadata: self.__unsafe_private_named.4,
-            tags: self.__unsafe_private_named.5.unwrap(),
-            title: self.__unsafe_private_named.6.unwrap(),
-            visibility: self.__unsafe_private_named.7.unwrap(),
+            category: self._fields.0,
+            description: self._fields.1,
+            external_link: self._fields.2,
+            images: self._fields.3.unwrap(),
+            metadata: self._fields.4,
+            tags: self._fields.5.unwrap(),
+            title: self._fields.6.unwrap(),
+            visibility: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -439,14 +442,14 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> CreateItem<'a> {
         CreateItem {
-            category: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            external_link: self.__unsafe_private_named.2,
-            images: self.__unsafe_private_named.3.unwrap(),
-            metadata: self.__unsafe_private_named.4,
-            tags: self.__unsafe_private_named.5.unwrap(),
-            title: self.__unsafe_private_named.6.unwrap(),
-            visibility: self.__unsafe_private_named.7.unwrap(),
+            category: self._fields.0,
+            description: self._fields.1,
+            external_link: self._fields.2,
+            images: self._fields.3.unwrap(),
+            metadata: self._fields.4,
+            tags: self._fields.5.unwrap(),
+            title: self._fields.6.unwrap(),
+            visibility: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_showcase/library/delete_item.rs b/crates/jacquard-api/src/social_showcase/library/delete_item.rs
index 1c7484cc..6e9e87d7 100644
--- a/crates/jacquard-api/src/social_showcase/library/delete_item.rs
+++ b/crates/jacquard-api/src/social_showcase/library/delete_item.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::deps::bytes::Bytes;
 use jacquard_common::types::string::AtUri;
@@ -90,9 +93,9 @@ pub mod delete_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeleteItemBuilder<'a, S: delete_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeleteItem<'a> {
@@ -106,9 +109,9 @@ impl<'a> DeleteItemBuilder<'a, delete_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -123,11 +126,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> DeleteItemBuilder<'a, delete_item_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeleteItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -140,7 +143,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DeleteItem<'a> {
         DeleteItem {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -153,7 +156,7 @@ where
         >,
     ) -> DeleteItem<'a> {
         DeleteItem {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_showcase/library/get_item.rs b/crates/jacquard-api/src/social_showcase/library/get_item.rs
index d667c819..006fe241 100644
--- a/crates/jacquard-api/src/social_showcase/library/get_item.rs
+++ b/crates/jacquard-api/src/social_showcase/library/get_item.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetItemBuilder<'a, S: get_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetItem<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetItemBuilder<'a, get_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetItemBuilder<'a, get_item_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetItem<'a> {
         GetItem {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_showcase/library/item.rs b/crates/jacquard-api/src/social_showcase/library/item.rs
index 2528c524..aaaf4410 100644
--- a/crates/jacquard-api/src/social_showcase/library/item.rs
+++ b/crates/jacquard-api/src/social_showcase/library/item.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -320,8 +323,8 @@ pub mod item_state {
         type Images;
         type Visibility;
         type CreatedAt;
-        type Title;
         type Tags;
+        type Title;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
@@ -330,8 +333,8 @@ pub mod item_state {
         type Images = Unset;
         type Visibility = Unset;
         type CreatedAt = Unset;
-        type Title = Unset;
         type Tags = Unset;
+        type Title = Unset;
     }
     ///State transition - sets the `images` field to Set
     pub struct SetImages<S: State = Empty>(PhantomData<fn() -> S>);
@@ -340,8 +343,8 @@ pub mod item_state {
         type Images = Set<members::images>;
         type Visibility = S::Visibility;
         type CreatedAt = S::CreatedAt;
-        type Title = S::Title;
         type Tags = S::Tags;
+        type Title = S::Title;
     }
     ///State transition - sets the `visibility` field to Set
     pub struct SetVisibility<S: State = Empty>(PhantomData<fn() -> S>);
@@ -350,8 +353,8 @@ pub mod item_state {
         type Images = S::Images;
         type Visibility = Set<members::visibility>;
         type CreatedAt = S::CreatedAt;
-        type Title = S::Title;
         type Tags = S::Tags;
+        type Title = S::Title;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
@@ -360,18 +363,8 @@ pub mod item_state {
         type Images = S::Images;
         type Visibility = S::Visibility;
         type CreatedAt = Set<members::created_at>;
-        type Title = S::Title;
-        type Tags = S::Tags;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Images = S::Images;
-        type Visibility = S::Visibility;
-        type CreatedAt = S::CreatedAt;
-        type Title = Set<members::title>;
         type Tags = S::Tags;
+        type Title = S::Title;
     }
     ///State transition - sets the `tags` field to Set
     pub struct SetTags<S: State = Empty>(PhantomData<fn() -> S>);
@@ -380,8 +373,18 @@ pub mod item_state {
         type Images = S::Images;
         type Visibility = S::Visibility;
         type CreatedAt = S::CreatedAt;
-        type Title = S::Title;
         type Tags = Set<members::tags>;
+        type Title = S::Title;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type Images = S::Images;
+        type Visibility = S::Visibility;
+        type CreatedAt = S::CreatedAt;
+        type Tags = S::Tags;
+        type Title = Set<members::title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
@@ -392,17 +395,17 @@ pub mod item_state {
         pub struct visibility(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `title` field
-        pub struct title(());
         ///Marker type for the `tags` field
         pub struct tags(());
+        ///Marker type for the `title` field
+        pub struct title(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ItemBuilder<'a, S: item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -416,7 +419,7 @@ pub struct ItemBuilder<'a, S: item_state::State> {
         Option<Datetime>,
         Option<ItemVisibility<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Item<'a> {
@@ -430,8 +433,8 @@ impl<'a> ItemBuilder<'a, item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -445,7 +448,7 @@ impl<'a> ItemBuilder<'a, item_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -453,12 +456,12 @@ impl<'a> ItemBuilder<'a, item_state::Empty> {
 impl<'a, S: item_state::State> ItemBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -473,11 +476,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ItemBuilder<'a, item_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -485,12 +488,12 @@ where
 impl<'a, S: item_state::State> ItemBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -498,12 +501,12 @@ impl<'a, S: item_state::State> ItemBuilder<'a, S> {
 impl<'a, S: item_state::State> ItemBuilder<'a, S> {
     /// Set the `externalLink` field (optional)
     pub fn external_link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `externalLink` field to an Option value (optional)
     pub fn maybe_external_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -518,11 +521,11 @@ where
         mut self,
         value: impl Into<Vec<ItemImage<'a>>>,
     ) -> ItemBuilder<'a, item_state::SetImages<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -530,12 +533,12 @@ where
 impl<'a, S: item_state::State> ItemBuilder<'a, S> {
     /// Set the `metadata` field (optional)
     pub fn metadata(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `metadata` field to an Option value (optional)
     pub fn maybe_metadata(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -543,12 +546,12 @@ impl<'a, S: item_state::State> ItemBuilder<'a, S> {
 impl<'a, S: item_state::State> ItemBuilder<'a, S> {
     /// Set the `notes` field (optional)
     pub fn notes(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `notes` field to an Option value (optional)
     pub fn maybe_notes(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -556,12 +559,12 @@ impl<'a, S: item_state::State> ItemBuilder<'a, S> {
 impl<'a, S: item_state::State> ItemBuilder<'a, S> {
     /// Set the `schemaVersion` field (optional)
     pub fn schema_version(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `schemaVersion` field to an Option value (optional)
     pub fn maybe_schema_version(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -576,11 +579,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> ItemBuilder<'a, item_state::SetTags<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         ItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -595,11 +598,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ItemBuilder<'a, item_state::SetTitle<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -607,12 +610,12 @@ where
 impl<'a, S: item_state::State> ItemBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -627,11 +630,11 @@ where
         mut self,
         value: impl Into<ItemVisibility<'a>>,
     ) -> ItemBuilder<'a, item_state::SetVisibility<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         ItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -642,24 +645,24 @@ where
     S::Images: item_state::IsSet,
     S::Visibility: item_state::IsSet,
     S::CreatedAt: item_state::IsSet,
-    S::Title: item_state::IsSet,
     S::Tags: item_state::IsSet,
+    S::Title: item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Item<'a> {
         Item {
-            category: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            external_link: self.__unsafe_private_named.3,
-            images: self.__unsafe_private_named.4.unwrap(),
-            metadata: self.__unsafe_private_named.5,
-            notes: self.__unsafe_private_named.6,
-            schema_version: self.__unsafe_private_named.7.or_else(|| Some(1i64)),
-            tags: self.__unsafe_private_named.8.unwrap(),
-            title: self.__unsafe_private_named.9.unwrap(),
-            updated_at: self.__unsafe_private_named.10,
-            visibility: self.__unsafe_private_named.11.unwrap(),
+            category: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            external_link: self._fields.3,
+            images: self._fields.4.unwrap(),
+            metadata: self._fields.5,
+            notes: self._fields.6,
+            schema_version: self._fields.7.or_else(|| Some(1i64)),
+            tags: self._fields.8.unwrap(),
+            title: self._fields.9.unwrap(),
+            updated_at: self._fields.10,
+            visibility: self._fields.11.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -669,18 +672,18 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Item<'a> {
         Item {
-            category: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            external_link: self.__unsafe_private_named.3,
-            images: self.__unsafe_private_named.4.unwrap(),
-            metadata: self.__unsafe_private_named.5,
-            notes: self.__unsafe_private_named.6,
-            schema_version: self.__unsafe_private_named.7.or_else(|| Some(1i64)),
-            tags: self.__unsafe_private_named.8.unwrap(),
-            title: self.__unsafe_private_named.9.unwrap(),
-            updated_at: self.__unsafe_private_named.10,
-            visibility: self.__unsafe_private_named.11.unwrap(),
+            category: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            description: self._fields.2,
+            external_link: self._fields.3,
+            images: self._fields.4.unwrap(),
+            metadata: self._fields.5,
+            notes: self._fields.6,
+            schema_version: self._fields.7.or_else(|| Some(1i64)),
+            tags: self._fields.8.unwrap(),
+            title: self._fields.9.unwrap(),
+            updated_at: self._fields.10,
+            visibility: self._fields.11.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_showcase/library/list_items.rs b/crates/jacquard-api/src/social_showcase/library/list_items.rs
index a5a2696a..9b4b1c06 100644
--- a/crates/jacquard-api/src/social_showcase/library/list_items.rs
+++ b/crates/jacquard-api/src/social_showcase/library/list_items.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::ident::AtIdentifier;
@@ -102,9 +105,9 @@ pub mod list_items_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListItemsBuilder<'a, S: list_items_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListItems<'a> {
@@ -118,9 +121,9 @@ impl<'a> ListItemsBuilder<'a, list_items_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListItemsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -135,11 +138,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> ListItemsBuilder<'a, list_items_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ListItemsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -147,12 +150,12 @@ where
 impl<'a, S: list_items_state::State> ListItemsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -160,12 +163,12 @@ impl<'a, S: list_items_state::State> ListItemsBuilder<'a, S> {
 impl<'a, S: list_items_state::State> ListItemsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -178,9 +181,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ListItems<'a> {
         ListItems {
-            actor: self.__unsafe_private_named.0.unwrap(),
-            cursor: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
+            actor: self._fields.0.unwrap(),
+            cursor: self._fields.1,
+            limit: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_showcase/library/update_item.rs b/crates/jacquard-api/src/social_showcase/library/update_item.rs
index 6ba2b123..51da5ef6 100644
--- a/crates/jacquard-api/src/social_showcase/library/update_item.rs
+++ b/crates/jacquard-api/src/social_showcase/library/update_item.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{AtUri, UriValue};
@@ -216,8 +219,8 @@ pub mod update_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct UpdateItemBuilder<'a, S: update_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
@@ -228,7 +231,7 @@ pub struct UpdateItemBuilder<'a, S: update_item_state::State> {
         Option<AtUri<'a>>,
         Option<UpdateItemVisibility<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateItem<'a> {
@@ -242,19 +245,9 @@ impl<'a> UpdateItemBuilder<'a, update_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -262,12 +255,12 @@ impl<'a> UpdateItemBuilder<'a, update_item_state::Empty> {
 impl<'a, S: update_item_state::State> UpdateItemBuilder<'a, S> {
     /// Set the `category` field (optional)
     pub fn category(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `category` field to an Option value (optional)
     pub fn maybe_category(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -275,12 +268,12 @@ impl<'a, S: update_item_state::State> UpdateItemBuilder<'a, S> {
 impl<'a, S: update_item_state::State> UpdateItemBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -288,12 +281,12 @@ impl<'a, S: update_item_state::State> UpdateItemBuilder<'a, S> {
 impl<'a, S: update_item_state::State> UpdateItemBuilder<'a, S> {
     /// Set the `externalLink` field (optional)
     pub fn external_link(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `externalLink` field to an Option value (optional)
     pub fn maybe_external_link(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -301,12 +294,12 @@ impl<'a, S: update_item_state::State> UpdateItemBuilder<'a, S> {
 impl<'a, S: update_item_state::State> UpdateItemBuilder<'a, S> {
     /// Set the `images` field (optional)
     pub fn images(mut self, value: impl Into<Option<Vec<ItemImage<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `images` field to an Option value (optional)
     pub fn maybe_images(mut self, value: Option<Vec<ItemImage<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -314,12 +307,12 @@ impl<'a, S: update_item_state::State> UpdateItemBuilder<'a, S> {
 impl<'a, S: update_item_state::State> UpdateItemBuilder<'a, S> {
     /// Set the `metadata` field (optional)
     pub fn metadata(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `metadata` field to an Option value (optional)
     pub fn maybe_metadata(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -327,12 +320,12 @@ impl<'a, S: update_item_state::State> UpdateItemBuilder<'a, S> {
 impl<'a, S: update_item_state::State> UpdateItemBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -340,12 +333,12 @@ impl<'a, S: update_item_state::State> UpdateItemBuilder<'a, S> {
 impl<'a, S: update_item_state::State> UpdateItemBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -360,11 +353,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> UpdateItemBuilder<'a, update_item_state::SetUri<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         UpdateItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -375,12 +368,12 @@ impl<'a, S: update_item_state::State> UpdateItemBuilder<'a, S> {
         mut self,
         value: impl Into<Option<UpdateItemVisibility<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `visibility` field to an Option value (optional)
     pub fn maybe_visibility(mut self, value: Option<UpdateItemVisibility<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -393,15 +386,15 @@ where
     /// Build the final struct
     pub fn build(self) -> UpdateItem<'a> {
         UpdateItem {
-            category: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            external_link: self.__unsafe_private_named.2,
-            images: self.__unsafe_private_named.3,
-            metadata: self.__unsafe_private_named.4,
-            tags: self.__unsafe_private_named.5,
-            title: self.__unsafe_private_named.6,
-            uri: self.__unsafe_private_named.7.unwrap(),
-            visibility: self.__unsafe_private_named.8,
+            category: self._fields.0,
+            description: self._fields.1,
+            external_link: self._fields.2,
+            images: self._fields.3,
+            metadata: self._fields.4,
+            tags: self._fields.5,
+            title: self._fields.6,
+            uri: self._fields.7.unwrap(),
+            visibility: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -411,15 +404,15 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> UpdateItem<'a> {
         UpdateItem {
-            category: self.__unsafe_private_named.0,
-            description: self.__unsafe_private_named.1,
-            external_link: self.__unsafe_private_named.2,
-            images: self.__unsafe_private_named.3,
-            metadata: self.__unsafe_private_named.4,
-            tags: self.__unsafe_private_named.5,
-            title: self.__unsafe_private_named.6,
-            uri: self.__unsafe_private_named.7.unwrap(),
-            visibility: self.__unsafe_private_named.8,
+            category: self._fields.0,
+            description: self._fields.1,
+            external_link: self._fields.2,
+            images: self._fields.3,
+            metadata: self._fields.4,
+            tags: self._fields.5,
+            title: self._fields.6,
+            uri: self._fields.7.unwrap(),
+            visibility: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_showcase/profile/get_profile.rs b/crates/jacquard-api/src/social_showcase/profile/get_profile.rs
index 2bdbe469..ef309619 100644
--- a/crates/jacquard-api/src/social_showcase/profile/get_profile.rs
+++ b/crates/jacquard-api/src/social_showcase/profile/get_profile.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_derive::IntoStatic;
@@ -86,9 +87,9 @@ pub mod get_profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetProfileBuilder<'a, S: get_profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetProfile<'a> {
@@ -102,9 +103,9 @@ impl<'a> GetProfileBuilder<'a, get_profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +120,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetProfileBuilder<'a, get_profile_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +137,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetProfile<'a> {
         GetProfile {
-            actor: self.__unsafe_private_named.0.unwrap(),
+            actor: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/social_showcase/profile/preferences.rs b/crates/jacquard-api/src/social_showcase/profile/preferences.rs
index 97120c84..889206e1 100644
--- a/crates/jacquard-api/src/social_showcase/profile/preferences.rs
+++ b/crates/jacquard-api/src/social_showcase/profile/preferences.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -130,8 +133,8 @@ pub mod preferences_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Notifications;
         type UpdatedAt;
+        type Notifications;
         type Visibility;
         type Activity;
         type Privacy;
@@ -140,28 +143,28 @@ pub mod preferences_state {
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Notifications = Unset;
         type UpdatedAt = Unset;
+        type Notifications = Unset;
         type Visibility = Unset;
         type Activity = Unset;
         type Privacy = Unset;
     }
-    ///State transition - sets the `notifications` field to Set
-    pub struct SetNotifications<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetNotifications<S> {}
-    impl<S: State> State for SetNotifications<S> {
-        type Notifications = Set<members::notifications>;
-        type UpdatedAt = S::UpdatedAt;
-        type Visibility = S::Visibility;
-        type Activity = S::Activity;
-        type Privacy = S::Privacy;
-    }
     ///State transition - sets the `updated_at` field to Set
     pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
     impl<S: State> State for SetUpdatedAt<S> {
-        type Notifications = S::Notifications;
         type UpdatedAt = Set<members::updated_at>;
+        type Notifications = S::Notifications;
+        type Visibility = S::Visibility;
+        type Activity = S::Activity;
+        type Privacy = S::Privacy;
+    }
+    ///State transition - sets the `notifications` field to Set
+    pub struct SetNotifications<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetNotifications<S> {}
+    impl<S: State> State for SetNotifications<S> {
+        type UpdatedAt = S::UpdatedAt;
+        type Notifications = Set<members::notifications>;
         type Visibility = S::Visibility;
         type Activity = S::Activity;
         type Privacy = S::Privacy;
@@ -170,8 +173,8 @@ pub mod preferences_state {
     pub struct SetVisibility<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetVisibility<S> {}
     impl<S: State> State for SetVisibility<S> {
-        type Notifications = S::Notifications;
         type UpdatedAt = S::UpdatedAt;
+        type Notifications = S::Notifications;
         type Visibility = Set<members::visibility>;
         type Activity = S::Activity;
         type Privacy = S::Privacy;
@@ -180,8 +183,8 @@ pub mod preferences_state {
     pub struct SetActivity<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetActivity<S> {}
     impl<S: State> State for SetActivity<S> {
-        type Notifications = S::Notifications;
         type UpdatedAt = S::UpdatedAt;
+        type Notifications = S::Notifications;
         type Visibility = S::Visibility;
         type Activity = Set<members::activity>;
         type Privacy = S::Privacy;
@@ -190,8 +193,8 @@ pub mod preferences_state {
     pub struct SetPrivacy<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPrivacy<S> {}
     impl<S: State> State for SetPrivacy<S> {
-        type Notifications = S::Notifications;
         type UpdatedAt = S::UpdatedAt;
+        type Notifications = S::Notifications;
         type Visibility = S::Visibility;
         type Activity = S::Activity;
         type Privacy = Set<members::privacy>;
@@ -199,10 +202,10 @@ pub mod preferences_state {
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `notifications` field
-        pub struct notifications(());
         ///Marker type for the `updated_at` field
         pub struct updated_at(());
+        ///Marker type for the `notifications` field
+        pub struct notifications(());
         ///Marker type for the `visibility` field
         pub struct visibility(());
         ///Marker type for the `activity` field
@@ -214,8 +217,8 @@ pub mod preferences_state {
 
 /// Builder for constructing an instance of this type
 pub struct PreferencesBuilder<'a, S: preferences_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ActivitySettings<'a>>,
         Option<DisplaySettings<'a>>,
         Option<NotificationSettings<'a>>,
@@ -224,7 +227,7 @@ pub struct PreferencesBuilder<'a, S: preferences_state::State> {
         Option<Datetime>,
         Option<VisibilitySettings<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Preferences<'a> {
@@ -238,9 +241,9 @@ impl<'a> PreferencesBuilder<'a, preferences_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -255,11 +258,11 @@ where
         mut self,
         value: impl Into<ActivitySettings<'a>>,
     ) -> PreferencesBuilder<'a, preferences_state::SetActivity<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -267,12 +270,12 @@ where
 impl<'a, S: preferences_state::State> PreferencesBuilder<'a, S> {
     /// Set the `display` field (optional)
     pub fn display(mut self, value: impl Into<Option<DisplaySettings<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `display` field to an Option value (optional)
     pub fn maybe_display(mut self, value: Option<DisplaySettings<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -287,11 +290,11 @@ where
         mut self,
         value: impl Into<NotificationSettings<'a>>,
     ) -> PreferencesBuilder<'a, preferences_state::SetNotifications<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -306,11 +309,11 @@ where
         mut self,
         value: impl Into<PrivacySettings<'a>>,
     ) -> PreferencesBuilder<'a, preferences_state::SetPrivacy<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -318,12 +321,12 @@ where
 impl<'a, S: preferences_state::State> PreferencesBuilder<'a, S> {
     /// Set the `schemaVersion` field (optional)
     pub fn schema_version(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `schemaVersion` field to an Option value (optional)
     pub fn maybe_schema_version(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -338,11 +341,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PreferencesBuilder<'a, preferences_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -357,11 +360,11 @@ where
         mut self,
         value: impl Into<VisibilitySettings<'a>>,
     ) -> PreferencesBuilder<'a, preferences_state::SetVisibility<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         PreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -369,8 +372,8 @@ where
 impl<'a, S> PreferencesBuilder<'a, S>
 where
     S: preferences_state::State,
-    S::Notifications: preferences_state::IsSet,
     S::UpdatedAt: preferences_state::IsSet,
+    S::Notifications: preferences_state::IsSet,
     S::Visibility: preferences_state::IsSet,
     S::Activity: preferences_state::IsSet,
     S::Privacy: preferences_state::IsSet,
@@ -378,13 +381,13 @@ where
     /// Build the final struct
     pub fn build(self) -> Preferences<'a> {
         Preferences {
-            activity: self.__unsafe_private_named.0.unwrap(),
-            display: self.__unsafe_private_named.1,
-            notifications: self.__unsafe_private_named.2.unwrap(),
-            privacy: self.__unsafe_private_named.3.unwrap(),
-            schema_version: self.__unsafe_private_named.4.or_else(|| Some(1i64)),
-            updated_at: self.__unsafe_private_named.5.unwrap(),
-            visibility: self.__unsafe_private_named.6.unwrap(),
+            activity: self._fields.0.unwrap(),
+            display: self._fields.1,
+            notifications: self._fields.2.unwrap(),
+            privacy: self._fields.3.unwrap(),
+            schema_version: self._fields.4.or_else(|| Some(1i64)),
+            updated_at: self._fields.5.unwrap(),
+            visibility: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -397,13 +400,13 @@ where
         >,
     ) -> Preferences<'a> {
         Preferences {
-            activity: self.__unsafe_private_named.0.unwrap(),
-            display: self.__unsafe_private_named.1,
-            notifications: self.__unsafe_private_named.2.unwrap(),
-            privacy: self.__unsafe_private_named.3.unwrap(),
-            schema_version: self.__unsafe_private_named.4.or_else(|| Some(1i64)),
-            updated_at: self.__unsafe_private_named.5.unwrap(),
-            visibility: self.__unsafe_private_named.6.unwrap(),
+            activity: self._fields.0.unwrap(),
+            display: self._fields.1,
+            notifications: self._fields.2.unwrap(),
+            privacy: self._fields.3.unwrap(),
+            schema_version: self._fields.4.or_else(|| Some(1i64)),
+            updated_at: self._fields.5.unwrap(),
+            visibility: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_showcase/profile/profile.rs b/crates/jacquard-api/src/social_showcase/profile/profile.rs
index 101c2514..b45a4cad 100644
--- a/crates/jacquard-api/src/social_showcase/profile/profile.rs
+++ b/crates/jacquard-api/src/social_showcase/profile/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -350,74 +353,74 @@ pub mod profile_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Did;
-        type Tags;
         type Handle;
+        type Did;
         type CreatedAt;
+        type Tags;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Did = Unset;
-        type Tags = Unset;
         type Handle = Unset;
+        type Did = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Did = Set<members::did>;
-        type Tags = S::Tags;
-        type Handle = S::Handle;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `tags` field to Set
-    pub struct SetTags<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTags<S> {}
-    impl<S: State> State for SetTags<S> {
-        type Did = S::Did;
-        type Tags = Set<members::tags>;
-        type Handle = S::Handle;
-        type CreatedAt = S::CreatedAt;
+        type Tags = Unset;
     }
     ///State transition - sets the `handle` field to Set
     pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHandle<S> {}
     impl<S: State> State for SetHandle<S> {
+        type Handle = Set<members::handle>;
         type Did = S::Did;
+        type CreatedAt = S::CreatedAt;
         type Tags = S::Tags;
-        type Handle = Set<members::handle>;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Handle = S::Handle;
+        type Did = Set<members::did>;
         type CreatedAt = S::CreatedAt;
+        type Tags = S::Tags;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Handle = S::Handle;
         type Did = S::Did;
+        type CreatedAt = Set<members::created_at>;
         type Tags = S::Tags;
+    }
+    ///State transition - sets the `tags` field to Set
+    pub struct SetTags<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTags<S> {}
+    impl<S: State> State for SetTags<S> {
         type Handle = S::Handle;
-        type CreatedAt = Set<members::created_at>;
+        type Did = S::Did;
+        type CreatedAt = S::CreatedAt;
+        type Tags = Set<members::tags>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `did` field
-        pub struct did(());
-        ///Marker type for the `tags` field
-        pub struct tags(());
         ///Marker type for the `handle` field
         pub struct handle(());
+        ///Marker type for the `did` field
+        pub struct did(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `tags` field
+        pub struct tags(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
         Option<BlobRef<'a>>,
@@ -435,7 +438,7 @@ pub struct ProfileBuilder<'a, S: profile_state::State> {
         Option<Datetime>,
         Option<UriValue<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -449,8 +452,8 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -468,7 +471,7 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -476,12 +479,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `accentColor` field (optional)
     pub fn accent_color(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `accentColor` field to an Option value (optional)
     pub fn maybe_accent_color(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -489,12 +492,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -502,12 +505,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -515,12 +518,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `bio` field (optional)
     pub fn bio(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `bio` field to an Option value (optional)
     pub fn maybe_bio(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -528,12 +531,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `collectionCount` field (optional)
     pub fn collection_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `collectionCount` field to an Option value (optional)
     pub fn maybe_collection_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -548,11 +551,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ProfileBuilder<'a, profile_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -567,11 +570,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProfileBuilder<'a, profile_state::SetDid<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -579,12 +582,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -599,11 +602,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProfileBuilder<'a, profile_state::SetHandle<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -611,12 +614,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `itemCount` field (optional)
     pub fn item_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `itemCount` field to an Option value (optional)
     pub fn maybe_item_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -624,12 +627,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `schemaVersion` field (optional)
     pub fn schema_version(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `schemaVersion` field to an Option value (optional)
     pub fn maybe_schema_version(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -637,12 +640,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `showcase` field (optional)
     pub fn showcase(mut self, value: impl Into<Option<Vec<ShowcaseItem<'a>>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `showcase` field to an Option value (optional)
     pub fn maybe_showcase(mut self, value: Option<Vec<ShowcaseItem<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -657,11 +660,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> ProfileBuilder<'a, profile_state::SetTags<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -669,12 +672,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `theme` field (optional)
     pub fn theme(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `theme` field to an Option value (optional)
     pub fn maybe_theme(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -682,12 +685,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -695,12 +698,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `website` field (optional)
     pub fn website(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `website` field to an Option value (optional)
     pub fn maybe_website(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -708,30 +711,30 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S> ProfileBuilder<'a, S>
 where
     S: profile_state::State,
-    S::Did: profile_state::IsSet,
-    S::Tags: profile_state::IsSet,
     S::Handle: profile_state::IsSet,
+    S::Did: profile_state::IsSet,
     S::CreatedAt: profile_state::IsSet,
+    S::Tags: profile_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            accent_color: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            banner: self.__unsafe_private_named.2,
-            bio: self.__unsafe_private_named.3,
-            collection_count: self.__unsafe_private_named.4.or_else(|| Some(0i64)),
-            created_at: self.__unsafe_private_named.5.unwrap(),
-            did: self.__unsafe_private_named.6.unwrap(),
-            display_name: self.__unsafe_private_named.7,
-            handle: self.__unsafe_private_named.8.unwrap(),
-            item_count: self.__unsafe_private_named.9.or_else(|| Some(0i64)),
-            schema_version: self.__unsafe_private_named.10.or_else(|| Some(1i64)),
-            showcase: self.__unsafe_private_named.11,
-            tags: self.__unsafe_private_named.12.unwrap(),
-            theme: self.__unsafe_private_named.13,
-            updated_at: self.__unsafe_private_named.14,
-            website: self.__unsafe_private_named.15,
+            accent_color: self._fields.0,
+            avatar: self._fields.1,
+            banner: self._fields.2,
+            bio: self._fields.3,
+            collection_count: self._fields.4.or_else(|| Some(0i64)),
+            created_at: self._fields.5.unwrap(),
+            did: self._fields.6.unwrap(),
+            display_name: self._fields.7,
+            handle: self._fields.8.unwrap(),
+            item_count: self._fields.9.or_else(|| Some(0i64)),
+            schema_version: self._fields.10.or_else(|| Some(1i64)),
+            showcase: self._fields.11,
+            tags: self._fields.12.unwrap(),
+            theme: self._fields.13,
+            updated_at: self._fields.14,
+            website: self._fields.15,
             extra_data: Default::default(),
         }
     }
@@ -744,22 +747,22 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            accent_color: self.__unsafe_private_named.0,
-            avatar: self.__unsafe_private_named.1,
-            banner: self.__unsafe_private_named.2,
-            bio: self.__unsafe_private_named.3,
-            collection_count: self.__unsafe_private_named.4.or_else(|| Some(0i64)),
-            created_at: self.__unsafe_private_named.5.unwrap(),
-            did: self.__unsafe_private_named.6.unwrap(),
-            display_name: self.__unsafe_private_named.7,
-            handle: self.__unsafe_private_named.8.unwrap(),
-            item_count: self.__unsafe_private_named.9.or_else(|| Some(0i64)),
-            schema_version: self.__unsafe_private_named.10.or_else(|| Some(1i64)),
-            showcase: self.__unsafe_private_named.11,
-            tags: self.__unsafe_private_named.12.unwrap(),
-            theme: self.__unsafe_private_named.13,
-            updated_at: self.__unsafe_private_named.14,
-            website: self.__unsafe_private_named.15,
+            accent_color: self._fields.0,
+            avatar: self._fields.1,
+            banner: self._fields.2,
+            bio: self._fields.3,
+            collection_count: self._fields.4.or_else(|| Some(0i64)),
+            created_at: self._fields.5.unwrap(),
+            did: self._fields.6.unwrap(),
+            display_name: self._fields.7,
+            handle: self._fields.8.unwrap(),
+            item_count: self._fields.9.or_else(|| Some(0i64)),
+            schema_version: self._fields.10.or_else(|| Some(1i64)),
+            showcase: self._fields.11,
+            tags: self._fields.12.unwrap(),
+            theme: self._fields.13,
+            updated_at: self._fields.14,
+            website: self._fields.15,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_showcase/profile/update_profile.rs b/crates/jacquard-api/src/social_showcase/profile/update_profile.rs
index 50ac2a46..7fcfcc22 100644
--- a/crates/jacquard-api/src/social_showcase/profile/update_profile.rs
+++ b/crates/jacquard-api/src/social_showcase/profile/update_profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::blob::BlobRef;
diff --git a/crates/jacquard-api/src/social_sket/actor/profile.rs b/crates/jacquard-api/src/social_sket/actor/profile.rs
index 38c8ff17..f4b5f430 100644
--- a/crates/jacquard-api/src/social_sket/actor/profile.rs
+++ b/crates/jacquard-api/src/social_sket/actor/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -258,15 +261,15 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<BlobRef<'a>>,
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -280,9 +283,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -290,12 +293,12 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `avatar` field (optional)
     pub fn avatar(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `avatar` field to an Option value (optional)
     pub fn maybe_avatar(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -303,12 +306,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `banner` field (optional)
     pub fn banner(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `banner` field to an Option value (optional)
     pub fn maybe_banner(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -316,12 +319,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -329,12 +332,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -342,12 +345,12 @@ impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `displayName` field (optional)
     pub fn display_name(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `displayName` field to an Option value (optional)
     pub fn maybe_display_name(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -359,11 +362,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            created_at: self._fields.2,
+            description: self._fields.3,
+            display_name: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -376,11 +379,11 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            avatar: self.__unsafe_private_named.0,
-            banner: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2,
-            description: self.__unsafe_private_named.3,
-            display_name: self.__unsafe_private_named.4,
+            avatar: self._fields.0,
+            banner: self._fields.1,
+            created_at: self._fields.2,
+            description: self._fields.3,
+            display_name: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/social_tophhie/profile.rs b/crates/jacquard-api/src/social_tophhie/profile.rs
index fc8593c8..4ba5baf4 100644
--- a/crates/jacquard-api/src/social_tophhie/profile.rs
+++ b/crates/jacquard-api/src/social_tophhie/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -195,9 +198,9 @@ pub struct CommunicationPreferencesBuilder<
     'a,
     S: communication_preferences_state::State,
 > {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CommunicationPreferences<'a> {
@@ -214,9 +217,9 @@ impl<'a> CommunicationPreferencesBuilder<'a, communication_preferences_state::Em
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommunicationPreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         'a,
         communication_preferences_state::SetMarketing<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommunicationPreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -251,7 +254,7 @@ where
     /// Build the final struct
     pub fn build(self) -> CommunicationPreferences<'a> {
         CommunicationPreferences {
-            marketing: self.__unsafe_private_named.0.unwrap(),
+            marketing: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -264,7 +267,7 @@ where
         >,
     ) -> CommunicationPreferences<'a> {
         CommunicationPreferences {
-            marketing: self.__unsafe_private_named.0.unwrap(),
+            marketing: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -411,63 +414,63 @@ pub mod profile_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type CreatedAt;
-        type PdsPreferences;
         type CommunicationPreferences;
+        type PdsPreferences;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type CreatedAt = Unset;
-        type PdsPreferences = Unset;
         type CommunicationPreferences = Unset;
+        type PdsPreferences = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type CreatedAt = Set<members::created_at>;
-        type PdsPreferences = S::PdsPreferences;
-        type CommunicationPreferences = S::CommunicationPreferences;
-    }
-    ///State transition - sets the `pds_preferences` field to Set
-    pub struct SetPdsPreferences<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPdsPreferences<S> {}
-    impl<S: State> State for SetPdsPreferences<S> {
-        type CreatedAt = S::CreatedAt;
-        type PdsPreferences = Set<members::pds_preferences>;
         type CommunicationPreferences = S::CommunicationPreferences;
+        type PdsPreferences = S::PdsPreferences;
     }
     ///State transition - sets the `communication_preferences` field to Set
     pub struct SetCommunicationPreferences<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCommunicationPreferences<S> {}
     impl<S: State> State for SetCommunicationPreferences<S> {
         type CreatedAt = S::CreatedAt;
-        type PdsPreferences = S::PdsPreferences;
         type CommunicationPreferences = Set<members::communication_preferences>;
+        type PdsPreferences = S::PdsPreferences;
+    }
+    ///State transition - sets the `pds_preferences` field to Set
+    pub struct SetPdsPreferences<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPdsPreferences<S> {}
+    impl<S: State> State for SetPdsPreferences<S> {
+        type CreatedAt = S::CreatedAt;
+        type CommunicationPreferences = S::CommunicationPreferences;
+        type PdsPreferences = Set<members::pds_preferences>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `pds_preferences` field
-        pub struct pds_preferences(());
         ///Marker type for the `communication_preferences` field
         pub struct communication_preferences(());
+        ///Marker type for the `pds_preferences` field
+        pub struct pds_preferences(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<profile::CommunicationPreferences<'a>>,
         Option<Datetime>,
         Option<profile::PdsPreferences<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -481,9 +484,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -498,11 +501,11 @@ where
         mut self,
         value: impl Into<profile::CommunicationPreferences<'a>>,
     ) -> ProfileBuilder<'a, profile_state::SetCommunicationPreferences<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -517,11 +520,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ProfileBuilder<'a, profile_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -536,11 +539,11 @@ where
         mut self,
         value: impl Into<profile::PdsPreferences<'a>>,
     ) -> ProfileBuilder<'a, profile_state::SetPdsPreferences<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -548,12 +551,12 @@ where
 impl<'a, S: profile_state::State> ProfileBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -562,16 +565,16 @@ impl<'a, S> ProfileBuilder<'a, S>
 where
     S: profile_state::State,
     S::CreatedAt: profile_state::IsSet,
-    S::PdsPreferences: profile_state::IsSet,
     S::CommunicationPreferences: profile_state::IsSet,
+    S::PdsPreferences: profile_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            communication_preferences: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            pds_preferences: self.__unsafe_private_named.2.unwrap(),
-            updated_at: self.__unsafe_private_named.3,
+            communication_preferences: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            pds_preferences: self._fields.2.unwrap(),
+            updated_at: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -584,10 +587,10 @@ where
         >,
     ) -> Profile<'a> {
         Profile {
-            communication_preferences: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            pds_preferences: self.__unsafe_private_named.2.unwrap(),
-            updated_at: self.__unsafe_private_named.3,
+            communication_preferences: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            pds_preferences: self._fields.2.unwrap(),
+            updated_at: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
@@ -639,9 +642,9 @@ pub mod pds_preferences_state {
 
 /// Builder for constructing an instance of this type
 pub struct PdsPreferencesBuilder<'a, S: pds_preferences_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<bool>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PdsPreferences<'a> {
@@ -655,9 +658,9 @@ impl<'a> PdsPreferencesBuilder<'a, pds_preferences_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PdsPreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -672,11 +675,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> PdsPreferencesBuilder<'a, pds_preferences_state::SetAccessibilityScoring<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PdsPreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -691,11 +694,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> PdsPreferencesBuilder<'a, pds_preferences_state::SetShowOnHomepage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PdsPreferencesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -709,8 +712,8 @@ where
     /// Build the final struct
     pub fn build(self) -> PdsPreferences<'a> {
         PdsPreferences {
-            accessibility_scoring: self.__unsafe_private_named.0.unwrap(),
-            show_on_homepage: self.__unsafe_private_named.1.unwrap(),
+            accessibility_scoring: self._fields.0.unwrap(),
+            show_on_homepage: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -723,8 +726,8 @@ where
         >,
     ) -> PdsPreferences<'a> {
         PdsPreferences {
-            accessibility_scoring: self.__unsafe_private_named.0.unwrap(),
-            show_on_homepage: self.__unsafe_private_named.1.unwrap(),
+            accessibility_scoring: self._fields.0.unwrap(),
+            show_on_homepage: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/space_litenote/note.rs b/crates/jacquard-api/src/space_litenote/note.rs
index a6ed4cdb..064863de 100644
--- a/crates/jacquard-api/src/space_litenote/note.rs
+++ b/crates/jacquard-api/src/space_litenote/note.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -365,9 +368,9 @@ pub mod image_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImageBuilder<'a, S: image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<BlobRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<BlobRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Image<'a> {
@@ -381,9 +384,9 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -391,12 +394,12 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -411,11 +414,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ImageBuilder<'a, image_state::SetImage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -428,8 +431,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0,
-            image: self.__unsafe_private_named.1.unwrap(),
+            alt: self._fields.0,
+            image: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -442,8 +445,8 @@ where
         >,
     ) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0,
-            image: self.__unsafe_private_named.1.unwrap(),
+            alt: self._fields.0,
+            image: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -638,8 +641,8 @@ pub mod note_state {
 
 /// Builder for constructing an instance of this type
 pub struct NoteBuilder<'a, S: note_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -649,7 +652,7 @@ pub struct NoteBuilder<'a, S: note_state::State> {
         Option<NoteTheme<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Note<'a> {
@@ -663,9 +666,9 @@ impl<'a> NoteBuilder<'a, note_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -680,11 +683,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> NoteBuilder<'a, note_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -692,12 +695,12 @@ where
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -705,12 +708,12 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `fontFamily` field (optional)
     pub fn font_family(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `fontFamily` field to an Option value (optional)
     pub fn maybe_font_family(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -718,12 +721,12 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `fontSize` field (optional)
     pub fn font_size(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `fontSize` field to an Option value (optional)
     pub fn maybe_font_size(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -731,12 +734,12 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `images` field (optional)
     pub fn images(mut self, value: impl Into<Option<Vec<note::Image<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `images` field to an Option value (optional)
     pub fn maybe_images(mut self, value: Option<Vec<note::Image<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -744,12 +747,12 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `publishedAt` field (optional)
     pub fn published_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `publishedAt` field to an Option value (optional)
     pub fn maybe_published_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -757,12 +760,12 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `theme` field (optional)
     pub fn theme(mut self, value: impl Into<Option<NoteTheme<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `theme` field to an Option value (optional)
     pub fn maybe_theme(mut self, value: Option<NoteTheme<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -777,11 +780,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> NoteBuilder<'a, note_state::SetTitle<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -795,14 +798,14 @@ where
     /// Build the final struct
     pub fn build(self) -> Note<'a> {
         Note {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1,
-            font_family: self.__unsafe_private_named.2,
-            font_size: self.__unsafe_private_named.3,
-            images: self.__unsafe_private_named.4,
-            published_at: self.__unsafe_private_named.5,
-            theme: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7.unwrap(),
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1,
+            font_family: self._fields.2,
+            font_size: self._fields.3,
+            images: self._fields.4,
+            published_at: self._fields.5,
+            theme: self._fields.6,
+            title: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -815,14 +818,14 @@ where
         >,
     ) -> Note<'a> {
         Note {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1,
-            font_family: self.__unsafe_private_named.2,
-            font_size: self.__unsafe_private_named.3,
-            images: self.__unsafe_private_named.4,
-            published_at: self.__unsafe_private_named.5,
-            theme: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7.unwrap(),
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1,
+            font_family: self._fields.2,
+            font_size: self._fields.3,
+            images: self._fields.4,
+            published_at: self._fields.5,
+            theme: self._fields.6,
+            title: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/space_remanso/note.rs b/crates/jacquard-api/src/space_remanso/note.rs
index 1c7fbe6a..00dd8879 100644
--- a/crates/jacquard-api/src/space_remanso/note.rs
+++ b/crates/jacquard-api/src/space_remanso/note.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -712,9 +715,9 @@ pub mod image_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImageBuilder<'a, S: image_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<BlobRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<BlobRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Image<'a> {
@@ -728,9 +731,9 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -738,12 +741,12 @@ impl<'a> ImageBuilder<'a, image_state::Empty> {
 impl<'a, S: image_state::State> ImageBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -758,11 +761,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ImageBuilder<'a, image_state::SetImage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ImageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -775,8 +778,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0,
-            image: self.__unsafe_private_named.1.unwrap(),
+            alt: self._fields.0,
+            image: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -789,8 +792,8 @@ where
         >,
     ) -> Image<'a> {
         Image {
-            alt: self.__unsafe_private_named.0,
-            image: self.__unsafe_private_named.1.unwrap(),
+            alt: self._fields.0,
+            image: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1003,8 +1006,8 @@ pub mod note_state {
 
 /// Builder for constructing an instance of this type
 pub struct NoteBuilder<'a, S: note_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<bool>,
@@ -1016,7 +1019,7 @@ pub struct NoteBuilder<'a, S: note_state::State> {
         Option<NoteTheme<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Note<'a> {
@@ -1030,20 +1033,9 @@ impl<'a> NoteBuilder<'a, note_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1058,11 +1050,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> NoteBuilder<'a, note_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1070,12 +1062,12 @@ where
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1083,12 +1075,12 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `discoverable` field (optional)
     pub fn discoverable(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `discoverable` field to an Option value (optional)
     pub fn maybe_discoverable(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1096,12 +1088,12 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `fontFamily` field (optional)
     pub fn font_family(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `fontFamily` field to an Option value (optional)
     pub fn maybe_font_family(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1109,12 +1101,12 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `fontSize` field (optional)
     pub fn font_size(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `fontSize` field to an Option value (optional)
     pub fn maybe_font_size(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1122,12 +1114,12 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `images` field (optional)
     pub fn images(mut self, value: impl Into<Option<Vec<note::Image<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `images` field to an Option value (optional)
     pub fn maybe_images(mut self, value: Option<Vec<note::Image<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1135,12 +1127,12 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `language` field (optional)
     pub fn language(mut self, value: impl Into<Option<NoteLanguage<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `language` field to an Option value (optional)
     pub fn maybe_language(mut self, value: Option<NoteLanguage<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1148,12 +1140,12 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `publishedAt` field (optional)
     pub fn published_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `publishedAt` field to an Option value (optional)
     pub fn maybe_published_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -1161,12 +1153,12 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `theme` field (optional)
     pub fn theme(mut self, value: impl Into<Option<NoteTheme<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `theme` field to an Option value (optional)
     pub fn maybe_theme(mut self, value: Option<NoteTheme<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -1181,11 +1173,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> NoteBuilder<'a, note_state::SetTitle<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1199,16 +1191,16 @@ where
     /// Build the final struct
     pub fn build(self) -> Note<'a> {
         Note {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1,
-            discoverable: self.__unsafe_private_named.2,
-            font_family: self.__unsafe_private_named.3,
-            font_size: self.__unsafe_private_named.4,
-            images: self.__unsafe_private_named.5,
-            language: self.__unsafe_private_named.6,
-            published_at: self.__unsafe_private_named.7,
-            theme: self.__unsafe_private_named.8,
-            title: self.__unsafe_private_named.9.unwrap(),
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1,
+            discoverable: self._fields.2,
+            font_family: self._fields.3,
+            font_size: self._fields.4,
+            images: self._fields.5,
+            language: self._fields.6,
+            published_at: self._fields.7,
+            theme: self._fields.8,
+            title: self._fields.9.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1221,16 +1213,16 @@ where
         >,
     ) -> Note<'a> {
         Note {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1,
-            discoverable: self.__unsafe_private_named.2,
-            font_family: self.__unsafe_private_named.3,
-            font_size: self.__unsafe_private_named.4,
-            images: self.__unsafe_private_named.5,
-            language: self.__unsafe_private_named.6,
-            published_at: self.__unsafe_private_named.7,
-            theme: self.__unsafe_private_named.8,
-            title: self.__unsafe_private_named.9.unwrap(),
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1,
+            discoverable: self._fields.2,
+            font_family: self._fields.3,
+            font_size: self._fields.4,
+            images: self._fields.5,
+            language: self._fields.6,
+            published_at: self._fields.7,
+            theme: self._fields.8,
+            title: self._fields.9.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/st_lifepo/event.rs b/crates/jacquard-api/src/st_lifepo/event.rs
index 6395faa4..0d8df752 100644
--- a/crates/jacquard-api/src/st_lifepo/event.rs
+++ b/crates/jacquard-api/src/st_lifepo/event.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{AtUri, Datetime};
@@ -74,50 +77,50 @@ pub mod event_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type StartDate;
         type Title;
+        type StartDate;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type StartDate = Unset;
         type Title = Unset;
-    }
-    ///State transition - sets the `start_date` field to Set
-    pub struct SetStartDate<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStartDate<S> {}
-    impl<S: State> State for SetStartDate<S> {
-        type StartDate = Set<members::start_date>;
-        type Title = S::Title;
+        type StartDate = Unset;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTitle<S> {}
     impl<S: State> State for SetTitle<S> {
-        type StartDate = S::StartDate;
         type Title = Set<members::title>;
+        type StartDate = S::StartDate;
+    }
+    ///State transition - sets the `start_date` field to Set
+    pub struct SetStartDate<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStartDate<S> {}
+    impl<S: State> State for SetStartDate<S> {
+        type Title = S::Title;
+        type StartDate = Set<members::start_date>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `start_date` field
-        pub struct start_date(());
         ///Marker type for the `title` field
         pub struct title(());
+        ///Marker type for the `start_date` field
+        pub struct start_date(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EventBuilder<'a, S: event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<Datetime>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Event<'a> {
@@ -131,9 +134,9 @@ impl<'a> EventBuilder<'a, event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -141,12 +144,12 @@ impl<'a> EventBuilder<'a, event_state::Empty> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -154,12 +157,12 @@ impl<'a, S: event_state::State> EventBuilder<'a, S> {
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `endDate` field (optional)
     pub fn end_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `endDate` field to an Option value (optional)
     pub fn maybe_end_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -174,11 +177,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EventBuilder<'a, event_state::SetStartDate<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -193,11 +196,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EventBuilder<'a, event_state::SetTitle<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -205,16 +208,16 @@ where
 impl<'a, S> EventBuilder<'a, S>
 where
     S: event_state::State,
-    S::StartDate: event_state::IsSet,
     S::Title: event_state::IsSet,
+    S::StartDate: event_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Event<'a> {
         Event {
-            description: self.__unsafe_private_named.0,
-            end_date: self.__unsafe_private_named.1,
-            start_date: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0,
+            end_date: self._fields.1,
+            start_date: self._fields.2.unwrap(),
+            title: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -227,10 +230,10 @@ where
         >,
     ) -> Event<'a> {
         Event {
-            description: self.__unsafe_private_named.0,
-            end_date: self.__unsafe_private_named.1,
-            start_date: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0,
+            end_date: self._fields.1,
+            start_date: self._fields.2.unwrap(),
+            title: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/st_lifepo/profile.rs b/crates/jacquard-api/src/st_lifepo/profile.rs
index 59005202..7567fdfa 100644
--- a/crates/jacquard-api/src/st_lifepo/profile.rs
+++ b/crates/jacquard-api/src/st_lifepo/profile.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -106,50 +109,50 @@ pub mod life_event_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Title;
         type StartDate;
+        type Title;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Title = Unset;
         type StartDate = Unset;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Title = Set<members::title>;
-        type StartDate = S::StartDate;
+        type Title = Unset;
     }
     ///State transition - sets the `start_date` field to Set
     pub struct SetStartDate<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStartDate<S> {}
     impl<S: State> State for SetStartDate<S> {
-        type Title = S::Title;
         type StartDate = Set<members::start_date>;
+        type Title = S::Title;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
+        type StartDate = S::StartDate;
+        type Title = Set<members::title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `title` field
-        pub struct title(());
         ///Marker type for the `start_date` field
         pub struct start_date(());
+        ///Marker type for the `title` field
+        pub struct title(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct LifeEventBuilder<'a, S: life_event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<Datetime>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> LifeEvent<'a> {
@@ -163,9 +166,9 @@ impl<'a> LifeEventBuilder<'a, life_event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LifeEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -173,12 +176,12 @@ impl<'a> LifeEventBuilder<'a, life_event_state::Empty> {
 impl<'a, S: life_event_state::State> LifeEventBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -186,12 +189,12 @@ impl<'a, S: life_event_state::State> LifeEventBuilder<'a, S> {
 impl<'a, S: life_event_state::State> LifeEventBuilder<'a, S> {
     /// Set the `endDate` field (optional)
     pub fn end_date(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `endDate` field to an Option value (optional)
     pub fn maybe_end_date(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -206,11 +209,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LifeEventBuilder<'a, life_event_state::SetStartDate<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         LifeEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -225,11 +228,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> LifeEventBuilder<'a, life_event_state::SetTitle<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         LifeEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -237,16 +240,16 @@ where
 impl<'a, S> LifeEventBuilder<'a, S>
 where
     S: life_event_state::State,
-    S::Title: life_event_state::IsSet,
     S::StartDate: life_event_state::IsSet,
+    S::Title: life_event_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> LifeEvent<'a> {
         LifeEvent {
-            description: self.__unsafe_private_named.0,
-            end_date: self.__unsafe_private_named.1,
-            start_date: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0,
+            end_date: self._fields.1,
+            start_date: self._fields.2.unwrap(),
+            title: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -259,10 +262,10 @@ where
         >,
     ) -> LifeEvent<'a> {
         LifeEvent {
-            description: self.__unsafe_private_named.0,
-            end_date: self.__unsafe_private_named.1,
-            start_date: self.__unsafe_private_named.2.unwrap(),
-            title: self.__unsafe_private_named.3.unwrap(),
+            description: self._fields.0,
+            end_date: self._fields.1,
+            start_date: self._fields.2.unwrap(),
+            title: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -384,9 +387,9 @@ pub mod profile_state {
 
 /// Builder for constructing an instance of this type
 pub struct ProfileBuilder<'a, S: profile_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Profile<'a> {
@@ -400,9 +403,9 @@ impl<'a> ProfileBuilder<'a, profile_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -417,11 +420,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ProfileBuilder<'a, profile_state::SetActor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ProfileBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -434,7 +437,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Profile<'a> {
         Profile {
-            actor: self.__unsafe_private_named.0.unwrap(),
+            actor: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/st_snowpo/post.rs b/crates/jacquard-api/src/st_snowpo/post.rs
index 220927e8..3caf53e2 100644
--- a/crates/jacquard-api/src/st_snowpo/post.rs
+++ b/crates/jacquard-api/src/st_snowpo/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -207,15 +210,15 @@ pub mod post_state {
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AtUri<'a>>,
         Option<BlobRef<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -229,9 +232,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,12 +242,12 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `commentRoot` field (optional)
     pub fn comment_root(mut self, value: impl Into<Option<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `commentRoot` field to an Option value (optional)
     pub fn maybe_comment_root(mut self, value: Option<AtUri<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -259,11 +262,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> PostBuilder<'a, post_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -278,11 +281,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -290,12 +293,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `previewText` field (optional)
     pub fn preview_text(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `previewText` field to an Option value (optional)
     pub fn maybe_preview_text(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -303,12 +306,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -322,11 +325,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            comment_root: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            preview_text: self.__unsafe_private_named.3,
-            updated_at: self.__unsafe_private_named.4,
+            comment_root: self._fields.0,
+            content: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            preview_text: self._fields.3,
+            updated_at: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -339,11 +342,11 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            comment_root: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            preview_text: self.__unsafe_private_named.3,
-            updated_at: self.__unsafe_private_named.4,
+            comment_root: self._fields.0,
+            content: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            preview_text: self._fields.3,
+            updated_at: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/store__88x31/button.rs b/crates/jacquard-api/src/store__88x31/button.rs
index 35c01a1d..41564f99 100644
--- a/crates/jacquard-api/src/store__88x31/button.rs
+++ b/crates/jacquard-api/src/store__88x31/button.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -228,51 +231,51 @@ pub mod button_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type PostedAt;
         type Blob;
+        type PostedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type PostedAt = Unset;
         type Blob = Unset;
-    }
-    ///State transition - sets the `posted_at` field to Set
-    pub struct SetPostedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPostedAt<S> {}
-    impl<S: State> State for SetPostedAt<S> {
-        type PostedAt = Set<members::posted_at>;
-        type Blob = S::Blob;
+        type PostedAt = Unset;
     }
     ///State transition - sets the `blob` field to Set
     pub struct SetBlob<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBlob<S> {}
     impl<S: State> State for SetBlob<S> {
-        type PostedAt = S::PostedAt;
         type Blob = Set<members::blob>;
+        type PostedAt = S::PostedAt;
+    }
+    ///State transition - sets the `posted_at` field to Set
+    pub struct SetPostedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPostedAt<S> {}
+    impl<S: State> State for SetPostedAt<S> {
+        type Blob = S::Blob;
+        type PostedAt = Set<members::posted_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `posted_at` field
-        pub struct posted_at(());
         ///Marker type for the `blob` field
         pub struct blob(());
+        ///Marker type for the `posted_at` field
+        pub struct posted_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ButtonBuilder<'a, S: button_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<BlobRef<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Button<'a> {
@@ -286,9 +289,9 @@ impl<'a> ButtonBuilder<'a, button_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ButtonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -296,12 +299,12 @@ impl<'a> ButtonBuilder<'a, button_state::Empty> {
 impl<'a, S: button_state::State> ButtonBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -316,11 +319,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ButtonBuilder<'a, button_state::SetBlob<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ButtonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -328,12 +331,12 @@ where
 impl<'a, S: button_state::State> ButtonBuilder<'a, S> {
     /// Set the `href` field (optional)
     pub fn href(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `href` field to an Option value (optional)
     pub fn maybe_href(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -348,11 +351,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ButtonBuilder<'a, button_state::SetPostedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ButtonBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -360,12 +363,12 @@ where
 impl<'a, S: button_state::State> ButtonBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -373,17 +376,17 @@ impl<'a, S: button_state::State> ButtonBuilder<'a, S> {
 impl<'a, S> ButtonBuilder<'a, S>
 where
     S: button_state::State,
-    S::PostedAt: button_state::IsSet,
     S::Blob: button_state::IsSet,
+    S::PostedAt: button_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Button<'a> {
         Button {
-            alt: self.__unsafe_private_named.0,
-            blob: self.__unsafe_private_named.1.unwrap(),
-            href: self.__unsafe_private_named.2,
-            posted_at: self.__unsafe_private_named.3.unwrap(),
-            title: self.__unsafe_private_named.4,
+            alt: self._fields.0,
+            blob: self._fields.1.unwrap(),
+            href: self._fields.2,
+            posted_at: self._fields.3.unwrap(),
+            title: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -396,11 +399,11 @@ where
         >,
     ) -> Button<'a> {
         Button {
-            alt: self.__unsafe_private_named.0,
-            blob: self.__unsafe_private_named.1.unwrap(),
-            href: self.__unsafe_private_named.2,
-            posted_at: self.__unsafe_private_named.3.unwrap(),
-            title: self.__unsafe_private_named.4,
+            alt: self._fields.0,
+            blob: self._fields.1.unwrap(),
+            href: self._fields.2,
+            posted_at: self._fields.3.unwrap(),
+            title: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/store__88x31/like.rs b/crates/jacquard-api/src/store__88x31/like.rs
index f8f2a16f..55932106 100644
--- a/crates/jacquard-api/src/store__88x31/like.rs
+++ b/crates/jacquard-api/src/store__88x31/like.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -145,9 +148,9 @@ pub mod like_state {
 
 /// Builder for constructing an instance of this type
 pub struct LikeBuilder<'a, S: like_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Like<'a> {
@@ -161,9 +164,9 @@ impl<'a> LikeBuilder<'a, like_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LikeBuilder<'a, like_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> LikeBuilder<'a, like_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         LikeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,8 +218,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -229,8 +232,8 @@ where
         >,
     ) -> Like<'a> {
         Like {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/systems_timker/hawlt/get_note.rs b/crates/jacquard-api/src/systems_timker/hawlt/get_note.rs
index b414f737..8181972b 100644
--- a/crates/jacquard-api/src/systems_timker/hawlt/get_note.rs
+++ b/crates/jacquard-api/src/systems_timker/hawlt/get_note.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::ident::AtIdentifier;
 use jacquard_common::types::string::{AtUri, Cid, RecordKey, Rkey};
@@ -105,9 +108,9 @@ pub mod get_note_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetNoteBuilder<'a, S: get_note_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtIdentifier<'a>>, Option<RecordKey<Rkey<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtIdentifier<'a>>, Option<RecordKey<Rkey<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetNote<'a> {
@@ -121,9 +124,9 @@ impl<'a> GetNoteBuilder<'a, get_note_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetNoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -138,11 +141,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> GetNoteBuilder<'a, get_note_state::SetRepo<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetNoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -157,11 +160,11 @@ where
         mut self,
         value: impl Into<RecordKey<Rkey<'a>>>,
     ) -> GetNoteBuilder<'a, get_note_state::SetRkey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetNoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -175,8 +178,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetNote<'a> {
         GetNote {
-            repo: self.__unsafe_private_named.0.unwrap(),
-            rkey: self.__unsafe_private_named.1.unwrap(),
+            repo: self._fields.0.unwrap(),
+            rkey: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/systems_timker/hawlt/list_notes.rs b/crates/jacquard-api/src/systems_timker/hawlt/list_notes.rs
index 6e0f69cf..0fbdcf82 100644
--- a/crates/jacquard-api/src/systems_timker/hawlt/list_notes.rs
+++ b/crates/jacquard-api/src/systems_timker/hawlt/list_notes.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -137,9 +140,9 @@ pub mod list_notes_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListNotesBuilder<'a, S: list_notes_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<AtIdentifier<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<AtIdentifier<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListNotes<'a> {
@@ -153,9 +156,9 @@ impl<'a> ListNotesBuilder<'a, list_notes_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListNotesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -163,12 +166,12 @@ impl<'a> ListNotesBuilder<'a, list_notes_state::Empty> {
 impl<'a, S: list_notes_state::State> ListNotesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -176,12 +179,12 @@ impl<'a, S: list_notes_state::State> ListNotesBuilder<'a, S> {
 impl<'a, S: list_notes_state::State> ListNotesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<AtIdentifier<'a>>,
     ) -> ListNotesBuilder<'a, list_notes_state::SetRepo<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ListNotesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,9 +216,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ListNotes<'a> {
         ListNotes {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            repo: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            repo: self._fields.2.unwrap(),
         }
     }
 }
@@ -230,80 +233,75 @@ pub mod note_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type IndexedAt;
-        type Value;
-        type Cid;
         type Uri;
+        type Cid;
+        type Value;
+        type IndexedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type IndexedAt = Unset;
-        type Value = Unset;
-        type Cid = Unset;
         type Uri = Unset;
+        type Cid = Unset;
+        type Value = Unset;
+        type IndexedAt = Unset;
     }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
-        type IndexedAt = Set<members::indexed_at>;
-        type Value = S::Value;
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Uri = Set<members::uri>;
         type Cid = S::Cid;
-        type Uri = S::Uri;
-    }
-    ///State transition - sets the `value` field to Set
-    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetValue<S> {}
-    impl<S: State> State for SetValue<S> {
+        type Value = S::Value;
         type IndexedAt = S::IndexedAt;
-        type Value = Set<members::value>;
-        type Cid = S::Cid;
-        type Uri = S::Uri;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type IndexedAt = S::IndexedAt;
-        type Value = S::Value;
-        type Cid = Set<members::cid>;
         type Uri = S::Uri;
+        type Cid = Set<members::cid>;
+        type Value = S::Value;
+        type IndexedAt = S::IndexedAt;
     }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
+    ///State transition - sets the `value` field to Set
+    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetValue<S> {}
+    impl<S: State> State for SetValue<S> {
+        type Uri = S::Uri;
+        type Cid = S::Cid;
+        type Value = Set<members::value>;
         type IndexedAt = S::IndexedAt;
-        type Value = S::Value;
+    }
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
+        type Uri = S::Uri;
         type Cid = S::Cid;
-        type Uri = Set<members::uri>;
+        type Value = S::Value;
+        type IndexedAt = Set<members::indexed_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `indexed_at` field
-        pub struct indexed_at(());
-        ///Marker type for the `value` field
-        pub struct value(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
+        ///Marker type for the `value` field
+        pub struct value(());
+        ///Marker type for the `indexed_at` field
+        pub struct indexed_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct NoteViewBuilder<'a, S: note_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Cid<'a>>,
-        Option<Datetime>,
-        Option<AtUri<'a>>,
-        Option<Note<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<Datetime>, Option<AtUri<'a>>, Option<Note<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> NoteView<'a> {
@@ -317,9 +315,9 @@ impl<'a> NoteViewBuilder<'a, note_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NoteViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -334,11 +332,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> NoteViewBuilder<'a, note_view_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NoteViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -353,11 +351,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> NoteViewBuilder<'a, note_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         NoteViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -372,11 +370,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> NoteViewBuilder<'a, note_view_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         NoteViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -391,11 +389,11 @@ where
         mut self,
         value: impl Into<Note<'a>>,
     ) -> NoteViewBuilder<'a, note_view_state::SetValue<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         NoteViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -403,18 +401,18 @@ where
 impl<'a, S> NoteViewBuilder<'a, S>
 where
     S: note_view_state::State,
-    S::IndexedAt: note_view_state::IsSet,
-    S::Value: note_view_state::IsSet,
-    S::Cid: note_view_state::IsSet,
     S::Uri: note_view_state::IsSet,
+    S::Cid: note_view_state::IsSet,
+    S::Value: note_view_state::IsSet,
+    S::IndexedAt: note_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> NoteView<'a> {
         NoteView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            indexed_at: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
-            value: self.__unsafe_private_named.3.unwrap(),
+            cid: self._fields.0.unwrap(),
+            indexed_at: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
+            value: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -427,10 +425,10 @@ where
         >,
     ) -> NoteView<'a> {
         NoteView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            indexed_at: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
-            value: self.__unsafe_private_named.3.unwrap(),
+            cid: self._fields.0.unwrap(),
+            indexed_at: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
+            value: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/systems_timker/hawlt/note.rs b/crates/jacquard-api/src/systems_timker/hawlt/note.rs
index 5c279395..54fbe729 100644
--- a/crates/jacquard-api/src/systems_timker/hawlt/note.rs
+++ b/crates/jacquard-api/src/systems_timker/hawlt/note.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -297,45 +300,45 @@ pub mod attachment_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Alt;
         type Image;
+        type Alt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Alt = Unset;
         type Image = Unset;
-    }
-    ///State transition - sets the `alt` field to Set
-    pub struct SetAlt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAlt<S> {}
-    impl<S: State> State for SetAlt<S> {
-        type Alt = Set<members::alt>;
-        type Image = S::Image;
+        type Alt = Unset;
     }
     ///State transition - sets the `image` field to Set
     pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetImage<S> {}
     impl<S: State> State for SetImage<S> {
-        type Alt = S::Alt;
         type Image = Set<members::image>;
+        type Alt = S::Alt;
+    }
+    ///State transition - sets the `alt` field to Set
+    pub struct SetAlt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAlt<S> {}
+    impl<S: State> State for SetAlt<S> {
+        type Image = S::Image;
+        type Alt = Set<members::alt>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `alt` field
-        pub struct alt(());
         ///Marker type for the `image` field
         pub struct image(());
+        ///Marker type for the `alt` field
+        pub struct alt(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AttachmentBuilder<'a, S: attachment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<BlobRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<BlobRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Attachment<'a> {
@@ -349,9 +352,9 @@ impl<'a> AttachmentBuilder<'a, attachment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AttachmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -366,11 +369,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AttachmentBuilder<'a, attachment_state::SetAlt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AttachmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -385,11 +388,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> AttachmentBuilder<'a, attachment_state::SetImage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AttachmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -397,14 +400,14 @@ where
 impl<'a, S> AttachmentBuilder<'a, S>
 where
     S: attachment_state::State,
-    S::Alt: attachment_state::IsSet,
     S::Image: attachment_state::IsSet,
+    S::Alt: attachment_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Attachment<'a> {
         Attachment {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            image: self.__unsafe_private_named.1.unwrap(),
+            alt: self._fields.0.unwrap(),
+            image: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -417,8 +420,8 @@ where
         >,
     ) -> Attachment<'a> {
         Attachment {
-            alt: self.__unsafe_private_named.0.unwrap(),
-            image: self.__unsafe_private_named.1.unwrap(),
+            alt: self._fields.0.unwrap(),
+            image: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -600,44 +603,44 @@ pub mod note_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Content;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Content = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Content = S::Content;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `content` field to Set
     pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContent<S> {}
     impl<S: State> State for SetContent<S> {
-        type CreatedAt = S::CreatedAt;
         type Content = Set<members::content>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Content = S::Content;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `content` field
         pub struct content(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct NoteBuilder<'a, S: note_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<note::Attachment<'a>>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -645,7 +648,7 @@ pub struct NoteBuilder<'a, S: note_state::State> {
         Option<Vec<Language>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Note<'a> {
@@ -659,9 +662,9 @@ impl<'a> NoteBuilder<'a, note_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -672,7 +675,7 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<note::Attachment<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `attachments` field to an Option value (optional)
@@ -680,7 +683,7 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
         mut self,
         value: Option<Vec<note::Attachment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -695,11 +698,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> NoteBuilder<'a, note_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -707,12 +710,12 @@ where
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `contentWarning` field (optional)
     pub fn content_warning(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `contentWarning` field to an Option value (optional)
     pub fn maybe_content_warning(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -727,11 +730,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> NoteBuilder<'a, note_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         NoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -739,12 +742,12 @@ where
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `langs` field (optional)
     pub fn langs(mut self, value: impl Into<Option<Vec<Language>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `langs` field to an Option value (optional)
     pub fn maybe_langs(mut self, value: Option<Vec<Language>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -752,12 +755,12 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
 impl<'a, S: note_state::State> NoteBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -765,18 +768,18 @@ impl<'a, S: note_state::State> NoteBuilder<'a, S> {
 impl<'a, S> NoteBuilder<'a, S>
 where
     S: note_state::State,
-    S::CreatedAt: note_state::IsSet,
     S::Content: note_state::IsSet,
+    S::CreatedAt: note_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Note<'a> {
         Note {
-            attachments: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            content_warning: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            langs: self.__unsafe_private_named.4,
-            tags: self.__unsafe_private_named.5,
+            attachments: self._fields.0,
+            content: self._fields.1.unwrap(),
+            content_warning: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            langs: self._fields.4,
+            tags: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -789,12 +792,12 @@ where
         >,
     ) -> Note<'a> {
         Note {
-            attachments: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
-            content_warning: self.__unsafe_private_named.2,
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            langs: self.__unsafe_private_named.4,
-            tags: self.__unsafe_private_named.5,
+            attachments: self._fields.0,
+            content: self._fields.1.unwrap(),
+            content_warning: self._fields.2,
+            created_at: self._fields.3.unwrap(),
+            langs: self._fields.4,
+            tags: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/systems_timker/hawlt/put_note.rs b/crates/jacquard-api/src/systems_timker/hawlt/put_note.rs
index 8f7b10c1..dbd27065 100644
--- a/crates/jacquard-api/src/systems_timker/hawlt/put_note.rs
+++ b/crates/jacquard-api/src/systems_timker/hawlt/put_note.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::{AtUri, Cid, RecordKey, Rkey};
 use jacquard_derive::{IntoStatic, lexicon};
@@ -109,9 +112,9 @@ pub mod put_note_state {
 
 /// Builder for constructing an instance of this type
 pub struct PutNoteBuilder<'a, S: put_note_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Note<'a>>, Option<RecordKey<Rkey<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Note<'a>>, Option<RecordKey<Rkey<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PutNote<'a> {
@@ -125,9 +128,9 @@ impl<'a> PutNoteBuilder<'a, put_note_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PutNoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,11 +145,11 @@ where
         mut self,
         value: impl Into<Note<'a>>,
     ) -> PutNoteBuilder<'a, put_note_state::SetRecord<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PutNoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -161,11 +164,11 @@ where
         mut self,
         value: impl Into<RecordKey<Rkey<'a>>>,
     ) -> PutNoteBuilder<'a, put_note_state::SetRkey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PutNoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,8 +182,8 @@ where
     /// Build the final struct
     pub fn build(self) -> PutNote<'a> {
         PutNote {
-            record: self.__unsafe_private_named.0.unwrap(),
-            rkey: self.__unsafe_private_named.1.unwrap(),
+            record: self._fields.0.unwrap(),
+            rkey: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -193,8 +196,8 @@ where
         >,
     ) -> PutNote<'a> {
         PutNote {
-            record: self.__unsafe_private_named.0.unwrap(),
-            rkey: self.__unsafe_private_named.1.unwrap(),
+            record: self._fields.0.unwrap(),
+            rkey: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tech_lenooby09/didgit/object.rs b/crates/jacquard-api/src/tech_lenooby09/didgit/object.rs
index ad9a350b..deb5c8f8 100644
--- a/crates/jacquard-api/src/tech_lenooby09/didgit/object.rs
+++ b/crates/jacquard-api/src/tech_lenooby09/didgit/object.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -263,45 +266,45 @@ pub mod object_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ObjectType;
         type Content;
+        type ObjectType;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ObjectType = Unset;
         type Content = Unset;
-    }
-    ///State transition - sets the `object_type` field to Set
-    pub struct SetObjectType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetObjectType<S> {}
-    impl<S: State> State for SetObjectType<S> {
-        type ObjectType = Set<members::object_type>;
-        type Content = S::Content;
+        type ObjectType = Unset;
     }
     ///State transition - sets the `content` field to Set
     pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContent<S> {}
     impl<S: State> State for SetContent<S> {
-        type ObjectType = S::ObjectType;
         type Content = Set<members::content>;
+        type ObjectType = S::ObjectType;
+    }
+    ///State transition - sets the `object_type` field to Set
+    pub struct SetObjectType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetObjectType<S> {}
+    impl<S: State> State for SetObjectType<S> {
+        type Content = S::Content;
+        type ObjectType = Set<members::object_type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `object_type` field
-        pub struct object_type(());
         ///Marker type for the `content` field
         pub struct content(());
+        ///Marker type for the `object_type` field
+        pub struct object_type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ObjectBuilder<'a, S: object_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<BlobRef<'a>>, Option<ObjectObjectType<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<BlobRef<'a>>, Option<ObjectObjectType<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Object<'a> {
@@ -315,9 +318,9 @@ impl<'a> ObjectBuilder<'a, object_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ObjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -332,11 +335,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> ObjectBuilder<'a, object_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ObjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -351,11 +354,11 @@ where
         mut self,
         value: impl Into<ObjectObjectType<'a>>,
     ) -> ObjectBuilder<'a, object_state::SetObjectType<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ObjectBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -363,14 +366,14 @@ where
 impl<'a, S> ObjectBuilder<'a, S>
 where
     S: object_state::State,
-    S::ObjectType: object_state::IsSet,
     S::Content: object_state::IsSet,
+    S::ObjectType: object_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Object<'a> {
         Object {
-            content: self.__unsafe_private_named.0.unwrap(),
-            object_type: self.__unsafe_private_named.1.unwrap(),
+            content: self._fields.0.unwrap(),
+            object_type: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -383,8 +386,8 @@ where
         >,
     ) -> Object<'a> {
         Object {
-            content: self.__unsafe_private_named.0.unwrap(),
-            object_type: self.__unsafe_private_named.1.unwrap(),
+            content: self._fields.0.unwrap(),
+            object_type: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tech_lenooby09/didgit/ref.rs b/crates/jacquard-api/src/tech_lenooby09/didgit/ref.rs
index 829ccab2..df3b7fb8 100644
--- a/crates/jacquard-api/src/tech_lenooby09/didgit/ref.rs
+++ b/crates/jacquard-api/src/tech_lenooby09/didgit/ref.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -147,59 +150,59 @@ pub mod ref_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ObjectId;
-        type Repo;
         type RefName;
+        type Repo;
+        type ObjectId;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ObjectId = Unset;
-        type Repo = Unset;
         type RefName = Unset;
+        type Repo = Unset;
+        type ObjectId = Unset;
     }
-    ///State transition - sets the `object_id` field to Set
-    pub struct SetObjectId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetObjectId<S> {}
-    impl<S: State> State for SetObjectId<S> {
-        type ObjectId = Set<members::object_id>;
+    ///State transition - sets the `ref_name` field to Set
+    pub struct SetRefName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRefName<S> {}
+    impl<S: State> State for SetRefName<S> {
+        type RefName = Set<members::ref_name>;
         type Repo = S::Repo;
-        type RefName = S::RefName;
+        type ObjectId = S::ObjectId;
     }
     ///State transition - sets the `repo` field to Set
     pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepo<S> {}
     impl<S: State> State for SetRepo<S> {
-        type ObjectId = S::ObjectId;
-        type Repo = Set<members::repo>;
         type RefName = S::RefName;
-    }
-    ///State transition - sets the `ref_name` field to Set
-    pub struct SetRefName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRefName<S> {}
-    impl<S: State> State for SetRefName<S> {
+        type Repo = Set<members::repo>;
         type ObjectId = S::ObjectId;
+    }
+    ///State transition - sets the `object_id` field to Set
+    pub struct SetObjectId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetObjectId<S> {}
+    impl<S: State> State for SetObjectId<S> {
+        type RefName = S::RefName;
         type Repo = S::Repo;
-        type RefName = Set<members::ref_name>;
+        type ObjectId = Set<members::object_id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `object_id` field
-        pub struct object_id(());
-        ///Marker type for the `repo` field
-        pub struct repo(());
         ///Marker type for the `ref_name` field
         pub struct ref_name(());
+        ///Marker type for the `repo` field
+        pub struct repo(());
+        ///Marker type for the `object_id` field
+        pub struct object_id(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RefBuilder<'a, S: ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Ref<'a> {
@@ -213,9 +216,9 @@ impl<'a> RefBuilder<'a, ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -230,11 +233,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RefBuilder<'a, ref_state::SetObjectId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,11 +252,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RefBuilder<'a, ref_state::SetRefName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -268,11 +271,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RefBuilder<'a, ref_state::SetRepo<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -280,16 +283,16 @@ where
 impl<'a, S> RefBuilder<'a, S>
 where
     S: ref_state::State,
-    S::ObjectId: ref_state::IsSet,
-    S::Repo: ref_state::IsSet,
     S::RefName: ref_state::IsSet,
+    S::Repo: ref_state::IsSet,
+    S::ObjectId: ref_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Ref<'a> {
         Ref {
-            object_id: self.__unsafe_private_named.0.unwrap(),
-            ref_name: self.__unsafe_private_named.1.unwrap(),
-            repo: self.__unsafe_private_named.2.unwrap(),
+            object_id: self._fields.0.unwrap(),
+            ref_name: self._fields.1.unwrap(),
+            repo: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -302,9 +305,9 @@ where
         >,
     ) -> Ref<'a> {
         Ref {
-            object_id: self.__unsafe_private_named.0.unwrap(),
-            ref_name: self.__unsafe_private_named.1.unwrap(),
-            repo: self.__unsafe_private_named.2.unwrap(),
+            object_id: self._fields.0.unwrap(),
+            ref_name: self._fields.1.unwrap(),
+            repo: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tech_lenooby09/didgit/signature_proof.rs b/crates/jacquard-api/src/tech_lenooby09/didgit/signature_proof.rs
index 17d01002..9aa8b18d 100644
--- a/crates/jacquard-api/src/tech_lenooby09/didgit/signature_proof.rs
+++ b/crates/jacquard-api/src/tech_lenooby09/didgit/signature_proof.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -293,112 +296,112 @@ pub mod signature_proof_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Signer;
+        type ObjectType;
+        type Signature;
         type ObjectId;
         type SignatureType;
-        type Signature;
         type SignedAt;
-        type Signer;
-        type ObjectType;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Signer = Unset;
+        type ObjectType = Unset;
+        type Signature = Unset;
         type ObjectId = Unset;
         type SignatureType = Unset;
-        type Signature = Unset;
         type SignedAt = Unset;
-        type Signer = Unset;
-        type ObjectType = Unset;
+    }
+    ///State transition - sets the `signer` field to Set
+    pub struct SetSigner<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSigner<S> {}
+    impl<S: State> State for SetSigner<S> {
+        type Signer = Set<members::signer>;
+        type ObjectType = S::ObjectType;
+        type Signature = S::Signature;
+        type ObjectId = S::ObjectId;
+        type SignatureType = S::SignatureType;
+        type SignedAt = S::SignedAt;
+    }
+    ///State transition - sets the `object_type` field to Set
+    pub struct SetObjectType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetObjectType<S> {}
+    impl<S: State> State for SetObjectType<S> {
+        type Signer = S::Signer;
+        type ObjectType = Set<members::object_type>;
+        type Signature = S::Signature;
+        type ObjectId = S::ObjectId;
+        type SignatureType = S::SignatureType;
+        type SignedAt = S::SignedAt;
+    }
+    ///State transition - sets the `signature` field to Set
+    pub struct SetSignature<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSignature<S> {}
+    impl<S: State> State for SetSignature<S> {
+        type Signer = S::Signer;
+        type ObjectType = S::ObjectType;
+        type Signature = Set<members::signature>;
+        type ObjectId = S::ObjectId;
+        type SignatureType = S::SignatureType;
+        type SignedAt = S::SignedAt;
     }
     ///State transition - sets the `object_id` field to Set
     pub struct SetObjectId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetObjectId<S> {}
     impl<S: State> State for SetObjectId<S> {
+        type Signer = S::Signer;
+        type ObjectType = S::ObjectType;
+        type Signature = S::Signature;
         type ObjectId = Set<members::object_id>;
         type SignatureType = S::SignatureType;
-        type Signature = S::Signature;
         type SignedAt = S::SignedAt;
-        type Signer = S::Signer;
-        type ObjectType = S::ObjectType;
     }
     ///State transition - sets the `signature_type` field to Set
     pub struct SetSignatureType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSignatureType<S> {}
     impl<S: State> State for SetSignatureType<S> {
-        type ObjectId = S::ObjectId;
-        type SignatureType = Set<members::signature_type>;
-        type Signature = S::Signature;
-        type SignedAt = S::SignedAt;
         type Signer = S::Signer;
         type ObjectType = S::ObjectType;
-    }
-    ///State transition - sets the `signature` field to Set
-    pub struct SetSignature<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSignature<S> {}
-    impl<S: State> State for SetSignature<S> {
+        type Signature = S::Signature;
         type ObjectId = S::ObjectId;
-        type SignatureType = S::SignatureType;
-        type Signature = Set<members::signature>;
+        type SignatureType = Set<members::signature_type>;
         type SignedAt = S::SignedAt;
-        type Signer = S::Signer;
-        type ObjectType = S::ObjectType;
     }
     ///State transition - sets the `signed_at` field to Set
     pub struct SetSignedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSignedAt<S> {}
     impl<S: State> State for SetSignedAt<S> {
-        type ObjectId = S::ObjectId;
-        type SignatureType = S::SignatureType;
-        type Signature = S::Signature;
-        type SignedAt = Set<members::signed_at>;
         type Signer = S::Signer;
         type ObjectType = S::ObjectType;
-    }
-    ///State transition - sets the `signer` field to Set
-    pub struct SetSigner<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSigner<S> {}
-    impl<S: State> State for SetSigner<S> {
-        type ObjectId = S::ObjectId;
-        type SignatureType = S::SignatureType;
         type Signature = S::Signature;
-        type SignedAt = S::SignedAt;
-        type Signer = Set<members::signer>;
-        type ObjectType = S::ObjectType;
-    }
-    ///State transition - sets the `object_type` field to Set
-    pub struct SetObjectType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetObjectType<S> {}
-    impl<S: State> State for SetObjectType<S> {
         type ObjectId = S::ObjectId;
         type SignatureType = S::SignatureType;
-        type Signature = S::Signature;
-        type SignedAt = S::SignedAt;
-        type Signer = S::Signer;
-        type ObjectType = Set<members::object_type>;
+        type SignedAt = Set<members::signed_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `signer` field
+        pub struct signer(());
+        ///Marker type for the `object_type` field
+        pub struct object_type(());
+        ///Marker type for the `signature` field
+        pub struct signature(());
         ///Marker type for the `object_id` field
         pub struct object_id(());
         ///Marker type for the `signature_type` field
         pub struct signature_type(());
-        ///Marker type for the `signature` field
-        pub struct signature(());
         ///Marker type for the `signed_at` field
         pub struct signed_at(());
-        ///Marker type for the `signer` field
-        pub struct signer(());
-        ///Marker type for the `object_type` field
-        pub struct object_type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SignatureProofBuilder<'a, S: signature_proof_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<SignatureProofObjectType<'a>>,
         Option<CowStr<'a>>,
@@ -407,7 +410,7 @@ pub struct SignatureProofBuilder<'a, S: signature_proof_state::State> {
         Option<i64>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SignatureProof<'a> {
@@ -421,9 +424,9 @@ impl<'a> SignatureProofBuilder<'a, signature_proof_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SignatureProofBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -438,11 +441,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureProofBuilder<'a, signature_proof_state::SetObjectId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SignatureProofBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -457,11 +460,11 @@ where
         mut self,
         value: impl Into<SignatureProofObjectType<'a>>,
     ) -> SignatureProofBuilder<'a, signature_proof_state::SetObjectType<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SignatureProofBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -469,12 +472,12 @@ where
 impl<'a, S: signature_proof_state::State> SignatureProofBuilder<'a, S> {
     /// Set the `pdsEndpoint` field (optional)
     pub fn pds_endpoint(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `pdsEndpoint` field to an Option value (optional)
     pub fn maybe_pds_endpoint(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -489,11 +492,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureProofBuilder<'a, signature_proof_state::SetSignature<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SignatureProofBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -508,11 +511,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureProofBuilder<'a, signature_proof_state::SetSignatureType<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         SignatureProofBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -527,11 +530,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SignatureProofBuilder<'a, signature_proof_state::SetSignedAt<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         SignatureProofBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -546,11 +549,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SignatureProofBuilder<'a, signature_proof_state::SetSigner<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         SignatureProofBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -558,23 +561,23 @@ where
 impl<'a, S> SignatureProofBuilder<'a, S>
 where
     S: signature_proof_state::State,
+    S::Signer: signature_proof_state::IsSet,
+    S::ObjectType: signature_proof_state::IsSet,
+    S::Signature: signature_proof_state::IsSet,
     S::ObjectId: signature_proof_state::IsSet,
     S::SignatureType: signature_proof_state::IsSet,
-    S::Signature: signature_proof_state::IsSet,
     S::SignedAt: signature_proof_state::IsSet,
-    S::Signer: signature_proof_state::IsSet,
-    S::ObjectType: signature_proof_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SignatureProof<'a> {
         SignatureProof {
-            object_id: self.__unsafe_private_named.0.unwrap(),
-            object_type: self.__unsafe_private_named.1.unwrap(),
-            pds_endpoint: self.__unsafe_private_named.2,
-            signature: self.__unsafe_private_named.3.unwrap(),
-            signature_type: self.__unsafe_private_named.4.unwrap(),
-            signed_at: self.__unsafe_private_named.5.unwrap(),
-            signer: self.__unsafe_private_named.6.unwrap(),
+            object_id: self._fields.0.unwrap(),
+            object_type: self._fields.1.unwrap(),
+            pds_endpoint: self._fields.2,
+            signature: self._fields.3.unwrap(),
+            signature_type: self._fields.4.unwrap(),
+            signed_at: self._fields.5.unwrap(),
+            signer: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -587,13 +590,13 @@ where
         >,
     ) -> SignatureProof<'a> {
         SignatureProof {
-            object_id: self.__unsafe_private_named.0.unwrap(),
-            object_type: self.__unsafe_private_named.1.unwrap(),
-            pds_endpoint: self.__unsafe_private_named.2,
-            signature: self.__unsafe_private_named.3.unwrap(),
-            signature_type: self.__unsafe_private_named.4.unwrap(),
-            signed_at: self.__unsafe_private_named.5.unwrap(),
-            signer: self.__unsafe_private_named.6.unwrap(),
+            object_id: self._fields.0.unwrap(),
+            object_type: self._fields.1.unwrap(),
+            pds_endpoint: self._fields.2,
+            signature: self._fields.3.unwrap(),
+            signature_type: self._fields.4.unwrap(),
+            signed_at: self._fields.5.unwrap(),
+            signer: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tech_manos/twmirror/post.rs b/crates/jacquard-api/src/tech_manos/twmirror/post.rs
index 194bceb0..8ab497cf 100644
--- a/crates/jacquard-api/src/tech_manos/twmirror/post.rs
+++ b/crates/jacquard-api/src/tech_manos/twmirror/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -119,65 +122,65 @@ pub mod post_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type TweetId;
         type BskyPost;
+        type CreatedAt;
         type TwUserId;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type TweetId = Unset;
         type BskyPost = Unset;
+        type CreatedAt = Unset;
         type TwUserId = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type TweetId = S::TweetId;
-        type BskyPost = S::BskyPost;
-        type TwUserId = S::TwUserId;
-    }
     ///State transition - sets the `tweet_id` field to Set
     pub struct SetTweetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTweetId<S> {}
     impl<S: State> State for SetTweetId<S> {
-        type CreatedAt = S::CreatedAt;
         type TweetId = Set<members::tweet_id>;
         type BskyPost = S::BskyPost;
+        type CreatedAt = S::CreatedAt;
         type TwUserId = S::TwUserId;
     }
     ///State transition - sets the `bsky_post` field to Set
     pub struct SetBskyPost<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBskyPost<S> {}
     impl<S: State> State for SetBskyPost<S> {
-        type CreatedAt = S::CreatedAt;
         type TweetId = S::TweetId;
         type BskyPost = Set<members::bsky_post>;
+        type CreatedAt = S::CreatedAt;
+        type TwUserId = S::TwUserId;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type TweetId = S::TweetId;
+        type BskyPost = S::BskyPost;
+        type CreatedAt = Set<members::created_at>;
         type TwUserId = S::TwUserId;
     }
     ///State transition - sets the `tw_user_id` field to Set
     pub struct SetTwUserId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTwUserId<S> {}
     impl<S: State> State for SetTwUserId<S> {
-        type CreatedAt = S::CreatedAt;
         type TweetId = S::TweetId;
         type BskyPost = S::BskyPost;
+        type CreatedAt = S::CreatedAt;
         type TwUserId = Set<members::tw_user_id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `tweet_id` field
         pub struct tweet_id(());
         ///Marker type for the `bsky_post` field
         pub struct bsky_post(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `tw_user_id` field
         pub struct tw_user_id(());
     }
@@ -185,14 +188,14 @@ pub mod post_state {
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Data<'a>>,
         Option<Datetime>,
         Option<post::TwitterId<'a>>,
         Option<post::TwitterId<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -206,9 +209,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -223,11 +226,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> PostBuilder<'a, post_state::SetBskyPost<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -242,11 +245,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -261,11 +264,11 @@ where
         mut self,
         value: impl Into<post::TwitterId<'a>>,
     ) -> PostBuilder<'a, post_state::SetTwUserId<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -280,11 +283,11 @@ where
         mut self,
         value: impl Into<post::TwitterId<'a>>,
     ) -> PostBuilder<'a, post_state::SetTweetId<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -292,18 +295,18 @@ where
 impl<'a, S> PostBuilder<'a, S>
 where
     S: post_state::State,
-    S::CreatedAt: post_state::IsSet,
     S::TweetId: post_state::IsSet,
     S::BskyPost: post_state::IsSet,
+    S::CreatedAt: post_state::IsSet,
     S::TwUserId: post_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            bsky_post: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            tw_user_id: self.__unsafe_private_named.2.unwrap(),
-            tweet_id: self.__unsafe_private_named.3.unwrap(),
+            bsky_post: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            tw_user_id: self._fields.2.unwrap(),
+            tweet_id: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -313,10 +316,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Post<'a> {
         Post {
-            bsky_post: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            tw_user_id: self.__unsafe_private_named.2.unwrap(),
-            tweet_id: self.__unsafe_private_named.3.unwrap(),
+            bsky_post: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            tw_user_id: self._fields.2.unwrap(),
+            tweet_id: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tech_tokimeki/kaku.rs b/crates/jacquard-api/src/tech_tokimeki/kaku.rs
index 7d8a43b4..57de6a72 100644
--- a/crates/jacquard-api/src/tech_tokimeki/kaku.rs
+++ b/crates/jacquard-api/src/tech_tokimeki/kaku.rs
@@ -13,7 +13,11 @@ pub mod request;
 pub mod request_response;
 pub mod room_gate;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -646,45 +650,45 @@ pub mod aspect_ratio_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Width;
         type Height;
+        type Width;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Width = Unset;
         type Height = Unset;
-    }
-    ///State transition - sets the `width` field to Set
-    pub struct SetWidth<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetWidth<S> {}
-    impl<S: State> State for SetWidth<S> {
-        type Width = Set<members::width>;
-        type Height = S::Height;
+        type Width = Unset;
     }
     ///State transition - sets the `height` field to Set
     pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHeight<S> {}
     impl<S: State> State for SetHeight<S> {
-        type Width = S::Width;
         type Height = Set<members::height>;
+        type Width = S::Width;
+    }
+    ///State transition - sets the `width` field to Set
+    pub struct SetWidth<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetWidth<S> {}
+    impl<S: State> State for SetWidth<S> {
+        type Height = S::Height;
+        type Width = Set<members::width>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `width` field
-        pub struct width(());
         ///Marker type for the `height` field
         pub struct height(());
+        ///Marker type for the `width` field
+        pub struct width(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AspectRatioBuilder<'a, S: aspect_ratio_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AspectRatio<'a> {
@@ -698,9 +702,9 @@ impl<'a> AspectRatioBuilder<'a, aspect_ratio_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -715,11 +719,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -734,11 +738,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetWidth<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -746,14 +750,14 @@ where
 impl<'a, S> AspectRatioBuilder<'a, S>
 where
     S: aspect_ratio_state::State,
-    S::Width: aspect_ratio_state::IsSet,
     S::Height: aspect_ratio_state::IsSet,
+    S::Width: aspect_ratio_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -766,8 +770,8 @@ where
         >,
     ) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1417,92 +1421,92 @@ pub mod collection_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
+        type Name;
         type Uri;
-        type Author;
         type Cid;
-        type Name;
+        type Author;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
+        type Name = Unset;
         type Uri = Unset;
-        type Author = Unset;
         type Cid = Unset;
-        type Name = Unset;
+        type Author = Unset;
+        type CreatedAt = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Name = Set<members::name>;
         type Uri = S::Uri;
-        type Author = S::Author;
         type Cid = S::Cid;
-        type Name = S::Name;
+        type Author = S::Author;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type CreatedAt = S::CreatedAt;
+        type Name = S::Name;
         type Uri = Set<members::uri>;
-        type Author = S::Author;
         type Cid = S::Cid;
-        type Name = S::Name;
-    }
-    ///State transition - sets the `author` field to Set
-    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAuthor<S> {}
-    impl<S: State> State for SetAuthor<S> {
+        type Author = S::Author;
         type CreatedAt = S::CreatedAt;
-        type Uri = S::Uri;
-        type Author = Set<members::author>;
-        type Cid = S::Cid;
-        type Name = S::Name;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type CreatedAt = S::CreatedAt;
+        type Name = S::Name;
         type Uri = S::Uri;
-        type Author = S::Author;
         type Cid = Set<members::cid>;
-        type Name = S::Name;
+        type Author = S::Author;
+        type CreatedAt = S::CreatedAt;
     }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
+    ///State transition - sets the `author` field to Set
+    pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAuthor<S> {}
+    impl<S: State> State for SetAuthor<S> {
+        type Name = S::Name;
+        type Uri = S::Uri;
+        type Cid = S::Cid;
+        type Author = Set<members::author>;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Name = S::Name;
         type Uri = S::Uri;
-        type Author = S::Author;
         type Cid = S::Cid;
-        type Name = Set<members::name>;
+        type Author = S::Author;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
+        ///Marker type for the `name` field
+        pub struct name(());
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `author` field
-        pub struct author(());
         ///Marker type for the `cid` field
         pub struct cid(());
-        ///Marker type for the `name` field
-        pub struct name(());
+        ///Marker type for the `author` field
+        pub struct author(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CollectionViewBuilder<'a, S: collection_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<Cid<'a>>,
         Option<Datetime>,
@@ -1513,7 +1517,7 @@ pub struct CollectionViewBuilder<'a, S: collection_view_state::State> {
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CollectionView<'a> {
@@ -1527,19 +1531,9 @@ impl<'a> CollectionViewBuilder<'a, collection_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1554,11 +1548,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> CollectionViewBuilder<'a, collection_view_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1573,11 +1567,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> CollectionViewBuilder<'a, collection_view_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CollectionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1592,11 +1586,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionViewBuilder<'a, collection_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CollectionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1604,12 +1598,12 @@ where
 impl<'a, S: collection_view_state::State> CollectionViewBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -1617,12 +1611,12 @@ impl<'a, S: collection_view_state::State> CollectionViewBuilder<'a, S> {
 impl<'a, S: collection_view_state::State> CollectionViewBuilder<'a, S> {
     /// Set the `indexedAt` field (optional)
     pub fn indexed_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `indexedAt` field to an Option value (optional)
     pub fn maybe_indexed_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -1630,12 +1624,12 @@ impl<'a, S: collection_view_state::State> CollectionViewBuilder<'a, S> {
 impl<'a, S: collection_view_state::State> CollectionViewBuilder<'a, S> {
     /// Set the `isPublic` field (optional)
     pub fn is_public(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `isPublic` field to an Option value (optional)
     pub fn maybe_is_public(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -1643,12 +1637,12 @@ impl<'a, S: collection_view_state::State> CollectionViewBuilder<'a, S> {
 impl<'a, S: collection_view_state::State> CollectionViewBuilder<'a, S> {
     /// Set the `itemCount` field (optional)
     pub fn item_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `itemCount` field to an Option value (optional)
     pub fn maybe_item_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -1663,11 +1657,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CollectionViewBuilder<'a, collection_view_state::SetName<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         CollectionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1682,11 +1676,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> CollectionViewBuilder<'a, collection_view_state::SetUri<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         CollectionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1694,24 +1688,24 @@ where
 impl<'a, S> CollectionViewBuilder<'a, S>
 where
     S: collection_view_state::State,
-    S::CreatedAt: collection_view_state::IsSet,
+    S::Name: collection_view_state::IsSet,
     S::Uri: collection_view_state::IsSet,
-    S::Author: collection_view_state::IsSet,
     S::Cid: collection_view_state::IsSet,
-    S::Name: collection_view_state::IsSet,
+    S::Author: collection_view_state::IsSet,
+    S::CreatedAt: collection_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CollectionView<'a> {
         CollectionView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            indexed_at: self.__unsafe_private_named.4,
-            is_public: self.__unsafe_private_named.5.or_else(|| Some(true)),
-            item_count: self.__unsafe_private_named.6,
-            name: self.__unsafe_private_named.7.unwrap(),
-            uri: self.__unsafe_private_named.8.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            indexed_at: self._fields.4,
+            is_public: self._fields.5.or_else(|| Some(true)),
+            item_count: self._fields.6,
+            name: self._fields.7.unwrap(),
+            uri: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1724,15 +1718,15 @@ where
         >,
     ) -> CollectionView<'a> {
         CollectionView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            description: self.__unsafe_private_named.3,
-            indexed_at: self.__unsafe_private_named.4,
-            is_public: self.__unsafe_private_named.5.or_else(|| Some(true)),
-            item_count: self.__unsafe_private_named.6,
-            name: self.__unsafe_private_named.7.unwrap(),
-            uri: self.__unsafe_private_named.8.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            description: self._fields.3,
+            indexed_at: self._fields.4,
+            is_public: self._fields.5.or_else(|| Some(true)),
+            item_count: self._fields.6,
+            name: self._fields.7.unwrap(),
+            uri: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1748,112 +1742,112 @@ pub mod post_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
-        type AspectRatio;
-        type Author;
         type Image;
-        type CreatedAt;
+        type Author;
         type Cid;
+        type AspectRatio;
+        type Uri;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
-        type AspectRatio = Unset;
-        type Author = Unset;
         type Image = Unset;
-        type CreatedAt = Unset;
+        type Author = Unset;
         type Cid = Unset;
+        type AspectRatio = Unset;
+        type Uri = Unset;
+        type CreatedAt = Unset;
     }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type AspectRatio = S::AspectRatio;
+    ///State transition - sets the `image` field to Set
+    pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetImage<S> {}
+    impl<S: State> State for SetImage<S> {
+        type Image = Set<members::image>;
         type Author = S::Author;
-        type Image = S::Image;
-        type CreatedAt = S::CreatedAt;
         type Cid = S::Cid;
-    }
-    ///State transition - sets the `aspect_ratio` field to Set
-    pub struct SetAspectRatio<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAspectRatio<S> {}
-    impl<S: State> State for SetAspectRatio<S> {
+        type AspectRatio = S::AspectRatio;
         type Uri = S::Uri;
-        type AspectRatio = Set<members::aspect_ratio>;
-        type Author = S::Author;
-        type Image = S::Image;
         type CreatedAt = S::CreatedAt;
-        type Cid = S::Cid;
     }
     ///State transition - sets the `author` field to Set
     pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthor<S> {}
     impl<S: State> State for SetAuthor<S> {
-        type Uri = S::Uri;
-        type AspectRatio = S::AspectRatio;
-        type Author = Set<members::author>;
         type Image = S::Image;
-        type CreatedAt = S::CreatedAt;
+        type Author = Set<members::author>;
         type Cid = S::Cid;
-    }
-    ///State transition - sets the `image` field to Set
-    pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetImage<S> {}
-    impl<S: State> State for SetImage<S> {
+        type AspectRatio = S::AspectRatio;
         type Uri = S::Uri;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Image = S::Image;
+        type Author = S::Author;
+        type Cid = Set<members::cid>;
         type AspectRatio = S::AspectRatio;
+        type Uri = S::Uri;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `aspect_ratio` field to Set
+    pub struct SetAspectRatio<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAspectRatio<S> {}
+    impl<S: State> State for SetAspectRatio<S> {
+        type Image = S::Image;
         type Author = S::Author;
-        type Image = Set<members::image>;
+        type Cid = S::Cid;
+        type AspectRatio = Set<members::aspect_ratio>;
+        type Uri = S::Uri;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Image = S::Image;
+        type Author = S::Author;
         type Cid = S::Cid;
+        type AspectRatio = S::AspectRatio;
+        type Uri = Set<members::uri>;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Uri = S::Uri;
-        type AspectRatio = S::AspectRatio;
-        type Author = S::Author;
         type Image = S::Image;
-        type CreatedAt = Set<members::created_at>;
+        type Author = S::Author;
         type Cid = S::Cid;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type Uri = S::Uri;
         type AspectRatio = S::AspectRatio;
-        type Author = S::Author;
-        type Image = S::Image;
-        type CreatedAt = S::CreatedAt;
-        type Cid = Set<members::cid>;
+        type Uri = S::Uri;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
-        ///Marker type for the `aspect_ratio` field
-        pub struct aspect_ratio(());
-        ///Marker type for the `author` field
-        pub struct author(());
         ///Marker type for the `image` field
         pub struct image(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
+        ///Marker type for the `author` field
+        pub struct author(());
         ///Marker type for the `cid` field
         pub struct cid(());
+        ///Marker type for the `aspect_ratio` field
+        pub struct aspect_ratio(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PostViewBuilder<'a, S: post_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<kaku::AspectRatio<'a>>,
         Option<ProfileViewBasic<'a>>,
         Option<Cid<'a>>,
@@ -1867,7 +1861,7 @@ pub struct PostViewBuilder<'a, S: post_view_state::State> {
         Option<AtUri<'a>>,
         Option<kaku::ReactionType<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PostView<'a> {
@@ -1881,8 +1875,8 @@ impl<'a> PostViewBuilder<'a, post_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -1896,7 +1890,7 @@ impl<'a> PostViewBuilder<'a, post_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1911,11 +1905,11 @@ where
         mut self,
         value: impl Into<kaku::AspectRatio<'a>>,
     ) -> PostViewBuilder<'a, post_view_state::SetAspectRatio<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PostViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1930,11 +1924,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> PostViewBuilder<'a, post_view_state::SetAuthor<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1949,11 +1943,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> PostViewBuilder<'a, post_view_state::SetCid<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PostViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1968,11 +1962,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostViewBuilder<'a, post_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PostViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1987,11 +1981,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> PostViewBuilder<'a, post_view_state::SetImage<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PostViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1999,12 +1993,12 @@ where
 impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
     /// Set the `indexedAt` field (optional)
     pub fn indexed_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `indexedAt` field to an Option value (optional)
     pub fn maybe_indexed_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -2012,12 +2006,12 @@ impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
 impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
     /// Set the `linkedPost` field (optional)
     pub fn linked_post(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `linkedPost` field to an Option value (optional)
     pub fn maybe_linked_post(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -2028,7 +2022,7 @@ impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<kaku::ReactionCounts<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `reactionCounts` field to an Option value (optional)
@@ -2036,7 +2030,7 @@ impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
         mut self,
         value: Option<kaku::ReactionCounts<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -2044,12 +2038,12 @@ impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
 impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -2057,12 +2051,12 @@ impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
 impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -2077,11 +2071,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PostViewBuilder<'a, post_view_state::SetUri<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         PostViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2092,7 +2086,7 @@ impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<kaku::ReactionType<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `viewerReaction` field to an Option value (optional)
@@ -2100,7 +2094,7 @@ impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
         mut self,
         value: Option<kaku::ReactionType<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -2108,28 +2102,28 @@ impl<'a, S: post_view_state::State> PostViewBuilder<'a, S> {
 impl<'a, S> PostViewBuilder<'a, S>
 where
     S: post_view_state::State,
-    S::Uri: post_view_state::IsSet,
-    S::AspectRatio: post_view_state::IsSet,
-    S::Author: post_view_state::IsSet,
     S::Image: post_view_state::IsSet,
-    S::CreatedAt: post_view_state::IsSet,
+    S::Author: post_view_state::IsSet,
     S::Cid: post_view_state::IsSet,
+    S::AspectRatio: post_view_state::IsSet,
+    S::Uri: post_view_state::IsSet,
+    S::CreatedAt: post_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> PostView<'a> {
         PostView {
-            aspect_ratio: self.__unsafe_private_named.0.unwrap(),
-            author: self.__unsafe_private_named.1.unwrap(),
-            cid: self.__unsafe_private_named.2.unwrap(),
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            image: self.__unsafe_private_named.4.unwrap(),
-            indexed_at: self.__unsafe_private_named.5,
-            linked_post: self.__unsafe_private_named.6,
-            reaction_counts: self.__unsafe_private_named.7,
-            tags: self.__unsafe_private_named.8,
-            text: self.__unsafe_private_named.9,
-            uri: self.__unsafe_private_named.10.unwrap(),
-            viewer_reaction: self.__unsafe_private_named.11,
+            aspect_ratio: self._fields.0.unwrap(),
+            author: self._fields.1.unwrap(),
+            cid: self._fields.2.unwrap(),
+            created_at: self._fields.3.unwrap(),
+            image: self._fields.4.unwrap(),
+            indexed_at: self._fields.5,
+            linked_post: self._fields.6,
+            reaction_counts: self._fields.7,
+            tags: self._fields.8,
+            text: self._fields.9,
+            uri: self._fields.10.unwrap(),
+            viewer_reaction: self._fields.11,
             extra_data: Default::default(),
         }
     }
@@ -2142,18 +2136,18 @@ where
         >,
     ) -> PostView<'a> {
         PostView {
-            aspect_ratio: self.__unsafe_private_named.0.unwrap(),
-            author: self.__unsafe_private_named.1.unwrap(),
-            cid: self.__unsafe_private_named.2.unwrap(),
-            created_at: self.__unsafe_private_named.3.unwrap(),
-            image: self.__unsafe_private_named.4.unwrap(),
-            indexed_at: self.__unsafe_private_named.5,
-            linked_post: self.__unsafe_private_named.6,
-            reaction_counts: self.__unsafe_private_named.7,
-            tags: self.__unsafe_private_named.8,
-            text: self.__unsafe_private_named.9,
-            uri: self.__unsafe_private_named.10.unwrap(),
-            viewer_reaction: self.__unsafe_private_named.11,
+            aspect_ratio: self._fields.0.unwrap(),
+            author: self._fields.1.unwrap(),
+            cid: self._fields.2.unwrap(),
+            created_at: self._fields.3.unwrap(),
+            image: self._fields.4.unwrap(),
+            indexed_at: self._fields.5,
+            linked_post: self._fields.6,
+            reaction_counts: self._fields.7,
+            tags: self._fields.8,
+            text: self._fields.9,
+            uri: self._fields.10.unwrap(),
+            viewer_reaction: self._fields.11,
             extra_data: Some(extra_data),
         }
     }
@@ -2286,15 +2280,15 @@ pub mod reply_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReplyViewBuilder<'a, S: reply_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<Cid<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReplyView<'a> {
@@ -2308,9 +2302,9 @@ impl<'a> ReplyViewBuilder<'a, reply_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReplyViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2325,11 +2319,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> ReplyViewBuilder<'a, reply_view_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReplyViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2344,11 +2338,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> ReplyViewBuilder<'a, reply_view_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReplyViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2363,11 +2357,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReplyViewBuilder<'a, reply_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReplyViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2382,11 +2376,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ReplyViewBuilder<'a, reply_view_state::SetText<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ReplyViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2401,11 +2395,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> ReplyViewBuilder<'a, reply_view_state::SetUri<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ReplyViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2422,11 +2416,11 @@ where
     /// Build the final struct
     pub fn build(self) -> ReplyView<'a> {
         ReplyView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            text: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            text: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2439,11 +2433,11 @@ where
         >,
     ) -> ReplyView<'a> {
         ReplyView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            text: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            text: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2459,92 +2453,92 @@ pub mod request_response_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type CreatedAt;
+        type Post;
         type Uri;
         type Cid;
         type Author;
-        type Post;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type CreatedAt = Unset;
+        type Post = Unset;
         type Uri = Unset;
         type Cid = Unset;
         type Author = Unset;
-        type Post = Unset;
-        type CreatedAt = Unset;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type Post = S::Post;
+        type Uri = S::Uri;
+        type Cid = S::Cid;
+        type Author = S::Author;
+    }
+    ///State transition - sets the `post` field to Set
+    pub struct SetPost<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPost<S> {}
+    impl<S: State> State for SetPost<S> {
+        type CreatedAt = S::CreatedAt;
+        type Post = Set<members::post>;
+        type Uri = S::Uri;
+        type Cid = S::Cid;
+        type Author = S::Author;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
+        type CreatedAt = S::CreatedAt;
+        type Post = S::Post;
         type Uri = Set<members::uri>;
         type Cid = S::Cid;
         type Author = S::Author;
-        type Post = S::Post;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
+        type CreatedAt = S::CreatedAt;
+        type Post = S::Post;
         type Uri = S::Uri;
         type Cid = Set<members::cid>;
         type Author = S::Author;
-        type Post = S::Post;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `author` field to Set
     pub struct SetAuthor<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAuthor<S> {}
     impl<S: State> State for SetAuthor<S> {
-        type Uri = S::Uri;
-        type Cid = S::Cid;
-        type Author = Set<members::author>;
-        type Post = S::Post;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `post` field to Set
-    pub struct SetPost<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPost<S> {}
-    impl<S: State> State for SetPost<S> {
-        type Uri = S::Uri;
-        type Cid = S::Cid;
-        type Author = S::Author;
-        type Post = Set<members::post>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+        type Post = S::Post;
         type Uri = S::Uri;
         type Cid = S::Cid;
-        type Author = S::Author;
-        type Post = S::Post;
-        type CreatedAt = Set<members::created_at>;
+        type Author = Set<members::author>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `post` field
+        pub struct post(());
         ///Marker type for the `uri` field
         pub struct uri(());
         ///Marker type for the `cid` field
         pub struct cid(());
         ///Marker type for the `author` field
         pub struct author(());
-        ///Marker type for the `post` field
-        pub struct post(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RequestResponseViewBuilder<'a, S: request_response_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<Cid<'a>>,
         Option<Datetime>,
@@ -2552,7 +2546,7 @@ pub struct RequestResponseViewBuilder<'a, S: request_response_view_state::State>
         Option<kaku::PostView<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RequestResponseView<'a> {
@@ -2566,9 +2560,9 @@ impl<'a> RequestResponseViewBuilder<'a, request_response_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RequestResponseViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2583,11 +2577,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> RequestResponseViewBuilder<'a, request_response_view_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RequestResponseViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2602,11 +2596,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> RequestResponseViewBuilder<'a, request_response_view_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RequestResponseViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2621,11 +2615,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RequestResponseViewBuilder<'a, request_response_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RequestResponseViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2633,12 +2627,12 @@ where
 impl<'a, S: request_response_view_state::State> RequestResponseViewBuilder<'a, S> {
     /// Set the `message` field (optional)
     pub fn message(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `message` field to an Option value (optional)
     pub fn maybe_message(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -2653,11 +2647,11 @@ where
         mut self,
         value: impl Into<kaku::PostView<'a>>,
     ) -> RequestResponseViewBuilder<'a, request_response_view_state::SetPost<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RequestResponseViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2672,11 +2666,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RequestResponseViewBuilder<'a, request_response_view_state::SetUri<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         RequestResponseViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2684,21 +2678,21 @@ where
 impl<'a, S> RequestResponseViewBuilder<'a, S>
 where
     S: request_response_view_state::State,
+    S::CreatedAt: request_response_view_state::IsSet,
+    S::Post: request_response_view_state::IsSet,
     S::Uri: request_response_view_state::IsSet,
     S::Cid: request_response_view_state::IsSet,
     S::Author: request_response_view_state::IsSet,
-    S::Post: request_response_view_state::IsSet,
-    S::CreatedAt: request_response_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RequestResponseView<'a> {
         RequestResponseView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            message: self.__unsafe_private_named.3,
-            post: self.__unsafe_private_named.4.unwrap(),
-            uri: self.__unsafe_private_named.5.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            message: self._fields.3,
+            post: self._fields.4.unwrap(),
+            uri: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -2711,12 +2705,12 @@ where
         >,
     ) -> RequestResponseView<'a> {
         RequestResponseView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            message: self.__unsafe_private_named.3,
-            post: self.__unsafe_private_named.4.unwrap(),
-            uri: self.__unsafe_private_named.5.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            message: self._fields.3,
+            post: self._fields.4.unwrap(),
+            uri: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -2734,9 +2728,9 @@ pub mod request_view_state {
     pub trait State: sealed::Sealed {
         type Author;
         type Uri;
-        type Text;
         type IsOpen;
         type CreatedAt;
+        type Text;
         type Cid;
     }
     /// Empty state - all required fields are unset
@@ -2745,9 +2739,9 @@ pub mod request_view_state {
     impl State for Empty {
         type Author = Unset;
         type Uri = Unset;
-        type Text = Unset;
         type IsOpen = Unset;
         type CreatedAt = Unset;
+        type Text = Unset;
         type Cid = Unset;
     }
     ///State transition - sets the `author` field to Set
@@ -2756,9 +2750,9 @@ pub mod request_view_state {
     impl<S: State> State for SetAuthor<S> {
         type Author = Set<members::author>;
         type Uri = S::Uri;
-        type Text = S::Text;
         type IsOpen = S::IsOpen;
         type CreatedAt = S::CreatedAt;
+        type Text = S::Text;
         type Cid = S::Cid;
     }
     ///State transition - sets the `uri` field to Set
@@ -2767,20 +2761,9 @@ pub mod request_view_state {
     impl<S: State> State for SetUri<S> {
         type Author = S::Author;
         type Uri = Set<members::uri>;
-        type Text = S::Text;
-        type IsOpen = S::IsOpen;
-        type CreatedAt = S::CreatedAt;
-        type Cid = S::Cid;
-    }
-    ///State transition - sets the `text` field to Set
-    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetText<S> {}
-    impl<S: State> State for SetText<S> {
-        type Author = S::Author;
-        type Uri = S::Uri;
-        type Text = Set<members::text>;
         type IsOpen = S::IsOpen;
         type CreatedAt = S::CreatedAt;
+        type Text = S::Text;
         type Cid = S::Cid;
     }
     ///State transition - sets the `is_open` field to Set
@@ -2789,9 +2772,9 @@ pub mod request_view_state {
     impl<S: State> State for SetIsOpen<S> {
         type Author = S::Author;
         type Uri = S::Uri;
-        type Text = S::Text;
         type IsOpen = Set<members::is_open>;
         type CreatedAt = S::CreatedAt;
+        type Text = S::Text;
         type Cid = S::Cid;
     }
     ///State transition - sets the `created_at` field to Set
@@ -2800,9 +2783,20 @@ pub mod request_view_state {
     impl<S: State> State for SetCreatedAt<S> {
         type Author = S::Author;
         type Uri = S::Uri;
-        type Text = S::Text;
         type IsOpen = S::IsOpen;
         type CreatedAt = Set<members::created_at>;
+        type Text = S::Text;
+        type Cid = S::Cid;
+    }
+    ///State transition - sets the `text` field to Set
+    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetText<S> {}
+    impl<S: State> State for SetText<S> {
+        type Author = S::Author;
+        type Uri = S::Uri;
+        type IsOpen = S::IsOpen;
+        type CreatedAt = S::CreatedAt;
+        type Text = Set<members::text>;
         type Cid = S::Cid;
     }
     ///State transition - sets the `cid` field to Set
@@ -2811,9 +2805,9 @@ pub mod request_view_state {
     impl<S: State> State for SetCid<S> {
         type Author = S::Author;
         type Uri = S::Uri;
-        type Text = S::Text;
         type IsOpen = S::IsOpen;
         type CreatedAt = S::CreatedAt;
+        type Text = S::Text;
         type Cid = Set<members::cid>;
     }
     /// Marker types for field names
@@ -2823,12 +2817,12 @@ pub mod request_view_state {
         pub struct author(());
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `text` field
-        pub struct text(());
         ///Marker type for the `is_open` field
         pub struct is_open(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `text` field
+        pub struct text(());
         ///Marker type for the `cid` field
         pub struct cid(());
     }
@@ -2836,8 +2830,8 @@ pub mod request_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct RequestViewBuilder<'a, S: request_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ProfileViewBasic<'a>>,
         Option<Cid<'a>>,
         Option<Datetime>,
@@ -2850,7 +2844,7 @@ pub struct RequestViewBuilder<'a, S: request_view_state::State> {
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RequestView<'a> {
@@ -2864,21 +2858,9 @@ impl<'a> RequestViewBuilder<'a, request_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RequestViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2893,11 +2875,11 @@ where
         mut self,
         value: impl Into<ProfileViewBasic<'a>>,
     ) -> RequestViewBuilder<'a, request_view_state::SetAuthor<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RequestViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2912,11 +2894,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> RequestViewBuilder<'a, request_view_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RequestViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2931,11 +2913,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RequestViewBuilder<'a, request_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RequestViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2943,12 +2925,12 @@ where
 impl<'a, S: request_view_state::State> RequestViewBuilder<'a, S> {
     /// Set the `indexedAt` field (optional)
     pub fn indexed_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `indexedAt` field to an Option value (optional)
     pub fn maybe_indexed_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -2963,11 +2945,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> RequestViewBuilder<'a, request_view_state::SetIsOpen<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RequestViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -2978,12 +2960,12 @@ impl<'a, S: request_view_state::State> RequestViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<UriValue<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `referenceImages` field to an Option value (optional)
     pub fn maybe_reference_images(mut self, value: Option<Vec<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -2991,12 +2973,12 @@ impl<'a, S: request_view_state::State> RequestViewBuilder<'a, S> {
 impl<'a, S: request_view_state::State> RequestViewBuilder<'a, S> {
     /// Set the `responseCount` field (optional)
     pub fn response_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `responseCount` field to an Option value (optional)
     pub fn maybe_response_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -3004,12 +2986,12 @@ impl<'a, S: request_view_state::State> RequestViewBuilder<'a, S> {
 impl<'a, S: request_view_state::State> RequestViewBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -3020,12 +3002,12 @@ impl<'a, S: request_view_state::State> RequestViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<ProfileViewBasic<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `targetActor` field to an Option value (optional)
     pub fn maybe_target_actor(mut self, value: Option<ProfileViewBasic<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -3040,11 +3022,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RequestViewBuilder<'a, request_view_state::SetText<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         RequestViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3059,11 +3041,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RequestViewBuilder<'a, request_view_state::SetUri<S>> {
-        self.__unsafe_private_named.10 = Option::Some(value.into());
+        self._fields.10 = Option::Some(value.into());
         RequestViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3073,25 +3055,25 @@ where
     S: request_view_state::State,
     S::Author: request_view_state::IsSet,
     S::Uri: request_view_state::IsSet,
-    S::Text: request_view_state::IsSet,
     S::IsOpen: request_view_state::IsSet,
     S::CreatedAt: request_view_state::IsSet,
+    S::Text: request_view_state::IsSet,
     S::Cid: request_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RequestView<'a> {
         RequestView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            indexed_at: self.__unsafe_private_named.3,
-            is_open: self.__unsafe_private_named.4.unwrap(),
-            reference_images: self.__unsafe_private_named.5,
-            response_count: self.__unsafe_private_named.6,
-            tags: self.__unsafe_private_named.7,
-            target_actor: self.__unsafe_private_named.8,
-            text: self.__unsafe_private_named.9.unwrap(),
-            uri: self.__unsafe_private_named.10.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            indexed_at: self._fields.3,
+            is_open: self._fields.4.unwrap(),
+            reference_images: self._fields.5,
+            response_count: self._fields.6,
+            tags: self._fields.7,
+            target_actor: self._fields.8,
+            text: self._fields.9.unwrap(),
+            uri: self._fields.10.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3104,17 +3086,17 @@ where
         >,
     ) -> RequestView<'a> {
         RequestView {
-            author: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            indexed_at: self.__unsafe_private_named.3,
-            is_open: self.__unsafe_private_named.4.unwrap(),
-            reference_images: self.__unsafe_private_named.5,
-            response_count: self.__unsafe_private_named.6,
-            tags: self.__unsafe_private_named.7,
-            target_actor: self.__unsafe_private_named.8,
-            text: self.__unsafe_private_named.9.unwrap(),
-            uri: self.__unsafe_private_named.10.unwrap(),
+            author: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            created_at: self._fields.2.unwrap(),
+            indexed_at: self._fields.3,
+            is_open: self._fields.4.unwrap(),
+            reference_images: self._fields.5,
+            response_count: self._fields.6,
+            tags: self._fields.7,
+            target_actor: self._fields.8,
+            text: self._fields.9.unwrap(),
+            uri: self._fields.10.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tech_tokimeki/kaku/collection.rs b/crates/jacquard-api/src/tech_tokimeki/kaku/collection.rs
index ec73219c..47c3fb76 100644
--- a/crates/jacquard-api/src/tech_tokimeki/kaku/collection.rs
+++ b/crates/jacquard-api/src/tech_tokimeki/kaku/collection.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -214,14 +217,9 @@ pub mod collection_state {
 
 /// Builder for constructing an instance of this type
 pub struct CollectionBuilder<'a, S: collection_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<CowStr<'a>>,
-        Option<bool>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<bool>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Collection<'a> {
@@ -235,9 +233,9 @@ impl<'a> CollectionBuilder<'a, collection_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -252,11 +250,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionBuilder<'a, collection_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -264,12 +262,12 @@ where
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -277,12 +275,12 @@ impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
 impl<'a, S: collection_state::State> CollectionBuilder<'a, S> {
     /// Set the `isPublic` field (optional)
     pub fn is_public(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `isPublic` field to an Option value (optional)
     pub fn maybe_is_public(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -297,11 +295,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> CollectionBuilder<'a, collection_state::SetName<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CollectionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -315,10 +313,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Collection<'a> {
         Collection {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            is_public: self.__unsafe_private_named.2.or_else(|| Some(true)),
-            name: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            is_public: self._fields.2.or_else(|| Some(true)),
+            name: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -331,10 +329,10 @@ where
         >,
     ) -> Collection<'a> {
         Collection {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            is_public: self.__unsafe_private_named.2.or_else(|| Some(true)),
-            name: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            is_public: self._fields.2.or_else(|| Some(true)),
+            name: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tech_tokimeki/kaku/collection_item.rs b/crates/jacquard-api/src/tech_tokimeki/kaku/collection_item.rs
index 53bf85d7..6b3484c0 100644
--- a/crates/jacquard-api/src/tech_tokimeki/kaku/collection_item.rs
+++ b/crates/jacquard-api/src/tech_tokimeki/kaku/collection_item.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -125,64 +128,64 @@ pub mod collection_item_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Post;
-        type Collection;
         type CreatedAt;
+        type Collection;
+        type Post;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Post = Unset;
-        type Collection = Unset;
         type CreatedAt = Unset;
+        type Collection = Unset;
+        type Post = Unset;
     }
-    ///State transition - sets the `post` field to Set
-    pub struct SetPost<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPost<S> {}
-    impl<S: State> State for SetPost<S> {
-        type Post = Set<members::post>;
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
         type Collection = S::Collection;
-        type CreatedAt = S::CreatedAt;
+        type Post = S::Post;
     }
     ///State transition - sets the `collection` field to Set
     pub struct SetCollection<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCollection<S> {}
     impl<S: State> State for SetCollection<S> {
-        type Post = S::Post;
-        type Collection = Set<members::collection>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
+        type Collection = Set<members::collection>;
         type Post = S::Post;
+    }
+    ///State transition - sets the `post` field to Set
+    pub struct SetPost<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPost<S> {}
+    impl<S: State> State for SetPost<S> {
+        type CreatedAt = S::CreatedAt;
         type Collection = S::Collection;
-        type CreatedAt = Set<members::created_at>;
+        type Post = Set<members::post>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `post` field
-        pub struct post(());
-        ///Marker type for the `collection` field
-        pub struct collection(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `collection` field
+        pub struct collection(());
+        ///Marker type for the `post` field
+        pub struct post(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CollectionItemBuilder<'a, S: collection_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<StrongRef<'a>>,
         Option<Datetime>,
         Option<i64>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CollectionItem<'a> {
@@ -196,9 +199,9 @@ impl<'a> CollectionItemBuilder<'a, collection_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -213,11 +216,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> CollectionItemBuilder<'a, collection_item_state::SetCollection<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,11 +235,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CollectionItemBuilder<'a, collection_item_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,12 +247,12 @@ where
 impl<'a, S: collection_item_state::State> CollectionItemBuilder<'a, S> {
     /// Set the `order` field (optional)
     pub fn order(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `order` field to an Option value (optional)
     pub fn maybe_order(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -264,11 +267,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> CollectionItemBuilder<'a, collection_item_state::SetPost<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CollectionItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -276,17 +279,17 @@ where
 impl<'a, S> CollectionItemBuilder<'a, S>
 where
     S: collection_item_state::State,
-    S::Post: collection_item_state::IsSet,
-    S::Collection: collection_item_state::IsSet,
     S::CreatedAt: collection_item_state::IsSet,
+    S::Collection: collection_item_state::IsSet,
+    S::Post: collection_item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> CollectionItem<'a> {
         CollectionItem {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            order: self.__unsafe_private_named.2,
-            post: self.__unsafe_private_named.3.unwrap(),
+            collection: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            order: self._fields.2,
+            post: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -299,10 +302,10 @@ where
         >,
     ) -> CollectionItem<'a> {
         CollectionItem {
-            collection: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            order: self.__unsafe_private_named.2,
-            post: self.__unsafe_private_named.3.unwrap(),
+            collection: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            order: self._fields.2,
+            post: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tech_tokimeki/kaku/post.rs b/crates/jacquard-api/src/tech_tokimeki/kaku/post.rs
index 43f7f07d..aacfbebf 100644
--- a/crates/jacquard-api/src/tech_tokimeki/kaku/post.rs
+++ b/crates/jacquard-api/src/tech_tokimeki/kaku/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -206,58 +209,58 @@ pub mod post_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type AspectRatio;
         type Image;
+        type AspectRatio;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type AspectRatio = Unset;
         type Image = Unset;
+        type AspectRatio = Unset;
+        type CreatedAt = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
+    ///State transition - sets the `image` field to Set
+    pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetImage<S> {}
+    impl<S: State> State for SetImage<S> {
+        type Image = Set<members::image>;
         type AspectRatio = S::AspectRatio;
-        type Image = S::Image;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `aspect_ratio` field to Set
     pub struct SetAspectRatio<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAspectRatio<S> {}
     impl<S: State> State for SetAspectRatio<S> {
-        type CreatedAt = S::CreatedAt;
-        type AspectRatio = Set<members::aspect_ratio>;
         type Image = S::Image;
-    }
-    ///State transition - sets the `image` field to Set
-    pub struct SetImage<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetImage<S> {}
-    impl<S: State> State for SetImage<S> {
+        type AspectRatio = Set<members::aspect_ratio>;
         type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Image = S::Image;
         type AspectRatio = S::AspectRatio;
-        type Image = Set<members::image>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `aspect_ratio` field
-        pub struct aspect_ratio(());
         ///Marker type for the `image` field
         pub struct image(());
+        ///Marker type for the `aspect_ratio` field
+        pub struct aspect_ratio(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<AspectRatio<'a>>,
         Option<Datetime>,
         Option<BlobRef<'a>>,
@@ -266,7 +269,7 @@ pub struct PostBuilder<'a, S: post_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -280,9 +283,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -297,11 +300,11 @@ where
         mut self,
         value: impl Into<AspectRatio<'a>>,
     ) -> PostBuilder<'a, post_state::SetAspectRatio<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -316,11 +319,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -335,11 +338,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> PostBuilder<'a, post_state::SetImage<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -347,12 +350,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `linkedPost` field (optional)
     pub fn linked_post(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `linkedPost` field to an Option value (optional)
     pub fn maybe_linked_post(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -360,12 +363,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `subject` field (optional)
     pub fn subject(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `subject` field to an Option value (optional)
     pub fn maybe_subject(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -373,12 +376,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -386,12 +389,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -399,20 +402,20 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S> PostBuilder<'a, S>
 where
     S: post_state::State,
-    S::CreatedAt: post_state::IsSet,
-    S::AspectRatio: post_state::IsSet,
     S::Image: post_state::IsSet,
+    S::AspectRatio: post_state::IsSet,
+    S::CreatedAt: post_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            aspect_ratio: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            image: self.__unsafe_private_named.2.unwrap(),
-            linked_post: self.__unsafe_private_named.3,
-            subject: self.__unsafe_private_named.4,
-            tags: self.__unsafe_private_named.5,
-            text: self.__unsafe_private_named.6,
+            aspect_ratio: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            image: self._fields.2.unwrap(),
+            linked_post: self._fields.3,
+            subject: self._fields.4,
+            tags: self._fields.5,
+            text: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -425,13 +428,13 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            aspect_ratio: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            image: self.__unsafe_private_named.2.unwrap(),
-            linked_post: self.__unsafe_private_named.3,
-            subject: self.__unsafe_private_named.4,
-            tags: self.__unsafe_private_named.5,
-            text: self.__unsafe_private_named.6,
+            aspect_ratio: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            image: self._fields.2.unwrap(),
+            linked_post: self._fields.3,
+            subject: self._fields.4,
+            tags: self._fields.5,
+            text: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tech_tokimeki/kaku/reaction.rs b/crates/jacquard-api/src/tech_tokimeki/kaku/reaction.rs
index 25113151..71e73617 100644
--- a/crates/jacquard-api/src/tech_tokimeki/kaku/reaction.rs
+++ b/crates/jacquard-api/src/tech_tokimeki/kaku/reaction.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -268,13 +271,9 @@ pub mod reaction_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReactionBuilder<'a, S: reaction_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<StrongRef<'a>>,
-        Option<ReactionType<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>, Option<ReactionType<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Reaction<'a> {
@@ -288,9 +287,9 @@ impl<'a> ReactionBuilder<'a, reaction_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -305,11 +304,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ReactionBuilder<'a, reaction_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -324,11 +323,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ReactionBuilder<'a, reaction_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -343,11 +342,11 @@ where
         mut self,
         value: impl Into<ReactionType<'a>>,
     ) -> ReactionBuilder<'a, reaction_state::SetType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReactionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -362,9 +361,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Reaction<'a> {
         Reaction {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -377,9 +376,9 @@ where
         >,
     ) -> Reaction<'a> {
         Reaction {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            r#type: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            r#type: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tech_tokimeki/kaku/request.rs b/crates/jacquard-api/src/tech_tokimeki/kaku/request.rs
index 4b90bebf..86ea709a 100644
--- a/crates/jacquard-api/src/tech_tokimeki/kaku/request.rs
+++ b/crates/jacquard-api/src/tech_tokimeki/kaku/request.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -210,8 +213,8 @@ pub mod request_state {
 
 /// Builder for constructing an instance of this type
 pub struct RequestBuilder<'a, S: request_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<bool>,
         Option<Vec<BlobRef<'a>>>,
@@ -219,7 +222,7 @@ pub struct RequestBuilder<'a, S: request_state::State> {
         Option<Did<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Request<'a> {
@@ -233,9 +236,9 @@ impl<'a> RequestBuilder<'a, request_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RequestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -250,11 +253,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RequestBuilder<'a, request_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RequestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -262,12 +265,12 @@ where
 impl<'a, S: request_state::State> RequestBuilder<'a, S> {
     /// Set the `isOpen` field (optional)
     pub fn is_open(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `isOpen` field to an Option value (optional)
     pub fn maybe_is_open(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -278,12 +281,12 @@ impl<'a, S: request_state::State> RequestBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<BlobRef<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `referenceImages` field to an Option value (optional)
     pub fn maybe_reference_images(mut self, value: Option<Vec<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -291,12 +294,12 @@ impl<'a, S: request_state::State> RequestBuilder<'a, S> {
 impl<'a, S: request_state::State> RequestBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -304,12 +307,12 @@ impl<'a, S: request_state::State> RequestBuilder<'a, S> {
 impl<'a, S: request_state::State> RequestBuilder<'a, S> {
     /// Set the `targetActor` field (optional)
     pub fn target_actor(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `targetActor` field to an Option value (optional)
     pub fn maybe_target_actor(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -324,11 +327,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RequestBuilder<'a, request_state::SetText<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         RequestBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -342,12 +345,12 @@ where
     /// Build the final struct
     pub fn build(self) -> Request<'a> {
         Request {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            is_open: self.__unsafe_private_named.1.or_else(|| Some(true)),
-            reference_images: self.__unsafe_private_named.2,
-            tags: self.__unsafe_private_named.3,
-            target_actor: self.__unsafe_private_named.4,
-            text: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            is_open: self._fields.1.or_else(|| Some(true)),
+            reference_images: self._fields.2,
+            tags: self._fields.3,
+            target_actor: self._fields.4,
+            text: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -360,12 +363,12 @@ where
         >,
     ) -> Request<'a> {
         Request {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            is_open: self.__unsafe_private_named.1.or_else(|| Some(true)),
-            reference_images: self.__unsafe_private_named.2,
-            tags: self.__unsafe_private_named.3,
-            target_actor: self.__unsafe_private_named.4,
-            text: self.__unsafe_private_named.5.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            is_open: self._fields.1.or_else(|| Some(true)),
+            reference_images: self._fields.2,
+            tags: self._fields.3,
+            target_actor: self._fields.4,
+            text: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tech_tokimeki/kaku/request_response.rs b/crates/jacquard-api/src/tech_tokimeki/kaku/request_response.rs
index 5074b2c3..65ddc697 100644
--- a/crates/jacquard-api/src/tech_tokimeki/kaku/request_response.rs
+++ b/crates/jacquard-api/src/tech_tokimeki/kaku/request_response.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -139,64 +142,64 @@ pub mod request_response_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Request;
         type Post;
         type CreatedAt;
-        type Request;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Request = Unset;
         type Post = Unset;
         type CreatedAt = Unset;
-        type Request = Unset;
+    }
+    ///State transition - sets the `request` field to Set
+    pub struct SetRequest<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRequest<S> {}
+    impl<S: State> State for SetRequest<S> {
+        type Request = Set<members::request>;
+        type Post = S::Post;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `post` field to Set
     pub struct SetPost<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPost<S> {}
     impl<S: State> State for SetPost<S> {
+        type Request = S::Request;
         type Post = Set<members::post>;
         type CreatedAt = S::CreatedAt;
-        type Request = S::Request;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Post = S::Post;
-        type CreatedAt = Set<members::created_at>;
         type Request = S::Request;
-    }
-    ///State transition - sets the `request` field to Set
-    pub struct SetRequest<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRequest<S> {}
-    impl<S: State> State for SetRequest<S> {
         type Post = S::Post;
-        type CreatedAt = S::CreatedAt;
-        type Request = Set<members::request>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `request` field
+        pub struct request(());
         ///Marker type for the `post` field
         pub struct post(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `request` field
-        pub struct request(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RequestResponseBuilder<'a, S: request_response_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<StrongRef<'a>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RequestResponse<'a> {
@@ -210,9 +213,9 @@ impl<'a> RequestResponseBuilder<'a, request_response_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RequestResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -227,11 +230,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RequestResponseBuilder<'a, request_response_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RequestResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,12 +242,12 @@ where
 impl<'a, S: request_response_state::State> RequestResponseBuilder<'a, S> {
     /// Set the `message` field (optional)
     pub fn message(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `message` field to an Option value (optional)
     pub fn maybe_message(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -259,11 +262,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> RequestResponseBuilder<'a, request_response_state::SetPost<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RequestResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -278,11 +281,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> RequestResponseBuilder<'a, request_response_state::SetRequest<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RequestResponseBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -290,17 +293,17 @@ where
 impl<'a, S> RequestResponseBuilder<'a, S>
 where
     S: request_response_state::State,
+    S::Request: request_response_state::IsSet,
     S::Post: request_response_state::IsSet,
     S::CreatedAt: request_response_state::IsSet,
-    S::Request: request_response_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RequestResponse<'a> {
         RequestResponse {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1,
-            post: self.__unsafe_private_named.2.unwrap(),
-            request: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            message: self._fields.1,
+            post: self._fields.2.unwrap(),
+            request: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -313,10 +316,10 @@ where
         >,
     ) -> RequestResponse<'a> {
         RequestResponse {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            message: self.__unsafe_private_named.1,
-            post: self.__unsafe_private_named.2.unwrap(),
-            request: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            message: self._fields.1,
+            post: self._fields.2.unwrap(),
+            request: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tech_tokimeki/kaku/room_gate.rs b/crates/jacquard-api/src/tech_tokimeki/kaku/room_gate.rs
index 54d4354a..8e54670f 100644
--- a/crates/jacquard-api/src/tech_tokimeki/kaku/room_gate.rs
+++ b/crates/jacquard-api/src/tech_tokimeki/kaku/room_gate.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -119,45 +122,45 @@ pub mod room_gate_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Room;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Room = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Room = S::Room;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `room` field to Set
     pub struct SetRoom<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRoom<S> {}
     impl<S: State> State for SetRoom<S> {
-        type CreatedAt = S::CreatedAt;
         type Room = Set<members::room>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Room = S::Room;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `room` field
         pub struct room(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RoomGateBuilder<'a, S: room_gate_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<bool>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<bool>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RoomGate<'a> {
@@ -171,9 +174,9 @@ impl<'a> RoomGateBuilder<'a, room_gate_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RoomGateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -188,11 +191,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RoomGateBuilder<'a, room_gate_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RoomGateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,12 +203,12 @@ where
 impl<'a, S: room_gate_state::State> RoomGateBuilder<'a, S> {
     /// Set the `isClosed` field (optional)
     pub fn is_closed(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `isClosed` field to an Option value (optional)
     pub fn maybe_is_closed(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -220,11 +223,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> RoomGateBuilder<'a, room_gate_state::SetRoom<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RoomGateBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,15 +235,15 @@ where
 impl<'a, S> RoomGateBuilder<'a, S>
 where
     S: room_gate_state::State,
-    S::CreatedAt: room_gate_state::IsSet,
     S::Room: room_gate_state::IsSet,
+    S::CreatedAt: room_gate_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RoomGate<'a> {
         RoomGate {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            is_closed: self.__unsafe_private_named.1.or_else(|| Some(false)),
-            room: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            is_closed: self._fields.1.or_else(|| Some(false)),
+            room: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -253,9 +256,9 @@ where
         >,
     ) -> RoomGate<'a> {
         RoomGate {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            is_closed: self.__unsafe_private_named.1.or_else(|| Some(false)),
-            room: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            is_closed: self._fields.1.or_else(|| Some(false)),
+            room: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tech_tokimeki/poll/poll.rs b/crates/jacquard-api/src/tech_tokimeki/poll/poll.rs
index 2a511aad..b8a03e5b 100644
--- a/crates/jacquard-api/src/tech_tokimeki/poll/poll.rs
+++ b/crates/jacquard-api/src/tech_tokimeki/poll/poll.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -138,64 +141,64 @@ pub mod poll_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Options;
         type CreatedAt;
         type EndsAt;
-        type Options;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Options = Unset;
         type CreatedAt = Unset;
         type EndsAt = Unset;
-        type Options = Unset;
+    }
+    ///State transition - sets the `options` field to Set
+    pub struct SetOptions<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetOptions<S> {}
+    impl<S: State> State for SetOptions<S> {
+        type Options = Set<members::options>;
+        type CreatedAt = S::CreatedAt;
+        type EndsAt = S::EndsAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Options = S::Options;
         type CreatedAt = Set<members::created_at>;
         type EndsAt = S::EndsAt;
-        type Options = S::Options;
     }
     ///State transition - sets the `ends_at` field to Set
     pub struct SetEndsAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEndsAt<S> {}
     impl<S: State> State for SetEndsAt<S> {
-        type CreatedAt = S::CreatedAt;
-        type EndsAt = Set<members::ends_at>;
         type Options = S::Options;
-    }
-    ///State transition - sets the `options` field to Set
-    pub struct SetOptions<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetOptions<S> {}
-    impl<S: State> State for SetOptions<S> {
         type CreatedAt = S::CreatedAt;
-        type EndsAt = S::EndsAt;
-        type Options = Set<members::options>;
+        type EndsAt = Set<members::ends_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `options` field
+        pub struct options(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `ends_at` field
         pub struct ends_at(());
-        ///Marker type for the `options` field
-        pub struct options(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PollBuilder<'a, S: poll_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<Vec<CowStr<'a>>>,
         Option<StrongRef<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Poll<'a> {
@@ -209,9 +212,9 @@ impl<'a> PollBuilder<'a, poll_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PollBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -226,11 +229,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PollBuilder<'a, poll_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PollBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -245,11 +248,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PollBuilder<'a, poll_state::SetEndsAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PollBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -264,11 +267,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> PollBuilder<'a, poll_state::SetOptions<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         PollBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -276,12 +279,12 @@ where
 impl<'a, S: poll_state::State> PollBuilder<'a, S> {
     /// Set the `subject` field (optional)
     pub fn subject(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `subject` field to an Option value (optional)
     pub fn maybe_subject(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -289,17 +292,17 @@ impl<'a, S: poll_state::State> PollBuilder<'a, S> {
 impl<'a, S> PollBuilder<'a, S>
 where
     S: poll_state::State,
+    S::Options: poll_state::IsSet,
     S::CreatedAt: poll_state::IsSet,
     S::EndsAt: poll_state::IsSet,
-    S::Options: poll_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Poll<'a> {
         Poll {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            ends_at: self.__unsafe_private_named.1.unwrap(),
-            options: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3,
+            created_at: self._fields.0.unwrap(),
+            ends_at: self._fields.1.unwrap(),
+            options: self._fields.2.unwrap(),
+            subject: self._fields.3,
             extra_data: Default::default(),
         }
     }
@@ -312,10 +315,10 @@ where
         >,
     ) -> Poll<'a> {
         Poll {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            ends_at: self.__unsafe_private_named.1.unwrap(),
-            options: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3,
+            created_at: self._fields.0.unwrap(),
+            ends_at: self._fields.1.unwrap(),
+            options: self._fields.2.unwrap(),
+            subject: self._fields.3,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tech_tokimeki/poll/vote.rs b/crates/jacquard-api/src/tech_tokimeki/poll/vote.rs
index 7d5bf1b4..e3e63f59 100644
--- a/crates/jacquard-api/src/tech_tokimeki/poll/vote.rs
+++ b/crates/jacquard-api/src/tech_tokimeki/poll/vote.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -132,59 +135,59 @@ pub mod vote_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type CreatedAt;
         type OptionIndex;
         type Poll;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type CreatedAt = Unset;
         type OptionIndex = Unset;
         type Poll = Unset;
-        type CreatedAt = Unset;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type OptionIndex = S::OptionIndex;
+        type Poll = S::Poll;
     }
     ///State transition - sets the `option_index` field to Set
     pub struct SetOptionIndex<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetOptionIndex<S> {}
     impl<S: State> State for SetOptionIndex<S> {
+        type CreatedAt = S::CreatedAt;
         type OptionIndex = Set<members::option_index>;
         type Poll = S::Poll;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `poll` field to Set
     pub struct SetPoll<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPoll<S> {}
     impl<S: State> State for SetPoll<S> {
-        type OptionIndex = S::OptionIndex;
-        type Poll = Set<members::poll>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type OptionIndex = S::OptionIndex;
-        type Poll = S::Poll;
-        type CreatedAt = Set<members::created_at>;
+        type Poll = Set<members::poll>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `option_index` field
         pub struct option_index(());
         ///Marker type for the `poll` field
         pub struct poll(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct VoteBuilder<'a, S: vote_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<i64>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<i64>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Vote<'a> {
@@ -198,9 +201,9 @@ impl<'a> VoteBuilder<'a, vote_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> VoteBuilder<'a, vote_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -234,11 +237,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> VoteBuilder<'a, vote_state::SetOptionIndex<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,11 +256,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> VoteBuilder<'a, vote_state::SetPoll<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         VoteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -265,16 +268,16 @@ where
 impl<'a, S> VoteBuilder<'a, S>
 where
     S: vote_state::State,
+    S::CreatedAt: vote_state::IsSet,
     S::OptionIndex: vote_state::IsSet,
     S::Poll: vote_state::IsSet,
-    S::CreatedAt: vote_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Vote<'a> {
         Vote {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            option_index: self.__unsafe_private_named.1.unwrap(),
-            poll: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            option_index: self._fields.1.unwrap(),
+            poll: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -287,9 +290,9 @@ where
         >,
     ) -> Vote<'a> {
         Vote {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            option_index: self.__unsafe_private_named.1.unwrap(),
-            poll: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            option_index: self._fields.1.unwrap(),
+            poll: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tech_tokimeki/takibi/log.rs b/crates/jacquard-api/src/tech_tokimeki/takibi/log.rs
index e5fb6639..a8c21523 100644
--- a/crates/jacquard-api/src/tech_tokimeki/takibi/log.rs
+++ b/crates/jacquard-api/src/tech_tokimeki/takibi/log.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -194,9 +197,9 @@ pub mod log_state {
 
 /// Builder for constructing an instance of this type
 pub struct LogBuilder<'a, S: log_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Vec<log::SparkRef<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Vec<log::SparkRef<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Log<'a> {
@@ -210,9 +213,9 @@ impl<'a> LogBuilder<'a, log_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         LogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -227,11 +230,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> LogBuilder<'a, log_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         LogBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -242,7 +245,7 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<log::SparkRef<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `visibleSparks` field to an Option value (optional)
@@ -250,7 +253,7 @@ impl<'a, S: log_state::State> LogBuilder<'a, S> {
         mut self,
         value: Option<Vec<log::SparkRef<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -263,8 +266,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Log<'a> {
         Log {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            visible_sparks: self.__unsafe_private_named.1,
+            created_at: self._fields.0.unwrap(),
+            visible_sparks: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -277,8 +280,8 @@ where
         >,
     ) -> Log<'a> {
         Log {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            visible_sparks: self.__unsafe_private_named.1,
+            created_at: self._fields.0.unwrap(),
+            visible_sparks: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
@@ -426,9 +429,9 @@ pub mod spark_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct SparkRefBuilder<'a, S: spark_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SparkRef<'a> {
@@ -442,9 +445,9 @@ impl<'a> SparkRefBuilder<'a, spark_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SparkRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -459,11 +462,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SparkRefBuilder<'a, spark_ref_state::SetElapsed<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SparkRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -478,11 +481,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> SparkRefBuilder<'a, spark_ref_state::SetSpark<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SparkRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -496,8 +499,8 @@ where
     /// Build the final struct
     pub fn build(self) -> SparkRef<'a> {
         SparkRef {
-            elapsed: self.__unsafe_private_named.0.unwrap(),
-            spark: self.__unsafe_private_named.1.unwrap(),
+            elapsed: self._fields.0.unwrap(),
+            spark: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -510,8 +513,8 @@ where
         >,
     ) -> SparkRef<'a> {
         SparkRef {
-            elapsed: self.__unsafe_private_named.0.unwrap(),
-            spark: self.__unsafe_private_named.1.unwrap(),
+            elapsed: self._fields.0.unwrap(),
+            spark: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tech_tokimeki/takibi/spark.rs b/crates/jacquard-api/src/tech_tokimeki/takibi/spark.rs
index 8fb637bd..b3736eb9 100644
--- a/crates/jacquard-api/src/tech_tokimeki/takibi/spark.rs
+++ b/crates/jacquard-api/src/tech_tokimeki/takibi/spark.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -169,9 +172,9 @@ pub mod spark_state {
 
 /// Builder for constructing an instance of this type
 pub struct SparkBuilder<'a, S: spark_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Spark<'a> {
@@ -185,9 +188,9 @@ impl<'a> SparkBuilder<'a, spark_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SparkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -202,11 +205,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SparkBuilder<'a, spark_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SparkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,11 +224,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SparkBuilder<'a, spark_state::SetText<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SparkBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -239,8 +242,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Spark<'a> {
         Spark {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            text: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            text: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -253,8 +256,8 @@ where
         >,
     ) -> Spark<'a> {
         Spark {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            text: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            text: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/communication.rs b/crates/jacquard-api/src/tools_ozone/communication.rs
index 9c842395..f187602f 100644
--- a/crates/jacquard-api/src/tools_ozone/communication.rs
+++ b/crates/jacquard-api/src/tools_ozone/communication.rs
@@ -10,7 +10,11 @@ pub mod delete_template;
 pub mod list_templates;
 pub mod update_template;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -77,134 +81,134 @@ pub mod template_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type Name;
         type ContentMarkdown;
-        type Id;
+        type Name;
+        type Disabled;
         type LastUpdatedBy;
         type UpdatedAt;
-        type Disabled;
+        type CreatedAt;
+        type Id;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type Name = Unset;
         type ContentMarkdown = Unset;
-        type Id = Unset;
+        type Name = Unset;
+        type Disabled = Unset;
         type LastUpdatedBy = Unset;
         type UpdatedAt = Unset;
-        type Disabled = Unset;
+        type CreatedAt = Unset;
+        type Id = Unset;
     }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
+    ///State transition - sets the `content_markdown` field to Set
+    pub struct SetContentMarkdown<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetContentMarkdown<S> {}
+    impl<S: State> State for SetContentMarkdown<S> {
+        type ContentMarkdown = Set<members::content_markdown>;
         type Name = S::Name;
-        type ContentMarkdown = S::ContentMarkdown;
-        type Id = S::Id;
+        type Disabled = S::Disabled;
         type LastUpdatedBy = S::LastUpdatedBy;
         type UpdatedAt = S::UpdatedAt;
-        type Disabled = S::Disabled;
+        type CreatedAt = S::CreatedAt;
+        type Id = S::Id;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type CreatedAt = S::CreatedAt;
-        type Name = Set<members::name>;
         type ContentMarkdown = S::ContentMarkdown;
-        type Id = S::Id;
+        type Name = Set<members::name>;
+        type Disabled = S::Disabled;
         type LastUpdatedBy = S::LastUpdatedBy;
         type UpdatedAt = S::UpdatedAt;
-        type Disabled = S::Disabled;
-    }
-    ///State transition - sets the `content_markdown` field to Set
-    pub struct SetContentMarkdown<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetContentMarkdown<S> {}
-    impl<S: State> State for SetContentMarkdown<S> {
         type CreatedAt = S::CreatedAt;
-        type Name = S::Name;
-        type ContentMarkdown = Set<members::content_markdown>;
         type Id = S::Id;
-        type LastUpdatedBy = S::LastUpdatedBy;
-        type UpdatedAt = S::UpdatedAt;
-        type Disabled = S::Disabled;
     }
-    ///State transition - sets the `id` field to Set
-    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetId<S> {}
-    impl<S: State> State for SetId<S> {
-        type CreatedAt = S::CreatedAt;
-        type Name = S::Name;
+    ///State transition - sets the `disabled` field to Set
+    pub struct SetDisabled<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDisabled<S> {}
+    impl<S: State> State for SetDisabled<S> {
         type ContentMarkdown = S::ContentMarkdown;
-        type Id = Set<members::id>;
+        type Name = S::Name;
+        type Disabled = Set<members::disabled>;
         type LastUpdatedBy = S::LastUpdatedBy;
         type UpdatedAt = S::UpdatedAt;
-        type Disabled = S::Disabled;
+        type CreatedAt = S::CreatedAt;
+        type Id = S::Id;
     }
     ///State transition - sets the `last_updated_by` field to Set
     pub struct SetLastUpdatedBy<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLastUpdatedBy<S> {}
     impl<S: State> State for SetLastUpdatedBy<S> {
-        type CreatedAt = S::CreatedAt;
-        type Name = S::Name;
         type ContentMarkdown = S::ContentMarkdown;
-        type Id = S::Id;
+        type Name = S::Name;
+        type Disabled = S::Disabled;
         type LastUpdatedBy = Set<members::last_updated_by>;
         type UpdatedAt = S::UpdatedAt;
-        type Disabled = S::Disabled;
+        type CreatedAt = S::CreatedAt;
+        type Id = S::Id;
     }
     ///State transition - sets the `updated_at` field to Set
     pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
     impl<S: State> State for SetUpdatedAt<S> {
-        type CreatedAt = S::CreatedAt;
-        type Name = S::Name;
         type ContentMarkdown = S::ContentMarkdown;
-        type Id = S::Id;
+        type Name = S::Name;
+        type Disabled = S::Disabled;
         type LastUpdatedBy = S::LastUpdatedBy;
         type UpdatedAt = Set<members::updated_at>;
-        type Disabled = S::Disabled;
-    }
-    ///State transition - sets the `disabled` field to Set
-    pub struct SetDisabled<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDisabled<S> {}
-    impl<S: State> State for SetDisabled<S> {
         type CreatedAt = S::CreatedAt;
-        type Name = S::Name;
+        type Id = S::Id;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
         type ContentMarkdown = S::ContentMarkdown;
+        type Name = S::Name;
+        type Disabled = S::Disabled;
+        type LastUpdatedBy = S::LastUpdatedBy;
+        type UpdatedAt = S::UpdatedAt;
+        type CreatedAt = Set<members::created_at>;
         type Id = S::Id;
+    }
+    ///State transition - sets the `id` field to Set
+    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetId<S> {}
+    impl<S: State> State for SetId<S> {
+        type ContentMarkdown = S::ContentMarkdown;
+        type Name = S::Name;
+        type Disabled = S::Disabled;
         type LastUpdatedBy = S::LastUpdatedBy;
         type UpdatedAt = S::UpdatedAt;
-        type Disabled = Set<members::disabled>;
+        type CreatedAt = S::CreatedAt;
+        type Id = Set<members::id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `content_markdown` field
         pub struct content_markdown(());
-        ///Marker type for the `id` field
-        pub struct id(());
+        ///Marker type for the `name` field
+        pub struct name(());
+        ///Marker type for the `disabled` field
+        pub struct disabled(());
         ///Marker type for the `last_updated_by` field
         pub struct last_updated_by(());
         ///Marker type for the `updated_at` field
         pub struct updated_at(());
-        ///Marker type for the `disabled` field
-        pub struct disabled(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `id` field
+        pub struct id(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct TemplateViewBuilder<'a, S: template_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<bool>,
@@ -215,7 +219,7 @@ pub struct TemplateViewBuilder<'a, S: template_view_state::State> {
         Option<CowStr<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TemplateView<'a> {
@@ -229,19 +233,9 @@ impl<'a> TemplateViewBuilder<'a, template_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TemplateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -256,11 +250,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TemplateViewBuilder<'a, template_view_state::SetContentMarkdown<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TemplateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -275,11 +269,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TemplateViewBuilder<'a, template_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TemplateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -294,11 +288,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> TemplateViewBuilder<'a, template_view_state::SetDisabled<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TemplateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -313,11 +307,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TemplateViewBuilder<'a, template_view_state::SetId<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TemplateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -325,12 +319,12 @@ where
 impl<'a, S: template_view_state::State> TemplateViewBuilder<'a, S> {
     /// Set the `lang` field (optional)
     pub fn lang(mut self, value: impl Into<Option<Language>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `lang` field to an Option value (optional)
     pub fn maybe_lang(mut self, value: Option<Language>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -345,11 +339,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> TemplateViewBuilder<'a, template_view_state::SetLastUpdatedBy<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         TemplateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -364,11 +358,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TemplateViewBuilder<'a, template_view_state::SetName<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         TemplateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -376,12 +370,12 @@ where
 impl<'a, S: template_view_state::State> TemplateViewBuilder<'a, S> {
     /// Set the `subject` field (optional)
     pub fn subject(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `subject` field to an Option value (optional)
     pub fn maybe_subject(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -396,11 +390,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TemplateViewBuilder<'a, template_view_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         TemplateViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -408,26 +402,26 @@ where
 impl<'a, S> TemplateViewBuilder<'a, S>
 where
     S: template_view_state::State,
-    S::CreatedAt: template_view_state::IsSet,
-    S::Name: template_view_state::IsSet,
     S::ContentMarkdown: template_view_state::IsSet,
-    S::Id: template_view_state::IsSet,
+    S::Name: template_view_state::IsSet,
+    S::Disabled: template_view_state::IsSet,
     S::LastUpdatedBy: template_view_state::IsSet,
     S::UpdatedAt: template_view_state::IsSet,
-    S::Disabled: template_view_state::IsSet,
+    S::CreatedAt: template_view_state::IsSet,
+    S::Id: template_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TemplateView<'a> {
         TemplateView {
-            content_markdown: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            disabled: self.__unsafe_private_named.2.unwrap(),
-            id: self.__unsafe_private_named.3.unwrap(),
-            lang: self.__unsafe_private_named.4,
-            last_updated_by: self.__unsafe_private_named.5.unwrap(),
-            name: self.__unsafe_private_named.6.unwrap(),
-            subject: self.__unsafe_private_named.7,
-            updated_at: self.__unsafe_private_named.8.unwrap(),
+            content_markdown: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            disabled: self._fields.2.unwrap(),
+            id: self._fields.3.unwrap(),
+            lang: self._fields.4,
+            last_updated_by: self._fields.5.unwrap(),
+            name: self._fields.6.unwrap(),
+            subject: self._fields.7,
+            updated_at: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -440,15 +434,15 @@ where
         >,
     ) -> TemplateView<'a> {
         TemplateView {
-            content_markdown: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            disabled: self.__unsafe_private_named.2.unwrap(),
-            id: self.__unsafe_private_named.3.unwrap(),
-            lang: self.__unsafe_private_named.4,
-            last_updated_by: self.__unsafe_private_named.5.unwrap(),
-            name: self.__unsafe_private_named.6.unwrap(),
-            subject: self.__unsafe_private_named.7,
-            updated_at: self.__unsafe_private_named.8.unwrap(),
+            content_markdown: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            disabled: self._fields.2.unwrap(),
+            id: self._fields.3.unwrap(),
+            lang: self._fields.4,
+            last_updated_by: self._fields.5.unwrap(),
+            name: self._fields.6.unwrap(),
+            subject: self._fields.7,
+            updated_at: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/communication/create_template.rs b/crates/jacquard-api/src/tools_ozone/communication/create_template.rs
index 74939fb2..0dcf72d5 100644
--- a/crates/jacquard-api/src/tools_ozone/communication/create_template.rs
+++ b/crates/jacquard-api/src/tools_ozone/communication/create_template.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Language};
diff --git a/crates/jacquard-api/src/tools_ozone/communication/delete_template.rs b/crates/jacquard-api/src/tools_ozone/communication/delete_template.rs
index 7e6a1185..ea5bfaaf 100644
--- a/crates/jacquard-api/src/tools_ozone/communication/delete_template.rs
+++ b/crates/jacquard-api/src/tools_ozone/communication/delete_template.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/tools_ozone/communication/list_templates.rs b/crates/jacquard-api/src/tools_ozone/communication/list_templates.rs
index 46818c51..c6b82899 100644
--- a/crates/jacquard-api/src/tools_ozone/communication/list_templates.rs
+++ b/crates/jacquard-api/src/tools_ozone/communication/list_templates.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::{IntoStatic, lexicon};
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/tools_ozone/communication/update_template.rs b/crates/jacquard-api/src/tools_ozone/communication/update_template.rs
index eb4cc566..a72322c4 100644
--- a/crates/jacquard-api/src/tools_ozone/communication/update_template.rs
+++ b/crates/jacquard-api/src/tools_ozone/communication/update_template.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Language};
diff --git a/crates/jacquard-api/src/tools_ozone/hosting/get_account_history.rs b/crates/jacquard-api/src/tools_ozone/hosting/get_account_history.rs
index 48e34af0..797edc63 100644
--- a/crates/jacquard-api/src/tools_ozone/hosting/get_account_history.rs
+++ b/crates/jacquard-api/src/tools_ozone/hosting/get_account_history.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -438,63 +441,59 @@ pub mod event_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type CreatedAt;
         type Details;
         type CreatedBy;
-        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type CreatedAt = Unset;
         type Details = Unset;
         type CreatedBy = Unset;
-        type CreatedAt = Unset;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type CreatedAt = Set<members::created_at>;
+        type Details = S::Details;
+        type CreatedBy = S::CreatedBy;
     }
     ///State transition - sets the `details` field to Set
     pub struct SetDetails<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDetails<S> {}
     impl<S: State> State for SetDetails<S> {
+        type CreatedAt = S::CreatedAt;
         type Details = Set<members::details>;
         type CreatedBy = S::CreatedBy;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_by` field to Set
     pub struct SetCreatedBy<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedBy<S> {}
     impl<S: State> State for SetCreatedBy<S> {
-        type Details = S::Details;
-        type CreatedBy = Set<members::created_by>;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type Details = S::Details;
-        type CreatedBy = S::CreatedBy;
-        type CreatedAt = Set<members::created_at>;
+        type CreatedBy = Set<members::created_by>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `details` field
         pub struct details(());
         ///Marker type for the `created_by` field
         pub struct created_by(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EventBuilder<'a, S: event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<CowStr<'a>>,
-        Option<EventDetails<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<EventDetails<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Event<'a> {
@@ -508,9 +507,9 @@ impl<'a> EventBuilder<'a, event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -525,11 +524,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EventBuilder<'a, event_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -544,11 +543,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EventBuilder<'a, event_state::SetCreatedBy<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -563,11 +562,11 @@ where
         mut self,
         value: impl Into<EventDetails<'a>>,
     ) -> EventBuilder<'a, event_state::SetDetails<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -575,16 +574,16 @@ where
 impl<'a, S> EventBuilder<'a, S>
 where
     S: event_state::State,
+    S::CreatedAt: event_state::IsSet,
     S::Details: event_state::IsSet,
     S::CreatedBy: event_state::IsSet,
-    S::CreatedAt: event_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Event<'a> {
         Event {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            created_by: self.__unsafe_private_named.1.unwrap(),
-            details: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            created_by: self._fields.1.unwrap(),
+            details: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -597,9 +596,9 @@ where
         >,
     ) -> Event<'a> {
         Event {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            created_by: self.__unsafe_private_named.1.unwrap(),
-            details: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            created_by: self._fields.1.unwrap(),
+            details: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -639,9 +638,9 @@ pub mod handle_updated_state {
 
 /// Builder for constructing an instance of this type
 pub struct HandleUpdatedBuilder<'a, S: handle_updated_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Handle<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Handle<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> HandleUpdated<'a> {
@@ -655,9 +654,9 @@ impl<'a> HandleUpdatedBuilder<'a, handle_updated_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HandleUpdatedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -672,11 +671,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> HandleUpdatedBuilder<'a, handle_updated_state::SetHandle<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         HandleUpdatedBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -689,7 +688,7 @@ where
     /// Build the final struct
     pub fn build(self) -> HandleUpdated<'a> {
         HandleUpdated {
-            handle: self.__unsafe_private_named.0.unwrap(),
+            handle: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -702,7 +701,7 @@ where
         >,
     ) -> HandleUpdated<'a> {
         HandleUpdated {
-            handle: self.__unsafe_private_named.0.unwrap(),
+            handle: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -746,14 +745,9 @@ pub mod get_account_history_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetAccountHistoryBuilder<'a, S: get_account_history_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<Did<'a>>,
-        Option<Vec<CowStr<'a>>>,
-        Option<i64>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Did<'a>>, Option<Vec<CowStr<'a>>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetAccountHistory<'a> {
@@ -767,9 +761,9 @@ impl<'a> GetAccountHistoryBuilder<'a, get_account_history_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetAccountHistoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -777,12 +771,12 @@ impl<'a> GetAccountHistoryBuilder<'a, get_account_history_state::Empty> {
 impl<'a, S: get_account_history_state::State> GetAccountHistoryBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -797,11 +791,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetAccountHistoryBuilder<'a, get_account_history_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetAccountHistoryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -809,12 +803,12 @@ where
 impl<'a, S: get_account_history_state::State> GetAccountHistoryBuilder<'a, S> {
     /// Set the `events` field (optional)
     pub fn events(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `events` field to an Option value (optional)
     pub fn maybe_events(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -822,12 +816,12 @@ impl<'a, S: get_account_history_state::State> GetAccountHistoryBuilder<'a, S> {
 impl<'a, S: get_account_history_state::State> GetAccountHistoryBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -840,10 +834,10 @@ where
     /// Build the final struct
     pub fn build(self) -> GetAccountHistory<'a> {
         GetAccountHistory {
-            cursor: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            events: self.__unsafe_private_named.2,
-            limit: self.__unsafe_private_named.3,
+            cursor: self._fields.0,
+            did: self._fields.1.unwrap(),
+            events: self._fields.2,
+            limit: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation.rs b/crates/jacquard-api/src/tools_ozone/moderation.rs
index 8291e8f2..d60d3364 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation.rs
@@ -21,7 +21,11 @@ pub mod query_statuses;
 pub mod schedule_action;
 pub mod search_repos;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -3228,50 +3232,50 @@ pub mod account_event_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Active;
         type Timestamp;
+        type Active;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Active = Unset;
         type Timestamp = Unset;
-    }
-    ///State transition - sets the `active` field to Set
-    pub struct SetActive<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetActive<S> {}
-    impl<S: State> State for SetActive<S> {
-        type Active = Set<members::active>;
-        type Timestamp = S::Timestamp;
+        type Active = Unset;
     }
     ///State transition - sets the `timestamp` field to Set
     pub struct SetTimestamp<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTimestamp<S> {}
     impl<S: State> State for SetTimestamp<S> {
-        type Active = S::Active;
         type Timestamp = Set<members::timestamp>;
+        type Active = S::Active;
+    }
+    ///State transition - sets the `active` field to Set
+    pub struct SetActive<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetActive<S> {}
+    impl<S: State> State for SetActive<S> {
+        type Timestamp = S::Timestamp;
+        type Active = Set<members::active>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `active` field
-        pub struct active(());
         ///Marker type for the `timestamp` field
         pub struct timestamp(());
+        ///Marker type for the `active` field
+        pub struct active(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AccountEventBuilder<'a, S: account_event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<bool>,
         Option<CowStr<'a>>,
         Option<AccountEventStatus<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AccountEvent<'a> {
@@ -3285,9 +3289,9 @@ impl<'a> AccountEventBuilder<'a, account_event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AccountEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3302,11 +3306,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> AccountEventBuilder<'a, account_event_state::SetActive<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AccountEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3314,12 +3318,12 @@ where
 impl<'a, S: account_event_state::State> AccountEventBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -3327,12 +3331,12 @@ impl<'a, S: account_event_state::State> AccountEventBuilder<'a, S> {
 impl<'a, S: account_event_state::State> AccountEventBuilder<'a, S> {
     /// Set the `status` field (optional)
     pub fn status(mut self, value: impl Into<Option<AccountEventStatus<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
     pub fn maybe_status(mut self, value: Option<AccountEventStatus<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -3347,11 +3351,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AccountEventBuilder<'a, account_event_state::SetTimestamp<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         AccountEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -3359,16 +3363,16 @@ where
 impl<'a, S> AccountEventBuilder<'a, S>
 where
     S: account_event_state::State,
-    S::Active: account_event_state::IsSet,
     S::Timestamp: account_event_state::IsSet,
+    S::Active: account_event_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AccountEvent<'a> {
         AccountEvent {
-            active: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1,
-            status: self.__unsafe_private_named.2,
-            timestamp: self.__unsafe_private_named.3.unwrap(),
+            active: self._fields.0.unwrap(),
+            comment: self._fields.1,
+            status: self._fields.2,
+            timestamp: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -3378,10 +3382,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> AccountEvent<'a> {
         AccountEvent {
-            active: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1,
-            status: self.__unsafe_private_named.2,
-            timestamp: self.__unsafe_private_named.3.unwrap(),
+            active: self._fields.0.unwrap(),
+            comment: self._fields.1,
+            status: self._fields.2,
+            timestamp: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -6081,57 +6085,57 @@ pub mod age_assurance_event_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type CreatedAt;
-        type Status;
         type AttemptId;
+        type Status;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type CreatedAt = Unset;
-        type Status = Unset;
         type AttemptId = Unset;
+        type Status = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
         type CreatedAt = Set<members::created_at>;
-        type Status = S::Status;
-        type AttemptId = S::AttemptId;
-    }
-    ///State transition - sets the `status` field to Set
-    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetStatus<S> {}
-    impl<S: State> State for SetStatus<S> {
-        type CreatedAt = S::CreatedAt;
-        type Status = Set<members::status>;
         type AttemptId = S::AttemptId;
+        type Status = S::Status;
     }
     ///State transition - sets the `attempt_id` field to Set
     pub struct SetAttemptId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAttemptId<S> {}
     impl<S: State> State for SetAttemptId<S> {
         type CreatedAt = S::CreatedAt;
-        type Status = S::Status;
         type AttemptId = Set<members::attempt_id>;
+        type Status = S::Status;
+    }
+    ///State transition - sets the `status` field to Set
+    pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetStatus<S> {}
+    impl<S: State> State for SetStatus<S> {
+        type CreatedAt = S::CreatedAt;
+        type AttemptId = S::AttemptId;
+        type Status = Set<members::status>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `status` field
-        pub struct status(());
         ///Marker type for the `attempt_id` field
         pub struct attempt_id(());
+        ///Marker type for the `status` field
+        pub struct status(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AgeAssuranceEventBuilder<'a, S: age_assurance_event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Access<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
@@ -6143,7 +6147,7 @@ pub struct AgeAssuranceEventBuilder<'a, S: age_assurance_event_state::State> {
         Option<CowStr<'a>>,
         Option<AgeAssuranceEventStatus<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AgeAssuranceEvent<'a> {
@@ -6157,20 +6161,9 @@ impl<'a> AgeAssuranceEventBuilder<'a, age_assurance_event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AgeAssuranceEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6178,12 +6171,12 @@ impl<'a> AgeAssuranceEventBuilder<'a, age_assurance_event_state::Empty> {
 impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
     /// Set the `access` field (optional)
     pub fn access(mut self, value: impl Into<Option<Access<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `access` field to an Option value (optional)
     pub fn maybe_access(mut self, value: Option<Access<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -6198,11 +6191,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AgeAssuranceEventBuilder<'a, age_assurance_event_state::SetAttemptId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AgeAssuranceEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6210,12 +6203,12 @@ where
 impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
     /// Set the `completeIp` field (optional)
     pub fn complete_ip(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `completeIp` field to an Option value (optional)
     pub fn maybe_complete_ip(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -6223,12 +6216,12 @@ impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
 impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
     /// Set the `completeUa` field (optional)
     pub fn complete_ua(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `completeUa` field to an Option value (optional)
     pub fn maybe_complete_ua(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -6236,12 +6229,12 @@ impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
 impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
     /// Set the `countryCode` field (optional)
     pub fn country_code(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `countryCode` field to an Option value (optional)
     pub fn maybe_country_code(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -6256,11 +6249,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AgeAssuranceEventBuilder<'a, age_assurance_event_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         AgeAssuranceEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6268,12 +6261,12 @@ where
 impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
     /// Set the `initIp` field (optional)
     pub fn init_ip(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `initIp` field to an Option value (optional)
     pub fn maybe_init_ip(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -6281,12 +6274,12 @@ impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
 impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
     /// Set the `initUa` field (optional)
     pub fn init_ua(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `initUa` field to an Option value (optional)
     pub fn maybe_init_ua(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -6294,12 +6287,12 @@ impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
 impl<'a, S: age_assurance_event_state::State> AgeAssuranceEventBuilder<'a, S> {
     /// Set the `regionCode` field (optional)
     pub fn region_code(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `regionCode` field to an Option value (optional)
     pub fn maybe_region_code(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -6314,11 +6307,11 @@ where
         mut self,
         value: impl Into<AgeAssuranceEventStatus<'a>>,
     ) -> AgeAssuranceEventBuilder<'a, age_assurance_event_state::SetStatus<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         AgeAssuranceEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6327,22 +6320,22 @@ impl<'a, S> AgeAssuranceEventBuilder<'a, S>
 where
     S: age_assurance_event_state::State,
     S::CreatedAt: age_assurance_event_state::IsSet,
-    S::Status: age_assurance_event_state::IsSet,
     S::AttemptId: age_assurance_event_state::IsSet,
+    S::Status: age_assurance_event_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AgeAssuranceEvent<'a> {
         AgeAssuranceEvent {
-            access: self.__unsafe_private_named.0,
-            attempt_id: self.__unsafe_private_named.1.unwrap(),
-            complete_ip: self.__unsafe_private_named.2,
-            complete_ua: self.__unsafe_private_named.3,
-            country_code: self.__unsafe_private_named.4,
-            created_at: self.__unsafe_private_named.5.unwrap(),
-            init_ip: self.__unsafe_private_named.6,
-            init_ua: self.__unsafe_private_named.7,
-            region_code: self.__unsafe_private_named.8,
-            status: self.__unsafe_private_named.9.unwrap(),
+            access: self._fields.0,
+            attempt_id: self._fields.1.unwrap(),
+            complete_ip: self._fields.2,
+            complete_ua: self._fields.3,
+            country_code: self._fields.4,
+            created_at: self._fields.5.unwrap(),
+            init_ip: self._fields.6,
+            init_ua: self._fields.7,
+            region_code: self._fields.8,
+            status: self._fields.9.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -6352,16 +6345,16 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> AgeAssuranceEvent<'a> {
         AgeAssuranceEvent {
-            access: self.__unsafe_private_named.0,
-            attempt_id: self.__unsafe_private_named.1.unwrap(),
-            complete_ip: self.__unsafe_private_named.2,
-            complete_ua: self.__unsafe_private_named.3,
-            country_code: self.__unsafe_private_named.4,
-            created_at: self.__unsafe_private_named.5.unwrap(),
-            init_ip: self.__unsafe_private_named.6,
-            init_ua: self.__unsafe_private_named.7,
-            region_code: self.__unsafe_private_named.8,
-            status: self.__unsafe_private_named.9.unwrap(),
+            access: self._fields.0,
+            attempt_id: self._fields.1.unwrap(),
+            complete_ip: self._fields.2,
+            complete_ua: self._fields.3,
+            country_code: self._fields.4,
+            created_at: self._fields.5.unwrap(),
+            init_ip: self._fields.6,
+            init_ua: self._fields.7,
+            region_code: self._fields.8,
+            status: self._fields.9.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -6377,65 +6370,65 @@ pub mod blob_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Size;
-        type Cid;
         type MimeType;
+        type Cid;
+        type Size;
         type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Size = Unset;
-        type Cid = Unset;
         type MimeType = Unset;
+        type Cid = Unset;
+        type Size = Unset;
         type CreatedAt = Unset;
     }
-    ///State transition - sets the `size` field to Set
-    pub struct SetSize<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSize<S> {}
-    impl<S: State> State for SetSize<S> {
-        type Size = Set<members::size>;
+    ///State transition - sets the `mime_type` field to Set
+    pub struct SetMimeType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetMimeType<S> {}
+    impl<S: State> State for SetMimeType<S> {
+        type MimeType = Set<members::mime_type>;
         type Cid = S::Cid;
-        type MimeType = S::MimeType;
+        type Size = S::Size;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type Size = S::Size;
-        type Cid = Set<members::cid>;
         type MimeType = S::MimeType;
+        type Cid = Set<members::cid>;
+        type Size = S::Size;
         type CreatedAt = S::CreatedAt;
     }
-    ///State transition - sets the `mime_type` field to Set
-    pub struct SetMimeType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetMimeType<S> {}
-    impl<S: State> State for SetMimeType<S> {
-        type Size = S::Size;
+    ///State transition - sets the `size` field to Set
+    pub struct SetSize<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSize<S> {}
+    impl<S: State> State for SetSize<S> {
+        type MimeType = S::MimeType;
         type Cid = S::Cid;
-        type MimeType = Set<members::mime_type>;
+        type Size = Set<members::size>;
         type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Size = S::Size;
-        type Cid = S::Cid;
         type MimeType = S::MimeType;
+        type Cid = S::Cid;
+        type Size = S::Size;
         type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `size` field
-        pub struct size(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `mime_type` field
         pub struct mime_type(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
+        ///Marker type for the `size` field
+        pub struct size(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
     }
@@ -6443,8 +6436,8 @@ pub mod blob_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct BlobViewBuilder<'a, S: blob_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<Datetime>,
         Option<BlobViewDetails<'a>>,
@@ -6452,7 +6445,7 @@ pub struct BlobViewBuilder<'a, S: blob_view_state::State> {
         Option<moderation::Moderation<'a>>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> BlobView<'a> {
@@ -6466,9 +6459,9 @@ impl<'a> BlobViewBuilder<'a, blob_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BlobViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6483,11 +6476,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> BlobViewBuilder<'a, blob_view_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BlobViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6502,11 +6495,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BlobViewBuilder<'a, blob_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BlobViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6514,12 +6507,12 @@ where
 impl<'a, S: blob_view_state::State> BlobViewBuilder<'a, S> {
     /// Set the `details` field (optional)
     pub fn details(mut self, value: impl Into<Option<BlobViewDetails<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `details` field to an Option value (optional)
     pub fn maybe_details(mut self, value: Option<BlobViewDetails<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -6534,11 +6527,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BlobViewBuilder<'a, blob_view_state::SetMimeType<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         BlobViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6549,7 +6542,7 @@ impl<'a, S: blob_view_state::State> BlobViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<moderation::Moderation<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `moderation` field to an Option value (optional)
@@ -6557,7 +6550,7 @@ impl<'a, S: blob_view_state::State> BlobViewBuilder<'a, S> {
         mut self,
         value: Option<moderation::Moderation<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -6572,11 +6565,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> BlobViewBuilder<'a, blob_view_state::SetSize<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         BlobViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6584,20 +6577,20 @@ where
 impl<'a, S> BlobViewBuilder<'a, S>
 where
     S: blob_view_state::State,
-    S::Size: blob_view_state::IsSet,
-    S::Cid: blob_view_state::IsSet,
     S::MimeType: blob_view_state::IsSet,
+    S::Cid: blob_view_state::IsSet,
+    S::Size: blob_view_state::IsSet,
     S::CreatedAt: blob_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> BlobView<'a> {
         BlobView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            details: self.__unsafe_private_named.2,
-            mime_type: self.__unsafe_private_named.3.unwrap(),
-            moderation: self.__unsafe_private_named.4,
-            size: self.__unsafe_private_named.5.unwrap(),
+            cid: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            details: self._fields.2,
+            mime_type: self._fields.3.unwrap(),
+            moderation: self._fields.4,
+            size: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -6607,12 +6600,12 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> BlobView<'a> {
         BlobView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            details: self.__unsafe_private_named.2,
-            mime_type: self.__unsafe_private_named.3.unwrap(),
-            moderation: self.__unsafe_private_named.4,
-            size: self.__unsafe_private_named.5.unwrap(),
+            cid: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            details: self._fields.2,
+            mime_type: self._fields.3.unwrap(),
+            moderation: self._fields.4,
+            size: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -6652,15 +6645,15 @@ pub mod identity_event_state {
 
 /// Builder for constructing an instance of this type
 pub struct IdentityEventBuilder<'a, S: identity_event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Handle<'a>>,
         Option<UriValue<'a>>,
         Option<Datetime>,
         Option<bool>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> IdentityEvent<'a> {
@@ -6674,9 +6667,9 @@ impl<'a> IdentityEventBuilder<'a, identity_event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         IdentityEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6684,12 +6677,12 @@ impl<'a> IdentityEventBuilder<'a, identity_event_state::Empty> {
 impl<'a, S: identity_event_state::State> IdentityEventBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -6697,12 +6690,12 @@ impl<'a, S: identity_event_state::State> IdentityEventBuilder<'a, S> {
 impl<'a, S: identity_event_state::State> IdentityEventBuilder<'a, S> {
     /// Set the `handle` field (optional)
     pub fn handle(mut self, value: impl Into<Option<Handle<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `handle` field to an Option value (optional)
     pub fn maybe_handle(mut self, value: Option<Handle<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -6710,12 +6703,12 @@ impl<'a, S: identity_event_state::State> IdentityEventBuilder<'a, S> {
 impl<'a, S: identity_event_state::State> IdentityEventBuilder<'a, S> {
     /// Set the `pdsHost` field (optional)
     pub fn pds_host(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `pdsHost` field to an Option value (optional)
     pub fn maybe_pds_host(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -6730,11 +6723,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> IdentityEventBuilder<'a, identity_event_state::SetTimestamp<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         IdentityEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6742,12 +6735,12 @@ where
 impl<'a, S: identity_event_state::State> IdentityEventBuilder<'a, S> {
     /// Set the `tombstone` field (optional)
     pub fn tombstone(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `tombstone` field to an Option value (optional)
     pub fn maybe_tombstone(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -6760,11 +6753,11 @@ where
     /// Build the final struct
     pub fn build(self) -> IdentityEvent<'a> {
         IdentityEvent {
-            comment: self.__unsafe_private_named.0,
-            handle: self.__unsafe_private_named.1,
-            pds_host: self.__unsafe_private_named.2,
-            timestamp: self.__unsafe_private_named.3.unwrap(),
-            tombstone: self.__unsafe_private_named.4,
+            comment: self._fields.0,
+            handle: self._fields.1,
+            pds_host: self._fields.2,
+            timestamp: self._fields.3.unwrap(),
+            tombstone: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -6774,11 +6767,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> IdentityEvent<'a> {
         IdentityEvent {
-            comment: self.__unsafe_private_named.0,
-            handle: self.__unsafe_private_named.1,
-            pds_host: self.__unsafe_private_named.2,
-            timestamp: self.__unsafe_private_named.3.unwrap(),
-            tombstone: self.__unsafe_private_named.4,
+            comment: self._fields.0,
+            handle: self._fields.1,
+            pds_host: self._fields.2,
+            timestamp: self._fields.3.unwrap(),
+            tombstone: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
@@ -6830,9 +6823,9 @@ pub mod image_details_state {
 
 /// Builder for constructing an instance of this type
 pub struct ImageDetailsBuilder<'a, S: image_details_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ImageDetails<'a> {
@@ -6846,9 +6839,9 @@ impl<'a> ImageDetailsBuilder<'a, image_details_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ImageDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6863,11 +6856,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ImageDetailsBuilder<'a, image_details_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ImageDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6882,11 +6875,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ImageDetailsBuilder<'a, image_details_state::SetWidth<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ImageDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6900,8 +6893,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ImageDetails<'a> {
         ImageDetails {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -6911,8 +6904,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ImageDetails<'a> {
         ImageDetails {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -6964,14 +6957,14 @@ pub mod mod_event_label_state {
 
 /// Builder for constructing an instance of this type
 pub struct ModEventLabelBuilder<'a, S: mod_event_label_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Vec<CowStr<'a>>>,
         Option<i64>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ModEventLabel<'a> {
@@ -6985,9 +6978,9 @@ impl<'a> ModEventLabelBuilder<'a, mod_event_label_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ModEventLabelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -6995,12 +6988,12 @@ impl<'a> ModEventLabelBuilder<'a, mod_event_label_state::Empty> {
 impl<'a, S: mod_event_label_state::State> ModEventLabelBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -7015,11 +7008,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> ModEventLabelBuilder<'a, mod_event_label_state::SetCreateLabelVals<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ModEventLabelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7027,12 +7020,12 @@ where
 impl<'a, S: mod_event_label_state::State> ModEventLabelBuilder<'a, S> {
     /// Set the `durationInHours` field (optional)
     pub fn duration_in_hours(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `durationInHours` field to an Option value (optional)
     pub fn maybe_duration_in_hours(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -7047,11 +7040,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> ModEventLabelBuilder<'a, mod_event_label_state::SetNegateLabelVals<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ModEventLabelBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7065,10 +7058,10 @@ where
     /// Build the final struct
     pub fn build(self) -> ModEventLabel<'a> {
         ModEventLabel {
-            comment: self.__unsafe_private_named.0,
-            create_label_vals: self.__unsafe_private_named.1.unwrap(),
-            duration_in_hours: self.__unsafe_private_named.2,
-            negate_label_vals: self.__unsafe_private_named.3.unwrap(),
+            comment: self._fields.0,
+            create_label_vals: self._fields.1.unwrap(),
+            duration_in_hours: self._fields.2,
+            negate_label_vals: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -7078,10 +7071,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ModEventLabel<'a> {
         ModEventLabel {
-            comment: self.__unsafe_private_named.0,
-            create_label_vals: self.__unsafe_private_named.1.unwrap(),
-            duration_in_hours: self.__unsafe_private_named.2,
-            negate_label_vals: self.__unsafe_private_named.3.unwrap(),
+            comment: self._fields.0,
+            create_label_vals: self._fields.1.unwrap(),
+            duration_in_hours: self._fields.2,
+            negate_label_vals: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -7121,9 +7114,9 @@ pub mod mod_event_mute_state {
 
 /// Builder for constructing an instance of this type
 pub struct ModEventMuteBuilder<'a, S: mod_event_mute_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ModEventMute<'a> {
@@ -7137,9 +7130,9 @@ impl<'a> ModEventMuteBuilder<'a, mod_event_mute_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ModEventMuteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7147,12 +7140,12 @@ impl<'a> ModEventMuteBuilder<'a, mod_event_mute_state::Empty> {
 impl<'a, S: mod_event_mute_state::State> ModEventMuteBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -7167,11 +7160,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ModEventMuteBuilder<'a, mod_event_mute_state::SetDurationInHours<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ModEventMuteBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7184,8 +7177,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ModEventMute<'a> {
         ModEventMute {
-            comment: self.__unsafe_private_named.0,
-            duration_in_hours: self.__unsafe_private_named.1.unwrap(),
+            comment: self._fields.0,
+            duration_in_hours: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -7195,8 +7188,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ModEventMute<'a> {
         ModEventMute {
-            comment: self.__unsafe_private_named.0,
-            duration_in_hours: self.__unsafe_private_named.1.unwrap(),
+            comment: self._fields.0,
+            duration_in_hours: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -7236,9 +7229,9 @@ pub mod mod_event_priority_score_state {
 
 /// Builder for constructing an instance of this type
 pub struct ModEventPriorityScoreBuilder<'a, S: mod_event_priority_score_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ModEventPriorityScore<'a> {
@@ -7255,9 +7248,9 @@ impl<'a> ModEventPriorityScoreBuilder<'a, mod_event_priority_score_state::Empty>
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ModEventPriorityScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7265,12 +7258,12 @@ impl<'a> ModEventPriorityScoreBuilder<'a, mod_event_priority_score_state::Empty>
 impl<'a, S: mod_event_priority_score_state::State> ModEventPriorityScoreBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -7285,11 +7278,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ModEventPriorityScoreBuilder<'a, mod_event_priority_score_state::SetScore<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ModEventPriorityScoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7302,8 +7295,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ModEventPriorityScore<'a> {
         ModEventPriorityScore {
-            comment: self.__unsafe_private_named.0,
-            score: self.__unsafe_private_named.1.unwrap(),
+            comment: self._fields.0,
+            score: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -7313,8 +7306,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ModEventPriorityScore<'a> {
         ModEventPriorityScore {
-            comment: self.__unsafe_private_named.0,
-            score: self.__unsafe_private_named.1.unwrap(),
+            comment: self._fields.0,
+            score: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -7354,9 +7347,9 @@ pub mod mod_event_report_state {
 
 /// Builder for constructing an instance of this type
 pub struct ModEventReportBuilder<'a, S: mod_event_report_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<bool>, Option<ReasonType<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<bool>, Option<ReasonType<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ModEventReport<'a> {
@@ -7370,9 +7363,9 @@ impl<'a> ModEventReportBuilder<'a, mod_event_report_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ModEventReportBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7380,12 +7373,12 @@ impl<'a> ModEventReportBuilder<'a, mod_event_report_state::Empty> {
 impl<'a, S: mod_event_report_state::State> ModEventReportBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -7393,12 +7386,12 @@ impl<'a, S: mod_event_report_state::State> ModEventReportBuilder<'a, S> {
 impl<'a, S: mod_event_report_state::State> ModEventReportBuilder<'a, S> {
     /// Set the `isReporterMuted` field (optional)
     pub fn is_reporter_muted(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `isReporterMuted` field to an Option value (optional)
     pub fn maybe_is_reporter_muted(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -7413,11 +7406,11 @@ where
         mut self,
         value: impl Into<ReasonType<'a>>,
     ) -> ModEventReportBuilder<'a, mod_event_report_state::SetReportType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ModEventReportBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7430,9 +7423,9 @@ where
     /// Build the final struct
     pub fn build(self) -> ModEventReport<'a> {
         ModEventReport {
-            comment: self.__unsafe_private_named.0,
-            is_reporter_muted: self.__unsafe_private_named.1,
-            report_type: self.__unsafe_private_named.2.unwrap(),
+            comment: self._fields.0,
+            is_reporter_muted: self._fields.1,
+            report_type: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -7442,9 +7435,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ModEventReport<'a> {
         ModEventReport {
-            comment: self.__unsafe_private_named.0,
-            is_reporter_muted: self.__unsafe_private_named.1,
-            report_type: self.__unsafe_private_named.2.unwrap(),
+            comment: self._fields.0,
+            is_reporter_muted: self._fields.1,
+            report_type: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -7460,49 +7453,45 @@ pub mod mod_event_tag_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Remove;
         type Add;
+        type Remove;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Remove = Unset;
         type Add = Unset;
-    }
-    ///State transition - sets the `remove` field to Set
-    pub struct SetRemove<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRemove<S> {}
-    impl<S: State> State for SetRemove<S> {
-        type Remove = Set<members::remove>;
-        type Add = S::Add;
+        type Remove = Unset;
     }
     ///State transition - sets the `add` field to Set
     pub struct SetAdd<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAdd<S> {}
     impl<S: State> State for SetAdd<S> {
-        type Remove = S::Remove;
         type Add = Set<members::add>;
+        type Remove = S::Remove;
+    }
+    ///State transition - sets the `remove` field to Set
+    pub struct SetRemove<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRemove<S> {}
+    impl<S: State> State for SetRemove<S> {
+        type Add = S::Add;
+        type Remove = Set<members::remove>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `remove` field
-        pub struct remove(());
         ///Marker type for the `add` field
         pub struct add(());
+        ///Marker type for the `remove` field
+        pub struct remove(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ModEventTagBuilder<'a, S: mod_event_tag_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<CowStr<'a>>>,
-        Option<CowStr<'a>>,
-        Option<Vec<CowStr<'a>>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<CowStr<'a>>>, Option<CowStr<'a>>, Option<Vec<CowStr<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ModEventTag<'a> {
@@ -7516,9 +7505,9 @@ impl<'a> ModEventTagBuilder<'a, mod_event_tag_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ModEventTagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7533,11 +7522,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> ModEventTagBuilder<'a, mod_event_tag_state::SetAdd<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ModEventTagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7545,12 +7534,12 @@ where
 impl<'a, S: mod_event_tag_state::State> ModEventTagBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -7565,11 +7554,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> ModEventTagBuilder<'a, mod_event_tag_state::SetRemove<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ModEventTagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7577,15 +7566,15 @@ where
 impl<'a, S> ModEventTagBuilder<'a, S>
 where
     S: mod_event_tag_state::State,
-    S::Remove: mod_event_tag_state::IsSet,
     S::Add: mod_event_tag_state::IsSet,
+    S::Remove: mod_event_tag_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ModEventTag<'a> {
         ModEventTag {
-            add: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1,
-            remove: self.__unsafe_private_named.2.unwrap(),
+            add: self._fields.0.unwrap(),
+            comment: self._fields.1,
+            remove: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -7595,9 +7584,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ModEventTag<'a> {
         ModEventTag {
-            add: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1,
-            remove: self.__unsafe_private_named.2.unwrap(),
+            add: self._fields.0.unwrap(),
+            comment: self._fields.1,
+            remove: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -7613,112 +7602,112 @@ pub mod mod_event_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Id;
+        type Subject;
         type Event;
         type CreatedBy;
-        type Subject;
         type SubjectBlobCids;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Id = Unset;
+        type Subject = Unset;
         type Event = Unset;
         type CreatedBy = Unset;
-        type Subject = Unset;
         type SubjectBlobCids = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Id = S::Id;
-        type Event = S::Event;
-        type CreatedBy = S::CreatedBy;
-        type Subject = S::Subject;
-        type SubjectBlobCids = S::SubjectBlobCids;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetId<S> {}
     impl<S: State> State for SetId<S> {
-        type CreatedAt = S::CreatedAt;
         type Id = Set<members::id>;
+        type Subject = S::Subject;
+        type Event = S::Event;
+        type CreatedBy = S::CreatedBy;
+        type SubjectBlobCids = S::SubjectBlobCids;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type Id = S::Id;
+        type Subject = Set<members::subject>;
         type Event = S::Event;
         type CreatedBy = S::CreatedBy;
-        type Subject = S::Subject;
         type SubjectBlobCids = S::SubjectBlobCids;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `event` field to Set
     pub struct SetEvent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEvent<S> {}
     impl<S: State> State for SetEvent<S> {
-        type CreatedAt = S::CreatedAt;
         type Id = S::Id;
+        type Subject = S::Subject;
         type Event = Set<members::event>;
         type CreatedBy = S::CreatedBy;
-        type Subject = S::Subject;
         type SubjectBlobCids = S::SubjectBlobCids;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `created_by` field to Set
     pub struct SetCreatedBy<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedBy<S> {}
     impl<S: State> State for SetCreatedBy<S> {
-        type CreatedAt = S::CreatedAt;
         type Id = S::Id;
+        type Subject = S::Subject;
         type Event = S::Event;
         type CreatedBy = Set<members::created_by>;
-        type Subject = S::Subject;
         type SubjectBlobCids = S::SubjectBlobCids;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
         type CreatedAt = S::CreatedAt;
-        type Id = S::Id;
-        type Event = S::Event;
-        type CreatedBy = S::CreatedBy;
-        type Subject = Set<members::subject>;
-        type SubjectBlobCids = S::SubjectBlobCids;
     }
     ///State transition - sets the `subject_blob_cids` field to Set
     pub struct SetSubjectBlobCids<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubjectBlobCids<S> {}
     impl<S: State> State for SetSubjectBlobCids<S> {
-        type CreatedAt = S::CreatedAt;
         type Id = S::Id;
+        type Subject = S::Subject;
         type Event = S::Event;
         type CreatedBy = S::CreatedBy;
-        type Subject = S::Subject;
         type SubjectBlobCids = Set<members::subject_blob_cids>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Id = S::Id;
+        type Subject = S::Subject;
+        type Event = S::Event;
+        type CreatedBy = S::CreatedBy;
+        type SubjectBlobCids = S::SubjectBlobCids;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `id` field
         pub struct id(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
         ///Marker type for the `event` field
         pub struct event(());
         ///Marker type for the `created_by` field
         pub struct created_by(());
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `subject_blob_cids` field
         pub struct subject_blob_cids(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ModEventViewBuilder<'a, S: mod_event_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
@@ -7729,7 +7718,7 @@ pub struct ModEventViewBuilder<'a, S: mod_event_view_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ModEventView<'a> {
@@ -7743,19 +7732,9 @@ impl<'a> ModEventViewBuilder<'a, mod_event_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ModEventViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7770,11 +7749,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ModEventViewBuilder<'a, mod_event_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ModEventViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7789,11 +7768,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ModEventViewBuilder<'a, mod_event_view_state::SetCreatedBy<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ModEventViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7801,12 +7780,12 @@ where
 impl<'a, S: mod_event_view_state::State> ModEventViewBuilder<'a, S> {
     /// Set the `creatorHandle` field (optional)
     pub fn creator_handle(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `creatorHandle` field to an Option value (optional)
     pub fn maybe_creator_handle(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -7821,11 +7800,11 @@ where
         mut self,
         value: impl Into<ModEventViewEvent<'a>>,
     ) -> ModEventViewBuilder<'a, mod_event_view_state::SetEvent<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ModEventViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7840,11 +7819,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ModEventViewBuilder<'a, mod_event_view_state::SetId<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ModEventViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7855,12 +7834,12 @@ impl<'a, S: mod_event_view_state::State> ModEventViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<moderation::ModTool<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `modTool` field to an Option value (optional)
     pub fn maybe_mod_tool(mut self, value: Option<moderation::ModTool<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -7875,11 +7854,11 @@ where
         mut self,
         value: impl Into<ModEventViewSubject<'a>>,
     ) -> ModEventViewBuilder<'a, mod_event_view_state::SetSubject<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ModEventViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7894,11 +7873,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> ModEventViewBuilder<'a, mod_event_view_state::SetSubjectBlobCids<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ModEventViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -7906,12 +7885,12 @@ where
 impl<'a, S: mod_event_view_state::State> ModEventViewBuilder<'a, S> {
     /// Set the `subjectHandle` field (optional)
     pub fn subject_handle(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `subjectHandle` field to an Option value (optional)
     pub fn maybe_subject_handle(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -7919,25 +7898,25 @@ impl<'a, S: mod_event_view_state::State> ModEventViewBuilder<'a, S> {
 impl<'a, S> ModEventViewBuilder<'a, S>
 where
     S: mod_event_view_state::State,
-    S::CreatedAt: mod_event_view_state::IsSet,
     S::Id: mod_event_view_state::IsSet,
+    S::Subject: mod_event_view_state::IsSet,
     S::Event: mod_event_view_state::IsSet,
     S::CreatedBy: mod_event_view_state::IsSet,
-    S::Subject: mod_event_view_state::IsSet,
     S::SubjectBlobCids: mod_event_view_state::IsSet,
+    S::CreatedAt: mod_event_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ModEventView<'a> {
         ModEventView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            created_by: self.__unsafe_private_named.1.unwrap(),
-            creator_handle: self.__unsafe_private_named.2,
-            event: self.__unsafe_private_named.3.unwrap(),
-            id: self.__unsafe_private_named.4.unwrap(),
-            mod_tool: self.__unsafe_private_named.5,
-            subject: self.__unsafe_private_named.6.unwrap(),
-            subject_blob_cids: self.__unsafe_private_named.7.unwrap(),
-            subject_handle: self.__unsafe_private_named.8,
+            created_at: self._fields.0.unwrap(),
+            created_by: self._fields.1.unwrap(),
+            creator_handle: self._fields.2,
+            event: self._fields.3.unwrap(),
+            id: self._fields.4.unwrap(),
+            mod_tool: self._fields.5,
+            subject: self._fields.6.unwrap(),
+            subject_blob_cids: self._fields.7.unwrap(),
+            subject_handle: self._fields.8,
             extra_data: Default::default(),
         }
     }
@@ -7947,15 +7926,15 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ModEventView<'a> {
         ModEventView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            created_by: self.__unsafe_private_named.1.unwrap(),
-            creator_handle: self.__unsafe_private_named.2,
-            event: self.__unsafe_private_named.3.unwrap(),
-            id: self.__unsafe_private_named.4.unwrap(),
-            mod_tool: self.__unsafe_private_named.5,
-            subject: self.__unsafe_private_named.6.unwrap(),
-            subject_blob_cids: self.__unsafe_private_named.7.unwrap(),
-            subject_handle: self.__unsafe_private_named.8,
+            created_at: self._fields.0.unwrap(),
+            created_by: self._fields.1.unwrap(),
+            creator_handle: self._fields.2,
+            event: self._fields.3.unwrap(),
+            id: self._fields.4.unwrap(),
+            mod_tool: self._fields.5,
+            subject: self._fields.6.unwrap(),
+            subject_blob_cids: self._fields.7.unwrap(),
+            subject_handle: self._fields.8,
             extra_data: Some(extra_data),
         }
     }
@@ -7971,112 +7950,112 @@ pub mod mod_event_view_detail_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Id;
-        type Event;
         type CreatedBy;
-        type Subject;
         type SubjectBlobs;
+        type Subject;
         type CreatedAt;
+        type Id;
+        type Event;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Id = Unset;
-        type Event = Unset;
         type CreatedBy = Unset;
-        type Subject = Unset;
         type SubjectBlobs = Unset;
+        type Subject = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `id` field to Set
-    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetId<S> {}
-    impl<S: State> State for SetId<S> {
-        type Id = Set<members::id>;
-        type Event = S::Event;
-        type CreatedBy = S::CreatedBy;
-        type Subject = S::Subject;
-        type SubjectBlobs = S::SubjectBlobs;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `event` field to Set
-    pub struct SetEvent<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetEvent<S> {}
-    impl<S: State> State for SetEvent<S> {
-        type Id = S::Id;
-        type Event = Set<members::event>;
-        type CreatedBy = S::CreatedBy;
-        type Subject = S::Subject;
-        type SubjectBlobs = S::SubjectBlobs;
-        type CreatedAt = S::CreatedAt;
+        type Id = Unset;
+        type Event = Unset;
     }
     ///State transition - sets the `created_by` field to Set
     pub struct SetCreatedBy<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedBy<S> {}
     impl<S: State> State for SetCreatedBy<S> {
-        type Id = S::Id;
-        type Event = S::Event;
         type CreatedBy = Set<members::created_by>;
-        type Subject = S::Subject;
         type SubjectBlobs = S::SubjectBlobs;
+        type Subject = S::Subject;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
         type Id = S::Id;
         type Event = S::Event;
-        type CreatedBy = S::CreatedBy;
-        type Subject = Set<members::subject>;
-        type SubjectBlobs = S::SubjectBlobs;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `subject_blobs` field to Set
     pub struct SetSubjectBlobs<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubjectBlobs<S> {}
     impl<S: State> State for SetSubjectBlobs<S> {
+        type CreatedBy = S::CreatedBy;
+        type SubjectBlobs = Set<members::subject_blobs>;
+        type Subject = S::Subject;
+        type CreatedAt = S::CreatedAt;
         type Id = S::Id;
         type Event = S::Event;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
         type CreatedBy = S::CreatedBy;
-        type Subject = S::Subject;
-        type SubjectBlobs = Set<members::subject_blobs>;
+        type SubjectBlobs = S::SubjectBlobs;
+        type Subject = Set<members::subject>;
         type CreatedAt = S::CreatedAt;
+        type Id = S::Id;
+        type Event = S::Event;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type CreatedBy = S::CreatedBy;
+        type SubjectBlobs = S::SubjectBlobs;
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
         type Id = S::Id;
         type Event = S::Event;
+    }
+    ///State transition - sets the `id` field to Set
+    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetId<S> {}
+    impl<S: State> State for SetId<S> {
         type CreatedBy = S::CreatedBy;
+        type SubjectBlobs = S::SubjectBlobs;
         type Subject = S::Subject;
+        type CreatedAt = S::CreatedAt;
+        type Id = Set<members::id>;
+        type Event = S::Event;
+    }
+    ///State transition - sets the `event` field to Set
+    pub struct SetEvent<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetEvent<S> {}
+    impl<S: State> State for SetEvent<S> {
+        type CreatedBy = S::CreatedBy;
         type SubjectBlobs = S::SubjectBlobs;
-        type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+        type CreatedAt = S::CreatedAt;
+        type Id = S::Id;
+        type Event = Set<members::event>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `id` field
-        pub struct id(());
-        ///Marker type for the `event` field
-        pub struct event(());
         ///Marker type for the `created_by` field
         pub struct created_by(());
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `subject_blobs` field
         pub struct subject_blobs(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `id` field
+        pub struct id(());
+        ///Marker type for the `event` field
+        pub struct event(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ModEventViewDetailBuilder<'a, S: mod_event_view_detail_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Did<'a>>,
         Option<ModEventViewDetailEvent<'a>>,
@@ -8085,7 +8064,7 @@ pub struct ModEventViewDetailBuilder<'a, S: mod_event_view_detail_state::State>
         Option<ModEventViewDetailSubject<'a>>,
         Option<Vec<moderation::BlobView<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ModEventViewDetail<'a> {
@@ -8099,9 +8078,9 @@ impl<'a> ModEventViewDetailBuilder<'a, mod_event_view_detail_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ModEventViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8116,11 +8095,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ModEventViewDetailBuilder<'a, mod_event_view_detail_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ModEventViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8135,11 +8114,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ModEventViewDetailBuilder<'a, mod_event_view_detail_state::SetCreatedBy<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ModEventViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8154,11 +8133,11 @@ where
         mut self,
         value: impl Into<ModEventViewDetailEvent<'a>>,
     ) -> ModEventViewDetailBuilder<'a, mod_event_view_detail_state::SetEvent<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ModEventViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8173,11 +8152,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ModEventViewDetailBuilder<'a, mod_event_view_detail_state::SetId<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ModEventViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8188,12 +8167,12 @@ impl<'a, S: mod_event_view_detail_state::State> ModEventViewDetailBuilder<'a, S>
         mut self,
         value: impl Into<Option<moderation::ModTool<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `modTool` field to an Option value (optional)
     pub fn maybe_mod_tool(mut self, value: Option<moderation::ModTool<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -8208,11 +8187,11 @@ where
         mut self,
         value: impl Into<ModEventViewDetailSubject<'a>>,
     ) -> ModEventViewDetailBuilder<'a, mod_event_view_detail_state::SetSubject<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ModEventViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8227,11 +8206,11 @@ where
         mut self,
         value: impl Into<Vec<moderation::BlobView<'a>>>,
     ) -> ModEventViewDetailBuilder<'a, mod_event_view_detail_state::SetSubjectBlobs<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ModEventViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8239,23 +8218,23 @@ where
 impl<'a, S> ModEventViewDetailBuilder<'a, S>
 where
     S: mod_event_view_detail_state::State,
-    S::Id: mod_event_view_detail_state::IsSet,
-    S::Event: mod_event_view_detail_state::IsSet,
     S::CreatedBy: mod_event_view_detail_state::IsSet,
-    S::Subject: mod_event_view_detail_state::IsSet,
     S::SubjectBlobs: mod_event_view_detail_state::IsSet,
+    S::Subject: mod_event_view_detail_state::IsSet,
     S::CreatedAt: mod_event_view_detail_state::IsSet,
+    S::Id: mod_event_view_detail_state::IsSet,
+    S::Event: mod_event_view_detail_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ModEventViewDetail<'a> {
         ModEventViewDetail {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            created_by: self.__unsafe_private_named.1.unwrap(),
-            event: self.__unsafe_private_named.2.unwrap(),
-            id: self.__unsafe_private_named.3.unwrap(),
-            mod_tool: self.__unsafe_private_named.4,
-            subject: self.__unsafe_private_named.5.unwrap(),
-            subject_blobs: self.__unsafe_private_named.6.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            created_by: self._fields.1.unwrap(),
+            event: self._fields.2.unwrap(),
+            id: self._fields.3.unwrap(),
+            mod_tool: self._fields.4,
+            subject: self._fields.5.unwrap(),
+            subject_blobs: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -8265,13 +8244,13 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ModEventViewDetail<'a> {
         ModEventViewDetail {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            created_by: self.__unsafe_private_named.1.unwrap(),
-            event: self.__unsafe_private_named.2.unwrap(),
-            id: self.__unsafe_private_named.3.unwrap(),
-            mod_tool: self.__unsafe_private_named.4,
-            subject: self.__unsafe_private_named.5.unwrap(),
-            subject_blobs: self.__unsafe_private_named.6.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            created_by: self._fields.1.unwrap(),
+            event: self._fields.2.unwrap(),
+            id: self._fields.3.unwrap(),
+            mod_tool: self._fields.4,
+            subject: self._fields.5.unwrap(),
+            subject_blobs: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -8323,14 +8302,14 @@ pub mod record_event_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordEventBuilder<'a, S: record_event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<CowStr<'a>>,
         Option<RecordEventOp<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RecordEvent<'a> {
@@ -8344,9 +8323,9 @@ impl<'a> RecordEventBuilder<'a, record_event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8354,12 +8333,12 @@ impl<'a> RecordEventBuilder<'a, record_event_state::Empty> {
 impl<'a, S: record_event_state::State> RecordEventBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -8367,12 +8346,12 @@ impl<'a, S: record_event_state::State> RecordEventBuilder<'a, S> {
 impl<'a, S: record_event_state::State> RecordEventBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -8387,11 +8366,11 @@ where
         mut self,
         value: impl Into<RecordEventOp<'a>>,
     ) -> RecordEventBuilder<'a, record_event_state::SetOp<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RecordEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8406,11 +8385,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RecordEventBuilder<'a, record_event_state::SetTimestamp<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RecordEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8424,10 +8403,10 @@ where
     /// Build the final struct
     pub fn build(self) -> RecordEvent<'a> {
         RecordEvent {
-            cid: self.__unsafe_private_named.0,
-            comment: self.__unsafe_private_named.1,
-            op: self.__unsafe_private_named.2.unwrap(),
-            timestamp: self.__unsafe_private_named.3.unwrap(),
+            cid: self._fields.0,
+            comment: self._fields.1,
+            op: self._fields.2.unwrap(),
+            timestamp: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -8437,10 +8416,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> RecordEvent<'a> {
         RecordEvent {
-            cid: self.__unsafe_private_named.0,
-            comment: self.__unsafe_private_named.1,
-            op: self.__unsafe_private_named.2.unwrap(),
-            timestamp: self.__unsafe_private_named.3.unwrap(),
+            cid: self._fields.0,
+            comment: self._fields.1,
+            op: self._fields.2.unwrap(),
+            timestamp: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -8456,134 +8435,134 @@ pub mod record_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Repo;
-        type Uri;
-        type Value;
         type Cid;
+        type Value;
         type IndexedAt;
-        type BlobCids;
+        type Uri;
         type Moderation;
+        type Repo;
+        type BlobCids;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Repo = Unset;
-        type Uri = Unset;
-        type Value = Unset;
         type Cid = Unset;
+        type Value = Unset;
         type IndexedAt = Unset;
-        type BlobCids = Unset;
+        type Uri = Unset;
         type Moderation = Unset;
+        type Repo = Unset;
+        type BlobCids = Unset;
     }
-    ///State transition - sets the `repo` field to Set
-    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepo<S> {}
-    impl<S: State> State for SetRepo<S> {
-        type Repo = Set<members::repo>;
-        type Uri = S::Uri;
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Cid = Set<members::cid>;
         type Value = S::Value;
-        type Cid = S::Cid;
         type IndexedAt = S::IndexedAt;
-        type BlobCids = S::BlobCids;
+        type Uri = S::Uri;
         type Moderation = S::Moderation;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
         type Repo = S::Repo;
-        type Uri = Set<members::uri>;
-        type Value = S::Value;
-        type Cid = S::Cid;
-        type IndexedAt = S::IndexedAt;
         type BlobCids = S::BlobCids;
-        type Moderation = S::Moderation;
     }
     ///State transition - sets the `value` field to Set
     pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetValue<S> {}
     impl<S: State> State for SetValue<S> {
-        type Repo = S::Repo;
-        type Uri = S::Uri;
-        type Value = Set<members::value>;
         type Cid = S::Cid;
+        type Value = Set<members::value>;
         type IndexedAt = S::IndexedAt;
-        type BlobCids = S::BlobCids;
+        type Uri = S::Uri;
         type Moderation = S::Moderation;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
         type Repo = S::Repo;
-        type Uri = S::Uri;
-        type Value = S::Value;
-        type Cid = Set<members::cid>;
-        type IndexedAt = S::IndexedAt;
         type BlobCids = S::BlobCids;
-        type Moderation = S::Moderation;
     }
     ///State transition - sets the `indexed_at` field to Set
     pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
     impl<S: State> State for SetIndexedAt<S> {
-        type Repo = S::Repo;
-        type Uri = S::Uri;
-        type Value = S::Value;
         type Cid = S::Cid;
+        type Value = S::Value;
         type IndexedAt = Set<members::indexed_at>;
-        type BlobCids = S::BlobCids;
+        type Uri = S::Uri;
         type Moderation = S::Moderation;
-    }
-    ///State transition - sets the `blob_cids` field to Set
-    pub struct SetBlobCids<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetBlobCids<S> {}
-    impl<S: State> State for SetBlobCids<S> {
         type Repo = S::Repo;
-        type Uri = S::Uri;
-        type Value = S::Value;
+        type BlobCids = S::BlobCids;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
         type Cid = S::Cid;
+        type Value = S::Value;
         type IndexedAt = S::IndexedAt;
-        type BlobCids = Set<members::blob_cids>;
+        type Uri = Set<members::uri>;
         type Moderation = S::Moderation;
+        type Repo = S::Repo;
+        type BlobCids = S::BlobCids;
     }
     ///State transition - sets the `moderation` field to Set
     pub struct SetModeration<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetModeration<S> {}
     impl<S: State> State for SetModeration<S> {
-        type Repo = S::Repo;
-        type Uri = S::Uri;
+        type Cid = S::Cid;
         type Value = S::Value;
+        type IndexedAt = S::IndexedAt;
+        type Uri = S::Uri;
+        type Moderation = Set<members::moderation>;
+        type Repo = S::Repo;
+        type BlobCids = S::BlobCids;
+    }
+    ///State transition - sets the `repo` field to Set
+    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepo<S> {}
+    impl<S: State> State for SetRepo<S> {
         type Cid = S::Cid;
+        type Value = S::Value;
         type IndexedAt = S::IndexedAt;
+        type Uri = S::Uri;
+        type Moderation = S::Moderation;
+        type Repo = Set<members::repo>;
         type BlobCids = S::BlobCids;
-        type Moderation = Set<members::moderation>;
+    }
+    ///State transition - sets the `blob_cids` field to Set
+    pub struct SetBlobCids<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetBlobCids<S> {}
+    impl<S: State> State for SetBlobCids<S> {
+        type Cid = S::Cid;
+        type Value = S::Value;
+        type IndexedAt = S::IndexedAt;
+        type Uri = S::Uri;
+        type Moderation = S::Moderation;
+        type Repo = S::Repo;
+        type BlobCids = Set<members::blob_cids>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `repo` field
-        pub struct repo(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
-        ///Marker type for the `value` field
-        pub struct value(());
         ///Marker type for the `cid` field
         pub struct cid(());
+        ///Marker type for the `value` field
+        pub struct value(());
         ///Marker type for the `indexed_at` field
         pub struct indexed_at(());
-        ///Marker type for the `blob_cids` field
-        pub struct blob_cids(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
         ///Marker type for the `moderation` field
         pub struct moderation(());
+        ///Marker type for the `repo` field
+        pub struct repo(());
+        ///Marker type for the `blob_cids` field
+        pub struct blob_cids(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RecordViewBuilder<'a, S: record_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<Cid<'a>>>,
         Option<Cid<'a>>,
         Option<Datetime>,
@@ -8592,7 +8571,7 @@ pub struct RecordViewBuilder<'a, S: record_view_state::State> {
         Option<AtUri<'a>>,
         Option<Data<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RecordView<'a> {
@@ -8606,9 +8585,9 @@ impl<'a> RecordViewBuilder<'a, record_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8623,11 +8602,11 @@ where
         mut self,
         value: impl Into<Vec<Cid<'a>>>,
     ) -> RecordViewBuilder<'a, record_view_state::SetBlobCids<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8642,11 +8621,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> RecordViewBuilder<'a, record_view_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RecordViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8661,11 +8640,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RecordViewBuilder<'a, record_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RecordViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8680,11 +8659,11 @@ where
         mut self,
         value: impl Into<moderation::Moderation<'a>>,
     ) -> RecordViewBuilder<'a, record_view_state::SetModeration<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RecordViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8699,11 +8678,11 @@ where
         mut self,
         value: impl Into<moderation::RepoView<'a>>,
     ) -> RecordViewBuilder<'a, record_view_state::SetRepo<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RecordViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8718,11 +8697,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RecordViewBuilder<'a, record_view_state::SetUri<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         RecordViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8737,11 +8716,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> RecordViewBuilder<'a, record_view_state::SetValue<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         RecordViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8749,24 +8728,24 @@ where
 impl<'a, S> RecordViewBuilder<'a, S>
 where
     S: record_view_state::State,
-    S::Repo: record_view_state::IsSet,
-    S::Uri: record_view_state::IsSet,
-    S::Value: record_view_state::IsSet,
     S::Cid: record_view_state::IsSet,
+    S::Value: record_view_state::IsSet,
     S::IndexedAt: record_view_state::IsSet,
-    S::BlobCids: record_view_state::IsSet,
+    S::Uri: record_view_state::IsSet,
     S::Moderation: record_view_state::IsSet,
+    S::Repo: record_view_state::IsSet,
+    S::BlobCids: record_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RecordView<'a> {
         RecordView {
-            blob_cids: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            moderation: self.__unsafe_private_named.3.unwrap(),
-            repo: self.__unsafe_private_named.4.unwrap(),
-            uri: self.__unsafe_private_named.5.unwrap(),
-            value: self.__unsafe_private_named.6.unwrap(),
+            blob_cids: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            moderation: self._fields.3.unwrap(),
+            repo: self._fields.4.unwrap(),
+            uri: self._fields.5.unwrap(),
+            value: self._fields.6.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -8776,13 +8755,13 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> RecordView<'a> {
         RecordView {
-            blob_cids: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            moderation: self.__unsafe_private_named.3.unwrap(),
-            repo: self.__unsafe_private_named.4.unwrap(),
-            uri: self.__unsafe_private_named.5.unwrap(),
-            value: self.__unsafe_private_named.6.unwrap(),
+            blob_cids: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            moderation: self._fields.3.unwrap(),
+            repo: self._fields.4.unwrap(),
+            uri: self._fields.5.unwrap(),
+            value: self._fields.6.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -8799,133 +8778,133 @@ pub mod record_view_detail_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Blobs;
+        type IndexedAt;
         type Repo;
         type Uri;
+        type Cid;
         type Moderation;
         type Value;
-        type Cid;
-        type IndexedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Blobs = Unset;
+        type IndexedAt = Unset;
         type Repo = Unset;
         type Uri = Unset;
+        type Cid = Unset;
         type Moderation = Unset;
         type Value = Unset;
-        type Cid = Unset;
-        type IndexedAt = Unset;
     }
     ///State transition - sets the `blobs` field to Set
     pub struct SetBlobs<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetBlobs<S> {}
     impl<S: State> State for SetBlobs<S> {
         type Blobs = Set<members::blobs>;
+        type IndexedAt = S::IndexedAt;
         type Repo = S::Repo;
         type Uri = S::Uri;
+        type Cid = S::Cid;
         type Moderation = S::Moderation;
         type Value = S::Value;
+    }
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
+        type Blobs = S::Blobs;
+        type IndexedAt = Set<members::indexed_at>;
+        type Repo = S::Repo;
+        type Uri = S::Uri;
         type Cid = S::Cid;
-        type IndexedAt = S::IndexedAt;
+        type Moderation = S::Moderation;
+        type Value = S::Value;
     }
     ///State transition - sets the `repo` field to Set
     pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRepo<S> {}
     impl<S: State> State for SetRepo<S> {
         type Blobs = S::Blobs;
+        type IndexedAt = S::IndexedAt;
         type Repo = Set<members::repo>;
         type Uri = S::Uri;
+        type Cid = S::Cid;
         type Moderation = S::Moderation;
         type Value = S::Value;
-        type Cid = S::Cid;
-        type IndexedAt = S::IndexedAt;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
         type Blobs = S::Blobs;
+        type IndexedAt = S::IndexedAt;
         type Repo = S::Repo;
         type Uri = Set<members::uri>;
+        type Cid = S::Cid;
         type Moderation = S::Moderation;
         type Value = S::Value;
-        type Cid = S::Cid;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCid<S> {}
+    impl<S: State> State for SetCid<S> {
+        type Blobs = S::Blobs;
         type IndexedAt = S::IndexedAt;
+        type Repo = S::Repo;
+        type Uri = S::Uri;
+        type Cid = Set<members::cid>;
+        type Moderation = S::Moderation;
+        type Value = S::Value;
     }
     ///State transition - sets the `moderation` field to Set
     pub struct SetModeration<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetModeration<S> {}
     impl<S: State> State for SetModeration<S> {
         type Blobs = S::Blobs;
+        type IndexedAt = S::IndexedAt;
         type Repo = S::Repo;
         type Uri = S::Uri;
+        type Cid = S::Cid;
         type Moderation = Set<members::moderation>;
         type Value = S::Value;
-        type Cid = S::Cid;
-        type IndexedAt = S::IndexedAt;
     }
     ///State transition - sets the `value` field to Set
     pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetValue<S> {}
     impl<S: State> State for SetValue<S> {
         type Blobs = S::Blobs;
-        type Repo = S::Repo;
-        type Uri = S::Uri;
-        type Moderation = S::Moderation;
-        type Value = Set<members::value>;
-        type Cid = S::Cid;
         type IndexedAt = S::IndexedAt;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCid<S> {}
-    impl<S: State> State for SetCid<S> {
-        type Blobs = S::Blobs;
         type Repo = S::Repo;
         type Uri = S::Uri;
-        type Moderation = S::Moderation;
-        type Value = S::Value;
-        type Cid = Set<members::cid>;
-        type IndexedAt = S::IndexedAt;
-    }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
-        type Blobs = S::Blobs;
-        type Repo = S::Repo;
-        type Uri = S::Uri;
-        type Moderation = S::Moderation;
-        type Value = S::Value;
         type Cid = S::Cid;
-        type IndexedAt = Set<members::indexed_at>;
+        type Moderation = S::Moderation;
+        type Value = Set<members::value>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `blobs` field
         pub struct blobs(());
+        ///Marker type for the `indexed_at` field
+        pub struct indexed_at(());
         ///Marker type for the `repo` field
         pub struct repo(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
         ///Marker type for the `moderation` field
         pub struct moderation(());
         ///Marker type for the `value` field
         pub struct value(());
-        ///Marker type for the `cid` field
-        pub struct cid(());
-        ///Marker type for the `indexed_at` field
-        pub struct indexed_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RecordViewDetailBuilder<'a, S: record_view_detail_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<moderation::BlobView<'a>>>,
         Option<Cid<'a>>,
         Option<Datetime>,
@@ -8935,7 +8914,7 @@ pub struct RecordViewDetailBuilder<'a, S: record_view_detail_state::State> {
         Option<AtUri<'a>>,
         Option<Data<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RecordViewDetail<'a> {
@@ -8949,9 +8928,9 @@ impl<'a> RecordViewDetailBuilder<'a, record_view_detail_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8966,11 +8945,11 @@ where
         mut self,
         value: impl Into<Vec<moderation::BlobView<'a>>>,
     ) -> RecordViewDetailBuilder<'a, record_view_detail_state::SetBlobs<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -8985,11 +8964,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> RecordViewDetailBuilder<'a, record_view_detail_state::SetCid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RecordViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9004,11 +8983,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RecordViewDetailBuilder<'a, record_view_detail_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RecordViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9016,12 +8995,12 @@ where
 impl<'a, S: record_view_detail_state::State> RecordViewDetailBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -9036,11 +9015,11 @@ where
         mut self,
         value: impl Into<moderation::ModerationDetail<'a>>,
     ) -> RecordViewDetailBuilder<'a, record_view_detail_state::SetModeration<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RecordViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9055,11 +9034,11 @@ where
         mut self,
         value: impl Into<moderation::RepoView<'a>>,
     ) -> RecordViewDetailBuilder<'a, record_view_detail_state::SetRepo<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         RecordViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9074,11 +9053,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RecordViewDetailBuilder<'a, record_view_detail_state::SetUri<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         RecordViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9093,11 +9072,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> RecordViewDetailBuilder<'a, record_view_detail_state::SetValue<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         RecordViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9106,24 +9085,24 @@ impl<'a, S> RecordViewDetailBuilder<'a, S>
 where
     S: record_view_detail_state::State,
     S::Blobs: record_view_detail_state::IsSet,
+    S::IndexedAt: record_view_detail_state::IsSet,
     S::Repo: record_view_detail_state::IsSet,
     S::Uri: record_view_detail_state::IsSet,
+    S::Cid: record_view_detail_state::IsSet,
     S::Moderation: record_view_detail_state::IsSet,
     S::Value: record_view_detail_state::IsSet,
-    S::Cid: record_view_detail_state::IsSet,
-    S::IndexedAt: record_view_detail_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RecordViewDetail<'a> {
         RecordViewDetail {
-            blobs: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            labels: self.__unsafe_private_named.3,
-            moderation: self.__unsafe_private_named.4.unwrap(),
-            repo: self.__unsafe_private_named.5.unwrap(),
-            uri: self.__unsafe_private_named.6.unwrap(),
-            value: self.__unsafe_private_named.7.unwrap(),
+            blobs: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            labels: self._fields.3,
+            moderation: self._fields.4.unwrap(),
+            repo: self._fields.5.unwrap(),
+            uri: self._fields.6.unwrap(),
+            value: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -9133,14 +9112,14 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> RecordViewDetail<'a> {
         RecordViewDetail {
-            blobs: self.__unsafe_private_named.0.unwrap(),
-            cid: self.__unsafe_private_named.1.unwrap(),
-            indexed_at: self.__unsafe_private_named.2.unwrap(),
-            labels: self.__unsafe_private_named.3,
-            moderation: self.__unsafe_private_named.4.unwrap(),
-            repo: self.__unsafe_private_named.5.unwrap(),
-            uri: self.__unsafe_private_named.6.unwrap(),
-            value: self.__unsafe_private_named.7.unwrap(),
+            blobs: self._fields.0.unwrap(),
+            cid: self._fields.1.unwrap(),
+            indexed_at: self._fields.2.unwrap(),
+            labels: self._fields.3,
+            moderation: self._fields.4.unwrap(),
+            repo: self._fields.5.unwrap(),
+            uri: self._fields.6.unwrap(),
+            value: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -9180,9 +9159,9 @@ pub mod record_view_not_found_state {
 
 /// Builder for constructing an instance of this type
 pub struct RecordViewNotFoundBuilder<'a, S: record_view_not_found_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AtUri<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AtUri<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RecordViewNotFound<'a> {
@@ -9196,9 +9175,9 @@ impl<'a> RecordViewNotFoundBuilder<'a, record_view_not_found_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordViewNotFoundBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9213,11 +9192,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RecordViewNotFoundBuilder<'a, record_view_not_found_state::SetUri<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordViewNotFoundBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9230,7 +9209,7 @@ where
     /// Build the final struct
     pub fn build(self) -> RecordViewNotFound<'a> {
         RecordViewNotFound {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -9240,7 +9219,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> RecordViewNotFound<'a> {
         RecordViewNotFound {
-            uri: self.__unsafe_private_named.0.unwrap(),
+            uri: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -9258,8 +9237,8 @@ pub mod repo_view_state {
     pub trait State: sealed::Sealed {
         type Handle;
         type Moderation;
-        type RelatedRecords;
         type Did;
+        type RelatedRecords;
         type IndexedAt;
     }
     /// Empty state - all required fields are unset
@@ -9268,8 +9247,8 @@ pub mod repo_view_state {
     impl State for Empty {
         type Handle = Unset;
         type Moderation = Unset;
-        type RelatedRecords = Unset;
         type Did = Unset;
+        type RelatedRecords = Unset;
         type IndexedAt = Unset;
     }
     ///State transition - sets the `handle` field to Set
@@ -9278,8 +9257,8 @@ pub mod repo_view_state {
     impl<S: State> State for SetHandle<S> {
         type Handle = Set<members::handle>;
         type Moderation = S::Moderation;
-        type RelatedRecords = S::RelatedRecords;
         type Did = S::Did;
+        type RelatedRecords = S::RelatedRecords;
         type IndexedAt = S::IndexedAt;
     }
     ///State transition - sets the `moderation` field to Set
@@ -9287,19 +9266,9 @@ pub mod repo_view_state {
     impl<S: State> sealed::Sealed for SetModeration<S> {}
     impl<S: State> State for SetModeration<S> {
         type Handle = S::Handle;
-        type Moderation = Set<members::moderation>;
-        type RelatedRecords = S::RelatedRecords;
-        type Did = S::Did;
-        type IndexedAt = S::IndexedAt;
-    }
-    ///State transition - sets the `related_records` field to Set
-    pub struct SetRelatedRecords<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRelatedRecords<S> {}
-    impl<S: State> State for SetRelatedRecords<S> {
-        type Handle = S::Handle;
-        type Moderation = S::Moderation;
-        type RelatedRecords = Set<members::related_records>;
+        type Moderation = Set<members::moderation>;
         type Did = S::Did;
+        type RelatedRecords = S::RelatedRecords;
         type IndexedAt = S::IndexedAt;
     }
     ///State transition - sets the `did` field to Set
@@ -9308,8 +9277,18 @@ pub mod repo_view_state {
     impl<S: State> State for SetDid<S> {
         type Handle = S::Handle;
         type Moderation = S::Moderation;
-        type RelatedRecords = S::RelatedRecords;
         type Did = Set<members::did>;
+        type RelatedRecords = S::RelatedRecords;
+        type IndexedAt = S::IndexedAt;
+    }
+    ///State transition - sets the `related_records` field to Set
+    pub struct SetRelatedRecords<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRelatedRecords<S> {}
+    impl<S: State> State for SetRelatedRecords<S> {
+        type Handle = S::Handle;
+        type Moderation = S::Moderation;
+        type Did = S::Did;
+        type RelatedRecords = Set<members::related_records>;
         type IndexedAt = S::IndexedAt;
     }
     ///State transition - sets the `indexed_at` field to Set
@@ -9318,8 +9297,8 @@ pub mod repo_view_state {
     impl<S: State> State for SetIndexedAt<S> {
         type Handle = S::Handle;
         type Moderation = S::Moderation;
-        type RelatedRecords = S::RelatedRecords;
         type Did = S::Did;
+        type RelatedRecords = S::RelatedRecords;
         type IndexedAt = Set<members::indexed_at>;
     }
     /// Marker types for field names
@@ -9329,10 +9308,10 @@ pub mod repo_view_state {
         pub struct handle(());
         ///Marker type for the `moderation` field
         pub struct moderation(());
-        ///Marker type for the `related_records` field
-        pub struct related_records(());
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `related_records` field
+        pub struct related_records(());
         ///Marker type for the `indexed_at` field
         pub struct indexed_at(());
     }
@@ -9340,8 +9319,8 @@ pub mod repo_view_state {
 
 /// Builder for constructing an instance of this type
 pub struct RepoViewBuilder<'a, S: repo_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
@@ -9354,7 +9333,7 @@ pub struct RepoViewBuilder<'a, S: repo_view_state::State> {
         Option<Vec<Data<'a>>>,
         Option<Vec<ThreatSignature<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RepoView<'a> {
@@ -9368,21 +9347,9 @@ impl<'a> RepoViewBuilder<'a, repo_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RepoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9390,12 +9357,12 @@ impl<'a> RepoViewBuilder<'a, repo_view_state::Empty> {
 impl<'a, S: repo_view_state::State> RepoViewBuilder<'a, S> {
     /// Set the `deactivatedAt` field (optional)
     pub fn deactivated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `deactivatedAt` field to an Option value (optional)
     pub fn maybe_deactivated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -9410,11 +9377,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> RepoViewBuilder<'a, repo_view_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RepoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9422,12 +9389,12 @@ where
 impl<'a, S: repo_view_state::State> RepoViewBuilder<'a, S> {
     /// Set the `email` field (optional)
     pub fn email(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `email` field to an Option value (optional)
     pub fn maybe_email(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -9442,11 +9409,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> RepoViewBuilder<'a, repo_view_state::SetHandle<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RepoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9461,11 +9428,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RepoViewBuilder<'a, repo_view_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RepoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9473,12 +9440,12 @@ where
 impl<'a, S: repo_view_state::State> RepoViewBuilder<'a, S> {
     /// Set the `inviteNote` field (optional)
     pub fn invite_note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `inviteNote` field to an Option value (optional)
     pub fn maybe_invite_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -9486,12 +9453,12 @@ impl<'a, S: repo_view_state::State> RepoViewBuilder<'a, S> {
 impl<'a, S: repo_view_state::State> RepoViewBuilder<'a, S> {
     /// Set the `invitedBy` field (optional)
     pub fn invited_by(mut self, value: impl Into<Option<InviteCode<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `invitedBy` field to an Option value (optional)
     pub fn maybe_invited_by(mut self, value: Option<InviteCode<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -9499,12 +9466,12 @@ impl<'a, S: repo_view_state::State> RepoViewBuilder<'a, S> {
 impl<'a, S: repo_view_state::State> RepoViewBuilder<'a, S> {
     /// Set the `invitesDisabled` field (optional)
     pub fn invites_disabled(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `invitesDisabled` field to an Option value (optional)
     pub fn maybe_invites_disabled(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -9519,11 +9486,11 @@ where
         mut self,
         value: impl Into<moderation::Moderation<'a>>,
     ) -> RepoViewBuilder<'a, repo_view_state::SetModeration<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         RepoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9538,11 +9505,11 @@ where
         mut self,
         value: impl Into<Vec<Data<'a>>>,
     ) -> RepoViewBuilder<'a, repo_view_state::SetRelatedRecords<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         RepoViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9553,7 +9520,7 @@ impl<'a, S: repo_view_state::State> RepoViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<ThreatSignature<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `threatSignatures` field to an Option value (optional)
@@ -9561,7 +9528,7 @@ impl<'a, S: repo_view_state::State> RepoViewBuilder<'a, S> {
         mut self,
         value: Option<Vec<ThreatSignature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -9571,24 +9538,24 @@ where
     S: repo_view_state::State,
     S::Handle: repo_view_state::IsSet,
     S::Moderation: repo_view_state::IsSet,
-    S::RelatedRecords: repo_view_state::IsSet,
     S::Did: repo_view_state::IsSet,
+    S::RelatedRecords: repo_view_state::IsSet,
     S::IndexedAt: repo_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RepoView<'a> {
         RepoView {
-            deactivated_at: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            email: self.__unsafe_private_named.2,
-            handle: self.__unsafe_private_named.3.unwrap(),
-            indexed_at: self.__unsafe_private_named.4.unwrap(),
-            invite_note: self.__unsafe_private_named.5,
-            invited_by: self.__unsafe_private_named.6,
-            invites_disabled: self.__unsafe_private_named.7,
-            moderation: self.__unsafe_private_named.8.unwrap(),
-            related_records: self.__unsafe_private_named.9.unwrap(),
-            threat_signatures: self.__unsafe_private_named.10,
+            deactivated_at: self._fields.0,
+            did: self._fields.1.unwrap(),
+            email: self._fields.2,
+            handle: self._fields.3.unwrap(),
+            indexed_at: self._fields.4.unwrap(),
+            invite_note: self._fields.5,
+            invited_by: self._fields.6,
+            invites_disabled: self._fields.7,
+            moderation: self._fields.8.unwrap(),
+            related_records: self._fields.9.unwrap(),
+            threat_signatures: self._fields.10,
             extra_data: Default::default(),
         }
     }
@@ -9598,17 +9565,17 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> RepoView<'a> {
         RepoView {
-            deactivated_at: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            email: self.__unsafe_private_named.2,
-            handle: self.__unsafe_private_named.3.unwrap(),
-            indexed_at: self.__unsafe_private_named.4.unwrap(),
-            invite_note: self.__unsafe_private_named.5,
-            invited_by: self.__unsafe_private_named.6,
-            invites_disabled: self.__unsafe_private_named.7,
-            moderation: self.__unsafe_private_named.8.unwrap(),
-            related_records: self.__unsafe_private_named.9.unwrap(),
-            threat_signatures: self.__unsafe_private_named.10,
+            deactivated_at: self._fields.0,
+            did: self._fields.1.unwrap(),
+            email: self._fields.2,
+            handle: self._fields.3.unwrap(),
+            indexed_at: self._fields.4.unwrap(),
+            invite_note: self._fields.5,
+            invited_by: self._fields.6,
+            invites_disabled: self._fields.7,
+            moderation: self._fields.8.unwrap(),
+            related_records: self._fields.9.unwrap(),
+            threat_signatures: self._fields.10,
             extra_data: Some(extra_data),
         }
     }
@@ -9625,9 +9592,9 @@ pub mod repo_view_detail_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Did;
+        type IndexedAt;
         type Handle;
         type RelatedRecords;
-        type IndexedAt;
         type Moderation;
     }
     /// Empty state - all required fields are unset
@@ -9635,9 +9602,9 @@ pub mod repo_view_detail_state {
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Did = Unset;
+        type IndexedAt = Unset;
         type Handle = Unset;
         type RelatedRecords = Unset;
-        type IndexedAt = Unset;
         type Moderation = Unset;
     }
     ///State transition - sets the `did` field to Set
@@ -9645,9 +9612,19 @@ pub mod repo_view_detail_state {
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
         type Did = Set<members::did>;
+        type IndexedAt = S::IndexedAt;
+        type Handle = S::Handle;
+        type RelatedRecords = S::RelatedRecords;
+        type Moderation = S::Moderation;
+    }
+    ///State transition - sets the `indexed_at` field to Set
+    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
+    impl<S: State> State for SetIndexedAt<S> {
+        type Did = S::Did;
+        type IndexedAt = Set<members::indexed_at>;
         type Handle = S::Handle;
         type RelatedRecords = S::RelatedRecords;
-        type IndexedAt = S::IndexedAt;
         type Moderation = S::Moderation;
     }
     ///State transition - sets the `handle` field to Set
@@ -9655,9 +9632,9 @@ pub mod repo_view_detail_state {
     impl<S: State> sealed::Sealed for SetHandle<S> {}
     impl<S: State> State for SetHandle<S> {
         type Did = S::Did;
+        type IndexedAt = S::IndexedAt;
         type Handle = Set<members::handle>;
         type RelatedRecords = S::RelatedRecords;
-        type IndexedAt = S::IndexedAt;
         type Moderation = S::Moderation;
     }
     ///State transition - sets the `related_records` field to Set
@@ -9665,19 +9642,9 @@ pub mod repo_view_detail_state {
     impl<S: State> sealed::Sealed for SetRelatedRecords<S> {}
     impl<S: State> State for SetRelatedRecords<S> {
         type Did = S::Did;
-        type Handle = S::Handle;
-        type RelatedRecords = Set<members::related_records>;
         type IndexedAt = S::IndexedAt;
-        type Moderation = S::Moderation;
-    }
-    ///State transition - sets the `indexed_at` field to Set
-    pub struct SetIndexedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetIndexedAt<S> {}
-    impl<S: State> State for SetIndexedAt<S> {
-        type Did = S::Did;
         type Handle = S::Handle;
-        type RelatedRecords = S::RelatedRecords;
-        type IndexedAt = Set<members::indexed_at>;
+        type RelatedRecords = Set<members::related_records>;
         type Moderation = S::Moderation;
     }
     ///State transition - sets the `moderation` field to Set
@@ -9685,9 +9652,9 @@ pub mod repo_view_detail_state {
     impl<S: State> sealed::Sealed for SetModeration<S> {}
     impl<S: State> State for SetModeration<S> {
         type Did = S::Did;
+        type IndexedAt = S::IndexedAt;
         type Handle = S::Handle;
         type RelatedRecords = S::RelatedRecords;
-        type IndexedAt = S::IndexedAt;
         type Moderation = Set<members::moderation>;
     }
     /// Marker types for field names
@@ -9695,12 +9662,12 @@ pub mod repo_view_detail_state {
     pub mod members {
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `indexed_at` field
+        pub struct indexed_at(());
         ///Marker type for the `handle` field
         pub struct handle(());
         ///Marker type for the `related_records` field
         pub struct related_records(());
-        ///Marker type for the `indexed_at` field
-        pub struct indexed_at(());
         ///Marker type for the `moderation` field
         pub struct moderation(());
     }
@@ -9708,8 +9675,8 @@ pub mod repo_view_detail_state {
 
 /// Builder for constructing an instance of this type
 pub struct RepoViewDetailBuilder<'a, S: repo_view_detail_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
@@ -9725,7 +9692,7 @@ pub struct RepoViewDetailBuilder<'a, S: repo_view_detail_state::State> {
         Option<Vec<Data<'a>>>,
         Option<Vec<ThreatSignature<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RepoViewDetail<'a> {
@@ -9739,8 +9706,8 @@ impl<'a> RepoViewDetailBuilder<'a, repo_view_detail_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RepoViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -9756,7 +9723,7 @@ impl<'a> RepoViewDetailBuilder<'a, repo_view_detail_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9764,12 +9731,12 @@ impl<'a> RepoViewDetailBuilder<'a, repo_view_detail_state::Empty> {
 impl<'a, S: repo_view_detail_state::State> RepoViewDetailBuilder<'a, S> {
     /// Set the `deactivatedAt` field (optional)
     pub fn deactivated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `deactivatedAt` field to an Option value (optional)
     pub fn maybe_deactivated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -9784,11 +9751,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> RepoViewDetailBuilder<'a, repo_view_detail_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RepoViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9796,12 +9763,12 @@ where
 impl<'a, S: repo_view_detail_state::State> RepoViewDetailBuilder<'a, S> {
     /// Set the `email` field (optional)
     pub fn email(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `email` field to an Option value (optional)
     pub fn maybe_email(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -9809,12 +9776,12 @@ impl<'a, S: repo_view_detail_state::State> RepoViewDetailBuilder<'a, S> {
 impl<'a, S: repo_view_detail_state::State> RepoViewDetailBuilder<'a, S> {
     /// Set the `emailConfirmedAt` field (optional)
     pub fn email_confirmed_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `emailConfirmedAt` field to an Option value (optional)
     pub fn maybe_email_confirmed_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -9829,11 +9796,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> RepoViewDetailBuilder<'a, repo_view_detail_state::SetHandle<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         RepoViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9848,11 +9815,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> RepoViewDetailBuilder<'a, repo_view_detail_state::SetIndexedAt<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         RepoViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9860,12 +9827,12 @@ where
 impl<'a, S: repo_view_detail_state::State> RepoViewDetailBuilder<'a, S> {
     /// Set the `inviteNote` field (optional)
     pub fn invite_note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `inviteNote` field to an Option value (optional)
     pub fn maybe_invite_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -9873,12 +9840,12 @@ impl<'a, S: repo_view_detail_state::State> RepoViewDetailBuilder<'a, S> {
 impl<'a, S: repo_view_detail_state::State> RepoViewDetailBuilder<'a, S> {
     /// Set the `invitedBy` field (optional)
     pub fn invited_by(mut self, value: impl Into<Option<InviteCode<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `invitedBy` field to an Option value (optional)
     pub fn maybe_invited_by(mut self, value: Option<InviteCode<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -9886,12 +9853,12 @@ impl<'a, S: repo_view_detail_state::State> RepoViewDetailBuilder<'a, S> {
 impl<'a, S: repo_view_detail_state::State> RepoViewDetailBuilder<'a, S> {
     /// Set the `invites` field (optional)
     pub fn invites(mut self, value: impl Into<Option<Vec<InviteCode<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `invites` field to an Option value (optional)
     pub fn maybe_invites(mut self, value: Option<Vec<InviteCode<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -9899,12 +9866,12 @@ impl<'a, S: repo_view_detail_state::State> RepoViewDetailBuilder<'a, S> {
 impl<'a, S: repo_view_detail_state::State> RepoViewDetailBuilder<'a, S> {
     /// Set the `invitesDisabled` field (optional)
     pub fn invites_disabled(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `invitesDisabled` field to an Option value (optional)
     pub fn maybe_invites_disabled(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -9912,12 +9879,12 @@ impl<'a, S: repo_view_detail_state::State> RepoViewDetailBuilder<'a, S> {
 impl<'a, S: repo_view_detail_state::State> RepoViewDetailBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<Vec<Label<'a>>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<Vec<Label<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -9932,11 +9899,11 @@ where
         mut self,
         value: impl Into<moderation::ModerationDetail<'a>>,
     ) -> RepoViewDetailBuilder<'a, repo_view_detail_state::SetModeration<S>> {
-        self.__unsafe_private_named.11 = Option::Some(value.into());
+        self._fields.11 = Option::Some(value.into());
         RepoViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9951,11 +9918,11 @@ where
         mut self,
         value: impl Into<Vec<Data<'a>>>,
     ) -> RepoViewDetailBuilder<'a, repo_view_detail_state::SetRelatedRecords<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         RepoViewDetailBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -9966,7 +9933,7 @@ impl<'a, S: repo_view_detail_state::State> RepoViewDetailBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<ThreatSignature<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `threatSignatures` field to an Option value (optional)
@@ -9974,7 +9941,7 @@ impl<'a, S: repo_view_detail_state::State> RepoViewDetailBuilder<'a, S> {
         mut self,
         value: Option<Vec<ThreatSignature<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -9983,28 +9950,28 @@ impl<'a, S> RepoViewDetailBuilder<'a, S>
 where
     S: repo_view_detail_state::State,
     S::Did: repo_view_detail_state::IsSet,
+    S::IndexedAt: repo_view_detail_state::IsSet,
     S::Handle: repo_view_detail_state::IsSet,
     S::RelatedRecords: repo_view_detail_state::IsSet,
-    S::IndexedAt: repo_view_detail_state::IsSet,
     S::Moderation: repo_view_detail_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RepoViewDetail<'a> {
         RepoViewDetail {
-            deactivated_at: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            email: self.__unsafe_private_named.2,
-            email_confirmed_at: self.__unsafe_private_named.3,
-            handle: self.__unsafe_private_named.4.unwrap(),
-            indexed_at: self.__unsafe_private_named.5.unwrap(),
-            invite_note: self.__unsafe_private_named.6,
-            invited_by: self.__unsafe_private_named.7,
-            invites: self.__unsafe_private_named.8,
-            invites_disabled: self.__unsafe_private_named.9,
-            labels: self.__unsafe_private_named.10,
-            moderation: self.__unsafe_private_named.11.unwrap(),
-            related_records: self.__unsafe_private_named.12.unwrap(),
-            threat_signatures: self.__unsafe_private_named.13,
+            deactivated_at: self._fields.0,
+            did: self._fields.1.unwrap(),
+            email: self._fields.2,
+            email_confirmed_at: self._fields.3,
+            handle: self._fields.4.unwrap(),
+            indexed_at: self._fields.5.unwrap(),
+            invite_note: self._fields.6,
+            invited_by: self._fields.7,
+            invites: self._fields.8,
+            invites_disabled: self._fields.9,
+            labels: self._fields.10,
+            moderation: self._fields.11.unwrap(),
+            related_records: self._fields.12.unwrap(),
+            threat_signatures: self._fields.13,
             extra_data: Default::default(),
         }
     }
@@ -10014,20 +9981,20 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> RepoViewDetail<'a> {
         RepoViewDetail {
-            deactivated_at: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            email: self.__unsafe_private_named.2,
-            email_confirmed_at: self.__unsafe_private_named.3,
-            handle: self.__unsafe_private_named.4.unwrap(),
-            indexed_at: self.__unsafe_private_named.5.unwrap(),
-            invite_note: self.__unsafe_private_named.6,
-            invited_by: self.__unsafe_private_named.7,
-            invites: self.__unsafe_private_named.8,
-            invites_disabled: self.__unsafe_private_named.9,
-            labels: self.__unsafe_private_named.10,
-            moderation: self.__unsafe_private_named.11.unwrap(),
-            related_records: self.__unsafe_private_named.12.unwrap(),
-            threat_signatures: self.__unsafe_private_named.13,
+            deactivated_at: self._fields.0,
+            did: self._fields.1.unwrap(),
+            email: self._fields.2,
+            email_confirmed_at: self._fields.3,
+            handle: self._fields.4.unwrap(),
+            indexed_at: self._fields.5.unwrap(),
+            invite_note: self._fields.6,
+            invited_by: self._fields.7,
+            invites: self._fields.8,
+            invites_disabled: self._fields.9,
+            labels: self._fields.10,
+            moderation: self._fields.11.unwrap(),
+            related_records: self._fields.12.unwrap(),
+            threat_signatures: self._fields.13,
             extra_data: Some(extra_data),
         }
     }
@@ -10067,9 +10034,9 @@ pub mod repo_view_not_found_state {
 
 /// Builder for constructing an instance of this type
 pub struct RepoViewNotFoundBuilder<'a, S: repo_view_not_found_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RepoViewNotFound<'a> {
@@ -10083,9 +10050,9 @@ impl<'a> RepoViewNotFoundBuilder<'a, repo_view_not_found_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RepoViewNotFoundBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10100,11 +10067,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> RepoViewNotFoundBuilder<'a, repo_view_not_found_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RepoViewNotFoundBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10117,7 +10084,7 @@ where
     /// Build the final struct
     pub fn build(self) -> RepoViewNotFound<'a> {
         RepoViewNotFound {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -10127,7 +10094,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> RepoViewNotFound<'a> {
         RepoViewNotFound {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -10143,184 +10110,184 @@ pub mod reporter_stats_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type AccountReportCount;
-        type TakendownRecordCount;
         type Did;
-        type RecordReportCount;
+        type LabeledRecordCount;
+        type LabeledAccountCount;
+        type TakendownAccountCount;
+        type TakendownRecordCount;
         type ReportedAccountCount;
+        type RecordReportCount;
+        type AccountReportCount;
         type ReportedRecordCount;
-        type TakendownAccountCount;
-        type LabeledAccountCount;
-        type LabeledRecordCount;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type AccountReportCount = Unset;
-        type TakendownRecordCount = Unset;
         type Did = Unset;
-        type RecordReportCount = Unset;
+        type LabeledRecordCount = Unset;
+        type LabeledAccountCount = Unset;
+        type TakendownAccountCount = Unset;
+        type TakendownRecordCount = Unset;
         type ReportedAccountCount = Unset;
+        type RecordReportCount = Unset;
+        type AccountReportCount = Unset;
         type ReportedRecordCount = Unset;
-        type TakendownAccountCount = Unset;
-        type LabeledAccountCount = Unset;
-        type LabeledRecordCount = Unset;
     }
-    ///State transition - sets the `account_report_count` field to Set
-    pub struct SetAccountReportCount<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAccountReportCount<S> {}
-    impl<S: State> State for SetAccountReportCount<S> {
-        type AccountReportCount = Set<members::account_report_count>;
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Did = Set<members::did>;
+        type LabeledRecordCount = S::LabeledRecordCount;
+        type LabeledAccountCount = S::LabeledAccountCount;
+        type TakendownAccountCount = S::TakendownAccountCount;
         type TakendownRecordCount = S::TakendownRecordCount;
-        type Did = S::Did;
-        type RecordReportCount = S::RecordReportCount;
         type ReportedAccountCount = S::ReportedAccountCount;
+        type RecordReportCount = S::RecordReportCount;
+        type AccountReportCount = S::AccountReportCount;
         type ReportedRecordCount = S::ReportedRecordCount;
-        type TakendownAccountCount = S::TakendownAccountCount;
-        type LabeledAccountCount = S::LabeledAccountCount;
-        type LabeledRecordCount = S::LabeledRecordCount;
     }
-    ///State transition - sets the `takendown_record_count` field to Set
-    pub struct SetTakendownRecordCount<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTakendownRecordCount<S> {}
-    impl<S: State> State for SetTakendownRecordCount<S> {
-        type AccountReportCount = S::AccountReportCount;
-        type TakendownRecordCount = Set<members::takendown_record_count>;
+    ///State transition - sets the `labeled_record_count` field to Set
+    pub struct SetLabeledRecordCount<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLabeledRecordCount<S> {}
+    impl<S: State> State for SetLabeledRecordCount<S> {
         type Did = S::Did;
-        type RecordReportCount = S::RecordReportCount;
+        type LabeledRecordCount = Set<members::labeled_record_count>;
+        type LabeledAccountCount = S::LabeledAccountCount;
+        type TakendownAccountCount = S::TakendownAccountCount;
+        type TakendownRecordCount = S::TakendownRecordCount;
         type ReportedAccountCount = S::ReportedAccountCount;
+        type RecordReportCount = S::RecordReportCount;
+        type AccountReportCount = S::AccountReportCount;
         type ReportedRecordCount = S::ReportedRecordCount;
-        type TakendownAccountCount = S::TakendownAccountCount;
-        type LabeledAccountCount = S::LabeledAccountCount;
-        type LabeledRecordCount = S::LabeledRecordCount;
     }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type AccountReportCount = S::AccountReportCount;
+    ///State transition - sets the `labeled_account_count` field to Set
+    pub struct SetLabeledAccountCount<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLabeledAccountCount<S> {}
+    impl<S: State> State for SetLabeledAccountCount<S> {
+        type Did = S::Did;
+        type LabeledRecordCount = S::LabeledRecordCount;
+        type LabeledAccountCount = Set<members::labeled_account_count>;
+        type TakendownAccountCount = S::TakendownAccountCount;
         type TakendownRecordCount = S::TakendownRecordCount;
-        type Did = Set<members::did>;
-        type RecordReportCount = S::RecordReportCount;
         type ReportedAccountCount = S::ReportedAccountCount;
+        type RecordReportCount = S::RecordReportCount;
+        type AccountReportCount = S::AccountReportCount;
         type ReportedRecordCount = S::ReportedRecordCount;
-        type TakendownAccountCount = S::TakendownAccountCount;
-        type LabeledAccountCount = S::LabeledAccountCount;
-        type LabeledRecordCount = S::LabeledRecordCount;
     }
-    ///State transition - sets the `record_report_count` field to Set
-    pub struct SetRecordReportCount<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRecordReportCount<S> {}
-    impl<S: State> State for SetRecordReportCount<S> {
-        type AccountReportCount = S::AccountReportCount;
-        type TakendownRecordCount = S::TakendownRecordCount;
+    ///State transition - sets the `takendown_account_count` field to Set
+    pub struct SetTakendownAccountCount<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTakendownAccountCount<S> {}
+    impl<S: State> State for SetTakendownAccountCount<S> {
         type Did = S::Did;
-        type RecordReportCount = Set<members::record_report_count>;
+        type LabeledRecordCount = S::LabeledRecordCount;
+        type LabeledAccountCount = S::LabeledAccountCount;
+        type TakendownAccountCount = Set<members::takendown_account_count>;
+        type TakendownRecordCount = S::TakendownRecordCount;
         type ReportedAccountCount = S::ReportedAccountCount;
+        type RecordReportCount = S::RecordReportCount;
+        type AccountReportCount = S::AccountReportCount;
         type ReportedRecordCount = S::ReportedRecordCount;
-        type TakendownAccountCount = S::TakendownAccountCount;
-        type LabeledAccountCount = S::LabeledAccountCount;
+    }
+    ///State transition - sets the `takendown_record_count` field to Set
+    pub struct SetTakendownRecordCount<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTakendownRecordCount<S> {}
+    impl<S: State> State for SetTakendownRecordCount<S> {
+        type Did = S::Did;
         type LabeledRecordCount = S::LabeledRecordCount;
+        type LabeledAccountCount = S::LabeledAccountCount;
+        type TakendownAccountCount = S::TakendownAccountCount;
+        type TakendownRecordCount = Set<members::takendown_record_count>;
+        type ReportedAccountCount = S::ReportedAccountCount;
+        type RecordReportCount = S::RecordReportCount;
+        type AccountReportCount = S::AccountReportCount;
+        type ReportedRecordCount = S::ReportedRecordCount;
     }
     ///State transition - sets the `reported_account_count` field to Set
     pub struct SetReportedAccountCount<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetReportedAccountCount<S> {}
     impl<S: State> State for SetReportedAccountCount<S> {
-        type AccountReportCount = S::AccountReportCount;
-        type TakendownRecordCount = S::TakendownRecordCount;
         type Did = S::Did;
-        type RecordReportCount = S::RecordReportCount;
-        type ReportedAccountCount = Set<members::reported_account_count>;
-        type ReportedRecordCount = S::ReportedRecordCount;
-        type TakendownAccountCount = S::TakendownAccountCount;
-        type LabeledAccountCount = S::LabeledAccountCount;
         type LabeledRecordCount = S::LabeledRecordCount;
-    }
-    ///State transition - sets the `reported_record_count` field to Set
-    pub struct SetReportedRecordCount<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetReportedRecordCount<S> {}
-    impl<S: State> State for SetReportedRecordCount<S> {
-        type AccountReportCount = S::AccountReportCount;
-        type TakendownRecordCount = S::TakendownRecordCount;
-        type Did = S::Did;
-        type RecordReportCount = S::RecordReportCount;
-        type ReportedAccountCount = S::ReportedAccountCount;
-        type ReportedRecordCount = Set<members::reported_record_count>;
-        type TakendownAccountCount = S::TakendownAccountCount;
         type LabeledAccountCount = S::LabeledAccountCount;
-        type LabeledRecordCount = S::LabeledRecordCount;
-    }
-    ///State transition - sets the `takendown_account_count` field to Set
-    pub struct SetTakendownAccountCount<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTakendownAccountCount<S> {}
-    impl<S: State> State for SetTakendownAccountCount<S> {
-        type AccountReportCount = S::AccountReportCount;
+        type TakendownAccountCount = S::TakendownAccountCount;
         type TakendownRecordCount = S::TakendownRecordCount;
-        type Did = S::Did;
+        type ReportedAccountCount = Set<members::reported_account_count>;
         type RecordReportCount = S::RecordReportCount;
-        type ReportedAccountCount = S::ReportedAccountCount;
+        type AccountReportCount = S::AccountReportCount;
         type ReportedRecordCount = S::ReportedRecordCount;
-        type TakendownAccountCount = Set<members::takendown_account_count>;
-        type LabeledAccountCount = S::LabeledAccountCount;
-        type LabeledRecordCount = S::LabeledRecordCount;
     }
-    ///State transition - sets the `labeled_account_count` field to Set
-    pub struct SetLabeledAccountCount<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLabeledAccountCount<S> {}
-    impl<S: State> State for SetLabeledAccountCount<S> {
-        type AccountReportCount = S::AccountReportCount;
-        type TakendownRecordCount = S::TakendownRecordCount;
+    ///State transition - sets the `record_report_count` field to Set
+    pub struct SetRecordReportCount<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRecordReportCount<S> {}
+    impl<S: State> State for SetRecordReportCount<S> {
         type Did = S::Did;
-        type RecordReportCount = S::RecordReportCount;
+        type LabeledRecordCount = S::LabeledRecordCount;
+        type LabeledAccountCount = S::LabeledAccountCount;
+        type TakendownAccountCount = S::TakendownAccountCount;
+        type TakendownRecordCount = S::TakendownRecordCount;
         type ReportedAccountCount = S::ReportedAccountCount;
+        type RecordReportCount = Set<members::record_report_count>;
+        type AccountReportCount = S::AccountReportCount;
         type ReportedRecordCount = S::ReportedRecordCount;
-        type TakendownAccountCount = S::TakendownAccountCount;
-        type LabeledAccountCount = Set<members::labeled_account_count>;
-        type LabeledRecordCount = S::LabeledRecordCount;
     }
-    ///State transition - sets the `labeled_record_count` field to Set
-    pub struct SetLabeledRecordCount<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLabeledRecordCount<S> {}
-    impl<S: State> State for SetLabeledRecordCount<S> {
-        type AccountReportCount = S::AccountReportCount;
-        type TakendownRecordCount = S::TakendownRecordCount;
+    ///State transition - sets the `account_report_count` field to Set
+    pub struct SetAccountReportCount<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAccountReportCount<S> {}
+    impl<S: State> State for SetAccountReportCount<S> {
         type Did = S::Did;
-        type RecordReportCount = S::RecordReportCount;
+        type LabeledRecordCount = S::LabeledRecordCount;
+        type LabeledAccountCount = S::LabeledAccountCount;
+        type TakendownAccountCount = S::TakendownAccountCount;
+        type TakendownRecordCount = S::TakendownRecordCount;
         type ReportedAccountCount = S::ReportedAccountCount;
+        type RecordReportCount = S::RecordReportCount;
+        type AccountReportCount = Set<members::account_report_count>;
         type ReportedRecordCount = S::ReportedRecordCount;
-        type TakendownAccountCount = S::TakendownAccountCount;
+    }
+    ///State transition - sets the `reported_record_count` field to Set
+    pub struct SetReportedRecordCount<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetReportedRecordCount<S> {}
+    impl<S: State> State for SetReportedRecordCount<S> {
+        type Did = S::Did;
+        type LabeledRecordCount = S::LabeledRecordCount;
         type LabeledAccountCount = S::LabeledAccountCount;
-        type LabeledRecordCount = Set<members::labeled_record_count>;
+        type TakendownAccountCount = S::TakendownAccountCount;
+        type TakendownRecordCount = S::TakendownRecordCount;
+        type ReportedAccountCount = S::ReportedAccountCount;
+        type RecordReportCount = S::RecordReportCount;
+        type AccountReportCount = S::AccountReportCount;
+        type ReportedRecordCount = Set<members::reported_record_count>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `account_report_count` field
-        pub struct account_report_count(());
-        ///Marker type for the `takendown_record_count` field
-        pub struct takendown_record_count(());
         ///Marker type for the `did` field
         pub struct did(());
-        ///Marker type for the `record_report_count` field
-        pub struct record_report_count(());
+        ///Marker type for the `labeled_record_count` field
+        pub struct labeled_record_count(());
+        ///Marker type for the `labeled_account_count` field
+        pub struct labeled_account_count(());
+        ///Marker type for the `takendown_account_count` field
+        pub struct takendown_account_count(());
+        ///Marker type for the `takendown_record_count` field
+        pub struct takendown_record_count(());
         ///Marker type for the `reported_account_count` field
         pub struct reported_account_count(());
+        ///Marker type for the `record_report_count` field
+        pub struct record_report_count(());
+        ///Marker type for the `account_report_count` field
+        pub struct account_report_count(());
         ///Marker type for the `reported_record_count` field
         pub struct reported_record_count(());
-        ///Marker type for the `takendown_account_count` field
-        pub struct takendown_account_count(());
-        ///Marker type for the `labeled_account_count` field
-        pub struct labeled_account_count(());
-        ///Marker type for the `labeled_record_count` field
-        pub struct labeled_record_count(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ReporterStatsBuilder<'a, S: reporter_stats_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<Did<'a>>,
         Option<i64>,
@@ -10331,7 +10298,7 @@ pub struct ReporterStatsBuilder<'a, S: reporter_stats_state::State> {
         Option<i64>,
         Option<i64>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReporterStats<'a> {
@@ -10345,19 +10312,9 @@ impl<'a> ReporterStatsBuilder<'a, reporter_stats_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReporterStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10372,11 +10329,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ReporterStatsBuilder<'a, reporter_stats_state::SetAccountReportCount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReporterStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10391,11 +10348,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ReporterStatsBuilder<'a, reporter_stats_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReporterStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10410,11 +10367,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ReporterStatsBuilder<'a, reporter_stats_state::SetLabeledAccountCount<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ReporterStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10429,11 +10386,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ReporterStatsBuilder<'a, reporter_stats_state::SetLabeledRecordCount<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ReporterStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10448,11 +10405,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ReporterStatsBuilder<'a, reporter_stats_state::SetRecordReportCount<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ReporterStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10467,11 +10424,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ReporterStatsBuilder<'a, reporter_stats_state::SetReportedAccountCount<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         ReporterStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10486,11 +10443,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ReporterStatsBuilder<'a, reporter_stats_state::SetReportedRecordCount<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         ReporterStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10505,11 +10462,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ReporterStatsBuilder<'a, reporter_stats_state::SetTakendownAccountCount<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         ReporterStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10524,11 +10481,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ReporterStatsBuilder<'a, reporter_stats_state::SetTakendownRecordCount<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         ReporterStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10536,28 +10493,28 @@ where
 impl<'a, S> ReporterStatsBuilder<'a, S>
 where
     S: reporter_stats_state::State,
-    S::AccountReportCount: reporter_stats_state::IsSet,
-    S::TakendownRecordCount: reporter_stats_state::IsSet,
     S::Did: reporter_stats_state::IsSet,
-    S::RecordReportCount: reporter_stats_state::IsSet,
+    S::LabeledRecordCount: reporter_stats_state::IsSet,
+    S::LabeledAccountCount: reporter_stats_state::IsSet,
+    S::TakendownAccountCount: reporter_stats_state::IsSet,
+    S::TakendownRecordCount: reporter_stats_state::IsSet,
     S::ReportedAccountCount: reporter_stats_state::IsSet,
+    S::RecordReportCount: reporter_stats_state::IsSet,
+    S::AccountReportCount: reporter_stats_state::IsSet,
     S::ReportedRecordCount: reporter_stats_state::IsSet,
-    S::TakendownAccountCount: reporter_stats_state::IsSet,
-    S::LabeledAccountCount: reporter_stats_state::IsSet,
-    S::LabeledRecordCount: reporter_stats_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ReporterStats<'a> {
         ReporterStats {
-            account_report_count: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            labeled_account_count: self.__unsafe_private_named.2.unwrap(),
-            labeled_record_count: self.__unsafe_private_named.3.unwrap(),
-            record_report_count: self.__unsafe_private_named.4.unwrap(),
-            reported_account_count: self.__unsafe_private_named.5.unwrap(),
-            reported_record_count: self.__unsafe_private_named.6.unwrap(),
-            takendown_account_count: self.__unsafe_private_named.7.unwrap(),
-            takendown_record_count: self.__unsafe_private_named.8.unwrap(),
+            account_report_count: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            labeled_account_count: self._fields.2.unwrap(),
+            labeled_record_count: self._fields.3.unwrap(),
+            record_report_count: self._fields.4.unwrap(),
+            reported_account_count: self._fields.5.unwrap(),
+            reported_record_count: self._fields.6.unwrap(),
+            takendown_account_count: self._fields.7.unwrap(),
+            takendown_record_count: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -10567,15 +10524,15 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ReporterStats<'a> {
         ReporterStats {
-            account_report_count: self.__unsafe_private_named.0.unwrap(),
-            did: self.__unsafe_private_named.1.unwrap(),
-            labeled_account_count: self.__unsafe_private_named.2.unwrap(),
-            labeled_record_count: self.__unsafe_private_named.3.unwrap(),
-            record_report_count: self.__unsafe_private_named.4.unwrap(),
-            reported_account_count: self.__unsafe_private_named.5.unwrap(),
-            reported_record_count: self.__unsafe_private_named.6.unwrap(),
-            takendown_account_count: self.__unsafe_private_named.7.unwrap(),
-            takendown_record_count: self.__unsafe_private_named.8.unwrap(),
+            account_report_count: self._fields.0.unwrap(),
+            did: self._fields.1.unwrap(),
+            labeled_account_count: self._fields.2.unwrap(),
+            labeled_record_count: self._fields.3.unwrap(),
+            record_report_count: self._fields.4.unwrap(),
+            reported_account_count: self._fields.5.unwrap(),
+            reported_record_count: self._fields.6.unwrap(),
+            takendown_account_count: self._fields.7.unwrap(),
+            takendown_record_count: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -10591,112 +10548,112 @@ pub mod scheduled_action_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Id;
-        type CreatedAt;
+        type Action;
         type CreatedBy;
         type Did;
+        type Id;
+        type CreatedAt;
         type Status;
-        type Action;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Id = Unset;
-        type CreatedAt = Unset;
+        type Action = Unset;
         type CreatedBy = Unset;
         type Did = Unset;
+        type Id = Unset;
+        type CreatedAt = Unset;
         type Status = Unset;
-        type Action = Unset;
     }
-    ///State transition - sets the `id` field to Set
-    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetId<S> {}
-    impl<S: State> State for SetId<S> {
-        type Id = Set<members::id>;
-        type CreatedAt = S::CreatedAt;
+    ///State transition - sets the `action` field to Set
+    pub struct SetAction<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAction<S> {}
+    impl<S: State> State for SetAction<S> {
+        type Action = Set<members::action>;
         type CreatedBy = S::CreatedBy;
         type Did = S::Did;
-        type Status = S::Status;
-        type Action = S::Action;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
         type Id = S::Id;
-        type CreatedAt = Set<members::created_at>;
-        type CreatedBy = S::CreatedBy;
-        type Did = S::Did;
+        type CreatedAt = S::CreatedAt;
         type Status = S::Status;
-        type Action = S::Action;
     }
     ///State transition - sets the `created_by` field to Set
     pub struct SetCreatedBy<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedBy<S> {}
     impl<S: State> State for SetCreatedBy<S> {
-        type Id = S::Id;
-        type CreatedAt = S::CreatedAt;
+        type Action = S::Action;
         type CreatedBy = Set<members::created_by>;
         type Did = S::Did;
+        type Id = S::Id;
+        type CreatedAt = S::CreatedAt;
         type Status = S::Status;
-        type Action = S::Action;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
+        type Action = S::Action;
+        type CreatedBy = S::CreatedBy;
+        type Did = Set<members::did>;
         type Id = S::Id;
         type CreatedAt = S::CreatedAt;
+        type Status = S::Status;
+    }
+    ///State transition - sets the `id` field to Set
+    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetId<S> {}
+    impl<S: State> State for SetId<S> {
+        type Action = S::Action;
         type CreatedBy = S::CreatedBy;
-        type Did = Set<members::did>;
+        type Did = S::Did;
+        type Id = Set<members::id>;
+        type CreatedAt = S::CreatedAt;
         type Status = S::Status;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
         type Action = S::Action;
+        type CreatedBy = S::CreatedBy;
+        type Did = S::Did;
+        type Id = S::Id;
+        type CreatedAt = Set<members::created_at>;
+        type Status = S::Status;
     }
     ///State transition - sets the `status` field to Set
     pub struct SetStatus<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetStatus<S> {}
     impl<S: State> State for SetStatus<S> {
-        type Id = S::Id;
-        type CreatedAt = S::CreatedAt;
+        type Action = S::Action;
         type CreatedBy = S::CreatedBy;
         type Did = S::Did;
-        type Status = Set<members::status>;
-        type Action = S::Action;
-    }
-    ///State transition - sets the `action` field to Set
-    pub struct SetAction<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAction<S> {}
-    impl<S: State> State for SetAction<S> {
         type Id = S::Id;
         type CreatedAt = S::CreatedAt;
-        type CreatedBy = S::CreatedBy;
-        type Did = S::Did;
-        type Status = S::Status;
-        type Action = Set<members::action>;
+        type Status = Set<members::status>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `id` field
-        pub struct id(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
+        ///Marker type for the `action` field
+        pub struct action(());
         ///Marker type for the `created_by` field
         pub struct created_by(());
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `id` field
+        pub struct id(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `status` field
         pub struct status(());
-        ///Marker type for the `action` field
-        pub struct action(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ScheduledActionViewBuilder<'a, S: scheduled_action_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ScheduledActionViewAction<'a>>,
         Option<Datetime>,
         Option<Did<'a>>,
@@ -10713,7 +10670,7 @@ pub struct ScheduledActionViewBuilder<'a, S: scheduled_action_view_state::State>
         Option<ScheduledActionViewStatus<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ScheduledActionView<'a> {
@@ -10727,8 +10684,8 @@ impl<'a> ScheduledActionViewBuilder<'a, scheduled_action_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ScheduledActionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -10745,7 +10702,7 @@ impl<'a> ScheduledActionViewBuilder<'a, scheduled_action_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10760,11 +10717,11 @@ where
         mut self,
         value: impl Into<ScheduledActionViewAction<'a>>,
     ) -> ScheduledActionViewBuilder<'a, scheduled_action_view_state::SetAction<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ScheduledActionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10779,11 +10736,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ScheduledActionViewBuilder<'a, scheduled_action_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ScheduledActionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10798,11 +10755,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ScheduledActionViewBuilder<'a, scheduled_action_view_state::SetCreatedBy<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ScheduledActionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10817,11 +10774,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ScheduledActionViewBuilder<'a, scheduled_action_view_state::SetDid<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ScheduledActionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10829,12 +10786,12 @@ where
 impl<'a, S: scheduled_action_view_state::State> ScheduledActionViewBuilder<'a, S> {
     /// Set the `eventData` field (optional)
     pub fn event_data(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `eventData` field to an Option value (optional)
     pub fn maybe_event_data(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -10842,12 +10799,12 @@ impl<'a, S: scheduled_action_view_state::State> ScheduledActionViewBuilder<'a, S
 impl<'a, S: scheduled_action_view_state::State> ScheduledActionViewBuilder<'a, S> {
     /// Set the `executeAfter` field (optional)
     pub fn execute_after(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `executeAfter` field to an Option value (optional)
     pub fn maybe_execute_after(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -10855,12 +10812,12 @@ impl<'a, S: scheduled_action_view_state::State> ScheduledActionViewBuilder<'a, S
 impl<'a, S: scheduled_action_view_state::State> ScheduledActionViewBuilder<'a, S> {
     /// Set the `executeAt` field (optional)
     pub fn execute_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `executeAt` field to an Option value (optional)
     pub fn maybe_execute_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -10868,12 +10825,12 @@ impl<'a, S: scheduled_action_view_state::State> ScheduledActionViewBuilder<'a, S
 impl<'a, S: scheduled_action_view_state::State> ScheduledActionViewBuilder<'a, S> {
     /// Set the `executeUntil` field (optional)
     pub fn execute_until(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `executeUntil` field to an Option value (optional)
     pub fn maybe_execute_until(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -10881,12 +10838,12 @@ impl<'a, S: scheduled_action_view_state::State> ScheduledActionViewBuilder<'a, S
 impl<'a, S: scheduled_action_view_state::State> ScheduledActionViewBuilder<'a, S> {
     /// Set the `executionEventId` field (optional)
     pub fn execution_event_id(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `executionEventId` field to an Option value (optional)
     pub fn maybe_execution_event_id(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -10901,11 +10858,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> ScheduledActionViewBuilder<'a, scheduled_action_view_state::SetId<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         ScheduledActionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10913,12 +10870,12 @@ where
 impl<'a, S: scheduled_action_view_state::State> ScheduledActionViewBuilder<'a, S> {
     /// Set the `lastExecutedAt` field (optional)
     pub fn last_executed_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `lastExecutedAt` field to an Option value (optional)
     pub fn maybe_last_executed_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -10926,12 +10883,12 @@ impl<'a, S: scheduled_action_view_state::State> ScheduledActionViewBuilder<'a, S
 impl<'a, S: scheduled_action_view_state::State> ScheduledActionViewBuilder<'a, S> {
     /// Set the `lastFailureReason` field (optional)
     pub fn last_failure_reason(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `lastFailureReason` field to an Option value (optional)
     pub fn maybe_last_failure_reason(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -10939,12 +10896,12 @@ impl<'a, S: scheduled_action_view_state::State> ScheduledActionViewBuilder<'a, S
 impl<'a, S: scheduled_action_view_state::State> ScheduledActionViewBuilder<'a, S> {
     /// Set the `randomizeExecution` field (optional)
     pub fn randomize_execution(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `randomizeExecution` field to an Option value (optional)
     pub fn maybe_randomize_execution(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -10959,11 +10916,11 @@ where
         mut self,
         value: impl Into<ScheduledActionViewStatus<'a>>,
     ) -> ScheduledActionViewBuilder<'a, scheduled_action_view_state::SetStatus<S>> {
-        self.__unsafe_private_named.13 = Option::Some(value.into());
+        self._fields.13 = Option::Some(value.into());
         ScheduledActionViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -10971,12 +10928,12 @@ where
 impl<'a, S: scheduled_action_view_state::State> ScheduledActionViewBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -10984,31 +10941,31 @@ impl<'a, S: scheduled_action_view_state::State> ScheduledActionViewBuilder<'a, S
 impl<'a, S> ScheduledActionViewBuilder<'a, S>
 where
     S: scheduled_action_view_state::State,
-    S::Id: scheduled_action_view_state::IsSet,
-    S::CreatedAt: scheduled_action_view_state::IsSet,
+    S::Action: scheduled_action_view_state::IsSet,
     S::CreatedBy: scheduled_action_view_state::IsSet,
     S::Did: scheduled_action_view_state::IsSet,
+    S::Id: scheduled_action_view_state::IsSet,
+    S::CreatedAt: scheduled_action_view_state::IsSet,
     S::Status: scheduled_action_view_state::IsSet,
-    S::Action: scheduled_action_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ScheduledActionView<'a> {
         ScheduledActionView {
-            action: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            created_by: self.__unsafe_private_named.2.unwrap(),
-            did: self.__unsafe_private_named.3.unwrap(),
-            event_data: self.__unsafe_private_named.4,
-            execute_after: self.__unsafe_private_named.5,
-            execute_at: self.__unsafe_private_named.6,
-            execute_until: self.__unsafe_private_named.7,
-            execution_event_id: self.__unsafe_private_named.8,
-            id: self.__unsafe_private_named.9.unwrap(),
-            last_executed_at: self.__unsafe_private_named.10,
-            last_failure_reason: self.__unsafe_private_named.11,
-            randomize_execution: self.__unsafe_private_named.12,
-            status: self.__unsafe_private_named.13.unwrap(),
-            updated_at: self.__unsafe_private_named.14,
+            action: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            created_by: self._fields.2.unwrap(),
+            did: self._fields.3.unwrap(),
+            event_data: self._fields.4,
+            execute_after: self._fields.5,
+            execute_at: self._fields.6,
+            execute_until: self._fields.7,
+            execution_event_id: self._fields.8,
+            id: self._fields.9.unwrap(),
+            last_executed_at: self._fields.10,
+            last_failure_reason: self._fields.11,
+            randomize_execution: self._fields.12,
+            status: self._fields.13.unwrap(),
+            updated_at: self._fields.14,
             extra_data: Default::default(),
         }
     }
@@ -11018,21 +10975,21 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> ScheduledActionView<'a> {
         ScheduledActionView {
-            action: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            created_by: self.__unsafe_private_named.2.unwrap(),
-            did: self.__unsafe_private_named.3.unwrap(),
-            event_data: self.__unsafe_private_named.4,
-            execute_after: self.__unsafe_private_named.5,
-            execute_at: self.__unsafe_private_named.6,
-            execute_until: self.__unsafe_private_named.7,
-            execution_event_id: self.__unsafe_private_named.8,
-            id: self.__unsafe_private_named.9.unwrap(),
-            last_executed_at: self.__unsafe_private_named.10,
-            last_failure_reason: self.__unsafe_private_named.11,
-            randomize_execution: self.__unsafe_private_named.12,
-            status: self.__unsafe_private_named.13.unwrap(),
-            updated_at: self.__unsafe_private_named.14,
+            action: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            created_by: self._fields.2.unwrap(),
+            did: self._fields.3.unwrap(),
+            event_data: self._fields.4,
+            execute_after: self._fields.5,
+            execute_at: self._fields.6,
+            execute_until: self._fields.7,
+            execution_event_id: self._fields.8,
+            id: self._fields.9.unwrap(),
+            last_executed_at: self._fields.10,
+            last_failure_reason: self._fields.11,
+            randomize_execution: self._fields.12,
+            status: self._fields.13.unwrap(),
+            updated_at: self._fields.14,
             extra_data: Some(extra_data),
         }
     }
@@ -11050,9 +11007,9 @@ pub mod subject_status_view_state {
     pub trait State: sealed::Sealed {
         type UpdatedAt;
         type Id;
+        type ReviewState;
         type Subject;
         type CreatedAt;
-        type ReviewState;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
@@ -11060,9 +11017,9 @@ pub mod subject_status_view_state {
     impl State for Empty {
         type UpdatedAt = Unset;
         type Id = Unset;
+        type ReviewState = Unset;
         type Subject = Unset;
         type CreatedAt = Unset;
-        type ReviewState = Unset;
     }
     ///State transition - sets the `updated_at` field to Set
     pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
@@ -11070,9 +11027,9 @@ pub mod subject_status_view_state {
     impl<S: State> State for SetUpdatedAt<S> {
         type UpdatedAt = Set<members::updated_at>;
         type Id = S::Id;
+        type ReviewState = S::ReviewState;
         type Subject = S::Subject;
         type CreatedAt = S::CreatedAt;
-        type ReviewState = S::ReviewState;
     }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
@@ -11080,9 +11037,19 @@ pub mod subject_status_view_state {
     impl<S: State> State for SetId<S> {
         type UpdatedAt = S::UpdatedAt;
         type Id = Set<members::id>;
+        type ReviewState = S::ReviewState;
+        type Subject = S::Subject;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `review_state` field to Set
+    pub struct SetReviewState<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetReviewState<S> {}
+    impl<S: State> State for SetReviewState<S> {
+        type UpdatedAt = S::UpdatedAt;
+        type Id = S::Id;
+        type ReviewState = Set<members::review_state>;
         type Subject = S::Subject;
         type CreatedAt = S::CreatedAt;
-        type ReviewState = S::ReviewState;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
@@ -11090,9 +11057,9 @@ pub mod subject_status_view_state {
     impl<S: State> State for SetSubject<S> {
         type UpdatedAt = S::UpdatedAt;
         type Id = S::Id;
+        type ReviewState = S::ReviewState;
         type Subject = Set<members::subject>;
         type CreatedAt = S::CreatedAt;
-        type ReviewState = S::ReviewState;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
@@ -11100,19 +11067,9 @@ pub mod subject_status_view_state {
     impl<S: State> State for SetCreatedAt<S> {
         type UpdatedAt = S::UpdatedAt;
         type Id = S::Id;
-        type Subject = S::Subject;
-        type CreatedAt = Set<members::created_at>;
         type ReviewState = S::ReviewState;
-    }
-    ///State transition - sets the `review_state` field to Set
-    pub struct SetReviewState<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetReviewState<S> {}
-    impl<S: State> State for SetReviewState<S> {
-        type UpdatedAt = S::UpdatedAt;
-        type Id = S::Id;
         type Subject = S::Subject;
-        type CreatedAt = S::CreatedAt;
-        type ReviewState = Set<members::review_state>;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
@@ -11121,19 +11078,19 @@ pub mod subject_status_view_state {
         pub struct updated_at(());
         ///Marker type for the `id` field
         pub struct id(());
+        ///Marker type for the `review_state` field
+        pub struct review_state(());
         ///Marker type for the `subject` field
         pub struct subject(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
-        ///Marker type for the `review_state` field
-        pub struct review_state(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SubjectStatusViewBuilder<'a, S: subject_status_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<moderation::AccountStats<'a>>,
         Option<moderation::AccountStrike<'a>>,
         Option<SubjectStatusViewAgeAssuranceState<'a>>,
@@ -11160,7 +11117,7 @@ pub struct SubjectStatusViewBuilder<'a, S: subject_status_view_state::State> {
         Option<bool>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SubjectStatusView<'a> {
@@ -11174,8 +11131,8 @@ impl<'a> SubjectStatusViewBuilder<'a, subject_status_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubjectStatusViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -11202,7 +11159,7 @@ impl<'a> SubjectStatusViewBuilder<'a, subject_status_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -11213,7 +11170,7 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<moderation::AccountStats<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `accountStats` field to an Option value (optional)
@@ -11221,7 +11178,7 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
         mut self,
         value: Option<moderation::AccountStats<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -11232,7 +11189,7 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<moderation::AccountStrike<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `accountStrike` field to an Option value (optional)
@@ -11240,7 +11197,7 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
         mut self,
         value: Option<moderation::AccountStrike<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -11251,7 +11208,7 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<SubjectStatusViewAgeAssuranceState<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `ageAssuranceState` field to an Option value (optional)
@@ -11259,7 +11216,7 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
         mut self,
         value: Option<SubjectStatusViewAgeAssuranceState<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -11270,7 +11227,7 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<SubjectStatusViewAgeAssuranceUpdatedBy<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `ageAssuranceUpdatedBy` field to an Option value (optional)
@@ -11278,7 +11235,7 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
         mut self,
         value: Option<SubjectStatusViewAgeAssuranceUpdatedBy<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -11286,12 +11243,12 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
 impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
     /// Set the `appealed` field (optional)
     pub fn appealed(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `appealed` field to an Option value (optional)
     pub fn maybe_appealed(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -11299,12 +11256,12 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
 impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -11319,11 +11276,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SubjectStatusViewBuilder<'a, subject_status_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         SubjectStatusViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -11334,12 +11291,12 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<SubjectStatusViewHosting<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `hosting` field to an Option value (optional)
     pub fn maybe_hosting(mut self, value: Option<SubjectStatusViewHosting<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -11354,11 +11311,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SubjectStatusViewBuilder<'a, subject_status_view_state::SetId<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         SubjectStatusViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -11366,12 +11323,12 @@ where
 impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
     /// Set the `lastAppealedAt` field (optional)
     pub fn last_appealed_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `lastAppealedAt` field to an Option value (optional)
     pub fn maybe_last_appealed_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -11379,12 +11336,12 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
 impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
     /// Set the `lastReportedAt` field (optional)
     pub fn last_reported_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `lastReportedAt` field to an Option value (optional)
     pub fn maybe_last_reported_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -11392,12 +11349,12 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
 impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
     /// Set the `lastReviewedAt` field (optional)
     pub fn last_reviewed_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `lastReviewedAt` field to an Option value (optional)
     pub fn maybe_last_reviewed_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -11405,12 +11362,12 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
 impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
     /// Set the `lastReviewedBy` field (optional)
     pub fn last_reviewed_by(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `lastReviewedBy` field to an Option value (optional)
     pub fn maybe_last_reviewed_by(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -11418,12 +11375,12 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
 impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
     /// Set the `muteReportingUntil` field (optional)
     pub fn mute_reporting_until(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `muteReportingUntil` field to an Option value (optional)
     pub fn maybe_mute_reporting_until(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -11431,12 +11388,12 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
 impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
     /// Set the `muteUntil` field (optional)
     pub fn mute_until(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `muteUntil` field to an Option value (optional)
     pub fn maybe_mute_until(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -11444,12 +11401,12 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
 impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
     /// Set the `priorityScore` field (optional)
     pub fn priority_score(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `priorityScore` field to an Option value (optional)
     pub fn maybe_priority_score(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -11460,7 +11417,7 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<moderation::RecordsStats<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `recordsStats` field to an Option value (optional)
@@ -11468,7 +11425,7 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
         mut self,
         value: Option<moderation::RecordsStats<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -11483,11 +11440,11 @@ where
         mut self,
         value: impl Into<moderation::SubjectReviewState<'a>>,
     ) -> SubjectStatusViewBuilder<'a, subject_status_view_state::SetReviewState<S>> {
-        self.__unsafe_private_named.17 = Option::Some(value.into());
+        self._fields.17 = Option::Some(value.into());
         SubjectStatusViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -11502,11 +11459,11 @@ where
         mut self,
         value: impl Into<SubjectStatusViewSubject<'a>>,
     ) -> SubjectStatusViewBuilder<'a, subject_status_view_state::SetSubject<S>> {
-        self.__unsafe_private_named.18 = Option::Some(value.into());
+        self._fields.18 = Option::Some(value.into());
         SubjectStatusViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -11514,12 +11471,12 @@ where
 impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
     /// Set the `subjectBlobCids` field (optional)
     pub fn subject_blob_cids(mut self, value: impl Into<Option<Vec<Cid<'a>>>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `subjectBlobCids` field to an Option value (optional)
     pub fn maybe_subject_blob_cids(mut self, value: Option<Vec<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -11527,12 +11484,12 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
 impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
     /// Set the `subjectRepoHandle` field (optional)
     pub fn subject_repo_handle(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `subjectRepoHandle` field to an Option value (optional)
     pub fn maybe_subject_repo_handle(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -11540,12 +11497,12 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
 impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
     /// Set the `suspendUntil` field (optional)
     pub fn suspend_until(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `suspendUntil` field to an Option value (optional)
     pub fn maybe_suspend_until(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -11553,12 +11510,12 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
 impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -11566,12 +11523,12 @@ impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
 impl<'a, S: subject_status_view_state::State> SubjectStatusViewBuilder<'a, S> {
     /// Set the `takendown` field (optional)
     pub fn takendown(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `takendown` field to an Option value (optional)
     pub fn maybe_takendown(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -11586,11 +11543,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SubjectStatusViewBuilder<'a, subject_status_view_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.24 = Option::Some(value.into());
+        self._fields.24 = Option::Some(value.into());
         SubjectStatusViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -11600,38 +11557,38 @@ where
     S: subject_status_view_state::State,
     S::UpdatedAt: subject_status_view_state::IsSet,
     S::Id: subject_status_view_state::IsSet,
+    S::ReviewState: subject_status_view_state::IsSet,
     S::Subject: subject_status_view_state::IsSet,
     S::CreatedAt: subject_status_view_state::IsSet,
-    S::ReviewState: subject_status_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SubjectStatusView<'a> {
         SubjectStatusView {
-            account_stats: self.__unsafe_private_named.0,
-            account_strike: self.__unsafe_private_named.1,
-            age_assurance_state: self.__unsafe_private_named.2,
-            age_assurance_updated_by: self.__unsafe_private_named.3,
-            appealed: self.__unsafe_private_named.4,
-            comment: self.__unsafe_private_named.5,
-            created_at: self.__unsafe_private_named.6.unwrap(),
-            hosting: self.__unsafe_private_named.7,
-            id: self.__unsafe_private_named.8.unwrap(),
-            last_appealed_at: self.__unsafe_private_named.9,
-            last_reported_at: self.__unsafe_private_named.10,
-            last_reviewed_at: self.__unsafe_private_named.11,
-            last_reviewed_by: self.__unsafe_private_named.12,
-            mute_reporting_until: self.__unsafe_private_named.13,
-            mute_until: self.__unsafe_private_named.14,
-            priority_score: self.__unsafe_private_named.15,
-            records_stats: self.__unsafe_private_named.16,
-            review_state: self.__unsafe_private_named.17.unwrap(),
-            subject: self.__unsafe_private_named.18.unwrap(),
-            subject_blob_cids: self.__unsafe_private_named.19,
-            subject_repo_handle: self.__unsafe_private_named.20,
-            suspend_until: self.__unsafe_private_named.21,
-            tags: self.__unsafe_private_named.22,
-            takendown: self.__unsafe_private_named.23,
-            updated_at: self.__unsafe_private_named.24.unwrap(),
+            account_stats: self._fields.0,
+            account_strike: self._fields.1,
+            age_assurance_state: self._fields.2,
+            age_assurance_updated_by: self._fields.3,
+            appealed: self._fields.4,
+            comment: self._fields.5,
+            created_at: self._fields.6.unwrap(),
+            hosting: self._fields.7,
+            id: self._fields.8.unwrap(),
+            last_appealed_at: self._fields.9,
+            last_reported_at: self._fields.10,
+            last_reviewed_at: self._fields.11,
+            last_reviewed_by: self._fields.12,
+            mute_reporting_until: self._fields.13,
+            mute_until: self._fields.14,
+            priority_score: self._fields.15,
+            records_stats: self._fields.16,
+            review_state: self._fields.17.unwrap(),
+            subject: self._fields.18.unwrap(),
+            subject_blob_cids: self._fields.19,
+            subject_repo_handle: self._fields.20,
+            suspend_until: self._fields.21,
+            tags: self._fields.22,
+            takendown: self._fields.23,
+            updated_at: self._fields.24.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -11641,31 +11598,31 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> SubjectStatusView<'a> {
         SubjectStatusView {
-            account_stats: self.__unsafe_private_named.0,
-            account_strike: self.__unsafe_private_named.1,
-            age_assurance_state: self.__unsafe_private_named.2,
-            age_assurance_updated_by: self.__unsafe_private_named.3,
-            appealed: self.__unsafe_private_named.4,
-            comment: self.__unsafe_private_named.5,
-            created_at: self.__unsafe_private_named.6.unwrap(),
-            hosting: self.__unsafe_private_named.7,
-            id: self.__unsafe_private_named.8.unwrap(),
-            last_appealed_at: self.__unsafe_private_named.9,
-            last_reported_at: self.__unsafe_private_named.10,
-            last_reviewed_at: self.__unsafe_private_named.11,
-            last_reviewed_by: self.__unsafe_private_named.12,
-            mute_reporting_until: self.__unsafe_private_named.13,
-            mute_until: self.__unsafe_private_named.14,
-            priority_score: self.__unsafe_private_named.15,
-            records_stats: self.__unsafe_private_named.16,
-            review_state: self.__unsafe_private_named.17.unwrap(),
-            subject: self.__unsafe_private_named.18.unwrap(),
-            subject_blob_cids: self.__unsafe_private_named.19,
-            subject_repo_handle: self.__unsafe_private_named.20,
-            suspend_until: self.__unsafe_private_named.21,
-            tags: self.__unsafe_private_named.22,
-            takendown: self.__unsafe_private_named.23,
-            updated_at: self.__unsafe_private_named.24.unwrap(),
+            account_stats: self._fields.0,
+            account_strike: self._fields.1,
+            age_assurance_state: self._fields.2,
+            age_assurance_updated_by: self._fields.3,
+            appealed: self._fields.4,
+            comment: self._fields.5,
+            created_at: self._fields.6.unwrap(),
+            hosting: self._fields.7,
+            id: self._fields.8.unwrap(),
+            last_appealed_at: self._fields.9,
+            last_reported_at: self._fields.10,
+            last_reviewed_at: self._fields.11,
+            last_reviewed_by: self._fields.12,
+            mute_reporting_until: self._fields.13,
+            mute_until: self._fields.14,
+            priority_score: self._fields.15,
+            records_stats: self._fields.16,
+            review_state: self._fields.17.unwrap(),
+            subject: self._fields.18.unwrap(),
+            subject_blob_cids: self._fields.19,
+            subject_repo_handle: self._fields.20,
+            suspend_until: self._fields.21,
+            tags: self._fields.22,
+            takendown: self._fields.23,
+            updated_at: self._fields.24.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -11681,44 +11638,44 @@ pub mod subject_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Type;
         type Subject;
+        type Type;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Type = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `type` field to Set
-    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetType<S> {}
-    impl<S: State> State for SetType<S> {
-        type Type = Set<members::r#type>;
-        type Subject = S::Subject;
+        type Type = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type Type = S::Type;
         type Subject = Set<members::subject>;
+        type Type = S::Type;
+    }
+    ///State transition - sets the `type` field to Set
+    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetType<S> {}
+    impl<S: State> State for SetType<S> {
+        type Subject = S::Subject;
+        type Type = Set<members::r#type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `type` field
-        pub struct r#type(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `type` field
+        pub struct r#type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SubjectViewBuilder<'a, S: subject_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Data<'a>>,
         Option<moderation::RecordViewDetail<'a>>,
         Option<moderation::RepoViewDetail<'a>>,
@@ -11726,7 +11683,7 @@ pub struct SubjectViewBuilder<'a, S: subject_view_state::State> {
         Option<CowStr<'a>>,
         Option<SubjectType<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SubjectView<'a> {
@@ -11740,9 +11697,9 @@ impl<'a> SubjectViewBuilder<'a, subject_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubjectViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -11750,12 +11707,12 @@ impl<'a> SubjectViewBuilder<'a, subject_view_state::Empty> {
 impl<'a, S: subject_view_state::State> SubjectViewBuilder<'a, S> {
     /// Set the `profile` field (optional)
     pub fn profile(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `profile` field to an Option value (optional)
     pub fn maybe_profile(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -11766,7 +11723,7 @@ impl<'a, S: subject_view_state::State> SubjectViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<moderation::RecordViewDetail<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `record` field to an Option value (optional)
@@ -11774,7 +11731,7 @@ impl<'a, S: subject_view_state::State> SubjectViewBuilder<'a, S> {
         mut self,
         value: Option<moderation::RecordViewDetail<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -11785,12 +11742,12 @@ impl<'a, S: subject_view_state::State> SubjectViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<moderation::RepoViewDetail<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `repo` field to an Option value (optional)
     pub fn maybe_repo(mut self, value: Option<moderation::RepoViewDetail<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -11801,7 +11758,7 @@ impl<'a, S: subject_view_state::State> SubjectViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<moderation::SubjectStatusView<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `status` field to an Option value (optional)
@@ -11809,7 +11766,7 @@ impl<'a, S: subject_view_state::State> SubjectViewBuilder<'a, S> {
         mut self,
         value: Option<moderation::SubjectStatusView<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -11824,11 +11781,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SubjectViewBuilder<'a, subject_view_state::SetSubject<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         SubjectViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -11843,11 +11800,11 @@ where
         mut self,
         value: impl Into<SubjectType<'a>>,
     ) -> SubjectViewBuilder<'a, subject_view_state::SetType<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         SubjectViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -11855,18 +11812,18 @@ where
 impl<'a, S> SubjectViewBuilder<'a, S>
 where
     S: subject_view_state::State,
-    S::Type: subject_view_state::IsSet,
     S::Subject: subject_view_state::IsSet,
+    S::Type: subject_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SubjectView<'a> {
         SubjectView {
-            profile: self.__unsafe_private_named.0,
-            record: self.__unsafe_private_named.1,
-            repo: self.__unsafe_private_named.2,
-            status: self.__unsafe_private_named.3,
-            subject: self.__unsafe_private_named.4.unwrap(),
-            r#type: self.__unsafe_private_named.5.unwrap(),
+            profile: self._fields.0,
+            record: self._fields.1,
+            repo: self._fields.2,
+            status: self._fields.3,
+            subject: self._fields.4.unwrap(),
+            r#type: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -11876,12 +11833,12 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> SubjectView<'a> {
         SubjectView {
-            profile: self.__unsafe_private_named.0,
-            record: self.__unsafe_private_named.1,
-            repo: self.__unsafe_private_named.2,
-            status: self.__unsafe_private_named.3,
-            subject: self.__unsafe_private_named.4.unwrap(),
-            r#type: self.__unsafe_private_named.5.unwrap(),
+            profile: self._fields.0,
+            record: self._fields.1,
+            repo: self._fields.2,
+            status: self._fields.3,
+            subject: self._fields.4.unwrap(),
+            r#type: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -11897,59 +11854,59 @@ pub mod video_details_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Width;
         type Height;
         type Length;
+        type Width;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Width = Unset;
         type Height = Unset;
         type Length = Unset;
-    }
-    ///State transition - sets the `width` field to Set
-    pub struct SetWidth<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetWidth<S> {}
-    impl<S: State> State for SetWidth<S> {
-        type Width = Set<members::width>;
-        type Height = S::Height;
-        type Length = S::Length;
+        type Width = Unset;
     }
     ///State transition - sets the `height` field to Set
     pub struct SetHeight<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHeight<S> {}
     impl<S: State> State for SetHeight<S> {
-        type Width = S::Width;
         type Height = Set<members::height>;
         type Length = S::Length;
+        type Width = S::Width;
     }
     ///State transition - sets the `length` field to Set
     pub struct SetLength<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLength<S> {}
     impl<S: State> State for SetLength<S> {
-        type Width = S::Width;
         type Height = S::Height;
         type Length = Set<members::length>;
+        type Width = S::Width;
+    }
+    ///State transition - sets the `width` field to Set
+    pub struct SetWidth<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetWidth<S> {}
+    impl<S: State> State for SetWidth<S> {
+        type Height = S::Height;
+        type Length = S::Length;
+        type Width = Set<members::width>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `width` field
-        pub struct width(());
         ///Marker type for the `height` field
         pub struct height(());
         ///Marker type for the `length` field
         pub struct length(());
+        ///Marker type for the `width` field
+        pub struct width(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct VideoDetailsBuilder<'a, S: video_details_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> VideoDetails<'a> {
@@ -11963,9 +11920,9 @@ impl<'a> VideoDetailsBuilder<'a, video_details_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VideoDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -11980,11 +11937,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> VideoDetailsBuilder<'a, video_details_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         VideoDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -11999,11 +11956,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> VideoDetailsBuilder<'a, video_details_state::SetLength<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VideoDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -12018,11 +11975,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> VideoDetailsBuilder<'a, video_details_state::SetWidth<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         VideoDetailsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -12030,16 +11987,16 @@ where
 impl<'a, S> VideoDetailsBuilder<'a, S>
 where
     S: video_details_state::State,
-    S::Width: video_details_state::IsSet,
     S::Height: video_details_state::IsSet,
     S::Length: video_details_state::IsSet,
+    S::Width: video_details_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> VideoDetails<'a> {
         VideoDetails {
-            height: self.__unsafe_private_named.0.unwrap(),
-            length: self.__unsafe_private_named.1.unwrap(),
-            width: self.__unsafe_private_named.2.unwrap(),
+            height: self._fields.0.unwrap(),
+            length: self._fields.1.unwrap(),
+            width: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -12049,9 +12006,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> VideoDetails<'a> {
         VideoDetails {
-            height: self.__unsafe_private_named.0.unwrap(),
-            length: self.__unsafe_private_named.1.unwrap(),
-            width: self.__unsafe_private_named.2.unwrap(),
+            height: self._fields.0.unwrap(),
+            length: self._fields.1.unwrap(),
+            width: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/cancel_scheduled_actions.rs b/crates/jacquard-api/src/tools_ozone/moderation/cancel_scheduled_actions.rs
index 1c433876..9368bf4f 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/cancel_scheduled_actions.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/cancel_scheduled_actions.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -175,12 +178,12 @@ pub mod cancellation_results_state {
 
 /// Builder for constructing an instance of this type
 pub struct CancellationResultsBuilder<'a, S: cancellation_results_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<cancel_scheduled_actions::FailedCancellation<'a>>>,
         Option<Vec<Did<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CancellationResults<'a> {
@@ -194,9 +197,9 @@ impl<'a> CancellationResultsBuilder<'a, cancellation_results_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CancellationResultsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -211,11 +214,11 @@ where
         mut self,
         value: impl Into<Vec<cancel_scheduled_actions::FailedCancellation<'a>>>,
     ) -> CancellationResultsBuilder<'a, cancellation_results_state::SetFailed<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CancellationResultsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -230,11 +233,11 @@ where
         mut self,
         value: impl Into<Vec<Did<'a>>>,
     ) -> CancellationResultsBuilder<'a, cancellation_results_state::SetSucceeded<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CancellationResultsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -248,8 +251,8 @@ where
     /// Build the final struct
     pub fn build(self) -> CancellationResults<'a> {
         CancellationResults {
-            failed: self.__unsafe_private_named.0.unwrap(),
-            succeeded: self.__unsafe_private_named.1.unwrap(),
+            failed: self._fields.0.unwrap(),
+            succeeded: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -262,8 +265,8 @@ where
         >,
     ) -> CancellationResults<'a> {
         CancellationResults {
-            failed: self.__unsafe_private_named.0.unwrap(),
-            succeeded: self.__unsafe_private_named.1.unwrap(),
+            failed: self._fields.0.unwrap(),
+            succeeded: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -455,9 +458,9 @@ pub mod failed_cancellation_state {
 
 /// Builder for constructing an instance of this type
 pub struct FailedCancellationBuilder<'a, S: failed_cancellation_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> FailedCancellation<'a> {
@@ -471,9 +474,9 @@ impl<'a> FailedCancellationBuilder<'a, failed_cancellation_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FailedCancellationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -488,11 +491,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> FailedCancellationBuilder<'a, failed_cancellation_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FailedCancellationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -507,11 +510,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> FailedCancellationBuilder<'a, failed_cancellation_state::SetError<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FailedCancellationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -519,12 +522,12 @@ where
 impl<'a, S: failed_cancellation_state::State> FailedCancellationBuilder<'a, S> {
     /// Set the `errorCode` field (optional)
     pub fn error_code(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `errorCode` field to an Option value (optional)
     pub fn maybe_error_code(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -538,9 +541,9 @@ where
     /// Build the final struct
     pub fn build(self) -> FailedCancellation<'a> {
         FailedCancellation {
-            did: self.__unsafe_private_named.0.unwrap(),
-            error: self.__unsafe_private_named.1.unwrap(),
-            error_code: self.__unsafe_private_named.2,
+            did: self._fields.0.unwrap(),
+            error: self._fields.1.unwrap(),
+            error_code: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -553,9 +556,9 @@ where
         >,
     ) -> FailedCancellation<'a> {
         FailedCancellation {
-            did: self.__unsafe_private_named.0.unwrap(),
-            error: self.__unsafe_private_named.1.unwrap(),
-            error_code: self.__unsafe_private_named.2,
+            did: self._fields.0.unwrap(),
+            error: self._fields.1.unwrap(),
+            error_code: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
@@ -595,9 +598,9 @@ pub mod cancel_scheduled_actions_state {
 
 /// Builder for constructing an instance of this type
 pub struct CancelScheduledActionsBuilder<'a, S: cancel_scheduled_actions_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Vec<Did<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Vec<Did<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> CancelScheduledActions<'a> {
@@ -614,9 +617,9 @@ impl<'a> CancelScheduledActionsBuilder<'a, cancel_scheduled_actions_state::Empty
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CancelScheduledActionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -624,12 +627,12 @@ impl<'a> CancelScheduledActionsBuilder<'a, cancel_scheduled_actions_state::Empty
 impl<'a, S: cancel_scheduled_actions_state::State> CancelScheduledActionsBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -647,11 +650,11 @@ where
         'a,
         cancel_scheduled_actions_state::SetSubjects<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CancelScheduledActionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -664,8 +667,8 @@ where
     /// Build the final struct
     pub fn build(self) -> CancelScheduledActions<'a> {
         CancelScheduledActions {
-            comment: self.__unsafe_private_named.0,
-            subjects: self.__unsafe_private_named.1.unwrap(),
+            comment: self._fields.0,
+            subjects: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -678,8 +681,8 @@ where
         >,
     ) -> CancelScheduledActions<'a> {
         CancelScheduledActions {
-            comment: self.__unsafe_private_named.0,
-            subjects: self.__unsafe_private_named.1.unwrap(),
+            comment: self._fields.0,
+            subjects: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/emit_event.rs b/crates/jacquard-api/src/tools_ozone/moderation/emit_event.rs
index fdd0d871..9e320e9d 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/emit_event.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/emit_event.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Cid};
@@ -277,8 +280,8 @@ pub mod emit_event_state {
 
 /// Builder for constructing an instance of this type
 pub struct EmitEventBuilder<'a, S: emit_event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Did<'a>>,
         Option<EmitEventEvent<'a>>,
         Option<CowStr<'a>>,
@@ -286,7 +289,7 @@ pub struct EmitEventBuilder<'a, S: emit_event_state::State> {
         Option<EmitEventSubject<'a>>,
         Option<Vec<Cid<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> EmitEvent<'a> {
@@ -300,9 +303,9 @@ impl<'a> EmitEventBuilder<'a, emit_event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EmitEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -317,11 +320,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> EmitEventBuilder<'a, emit_event_state::SetCreatedBy<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EmitEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -336,11 +339,11 @@ where
         mut self,
         value: impl Into<EmitEventEvent<'a>>,
     ) -> EmitEventBuilder<'a, emit_event_state::SetEvent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EmitEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -348,12 +351,12 @@ where
 impl<'a, S: emit_event_state::State> EmitEventBuilder<'a, S> {
     /// Set the `externalId` field (optional)
     pub fn external_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `externalId` field to an Option value (optional)
     pub fn maybe_external_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -361,12 +364,12 @@ impl<'a, S: emit_event_state::State> EmitEventBuilder<'a, S> {
 impl<'a, S: emit_event_state::State> EmitEventBuilder<'a, S> {
     /// Set the `modTool` field (optional)
     pub fn mod_tool(mut self, value: impl Into<Option<ModTool<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `modTool` field to an Option value (optional)
     pub fn maybe_mod_tool(mut self, value: Option<ModTool<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -381,11 +384,11 @@ where
         mut self,
         value: impl Into<EmitEventSubject<'a>>,
     ) -> EmitEventBuilder<'a, emit_event_state::SetSubject<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         EmitEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -393,12 +396,12 @@ where
 impl<'a, S: emit_event_state::State> EmitEventBuilder<'a, S> {
     /// Set the `subjectBlobCids` field (optional)
     pub fn subject_blob_cids(mut self, value: impl Into<Option<Vec<Cid<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `subjectBlobCids` field to an Option value (optional)
     pub fn maybe_subject_blob_cids(mut self, value: Option<Vec<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -413,12 +416,12 @@ where
     /// Build the final struct
     pub fn build(self) -> EmitEvent<'a> {
         EmitEvent {
-            created_by: self.__unsafe_private_named.0.unwrap(),
-            event: self.__unsafe_private_named.1.unwrap(),
-            external_id: self.__unsafe_private_named.2,
-            mod_tool: self.__unsafe_private_named.3,
-            subject: self.__unsafe_private_named.4.unwrap(),
-            subject_blob_cids: self.__unsafe_private_named.5,
+            created_by: self._fields.0.unwrap(),
+            event: self._fields.1.unwrap(),
+            external_id: self._fields.2,
+            mod_tool: self._fields.3,
+            subject: self._fields.4.unwrap(),
+            subject_blob_cids: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -431,12 +434,12 @@ where
         >,
     ) -> EmitEvent<'a> {
         EmitEvent {
-            created_by: self.__unsafe_private_named.0.unwrap(),
-            event: self.__unsafe_private_named.1.unwrap(),
-            external_id: self.__unsafe_private_named.2,
-            mod_tool: self.__unsafe_private_named.3,
-            subject: self.__unsafe_private_named.4.unwrap(),
-            subject_blob_cids: self.__unsafe_private_named.5,
+            created_by: self._fields.0.unwrap(),
+            event: self._fields.1.unwrap(),
+            external_id: self._fields.2,
+            mod_tool: self._fields.3,
+            subject: self._fields.4.unwrap(),
+            subject_blob_cids: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_account_timeline.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_account_timeline.rs
index 51dda3e2..a07a9503 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/get_account_timeline.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/get_account_timeline.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -680,9 +683,9 @@ pub mod get_account_timeline_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetAccountTimelineBuilder<'a, S: get_account_timeline_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetAccountTimeline<'a> {
@@ -696,9 +699,9 @@ impl<'a> GetAccountTimelineBuilder<'a, get_account_timeline_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetAccountTimelineBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -713,11 +716,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetAccountTimelineBuilder<'a, get_account_timeline_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetAccountTimelineBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -730,7 +733,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetAccountTimeline<'a> {
         GetAccountTimeline {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
         }
     }
 }
@@ -781,12 +784,12 @@ pub mod timeline_item_state {
 
 /// Builder for constructing an instance of this type
 pub struct TimelineItemBuilder<'a, S: timeline_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Vec<get_account_timeline::TimelineItemSummary<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TimelineItem<'a> {
@@ -800,9 +803,9 @@ impl<'a> TimelineItemBuilder<'a, timeline_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TimelineItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -817,11 +820,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TimelineItemBuilder<'a, timeline_item_state::SetDay<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TimelineItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -836,11 +839,11 @@ where
         mut self,
         value: impl Into<Vec<get_account_timeline::TimelineItemSummary<'a>>>,
     ) -> TimelineItemBuilder<'a, timeline_item_state::SetSummary<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TimelineItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -854,8 +857,8 @@ where
     /// Build the final struct
     pub fn build(self) -> TimelineItem<'a> {
         TimelineItem {
-            day: self.__unsafe_private_named.0.unwrap(),
-            summary: self.__unsafe_private_named.1.unwrap(),
+            day: self._fields.0.unwrap(),
+            summary: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -868,8 +871,8 @@ where
         >,
     ) -> TimelineItem<'a> {
         TimelineItem {
-            day: self.__unsafe_private_named.0.unwrap(),
-            summary: self.__unsafe_private_named.1.unwrap(),
+            day: self._fields.0.unwrap(),
+            summary: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -985,49 +988,49 @@ pub mod timeline_item_summary_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Count;
         type EventSubjectType;
+        type Count;
         type EventType;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Count = Unset;
         type EventSubjectType = Unset;
+        type Count = Unset;
         type EventType = Unset;
     }
-    ///State transition - sets the `count` field to Set
-    pub struct SetCount<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCount<S> {}
-    impl<S: State> State for SetCount<S> {
-        type Count = Set<members::count>;
-        type EventSubjectType = S::EventSubjectType;
-        type EventType = S::EventType;
-    }
     ///State transition - sets the `event_subject_type` field to Set
     pub struct SetEventSubjectType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEventSubjectType<S> {}
     impl<S: State> State for SetEventSubjectType<S> {
-        type Count = S::Count;
         type EventSubjectType = Set<members::event_subject_type>;
+        type Count = S::Count;
+        type EventType = S::EventType;
+    }
+    ///State transition - sets the `count` field to Set
+    pub struct SetCount<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCount<S> {}
+    impl<S: State> State for SetCount<S> {
+        type EventSubjectType = S::EventSubjectType;
+        type Count = Set<members::count>;
         type EventType = S::EventType;
     }
     ///State transition - sets the `event_type` field to Set
     pub struct SetEventType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetEventType<S> {}
     impl<S: State> State for SetEventType<S> {
-        type Count = S::Count;
         type EventSubjectType = S::EventSubjectType;
+        type Count = S::Count;
         type EventType = Set<members::event_type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `count` field
-        pub struct count(());
         ///Marker type for the `event_subject_type` field
         pub struct event_subject_type(());
+        ///Marker type for the `count` field
+        pub struct count(());
         ///Marker type for the `event_type` field
         pub struct event_type(());
     }
@@ -1035,13 +1038,13 @@ pub mod timeline_item_summary_state {
 
 /// Builder for constructing an instance of this type
 pub struct TimelineItemSummaryBuilder<'a, S: timeline_item_summary_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<i64>,
         Option<TimelineItemSummaryEventSubjectType<'a>>,
         Option<TimelineItemSummaryEventType<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> TimelineItemSummary<'a> {
@@ -1055,9 +1058,9 @@ impl<'a> TimelineItemSummaryBuilder<'a, timeline_item_summary_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TimelineItemSummaryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1072,11 +1075,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> TimelineItemSummaryBuilder<'a, timeline_item_summary_state::SetCount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TimelineItemSummaryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1094,11 +1097,11 @@ where
         'a,
         timeline_item_summary_state::SetEventSubjectType<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TimelineItemSummaryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1113,11 +1116,11 @@ where
         mut self,
         value: impl Into<TimelineItemSummaryEventType<'a>>,
     ) -> TimelineItemSummaryBuilder<'a, timeline_item_summary_state::SetEventType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TimelineItemSummaryBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1125,16 +1128,16 @@ where
 impl<'a, S> TimelineItemSummaryBuilder<'a, S>
 where
     S: timeline_item_summary_state::State,
-    S::Count: timeline_item_summary_state::IsSet,
     S::EventSubjectType: timeline_item_summary_state::IsSet,
+    S::Count: timeline_item_summary_state::IsSet,
     S::EventType: timeline_item_summary_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> TimelineItemSummary<'a> {
         TimelineItemSummary {
-            count: self.__unsafe_private_named.0.unwrap(),
-            event_subject_type: self.__unsafe_private_named.1.unwrap(),
-            event_type: self.__unsafe_private_named.2.unwrap(),
+            count: self._fields.0.unwrap(),
+            event_subject_type: self._fields.1.unwrap(),
+            event_type: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1147,9 +1150,9 @@ where
         >,
     ) -> TimelineItemSummary<'a> {
         TimelineItemSummary {
-            count: self.__unsafe_private_named.0.unwrap(),
-            event_subject_type: self.__unsafe_private_named.1.unwrap(),
-            event_type: self.__unsafe_private_named.2.unwrap(),
+            count: self._fields.0.unwrap(),
+            event_subject_type: self._fields.1.unwrap(),
+            event_type: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_event.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_event.rs
index e8fded2b..88bccf75 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/get_event.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/get_event.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::IntoStatic;
 use serde::{Serialize, Deserialize};
@@ -84,8 +85,8 @@ pub mod get_event_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetEventBuilder<S: get_event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>,),
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>,),
 }
 
 impl GetEvent {
@@ -99,8 +100,8 @@ impl GetEventBuilder<get_event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
+            _state: PhantomData,
+            _fields: (None,),
         }
     }
 }
@@ -115,10 +116,10 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> GetEventBuilder<get_event_state::SetId<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetEventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
+            _state: PhantomData,
+            _fields: self._fields,
         }
     }
 }
@@ -131,7 +132,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetEvent {
         GetEvent {
-            id: self.__unsafe_private_named.0.unwrap(),
+            id: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_record.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_record.rs
index 70b33f14..17b3be0f 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/get_record.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/get_record.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{AtUri, Cid};
@@ -126,9 +127,9 @@ pub mod get_record_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetRecordBuilder<'a, S: get_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetRecord<'a> {
@@ -142,9 +143,9 @@ impl<'a> GetRecordBuilder<'a, get_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -152,12 +153,12 @@ impl<'a> GetRecordBuilder<'a, get_record_state::Empty> {
 impl<'a, S: get_record_state::State> GetRecordBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -172,11 +173,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetRecordBuilder<'a, get_record_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -189,8 +190,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetRecord<'a> {
         GetRecord {
-            cid: self.__unsafe_private_named.0,
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0,
+            uri: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_records.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_records.rs
index 69942d37..026fe7c9 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/get_records.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/get_records.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::AtUri;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -99,9 +102,9 @@ pub mod get_records_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetRecordsBuilder<'a, S: get_records_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<AtUri<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<AtUri<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetRecords<'a> {
@@ -115,9 +118,9 @@ impl<'a> GetRecordsBuilder<'a, get_records_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetRecordsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -132,11 +135,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> GetRecordsBuilder<'a, get_records_state::SetUris<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetRecordsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,7 +152,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetRecords<'a> {
         GetRecords {
-            uris: self.__unsafe_private_named.0.unwrap(),
+            uris: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_repo.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_repo.rs
index f21839d3..78146735 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/get_repo.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/get_repo.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -123,9 +124,9 @@ pub mod get_repo_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetRepoBuilder<'a, S: get_repo_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetRepo<'a> {
@@ -139,9 +140,9 @@ impl<'a> GetRepoBuilder<'a, get_repo_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetRepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -156,11 +157,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetRepoBuilder<'a, get_repo_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetRepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -173,7 +174,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetRepo<'a> {
         GetRepo {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_reporter_stats.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_reporter_stats.rs
index db1e7b5d..c7d81125 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/get_reporter_stats.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/get_reporter_stats.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_reporter_stats_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetReporterStatsBuilder<'a, S: get_reporter_stats_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<Did<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<Did<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetReporterStats<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetReporterStatsBuilder<'a, get_reporter_stats_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetReporterStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<Vec<Did<'a>>>,
     ) -> GetReporterStatsBuilder<'a, get_reporter_stats_state::SetDids<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetReporterStatsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetReporterStats<'a> {
         GetReporterStats {
-            dids: self.__unsafe_private_named.0.unwrap(),
+            dids: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_repos.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_repos.rs
index 14a45164..4d993037 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/get_repos.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/get_repos.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -99,9 +102,9 @@ pub mod get_repos_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetReposBuilder<'a, S: get_repos_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<Did<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<Did<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetRepos<'a> {
@@ -115,9 +118,9 @@ impl<'a> GetReposBuilder<'a, get_repos_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetReposBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -132,11 +135,11 @@ where
         mut self,
         value: impl Into<Vec<Did<'a>>>,
     ) -> GetReposBuilder<'a, get_repos_state::SetDids<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetReposBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,7 +152,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetRepos<'a> {
         GetRepos {
-            dids: self.__unsafe_private_named.0.unwrap(),
+            dids: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_subjects.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_subjects.rs
index 2e5a265d..f34af44b 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/get_subjects.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/get_subjects.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod get_subjects_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetSubjectsBuilder<'a, S: get_subjects_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<CowStr<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<CowStr<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetSubjects<'a> {
@@ -102,9 +105,9 @@ impl<'a> GetSubjectsBuilder<'a, get_subjects_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetSubjectsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> GetSubjectsBuilder<'a, get_subjects_state::SetSubjects<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetSubjectsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GetSubjects<'a> {
         GetSubjects {
-            subjects: self.__unsafe_private_named.0.unwrap(),
+            subjects: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/list_scheduled_actions.rs b/crates/jacquard-api/src/tools_ozone/moderation/list_scheduled_actions.rs
index 8cfbca3b..3d6f6006 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/list_scheduled_actions.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/list_scheduled_actions.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Datetime};
@@ -119,8 +122,8 @@ pub mod list_scheduled_actions_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListScheduledActionsBuilder<'a, S: list_scheduled_actions_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<i64>,
@@ -128,7 +131,7 @@ pub struct ListScheduledActionsBuilder<'a, S: list_scheduled_actions_state::Stat
         Option<Vec<CowStr<'a>>>,
         Option<Vec<Did<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListScheduledActions<'a> {
@@ -145,9 +148,9 @@ impl<'a> ListScheduledActionsBuilder<'a, list_scheduled_actions_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListScheduledActionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -155,12 +158,12 @@ impl<'a> ListScheduledActionsBuilder<'a, list_scheduled_actions_state::Empty> {
 impl<'a, S: list_scheduled_actions_state::State> ListScheduledActionsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -168,12 +171,12 @@ impl<'a, S: list_scheduled_actions_state::State> ListScheduledActionsBuilder<'a,
 impl<'a, S: list_scheduled_actions_state::State> ListScheduledActionsBuilder<'a, S> {
     /// Set the `endsBefore` field (optional)
     pub fn ends_before(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `endsBefore` field to an Option value (optional)
     pub fn maybe_ends_before(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -181,12 +184,12 @@ impl<'a, S: list_scheduled_actions_state::State> ListScheduledActionsBuilder<'a,
 impl<'a, S: list_scheduled_actions_state::State> ListScheduledActionsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -194,12 +197,12 @@ impl<'a, S: list_scheduled_actions_state::State> ListScheduledActionsBuilder<'a,
 impl<'a, S: list_scheduled_actions_state::State> ListScheduledActionsBuilder<'a, S> {
     /// Set the `startsAfter` field (optional)
     pub fn starts_after(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `startsAfter` field to an Option value (optional)
     pub fn maybe_starts_after(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -214,11 +217,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> ListScheduledActionsBuilder<'a, list_scheduled_actions_state::SetStatuses<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ListScheduledActionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -226,12 +229,12 @@ where
 impl<'a, S: list_scheduled_actions_state::State> ListScheduledActionsBuilder<'a, S> {
     /// Set the `subjects` field (optional)
     pub fn subjects(mut self, value: impl Into<Option<Vec<Did<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `subjects` field to an Option value (optional)
     pub fn maybe_subjects(mut self, value: Option<Vec<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -244,12 +247,12 @@ where
     /// Build the final struct
     pub fn build(self) -> ListScheduledActions<'a> {
         ListScheduledActions {
-            cursor: self.__unsafe_private_named.0,
-            ends_before: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2.or_else(|| Some(50i64)),
-            starts_after: self.__unsafe_private_named.3,
-            statuses: self.__unsafe_private_named.4.unwrap(),
-            subjects: self.__unsafe_private_named.5,
+            cursor: self._fields.0,
+            ends_before: self._fields.1,
+            limit: self._fields.2.or_else(|| Some(50i64)),
+            starts_after: self._fields.3,
+            statuses: self._fields.4.unwrap(),
+            subjects: self._fields.5,
             extra_data: Default::default(),
         }
     }
@@ -262,12 +265,12 @@ where
         >,
     ) -> ListScheduledActions<'a> {
         ListScheduledActions {
-            cursor: self.__unsafe_private_named.0,
-            ends_before: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2.or_else(|| Some(50i64)),
-            starts_after: self.__unsafe_private_named.3,
-            statuses: self.__unsafe_private_named.4.unwrap(),
-            subjects: self.__unsafe_private_named.5,
+            cursor: self._fields.0,
+            ends_before: self._fields.1,
+            limit: self._fields.2.or_else(|| Some(50i64)),
+            starts_after: self._fields.3,
+            statuses: self._fields.4.unwrap(),
+            subjects: self._fields.5,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/query_events.rs b/crates/jacquard-api/src/tools_ozone/moderation/query_events.rs
index 9ea58495..f531fef5 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/query_events.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/query_events.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Nsid, Datetime, UriValue};
@@ -156,8 +159,8 @@ pub mod query_events_state {
 
 /// Builder for constructing an instance of this type
 pub struct QueryEventsBuilder<'a, S: query_events_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<CowStr<'a>>>,
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
@@ -182,7 +185,7 @@ pub struct QueryEventsBuilder<'a, S: query_events_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<bool>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> QueryEvents<'a> {
@@ -196,8 +199,8 @@ impl<'a> QueryEventsBuilder<'a, query_events_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         QueryEventsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -222,7 +225,7 @@ impl<'a> QueryEventsBuilder<'a, query_events_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -230,12 +233,12 @@ impl<'a> QueryEventsBuilder<'a, query_events_state::Empty> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `addedLabels` field (optional)
     pub fn added_labels(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `addedLabels` field to an Option value (optional)
     pub fn maybe_added_labels(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -243,12 +246,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `addedTags` field (optional)
     pub fn added_tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `addedTags` field to an Option value (optional)
     pub fn maybe_added_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -256,12 +259,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `ageAssuranceState` field (optional)
     pub fn age_assurance_state(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `ageAssuranceState` field to an Option value (optional)
     pub fn maybe_age_assurance_state(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -269,12 +272,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `batchId` field (optional)
     pub fn batch_id(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `batchId` field to an Option value (optional)
     pub fn maybe_batch_id(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -282,12 +285,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `collections` field (optional)
     pub fn collections(mut self, value: impl Into<Option<Vec<Nsid<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `collections` field to an Option value (optional)
     pub fn maybe_collections(mut self, value: Option<Vec<Nsid<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -295,12 +298,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -308,12 +311,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `createdAfter` field (optional)
     pub fn created_after(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `createdAfter` field to an Option value (optional)
     pub fn maybe_created_after(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -321,12 +324,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `createdBefore` field (optional)
     pub fn created_before(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `createdBefore` field to an Option value (optional)
     pub fn maybe_created_before(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -334,12 +337,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `createdBy` field (optional)
     pub fn created_by(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `createdBy` field to an Option value (optional)
     pub fn maybe_created_by(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -347,12 +350,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -360,12 +363,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `hasComment` field (optional)
     pub fn has_comment(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `hasComment` field to an Option value (optional)
     pub fn maybe_has_comment(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -373,12 +376,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `includeAllUserRecords` field (optional)
     pub fn include_all_user_records(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `includeAllUserRecords` field to an Option value (optional)
     pub fn maybe_include_all_user_records(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -386,12 +389,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -399,12 +402,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `modTool` field (optional)
     pub fn mod_tool(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `modTool` field to an Option value (optional)
     pub fn maybe_mod_tool(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -412,12 +415,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `policies` field (optional)
     pub fn policies(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `policies` field to an Option value (optional)
     pub fn maybe_policies(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -425,12 +428,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `removedLabels` field (optional)
     pub fn removed_labels(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `removedLabels` field to an Option value (optional)
     pub fn maybe_removed_labels(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -438,12 +441,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `removedTags` field (optional)
     pub fn removed_tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `removedTags` field to an Option value (optional)
     pub fn maybe_removed_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -451,12 +454,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `reportTypes` field (optional)
     pub fn report_types(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `reportTypes` field to an Option value (optional)
     pub fn maybe_report_types(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -464,12 +467,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `sortDirection` field (optional)
     pub fn sort_direction(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `sortDirection` field to an Option value (optional)
     pub fn maybe_sort_direction(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -477,12 +480,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `subject` field (optional)
     pub fn subject(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `subject` field to an Option value (optional)
     pub fn maybe_subject(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -490,12 +493,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `subjectType` field (optional)
     pub fn subject_type(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `subjectType` field to an Option value (optional)
     pub fn maybe_subject_type(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -503,12 +506,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `types` field (optional)
     pub fn types(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `types` field to an Option value (optional)
     pub fn maybe_types(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -516,12 +519,12 @@ impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
 impl<'a, S: query_events_state::State> QueryEventsBuilder<'a, S> {
     /// Set the `withStrike` field (optional)
     pub fn with_strike(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `withStrike` field to an Option value (optional)
     pub fn maybe_with_strike(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -533,29 +536,29 @@ where
     /// Build the final struct
     pub fn build(self) -> QueryEvents<'a> {
         QueryEvents {
-            added_labels: self.__unsafe_private_named.0,
-            added_tags: self.__unsafe_private_named.1,
-            age_assurance_state: self.__unsafe_private_named.2,
-            batch_id: self.__unsafe_private_named.3,
-            collections: self.__unsafe_private_named.4,
-            comment: self.__unsafe_private_named.5,
-            created_after: self.__unsafe_private_named.6,
-            created_before: self.__unsafe_private_named.7,
-            created_by: self.__unsafe_private_named.8,
-            cursor: self.__unsafe_private_named.9,
-            has_comment: self.__unsafe_private_named.10,
-            include_all_user_records: self.__unsafe_private_named.11,
-            limit: self.__unsafe_private_named.12,
-            mod_tool: self.__unsafe_private_named.13,
-            policies: self.__unsafe_private_named.14,
-            removed_labels: self.__unsafe_private_named.15,
-            removed_tags: self.__unsafe_private_named.16,
-            report_types: self.__unsafe_private_named.17,
-            sort_direction: self.__unsafe_private_named.18,
-            subject: self.__unsafe_private_named.19,
-            subject_type: self.__unsafe_private_named.20,
-            types: self.__unsafe_private_named.21,
-            with_strike: self.__unsafe_private_named.22,
+            added_labels: self._fields.0,
+            added_tags: self._fields.1,
+            age_assurance_state: self._fields.2,
+            batch_id: self._fields.3,
+            collections: self._fields.4,
+            comment: self._fields.5,
+            created_after: self._fields.6,
+            created_before: self._fields.7,
+            created_by: self._fields.8,
+            cursor: self._fields.9,
+            has_comment: self._fields.10,
+            include_all_user_records: self._fields.11,
+            limit: self._fields.12,
+            mod_tool: self._fields.13,
+            policies: self._fields.14,
+            removed_labels: self._fields.15,
+            removed_tags: self._fields.16,
+            report_types: self._fields.17,
+            sort_direction: self._fields.18,
+            subject: self._fields.19,
+            subject_type: self._fields.20,
+            types: self._fields.21,
+            with_strike: self._fields.22,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/query_statuses.rs b/crates/jacquard-api/src/tools_ozone/moderation/query_statuses.rs
index d5a3a392..c3ca1efc 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/query_statuses.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/query_statuses.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Nsid, Datetime, UriValue};
@@ -182,8 +185,8 @@ pub mod query_statuses_state {
 
 /// Builder for constructing an instance of this type
 pub struct QueryStatusesBuilder<'a, S: query_statuses_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<bool>,
         Option<Vec<Nsid<'a>>>,
@@ -221,7 +224,7 @@ pub struct QueryStatusesBuilder<'a, S: query_statuses_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<bool>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> QueryStatuses<'a> {
@@ -235,8 +238,8 @@ impl<'a> QueryStatusesBuilder<'a, query_statuses_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         QueryStatusesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -274,7 +277,7 @@ impl<'a> QueryStatusesBuilder<'a, query_statuses_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -282,12 +285,12 @@ impl<'a> QueryStatusesBuilder<'a, query_statuses_state::Empty> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `ageAssuranceState` field (optional)
     pub fn age_assurance_state(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `ageAssuranceState` field to an Option value (optional)
     pub fn maybe_age_assurance_state(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -295,12 +298,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `appealed` field (optional)
     pub fn appealed(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `appealed` field to an Option value (optional)
     pub fn maybe_appealed(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -308,12 +311,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `collections` field (optional)
     pub fn collections(mut self, value: impl Into<Option<Vec<Nsid<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `collections` field to an Option value (optional)
     pub fn maybe_collections(mut self, value: Option<Vec<Nsid<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -321,12 +324,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -334,12 +337,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -347,12 +350,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `excludeTags` field (optional)
     pub fn exclude_tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `excludeTags` field to an Option value (optional)
     pub fn maybe_exclude_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -360,12 +363,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `hostingDeletedAfter` field (optional)
     pub fn hosting_deleted_after(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `hostingDeletedAfter` field to an Option value (optional)
     pub fn maybe_hosting_deleted_after(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -373,12 +376,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `hostingDeletedBefore` field (optional)
     pub fn hosting_deleted_before(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `hostingDeletedBefore` field to an Option value (optional)
     pub fn maybe_hosting_deleted_before(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -389,12 +392,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<CowStr<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `hostingStatuses` field to an Option value (optional)
     pub fn maybe_hosting_statuses(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -402,12 +405,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `hostingUpdatedAfter` field (optional)
     pub fn hosting_updated_after(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `hostingUpdatedAfter` field to an Option value (optional)
     pub fn maybe_hosting_updated_after(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -415,12 +418,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `hostingUpdatedBefore` field (optional)
     pub fn hosting_updated_before(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `hostingUpdatedBefore` field to an Option value (optional)
     pub fn maybe_hosting_updated_before(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -431,12 +434,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<UriValue<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `ignoreSubjects` field to an Option value (optional)
     pub fn maybe_ignore_subjects(mut self, value: Option<Vec<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -444,12 +447,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `includeAllUserRecords` field (optional)
     pub fn include_all_user_records(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.12 = value.into();
+        self._fields.12 = value.into();
         self
     }
     /// Set the `includeAllUserRecords` field to an Option value (optional)
     pub fn maybe_include_all_user_records(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.12 = value;
+        self._fields.12 = value;
         self
     }
 }
@@ -457,12 +460,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `includeMuted` field (optional)
     pub fn include_muted(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.13 = value.into();
+        self._fields.13 = value.into();
         self
     }
     /// Set the `includeMuted` field to an Option value (optional)
     pub fn maybe_include_muted(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.13 = value;
+        self._fields.13 = value;
         self
     }
 }
@@ -470,12 +473,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `lastReviewedBy` field (optional)
     pub fn last_reviewed_by(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.14 = value.into();
+        self._fields.14 = value.into();
         self
     }
     /// Set the `lastReviewedBy` field to an Option value (optional)
     pub fn maybe_last_reviewed_by(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.14 = value;
+        self._fields.14 = value;
         self
     }
 }
@@ -483,12 +486,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.15 = value.into();
+        self._fields.15 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.15 = value;
+        self._fields.15 = value;
         self
     }
 }
@@ -496,12 +499,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `minAccountSuspendCount` field (optional)
     pub fn min_account_suspend_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.16 = value.into();
+        self._fields.16 = value.into();
         self
     }
     /// Set the `minAccountSuspendCount` field to an Option value (optional)
     pub fn maybe_min_account_suspend_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.16 = value;
+        self._fields.16 = value;
         self
     }
 }
@@ -509,12 +512,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `minPriorityScore` field (optional)
     pub fn min_priority_score(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.17 = value.into();
+        self._fields.17 = value.into();
         self
     }
     /// Set the `minPriorityScore` field to an Option value (optional)
     pub fn maybe_min_priority_score(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.17 = value;
+        self._fields.17 = value;
         self
     }
 }
@@ -522,12 +525,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `minReportedRecordsCount` field (optional)
     pub fn min_reported_records_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.18 = value.into();
+        self._fields.18 = value.into();
         self
     }
     /// Set the `minReportedRecordsCount` field to an Option value (optional)
     pub fn maybe_min_reported_records_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.18 = value;
+        self._fields.18 = value;
         self
     }
 }
@@ -535,12 +538,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `minStrikeCount` field (optional)
     pub fn min_strike_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.19 = value.into();
+        self._fields.19 = value.into();
         self
     }
     /// Set the `minStrikeCount` field to an Option value (optional)
     pub fn maybe_min_strike_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.19 = value;
+        self._fields.19 = value;
         self
     }
 }
@@ -548,12 +551,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `minTakendownRecordsCount` field (optional)
     pub fn min_takendown_records_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.20 = value.into();
+        self._fields.20 = value.into();
         self
     }
     /// Set the `minTakendownRecordsCount` field to an Option value (optional)
     pub fn maybe_min_takendown_records_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.20 = value;
+        self._fields.20 = value;
         self
     }
 }
@@ -561,12 +564,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `onlyMuted` field (optional)
     pub fn only_muted(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.21 = value.into();
+        self._fields.21 = value.into();
         self
     }
     /// Set the `onlyMuted` field to an Option value (optional)
     pub fn maybe_only_muted(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.21 = value;
+        self._fields.21 = value;
         self
     }
 }
@@ -574,12 +577,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `queueCount` field (optional)
     pub fn queue_count(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.22 = value.into();
+        self._fields.22 = value.into();
         self
     }
     /// Set the `queueCount` field to an Option value (optional)
     pub fn maybe_queue_count(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.22 = value;
+        self._fields.22 = value;
         self
     }
 }
@@ -587,12 +590,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `queueIndex` field (optional)
     pub fn queue_index(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.23 = value.into();
+        self._fields.23 = value.into();
         self
     }
     /// Set the `queueIndex` field to an Option value (optional)
     pub fn maybe_queue_index(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.23 = value;
+        self._fields.23 = value;
         self
     }
 }
@@ -600,12 +603,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `queueSeed` field (optional)
     pub fn queue_seed(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.24 = value.into();
+        self._fields.24 = value.into();
         self
     }
     /// Set the `queueSeed` field to an Option value (optional)
     pub fn maybe_queue_seed(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.24 = value;
+        self._fields.24 = value;
         self
     }
 }
@@ -613,12 +616,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `reportedAfter` field (optional)
     pub fn reported_after(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.25 = value.into();
+        self._fields.25 = value.into();
         self
     }
     /// Set the `reportedAfter` field to an Option value (optional)
     pub fn maybe_reported_after(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.25 = value;
+        self._fields.25 = value;
         self
     }
 }
@@ -626,12 +629,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `reportedBefore` field (optional)
     pub fn reported_before(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.26 = value.into();
+        self._fields.26 = value.into();
         self
     }
     /// Set the `reportedBefore` field to an Option value (optional)
     pub fn maybe_reported_before(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.26 = value;
+        self._fields.26 = value;
         self
     }
 }
@@ -639,12 +642,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `reviewState` field (optional)
     pub fn review_state(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.27 = value.into();
+        self._fields.27 = value.into();
         self
     }
     /// Set the `reviewState` field to an Option value (optional)
     pub fn maybe_review_state(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.27 = value;
+        self._fields.27 = value;
         self
     }
 }
@@ -652,12 +655,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `reviewedAfter` field (optional)
     pub fn reviewed_after(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.28 = value.into();
+        self._fields.28 = value.into();
         self
     }
     /// Set the `reviewedAfter` field to an Option value (optional)
     pub fn maybe_reviewed_after(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.28 = value;
+        self._fields.28 = value;
         self
     }
 }
@@ -665,12 +668,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `reviewedBefore` field (optional)
     pub fn reviewed_before(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.29 = value.into();
+        self._fields.29 = value.into();
         self
     }
     /// Set the `reviewedBefore` field to an Option value (optional)
     pub fn maybe_reviewed_before(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.29 = value;
+        self._fields.29 = value;
         self
     }
 }
@@ -678,12 +681,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `sortDirection` field (optional)
     pub fn sort_direction(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.30 = value.into();
+        self._fields.30 = value.into();
         self
     }
     /// Set the `sortDirection` field to an Option value (optional)
     pub fn maybe_sort_direction(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.30 = value;
+        self._fields.30 = value;
         self
     }
 }
@@ -691,12 +694,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `sortField` field (optional)
     pub fn sort_field(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.31 = value.into();
+        self._fields.31 = value.into();
         self
     }
     /// Set the `sortField` field to an Option value (optional)
     pub fn maybe_sort_field(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.31 = value;
+        self._fields.31 = value;
         self
     }
 }
@@ -704,12 +707,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `subject` field (optional)
     pub fn subject(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.32 = value.into();
+        self._fields.32 = value.into();
         self
     }
     /// Set the `subject` field to an Option value (optional)
     pub fn maybe_subject(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.32 = value;
+        self._fields.32 = value;
         self
     }
 }
@@ -717,12 +720,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `subjectType` field (optional)
     pub fn subject_type(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.33 = value.into();
+        self._fields.33 = value.into();
         self
     }
     /// Set the `subjectType` field to an Option value (optional)
     pub fn maybe_subject_type(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.33 = value;
+        self._fields.33 = value;
         self
     }
 }
@@ -730,12 +733,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.34 = value.into();
+        self._fields.34 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.34 = value;
+        self._fields.34 = value;
         self
     }
 }
@@ -743,12 +746,12 @@ impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
 impl<'a, S: query_statuses_state::State> QueryStatusesBuilder<'a, S> {
     /// Set the `takendown` field (optional)
     pub fn takendown(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.35 = value.into();
+        self._fields.35 = value.into();
         self
     }
     /// Set the `takendown` field to an Option value (optional)
     pub fn maybe_takendown(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.35 = value;
+        self._fields.35 = value;
         self
     }
 }
@@ -760,42 +763,42 @@ where
     /// Build the final struct
     pub fn build(self) -> QueryStatuses<'a> {
         QueryStatuses {
-            age_assurance_state: self.__unsafe_private_named.0,
-            appealed: self.__unsafe_private_named.1,
-            collections: self.__unsafe_private_named.2,
-            comment: self.__unsafe_private_named.3,
-            cursor: self.__unsafe_private_named.4,
-            exclude_tags: self.__unsafe_private_named.5,
-            hosting_deleted_after: self.__unsafe_private_named.6,
-            hosting_deleted_before: self.__unsafe_private_named.7,
-            hosting_statuses: self.__unsafe_private_named.8,
-            hosting_updated_after: self.__unsafe_private_named.9,
-            hosting_updated_before: self.__unsafe_private_named.10,
-            ignore_subjects: self.__unsafe_private_named.11,
-            include_all_user_records: self.__unsafe_private_named.12,
-            include_muted: self.__unsafe_private_named.13,
-            last_reviewed_by: self.__unsafe_private_named.14,
-            limit: self.__unsafe_private_named.15,
-            min_account_suspend_count: self.__unsafe_private_named.16,
-            min_priority_score: self.__unsafe_private_named.17,
-            min_reported_records_count: self.__unsafe_private_named.18,
-            min_strike_count: self.__unsafe_private_named.19,
-            min_takendown_records_count: self.__unsafe_private_named.20,
-            only_muted: self.__unsafe_private_named.21,
-            queue_count: self.__unsafe_private_named.22,
-            queue_index: self.__unsafe_private_named.23,
-            queue_seed: self.__unsafe_private_named.24,
-            reported_after: self.__unsafe_private_named.25,
-            reported_before: self.__unsafe_private_named.26,
-            review_state: self.__unsafe_private_named.27,
-            reviewed_after: self.__unsafe_private_named.28,
-            reviewed_before: self.__unsafe_private_named.29,
-            sort_direction: self.__unsafe_private_named.30,
-            sort_field: self.__unsafe_private_named.31,
-            subject: self.__unsafe_private_named.32,
-            subject_type: self.__unsafe_private_named.33,
-            tags: self.__unsafe_private_named.34,
-            takendown: self.__unsafe_private_named.35,
+            age_assurance_state: self._fields.0,
+            appealed: self._fields.1,
+            collections: self._fields.2,
+            comment: self._fields.3,
+            cursor: self._fields.4,
+            exclude_tags: self._fields.5,
+            hosting_deleted_after: self._fields.6,
+            hosting_deleted_before: self._fields.7,
+            hosting_statuses: self._fields.8,
+            hosting_updated_after: self._fields.9,
+            hosting_updated_before: self._fields.10,
+            ignore_subjects: self._fields.11,
+            include_all_user_records: self._fields.12,
+            include_muted: self._fields.13,
+            last_reviewed_by: self._fields.14,
+            limit: self._fields.15,
+            min_account_suspend_count: self._fields.16,
+            min_priority_score: self._fields.17,
+            min_reported_records_count: self._fields.18,
+            min_strike_count: self._fields.19,
+            min_takendown_records_count: self._fields.20,
+            only_muted: self._fields.21,
+            queue_count: self._fields.22,
+            queue_index: self._fields.23,
+            queue_seed: self._fields.24,
+            reported_after: self._fields.25,
+            reported_before: self._fields.26,
+            review_state: self._fields.27,
+            reviewed_after: self._fields.28,
+            reviewed_before: self._fields.29,
+            sort_direction: self._fields.30,
+            sort_field: self._fields.31,
+            subject: self._fields.32,
+            subject_type: self._fields.33,
+            tags: self._fields.34,
+            takendown: self._fields.35,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs b/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs
index a410ef21..465b2309 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -240,45 +243,45 @@ pub mod failed_scheduling_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Error;
         type Subject;
+        type Error;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Error = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `error` field to Set
-    pub struct SetError<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetError<S> {}
-    impl<S: State> State for SetError<S> {
-        type Error = Set<members::error>;
-        type Subject = S::Subject;
+        type Error = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type Error = S::Error;
         type Subject = Set<members::subject>;
+        type Error = S::Error;
+    }
+    ///State transition - sets the `error` field to Set
+    pub struct SetError<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetError<S> {}
+    impl<S: State> State for SetError<S> {
+        type Subject = S::Subject;
+        type Error = Set<members::error>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `error` field
-        pub struct error(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `error` field
+        pub struct error(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct FailedSchedulingBuilder<'a, S: failed_scheduling_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> FailedScheduling<'a> {
@@ -292,9 +295,9 @@ impl<'a> FailedSchedulingBuilder<'a, failed_scheduling_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FailedSchedulingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -309,11 +312,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> FailedSchedulingBuilder<'a, failed_scheduling_state::SetError<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FailedSchedulingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -321,12 +324,12 @@ where
 impl<'a, S: failed_scheduling_state::State> FailedSchedulingBuilder<'a, S> {
     /// Set the `errorCode` field (optional)
     pub fn error_code(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `errorCode` field to an Option value (optional)
     pub fn maybe_error_code(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -341,11 +344,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> FailedSchedulingBuilder<'a, failed_scheduling_state::SetSubject<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         FailedSchedulingBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -353,15 +356,15 @@ where
 impl<'a, S> FailedSchedulingBuilder<'a, S>
 where
     S: failed_scheduling_state::State,
-    S::Error: failed_scheduling_state::IsSet,
     S::Subject: failed_scheduling_state::IsSet,
+    S::Error: failed_scheduling_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> FailedScheduling<'a> {
         FailedScheduling {
-            error: self.__unsafe_private_named.0.unwrap(),
-            error_code: self.__unsafe_private_named.1,
-            subject: self.__unsafe_private_named.2.unwrap(),
+            error: self._fields.0.unwrap(),
+            error_code: self._fields.1,
+            subject: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -374,9 +377,9 @@ where
         >,
     ) -> FailedScheduling<'a> {
         FailedScheduling {
-            error: self.__unsafe_private_named.0.unwrap(),
-            error_code: self.__unsafe_private_named.1,
-            subject: self.__unsafe_private_named.2.unwrap(),
+            error: self._fields.0.unwrap(),
+            error_code: self._fields.1,
+            subject: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -694,81 +697,81 @@ pub mod schedule_action_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Subjects;
         type Scheduling;
-        type CreatedBy;
         type Action;
-        type Subjects;
+        type CreatedBy;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Subjects = Unset;
         type Scheduling = Unset;
-        type CreatedBy = Unset;
         type Action = Unset;
-        type Subjects = Unset;
+        type CreatedBy = Unset;
+    }
+    ///State transition - sets the `subjects` field to Set
+    pub struct SetSubjects<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubjects<S> {}
+    impl<S: State> State for SetSubjects<S> {
+        type Subjects = Set<members::subjects>;
+        type Scheduling = S::Scheduling;
+        type Action = S::Action;
+        type CreatedBy = S::CreatedBy;
     }
     ///State transition - sets the `scheduling` field to Set
     pub struct SetScheduling<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetScheduling<S> {}
     impl<S: State> State for SetScheduling<S> {
-        type Scheduling = Set<members::scheduling>;
-        type CreatedBy = S::CreatedBy;
-        type Action = S::Action;
         type Subjects = S::Subjects;
-    }
-    ///State transition - sets the `created_by` field to Set
-    pub struct SetCreatedBy<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedBy<S> {}
-    impl<S: State> State for SetCreatedBy<S> {
-        type Scheduling = S::Scheduling;
-        type CreatedBy = Set<members::created_by>;
+        type Scheduling = Set<members::scheduling>;
         type Action = S::Action;
-        type Subjects = S::Subjects;
+        type CreatedBy = S::CreatedBy;
     }
     ///State transition - sets the `action` field to Set
     pub struct SetAction<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAction<S> {}
     impl<S: State> State for SetAction<S> {
+        type Subjects = S::Subjects;
         type Scheduling = S::Scheduling;
-        type CreatedBy = S::CreatedBy;
         type Action = Set<members::action>;
-        type Subjects = S::Subjects;
+        type CreatedBy = S::CreatedBy;
     }
-    ///State transition - sets the `subjects` field to Set
-    pub struct SetSubjects<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubjects<S> {}
-    impl<S: State> State for SetSubjects<S> {
+    ///State transition - sets the `created_by` field to Set
+    pub struct SetCreatedBy<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedBy<S> {}
+    impl<S: State> State for SetCreatedBy<S> {
+        type Subjects = S::Subjects;
         type Scheduling = S::Scheduling;
-        type CreatedBy = S::CreatedBy;
         type Action = S::Action;
-        type Subjects = Set<members::subjects>;
+        type CreatedBy = Set<members::created_by>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `subjects` field
+        pub struct subjects(());
         ///Marker type for the `scheduling` field
         pub struct scheduling(());
-        ///Marker type for the `created_by` field
-        pub struct created_by(());
         ///Marker type for the `action` field
         pub struct action(());
-        ///Marker type for the `subjects` field
-        pub struct subjects(());
+        ///Marker type for the `created_by` field
+        pub struct created_by(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ScheduleActionBuilder<'a, S: schedule_action_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<schedule_action::Takedown<'a>>,
         Option<Did<'a>>,
         Option<ModTool<'a>>,
         Option<schedule_action::SchedulingConfig<'a>>,
         Option<Vec<Did<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ScheduleAction<'a> {
@@ -782,9 +785,9 @@ impl<'a> ScheduleActionBuilder<'a, schedule_action_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ScheduleActionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -799,11 +802,11 @@ where
         mut self,
         value: impl Into<schedule_action::Takedown<'a>>,
     ) -> ScheduleActionBuilder<'a, schedule_action_state::SetAction<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ScheduleActionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -818,11 +821,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> ScheduleActionBuilder<'a, schedule_action_state::SetCreatedBy<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ScheduleActionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -830,12 +833,12 @@ where
 impl<'a, S: schedule_action_state::State> ScheduleActionBuilder<'a, S> {
     /// Set the `modTool` field (optional)
     pub fn mod_tool(mut self, value: impl Into<Option<ModTool<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `modTool` field to an Option value (optional)
     pub fn maybe_mod_tool(mut self, value: Option<ModTool<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -850,11 +853,11 @@ where
         mut self,
         value: impl Into<schedule_action::SchedulingConfig<'a>>,
     ) -> ScheduleActionBuilder<'a, schedule_action_state::SetScheduling<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ScheduleActionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -869,11 +872,11 @@ where
         mut self,
         value: impl Into<Vec<Did<'a>>>,
     ) -> ScheduleActionBuilder<'a, schedule_action_state::SetSubjects<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         ScheduleActionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -881,19 +884,19 @@ where
 impl<'a, S> ScheduleActionBuilder<'a, S>
 where
     S: schedule_action_state::State,
+    S::Subjects: schedule_action_state::IsSet,
     S::Scheduling: schedule_action_state::IsSet,
-    S::CreatedBy: schedule_action_state::IsSet,
     S::Action: schedule_action_state::IsSet,
-    S::Subjects: schedule_action_state::IsSet,
+    S::CreatedBy: schedule_action_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ScheduleAction<'a> {
         ScheduleAction {
-            action: self.__unsafe_private_named.0.unwrap(),
-            created_by: self.__unsafe_private_named.1.unwrap(),
-            mod_tool: self.__unsafe_private_named.2,
-            scheduling: self.__unsafe_private_named.3.unwrap(),
-            subjects: self.__unsafe_private_named.4.unwrap(),
+            action: self._fields.0.unwrap(),
+            created_by: self._fields.1.unwrap(),
+            mod_tool: self._fields.2,
+            scheduling: self._fields.3.unwrap(),
+            subjects: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -906,11 +909,11 @@ where
         >,
     ) -> ScheduleAction<'a> {
         ScheduleAction {
-            action: self.__unsafe_private_named.0.unwrap(),
-            created_by: self.__unsafe_private_named.1.unwrap(),
-            mod_tool: self.__unsafe_private_named.2,
-            scheduling: self.__unsafe_private_named.3.unwrap(),
-            subjects: self.__unsafe_private_named.4.unwrap(),
+            action: self._fields.0.unwrap(),
+            created_by: self._fields.1.unwrap(),
+            mod_tool: self._fields.2,
+            scheduling: self._fields.3.unwrap(),
+            subjects: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -926,48 +929,45 @@ pub mod scheduled_action_results_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Succeeded;
         type Failed;
+        type Succeeded;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Succeeded = Unset;
         type Failed = Unset;
-    }
-    ///State transition - sets the `succeeded` field to Set
-    pub struct SetSucceeded<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSucceeded<S> {}
-    impl<S: State> State for SetSucceeded<S> {
-        type Succeeded = Set<members::succeeded>;
-        type Failed = S::Failed;
+        type Succeeded = Unset;
     }
     ///State transition - sets the `failed` field to Set
     pub struct SetFailed<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetFailed<S> {}
     impl<S: State> State for SetFailed<S> {
-        type Succeeded = S::Succeeded;
         type Failed = Set<members::failed>;
+        type Succeeded = S::Succeeded;
+    }
+    ///State transition - sets the `succeeded` field to Set
+    pub struct SetSucceeded<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSucceeded<S> {}
+    impl<S: State> State for SetSucceeded<S> {
+        type Failed = S::Failed;
+        type Succeeded = Set<members::succeeded>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `succeeded` field
-        pub struct succeeded(());
         ///Marker type for the `failed` field
         pub struct failed(());
+        ///Marker type for the `succeeded` field
+        pub struct succeeded(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ScheduledActionResultsBuilder<'a, S: scheduled_action_results_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<schedule_action::FailedScheduling<'a>>>,
-        Option<Vec<Did<'a>>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<schedule_action::FailedScheduling<'a>>>, Option<Vec<Did<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ScheduledActionResults<'a> {
@@ -984,9 +984,9 @@ impl<'a> ScheduledActionResultsBuilder<'a, scheduled_action_results_state::Empty
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ScheduledActionResultsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1004,11 +1004,11 @@ where
         'a,
         scheduled_action_results_state::SetFailed<S>,
     > {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ScheduledActionResultsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1026,11 +1026,11 @@ where
         'a,
         scheduled_action_results_state::SetSucceeded<S>,
     > {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ScheduledActionResultsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1038,14 +1038,14 @@ where
 impl<'a, S> ScheduledActionResultsBuilder<'a, S>
 where
     S: scheduled_action_results_state::State,
-    S::Succeeded: scheduled_action_results_state::IsSet,
     S::Failed: scheduled_action_results_state::IsSet,
+    S::Succeeded: scheduled_action_results_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> ScheduledActionResults<'a> {
         ScheduledActionResults {
-            failed: self.__unsafe_private_named.0.unwrap(),
-            succeeded: self.__unsafe_private_named.1.unwrap(),
+            failed: self._fields.0.unwrap(),
+            succeeded: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1058,8 +1058,8 @@ where
         >,
     ) -> ScheduledActionResults<'a> {
         ScheduledActionResults {
-            failed: self.__unsafe_private_named.0.unwrap(),
-            succeeded: self.__unsafe_private_named.1.unwrap(),
+            failed: self._fields.0.unwrap(),
+            succeeded: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/search_repos.rs b/crates/jacquard-api/src/tools_ozone/moderation/search_repos.rs
index 3af6a100..98c7fe33 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/search_repos.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/search_repos.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -91,14 +94,9 @@ pub mod search_repos_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchReposBuilder<'a, S: search_repos_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<i64>,
-        Option<CowStr<'a>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchRepos<'a> {
@@ -112,9 +110,9 @@ impl<'a> SearchReposBuilder<'a, search_repos_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchReposBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -122,12 +120,12 @@ impl<'a> SearchReposBuilder<'a, search_repos_state::Empty> {
 impl<'a, S: search_repos_state::State> SearchReposBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -135,12 +133,12 @@ impl<'a, S: search_repos_state::State> SearchReposBuilder<'a, S> {
 impl<'a, S: search_repos_state::State> SearchReposBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -148,12 +146,12 @@ impl<'a, S: search_repos_state::State> SearchReposBuilder<'a, S> {
 impl<'a, S: search_repos_state::State> SearchReposBuilder<'a, S> {
     /// Set the `q` field (optional)
     pub fn q(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `q` field to an Option value (optional)
     pub fn maybe_q(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -161,12 +159,12 @@ impl<'a, S: search_repos_state::State> SearchReposBuilder<'a, S> {
 impl<'a, S: search_repos_state::State> SearchReposBuilder<'a, S> {
     /// Set the `term` field (optional)
     pub fn term(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `term` field to an Option value (optional)
     pub fn maybe_term(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -178,10 +176,10 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchRepos<'a> {
         SearchRepos {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            q: self.__unsafe_private_named.2,
-            term: self.__unsafe_private_named.3,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            q: self._fields.2,
+            term: self._fields.3,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/safelink.rs b/crates/jacquard-api/src/tools_ozone/safelink.rs
index eaffd81d..75a1ad97 100644
--- a/crates/jacquard-api/src/tools_ozone/safelink.rs
+++ b/crates/jacquard-api/src/tools_ozone/safelink.rs
@@ -11,7 +11,11 @@ pub mod query_rules;
 pub mod remove_rule;
 pub mod update_rule;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -475,158 +479,158 @@ pub mod event_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
-        type Action;
         type Reason;
-        type Pattern;
-        type Url;
+        type EventType;
         type CreatedBy;
+        type Url;
+        type Pattern;
+        type CreatedAt;
         type Id;
-        type EventType;
+        type Action;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
-        type Action = Unset;
         type Reason = Unset;
-        type Pattern = Unset;
-        type Url = Unset;
+        type EventType = Unset;
         type CreatedBy = Unset;
+        type Url = Unset;
+        type Pattern = Unset;
+        type CreatedAt = Unset;
         type Id = Unset;
-        type EventType = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Action = S::Action;
-        type Reason = S::Reason;
-        type Pattern = S::Pattern;
-        type Url = S::Url;
-        type CreatedBy = S::CreatedBy;
-        type Id = S::Id;
-        type EventType = S::EventType;
-    }
-    ///State transition - sets the `action` field to Set
-    pub struct SetAction<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAction<S> {}
-    impl<S: State> State for SetAction<S> {
-        type CreatedAt = S::CreatedAt;
-        type Action = Set<members::action>;
-        type Reason = S::Reason;
-        type Pattern = S::Pattern;
-        type Url = S::Url;
-        type CreatedBy = S::CreatedBy;
-        type Id = S::Id;
-        type EventType = S::EventType;
+        type Action = Unset;
     }
     ///State transition - sets the `reason` field to Set
     pub struct SetReason<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetReason<S> {}
     impl<S: State> State for SetReason<S> {
-        type CreatedAt = S::CreatedAt;
-        type Action = S::Action;
         type Reason = Set<members::reason>;
-        type Pattern = S::Pattern;
-        type Url = S::Url;
+        type EventType = S::EventType;
         type CreatedBy = S::CreatedBy;
+        type Url = S::Url;
+        type Pattern = S::Pattern;
+        type CreatedAt = S::CreatedAt;
         type Id = S::Id;
-        type EventType = S::EventType;
+        type Action = S::Action;
     }
-    ///State transition - sets the `pattern` field to Set
-    pub struct SetPattern<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPattern<S> {}
-    impl<S: State> State for SetPattern<S> {
+    ///State transition - sets the `event_type` field to Set
+    pub struct SetEventType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetEventType<S> {}
+    impl<S: State> State for SetEventType<S> {
+        type Reason = S::Reason;
+        type EventType = Set<members::event_type>;
+        type CreatedBy = S::CreatedBy;
+        type Url = S::Url;
+        type Pattern = S::Pattern;
         type CreatedAt = S::CreatedAt;
+        type Id = S::Id;
         type Action = S::Action;
+    }
+    ///State transition - sets the `created_by` field to Set
+    pub struct SetCreatedBy<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedBy<S> {}
+    impl<S: State> State for SetCreatedBy<S> {
         type Reason = S::Reason;
-        type Pattern = Set<members::pattern>;
+        type EventType = S::EventType;
+        type CreatedBy = Set<members::created_by>;
         type Url = S::Url;
-        type CreatedBy = S::CreatedBy;
+        type Pattern = S::Pattern;
+        type CreatedAt = S::CreatedAt;
         type Id = S::Id;
-        type EventType = S::EventType;
+        type Action = S::Action;
     }
     ///State transition - sets the `url` field to Set
     pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUrl<S> {}
     impl<S: State> State for SetUrl<S> {
-        type CreatedAt = S::CreatedAt;
-        type Action = S::Action;
         type Reason = S::Reason;
-        type Pattern = S::Pattern;
-        type Url = Set<members::url>;
+        type EventType = S::EventType;
         type CreatedBy = S::CreatedBy;
+        type Url = Set<members::url>;
+        type Pattern = S::Pattern;
+        type CreatedAt = S::CreatedAt;
         type Id = S::Id;
-        type EventType = S::EventType;
+        type Action = S::Action;
     }
-    ///State transition - sets the `created_by` field to Set
-    pub struct SetCreatedBy<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedBy<S> {}
-    impl<S: State> State for SetCreatedBy<S> {
+    ///State transition - sets the `pattern` field to Set
+    pub struct SetPattern<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPattern<S> {}
+    impl<S: State> State for SetPattern<S> {
+        type Reason = S::Reason;
+        type EventType = S::EventType;
+        type CreatedBy = S::CreatedBy;
+        type Url = S::Url;
+        type Pattern = Set<members::pattern>;
         type CreatedAt = S::CreatedAt;
+        type Id = S::Id;
         type Action = S::Action;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
         type Reason = S::Reason;
-        type Pattern = S::Pattern;
+        type EventType = S::EventType;
+        type CreatedBy = S::CreatedBy;
         type Url = S::Url;
-        type CreatedBy = Set<members::created_by>;
+        type Pattern = S::Pattern;
+        type CreatedAt = Set<members::created_at>;
         type Id = S::Id;
-        type EventType = S::EventType;
+        type Action = S::Action;
     }
     ///State transition - sets the `id` field to Set
     pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetId<S> {}
     impl<S: State> State for SetId<S> {
-        type CreatedAt = S::CreatedAt;
-        type Action = S::Action;
         type Reason = S::Reason;
-        type Pattern = S::Pattern;
-        type Url = S::Url;
-        type CreatedBy = S::CreatedBy;
-        type Id = Set<members::id>;
         type EventType = S::EventType;
-    }
-    ///State transition - sets the `event_type` field to Set
-    pub struct SetEventType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetEventType<S> {}
-    impl<S: State> State for SetEventType<S> {
+        type CreatedBy = S::CreatedBy;
+        type Url = S::Url;
+        type Pattern = S::Pattern;
         type CreatedAt = S::CreatedAt;
+        type Id = Set<members::id>;
         type Action = S::Action;
+    }
+    ///State transition - sets the `action` field to Set
+    pub struct SetAction<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAction<S> {}
+    impl<S: State> State for SetAction<S> {
         type Reason = S::Reason;
-        type Pattern = S::Pattern;
-        type Url = S::Url;
+        type EventType = S::EventType;
         type CreatedBy = S::CreatedBy;
+        type Url = S::Url;
+        type Pattern = S::Pattern;
+        type CreatedAt = S::CreatedAt;
         type Id = S::Id;
-        type EventType = Set<members::event_type>;
+        type Action = Set<members::action>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `action` field
-        pub struct action(());
         ///Marker type for the `reason` field
         pub struct reason(());
-        ///Marker type for the `pattern` field
-        pub struct pattern(());
-        ///Marker type for the `url` field
-        pub struct url(());
+        ///Marker type for the `event_type` field
+        pub struct event_type(());
         ///Marker type for the `created_by` field
         pub struct created_by(());
+        ///Marker type for the `url` field
+        pub struct url(());
+        ///Marker type for the `pattern` field
+        pub struct pattern(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `id` field
         pub struct id(());
-        ///Marker type for the `event_type` field
-        pub struct event_type(());
+        ///Marker type for the `action` field
+        pub struct action(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct EventBuilder<'a, S: event_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<safelink::ActionType<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -637,7 +641,7 @@ pub struct EventBuilder<'a, S: event_state::State> {
         Option<safelink::ReasonType<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Event<'a> {
@@ -651,19 +655,9 @@ impl<'a> EventBuilder<'a, event_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -678,11 +672,11 @@ where
         mut self,
         value: impl Into<safelink::ActionType<'a>>,
     ) -> EventBuilder<'a, event_state::SetAction<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -690,12 +684,12 @@ where
 impl<'a, S: event_state::State> EventBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -710,11 +704,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EventBuilder<'a, event_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -729,11 +723,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> EventBuilder<'a, event_state::SetCreatedBy<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -748,11 +742,11 @@ where
         mut self,
         value: impl Into<safelink::EventType<'a>>,
     ) -> EventBuilder<'a, event_state::SetEventType<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -767,11 +761,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> EventBuilder<'a, event_state::SetId<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -786,11 +780,11 @@ where
         mut self,
         value: impl Into<safelink::PatternType<'a>>,
     ) -> EventBuilder<'a, event_state::SetPattern<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -805,11 +799,11 @@ where
         mut self,
         value: impl Into<safelink::ReasonType<'a>>,
     ) -> EventBuilder<'a, event_state::SetReason<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -824,11 +818,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> EventBuilder<'a, event_state::SetUrl<S>> {
-        self.__unsafe_private_named.8 = Option::Some(value.into());
+        self._fields.8 = Option::Some(value.into());
         EventBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -836,27 +830,27 @@ where
 impl<'a, S> EventBuilder<'a, S>
 where
     S: event_state::State,
-    S::CreatedAt: event_state::IsSet,
-    S::Action: event_state::IsSet,
     S::Reason: event_state::IsSet,
-    S::Pattern: event_state::IsSet,
-    S::Url: event_state::IsSet,
+    S::EventType: event_state::IsSet,
     S::CreatedBy: event_state::IsSet,
+    S::Url: event_state::IsSet,
+    S::Pattern: event_state::IsSet,
+    S::CreatedAt: event_state::IsSet,
     S::Id: event_state::IsSet,
-    S::EventType: event_state::IsSet,
+    S::Action: event_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Event<'a> {
         Event {
-            action: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            created_by: self.__unsafe_private_named.3.unwrap(),
-            event_type: self.__unsafe_private_named.4.unwrap(),
-            id: self.__unsafe_private_named.5.unwrap(),
-            pattern: self.__unsafe_private_named.6.unwrap(),
-            reason: self.__unsafe_private_named.7.unwrap(),
-            url: self.__unsafe_private_named.8.unwrap(),
+            action: self._fields.0.unwrap(),
+            comment: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            created_by: self._fields.3.unwrap(),
+            event_type: self._fields.4.unwrap(),
+            id: self._fields.5.unwrap(),
+            pattern: self._fields.6.unwrap(),
+            reason: self._fields.7.unwrap(),
+            url: self._fields.8.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -869,15 +863,15 @@ where
         >,
     ) -> Event<'a> {
         Event {
-            action: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            created_by: self.__unsafe_private_named.3.unwrap(),
-            event_type: self.__unsafe_private_named.4.unwrap(),
-            id: self.__unsafe_private_named.5.unwrap(),
-            pattern: self.__unsafe_private_named.6.unwrap(),
-            reason: self.__unsafe_private_named.7.unwrap(),
-            url: self.__unsafe_private_named.8.unwrap(),
+            action: self._fields.0.unwrap(),
+            comment: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            created_by: self._fields.3.unwrap(),
+            event_type: self._fields.4.unwrap(),
+            id: self._fields.5.unwrap(),
+            pattern: self._fields.6.unwrap(),
+            reason: self._fields.7.unwrap(),
+            url: self._fields.8.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -1111,134 +1105,134 @@ pub mod url_rule_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedBy;
-        type UpdatedAt;
         type Pattern;
-        type Url;
         type Action;
+        type Url;
         type Reason;
         type CreatedAt;
+        type CreatedBy;
+        type UpdatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedBy = Unset;
-        type UpdatedAt = Unset;
         type Pattern = Unset;
-        type Url = Unset;
         type Action = Unset;
+        type Url = Unset;
         type Reason = Unset;
         type CreatedAt = Unset;
+        type CreatedBy = Unset;
+        type UpdatedAt = Unset;
     }
-    ///State transition - sets the `created_by` field to Set
-    pub struct SetCreatedBy<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedBy<S> {}
-    impl<S: State> State for SetCreatedBy<S> {
-        type CreatedBy = Set<members::created_by>;
-        type UpdatedAt = S::UpdatedAt;
-        type Pattern = S::Pattern;
-        type Url = S::Url;
+    ///State transition - sets the `pattern` field to Set
+    pub struct SetPattern<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPattern<S> {}
+    impl<S: State> State for SetPattern<S> {
+        type Pattern = Set<members::pattern>;
         type Action = S::Action;
+        type Url = S::Url;
         type Reason = S::Reason;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `updated_at` field to Set
-    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
-    impl<S: State> State for SetUpdatedAt<S> {
         type CreatedBy = S::CreatedBy;
-        type UpdatedAt = Set<members::updated_at>;
+        type UpdatedAt = S::UpdatedAt;
+    }
+    ///State transition - sets the `action` field to Set
+    pub struct SetAction<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAction<S> {}
+    impl<S: State> State for SetAction<S> {
         type Pattern = S::Pattern;
+        type Action = Set<members::action>;
         type Url = S::Url;
-        type Action = S::Action;
         type Reason = S::Reason;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `pattern` field to Set
-    pub struct SetPattern<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPattern<S> {}
-    impl<S: State> State for SetPattern<S> {
         type CreatedBy = S::CreatedBy;
         type UpdatedAt = S::UpdatedAt;
-        type Pattern = Set<members::pattern>;
-        type Url = S::Url;
-        type Action = S::Action;
-        type Reason = S::Reason;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `url` field to Set
     pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUrl<S> {}
     impl<S: State> State for SetUrl<S> {
-        type CreatedBy = S::CreatedBy;
-        type UpdatedAt = S::UpdatedAt;
         type Pattern = S::Pattern;
-        type Url = Set<members::url>;
         type Action = S::Action;
+        type Url = Set<members::url>;
         type Reason = S::Reason;
         type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `action` field to Set
-    pub struct SetAction<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAction<S> {}
-    impl<S: State> State for SetAction<S> {
         type CreatedBy = S::CreatedBy;
         type UpdatedAt = S::UpdatedAt;
-        type Pattern = S::Pattern;
-        type Url = S::Url;
-        type Action = Set<members::action>;
-        type Reason = S::Reason;
-        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `reason` field to Set
     pub struct SetReason<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetReason<S> {}
     impl<S: State> State for SetReason<S> {
-        type CreatedBy = S::CreatedBy;
-        type UpdatedAt = S::UpdatedAt;
         type Pattern = S::Pattern;
-        type Url = S::Url;
         type Action = S::Action;
+        type Url = S::Url;
         type Reason = Set<members::reason>;
         type CreatedAt = S::CreatedAt;
+        type CreatedBy = S::CreatedBy;
+        type UpdatedAt = S::UpdatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Pattern = S::Pattern;
+        type Action = S::Action;
+        type Url = S::Url;
+        type Reason = S::Reason;
+        type CreatedAt = Set<members::created_at>;
         type CreatedBy = S::CreatedBy;
         type UpdatedAt = S::UpdatedAt;
+    }
+    ///State transition - sets the `created_by` field to Set
+    pub struct SetCreatedBy<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedBy<S> {}
+    impl<S: State> State for SetCreatedBy<S> {
         type Pattern = S::Pattern;
+        type Action = S::Action;
         type Url = S::Url;
+        type Reason = S::Reason;
+        type CreatedAt = S::CreatedAt;
+        type CreatedBy = Set<members::created_by>;
+        type UpdatedAt = S::UpdatedAt;
+    }
+    ///State transition - sets the `updated_at` field to Set
+    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
+    impl<S: State> State for SetUpdatedAt<S> {
+        type Pattern = S::Pattern;
         type Action = S::Action;
+        type Url = S::Url;
         type Reason = S::Reason;
-        type CreatedAt = Set<members::created_at>;
+        type CreatedAt = S::CreatedAt;
+        type CreatedBy = S::CreatedBy;
+        type UpdatedAt = Set<members::updated_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_by` field
-        pub struct created_by(());
-        ///Marker type for the `updated_at` field
-        pub struct updated_at(());
         ///Marker type for the `pattern` field
         pub struct pattern(());
-        ///Marker type for the `url` field
-        pub struct url(());
         ///Marker type for the `action` field
         pub struct action(());
+        ///Marker type for the `url` field
+        pub struct url(());
         ///Marker type for the `reason` field
         pub struct reason(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `created_by` field
+        pub struct created_by(());
+        ///Marker type for the `updated_at` field
+        pub struct updated_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct UrlRuleBuilder<'a, S: url_rule_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<safelink::ActionType<'a>>,
         Option<CowStr<'a>>,
         Option<Datetime>,
@@ -1248,7 +1242,7 @@ pub struct UrlRuleBuilder<'a, S: url_rule_state::State> {
         Option<Datetime>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UrlRule<'a> {
@@ -1262,9 +1256,9 @@ impl<'a> UrlRuleBuilder<'a, url_rule_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UrlRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1279,11 +1273,11 @@ where
         mut self,
         value: impl Into<safelink::ActionType<'a>>,
     ) -> UrlRuleBuilder<'a, url_rule_state::SetAction<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UrlRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1291,12 +1285,12 @@ where
 impl<'a, S: url_rule_state::State> UrlRuleBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -1311,11 +1305,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> UrlRuleBuilder<'a, url_rule_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         UrlRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1330,11 +1324,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> UrlRuleBuilder<'a, url_rule_state::SetCreatedBy<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         UrlRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1349,11 +1343,11 @@ where
         mut self,
         value: impl Into<safelink::PatternType<'a>>,
     ) -> UrlRuleBuilder<'a, url_rule_state::SetPattern<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         UrlRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1368,11 +1362,11 @@ where
         mut self,
         value: impl Into<safelink::ReasonType<'a>>,
     ) -> UrlRuleBuilder<'a, url_rule_state::SetReason<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         UrlRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1387,11 +1381,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> UrlRuleBuilder<'a, url_rule_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.6 = Option::Some(value.into());
+        self._fields.6 = Option::Some(value.into());
         UrlRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1406,11 +1400,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> UrlRuleBuilder<'a, url_rule_state::SetUrl<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         UrlRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1418,25 +1412,25 @@ where
 impl<'a, S> UrlRuleBuilder<'a, S>
 where
     S: url_rule_state::State,
-    S::CreatedBy: url_rule_state::IsSet,
-    S::UpdatedAt: url_rule_state::IsSet,
     S::Pattern: url_rule_state::IsSet,
-    S::Url: url_rule_state::IsSet,
     S::Action: url_rule_state::IsSet,
+    S::Url: url_rule_state::IsSet,
     S::Reason: url_rule_state::IsSet,
     S::CreatedAt: url_rule_state::IsSet,
+    S::CreatedBy: url_rule_state::IsSet,
+    S::UpdatedAt: url_rule_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> UrlRule<'a> {
         UrlRule {
-            action: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            created_by: self.__unsafe_private_named.3.unwrap(),
-            pattern: self.__unsafe_private_named.4.unwrap(),
-            reason: self.__unsafe_private_named.5.unwrap(),
-            updated_at: self.__unsafe_private_named.6.unwrap(),
-            url: self.__unsafe_private_named.7.unwrap(),
+            action: self._fields.0.unwrap(),
+            comment: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            created_by: self._fields.3.unwrap(),
+            pattern: self._fields.4.unwrap(),
+            reason: self._fields.5.unwrap(),
+            updated_at: self._fields.6.unwrap(),
+            url: self._fields.7.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -1449,14 +1443,14 @@ where
         >,
     ) -> UrlRule<'a> {
         UrlRule {
-            action: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1,
-            created_at: self.__unsafe_private_named.2.unwrap(),
-            created_by: self.__unsafe_private_named.3.unwrap(),
-            pattern: self.__unsafe_private_named.4.unwrap(),
-            reason: self.__unsafe_private_named.5.unwrap(),
-            updated_at: self.__unsafe_private_named.6.unwrap(),
-            url: self.__unsafe_private_named.7.unwrap(),
+            action: self._fields.0.unwrap(),
+            comment: self._fields.1,
+            created_at: self._fields.2.unwrap(),
+            created_by: self._fields.3.unwrap(),
+            pattern: self._fields.4.unwrap(),
+            reason: self._fields.5.unwrap(),
+            updated_at: self._fields.6.unwrap(),
+            url: self._fields.7.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/safelink/add_rule.rs b/crates/jacquard-api/src/tools_ozone/safelink/add_rule.rs
index 4236c296..ee52c084 100644
--- a/crates/jacquard-api/src/tools_ozone/safelink/add_rule.rs
+++ b/crates/jacquard-api/src/tools_ozone/safelink/add_rule.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -134,74 +137,74 @@ pub mod add_rule_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Pattern;
+        type Url;
         type Action;
         type Reason;
-        type Url;
+        type Pattern;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Pattern = Unset;
+        type Url = Unset;
         type Action = Unset;
         type Reason = Unset;
-        type Url = Unset;
+        type Pattern = Unset;
     }
-    ///State transition - sets the `pattern` field to Set
-    pub struct SetPattern<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPattern<S> {}
-    impl<S: State> State for SetPattern<S> {
-        type Pattern = Set<members::pattern>;
+    ///State transition - sets the `url` field to Set
+    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUrl<S> {}
+    impl<S: State> State for SetUrl<S> {
+        type Url = Set<members::url>;
         type Action = S::Action;
         type Reason = S::Reason;
-        type Url = S::Url;
+        type Pattern = S::Pattern;
     }
     ///State transition - sets the `action` field to Set
     pub struct SetAction<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetAction<S> {}
     impl<S: State> State for SetAction<S> {
-        type Pattern = S::Pattern;
+        type Url = S::Url;
         type Action = Set<members::action>;
         type Reason = S::Reason;
-        type Url = S::Url;
+        type Pattern = S::Pattern;
     }
     ///State transition - sets the `reason` field to Set
     pub struct SetReason<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetReason<S> {}
     impl<S: State> State for SetReason<S> {
-        type Pattern = S::Pattern;
+        type Url = S::Url;
         type Action = S::Action;
         type Reason = Set<members::reason>;
-        type Url = S::Url;
-    }
-    ///State transition - sets the `url` field to Set
-    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUrl<S> {}
-    impl<S: State> State for SetUrl<S> {
         type Pattern = S::Pattern;
+    }
+    ///State transition - sets the `pattern` field to Set
+    pub struct SetPattern<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPattern<S> {}
+    impl<S: State> State for SetPattern<S> {
+        type Url = S::Url;
         type Action = S::Action;
         type Reason = S::Reason;
-        type Url = Set<members::url>;
+        type Pattern = Set<members::pattern>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `pattern` field
-        pub struct pattern(());
+        ///Marker type for the `url` field
+        pub struct url(());
         ///Marker type for the `action` field
         pub struct action(());
         ///Marker type for the `reason` field
         pub struct reason(());
-        ///Marker type for the `url` field
-        pub struct url(());
+        ///Marker type for the `pattern` field
+        pub struct pattern(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AddRuleBuilder<'a, S: add_rule_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ActionType<'a>>,
         Option<CowStr<'a>>,
         Option<Did<'a>>,
@@ -209,7 +212,7 @@ pub struct AddRuleBuilder<'a, S: add_rule_state::State> {
         Option<ReasonType<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AddRule<'a> {
@@ -223,9 +226,9 @@ impl<'a> AddRuleBuilder<'a, add_rule_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AddRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -240,11 +243,11 @@ where
         mut self,
         value: impl Into<ActionType<'a>>,
     ) -> AddRuleBuilder<'a, add_rule_state::SetAction<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AddRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -252,12 +255,12 @@ where
 impl<'a, S: add_rule_state::State> AddRuleBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -265,12 +268,12 @@ impl<'a, S: add_rule_state::State> AddRuleBuilder<'a, S> {
 impl<'a, S: add_rule_state::State> AddRuleBuilder<'a, S> {
     /// Set the `createdBy` field (optional)
     pub fn created_by(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdBy` field to an Option value (optional)
     pub fn maybe_created_by(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -285,11 +288,11 @@ where
         mut self,
         value: impl Into<PatternType<'a>>,
     ) -> AddRuleBuilder<'a, add_rule_state::SetPattern<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         AddRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -304,11 +307,11 @@ where
         mut self,
         value: impl Into<ReasonType<'a>>,
     ) -> AddRuleBuilder<'a, add_rule_state::SetReason<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         AddRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -323,11 +326,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AddRuleBuilder<'a, add_rule_state::SetUrl<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         AddRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -335,20 +338,20 @@ where
 impl<'a, S> AddRuleBuilder<'a, S>
 where
     S: add_rule_state::State,
-    S::Pattern: add_rule_state::IsSet,
+    S::Url: add_rule_state::IsSet,
     S::Action: add_rule_state::IsSet,
     S::Reason: add_rule_state::IsSet,
-    S::Url: add_rule_state::IsSet,
+    S::Pattern: add_rule_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AddRule<'a> {
         AddRule {
-            action: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1,
-            created_by: self.__unsafe_private_named.2,
-            pattern: self.__unsafe_private_named.3.unwrap(),
-            reason: self.__unsafe_private_named.4.unwrap(),
-            url: self.__unsafe_private_named.5.unwrap(),
+            action: self._fields.0.unwrap(),
+            comment: self._fields.1,
+            created_by: self._fields.2,
+            pattern: self._fields.3.unwrap(),
+            reason: self._fields.4.unwrap(),
+            url: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -361,12 +364,12 @@ where
         >,
     ) -> AddRule<'a> {
         AddRule {
-            action: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1,
-            created_by: self.__unsafe_private_named.2,
-            pattern: self.__unsafe_private_named.3.unwrap(),
-            reason: self.__unsafe_private_named.4.unwrap(),
-            url: self.__unsafe_private_named.5.unwrap(),
+            action: self._fields.0.unwrap(),
+            comment: self._fields.1,
+            created_by: self._fields.2,
+            pattern: self._fields.3.unwrap(),
+            reason: self._fields.4.unwrap(),
+            url: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/safelink/query_events.rs b/crates/jacquard-api/src/tools_ozone/safelink/query_events.rs
index 152ade90..52b6d7ad 100644
--- a/crates/jacquard-api/src/tools_ozone/safelink/query_events.rs
+++ b/crates/jacquard-api/src/tools_ozone/safelink/query_events.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/tools_ozone/safelink/query_rules.rs b/crates/jacquard-api/src/tools_ozone/safelink/query_rules.rs
index 8a7631ed..786242c2 100644
--- a/crates/jacquard-api/src/tools_ozone/safelink/query_rules.rs
+++ b/crates/jacquard-api/src/tools_ozone/safelink/query_rules.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
diff --git a/crates/jacquard-api/src/tools_ozone/safelink/remove_rule.rs b/crates/jacquard-api/src/tools_ozone/safelink/remove_rule.rs
index 850f78a7..78774100 100644
--- a/crates/jacquard-api/src/tools_ozone/safelink/remove_rule.rs
+++ b/crates/jacquard-api/src/tools_ozone/safelink/remove_rule.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -118,50 +121,50 @@ pub mod remove_rule_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Url;
         type Pattern;
+        type Url;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Url = Unset;
         type Pattern = Unset;
-    }
-    ///State transition - sets the `url` field to Set
-    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUrl<S> {}
-    impl<S: State> State for SetUrl<S> {
-        type Url = Set<members::url>;
-        type Pattern = S::Pattern;
+        type Url = Unset;
     }
     ///State transition - sets the `pattern` field to Set
     pub struct SetPattern<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPattern<S> {}
     impl<S: State> State for SetPattern<S> {
-        type Url = S::Url;
         type Pattern = Set<members::pattern>;
+        type Url = S::Url;
+    }
+    ///State transition - sets the `url` field to Set
+    pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUrl<S> {}
+    impl<S: State> State for SetUrl<S> {
+        type Pattern = S::Pattern;
+        type Url = Set<members::url>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `url` field
-        pub struct url(());
         ///Marker type for the `pattern` field
         pub struct pattern(());
+        ///Marker type for the `url` field
+        pub struct url(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RemoveRuleBuilder<'a, S: remove_rule_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Did<'a>>,
         Option<PatternType<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RemoveRule<'a> {
@@ -175,9 +178,9 @@ impl<'a> RemoveRuleBuilder<'a, remove_rule_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RemoveRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -185,12 +188,12 @@ impl<'a> RemoveRuleBuilder<'a, remove_rule_state::Empty> {
 impl<'a, S: remove_rule_state::State> RemoveRuleBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -198,12 +201,12 @@ impl<'a, S: remove_rule_state::State> RemoveRuleBuilder<'a, S> {
 impl<'a, S: remove_rule_state::State> RemoveRuleBuilder<'a, S> {
     /// Set the `createdBy` field (optional)
     pub fn created_by(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdBy` field to an Option value (optional)
     pub fn maybe_created_by(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -218,11 +221,11 @@ where
         mut self,
         value: impl Into<PatternType<'a>>,
     ) -> RemoveRuleBuilder<'a, remove_rule_state::SetPattern<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RemoveRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -237,11 +240,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RemoveRuleBuilder<'a, remove_rule_state::SetUrl<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         RemoveRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,16 +252,16 @@ where
 impl<'a, S> RemoveRuleBuilder<'a, S>
 where
     S: remove_rule_state::State,
-    S::Url: remove_rule_state::IsSet,
     S::Pattern: remove_rule_state::IsSet,
+    S::Url: remove_rule_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RemoveRule<'a> {
         RemoveRule {
-            comment: self.__unsafe_private_named.0,
-            created_by: self.__unsafe_private_named.1,
-            pattern: self.__unsafe_private_named.2.unwrap(),
-            url: self.__unsafe_private_named.3.unwrap(),
+            comment: self._fields.0,
+            created_by: self._fields.1,
+            pattern: self._fields.2.unwrap(),
+            url: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -271,10 +274,10 @@ where
         >,
     ) -> RemoveRule<'a> {
         RemoveRule {
-            comment: self.__unsafe_private_named.0,
-            created_by: self.__unsafe_private_named.1,
-            pattern: self.__unsafe_private_named.2.unwrap(),
-            url: self.__unsafe_private_named.3.unwrap(),
+            comment: self._fields.0,
+            created_by: self._fields.1,
+            pattern: self._fields.2.unwrap(),
+            url: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/safelink/update_rule.rs b/crates/jacquard-api/src/tools_ozone/safelink/update_rule.rs
index 93f3ba57..07450c76 100644
--- a/crates/jacquard-api/src/tools_ozone/safelink/update_rule.rs
+++ b/crates/jacquard-api/src/tools_ozone/safelink/update_rule.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -126,8 +129,8 @@ pub mod update_rule_state {
     pub trait State: sealed::Sealed {
         type Pattern;
         type Reason;
-        type Action;
         type Url;
+        type Action;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
@@ -135,8 +138,8 @@ pub mod update_rule_state {
     impl State for Empty {
         type Pattern = Unset;
         type Reason = Unset;
-        type Action = Unset;
         type Url = Unset;
+        type Action = Unset;
     }
     ///State transition - sets the `pattern` field to Set
     pub struct SetPattern<S: State = Empty>(PhantomData<fn() -> S>);
@@ -144,8 +147,8 @@ pub mod update_rule_state {
     impl<S: State> State for SetPattern<S> {
         type Pattern = Set<members::pattern>;
         type Reason = S::Reason;
-        type Action = S::Action;
         type Url = S::Url;
+        type Action = S::Action;
     }
     ///State transition - sets the `reason` field to Set
     pub struct SetReason<S: State = Empty>(PhantomData<fn() -> S>);
@@ -153,17 +156,8 @@ pub mod update_rule_state {
     impl<S: State> State for SetReason<S> {
         type Pattern = S::Pattern;
         type Reason = Set<members::reason>;
-        type Action = S::Action;
-        type Url = S::Url;
-    }
-    ///State transition - sets the `action` field to Set
-    pub struct SetAction<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetAction<S> {}
-    impl<S: State> State for SetAction<S> {
-        type Pattern = S::Pattern;
-        type Reason = S::Reason;
-        type Action = Set<members::action>;
         type Url = S::Url;
+        type Action = S::Action;
     }
     ///State transition - sets the `url` field to Set
     pub struct SetUrl<S: State = Empty>(PhantomData<fn() -> S>);
@@ -171,8 +165,17 @@ pub mod update_rule_state {
     impl<S: State> State for SetUrl<S> {
         type Pattern = S::Pattern;
         type Reason = S::Reason;
-        type Action = S::Action;
         type Url = Set<members::url>;
+        type Action = S::Action;
+    }
+    ///State transition - sets the `action` field to Set
+    pub struct SetAction<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetAction<S> {}
+    impl<S: State> State for SetAction<S> {
+        type Pattern = S::Pattern;
+        type Reason = S::Reason;
+        type Url = S::Url;
+        type Action = Set<members::action>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
@@ -181,17 +184,17 @@ pub mod update_rule_state {
         pub struct pattern(());
         ///Marker type for the `reason` field
         pub struct reason(());
-        ///Marker type for the `action` field
-        pub struct action(());
         ///Marker type for the `url` field
         pub struct url(());
+        ///Marker type for the `action` field
+        pub struct action(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct UpdateRuleBuilder<'a, S: update_rule_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<ActionType<'a>>,
         Option<CowStr<'a>>,
         Option<Did<'a>>,
@@ -199,7 +202,7 @@ pub struct UpdateRuleBuilder<'a, S: update_rule_state::State> {
         Option<ReasonType<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateRule<'a> {
@@ -213,9 +216,9 @@ impl<'a> UpdateRuleBuilder<'a, update_rule_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -230,11 +233,11 @@ where
         mut self,
         value: impl Into<ActionType<'a>>,
     ) -> UpdateRuleBuilder<'a, update_rule_state::SetAction<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UpdateRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -242,12 +245,12 @@ where
 impl<'a, S: update_rule_state::State> UpdateRuleBuilder<'a, S> {
     /// Set the `comment` field (optional)
     pub fn comment(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `comment` field to an Option value (optional)
     pub fn maybe_comment(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -255,12 +258,12 @@ impl<'a, S: update_rule_state::State> UpdateRuleBuilder<'a, S> {
 impl<'a, S: update_rule_state::State> UpdateRuleBuilder<'a, S> {
     /// Set the `createdBy` field (optional)
     pub fn created_by(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `createdBy` field to an Option value (optional)
     pub fn maybe_created_by(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -275,11 +278,11 @@ where
         mut self,
         value: impl Into<PatternType<'a>>,
     ) -> UpdateRuleBuilder<'a, update_rule_state::SetPattern<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         UpdateRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -294,11 +297,11 @@ where
         mut self,
         value: impl Into<ReasonType<'a>>,
     ) -> UpdateRuleBuilder<'a, update_rule_state::SetReason<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         UpdateRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -313,11 +316,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> UpdateRuleBuilder<'a, update_rule_state::SetUrl<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         UpdateRuleBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -327,18 +330,18 @@ where
     S: update_rule_state::State,
     S::Pattern: update_rule_state::IsSet,
     S::Reason: update_rule_state::IsSet,
-    S::Action: update_rule_state::IsSet,
     S::Url: update_rule_state::IsSet,
+    S::Action: update_rule_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> UpdateRule<'a> {
         UpdateRule {
-            action: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1,
-            created_by: self.__unsafe_private_named.2,
-            pattern: self.__unsafe_private_named.3.unwrap(),
-            reason: self.__unsafe_private_named.4.unwrap(),
-            url: self.__unsafe_private_named.5.unwrap(),
+            action: self._fields.0.unwrap(),
+            comment: self._fields.1,
+            created_by: self._fields.2,
+            pattern: self._fields.3.unwrap(),
+            reason: self._fields.4.unwrap(),
+            url: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -351,12 +354,12 @@ where
         >,
     ) -> UpdateRule<'a> {
         UpdateRule {
-            action: self.__unsafe_private_named.0.unwrap(),
-            comment: self.__unsafe_private_named.1,
-            created_by: self.__unsafe_private_named.2,
-            pattern: self.__unsafe_private_named.3.unwrap(),
-            reason: self.__unsafe_private_named.4.unwrap(),
-            url: self.__unsafe_private_named.5.unwrap(),
+            action: self._fields.0.unwrap(),
+            comment: self._fields.1,
+            created_by: self._fields.2,
+            pattern: self._fields.3.unwrap(),
+            reason: self._fields.4.unwrap(),
+            url: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/server/get_config.rs b/crates/jacquard-api/src/tools_ozone/server/get_config.rs
index e707b60d..85dd95a8 100644
--- a/crates/jacquard-api/src/tools_ozone/server/get_config.rs
+++ b/crates/jacquard-api/src/tools_ozone/server/get_config.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
diff --git a/crates/jacquard-api/src/tools_ozone/set.rs b/crates/jacquard-api/src/tools_ozone/set.rs
index cfe6de07..e919ae5d 100644
--- a/crates/jacquard-api/src/tools_ozone/set.rs
+++ b/crates/jacquard-api/src/tools_ozone/set.rs
@@ -12,7 +12,11 @@ pub mod get_values;
 pub mod query_sets;
 pub mod upsert_set;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -279,81 +283,81 @@ pub mod set_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type UpdatedAt;
         type Name;
         type CreatedAt;
         type SetSize;
+        type UpdatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type UpdatedAt = Unset;
         type Name = Unset;
         type CreatedAt = Unset;
         type SetSize = Unset;
-    }
-    ///State transition - sets the `updated_at` field to Set
-    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
-    impl<S: State> State for SetUpdatedAt<S> {
-        type UpdatedAt = Set<members::updated_at>;
-        type Name = S::Name;
-        type CreatedAt = S::CreatedAt;
-        type SetSize = S::SetSize;
+        type UpdatedAt = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type UpdatedAt = S::UpdatedAt;
         type Name = Set<members::name>;
         type CreatedAt = S::CreatedAt;
         type SetSize = S::SetSize;
+        type UpdatedAt = S::UpdatedAt;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type UpdatedAt = S::UpdatedAt;
         type Name = S::Name;
         type CreatedAt = Set<members::created_at>;
         type SetSize = S::SetSize;
+        type UpdatedAt = S::UpdatedAt;
     }
     ///State transition - sets the `set_size` field to Set
     pub struct SetSetSize<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSetSize<S> {}
     impl<S: State> State for SetSetSize<S> {
-        type UpdatedAt = S::UpdatedAt;
         type Name = S::Name;
         type CreatedAt = S::CreatedAt;
         type SetSize = Set<members::set_size>;
+        type UpdatedAt = S::UpdatedAt;
+    }
+    ///State transition - sets the `updated_at` field to Set
+    pub struct SetUpdatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUpdatedAt<S> {}
+    impl<S: State> State for SetUpdatedAt<S> {
+        type Name = S::Name;
+        type CreatedAt = S::CreatedAt;
+        type SetSize = S::SetSize;
+        type UpdatedAt = Set<members::updated_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `updated_at` field
-        pub struct updated_at(());
         ///Marker type for the `name` field
         pub struct name(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `set_size` field
         pub struct set_size(());
+        ///Marker type for the `updated_at` field
+        pub struct updated_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SetViewBuilder<'a, S: set_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<i64>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SetView<'a> {
@@ -367,9 +371,9 @@ impl<'a> SetViewBuilder<'a, set_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SetViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -384,11 +388,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SetViewBuilder<'a, set_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SetViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -396,12 +400,12 @@ where
 impl<'a, S: set_view_state::State> SetViewBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -416,11 +420,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SetViewBuilder<'a, set_view_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SetViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -435,11 +439,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> SetViewBuilder<'a, set_view_state::SetSetSize<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         SetViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -454,11 +458,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> SetViewBuilder<'a, set_view_state::SetUpdatedAt<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         SetViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -466,19 +470,19 @@ where
 impl<'a, S> SetViewBuilder<'a, S>
 where
     S: set_view_state::State,
-    S::UpdatedAt: set_view_state::IsSet,
     S::Name: set_view_state::IsSet,
     S::CreatedAt: set_view_state::IsSet,
     S::SetSize: set_view_state::IsSet,
+    S::UpdatedAt: set_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> SetView<'a> {
         SetView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
-            set_size: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            name: self._fields.2.unwrap(),
+            set_size: self._fields.3.unwrap(),
+            updated_at: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -491,11 +495,11 @@ where
         >,
     ) -> SetView<'a> {
         SetView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
-            set_size: self.__unsafe_private_named.3.unwrap(),
-            updated_at: self.__unsafe_private_named.4.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1,
+            name: self._fields.2.unwrap(),
+            set_size: self._fields.3.unwrap(),
+            updated_at: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/set/add_values.rs b/crates/jacquard-api/src/tools_ozone/set/add_values.rs
index aba5e8dc..717170ff 100644
--- a/crates/jacquard-api/src/tools_ozone/set/add_values.rs
+++ b/crates/jacquard-api/src/tools_ozone/set/add_values.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -61,45 +64,45 @@ pub mod add_values_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Name;
         type Values;
+        type Name;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Name = Unset;
         type Values = Unset;
-    }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Name = Set<members::name>;
-        type Values = S::Values;
+        type Name = Unset;
     }
     ///State transition - sets the `values` field to Set
     pub struct SetValues<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetValues<S> {}
     impl<S: State> State for SetValues<S> {
-        type Name = S::Name;
         type Values = Set<members::values>;
+        type Name = S::Name;
+    }
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Values = S::Values;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `name` field
-        pub struct name(());
         ///Marker type for the `values` field
         pub struct values(());
+        ///Marker type for the `name` field
+        pub struct name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AddValuesBuilder<'a, S: add_values_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Vec<CowStr<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Vec<CowStr<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AddValues<'a> {
@@ -113,9 +116,9 @@ impl<'a> AddValuesBuilder<'a, add_values_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AddValuesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -130,11 +133,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AddValuesBuilder<'a, add_values_state::SetName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AddValuesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -149,11 +152,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> AddValuesBuilder<'a, add_values_state::SetValues<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AddValuesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -161,14 +164,14 @@ where
 impl<'a, S> AddValuesBuilder<'a, S>
 where
     S: add_values_state::State,
-    S::Name: add_values_state::IsSet,
     S::Values: add_values_state::IsSet,
+    S::Name: add_values_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> AddValues<'a> {
         AddValues {
-            name: self.__unsafe_private_named.0.unwrap(),
-            values: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0.unwrap(),
+            values: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -181,8 +184,8 @@ where
         >,
     ) -> AddValues<'a> {
         AddValues {
-            name: self.__unsafe_private_named.0.unwrap(),
-            values: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0.unwrap(),
+            values: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/set/delete_set.rs b/crates/jacquard-api/src/tools_ozone/set/delete_set.rs
index f18172a1..5649b385 100644
--- a/crates/jacquard-api/src/tools_ozone/set/delete_set.rs
+++ b/crates/jacquard-api/src/tools_ozone/set/delete_set.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
diff --git a/crates/jacquard-api/src/tools_ozone/set/delete_values.rs b/crates/jacquard-api/src/tools_ozone/set/delete_values.rs
index 8efd947c..4805dfff 100644
--- a/crates/jacquard-api/src/tools_ozone/set/delete_values.rs
+++ b/crates/jacquard-api/src/tools_ozone/set/delete_values.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -98,45 +101,45 @@ pub mod delete_values_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Values;
         type Name;
+        type Values;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Values = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `values` field to Set
-    pub struct SetValues<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetValues<S> {}
-    impl<S: State> State for SetValues<S> {
-        type Values = Set<members::values>;
-        type Name = S::Name;
+        type Values = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Values = S::Values;
         type Name = Set<members::name>;
+        type Values = S::Values;
+    }
+    ///State transition - sets the `values` field to Set
+    pub struct SetValues<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetValues<S> {}
+    impl<S: State> State for SetValues<S> {
+        type Name = S::Name;
+        type Values = Set<members::values>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `values` field
-        pub struct values(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `values` field
+        pub struct values(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DeleteValuesBuilder<'a, S: delete_values_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Vec<CowStr<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Vec<CowStr<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeleteValues<'a> {
@@ -150,9 +153,9 @@ impl<'a> DeleteValuesBuilder<'a, delete_values_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteValuesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -167,11 +170,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DeleteValuesBuilder<'a, delete_values_state::SetName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeleteValuesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -186,11 +189,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> DeleteValuesBuilder<'a, delete_values_state::SetValues<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DeleteValuesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -198,14 +201,14 @@ where
 impl<'a, S> DeleteValuesBuilder<'a, S>
 where
     S: delete_values_state::State,
-    S::Values: delete_values_state::IsSet,
     S::Name: delete_values_state::IsSet,
+    S::Values: delete_values_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DeleteValues<'a> {
         DeleteValues {
-            name: self.__unsafe_private_named.0.unwrap(),
-            values: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0.unwrap(),
+            values: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -218,8 +221,8 @@ where
         >,
     ) -> DeleteValues<'a> {
         DeleteValues {
-            name: self.__unsafe_private_named.0.unwrap(),
-            values: self.__unsafe_private_named.1.unwrap(),
+            name: self._fields.0.unwrap(),
+            values: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/set/get_values.rs b/crates/jacquard-api/src/tools_ozone/set/get_values.rs
index 92edb293..c9801aca 100644
--- a/crates/jacquard-api/src/tools_ozone/set/get_values.rs
+++ b/crates/jacquard-api/src/tools_ozone/set/get_values.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon, open_union};
@@ -139,9 +142,9 @@ pub mod get_values_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetValuesBuilder<'a, S: get_values_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetValues<'a> {
@@ -155,9 +158,9 @@ impl<'a> GetValuesBuilder<'a, get_values_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetValuesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -165,12 +168,12 @@ impl<'a> GetValuesBuilder<'a, get_values_state::Empty> {
 impl<'a, S: get_values_state::State> GetValuesBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -178,12 +181,12 @@ impl<'a, S: get_values_state::State> GetValuesBuilder<'a, S> {
 impl<'a, S: get_values_state::State> GetValuesBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -198,11 +201,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GetValuesBuilder<'a, get_values_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         GetValuesBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,9 +218,9 @@ where
     /// Build the final struct
     pub fn build(self) -> GetValues<'a> {
         GetValues {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            name: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            name: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/set/query_sets.rs b/crates/jacquard-api/src/tools_ozone/set/query_sets.rs
index 928817fb..226f466a 100644
--- a/crates/jacquard-api/src/tools_ozone/set/query_sets.rs
+++ b/crates/jacquard-api/src/tools_ozone/set/query_sets.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -106,15 +109,15 @@ pub mod query_sets_state {
 
 /// Builder for constructing an instance of this type
 pub struct QuerySetsBuilder<'a, S: query_sets_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<i64>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> QuerySets<'a> {
@@ -128,9 +131,9 @@ impl<'a> QuerySetsBuilder<'a, query_sets_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         QuerySetsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -138,12 +141,12 @@ impl<'a> QuerySetsBuilder<'a, query_sets_state::Empty> {
 impl<'a, S: query_sets_state::State> QuerySetsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -151,12 +154,12 @@ impl<'a, S: query_sets_state::State> QuerySetsBuilder<'a, S> {
 impl<'a, S: query_sets_state::State> QuerySetsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -164,12 +167,12 @@ impl<'a, S: query_sets_state::State> QuerySetsBuilder<'a, S> {
 impl<'a, S: query_sets_state::State> QuerySetsBuilder<'a, S> {
     /// Set the `namePrefix` field (optional)
     pub fn name_prefix(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `namePrefix` field to an Option value (optional)
     pub fn maybe_name_prefix(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -177,12 +180,12 @@ impl<'a, S: query_sets_state::State> QuerySetsBuilder<'a, S> {
 impl<'a, S: query_sets_state::State> QuerySetsBuilder<'a, S> {
     /// Set the `sortBy` field (optional)
     pub fn sort_by(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `sortBy` field to an Option value (optional)
     pub fn maybe_sort_by(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -190,12 +193,12 @@ impl<'a, S: query_sets_state::State> QuerySetsBuilder<'a, S> {
 impl<'a, S: query_sets_state::State> QuerySetsBuilder<'a, S> {
     /// Set the `sortDirection` field (optional)
     pub fn sort_direction(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `sortDirection` field to an Option value (optional)
     pub fn maybe_sort_direction(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -207,11 +210,11 @@ where
     /// Build the final struct
     pub fn build(self) -> QuerySets<'a> {
         QuerySets {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            name_prefix: self.__unsafe_private_named.2,
-            sort_by: self.__unsafe_private_named.3,
-            sort_direction: self.__unsafe_private_named.4,
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            name_prefix: self._fields.2,
+            sort_by: self._fields.3,
+            sort_direction: self._fields.4,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/set/upsert_set.rs b/crates/jacquard-api/src/tools_ozone/set/upsert_set.rs
index 8a28652f..28348508 100644
--- a/crates/jacquard-api/src/tools_ozone/set/upsert_set.rs
+++ b/crates/jacquard-api/src/tools_ozone/set/upsert_set.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_derive::IntoStatic;
 use serde::{Serialize, Deserialize};
diff --git a/crates/jacquard-api/src/tools_ozone/setting.rs b/crates/jacquard-api/src/tools_ozone/setting.rs
index 7da146fa..5296c5e1 100644
--- a/crates/jacquard-api/src/tools_ozone/setting.rs
+++ b/crates/jacquard-api/src/tools_ozone/setting.rs
@@ -9,7 +9,11 @@ pub mod list_options;
 pub mod remove_options;
 pub mod upsert_option;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -290,112 +294,112 @@ pub mod defs_option_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Scope;
-        type CreatedBy;
-        type LastUpdatedBy;
         type Value;
-        type Key;
+        type LastUpdatedBy;
         type Did;
+        type Key;
+        type CreatedBy;
+        type Scope;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Scope = Unset;
-        type CreatedBy = Unset;
-        type LastUpdatedBy = Unset;
         type Value = Unset;
-        type Key = Unset;
+        type LastUpdatedBy = Unset;
         type Did = Unset;
+        type Key = Unset;
+        type CreatedBy = Unset;
+        type Scope = Unset;
     }
-    ///State transition - sets the `scope` field to Set
-    pub struct SetScope<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetScope<S> {}
-    impl<S: State> State for SetScope<S> {
-        type Scope = Set<members::scope>;
-        type CreatedBy = S::CreatedBy;
+    ///State transition - sets the `value` field to Set
+    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetValue<S> {}
+    impl<S: State> State for SetValue<S> {
+        type Value = Set<members::value>;
         type LastUpdatedBy = S::LastUpdatedBy;
-        type Value = S::Value;
-        type Key = S::Key;
         type Did = S::Did;
-    }
-    ///State transition - sets the `created_by` field to Set
-    pub struct SetCreatedBy<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedBy<S> {}
-    impl<S: State> State for SetCreatedBy<S> {
-        type Scope = S::Scope;
-        type CreatedBy = Set<members::created_by>;
-        type LastUpdatedBy = S::LastUpdatedBy;
-        type Value = S::Value;
         type Key = S::Key;
-        type Did = S::Did;
+        type CreatedBy = S::CreatedBy;
+        type Scope = S::Scope;
     }
     ///State transition - sets the `last_updated_by` field to Set
     pub struct SetLastUpdatedBy<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetLastUpdatedBy<S> {}
     impl<S: State> State for SetLastUpdatedBy<S> {
-        type Scope = S::Scope;
-        type CreatedBy = S::CreatedBy;
-        type LastUpdatedBy = Set<members::last_updated_by>;
         type Value = S::Value;
-        type Key = S::Key;
+        type LastUpdatedBy = Set<members::last_updated_by>;
         type Did = S::Did;
-    }
-    ///State transition - sets the `value` field to Set
-    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetValue<S> {}
-    impl<S: State> State for SetValue<S> {
-        type Scope = S::Scope;
+        type Key = S::Key;
         type CreatedBy = S::CreatedBy;
+        type Scope = S::Scope;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Value = S::Value;
         type LastUpdatedBy = S::LastUpdatedBy;
-        type Value = Set<members::value>;
+        type Did = Set<members::did>;
         type Key = S::Key;
-        type Did = S::Did;
+        type CreatedBy = S::CreatedBy;
+        type Scope = S::Scope;
     }
     ///State transition - sets the `key` field to Set
     pub struct SetKey<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetKey<S> {}
     impl<S: State> State for SetKey<S> {
-        type Scope = S::Scope;
-        type CreatedBy = S::CreatedBy;
-        type LastUpdatedBy = S::LastUpdatedBy;
         type Value = S::Value;
-        type Key = Set<members::key>;
+        type LastUpdatedBy = S::LastUpdatedBy;
         type Did = S::Did;
-    }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Scope = S::Scope;
+        type Key = Set<members::key>;
         type CreatedBy = S::CreatedBy;
+        type Scope = S::Scope;
+    }
+    ///State transition - sets the `created_by` field to Set
+    pub struct SetCreatedBy<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedBy<S> {}
+    impl<S: State> State for SetCreatedBy<S> {
+        type Value = S::Value;
         type LastUpdatedBy = S::LastUpdatedBy;
+        type Did = S::Did;
+        type Key = S::Key;
+        type CreatedBy = Set<members::created_by>;
+        type Scope = S::Scope;
+    }
+    ///State transition - sets the `scope` field to Set
+    pub struct SetScope<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetScope<S> {}
+    impl<S: State> State for SetScope<S> {
         type Value = S::Value;
+        type LastUpdatedBy = S::LastUpdatedBy;
+        type Did = S::Did;
         type Key = S::Key;
-        type Did = Set<members::did>;
+        type CreatedBy = S::CreatedBy;
+        type Scope = Set<members::scope>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `scope` field
-        pub struct scope(());
-        ///Marker type for the `created_by` field
-        pub struct created_by(());
-        ///Marker type for the `last_updated_by` field
-        pub struct last_updated_by(());
         ///Marker type for the `value` field
         pub struct value(());
-        ///Marker type for the `key` field
-        pub struct key(());
+        ///Marker type for the `last_updated_by` field
+        pub struct last_updated_by(());
         ///Marker type for the `did` field
         pub struct did(());
+        ///Marker type for the `key` field
+        pub struct key(());
+        ///Marker type for the `created_by` field
+        pub struct created_by(());
+        ///Marker type for the `scope` field
+        pub struct scope(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DefsOptionBuilder<'a, S: defs_option_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Did<'a>>,
         Option<CowStr<'a>>,
@@ -407,7 +411,7 @@ pub struct DefsOptionBuilder<'a, S: defs_option_state::State> {
         Option<Datetime>,
         Option<Data<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DefsOption<'a> {
@@ -421,20 +425,9 @@ impl<'a> DefsOptionBuilder<'a, defs_option_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DefsOptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -442,12 +435,12 @@ impl<'a> DefsOptionBuilder<'a, defs_option_state::Empty> {
 impl<'a, S: defs_option_state::State> DefsOptionBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -462,11 +455,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> DefsOptionBuilder<'a, defs_option_state::SetCreatedBy<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DefsOptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -474,12 +467,12 @@ where
 impl<'a, S: defs_option_state::State> DefsOptionBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -494,11 +487,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> DefsOptionBuilder<'a, defs_option_state::SetDid<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         DefsOptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -513,11 +506,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> DefsOptionBuilder<'a, defs_option_state::SetKey<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         DefsOptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -532,11 +525,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> DefsOptionBuilder<'a, defs_option_state::SetLastUpdatedBy<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         DefsOptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -547,7 +540,7 @@ impl<'a, S: defs_option_state::State> DefsOptionBuilder<'a, S> {
         mut self,
         value: impl Into<Option<DefsOptionManagerRole<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `managerRole` field to an Option value (optional)
@@ -555,7 +548,7 @@ impl<'a, S: defs_option_state::State> DefsOptionBuilder<'a, S> {
         mut self,
         value: Option<DefsOptionManagerRole<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -570,11 +563,11 @@ where
         mut self,
         value: impl Into<DefsOptionScope<'a>>,
     ) -> DefsOptionBuilder<'a, defs_option_state::SetScope<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         DefsOptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -582,12 +575,12 @@ where
 impl<'a, S: defs_option_state::State> DefsOptionBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -602,11 +595,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> DefsOptionBuilder<'a, defs_option_state::SetValue<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         DefsOptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -614,26 +607,26 @@ where
 impl<'a, S> DefsOptionBuilder<'a, S>
 where
     S: defs_option_state::State,
-    S::Scope: defs_option_state::IsSet,
-    S::CreatedBy: defs_option_state::IsSet,
-    S::LastUpdatedBy: defs_option_state::IsSet,
     S::Value: defs_option_state::IsSet,
-    S::Key: defs_option_state::IsSet,
+    S::LastUpdatedBy: defs_option_state::IsSet,
     S::Did: defs_option_state::IsSet,
+    S::Key: defs_option_state::IsSet,
+    S::CreatedBy: defs_option_state::IsSet,
+    S::Scope: defs_option_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DefsOption<'a> {
         DefsOption {
-            created_at: self.__unsafe_private_named.0,
-            created_by: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            did: self.__unsafe_private_named.3.unwrap(),
-            key: self.__unsafe_private_named.4.unwrap(),
-            last_updated_by: self.__unsafe_private_named.5.unwrap(),
-            manager_role: self.__unsafe_private_named.6,
-            scope: self.__unsafe_private_named.7.unwrap(),
-            updated_at: self.__unsafe_private_named.8,
-            value: self.__unsafe_private_named.9.unwrap(),
+            created_at: self._fields.0,
+            created_by: self._fields.1.unwrap(),
+            description: self._fields.2,
+            did: self._fields.3.unwrap(),
+            key: self._fields.4.unwrap(),
+            last_updated_by: self._fields.5.unwrap(),
+            manager_role: self._fields.6,
+            scope: self._fields.7.unwrap(),
+            updated_at: self._fields.8,
+            value: self._fields.9.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -643,16 +636,16 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> DefsOption<'a> {
         DefsOption {
-            created_at: self.__unsafe_private_named.0,
-            created_by: self.__unsafe_private_named.1.unwrap(),
-            description: self.__unsafe_private_named.2,
-            did: self.__unsafe_private_named.3.unwrap(),
-            key: self.__unsafe_private_named.4.unwrap(),
-            last_updated_by: self.__unsafe_private_named.5.unwrap(),
-            manager_role: self.__unsafe_private_named.6,
-            scope: self.__unsafe_private_named.7.unwrap(),
-            updated_at: self.__unsafe_private_named.8,
-            value: self.__unsafe_private_named.9.unwrap(),
+            created_at: self._fields.0,
+            created_by: self._fields.1.unwrap(),
+            description: self._fields.2,
+            did: self._fields.3.unwrap(),
+            key: self._fields.4.unwrap(),
+            last_updated_by: self._fields.5.unwrap(),
+            manager_role: self._fields.6,
+            scope: self._fields.7.unwrap(),
+            updated_at: self._fields.8,
+            value: self._fields.9.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/setting/list_options.rs b/crates/jacquard-api/src/tools_ozone/setting/list_options.rs
index c5b7fb7a..a3d542dd 100644
--- a/crates/jacquard-api/src/tools_ozone/setting/list_options.rs
+++ b/crates/jacquard-api/src/tools_ozone/setting/list_options.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Nsid;
@@ -101,15 +104,15 @@ pub mod list_options_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListOptionsBuilder<'a, S: list_options_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Vec<Nsid<'a>>>,
         Option<i64>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListOptions<'a> {
@@ -123,9 +126,9 @@ impl<'a> ListOptionsBuilder<'a, list_options_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListOptionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -133,12 +136,12 @@ impl<'a> ListOptionsBuilder<'a, list_options_state::Empty> {
 impl<'a, S: list_options_state::State> ListOptionsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -146,12 +149,12 @@ impl<'a, S: list_options_state::State> ListOptionsBuilder<'a, S> {
 impl<'a, S: list_options_state::State> ListOptionsBuilder<'a, S> {
     /// Set the `keys` field (optional)
     pub fn keys(mut self, value: impl Into<Option<Vec<Nsid<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `keys` field to an Option value (optional)
     pub fn maybe_keys(mut self, value: Option<Vec<Nsid<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -159,12 +162,12 @@ impl<'a, S: list_options_state::State> ListOptionsBuilder<'a, S> {
 impl<'a, S: list_options_state::State> ListOptionsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -172,12 +175,12 @@ impl<'a, S: list_options_state::State> ListOptionsBuilder<'a, S> {
 impl<'a, S: list_options_state::State> ListOptionsBuilder<'a, S> {
     /// Set the `prefix` field (optional)
     pub fn prefix(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `prefix` field to an Option value (optional)
     pub fn maybe_prefix(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -185,12 +188,12 @@ impl<'a, S: list_options_state::State> ListOptionsBuilder<'a, S> {
 impl<'a, S: list_options_state::State> ListOptionsBuilder<'a, S> {
     /// Set the `scope` field (optional)
     pub fn scope(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `scope` field to an Option value (optional)
     pub fn maybe_scope(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -202,11 +205,11 @@ where
     /// Build the final struct
     pub fn build(self) -> ListOptions<'a> {
         ListOptions {
-            cursor: self.__unsafe_private_named.0,
-            keys: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            prefix: self.__unsafe_private_named.3,
-            scope: self.__unsafe_private_named.4,
+            cursor: self._fields.0,
+            keys: self._fields.1,
+            limit: self._fields.2,
+            prefix: self._fields.3,
+            scope: self._fields.4,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/setting/remove_options.rs b/crates/jacquard-api/src/tools_ozone/setting/remove_options.rs
index 197a1c41..c858768e 100644
--- a/crates/jacquard-api/src/tools_ozone/setting/remove_options.rs
+++ b/crates/jacquard-api/src/tools_ozone/setting/remove_options.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Nsid;
@@ -154,45 +157,45 @@ pub mod remove_options_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Keys;
         type Scope;
+        type Keys;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Keys = Unset;
         type Scope = Unset;
-    }
-    ///State transition - sets the `keys` field to Set
-    pub struct SetKeys<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetKeys<S> {}
-    impl<S: State> State for SetKeys<S> {
-        type Keys = Set<members::keys>;
-        type Scope = S::Scope;
+        type Keys = Unset;
     }
     ///State transition - sets the `scope` field to Set
     pub struct SetScope<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetScope<S> {}
     impl<S: State> State for SetScope<S> {
-        type Keys = S::Keys;
         type Scope = Set<members::scope>;
+        type Keys = S::Keys;
+    }
+    ///State transition - sets the `keys` field to Set
+    pub struct SetKeys<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetKeys<S> {}
+    impl<S: State> State for SetKeys<S> {
+        type Scope = S::Scope;
+        type Keys = Set<members::keys>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `keys` field
-        pub struct keys(());
         ///Marker type for the `scope` field
         pub struct scope(());
+        ///Marker type for the `keys` field
+        pub struct keys(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RemoveOptionsBuilder<'a, S: remove_options_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<Nsid<'a>>>, Option<RemoveOptionsScope<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<Nsid<'a>>>, Option<RemoveOptionsScope<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RemoveOptions<'a> {
@@ -206,9 +209,9 @@ impl<'a> RemoveOptionsBuilder<'a, remove_options_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RemoveOptionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -223,11 +226,11 @@ where
         mut self,
         value: impl Into<Vec<Nsid<'a>>>,
     ) -> RemoveOptionsBuilder<'a, remove_options_state::SetKeys<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RemoveOptionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -242,11 +245,11 @@ where
         mut self,
         value: impl Into<RemoveOptionsScope<'a>>,
     ) -> RemoveOptionsBuilder<'a, remove_options_state::SetScope<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RemoveOptionsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -254,14 +257,14 @@ where
 impl<'a, S> RemoveOptionsBuilder<'a, S>
 where
     S: remove_options_state::State,
-    S::Keys: remove_options_state::IsSet,
     S::Scope: remove_options_state::IsSet,
+    S::Keys: remove_options_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RemoveOptions<'a> {
         RemoveOptions {
-            keys: self.__unsafe_private_named.0.unwrap(),
-            scope: self.__unsafe_private_named.1.unwrap(),
+            keys: self._fields.0.unwrap(),
+            scope: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -274,8 +277,8 @@ where
         >,
     ) -> RemoveOptions<'a> {
         RemoveOptions {
-            keys: self.__unsafe_private_named.0.unwrap(),
-            scope: self.__unsafe_private_named.1.unwrap(),
+            keys: self._fields.0.unwrap(),
+            scope: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/setting/upsert_option.rs b/crates/jacquard-api/src/tools_ozone/setting/upsert_option.rs
index 001af2a1..6cd35238 100644
--- a/crates/jacquard-api/src/tools_ozone/setting/upsert_option.rs
+++ b/crates/jacquard-api/src/tools_ozone/setting/upsert_option.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Nsid;
@@ -273,65 +276,65 @@ pub mod upsert_option_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Key;
-        type Scope;
         type Value;
+        type Scope;
+        type Key;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Key = Unset;
-        type Scope = Unset;
         type Value = Unset;
+        type Scope = Unset;
+        type Key = Unset;
     }
-    ///State transition - sets the `key` field to Set
-    pub struct SetKey<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetKey<S> {}
-    impl<S: State> State for SetKey<S> {
-        type Key = Set<members::key>;
+    ///State transition - sets the `value` field to Set
+    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetValue<S> {}
+    impl<S: State> State for SetValue<S> {
+        type Value = Set<members::value>;
         type Scope = S::Scope;
-        type Value = S::Value;
+        type Key = S::Key;
     }
     ///State transition - sets the `scope` field to Set
     pub struct SetScope<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetScope<S> {}
     impl<S: State> State for SetScope<S> {
-        type Key = S::Key;
-        type Scope = Set<members::scope>;
         type Value = S::Value;
-    }
-    ///State transition - sets the `value` field to Set
-    pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetValue<S> {}
-    impl<S: State> State for SetValue<S> {
+        type Scope = Set<members::scope>;
         type Key = S::Key;
+    }
+    ///State transition - sets the `key` field to Set
+    pub struct SetKey<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetKey<S> {}
+    impl<S: State> State for SetKey<S> {
+        type Value = S::Value;
         type Scope = S::Scope;
-        type Value = Set<members::value>;
+        type Key = Set<members::key>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `key` field
-        pub struct key(());
-        ///Marker type for the `scope` field
-        pub struct scope(());
         ///Marker type for the `value` field
         pub struct value(());
+        ///Marker type for the `scope` field
+        pub struct scope(());
+        ///Marker type for the `key` field
+        pub struct key(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct UpsertOptionBuilder<'a, S: upsert_option_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Nsid<'a>>,
         Option<UpsertOptionManagerRole<'a>>,
         Option<UpsertOptionScope<'a>>,
         Option<Data<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpsertOption<'a> {
@@ -345,9 +348,9 @@ impl<'a> UpsertOptionBuilder<'a, upsert_option_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpsertOptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -355,12 +358,12 @@ impl<'a> UpsertOptionBuilder<'a, upsert_option_state::Empty> {
 impl<'a, S: upsert_option_state::State> UpsertOptionBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -375,11 +378,11 @@ where
         mut self,
         value: impl Into<Nsid<'a>>,
     ) -> UpsertOptionBuilder<'a, upsert_option_state::SetKey<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         UpsertOptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -390,7 +393,7 @@ impl<'a, S: upsert_option_state::State> UpsertOptionBuilder<'a, S> {
         mut self,
         value: impl Into<Option<UpsertOptionManagerRole<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `managerRole` field to an Option value (optional)
@@ -398,7 +401,7 @@ impl<'a, S: upsert_option_state::State> UpsertOptionBuilder<'a, S> {
         mut self,
         value: Option<UpsertOptionManagerRole<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -413,11 +416,11 @@ where
         mut self,
         value: impl Into<UpsertOptionScope<'a>>,
     ) -> UpsertOptionBuilder<'a, upsert_option_state::SetScope<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         UpsertOptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -432,11 +435,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> UpsertOptionBuilder<'a, upsert_option_state::SetValue<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         UpsertOptionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -444,18 +447,18 @@ where
 impl<'a, S> UpsertOptionBuilder<'a, S>
 where
     S: upsert_option_state::State,
-    S::Key: upsert_option_state::IsSet,
-    S::Scope: upsert_option_state::IsSet,
     S::Value: upsert_option_state::IsSet,
+    S::Scope: upsert_option_state::IsSet,
+    S::Key: upsert_option_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> UpsertOption<'a> {
         UpsertOption {
-            description: self.__unsafe_private_named.0,
-            key: self.__unsafe_private_named.1.unwrap(),
-            manager_role: self.__unsafe_private_named.2,
-            scope: self.__unsafe_private_named.3.unwrap(),
-            value: self.__unsafe_private_named.4.unwrap(),
+            description: self._fields.0,
+            key: self._fields.1.unwrap(),
+            manager_role: self._fields.2,
+            scope: self._fields.3.unwrap(),
+            value: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -465,11 +468,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> UpsertOption<'a> {
         UpsertOption {
-            description: self.__unsafe_private_named.0,
-            key: self.__unsafe_private_named.1.unwrap(),
-            manager_role: self.__unsafe_private_named.2,
-            scope: self.__unsafe_private_named.3.unwrap(),
-            value: self.__unsafe_private_named.4.unwrap(),
+            description: self._fields.0,
+            key: self._fields.1.unwrap(),
+            manager_role: self._fields.2,
+            scope: self._fields.3.unwrap(),
+            value: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/signature/find_correlation.rs b/crates/jacquard-api/src/tools_ozone/signature/find_correlation.rs
index 946a5f7d..ccfc6b3a 100644
--- a/crates/jacquard-api/src/tools_ozone/signature/find_correlation.rs
+++ b/crates/jacquard-api/src/tools_ozone/signature/find_correlation.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::Did;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -86,9 +89,9 @@ pub mod find_correlation_state {
 
 /// Builder for constructing an instance of this type
 pub struct FindCorrelationBuilder<'a, S: find_correlation_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<Did<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<Did<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> FindCorrelation<'a> {
@@ -102,9 +105,9 @@ impl<'a> FindCorrelationBuilder<'a, find_correlation_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FindCorrelationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -119,11 +122,11 @@ where
         mut self,
         value: impl Into<Vec<Did<'a>>>,
     ) -> FindCorrelationBuilder<'a, find_correlation_state::SetDids<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         FindCorrelationBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -136,7 +139,7 @@ where
     /// Build the final struct
     pub fn build(self) -> FindCorrelation<'a> {
         FindCorrelation {
-            dids: self.__unsafe_private_named.0.unwrap(),
+            dids: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs b/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs
index 58c56638..296111be 100644
--- a/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs
+++ b/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -138,9 +141,9 @@ pub mod find_related_accounts_state {
 
 /// Builder for constructing an instance of this type
 pub struct FindRelatedAccountsBuilder<'a, S: find_related_accounts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Did<'a>>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Did<'a>>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> FindRelatedAccounts<'a> {
@@ -154,9 +157,9 @@ impl<'a> FindRelatedAccountsBuilder<'a, find_related_accounts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         FindRelatedAccountsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,12 +167,12 @@ impl<'a> FindRelatedAccountsBuilder<'a, find_related_accounts_state::Empty> {
 impl<'a, S: find_related_accounts_state::State> FindRelatedAccountsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -184,11 +187,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> FindRelatedAccountsBuilder<'a, find_related_accounts_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         FindRelatedAccountsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,12 +199,12 @@ where
 impl<'a, S: find_related_accounts_state::State> FindRelatedAccountsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -214,9 +217,9 @@ where
     /// Build the final struct
     pub fn build(self) -> FindRelatedAccounts<'a> {
         FindRelatedAccounts {
-            cursor: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            limit: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            did: self._fields.1.unwrap(),
+            limit: self._fields.2,
         }
     }
 }
@@ -255,9 +258,9 @@ pub mod related_account_state {
 
 /// Builder for constructing an instance of this type
 pub struct RelatedAccountBuilder<'a, S: related_account_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<AccountView<'a>>, Option<Vec<SigDetail<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<AccountView<'a>>, Option<Vec<SigDetail<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RelatedAccount<'a> {
@@ -271,9 +274,9 @@ impl<'a> RelatedAccountBuilder<'a, related_account_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RelatedAccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -288,11 +291,11 @@ where
         mut self,
         value: impl Into<AccountView<'a>>,
     ) -> RelatedAccountBuilder<'a, related_account_state::SetAccount<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RelatedAccountBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -300,12 +303,12 @@ where
 impl<'a, S: related_account_state::State> RelatedAccountBuilder<'a, S> {
     /// Set the `similarities` field (optional)
     pub fn similarities(mut self, value: impl Into<Option<Vec<SigDetail<'a>>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `similarities` field to an Option value (optional)
     pub fn maybe_similarities(mut self, value: Option<Vec<SigDetail<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -318,8 +321,8 @@ where
     /// Build the final struct
     pub fn build(self) -> RelatedAccount<'a> {
         RelatedAccount {
-            account: self.__unsafe_private_named.0.unwrap(),
-            similarities: self.__unsafe_private_named.1,
+            account: self._fields.0.unwrap(),
+            similarities: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -332,8 +335,8 @@ where
         >,
     ) -> RelatedAccount<'a> {
         RelatedAccount {
-            account: self.__unsafe_private_named.0.unwrap(),
-            similarities: self.__unsafe_private_named.1,
+            account: self._fields.0.unwrap(),
+            similarities: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/signature/search_accounts.rs b/crates/jacquard-api/src/tools_ozone/signature/search_accounts.rs
index 8b6553ba..717273d3 100644
--- a/crates/jacquard-api/src/tools_ozone/signature/search_accounts.rs
+++ b/crates/jacquard-api/src/tools_ozone/signature/search_accounts.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -100,9 +103,9 @@ pub mod search_accounts_state {
 
 /// Builder for constructing an instance of this type
 pub struct SearchAccountsBuilder<'a, S: search_accounts_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<i64>, Option<Vec<CowStr<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<i64>, Option<Vec<CowStr<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SearchAccounts<'a> {
@@ -116,9 +119,9 @@ impl<'a> SearchAccountsBuilder<'a, search_accounts_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SearchAccountsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -126,12 +129,12 @@ impl<'a> SearchAccountsBuilder<'a, search_accounts_state::Empty> {
 impl<'a, S: search_accounts_state::State> SearchAccountsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -139,12 +142,12 @@ impl<'a, S: search_accounts_state::State> SearchAccountsBuilder<'a, S> {
 impl<'a, S: search_accounts_state::State> SearchAccountsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -159,11 +162,11 @@ where
         mut self,
         value: impl Into<Vec<CowStr<'a>>>,
     ) -> SearchAccountsBuilder<'a, search_accounts_state::SetValues<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SearchAccountsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -176,9 +179,9 @@ where
     /// Build the final struct
     pub fn build(self) -> SearchAccounts<'a> {
         SearchAccounts {
-            cursor: self.__unsafe_private_named.0,
-            limit: self.__unsafe_private_named.1,
-            values: self.__unsafe_private_named.2.unwrap(),
+            cursor: self._fields.0,
+            limit: self._fields.1,
+            values: self._fields.2.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/team.rs b/crates/jacquard-api/src/tools_ozone/team.rs
index 8b7cd4a5..d244a1fc 100644
--- a/crates/jacquard-api/src/tools_ozone/team.rs
+++ b/crates/jacquard-api/src/tools_ozone/team.rs
@@ -10,7 +10,11 @@ pub mod delete_member;
 pub mod list_members;
 pub mod update_member;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -212,44 +216,44 @@ pub mod member_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Did;
         type Role;
+        type Did;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Did = Unset;
         type Role = Unset;
-    }
-    ///State transition - sets the `did` field to Set
-    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDid<S> {}
-    impl<S: State> State for SetDid<S> {
-        type Did = Set<members::did>;
-        type Role = S::Role;
+        type Did = Unset;
     }
     ///State transition - sets the `role` field to Set
     pub struct SetRole<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetRole<S> {}
     impl<S: State> State for SetRole<S> {
-        type Did = S::Did;
         type Role = Set<members::role>;
+        type Did = S::Did;
+    }
+    ///State transition - sets the `did` field to Set
+    pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDid<S> {}
+    impl<S: State> State for SetDid<S> {
+        type Role = S::Role;
+        type Did = Set<members::did>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `did` field
-        pub struct did(());
         ///Marker type for the `role` field
         pub struct role(());
+        ///Marker type for the `did` field
+        pub struct did(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MemberBuilder<'a, S: member_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Did<'a>>,
         Option<bool>,
@@ -258,7 +262,7 @@ pub struct MemberBuilder<'a, S: member_state::State> {
         Option<MemberRole<'a>>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Member<'a> {
@@ -272,9 +276,9 @@ impl<'a> MemberBuilder<'a, member_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -282,12 +286,12 @@ impl<'a> MemberBuilder<'a, member_state::Empty> {
 impl<'a, S: member_state::State> MemberBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -302,11 +306,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> MemberBuilder<'a, member_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -314,12 +318,12 @@ where
 impl<'a, S: member_state::State> MemberBuilder<'a, S> {
     /// Set the `disabled` field (optional)
     pub fn disabled(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `disabled` field to an Option value (optional)
     pub fn maybe_disabled(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -327,12 +331,12 @@ impl<'a, S: member_state::State> MemberBuilder<'a, S> {
 impl<'a, S: member_state::State> MemberBuilder<'a, S> {
     /// Set the `lastUpdatedBy` field (optional)
     pub fn last_updated_by(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `lastUpdatedBy` field to an Option value (optional)
     pub fn maybe_last_updated_by(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -340,12 +344,12 @@ impl<'a, S: member_state::State> MemberBuilder<'a, S> {
 impl<'a, S: member_state::State> MemberBuilder<'a, S> {
     /// Set the `profile` field (optional)
     pub fn profile(mut self, value: impl Into<Option<ProfileViewDetailed<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `profile` field to an Option value (optional)
     pub fn maybe_profile(mut self, value: Option<ProfileViewDetailed<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -360,11 +364,11 @@ where
         mut self,
         value: impl Into<MemberRole<'a>>,
     ) -> MemberBuilder<'a, member_state::SetRole<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         MemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -372,12 +376,12 @@ where
 impl<'a, S: member_state::State> MemberBuilder<'a, S> {
     /// Set the `updatedAt` field (optional)
     pub fn updated_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `updatedAt` field to an Option value (optional)
     pub fn maybe_updated_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -385,19 +389,19 @@ impl<'a, S: member_state::State> MemberBuilder<'a, S> {
 impl<'a, S> MemberBuilder<'a, S>
 where
     S: member_state::State,
-    S::Did: member_state::IsSet,
     S::Role: member_state::IsSet,
+    S::Did: member_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Member<'a> {
         Member {
-            created_at: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            disabled: self.__unsafe_private_named.2,
-            last_updated_by: self.__unsafe_private_named.3,
-            profile: self.__unsafe_private_named.4,
-            role: self.__unsafe_private_named.5.unwrap(),
-            updated_at: self.__unsafe_private_named.6,
+            created_at: self._fields.0,
+            did: self._fields.1.unwrap(),
+            disabled: self._fields.2,
+            last_updated_by: self._fields.3,
+            profile: self._fields.4,
+            role: self._fields.5.unwrap(),
+            updated_at: self._fields.6,
             extra_data: Default::default(),
         }
     }
@@ -410,13 +414,13 @@ where
         >,
     ) -> Member<'a> {
         Member {
-            created_at: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            disabled: self.__unsafe_private_named.2,
-            last_updated_by: self.__unsafe_private_named.3,
-            profile: self.__unsafe_private_named.4,
-            role: self.__unsafe_private_named.5.unwrap(),
-            updated_at: self.__unsafe_private_named.6,
+            created_at: self._fields.0,
+            did: self._fields.1.unwrap(),
+            disabled: self._fields.2,
+            last_updated_by: self._fields.3,
+            profile: self._fields.4,
+            role: self._fields.5.unwrap(),
+            updated_at: self._fields.6,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/team/add_member.rs b/crates/jacquard-api/src/tools_ozone/team/add_member.rs
index 340b49ff..3b2b3f80 100644
--- a/crates/jacquard-api/src/tools_ozone/team/add_member.rs
+++ b/crates/jacquard-api/src/tools_ozone/team/add_member.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -243,9 +246,9 @@ pub mod add_member_state {
 
 /// Builder for constructing an instance of this type
 pub struct AddMemberBuilder<'a, S: add_member_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<AddMemberRole<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<AddMemberRole<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AddMember<'a> {
@@ -259,9 +262,9 @@ impl<'a> AddMemberBuilder<'a, add_member_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AddMemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -276,11 +279,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> AddMemberBuilder<'a, add_member_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AddMemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -295,11 +298,11 @@ where
         mut self,
         value: impl Into<AddMemberRole<'a>>,
     ) -> AddMemberBuilder<'a, add_member_state::SetRole<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AddMemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -313,8 +316,8 @@ where
     /// Build the final struct
     pub fn build(self) -> AddMember<'a> {
         AddMember {
-            did: self.__unsafe_private_named.0.unwrap(),
-            role: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            role: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -327,8 +330,8 @@ where
         >,
     ) -> AddMember<'a> {
         AddMember {
-            did: self.__unsafe_private_named.0.unwrap(),
-            role: self.__unsafe_private_named.1.unwrap(),
+            did: self._fields.0.unwrap(),
+            role: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/team/delete_member.rs b/crates/jacquard-api/src/tools_ozone/team/delete_member.rs
index 2bafb209..b482b01d 100644
--- a/crates/jacquard-api/src/tools_ozone/team/delete_member.rs
+++ b/crates/jacquard-api/src/tools_ozone/team/delete_member.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -129,9 +132,9 @@ pub mod delete_member_state {
 
 /// Builder for constructing an instance of this type
 pub struct DeleteMemberBuilder<'a, S: delete_member_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeleteMember<'a> {
@@ -145,9 +148,9 @@ impl<'a> DeleteMemberBuilder<'a, delete_member_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeleteMemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -162,11 +165,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> DeleteMemberBuilder<'a, delete_member_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeleteMemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -179,7 +182,7 @@ where
     /// Build the final struct
     pub fn build(self) -> DeleteMember<'a> {
         DeleteMember {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -192,7 +195,7 @@ where
         >,
     ) -> DeleteMember<'a> {
         DeleteMember {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/team/list_members.rs b/crates/jacquard-api/src/tools_ozone/team/list_members.rs
index cc7d81d6..5f1d44f7 100644
--- a/crates/jacquard-api/src/tools_ozone/team/list_members.rs
+++ b/crates/jacquard-api/src/tools_ozone/team/list_members.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
@@ -93,15 +96,15 @@ pub mod list_members_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListMembersBuilder<'a, S: list_members_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<bool>,
         Option<i64>,
         Option<CowStr<'a>>,
         Option<Vec<CowStr<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListMembers<'a> {
@@ -115,9 +118,9 @@ impl<'a> ListMembersBuilder<'a, list_members_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListMembersBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -125,12 +128,12 @@ impl<'a> ListMembersBuilder<'a, list_members_state::Empty> {
 impl<'a, S: list_members_state::State> ListMembersBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -138,12 +141,12 @@ impl<'a, S: list_members_state::State> ListMembersBuilder<'a, S> {
 impl<'a, S: list_members_state::State> ListMembersBuilder<'a, S> {
     /// Set the `disabled` field (optional)
     pub fn disabled(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `disabled` field to an Option value (optional)
     pub fn maybe_disabled(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -151,12 +154,12 @@ impl<'a, S: list_members_state::State> ListMembersBuilder<'a, S> {
 impl<'a, S: list_members_state::State> ListMembersBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -164,12 +167,12 @@ impl<'a, S: list_members_state::State> ListMembersBuilder<'a, S> {
 impl<'a, S: list_members_state::State> ListMembersBuilder<'a, S> {
     /// Set the `q` field (optional)
     pub fn q(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `q` field to an Option value (optional)
     pub fn maybe_q(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -177,12 +180,12 @@ impl<'a, S: list_members_state::State> ListMembersBuilder<'a, S> {
 impl<'a, S: list_members_state::State> ListMembersBuilder<'a, S> {
     /// Set the `roles` field (optional)
     pub fn roles(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `roles` field to an Option value (optional)
     pub fn maybe_roles(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -194,11 +197,11 @@ where
     /// Build the final struct
     pub fn build(self) -> ListMembers<'a> {
         ListMembers {
-            cursor: self.__unsafe_private_named.0,
-            disabled: self.__unsafe_private_named.1,
-            limit: self.__unsafe_private_named.2,
-            q: self.__unsafe_private_named.3,
-            roles: self.__unsafe_private_named.4,
+            cursor: self._fields.0,
+            disabled: self._fields.1,
+            limit: self._fields.2,
+            q: self._fields.3,
+            roles: self._fields.4,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/team/update_member.rs b/crates/jacquard-api/src/tools_ozone/team/update_member.rs
index e83de37c..ae0a76b1 100644
--- a/crates/jacquard-api/src/tools_ozone/team/update_member.rs
+++ b/crates/jacquard-api/src/tools_ozone/team/update_member.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -234,13 +237,9 @@ pub mod update_member_state {
 
 /// Builder for constructing an instance of this type
 pub struct UpdateMemberBuilder<'a, S: update_member_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Did<'a>>,
-        Option<bool>,
-        Option<UpdateMemberRole<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<bool>, Option<UpdateMemberRole<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> UpdateMember<'a> {
@@ -254,9 +253,9 @@ impl<'a> UpdateMemberBuilder<'a, update_member_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         UpdateMemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -271,11 +270,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> UpdateMemberBuilder<'a, update_member_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         UpdateMemberBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -283,12 +282,12 @@ where
 impl<'a, S: update_member_state::State> UpdateMemberBuilder<'a, S> {
     /// Set the `disabled` field (optional)
     pub fn disabled(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `disabled` field to an Option value (optional)
     pub fn maybe_disabled(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -296,12 +295,12 @@ impl<'a, S: update_member_state::State> UpdateMemberBuilder<'a, S> {
 impl<'a, S: update_member_state::State> UpdateMemberBuilder<'a, S> {
     /// Set the `role` field (optional)
     pub fn role(mut self, value: impl Into<Option<UpdateMemberRole<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `role` field to an Option value (optional)
     pub fn maybe_role(mut self, value: Option<UpdateMemberRole<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -314,9 +313,9 @@ where
     /// Build the final struct
     pub fn build(self) -> UpdateMember<'a> {
         UpdateMember {
-            did: self.__unsafe_private_named.0.unwrap(),
-            disabled: self.__unsafe_private_named.1,
-            role: self.__unsafe_private_named.2,
+            did: self._fields.0.unwrap(),
+            disabled: self._fields.1,
+            role: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -329,9 +328,9 @@ where
         >,
     ) -> UpdateMember<'a> {
         UpdateMember {
-            did: self.__unsafe_private_named.0.unwrap(),
-            disabled: self.__unsafe_private_named.1,
-            role: self.__unsafe_private_named.2,
+            did: self._fields.0.unwrap(),
+            disabled: self._fields.1,
+            role: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/verification.rs b/crates/jacquard-api/src/tools_ozone/verification.rs
index 396c0048..853649da 100644
--- a/crates/jacquard-api/src/tools_ozone/verification.rs
+++ b/crates/jacquard-api/src/tools_ozone/verification.rs
@@ -9,7 +9,11 @@ pub mod grant_verifications;
 pub mod list_verifications;
 pub mod revoke_verifications;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -123,112 +127,112 @@ pub mod verification_view_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type DisplayName;
         type Issuer;
+        type CreatedAt;
         type Subject;
         type Handle;
         type Uri;
-        type CreatedAt;
-        type DisplayName;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type DisplayName = Unset;
         type Issuer = Unset;
+        type CreatedAt = Unset;
         type Subject = Unset;
         type Handle = Unset;
         type Uri = Unset;
-        type CreatedAt = Unset;
-        type DisplayName = Unset;
+    }
+    ///State transition - sets the `display_name` field to Set
+    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
+    impl<S: State> State for SetDisplayName<S> {
+        type DisplayName = Set<members::display_name>;
+        type Issuer = S::Issuer;
+        type CreatedAt = S::CreatedAt;
+        type Subject = S::Subject;
+        type Handle = S::Handle;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `issuer` field to Set
     pub struct SetIssuer<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetIssuer<S> {}
     impl<S: State> State for SetIssuer<S> {
+        type DisplayName = S::DisplayName;
         type Issuer = Set<members::issuer>;
+        type CreatedAt = S::CreatedAt;
         type Subject = S::Subject;
         type Handle = S::Handle;
         type Uri = S::Uri;
-        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
         type DisplayName = S::DisplayName;
+        type Issuer = S::Issuer;
+        type CreatedAt = Set<members::created_at>;
+        type Subject = S::Subject;
+        type Handle = S::Handle;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
+        type DisplayName = S::DisplayName;
         type Issuer = S::Issuer;
+        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
         type Handle = S::Handle;
         type Uri = S::Uri;
-        type CreatedAt = S::CreatedAt;
-        type DisplayName = S::DisplayName;
     }
     ///State transition - sets the `handle` field to Set
     pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetHandle<S> {}
     impl<S: State> State for SetHandle<S> {
+        type DisplayName = S::DisplayName;
         type Issuer = S::Issuer;
+        type CreatedAt = S::CreatedAt;
         type Subject = S::Subject;
         type Handle = Set<members::handle>;
         type Uri = S::Uri;
-        type CreatedAt = S::CreatedAt;
-        type DisplayName = S::DisplayName;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetUri<S> {}
     impl<S: State> State for SetUri<S> {
-        type Issuer = S::Issuer;
-        type Subject = S::Subject;
-        type Handle = S::Handle;
-        type Uri = Set<members::uri>;
-        type CreatedAt = S::CreatedAt;
         type DisplayName = S::DisplayName;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type Issuer = S::Issuer;
-        type Subject = S::Subject;
-        type Handle = S::Handle;
-        type Uri = S::Uri;
-        type CreatedAt = Set<members::created_at>;
-        type DisplayName = S::DisplayName;
-    }
-    ///State transition - sets the `display_name` field to Set
-    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
-    impl<S: State> State for SetDisplayName<S> {
         type Issuer = S::Issuer;
+        type CreatedAt = S::CreatedAt;
         type Subject = S::Subject;
         type Handle = S::Handle;
-        type Uri = S::Uri;
-        type CreatedAt = S::CreatedAt;
-        type DisplayName = Set<members::display_name>;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `display_name` field
+        pub struct display_name(());
         ///Marker type for the `issuer` field
         pub struct issuer(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
         ///Marker type for the `handle` field
         pub struct handle(());
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
-        ///Marker type for the `display_name` field
-        pub struct display_name(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct VerificationViewBuilder<'a, S: verification_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<Handle<'a>>,
@@ -243,7 +247,7 @@ pub struct VerificationViewBuilder<'a, S: verification_view_state::State> {
         Option<VerificationViewSubjectRepo<'a>>,
         Option<AtUri<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> VerificationView<'a> {
@@ -257,8 +261,8 @@ impl<'a> VerificationViewBuilder<'a, verification_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VerificationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
+            _state: PhantomData,
+            _fields: (
                 None,
                 None,
                 None,
@@ -273,7 +277,7 @@ impl<'a> VerificationViewBuilder<'a, verification_view_state::Empty> {
                 None,
                 None,
             ),
-            _phantom: PhantomData,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -288,11 +292,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> VerificationViewBuilder<'a, verification_view_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         VerificationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -307,11 +311,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> VerificationViewBuilder<'a, verification_view_state::SetDisplayName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VerificationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -326,11 +330,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> VerificationViewBuilder<'a, verification_view_state::SetHandle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         VerificationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -345,11 +349,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> VerificationViewBuilder<'a, verification_view_state::SetIssuer<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         VerificationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -357,12 +361,12 @@ where
 impl<'a, S: verification_view_state::State> VerificationViewBuilder<'a, S> {
     /// Set the `issuerProfile` field (optional)
     pub fn issuer_profile(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `issuerProfile` field to an Option value (optional)
     pub fn maybe_issuer_profile(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -373,7 +377,7 @@ impl<'a, S: verification_view_state::State> VerificationViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<VerificationViewIssuerRepo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `issuerRepo` field to an Option value (optional)
@@ -381,7 +385,7 @@ impl<'a, S: verification_view_state::State> VerificationViewBuilder<'a, S> {
         mut self,
         value: Option<VerificationViewIssuerRepo<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -389,12 +393,12 @@ impl<'a, S: verification_view_state::State> VerificationViewBuilder<'a, S> {
 impl<'a, S: verification_view_state::State> VerificationViewBuilder<'a, S> {
     /// Set the `revokeReason` field (optional)
     pub fn revoke_reason(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `revokeReason` field to an Option value (optional)
     pub fn maybe_revoke_reason(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -402,12 +406,12 @@ impl<'a, S: verification_view_state::State> VerificationViewBuilder<'a, S> {
 impl<'a, S: verification_view_state::State> VerificationViewBuilder<'a, S> {
     /// Set the `revokedAt` field (optional)
     pub fn revoked_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `revokedAt` field to an Option value (optional)
     pub fn maybe_revoked_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -415,12 +419,12 @@ impl<'a, S: verification_view_state::State> VerificationViewBuilder<'a, S> {
 impl<'a, S: verification_view_state::State> VerificationViewBuilder<'a, S> {
     /// Set the `revokedBy` field (optional)
     pub fn revoked_by(mut self, value: impl Into<Option<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `revokedBy` field to an Option value (optional)
     pub fn maybe_revoked_by(mut self, value: Option<Did<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -435,11 +439,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> VerificationViewBuilder<'a, verification_view_state::SetSubject<S>> {
-        self.__unsafe_private_named.9 = Option::Some(value.into());
+        self._fields.9 = Option::Some(value.into());
         VerificationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -447,12 +451,12 @@ where
 impl<'a, S: verification_view_state::State> VerificationViewBuilder<'a, S> {
     /// Set the `subjectProfile` field (optional)
     pub fn subject_profile(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.10 = value.into();
+        self._fields.10 = value.into();
         self
     }
     /// Set the `subjectProfile` field to an Option value (optional)
     pub fn maybe_subject_profile(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.10 = value;
+        self._fields.10 = value;
         self
     }
 }
@@ -463,7 +467,7 @@ impl<'a, S: verification_view_state::State> VerificationViewBuilder<'a, S> {
         mut self,
         value: impl Into<Option<VerificationViewSubjectRepo<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value.into();
+        self._fields.11 = value.into();
         self
     }
     /// Set the `subjectRepo` field to an Option value (optional)
@@ -471,7 +475,7 @@ impl<'a, S: verification_view_state::State> VerificationViewBuilder<'a, S> {
         mut self,
         value: Option<VerificationViewSubjectRepo<'a>>,
     ) -> Self {
-        self.__unsafe_private_named.11 = value;
+        self._fields.11 = value;
         self
     }
 }
@@ -486,11 +490,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> VerificationViewBuilder<'a, verification_view_state::SetUri<S>> {
-        self.__unsafe_private_named.12 = Option::Some(value.into());
+        self._fields.12 = Option::Some(value.into());
         VerificationViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -498,29 +502,29 @@ where
 impl<'a, S> VerificationViewBuilder<'a, S>
 where
     S: verification_view_state::State,
+    S::DisplayName: verification_view_state::IsSet,
     S::Issuer: verification_view_state::IsSet,
+    S::CreatedAt: verification_view_state::IsSet,
     S::Subject: verification_view_state::IsSet,
     S::Handle: verification_view_state::IsSet,
     S::Uri: verification_view_state::IsSet,
-    S::CreatedAt: verification_view_state::IsSet,
-    S::DisplayName: verification_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> VerificationView<'a> {
         VerificationView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            display_name: self.__unsafe_private_named.1.unwrap(),
-            handle: self.__unsafe_private_named.2.unwrap(),
-            issuer: self.__unsafe_private_named.3.unwrap(),
-            issuer_profile: self.__unsafe_private_named.4,
-            issuer_repo: self.__unsafe_private_named.5,
-            revoke_reason: self.__unsafe_private_named.6,
-            revoked_at: self.__unsafe_private_named.7,
-            revoked_by: self.__unsafe_private_named.8,
-            subject: self.__unsafe_private_named.9.unwrap(),
-            subject_profile: self.__unsafe_private_named.10,
-            subject_repo: self.__unsafe_private_named.11,
-            uri: self.__unsafe_private_named.12.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            display_name: self._fields.1.unwrap(),
+            handle: self._fields.2.unwrap(),
+            issuer: self._fields.3.unwrap(),
+            issuer_profile: self._fields.4,
+            issuer_repo: self._fields.5,
+            revoke_reason: self._fields.6,
+            revoked_at: self._fields.7,
+            revoked_by: self._fields.8,
+            subject: self._fields.9.unwrap(),
+            subject_profile: self._fields.10,
+            subject_repo: self._fields.11,
+            uri: self._fields.12.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -530,19 +534,19 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> VerificationView<'a> {
         VerificationView {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            display_name: self.__unsafe_private_named.1.unwrap(),
-            handle: self.__unsafe_private_named.2.unwrap(),
-            issuer: self.__unsafe_private_named.3.unwrap(),
-            issuer_profile: self.__unsafe_private_named.4,
-            issuer_repo: self.__unsafe_private_named.5,
-            revoke_reason: self.__unsafe_private_named.6,
-            revoked_at: self.__unsafe_private_named.7,
-            revoked_by: self.__unsafe_private_named.8,
-            subject: self.__unsafe_private_named.9.unwrap(),
-            subject_profile: self.__unsafe_private_named.10,
-            subject_repo: self.__unsafe_private_named.11,
-            uri: self.__unsafe_private_named.12.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            display_name: self._fields.1.unwrap(),
+            handle: self._fields.2.unwrap(),
+            issuer: self._fields.3.unwrap(),
+            issuer_profile: self._fields.4,
+            issuer_repo: self._fields.5,
+            revoke_reason: self._fields.6,
+            revoked_at: self._fields.7,
+            revoked_by: self._fields.8,
+            subject: self._fields.9.unwrap(),
+            subject_profile: self._fields.10,
+            subject_repo: self._fields.11,
+            uri: self._fields.12.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs b/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs
index f3fb95ac..31f09c0a 100644
--- a/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs
+++ b/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -143,45 +146,45 @@ pub mod grant_error_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Subject;
         type Error;
+        type Subject;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Subject = Unset;
         type Error = Unset;
-    }
-    ///State transition - sets the `subject` field to Set
-    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSubject<S> {}
-    impl<S: State> State for SetSubject<S> {
-        type Subject = Set<members::subject>;
-        type Error = S::Error;
+        type Subject = Unset;
     }
     ///State transition - sets the `error` field to Set
     pub struct SetError<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetError<S> {}
     impl<S: State> State for SetError<S> {
-        type Subject = S::Subject;
         type Error = Set<members::error>;
+        type Subject = S::Subject;
+    }
+    ///State transition - sets the `subject` field to Set
+    pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSubject<S> {}
+    impl<S: State> State for SetSubject<S> {
+        type Error = S::Error;
+        type Subject = Set<members::subject>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `error` field
         pub struct error(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct GrantErrorBuilder<'a, S: grant_error_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GrantError<'a> {
@@ -195,9 +198,9 @@ impl<'a> GrantErrorBuilder<'a, grant_error_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GrantErrorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -212,11 +215,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> GrantErrorBuilder<'a, grant_error_state::SetError<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GrantErrorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -231,11 +234,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GrantErrorBuilder<'a, grant_error_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GrantErrorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -243,14 +246,14 @@ where
 impl<'a, S> GrantErrorBuilder<'a, S>
 where
     S: grant_error_state::State,
-    S::Subject: grant_error_state::IsSet,
     S::Error: grant_error_state::IsSet,
+    S::Subject: grant_error_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> GrantError<'a> {
         GrantError {
-            error: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            error: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -263,8 +266,8 @@ where
         >,
     ) -> GrantError<'a> {
         GrantError {
-            error: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            error: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -460,9 +463,9 @@ pub mod grant_verifications_state {
 
 /// Builder for constructing an instance of this type
 pub struct GrantVerificationsBuilder<'a, S: grant_verifications_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<grant_verifications::VerificationInput<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<grant_verifications::VerificationInput<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GrantVerifications<'a> {
@@ -476,9 +479,9 @@ impl<'a> GrantVerificationsBuilder<'a, grant_verifications_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GrantVerificationsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -493,11 +496,11 @@ where
         mut self,
         value: impl Into<Vec<grant_verifications::VerificationInput<'a>>>,
     ) -> GrantVerificationsBuilder<'a, grant_verifications_state::SetVerifications<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GrantVerificationsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -510,7 +513,7 @@ where
     /// Build the final struct
     pub fn build(self) -> GrantVerifications<'a> {
         GrantVerifications {
-            verifications: self.__unsafe_private_named.0.unwrap(),
+            verifications: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -523,7 +526,7 @@ where
         >,
     ) -> GrantVerifications<'a> {
         GrantVerifications {
-            verifications: self.__unsafe_private_named.0.unwrap(),
+            verifications: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -539,64 +542,59 @@ pub mod verification_input_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Handle;
-        type Subject;
         type DisplayName;
+        type Subject;
+        type Handle;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Handle = Unset;
-        type Subject = Unset;
         type DisplayName = Unset;
+        type Subject = Unset;
+        type Handle = Unset;
     }
-    ///State transition - sets the `handle` field to Set
-    pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetHandle<S> {}
-    impl<S: State> State for SetHandle<S> {
-        type Handle = Set<members::handle>;
+    ///State transition - sets the `display_name` field to Set
+    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
+    impl<S: State> State for SetDisplayName<S> {
+        type DisplayName = Set<members::display_name>;
         type Subject = S::Subject;
-        type DisplayName = S::DisplayName;
+        type Handle = S::Handle;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type Handle = S::Handle;
-        type Subject = Set<members::subject>;
         type DisplayName = S::DisplayName;
-    }
-    ///State transition - sets the `display_name` field to Set
-    pub struct SetDisplayName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDisplayName<S> {}
-    impl<S: State> State for SetDisplayName<S> {
+        type Subject = Set<members::subject>;
         type Handle = S::Handle;
+    }
+    ///State transition - sets the `handle` field to Set
+    pub struct SetHandle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetHandle<S> {}
+    impl<S: State> State for SetHandle<S> {
+        type DisplayName = S::DisplayName;
         type Subject = S::Subject;
-        type DisplayName = Set<members::display_name>;
+        type Handle = Set<members::handle>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `handle` field
-        pub struct handle(());
-        ///Marker type for the `subject` field
-        pub struct subject(());
         ///Marker type for the `display_name` field
         pub struct display_name(());
+        ///Marker type for the `subject` field
+        pub struct subject(());
+        ///Marker type for the `handle` field
+        pub struct handle(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct VerificationInputBuilder<'a, S: verification_input_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<CowStr<'a>>,
-        Option<Handle<'a>>,
-        Option<Did<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>, Option<Handle<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> VerificationInput<'a> {
@@ -610,9 +608,9 @@ impl<'a> VerificationInputBuilder<'a, verification_input_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         VerificationInputBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -620,12 +618,12 @@ impl<'a> VerificationInputBuilder<'a, verification_input_state::Empty> {
 impl<'a, S: verification_input_state::State> VerificationInputBuilder<'a, S> {
     /// Set the `createdAt` field (optional)
     pub fn created_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAt` field to an Option value (optional)
     pub fn maybe_created_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -640,11 +638,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> VerificationInputBuilder<'a, verification_input_state::SetDisplayName<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         VerificationInputBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -659,11 +657,11 @@ where
         mut self,
         value: impl Into<Handle<'a>>,
     ) -> VerificationInputBuilder<'a, verification_input_state::SetHandle<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         VerificationInputBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -678,11 +676,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> VerificationInputBuilder<'a, verification_input_state::SetSubject<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         VerificationInputBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -690,17 +688,17 @@ where
 impl<'a, S> VerificationInputBuilder<'a, S>
 where
     S: verification_input_state::State,
-    S::Handle: verification_input_state::IsSet,
-    S::Subject: verification_input_state::IsSet,
     S::DisplayName: verification_input_state::IsSet,
+    S::Subject: verification_input_state::IsSet,
+    S::Handle: verification_input_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> VerificationInput<'a> {
         VerificationInput {
-            created_at: self.__unsafe_private_named.0,
-            display_name: self.__unsafe_private_named.1.unwrap(),
-            handle: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0,
+            display_name: self._fields.1.unwrap(),
+            handle: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -713,10 +711,10 @@ where
         >,
     ) -> VerificationInput<'a> {
         VerificationInput {
-            created_at: self.__unsafe_private_named.0,
-            display_name: self.__unsafe_private_named.1.unwrap(),
-            handle: self.__unsafe_private_named.2.unwrap(),
-            subject: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0,
+            display_name: self._fields.1.unwrap(),
+            handle: self._fields.2.unwrap(),
+            subject: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_ozone/verification/list_verifications.rs b/crates/jacquard-api/src/tools_ozone/verification/list_verifications.rs
index b6b5044a..5619b4b1 100644
--- a/crates/jacquard-api/src/tools_ozone/verification/list_verifications.rs
+++ b/crates/jacquard-api/src/tools_ozone/verification/list_verifications.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Datetime};
@@ -107,8 +110,8 @@ pub mod list_verifications_state {
 
 /// Builder for constructing an instance of this type
 pub struct ListVerificationsBuilder<'a, S: list_verifications_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -118,7 +121,7 @@ pub struct ListVerificationsBuilder<'a, S: list_verifications_state::State> {
         Option<CowStr<'a>>,
         Option<Vec<Did<'a>>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ListVerifications<'a> {
@@ -132,9 +135,9 @@ impl<'a> ListVerificationsBuilder<'a, list_verifications_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ListVerificationsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -142,12 +145,12 @@ impl<'a> ListVerificationsBuilder<'a, list_verifications_state::Empty> {
 impl<'a, S: list_verifications_state::State> ListVerificationsBuilder<'a, S> {
     /// Set the `createdAfter` field (optional)
     pub fn created_after(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `createdAfter` field to an Option value (optional)
     pub fn maybe_created_after(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -155,12 +158,12 @@ impl<'a, S: list_verifications_state::State> ListVerificationsBuilder<'a, S> {
 impl<'a, S: list_verifications_state::State> ListVerificationsBuilder<'a, S> {
     /// Set the `createdBefore` field (optional)
     pub fn created_before(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `createdBefore` field to an Option value (optional)
     pub fn maybe_created_before(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -168,12 +171,12 @@ impl<'a, S: list_verifications_state::State> ListVerificationsBuilder<'a, S> {
 impl<'a, S: list_verifications_state::State> ListVerificationsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -181,12 +184,12 @@ impl<'a, S: list_verifications_state::State> ListVerificationsBuilder<'a, S> {
 impl<'a, S: list_verifications_state::State> ListVerificationsBuilder<'a, S> {
     /// Set the `isRevoked` field (optional)
     pub fn is_revoked(mut self, value: impl Into<Option<bool>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `isRevoked` field to an Option value (optional)
     pub fn maybe_is_revoked(mut self, value: Option<bool>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -194,12 +197,12 @@ impl<'a, S: list_verifications_state::State> ListVerificationsBuilder<'a, S> {
 impl<'a, S: list_verifications_state::State> ListVerificationsBuilder<'a, S> {
     /// Set the `issuers` field (optional)
     pub fn issuers(mut self, value: impl Into<Option<Vec<Did<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `issuers` field to an Option value (optional)
     pub fn maybe_issuers(mut self, value: Option<Vec<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -207,12 +210,12 @@ impl<'a, S: list_verifications_state::State> ListVerificationsBuilder<'a, S> {
 impl<'a, S: list_verifications_state::State> ListVerificationsBuilder<'a, S> {
     /// Set the `limit` field (optional)
     pub fn limit(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `limit` field to an Option value (optional)
     pub fn maybe_limit(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -220,12 +223,12 @@ impl<'a, S: list_verifications_state::State> ListVerificationsBuilder<'a, S> {
 impl<'a, S: list_verifications_state::State> ListVerificationsBuilder<'a, S> {
     /// Set the `sortDirection` field (optional)
     pub fn sort_direction(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `sortDirection` field to an Option value (optional)
     pub fn maybe_sort_direction(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -233,12 +236,12 @@ impl<'a, S: list_verifications_state::State> ListVerificationsBuilder<'a, S> {
 impl<'a, S: list_verifications_state::State> ListVerificationsBuilder<'a, S> {
     /// Set the `subjects` field (optional)
     pub fn subjects(mut self, value: impl Into<Option<Vec<Did<'a>>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `subjects` field to an Option value (optional)
     pub fn maybe_subjects(mut self, value: Option<Vec<Did<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -250,14 +253,14 @@ where
     /// Build the final struct
     pub fn build(self) -> ListVerifications<'a> {
         ListVerifications {
-            created_after: self.__unsafe_private_named.0,
-            created_before: self.__unsafe_private_named.1,
-            cursor: self.__unsafe_private_named.2,
-            is_revoked: self.__unsafe_private_named.3,
-            issuers: self.__unsafe_private_named.4,
-            limit: self.__unsafe_private_named.5,
-            sort_direction: self.__unsafe_private_named.6,
-            subjects: self.__unsafe_private_named.7,
+            created_after: self._fields.0,
+            created_before: self._fields.1,
+            cursor: self._fields.2,
+            is_revoked: self._fields.3,
+            issuers: self._fields.4,
+            limit: self._fields.5,
+            sort_direction: self._fields.6,
+            subjects: self._fields.7,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs b/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs
index 489a3a26..23de72d2 100644
--- a/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs
+++ b/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -138,9 +141,9 @@ pub mod revoke_verifications_state {
 
 /// Builder for constructing an instance of this type
 pub struct RevokeVerificationsBuilder<'a, S: revoke_verifications_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Vec<AtUri<'a>>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Vec<AtUri<'a>>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RevokeVerifications<'a> {
@@ -154,9 +157,9 @@ impl<'a> RevokeVerificationsBuilder<'a, revoke_verifications_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RevokeVerificationsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,12 +167,12 @@ impl<'a> RevokeVerificationsBuilder<'a, revoke_verifications_state::Empty> {
 impl<'a, S: revoke_verifications_state::State> RevokeVerificationsBuilder<'a, S> {
     /// Set the `revokeReason` field (optional)
     pub fn revoke_reason(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `revokeReason` field to an Option value (optional)
     pub fn maybe_revoke_reason(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -184,11 +187,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> RevokeVerificationsBuilder<'a, revoke_verifications_state::SetUris<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RevokeVerificationsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -201,8 +204,8 @@ where
     /// Build the final struct
     pub fn build(self) -> RevokeVerifications<'a> {
         RevokeVerifications {
-            revoke_reason: self.__unsafe_private_named.0,
-            uris: self.__unsafe_private_named.1.unwrap(),
+            revoke_reason: self._fields.0,
+            uris: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -215,8 +218,8 @@ where
         >,
     ) -> RevokeVerifications<'a> {
         RevokeVerifications {
-            revoke_reason: self.__unsafe_private_named.0,
-            uris: self.__unsafe_private_named.1.unwrap(),
+            revoke_reason: self._fields.0,
+            uris: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -232,45 +235,45 @@ pub mod revoke_error_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type Error;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type Error = Unset;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Error = S::Error;
+        type Uri = Unset;
     }
     ///State transition - sets the `error` field to Set
     pub struct SetError<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetError<S> {}
     impl<S: State> State for SetError<S> {
-        type Uri = S::Uri;
         type Error = Set<members::error>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Error = S::Error;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `error` field
         pub struct error(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RevokeErrorBuilder<'a, S: revoke_error_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RevokeError<'a> {
@@ -284,9 +287,9 @@ impl<'a> RevokeErrorBuilder<'a, revoke_error_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RevokeErrorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -301,11 +304,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> RevokeErrorBuilder<'a, revoke_error_state::SetError<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RevokeErrorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -320,11 +323,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RevokeErrorBuilder<'a, revoke_error_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RevokeErrorBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -332,14 +335,14 @@ where
 impl<'a, S> RevokeErrorBuilder<'a, S>
 where
     S: revoke_error_state::State,
-    S::Uri: revoke_error_state::IsSet,
     S::Error: revoke_error_state::IsSet,
+    S::Uri: revoke_error_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RevokeError<'a> {
         RevokeError {
-            error: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            error: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -352,8 +355,8 @@ where
         >,
     ) -> RevokeError<'a> {
         RevokeError {
-            error: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            error: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/tools_smokesignal/blahg/content/post.rs b/crates/jacquard-api/src/tools_smokesignal/blahg/content/post.rs
index 89e78a17..4cac9812 100644
--- a/crates/jacquard-api/src/tools_smokesignal/blahg/content/post.rs
+++ b/crates/jacquard-api/src/tools_smokesignal/blahg/content/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -287,9 +290,9 @@ pub mod attachment_state {
 
 /// Builder for constructing an instance of this type
 pub struct AttachmentBuilder<'a, S: attachment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<BlobRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<BlobRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Attachment<'a> {
@@ -303,9 +306,9 @@ impl<'a> AttachmentBuilder<'a, attachment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AttachmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -313,12 +316,12 @@ impl<'a> AttachmentBuilder<'a, attachment_state::Empty> {
 impl<'a, S: attachment_state::State> AttachmentBuilder<'a, S> {
     /// Set the `alt` field (optional)
     pub fn alt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `alt` field to an Option value (optional)
     pub fn maybe_alt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -333,11 +336,11 @@ where
         mut self,
         value: impl Into<BlobRef<'a>>,
     ) -> AttachmentBuilder<'a, attachment_state::SetContent<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AttachmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -350,8 +353,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Attachment<'a> {
         Attachment {
-            alt: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
+            alt: self._fields.0,
+            content: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -364,8 +367,8 @@ where
         >,
     ) -> Attachment<'a> {
         Attachment {
-            alt: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1.unwrap(),
+            alt: self._fields.0,
+            content: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -496,15 +499,15 @@ pub mod post_state {
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Vec<post::Attachment<'a>>>,
         Option<BlobRef<'a>>,
         Option<Vec<Language>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -518,9 +521,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -531,7 +534,7 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
         mut self,
         value: impl Into<Option<Vec<post::Attachment<'a>>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `attachments` field to an Option value (optional)
@@ -539,7 +542,7 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
         mut self,
         value: Option<Vec<post::Attachment<'a>>>,
     ) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -547,12 +550,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `content` field (optional)
     pub fn content(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `content` field to an Option value (optional)
     pub fn maybe_content(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -560,12 +563,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `langs` field (optional)
     pub fn langs(mut self, value: impl Into<Option<Vec<Language>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `langs` field to an Option value (optional)
     pub fn maybe_langs(mut self, value: Option<Vec<Language>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -573,12 +576,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `publishedAt` field (optional)
     pub fn published_at(mut self, value: impl Into<Option<Datetime>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `publishedAt` field to an Option value (optional)
     pub fn maybe_published_at(mut self, value: Option<Datetime>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -586,12 +589,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `title` field (optional)
     pub fn title(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `title` field to an Option value (optional)
     pub fn maybe_title(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -603,11 +606,11 @@ where
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            attachments: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1,
-            langs: self.__unsafe_private_named.2,
-            published_at: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4,
+            attachments: self._fields.0,
+            content: self._fields.1,
+            langs: self._fields.2,
+            published_at: self._fields.3,
+            title: self._fields.4,
             extra_data: Default::default(),
         }
     }
@@ -620,11 +623,11 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            attachments: self.__unsafe_private_named.0,
-            content: self.__unsafe_private_named.1,
-            langs: self.__unsafe_private_named.2,
-            published_at: self.__unsafe_private_named.3,
-            title: self.__unsafe_private_named.4,
+            attachments: self._fields.0,
+            content: self._fields.1,
+            langs: self._fields.2,
+            published_at: self._fields.3,
+            title: self._fields.4,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/top_launchpadx/agent/ack.rs b/crates/jacquard-api/src/top_launchpadx/agent/ack.rs
index 7987bcbe..8b9bc1db 100644
--- a/crates/jacquard-api/src/top_launchpadx/agent/ack.rs
+++ b/crates/jacquard-api/src/top_launchpadx/agent/ack.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -118,50 +121,50 @@ pub mod ack_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type WorkType;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type WorkType = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type WorkType = S::WorkType;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `work_type` field to Set
     pub struct SetWorkType<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetWorkType<S> {}
     impl<S: State> State for SetWorkType<S> {
-        type CreatedAt = S::CreatedAt;
         type WorkType = Set<members::work_type>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type WorkType = S::WorkType;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `work_type` field
         pub struct work_type(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct AckBuilder<'a, S: ack_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Ack<'a> {
@@ -175,9 +178,9 @@ impl<'a> AckBuilder<'a, ack_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AckBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -192,11 +195,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AckBuilder<'a, ack_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AckBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,12 +207,12 @@ where
 impl<'a, S: ack_state::State> AckBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -217,12 +220,12 @@ impl<'a, S: ack_state::State> AckBuilder<'a, S> {
 impl<'a, S: ack_state::State> AckBuilder<'a, S> {
     /// Set the `subjectUri` field (optional)
     pub fn subject_uri(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `subjectUri` field to an Option value (optional)
     pub fn maybe_subject_uri(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -237,11 +240,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> AckBuilder<'a, ack_state::SetWorkType<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         AckBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,16 +252,16 @@ where
 impl<'a, S> AckBuilder<'a, S>
 where
     S: ack_state::State,
-    S::CreatedAt: ack_state::IsSet,
     S::WorkType: ack_state::IsSet,
+    S::CreatedAt: ack_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Ack<'a> {
         Ack {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            note: self.__unsafe_private_named.1,
-            subject_uri: self.__unsafe_private_named.2,
-            work_type: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            note: self._fields.1,
+            subject_uri: self._fields.2,
+            work_type: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -271,10 +274,10 @@ where
         >,
     ) -> Ack<'a> {
         Ack {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            note: self.__unsafe_private_named.1,
-            subject_uri: self.__unsafe_private_named.2,
-            work_type: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            note: self._fields.1,
+            subject_uri: self._fields.2,
+            work_type: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/top_launchpadx/agent/journal.rs b/crates/jacquard-api/src/top_launchpadx/agent/journal.rs
index 5496bacd..ce1c213b 100644
--- a/crates/jacquard-api/src/top_launchpadx/agent/journal.rs
+++ b/crates/jacquard-api/src/top_launchpadx/agent/journal.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -135,9 +138,9 @@ pub mod journal_state {
 
 /// Builder for constructing an instance of this type
 pub struct JournalBuilder<'a, S: journal_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Journal<'a> {
@@ -151,9 +154,9 @@ impl<'a> JournalBuilder<'a, journal_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         JournalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -168,11 +171,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> JournalBuilder<'a, journal_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         JournalBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -180,12 +183,12 @@ where
 impl<'a, S: journal_state::State> JournalBuilder<'a, S> {
     /// Set the `journal` field (optional)
     pub fn journal(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `journal` field to an Option value (optional)
     pub fn maybe_journal(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -198,8 +201,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Journal<'a> {
         Journal {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            journal: self.__unsafe_private_named.1,
+            created_at: self._fields.0.unwrap(),
+            journal: self._fields.1,
             extra_data: Default::default(),
         }
     }
@@ -212,8 +215,8 @@ where
         >,
     ) -> Journal<'a> {
         Journal {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            journal: self.__unsafe_private_named.1,
+            created_at: self._fields.0.unwrap(),
+            journal: self._fields.1,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/top_launchpadx/agent/thought.rs b/crates/jacquard-api/src/top_launchpadx/agent/thought.rs
index 741383e2..d87a1956 100644
--- a/crates/jacquard-api/src/top_launchpadx/agent/thought.rs
+++ b/crates/jacquard-api/src/top_launchpadx/agent/thought.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -154,14 +157,14 @@ pub mod thought_state {
 
 /// Builder for constructing an instance of this type
 pub struct ThoughtBuilder<'a, S: thought_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Thought<'a> {
@@ -175,9 +178,9 @@ impl<'a> ThoughtBuilder<'a, thought_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ThoughtBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -192,11 +195,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ThoughtBuilder<'a, thought_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ThoughtBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,12 +207,12 @@ where
 impl<'a, S: thought_state::State> ThoughtBuilder<'a, S> {
     /// Set the `note` field (optional)
     pub fn note(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `note` field to an Option value (optional)
     pub fn maybe_note(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -217,12 +220,12 @@ impl<'a, S: thought_state::State> ThoughtBuilder<'a, S> {
 impl<'a, S: thought_state::State> ThoughtBuilder<'a, S> {
     /// Set the `subjectUri` field (optional)
     pub fn subject_uri(mut self, value: impl Into<Option<UriValue<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `subjectUri` field to an Option value (optional)
     pub fn maybe_subject_uri(mut self, value: Option<UriValue<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -237,11 +240,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ThoughtBuilder<'a, thought_state::SetWorkType<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ThoughtBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -255,10 +258,10 @@ where
     /// Build the final struct
     pub fn build(self) -> Thought<'a> {
         Thought {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            note: self.__unsafe_private_named.1,
-            subject_uri: self.__unsafe_private_named.2,
-            work_type: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            note: self._fields.1,
+            subject_uri: self._fields.2,
+            work_type: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -271,10 +274,10 @@ where
         >,
     ) -> Thought<'a> {
         Thought {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            note: self.__unsafe_private_named.1,
-            subject_uri: self.__unsafe_private_named.2,
-            work_type: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            note: self._fields.1,
+            subject_uri: self._fields.2,
+            work_type: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/uk_ewancroft/kofi/supporter.rs b/crates/jacquard-api/src/uk_ewancroft/kofi/supporter.rs
index c7ac6b32..559aedba 100644
--- a/crates/jacquard-api/src/uk_ewancroft/kofi/supporter.rs
+++ b/crates/jacquard-api/src/uk_ewancroft/kofi/supporter.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -115,45 +118,45 @@ pub mod supporter_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Type;
         type Name;
+        type Type;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Type = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `type` field to Set
-    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetType<S> {}
-    impl<S: State> State for SetType<S> {
-        type Type = Set<members::r#type>;
-        type Name = S::Name;
+        type Type = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
-        type Type = S::Type;
         type Name = Set<members::name>;
+        type Type = S::Type;
+    }
+    ///State transition - sets the `type` field to Set
+    pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetType<S> {}
+    impl<S: State> State for SetType<S> {
+        type Name = S::Name;
+        type Type = Set<members::r#type>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `type` field
-        pub struct r#type(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `type` field
+        pub struct r#type(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct SupporterBuilder<'a, S: supporter_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<CowStr<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Supporter<'a> {
@@ -167,9 +170,9 @@ impl<'a> SupporterBuilder<'a, supporter_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SupporterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -184,11 +187,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SupporterBuilder<'a, supporter_state::SetName<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SupporterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,12 +199,12 @@ where
 impl<'a, S: supporter_state::State> SupporterBuilder<'a, S> {
     /// Set the `tier` field (optional)
     pub fn tier(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `tier` field to an Option value (optional)
     pub fn maybe_tier(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -216,11 +219,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> SupporterBuilder<'a, supporter_state::SetType<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SupporterBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -228,15 +231,15 @@ where
 impl<'a, S> SupporterBuilder<'a, S>
 where
     S: supporter_state::State,
-    S::Type: supporter_state::IsSet,
     S::Name: supporter_state::IsSet,
+    S::Type: supporter_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Supporter<'a> {
         Supporter {
-            name: self.__unsafe_private_named.0.unwrap(),
-            tier: self.__unsafe_private_named.1,
-            r#type: self.__unsafe_private_named.2.unwrap(),
+            name: self._fields.0.unwrap(),
+            tier: self._fields.1,
+            r#type: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -249,9 +252,9 @@ where
         >,
     ) -> Supporter<'a> {
         Supporter {
-            name: self.__unsafe_private_named.0.unwrap(),
-            tier: self.__unsafe_private_named.1,
-            r#type: self.__unsafe_private_named.2.unwrap(),
+            name: self._fields.0.unwrap(),
+            tier: self._fields.1,
+            r#type: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/uk_ewancroft/now.rs b/crates/jacquard-api/src/uk_ewancroft/now.rs
index 0eb31737..0e0fc621 100644
--- a/crates/jacquard-api/src/uk_ewancroft/now.rs
+++ b/crates/jacquard-api/src/uk_ewancroft/now.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -167,9 +170,9 @@ pub mod now_state {
 
 /// Builder for constructing an instance of this type
 pub struct NowBuilder<'a, S: now_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Now<'a> {
@@ -183,9 +186,9 @@ impl<'a> NowBuilder<'a, now_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         NowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,11 +203,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> NowBuilder<'a, now_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         NowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -219,11 +222,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> NowBuilder<'a, now_state::SetText<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         NowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -237,8 +240,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Now<'a> {
         Now {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            text: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            text: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -251,8 +254,8 @@ where
         >,
     ) -> Now<'a> {
         Now {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            text: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            text: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/uk_skyblur/post.rs b/crates/jacquard-api/src/uk_skyblur/post.rs
index 1ac8cbcb..98337c10 100644
--- a/crates/jacquard-api/src/uk_skyblur/post.rs
+++ b/crates/jacquard-api/src/uk_skyblur/post.rs
@@ -11,7 +11,11 @@ pub mod encrypt;
 pub mod get_post;
 pub mod store;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -200,74 +204,74 @@ pub mod post_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Text;
-        type Uri;
         type Visibility;
         type CreatedAt;
+        type Text;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Text = Unset;
-        type Uri = Unset;
         type Visibility = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `text` field to Set
-    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetText<S> {}
-    impl<S: State> State for SetText<S> {
-        type Text = Set<members::text>;
-        type Uri = S::Uri;
-        type Visibility = S::Visibility;
-        type CreatedAt = S::CreatedAt;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Text = S::Text;
-        type Uri = Set<members::uri>;
-        type Visibility = S::Visibility;
-        type CreatedAt = S::CreatedAt;
+        type Text = Unset;
+        type Uri = Unset;
     }
     ///State transition - sets the `visibility` field to Set
     pub struct SetVisibility<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetVisibility<S> {}
     impl<S: State> State for SetVisibility<S> {
-        type Text = S::Text;
-        type Uri = S::Uri;
         type Visibility = Set<members::visibility>;
         type CreatedAt = S::CreatedAt;
+        type Text = S::Text;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
+        type Visibility = S::Visibility;
+        type CreatedAt = Set<members::created_at>;
         type Text = S::Text;
         type Uri = S::Uri;
+    }
+    ///State transition - sets the `text` field to Set
+    pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetText<S> {}
+    impl<S: State> State for SetText<S> {
         type Visibility = S::Visibility;
-        type CreatedAt = Set<members::created_at>;
+        type CreatedAt = S::CreatedAt;
+        type Text = Set<members::text>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Visibility = S::Visibility;
+        type CreatedAt = S::CreatedAt;
+        type Text = S::Text;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `text` field
-        pub struct text(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `visibility` field
         pub struct visibility(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `text` field
+        pub struct text(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<BlobRef<'a>>,
@@ -275,7 +279,7 @@ pub struct PostBuilder<'a, S: post_state::State> {
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -289,9 +293,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -299,12 +303,12 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `additional` field (optional)
     pub fn additional(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `additional` field to an Option value (optional)
     pub fn maybe_additional(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -319,11 +323,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -331,12 +335,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `encryptBody` field (optional)
     pub fn encrypt_body(mut self, value: impl Into<Option<BlobRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `encryptBody` field to an Option value (optional)
     pub fn maybe_encrypt_body(mut self, value: Option<BlobRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -351,11 +355,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetText<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -370,11 +374,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> PostBuilder<'a, post_state::SetUri<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -389,11 +393,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetVisibility<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -401,20 +405,20 @@ where
 impl<'a, S> PostBuilder<'a, S>
 where
     S: post_state::State,
-    S::Text: post_state::IsSet,
-    S::Uri: post_state::IsSet,
     S::Visibility: post_state::IsSet,
     S::CreatedAt: post_state::IsSet,
+    S::Text: post_state::IsSet,
+    S::Uri: post_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            additional: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            encrypt_body: self.__unsafe_private_named.2,
-            text: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
-            visibility: self.__unsafe_private_named.5.unwrap(),
+            additional: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            encrypt_body: self._fields.2,
+            text: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
+            visibility: self._fields.5.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -427,12 +431,12 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            additional: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            encrypt_body: self.__unsafe_private_named.2,
-            text: self.__unsafe_private_named.3.unwrap(),
-            uri: self.__unsafe_private_named.4.unwrap(),
-            visibility: self.__unsafe_private_named.5.unwrap(),
+            additional: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            encrypt_body: self._fields.2,
+            text: self._fields.3.unwrap(),
+            uri: self._fields.4.unwrap(),
+            visibility: self._fields.5.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/uk_skyblur/post/decrypt_by_cid.rs b/crates/jacquard-api/src/uk_skyblur/post/decrypt_by_cid.rs
index e7639b20..e1852828 100644
--- a/crates/jacquard-api/src/uk_skyblur/post/decrypt_by_cid.rs
+++ b/crates/jacquard-api/src/uk_skyblur/post/decrypt_by_cid.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{Did, Cid, UriValue};
@@ -80,80 +83,80 @@ pub mod decrypt_by_cid_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Repo;
         type Cid;
-        type Password;
+        type Repo;
         type Pds;
+        type Password;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Repo = Unset;
         type Cid = Unset;
-        type Password = Unset;
+        type Repo = Unset;
         type Pds = Unset;
-    }
-    ///State transition - sets the `repo` field to Set
-    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRepo<S> {}
-    impl<S: State> State for SetRepo<S> {
-        type Repo = Set<members::repo>;
-        type Cid = S::Cid;
-        type Password = S::Password;
-        type Pds = S::Pds;
+        type Password = Unset;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
-        type Repo = S::Repo;
         type Cid = Set<members::cid>;
-        type Password = S::Password;
+        type Repo = S::Repo;
         type Pds = S::Pds;
+        type Password = S::Password;
     }
-    ///State transition - sets the `password` field to Set
-    pub struct SetPassword<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetPassword<S> {}
-    impl<S: State> State for SetPassword<S> {
-        type Repo = S::Repo;
+    ///State transition - sets the `repo` field to Set
+    pub struct SetRepo<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRepo<S> {}
+    impl<S: State> State for SetRepo<S> {
         type Cid = S::Cid;
-        type Password = Set<members::password>;
+        type Repo = Set<members::repo>;
         type Pds = S::Pds;
+        type Password = S::Password;
     }
     ///State transition - sets the `pds` field to Set
     pub struct SetPds<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPds<S> {}
     impl<S: State> State for SetPds<S> {
-        type Repo = S::Repo;
         type Cid = S::Cid;
-        type Password = S::Password;
+        type Repo = S::Repo;
         type Pds = Set<members::pds>;
+        type Password = S::Password;
+    }
+    ///State transition - sets the `password` field to Set
+    pub struct SetPassword<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetPassword<S> {}
+    impl<S: State> State for SetPassword<S> {
+        type Cid = S::Cid;
+        type Repo = S::Repo;
+        type Pds = S::Pds;
+        type Password = Set<members::password>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `repo` field
-        pub struct repo(());
         ///Marker type for the `cid` field
         pub struct cid(());
-        ///Marker type for the `password` field
-        pub struct password(());
+        ///Marker type for the `repo` field
+        pub struct repo(());
         ///Marker type for the `pds` field
         pub struct pds(());
+        ///Marker type for the `password` field
+        pub struct password(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DecryptByCidBuilder<'a, S: decrypt_by_cid_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Cid<'a>>,
         Option<CowStr<'a>>,
         Option<UriValue<'a>>,
         Option<Did<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DecryptByCid<'a> {
@@ -167,9 +170,9 @@ impl<'a> DecryptByCidBuilder<'a, decrypt_by_cid_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DecryptByCidBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -184,11 +187,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> DecryptByCidBuilder<'a, decrypt_by_cid_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DecryptByCidBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -203,11 +206,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DecryptByCidBuilder<'a, decrypt_by_cid_state::SetPassword<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DecryptByCidBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -222,11 +225,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> DecryptByCidBuilder<'a, decrypt_by_cid_state::SetPds<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         DecryptByCidBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -241,11 +244,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> DecryptByCidBuilder<'a, decrypt_by_cid_state::SetRepo<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         DecryptByCidBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -253,18 +256,18 @@ where
 impl<'a, S> DecryptByCidBuilder<'a, S>
 where
     S: decrypt_by_cid_state::State,
-    S::Repo: decrypt_by_cid_state::IsSet,
     S::Cid: decrypt_by_cid_state::IsSet,
-    S::Password: decrypt_by_cid_state::IsSet,
+    S::Repo: decrypt_by_cid_state::IsSet,
     S::Pds: decrypt_by_cid_state::IsSet,
+    S::Password: decrypt_by_cid_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DecryptByCid<'a> {
         DecryptByCid {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            password: self.__unsafe_private_named.1.unwrap(),
-            pds: self.__unsafe_private_named.2.unwrap(),
-            repo: self.__unsafe_private_named.3.unwrap(),
+            cid: self._fields.0.unwrap(),
+            password: self._fields.1.unwrap(),
+            pds: self._fields.2.unwrap(),
+            repo: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -277,10 +280,10 @@ where
         >,
     ) -> DecryptByCid<'a> {
         DecryptByCid {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            password: self.__unsafe_private_named.1.unwrap(),
-            pds: self.__unsafe_private_named.2.unwrap(),
-            repo: self.__unsafe_private_named.3.unwrap(),
+            cid: self._fields.0.unwrap(),
+            password: self._fields.1.unwrap(),
+            pds: self._fields.2.unwrap(),
+            repo: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/uk_skyblur/post/delete_stored.rs b/crates/jacquard-api/src/uk_skyblur/post/delete_stored.rs
index a6083839..674f75aa 100644
--- a/crates/jacquard-api/src/uk_skyblur/post/delete_stored.rs
+++ b/crates/jacquard-api/src/uk_skyblur/post/delete_stored.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/uk_skyblur/post/encrypt.rs b/crates/jacquard-api/src/uk_skyblur/post/encrypt.rs
index 41f9bb19..c9b41267 100644
--- a/crates/jacquard-api/src/uk_skyblur/post/encrypt.rs
+++ b/crates/jacquard-api/src/uk_skyblur/post/encrypt.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_derive::{IntoStatic, lexicon};
diff --git a/crates/jacquard-api/src/uk_skyblur/post/get_post.rs b/crates/jacquard-api/src/uk_skyblur/post/get_post.rs
index a90a1a40..4ef9e703 100644
--- a/crates/jacquard-api/src/uk_skyblur/post/get_post.rs
+++ b/crates/jacquard-api/src/uk_skyblur/post/get_post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{AtUri, Datetime};
@@ -118,9 +121,9 @@ pub mod get_post_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetPostBuilder<'a, S: get_post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetPost<'a> {
@@ -134,9 +137,9 @@ impl<'a> GetPostBuilder<'a, get_post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -144,12 +147,12 @@ impl<'a> GetPostBuilder<'a, get_post_state::Empty> {
 impl<'a, S: get_post_state::State> GetPostBuilder<'a, S> {
     /// Set the `password` field (optional)
     pub fn password(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `password` field to an Option value (optional)
     pub fn maybe_password(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -164,11 +167,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> GetPostBuilder<'a, get_post_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         GetPostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,8 +184,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetPost<'a> {
         GetPost {
-            password: self.__unsafe_private_named.0,
-            uri: self.__unsafe_private_named.1.unwrap(),
+            password: self._fields.0,
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -195,8 +198,8 @@ where
         >,
     ) -> GetPost<'a> {
         GetPost {
-            password: self.__unsafe_private_named.0,
-            uri: self.__unsafe_private_named.1.unwrap(),
+            password: self._fields.0,
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/uk_skyblur/post/store.rs b/crates/jacquard-api/src/uk_skyblur/post/store.rs
index 92b7a9e2..f930c889 100644
--- a/crates/jacquard-api/src/uk_skyblur/post/store.rs
+++ b/crates/jacquard-api/src/uk_skyblur/post/store.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::AtUri;
@@ -77,49 +80,49 @@ pub mod store_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type Text;
+        type Uri;
         type Visibility;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type Text = Unset;
+        type Uri = Unset;
         type Visibility = Unset;
     }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Uri = Set<members::uri>;
-        type Text = S::Text;
-        type Visibility = S::Visibility;
-    }
     ///State transition - sets the `text` field to Set
     pub struct SetText<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetText<S> {}
     impl<S: State> State for SetText<S> {
-        type Uri = S::Uri;
         type Text = Set<members::text>;
+        type Uri = S::Uri;
+        type Visibility = S::Visibility;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Text = S::Text;
+        type Uri = Set<members::uri>;
         type Visibility = S::Visibility;
     }
     ///State transition - sets the `visibility` field to Set
     pub struct SetVisibility<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetVisibility<S> {}
     impl<S: State> State for SetVisibility<S> {
-        type Uri = S::Uri;
         type Text = S::Text;
+        type Uri = S::Uri;
         type Visibility = Set<members::visibility>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `text` field
         pub struct text(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
         ///Marker type for the `visibility` field
         pub struct visibility(());
     }
@@ -127,14 +130,14 @@ pub mod store_state {
 
 /// Builder for constructing an instance of this type
 pub struct StoreBuilder<'a, S: store_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<AtUri<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Store<'a> {
@@ -148,9 +151,9 @@ impl<'a> StoreBuilder<'a, store_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -158,12 +161,12 @@ impl<'a> StoreBuilder<'a, store_state::Empty> {
 impl<'a, S: store_state::State> StoreBuilder<'a, S> {
     /// Set the `additional` field (optional)
     pub fn additional(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `additional` field to an Option value (optional)
     pub fn maybe_additional(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -178,11 +181,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> StoreBuilder<'a, store_state::SetText<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         StoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,11 +200,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> StoreBuilder<'a, store_state::SetUri<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         StoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,11 +219,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> StoreBuilder<'a, store_state::SetVisibility<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         StoreBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -228,17 +231,17 @@ where
 impl<'a, S> StoreBuilder<'a, S>
 where
     S: store_state::State,
-    S::Uri: store_state::IsSet,
     S::Text: store_state::IsSet,
+    S::Uri: store_state::IsSet,
     S::Visibility: store_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Store<'a> {
         Store {
-            additional: self.__unsafe_private_named.0,
-            text: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
-            visibility: self.__unsafe_private_named.3.unwrap(),
+            additional: self._fields.0,
+            text: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
+            visibility: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -251,10 +254,10 @@ where
         >,
     ) -> Store<'a> {
         Store {
-            additional: self.__unsafe_private_named.0,
-            text: self.__unsafe_private_named.1.unwrap(),
-            uri: self.__unsafe_private_named.2.unwrap(),
-            visibility: self.__unsafe_private_named.3.unwrap(),
+            additional: self._fields.0,
+            text: self._fields.1.unwrap(),
+            uri: self._fields.2.unwrap(),
+            visibility: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/uk_skyblur/preference.rs b/crates/jacquard-api/src/uk_skyblur/preference.rs
index 188d4b38..02945e1d 100644
--- a/crates/jacquard-api/src/uk_skyblur/preference.rs
+++ b/crates/jacquard-api/src/uk_skyblur/preference.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -182,9 +185,9 @@ pub mod preference_state {
 
 /// Builder for constructing an instance of this type
 pub struct PreferenceBuilder<'a, S: preference_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<preference::MyPage<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<preference::MyPage<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Preference<'a> {
@@ -198,9 +201,9 @@ impl<'a> PreferenceBuilder<'a, preference_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PreferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -215,11 +218,11 @@ where
         mut self,
         value: impl Into<preference::MyPage<'a>>,
     ) -> PreferenceBuilder<'a, preference_state::SetMyPage<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PreferenceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -232,7 +235,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Preference<'a> {
         Preference {
-            my_page: self.__unsafe_private_named.0.unwrap(),
+            my_page: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -245,7 +248,7 @@ where
         >,
     ) -> Preference<'a> {
         Preference {
-            my_page: self.__unsafe_private_named.0.unwrap(),
+            my_page: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -360,9 +363,9 @@ pub mod my_page_state {
 
 /// Builder for constructing an instance of this type
 pub struct MyPageBuilder<'a, S: my_page_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<bool>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<bool>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> MyPage<'a> {
@@ -376,9 +379,9 @@ impl<'a> MyPageBuilder<'a, my_page_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MyPageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -386,12 +389,12 @@ impl<'a> MyPageBuilder<'a, my_page_state::Empty> {
 impl<'a, S: my_page_state::State> MyPageBuilder<'a, S> {
     /// Set the `description` field (optional)
     pub fn description(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `description` field to an Option value (optional)
     pub fn maybe_description(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -406,11 +409,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> MyPageBuilder<'a, my_page_state::SetIsUseMyPage<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MyPageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -423,8 +426,8 @@ where
     /// Build the final struct
     pub fn build(self) -> MyPage<'a> {
         MyPage {
-            description: self.__unsafe_private_named.0,
-            is_use_my_page: self.__unsafe_private_named.1.unwrap(),
+            description: self._fields.0,
+            is_use_my_page: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -437,8 +440,8 @@ where
         >,
     ) -> MyPage<'a> {
         MyPage {
-            description: self.__unsafe_private_named.0,
-            is_use_my_page: self.__unsafe_private_named.1.unwrap(),
+            description: self._fields.0,
+            is_use_my_page: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/us_polhem/blog.rs b/crates/jacquard-api/src/us_polhem/blog.rs
index a47a8b8f..9bd8c0f1 100644
--- a/crates/jacquard-api/src/us_polhem/blog.rs
+++ b/crates/jacquard-api/src/us_polhem/blog.rs
@@ -9,7 +9,11 @@ pub mod content;
 pub mod post;
 pub mod tag;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -112,9 +116,9 @@ pub mod aspect_ratio_state {
 
 /// Builder for constructing an instance of this type
 pub struct AspectRatioBuilder<'a, S: aspect_ratio_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<i64>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<i64>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> AspectRatio<'a> {
@@ -128,9 +132,9 @@ impl<'a> AspectRatioBuilder<'a, aspect_ratio_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -145,11 +149,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetHeight<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -164,11 +168,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> AspectRatioBuilder<'a, aspect_ratio_state::SetWidth<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AspectRatioBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -182,8 +186,8 @@ where
     /// Build the final struct
     pub fn build(self) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -196,8 +200,8 @@ where
         >,
     ) -> AspectRatio<'a> {
         AspectRatio {
-            height: self.__unsafe_private_named.0.unwrap(),
-            width: self.__unsafe_private_named.1.unwrap(),
+            height: self._fields.0.unwrap(),
+            width: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/us_polhem/blog/content.rs b/crates/jacquard-api/src/us_polhem/blog/content.rs
index 5e525632..f200fb19 100644
--- a/crates/jacquard-api/src/us_polhem/blog/content.rs
+++ b/crates/jacquard-api/src/us_polhem/blog/content.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -136,64 +139,64 @@ pub mod content_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Content;
         type Slug;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Content = Unset;
         type Slug = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Content = S::Content;
-        type Slug = S::Slug;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `content` field to Set
     pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContent<S> {}
     impl<S: State> State for SetContent<S> {
-        type CreatedAt = S::CreatedAt;
         type Content = Set<members::content>;
         type Slug = S::Slug;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `slug` field to Set
     pub struct SetSlug<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSlug<S> {}
     impl<S: State> State for SetSlug<S> {
-        type CreatedAt = S::CreatedAt;
         type Content = S::Content;
         type Slug = Set<members::slug>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Content = S::Content;
+        type Slug = S::Slug;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `content` field
         pub struct content(());
         ///Marker type for the `slug` field
         pub struct slug(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct ContentBuilder<'a, S: content_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<Vec<Data<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Content<'a> {
@@ -207,9 +210,9 @@ impl<'a> ContentBuilder<'a, content_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ContentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -224,11 +227,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ContentBuilder<'a, content_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ContentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -243,11 +246,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ContentBuilder<'a, content_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ContentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -255,12 +258,12 @@ where
 impl<'a, S: content_state::State> ContentBuilder<'a, S> {
     /// Set the `images` field (optional)
     pub fn images(mut self, value: impl Into<Option<Vec<Data<'a>>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `images` field to an Option value (optional)
     pub fn maybe_images(mut self, value: Option<Vec<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -275,11 +278,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ContentBuilder<'a, content_state::SetSlug<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         ContentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -287,17 +290,17 @@ where
 impl<'a, S> ContentBuilder<'a, S>
 where
     S: content_state::State,
-    S::CreatedAt: content_state::IsSet,
     S::Content: content_state::IsSet,
     S::Slug: content_state::IsSet,
+    S::CreatedAt: content_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Content<'a> {
         Content {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            images: self.__unsafe_private_named.2,
-            slug: self.__unsafe_private_named.3.unwrap(),
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            images: self._fields.2,
+            slug: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -307,10 +310,10 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Content<'a> {
         Content {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            images: self.__unsafe_private_named.2,
-            slug: self.__unsafe_private_named.3.unwrap(),
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            images: self._fields.2,
+            slug: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/us_polhem/blog/post.rs b/crates/jacquard-api/src/us_polhem/blog/post.rs
index f2576687..d2fde7d5 100644
--- a/crates/jacquard-api/src/us_polhem/blog/post.rs
+++ b/crates/jacquard-api/src/us_polhem/blog/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -177,74 +180,74 @@ pub mod post_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Title;
-        type Slug;
         type CreatedAt;
         type Content;
+        type Title;
+        type Slug;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Title = Unset;
-        type Slug = Unset;
         type CreatedAt = Unset;
         type Content = Unset;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetTitle<S> {}
-    impl<S: State> State for SetTitle<S> {
-        type Title = Set<members::title>;
-        type Slug = S::Slug;
-        type CreatedAt = S::CreatedAt;
-        type Content = S::Content;
-    }
-    ///State transition - sets the `slug` field to Set
-    pub struct SetSlug<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSlug<S> {}
-    impl<S: State> State for SetSlug<S> {
-        type Title = S::Title;
-        type Slug = Set<members::slug>;
-        type CreatedAt = S::CreatedAt;
-        type Content = S::Content;
+        type Title = Unset;
+        type Slug = Unset;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Title = S::Title;
-        type Slug = S::Slug;
         type CreatedAt = Set<members::created_at>;
         type Content = S::Content;
+        type Title = S::Title;
+        type Slug = S::Slug;
     }
     ///State transition - sets the `content` field to Set
     pub struct SetContent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetContent<S> {}
     impl<S: State> State for SetContent<S> {
+        type CreatedAt = S::CreatedAt;
+        type Content = Set<members::content>;
         type Title = S::Title;
         type Slug = S::Slug;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetTitle<S> {}
+    impl<S: State> State for SetTitle<S> {
         type CreatedAt = S::CreatedAt;
-        type Content = Set<members::content>;
+        type Content = S::Content;
+        type Title = Set<members::title>;
+        type Slug = S::Slug;
+    }
+    ///State transition - sets the `slug` field to Set
+    pub struct SetSlug<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSlug<S> {}
+    impl<S: State> State for SetSlug<S> {
+        type CreatedAt = S::CreatedAt;
+        type Content = S::Content;
+        type Title = S::Title;
+        type Slug = Set<members::slug>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `title` field
-        pub struct title(());
-        ///Marker type for the `slug` field
-        pub struct slug(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
         ///Marker type for the `content` field
         pub struct content(());
+        ///Marker type for the `title` field
+        pub struct title(());
+        ///Marker type for the `slug` field
+        pub struct slug(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<CowStr<'a>>,
         Option<Datetime>,
         Option<CowStr<'a>>,
@@ -255,7 +258,7 @@ pub struct PostBuilder<'a, S: post_state::State> {
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -269,19 +272,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -296,11 +289,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetContent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -315,11 +308,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -327,12 +320,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `excerpt` field (optional)
     pub fn excerpt(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `excerpt` field to an Option value (optional)
     pub fn maybe_excerpt(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -340,12 +333,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `featuredImage` field (optional)
     pub fn featured_image(mut self, value: impl Into<Option<Image<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `featuredImage` field to an Option value (optional)
     pub fn maybe_featured_image(mut self, value: Option<Image<'a>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -353,12 +346,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `images` field (optional)
     pub fn images(mut self, value: impl Into<Option<Vec<Image<'a>>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `images` field to an Option value (optional)
     pub fn maybe_images(mut self, value: Option<Vec<Image<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -373,11 +366,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetSlug<S>> {
-        self.__unsafe_private_named.5 = Option::Some(value.into());
+        self._fields.5 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -385,12 +378,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<AtUri<'a>>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<AtUri<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -405,11 +398,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> PostBuilder<'a, post_state::SetTitle<S>> {
-        self.__unsafe_private_named.7 = Option::Some(value.into());
+        self._fields.7 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -417,12 +410,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `visibility` field (optional)
     pub fn visibility(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `visibility` field to an Option value (optional)
     pub fn maybe_visibility(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -430,26 +423,23 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S> PostBuilder<'a, S>
 where
     S: post_state::State,
-    S::Title: post_state::IsSet,
-    S::Slug: post_state::IsSet,
     S::CreatedAt: post_state::IsSet,
     S::Content: post_state::IsSet,
+    S::Title: post_state::IsSet,
+    S::Slug: post_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            excerpt: self.__unsafe_private_named.2,
-            featured_image: self.__unsafe_private_named.3,
-            images: self.__unsafe_private_named.4,
-            slug: self.__unsafe_private_named.5.unwrap(),
-            tags: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7.unwrap(),
-            visibility: self
-                .__unsafe_private_named
-                .8
-                .or_else(|| Some(CowStr::from("public"))),
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            excerpt: self._fields.2,
+            featured_image: self._fields.3,
+            images: self._fields.4,
+            slug: self._fields.5.unwrap(),
+            tags: self._fields.6,
+            title: self._fields.7.unwrap(),
+            visibility: self._fields.8.or_else(|| Some(CowStr::from("public"))),
             extra_data: Default::default(),
         }
     }
@@ -462,18 +452,15 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            content: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            excerpt: self.__unsafe_private_named.2,
-            featured_image: self.__unsafe_private_named.3,
-            images: self.__unsafe_private_named.4,
-            slug: self.__unsafe_private_named.5.unwrap(),
-            tags: self.__unsafe_private_named.6,
-            title: self.__unsafe_private_named.7.unwrap(),
-            visibility: self
-                .__unsafe_private_named
-                .8
-                .or_else(|| Some(CowStr::from("public"))),
+            content: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            excerpt: self._fields.2,
+            featured_image: self._fields.3,
+            images: self._fields.4,
+            slug: self._fields.5.unwrap(),
+            tags: self._fields.6,
+            title: self._fields.7.unwrap(),
+            visibility: self._fields.8.or_else(|| Some(CowStr::from("public"))),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/us_polhem/blog/tag.rs b/crates/jacquard-api/src/us_polhem/blog/tag.rs
index 58ae38c5..af0bdab7 100644
--- a/crates/jacquard-api/src/us_polhem/blog/tag.rs
+++ b/crates/jacquard-api/src/us_polhem/blog/tag.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -145,65 +148,65 @@ pub mod tag_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Description;
-        type CreatedAt;
         type Name;
+        type CreatedAt;
+        type Description;
         type Slug;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Description = Unset;
-        type CreatedAt = Unset;
         type Name = Unset;
+        type CreatedAt = Unset;
+        type Description = Unset;
         type Slug = Unset;
     }
-    ///State transition - sets the `description` field to Set
-    pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetDescription<S> {}
-    impl<S: State> State for SetDescription<S> {
-        type Description = Set<members::description>;
+    ///State transition - sets the `name` field to Set
+    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetName<S> {}
+    impl<S: State> State for SetName<S> {
+        type Name = Set<members::name>;
         type CreatedAt = S::CreatedAt;
-        type Name = S::Name;
+        type Description = S::Description;
         type Slug = S::Slug;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Description = S::Description;
-        type CreatedAt = Set<members::created_at>;
         type Name = S::Name;
+        type CreatedAt = Set<members::created_at>;
+        type Description = S::Description;
         type Slug = S::Slug;
     }
-    ///State transition - sets the `name` field to Set
-    pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetName<S> {}
-    impl<S: State> State for SetName<S> {
-        type Description = S::Description;
+    ///State transition - sets the `description` field to Set
+    pub struct SetDescription<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetDescription<S> {}
+    impl<S: State> State for SetDescription<S> {
+        type Name = S::Name;
         type CreatedAt = S::CreatedAt;
-        type Name = Set<members::name>;
+        type Description = Set<members::description>;
         type Slug = S::Slug;
     }
     ///State transition - sets the `slug` field to Set
     pub struct SetSlug<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSlug<S> {}
     impl<S: State> State for SetSlug<S> {
-        type Description = S::Description;
-        type CreatedAt = S::CreatedAt;
         type Name = S::Name;
+        type CreatedAt = S::CreatedAt;
+        type Description = S::Description;
         type Slug = Set<members::slug>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `description` field
-        pub struct description(());
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
+        ///Marker type for the `description` field
+        pub struct description(());
         ///Marker type for the `slug` field
         pub struct slug(());
     }
@@ -211,14 +214,14 @@ pub mod tag_state {
 
 /// Builder for constructing an instance of this type
 pub struct TagBuilder<'a, S: tag_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Datetime>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Tag<'a> {
@@ -232,9 +235,9 @@ impl<'a> TagBuilder<'a, tag_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -249,11 +252,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> TagBuilder<'a, tag_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -268,11 +271,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TagBuilder<'a, tag_state::SetDescription<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -287,11 +290,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TagBuilder<'a, tag_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -306,11 +309,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> TagBuilder<'a, tag_state::SetSlug<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         TagBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -318,18 +321,18 @@ where
 impl<'a, S> TagBuilder<'a, S>
 where
     S: tag_state::State,
-    S::Description: tag_state::IsSet,
-    S::CreatedAt: tag_state::IsSet,
     S::Name: tag_state::IsSet,
+    S::CreatedAt: tag_state::IsSet,
+    S::Description: tag_state::IsSet,
     S::Slug: tag_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Tag<'a> {
         Tag {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            slug: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            slug: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -342,10 +345,10 @@ where
         >,
     ) -> Tag<'a> {
         Tag {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            description: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
-            slug: self.__unsafe_private_named.3.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            description: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
+            slug: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/win_tomo_x/pushat.rs b/crates/jacquard-api/src/win_tomo_x/pushat.rs
index 6802d853..70582c14 100644
--- a/crates/jacquard-api/src/win_tomo_x/pushat.rs
+++ b/crates/jacquard-api/src/win_tomo_x/pushat.rs
@@ -8,7 +8,11 @@
 pub mod allow;
 pub mod push_notify;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -127,58 +131,58 @@ pub mod device_list_item_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Name;
-        type Id;
         type Current;
+        type Id;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Name = Unset;
-        type Id = Unset;
         type Current = Unset;
+        type Id = Unset;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetName<S> {}
     impl<S: State> State for SetName<S> {
         type Name = Set<members::name>;
-        type Id = S::Id;
-        type Current = S::Current;
-    }
-    ///State transition - sets the `id` field to Set
-    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetId<S> {}
-    impl<S: State> State for SetId<S> {
-        type Name = S::Name;
-        type Id = Set<members::id>;
         type Current = S::Current;
+        type Id = S::Id;
     }
     ///State transition - sets the `current` field to Set
     pub struct SetCurrent<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCurrent<S> {}
     impl<S: State> State for SetCurrent<S> {
         type Name = S::Name;
-        type Id = S::Id;
         type Current = Set<members::current>;
+        type Id = S::Id;
+    }
+    ///State transition - sets the `id` field to Set
+    pub struct SetId<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetId<S> {}
+    impl<S: State> State for SetId<S> {
+        type Name = S::Name;
+        type Current = S::Current;
+        type Id = Set<members::id>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `id` field
-        pub struct id(());
         ///Marker type for the `current` field
         pub struct current(());
+        ///Marker type for the `id` field
+        pub struct id(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct DeviceListItemBuilder<'a, S: device_list_item_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<bool>, Option<Tid>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<bool>, Option<Tid>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> DeviceListItem<'a> {
@@ -192,9 +196,9 @@ impl<'a> DeviceListItemBuilder<'a, device_list_item_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DeviceListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -209,11 +213,11 @@ where
         mut self,
         value: impl Into<bool>,
     ) -> DeviceListItemBuilder<'a, device_list_item_state::SetCurrent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DeviceListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -228,11 +232,11 @@ where
         mut self,
         value: impl Into<Tid>,
     ) -> DeviceListItemBuilder<'a, device_list_item_state::SetId<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         DeviceListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -247,11 +251,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> DeviceListItemBuilder<'a, device_list_item_state::SetName<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         DeviceListItemBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -260,15 +264,15 @@ impl<'a, S> DeviceListItemBuilder<'a, S>
 where
     S: device_list_item_state::State,
     S::Name: device_list_item_state::IsSet,
-    S::Id: device_list_item_state::IsSet,
     S::Current: device_list_item_state::IsSet,
+    S::Id: device_list_item_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> DeviceListItem<'a> {
         DeviceListItem {
-            current: self.__unsafe_private_named.0.unwrap(),
-            id: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            current: self._fields.0.unwrap(),
+            id: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -281,9 +285,9 @@ where
         >,
     ) -> DeviceListItem<'a> {
         DeviceListItem {
-            current: self.__unsafe_private_named.0.unwrap(),
-            id: self.__unsafe_private_named.1.unwrap(),
-            name: self.__unsafe_private_named.2.unwrap(),
+            current: self._fields.0.unwrap(),
+            id: self._fields.1.unwrap(),
+            name: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/win_tomo_x/pushat/allow.rs b/crates/jacquard-api/src/win_tomo_x/pushat/allow.rs
index 600a41cb..26991030 100644
--- a/crates/jacquard-api/src/win_tomo_x/pushat/allow.rs
+++ b/crates/jacquard-api/src/win_tomo_x/pushat/allow.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -134,9 +137,9 @@ pub mod allow_state {
 
 /// Builder for constructing an instance of this type
 pub struct AllowBuilder<'a, S: allow_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Data<'a>>, Option<Datetime>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Data<'a>>, Option<Datetime>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Allow<'a> {
@@ -150,9 +153,9 @@ impl<'a> AllowBuilder<'a, allow_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         AllowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -160,12 +163,12 @@ impl<'a> AllowBuilder<'a, allow_state::Empty> {
 impl<'a, S: allow_state::State> AllowBuilder<'a, S> {
     /// Set the `config` field (optional)
     pub fn config(mut self, value: impl Into<Option<Data<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `config` field to an Option value (optional)
     pub fn maybe_config(mut self, value: Option<Data<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -180,11 +183,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> AllowBuilder<'a, allow_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         AllowBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -197,8 +200,8 @@ where
     /// Build the final struct
     pub fn build(self) -> Allow<'a> {
         Allow {
-            config: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
+            config: self._fields.0,
+            created_at: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -208,8 +211,8 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Allow<'a> {
         Allow {
-            config: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
+            config: self._fields.0,
+            created_at: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/win_tomo_x/pushat/push_notify.rs b/crates/jacquard-api/src/win_tomo_x/pushat/push_notify.rs
index 20fcaf9e..9188946c 100644
--- a/crates/jacquard-api/src/win_tomo_x/pushat/push_notify.rs
+++ b/crates/jacquard-api/src/win_tomo_x/pushat/push_notify.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::Did;
@@ -148,9 +151,9 @@ pub mod push_notify_state {
 
 /// Builder for constructing an instance of this type
 pub struct PushNotifyBuilder<'a, S: push_notify_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<NotifyBody<'a>>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<NotifyBody<'a>>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> PushNotify<'a> {
@@ -164,9 +167,9 @@ impl<'a> PushNotifyBuilder<'a, push_notify_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PushNotifyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -181,11 +184,11 @@ where
         mut self,
         value: impl Into<NotifyBody<'a>>,
     ) -> PushNotifyBuilder<'a, push_notify_state::SetBody<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PushNotifyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -200,11 +203,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> PushNotifyBuilder<'a, push_notify_state::SetTarget<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PushNotifyBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -218,8 +221,8 @@ where
     /// Build the final struct
     pub fn build(self) -> PushNotify<'a> {
         PushNotify {
-            body: self.__unsafe_private_named.0.unwrap(),
-            target: self.__unsafe_private_named.1.unwrap(),
+            body: self._fields.0.unwrap(),
+            target: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -232,8 +235,8 @@ where
         >,
     ) -> PushNotify<'a> {
         PushNotify {
-            body: self.__unsafe_private_named.0.unwrap(),
-            target: self.__unsafe_private_named.1.unwrap(),
+            body: self._fields.0.unwrap(),
+            target: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/xyz_atpoke/feed/poke.rs b/crates/jacquard-api/src/xyz_atpoke/feed/poke.rs
index 6a7320c4..3956dcab 100644
--- a/crates/jacquard-api/src/xyz_atpoke/feed/poke.rs
+++ b/crates/jacquard-api/src/xyz_atpoke/feed/poke.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -112,49 +115,45 @@ pub mod poke_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subject;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subject = S::Subject;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PokeBuilder<'a, S: poke_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<StrongRef<'a>>,
-        Option<StrongRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Poke<'a> {
@@ -168,9 +167,9 @@ impl<'a> PokeBuilder<'a, poke_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PokeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -185,11 +184,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PokeBuilder<'a, poke_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PokeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,11 +203,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> PokeBuilder<'a, poke_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PokeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -216,12 +215,12 @@ where
 impl<'a, S: poke_state::State> PokeBuilder<'a, S> {
     /// Set the `via` field (optional)
     pub fn via(mut self, value: impl Into<Option<StrongRef<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `via` field to an Option value (optional)
     pub fn maybe_via(mut self, value: Option<StrongRef<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -229,15 +228,15 @@ impl<'a, S: poke_state::State> PokeBuilder<'a, S> {
 impl<'a, S> PokeBuilder<'a, S>
 where
     S: poke_state::State,
-    S::CreatedAt: poke_state::IsSet,
     S::Subject: poke_state::IsSet,
+    S::CreatedAt: poke_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Poke<'a> {
         Poke {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            via: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            via: self._fields.2,
             extra_data: Default::default(),
         }
     }
@@ -250,9 +249,9 @@ where
         >,
     ) -> Poke<'a> {
         Poke {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            via: self.__unsafe_private_named.2,
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            via: self._fields.2,
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/xyz_atpoke/graph/poke.rs b/crates/jacquard-api/src/xyz_atpoke/graph/poke.rs
index d2407f78..0e87b6c1 100644
--- a/crates/jacquard-api/src/xyz_atpoke/graph/poke.rs
+++ b/crates/jacquard-api/src/xyz_atpoke/graph/poke.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -108,45 +111,45 @@ pub mod poke_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Subject;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Subject = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Subject = S::Subject;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type CreatedAt = S::CreatedAt;
         type Subject = Set<members::subject>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Subject = S::Subject;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct PokeBuilder<'a, S: poke_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Datetime>, Option<Did<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Did<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Poke<'a> {
@@ -160,9 +163,9 @@ impl<'a> PokeBuilder<'a, poke_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PokeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -177,11 +180,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PokeBuilder<'a, poke_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         PokeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -196,11 +199,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> PokeBuilder<'a, poke_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PokeBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -208,14 +211,14 @@ where
 impl<'a, S> PokeBuilder<'a, S>
 where
     S: poke_state::State,
-    S::CreatedAt: poke_state::IsSet,
     S::Subject: poke_state::IsSet,
+    S::CreatedAt: poke_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Poke<'a> {
         Poke {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -228,8 +231,8 @@ where
         >,
     ) -> Poke<'a> {
         Poke {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/za_co/ciaran/cumulus/bet.rs b/crates/jacquard-api/src/za_co/ciaran/cumulus/bet.rs
index 77ec9076..af8299f8 100644
--- a/crates/jacquard-api/src/za_co/ciaran/cumulus/bet.rs
+++ b/crates/jacquard-api/src/za_co/ciaran/cumulus/bet.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -134,63 +137,59 @@ pub mod bet_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type CreatedAt;
         type Market;
         type Position;
+        type CreatedAt;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type CreatedAt = Unset;
         type Market = Unset;
         type Position = Unset;
-    }
-    ///State transition - sets the `created_at` field to Set
-    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
-    impl<S: State> State for SetCreatedAt<S> {
-        type CreatedAt = Set<members::created_at>;
-        type Market = S::Market;
-        type Position = S::Position;
+        type CreatedAt = Unset;
     }
     ///State transition - sets the `market` field to Set
     pub struct SetMarket<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetMarket<S> {}
     impl<S: State> State for SetMarket<S> {
-        type CreatedAt = S::CreatedAt;
         type Market = Set<members::market>;
         type Position = S::Position;
+        type CreatedAt = S::CreatedAt;
     }
     ///State transition - sets the `position` field to Set
     pub struct SetPosition<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetPosition<S> {}
     impl<S: State> State for SetPosition<S> {
-        type CreatedAt = S::CreatedAt;
         type Market = S::Market;
         type Position = Set<members::position>;
+        type CreatedAt = S::CreatedAt;
+    }
+    ///State transition - sets the `created_at` field to Set
+    pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
+    impl<S: State> State for SetCreatedAt<S> {
+        type Market = S::Market;
+        type Position = S::Position;
+        type CreatedAt = Set<members::created_at>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `created_at` field
-        pub struct created_at(());
         ///Marker type for the `market` field
         pub struct market(());
         ///Marker type for the `position` field
         pub struct position(());
+        ///Marker type for the `created_at` field
+        pub struct created_at(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct BetBuilder<'a, S: bet_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<StrongRef<'a>>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<StrongRef<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Bet<'a> {
@@ -204,9 +203,9 @@ impl<'a> BetBuilder<'a, bet_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         BetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,11 +220,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> BetBuilder<'a, bet_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         BetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -240,11 +239,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> BetBuilder<'a, bet_state::SetMarket<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         BetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -259,11 +258,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> BetBuilder<'a, bet_state::SetPosition<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         BetBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -271,16 +270,16 @@ where
 impl<'a, S> BetBuilder<'a, S>
 where
     S: bet_state::State,
-    S::CreatedAt: bet_state::IsSet,
     S::Market: bet_state::IsSet,
     S::Position: bet_state::IsSet,
+    S::CreatedAt: bet_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Bet<'a> {
         Bet {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            market: self.__unsafe_private_named.1.unwrap(),
-            position: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            market: self._fields.1.unwrap(),
+            position: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -293,9 +292,9 @@ where
         >,
     ) -> Bet<'a> {
         Bet {
-            created_at: self.__unsafe_private_named.0.unwrap(),
-            market: self.__unsafe_private_named.1.unwrap(),
-            position: self.__unsafe_private_named.2.unwrap(),
+            created_at: self._fields.0.unwrap(),
+            market: self._fields.1.unwrap(),
+            position: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/za_co/ciaran/cumulus/market.rs b/crates/jacquard-api/src/za_co/ciaran/cumulus/market.rs
index 291e4d1e..183733f9 100644
--- a/crates/jacquard-api/src/za_co/ciaran/cumulus/market.rs
+++ b/crates/jacquard-api/src/za_co/ciaran/cumulus/market.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -121,80 +124,75 @@ pub mod market_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Liquidity;
         type ClosesAt;
         type Question;
         type CreatedAt;
+        type Liquidity;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Liquidity = Unset;
         type ClosesAt = Unset;
         type Question = Unset;
         type CreatedAt = Unset;
-    }
-    ///State transition - sets the `liquidity` field to Set
-    pub struct SetLiquidity<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetLiquidity<S> {}
-    impl<S: State> State for SetLiquidity<S> {
-        type Liquidity = Set<members::liquidity>;
-        type ClosesAt = S::ClosesAt;
-        type Question = S::Question;
-        type CreatedAt = S::CreatedAt;
+        type Liquidity = Unset;
     }
     ///State transition - sets the `closes_at` field to Set
     pub struct SetClosesAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetClosesAt<S> {}
     impl<S: State> State for SetClosesAt<S> {
-        type Liquidity = S::Liquidity;
         type ClosesAt = Set<members::closes_at>;
         type Question = S::Question;
         type CreatedAt = S::CreatedAt;
+        type Liquidity = S::Liquidity;
     }
     ///State transition - sets the `question` field to Set
     pub struct SetQuestion<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetQuestion<S> {}
     impl<S: State> State for SetQuestion<S> {
-        type Liquidity = S::Liquidity;
         type ClosesAt = S::ClosesAt;
         type Question = Set<members::question>;
         type CreatedAt = S::CreatedAt;
+        type Liquidity = S::Liquidity;
     }
     ///State transition - sets the `created_at` field to Set
     pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCreatedAt<S> {}
     impl<S: State> State for SetCreatedAt<S> {
-        type Liquidity = S::Liquidity;
         type ClosesAt = S::ClosesAt;
         type Question = S::Question;
         type CreatedAt = Set<members::created_at>;
+        type Liquidity = S::Liquidity;
+    }
+    ///State transition - sets the `liquidity` field to Set
+    pub struct SetLiquidity<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetLiquidity<S> {}
+    impl<S: State> State for SetLiquidity<S> {
+        type ClosesAt = S::ClosesAt;
+        type Question = S::Question;
+        type CreatedAt = S::CreatedAt;
+        type Liquidity = Set<members::liquidity>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `liquidity` field
-        pub struct liquidity(());
         ///Marker type for the `closes_at` field
         pub struct closes_at(());
         ///Marker type for the `question` field
         pub struct question(());
         ///Marker type for the `created_at` field
         pub struct created_at(());
+        ///Marker type for the `liquidity` field
+        pub struct liquidity(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct MarketBuilder<'a, S: market_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Datetime>,
-        Option<Datetime>,
-        Option<i64>,
-        Option<CowStr<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Datetime>, Option<Datetime>, Option<i64>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Market<'a> {
@@ -208,9 +206,9 @@ impl<'a> MarketBuilder<'a, market_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MarketBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -225,11 +223,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MarketBuilder<'a, market_state::SetClosesAt<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MarketBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -244,11 +242,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MarketBuilder<'a, market_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MarketBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -263,11 +261,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> MarketBuilder<'a, market_state::SetLiquidity<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         MarketBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -282,11 +280,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MarketBuilder<'a, market_state::SetQuestion<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         MarketBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -294,18 +292,18 @@ where
 impl<'a, S> MarketBuilder<'a, S>
 where
     S: market_state::State,
-    S::Liquidity: market_state::IsSet,
     S::ClosesAt: market_state::IsSet,
     S::Question: market_state::IsSet,
     S::CreatedAt: market_state::IsSet,
+    S::Liquidity: market_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Market<'a> {
         Market {
-            closes_at: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            liquidity: self.__unsafe_private_named.2.unwrap(),
-            question: self.__unsafe_private_named.3.unwrap(),
+            closes_at: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            liquidity: self._fields.2.unwrap(),
+            question: self._fields.3.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -318,10 +316,10 @@ where
         >,
     ) -> Market<'a> {
         Market {
-            closes_at: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            liquidity: self.__unsafe_private_named.2.unwrap(),
-            question: self.__unsafe_private_named.3.unwrap(),
+            closes_at: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            liquidity: self._fields.2.unwrap(),
+            question: self._fields.3.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/za_co/ciaran/cumulus/resolution.rs b/crates/jacquard-api/src/za_co/ciaran/cumulus/resolution.rs
index f2d5d9d5..56d4c142 100644
--- a/crates/jacquard-api/src/za_co/ciaran/cumulus/resolution.rs
+++ b/crates/jacquard-api/src/za_co/ciaran/cumulus/resolution.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -184,13 +187,9 @@ pub mod resolution_state {
 
 /// Builder for constructing an instance of this type
 pub struct ResolutionBuilder<'a, S: resolution_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<CowStr<'a>>,
-        Option<Datetime>,
-        Option<StrongRef<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Datetime>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Resolution<'a> {
@@ -204,9 +203,9 @@ impl<'a> ResolutionBuilder<'a, resolution_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ResolutionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -221,11 +220,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> ResolutionBuilder<'a, resolution_state::SetAnswer<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ResolutionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -240,11 +239,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> ResolutionBuilder<'a, resolution_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ResolutionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -259,11 +258,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ResolutionBuilder<'a, resolution_state::SetMarket<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         ResolutionBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -278,9 +277,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Resolution<'a> {
         Resolution {
-            answer: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            market: self.__unsafe_private_named.2.unwrap(),
+            answer: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            market: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -293,9 +292,9 @@ where
         >,
     ) -> Resolution<'a> {
         Resolution {
-            answer: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            market: self.__unsafe_private_named.2.unwrap(),
+            answer: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            market: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/zip_viruus/chat/message.rs b/crates/jacquard-api/src/zip_viruus/chat/message.rs
index 125ad100..a1cc0150 100644
--- a/crates/jacquard-api/src/zip_viruus/chat/message.rs
+++ b/crates/jacquard-api/src/zip_viruus/chat/message.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -198,9 +201,9 @@ pub mod message_state {
 
 /// Builder for constructing an instance of this type
 pub struct MessageBuilder<'a, S: message_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<CowStr<'a>>, Option<Datetime>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<CowStr<'a>>, Option<Datetime>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Message<'a> {
@@ -214,9 +217,9 @@ impl<'a> MessageBuilder<'a, message_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         MessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -231,11 +234,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MessageBuilder<'a, message_state::SetChannel<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         MessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -250,11 +253,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> MessageBuilder<'a, message_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         MessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -269,11 +272,11 @@ where
         mut self,
         value: impl Into<CowStr<'a>>,
     ) -> MessageBuilder<'a, message_state::SetText<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         MessageBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -288,9 +291,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Message<'a> {
         Message {
-            channel: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            text: self.__unsafe_private_named.2.unwrap(),
+            channel: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            text: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -303,9 +306,9 @@ where
         >,
     ) -> Message<'a> {
         Message {
-            channel: self.__unsafe_private_named.0.unwrap(),
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            text: self.__unsafe_private_named.2.unwrap(),
+            channel: self._fields.0.unwrap(),
+            created_at: self._fields.1.unwrap(),
+            text: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/zone_stratos.rs b/crates/jacquard-api/src/zone_stratos.rs
index 50114612..8b78eaeb 100644
--- a/crates/jacquard-api/src/zone_stratos.rs
+++ b/crates/jacquard-api/src/zone_stratos.rs
@@ -12,7 +12,11 @@ pub mod feed;
 pub mod repo;
 pub mod sync;
 
+
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -199,49 +203,49 @@ pub mod source_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Vary;
         type Subject;
+        type Vary;
         type Service;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Vary = Unset;
         type Subject = Unset;
+        type Vary = Unset;
         type Service = Unset;
     }
-    ///State transition - sets the `vary` field to Set
-    pub struct SetVary<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetVary<S> {}
-    impl<S: State> State for SetVary<S> {
-        type Vary = Set<members::vary>;
-        type Subject = S::Subject;
-        type Service = S::Service;
-    }
     ///State transition - sets the `subject` field to Set
     pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetSubject<S> {}
     impl<S: State> State for SetSubject<S> {
-        type Vary = S::Vary;
         type Subject = Set<members::subject>;
+        type Vary = S::Vary;
+        type Service = S::Service;
+    }
+    ///State transition - sets the `vary` field to Set
+    pub struct SetVary<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetVary<S> {}
+    impl<S: State> State for SetVary<S> {
+        type Subject = S::Subject;
+        type Vary = Set<members::vary>;
         type Service = S::Service;
     }
     ///State transition - sets the `service` field to Set
     pub struct SetService<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetService<S> {}
     impl<S: State> State for SetService<S> {
-        type Vary = S::Vary;
         type Subject = S::Subject;
+        type Vary = S::Vary;
         type Service = Set<members::service>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `vary` field
-        pub struct vary(());
         ///Marker type for the `subject` field
         pub struct subject(());
+        ///Marker type for the `vary` field
+        pub struct vary(());
         ///Marker type for the `service` field
         pub struct service(());
     }
@@ -249,13 +253,13 @@ pub mod source_state {
 
 /// Builder for constructing an instance of this type
 pub struct SourceBuilder<'a, S: source_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Did<'a>>,
         Option<zone_stratos::SubjectRef<'a>>,
         Option<SourceVary<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Source<'a> {
@@ -269,9 +273,9 @@ impl<'a> SourceBuilder<'a, source_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SourceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -286,11 +290,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> SourceBuilder<'a, source_state::SetService<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SourceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -305,11 +309,11 @@ where
         mut self,
         value: impl Into<zone_stratos::SubjectRef<'a>>,
     ) -> SourceBuilder<'a, source_state::SetSubject<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SourceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -324,11 +328,11 @@ where
         mut self,
         value: impl Into<SourceVary<'a>>,
     ) -> SourceBuilder<'a, source_state::SetVary<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         SourceBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -336,16 +340,16 @@ where
 impl<'a, S> SourceBuilder<'a, S>
 where
     S: source_state::State,
-    S::Vary: source_state::IsSet,
     S::Subject: source_state::IsSet,
+    S::Vary: source_state::IsSet,
     S::Service: source_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Source<'a> {
         Source {
-            service: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            vary: self.__unsafe_private_named.2.unwrap(),
+            service: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            vary: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -358,9 +362,9 @@ where
         >,
     ) -> Source<'a> {
         Source {
-            service: self.__unsafe_private_named.0.unwrap(),
-            subject: self.__unsafe_private_named.1.unwrap(),
-            vary: self.__unsafe_private_named.2.unwrap(),
+            service: self._fields.0.unwrap(),
+            subject: self._fields.1.unwrap(),
+            vary: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -524,9 +528,9 @@ pub mod subject_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct SubjectRefBuilder<'a, S: subject_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SubjectRef<'a> {
@@ -540,9 +544,9 @@ impl<'a> SubjectRefBuilder<'a, subject_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubjectRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -557,11 +561,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> SubjectRefBuilder<'a, subject_ref_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         SubjectRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -576,11 +580,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> SubjectRefBuilder<'a, subject_ref_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SubjectRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -594,8 +598,8 @@ where
     /// Build the final struct
     pub fn build(self) -> SubjectRef<'a> {
         SubjectRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -608,8 +612,8 @@ where
         >,
     ) -> SubjectRef<'a> {
         SubjectRef {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/zone_stratos/actor/enrollment.rs b/crates/jacquard-api/src/zone_stratos/actor/enrollment.rs
index d43160cc..f6e1739e 100644
--- a/crates/jacquard-api/src/zone_stratos/actor/enrollment.rs
+++ b/crates/jacquard-api/src/zone_stratos/actor/enrollment.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -161,13 +164,9 @@ pub mod enrollment_state {
 
 /// Builder for constructing an instance of this type
 pub struct EnrollmentBuilder<'a, S: enrollment_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
-        Option<Vec<Domain<'a>>>,
-        Option<Datetime>,
-        Option<UriValue<'a>>,
-    ),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<Domain<'a>>>, Option<Datetime>, Option<UriValue<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Enrollment<'a> {
@@ -181,9 +180,9 @@ impl<'a> EnrollmentBuilder<'a, enrollment_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         EnrollmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -191,12 +190,12 @@ impl<'a> EnrollmentBuilder<'a, enrollment_state::Empty> {
 impl<'a, S: enrollment_state::State> EnrollmentBuilder<'a, S> {
     /// Set the `boundaries` field (optional)
     pub fn boundaries(mut self, value: impl Into<Option<Vec<Domain<'a>>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `boundaries` field to an Option value (optional)
     pub fn maybe_boundaries(mut self, value: Option<Vec<Domain<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -211,11 +210,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> EnrollmentBuilder<'a, enrollment_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         EnrollmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -230,11 +229,11 @@ where
         mut self,
         value: impl Into<UriValue<'a>>,
     ) -> EnrollmentBuilder<'a, enrollment_state::SetService<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         EnrollmentBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -248,9 +247,9 @@ where
     /// Build the final struct
     pub fn build(self) -> Enrollment<'a> {
         Enrollment {
-            boundaries: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            service: self.__unsafe_private_named.2.unwrap(),
+            boundaries: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            service: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -263,9 +262,9 @@ where
         >,
     ) -> Enrollment<'a> {
         Enrollment {
-            boundaries: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            service: self.__unsafe_private_named.2.unwrap(),
+            boundaries: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            service: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/zone_stratos/boundary.rs b/crates/jacquard-api/src/zone_stratos/boundary.rs
index 54b87f97..9025b77a 100644
--- a/crates/jacquard-api/src/zone_stratos/boundary.rs
+++ b/crates/jacquard-api/src/zone_stratos/boundary.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -205,9 +208,9 @@ pub mod domains_state {
 
 /// Builder for constructing an instance of this type
 pub struct DomainsBuilder<'a, S: domains_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<boundary::Domain<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<boundary::Domain<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Domains<'a> {
@@ -221,9 +224,9 @@ impl<'a> DomainsBuilder<'a, domains_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         DomainsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -238,11 +241,11 @@ where
         mut self,
         value: impl Into<Vec<boundary::Domain<'a>>>,
     ) -> DomainsBuilder<'a, domains_state::SetValues<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         DomainsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -255,7 +258,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Domains<'a> {
         Domains {
-            values: self.__unsafe_private_named.0.unwrap(),
+            values: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -268,7 +271,7 @@ where
         >,
     ) -> Domains<'a> {
         Domains {
-            values: self.__unsafe_private_named.0.unwrap(),
+            values: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/zone_stratos/enrollment/status.rs b/crates/jacquard-api/src/zone_stratos/enrollment/status.rs
index 6ab1ce26..5195cdd1 100644
--- a/crates/jacquard-api/src/zone_stratos/enrollment/status.rs
+++ b/crates/jacquard-api/src/zone_stratos/enrollment/status.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::types::string::{Did, Datetime};
 use jacquard_common::types::value::Data;
@@ -96,9 +99,9 @@ pub mod status_state {
 
 /// Builder for constructing an instance of this type
 pub struct StatusBuilder<'a, S: status_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Status<'a> {
@@ -112,9 +115,9 @@ impl<'a> StatusBuilder<'a, status_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -129,11 +132,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> StatusBuilder<'a, status_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         StatusBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -146,7 +149,7 @@ where
     /// Build the final struct
     pub fn build(self) -> Status<'a> {
         Status {
-            did: self.__unsafe_private_named.0.unwrap(),
+            did: self._fields.0.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/zone_stratos/feed/post.rs b/crates/jacquard-api/src/zone_stratos/feed/post.rs
index ebeb40cd..eb5e8c5f 100644
--- a/crates/jacquard-api/src/zone_stratos/feed/post.rs
+++ b/crates/jacquard-api/src/zone_stratos/feed/post.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -262,8 +265,8 @@ pub mod post_state {
 
 /// Builder for constructing an instance of this type
 pub struct PostBuilder<'a, S: post_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Domains<'a>>,
         Option<Datetime>,
         Option<PostEmbed<'a>>,
@@ -275,7 +278,7 @@ pub struct PostBuilder<'a, S: post_state::State> {
         Option<Vec<CowStr<'a>>>,
         Option<CowStr<'a>>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Post<'a> {
@@ -289,20 +292,9 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None, None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -310,12 +302,12 @@ impl<'a> PostBuilder<'a, post_state::Empty> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `boundary` field (optional)
     pub fn boundary(mut self, value: impl Into<Option<Domains<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `boundary` field to an Option value (optional)
     pub fn maybe_boundary(mut self, value: Option<Domains<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -330,11 +322,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> PostBuilder<'a, post_state::SetCreatedAt<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         PostBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -342,12 +334,12 @@ where
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `embed` field (optional)
     pub fn embed(mut self, value: impl Into<Option<PostEmbed<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `embed` field to an Option value (optional)
     pub fn maybe_embed(mut self, value: Option<PostEmbed<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -355,12 +347,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `facets` field (optional)
     pub fn facets(mut self, value: impl Into<Option<Vec<Facet<'a>>>>) -> Self {
-        self.__unsafe_private_named.3 = value.into();
+        self._fields.3 = value.into();
         self
     }
     /// Set the `facets` field to an Option value (optional)
     pub fn maybe_facets(mut self, value: Option<Vec<Facet<'a>>>) -> Self {
-        self.__unsafe_private_named.3 = value;
+        self._fields.3 = value;
         self
     }
 }
@@ -368,12 +360,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `labels` field (optional)
     pub fn labels(mut self, value: impl Into<Option<SelfLabels<'a>>>) -> Self {
-        self.__unsafe_private_named.4 = value.into();
+        self._fields.4 = value.into();
         self
     }
     /// Set the `labels` field to an Option value (optional)
     pub fn maybe_labels(mut self, value: Option<SelfLabels<'a>>) -> Self {
-        self.__unsafe_private_named.4 = value;
+        self._fields.4 = value;
         self
     }
 }
@@ -381,12 +373,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `langs` field (optional)
     pub fn langs(mut self, value: impl Into<Option<Vec<Language>>>) -> Self {
-        self.__unsafe_private_named.5 = value.into();
+        self._fields.5 = value.into();
         self
     }
     /// Set the `langs` field to an Option value (optional)
     pub fn maybe_langs(mut self, value: Option<Vec<Language>>) -> Self {
-        self.__unsafe_private_named.5 = value;
+        self._fields.5 = value;
         self
     }
 }
@@ -394,12 +386,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `reply` field (optional)
     pub fn reply(mut self, value: impl Into<Option<post::ReplyRef<'a>>>) -> Self {
-        self.__unsafe_private_named.6 = value.into();
+        self._fields.6 = value.into();
         self
     }
     /// Set the `reply` field to an Option value (optional)
     pub fn maybe_reply(mut self, value: Option<post::ReplyRef<'a>>) -> Self {
-        self.__unsafe_private_named.6 = value;
+        self._fields.6 = value;
         self
     }
 }
@@ -407,12 +399,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `source` field (optional)
     pub fn source(mut self, value: impl Into<Option<Source<'a>>>) -> Self {
-        self.__unsafe_private_named.7 = value.into();
+        self._fields.7 = value.into();
         self
     }
     /// Set the `source` field to an Option value (optional)
     pub fn maybe_source(mut self, value: Option<Source<'a>>) -> Self {
-        self.__unsafe_private_named.7 = value;
+        self._fields.7 = value;
         self
     }
 }
@@ -420,12 +412,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `tags` field (optional)
     pub fn tags(mut self, value: impl Into<Option<Vec<CowStr<'a>>>>) -> Self {
-        self.__unsafe_private_named.8 = value.into();
+        self._fields.8 = value.into();
         self
     }
     /// Set the `tags` field to an Option value (optional)
     pub fn maybe_tags(mut self, value: Option<Vec<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.8 = value;
+        self._fields.8 = value;
         self
     }
 }
@@ -433,12 +425,12 @@ impl<'a, S: post_state::State> PostBuilder<'a, S> {
 impl<'a, S: post_state::State> PostBuilder<'a, S> {
     /// Set the `text` field (optional)
     pub fn text(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.9 = value.into();
+        self._fields.9 = value.into();
         self
     }
     /// Set the `text` field to an Option value (optional)
     pub fn maybe_text(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.9 = value;
+        self._fields.9 = value;
         self
     }
 }
@@ -451,16 +443,16 @@ where
     /// Build the final struct
     pub fn build(self) -> Post<'a> {
         Post {
-            boundary: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            embed: self.__unsafe_private_named.2,
-            facets: self.__unsafe_private_named.3,
-            labels: self.__unsafe_private_named.4,
-            langs: self.__unsafe_private_named.5,
-            reply: self.__unsafe_private_named.6,
-            source: self.__unsafe_private_named.7,
-            tags: self.__unsafe_private_named.8,
-            text: self.__unsafe_private_named.9,
+            boundary: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            embed: self._fields.2,
+            facets: self._fields.3,
+            labels: self._fields.4,
+            langs: self._fields.5,
+            reply: self._fields.6,
+            source: self._fields.7,
+            tags: self._fields.8,
+            text: self._fields.9,
             extra_data: Default::default(),
         }
     }
@@ -473,16 +465,16 @@ where
         >,
     ) -> Post<'a> {
         Post {
-            boundary: self.__unsafe_private_named.0,
-            created_at: self.__unsafe_private_named.1.unwrap(),
-            embed: self.__unsafe_private_named.2,
-            facets: self.__unsafe_private_named.3,
-            labels: self.__unsafe_private_named.4,
-            langs: self.__unsafe_private_named.5,
-            reply: self.__unsafe_private_named.6,
-            source: self.__unsafe_private_named.7,
-            tags: self.__unsafe_private_named.8,
-            text: self.__unsafe_private_named.9,
+            boundary: self._fields.0,
+            created_at: self._fields.1.unwrap(),
+            embed: self._fields.2,
+            facets: self._fields.3,
+            labels: self._fields.4,
+            langs: self._fields.5,
+            reply: self._fields.6,
+            source: self._fields.7,
+            tags: self._fields.8,
+            text: self._fields.9,
             extra_data: Some(extra_data),
         }
     }
@@ -732,9 +724,9 @@ pub mod reply_ref_state {
 
 /// Builder for constructing an instance of this type
 pub struct ReplyRefBuilder<'a, S: reply_ref_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<StrongRef<'a>>, Option<StrongRef<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<StrongRef<'a>>, Option<StrongRef<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ReplyRef<'a> {
@@ -748,9 +740,9 @@ impl<'a> ReplyRefBuilder<'a, reply_ref_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -765,11 +757,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ReplyRefBuilder<'a, reply_ref_state::SetParent<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -784,11 +776,11 @@ where
         mut self,
         value: impl Into<StrongRef<'a>>,
     ) -> ReplyRefBuilder<'a, reply_ref_state::SetRoot<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         ReplyRefBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -802,8 +794,8 @@ where
     /// Build the final struct
     pub fn build(self) -> ReplyRef<'a> {
         ReplyRef {
-            parent: self.__unsafe_private_named.0.unwrap(),
-            root: self.__unsafe_private_named.1.unwrap(),
+            parent: self._fields.0.unwrap(),
+            root: self._fields.1.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -816,8 +808,8 @@ where
         >,
     ) -> ReplyRef<'a> {
         ReplyRef {
-            parent: self.__unsafe_private_named.0.unwrap(),
-            root: self.__unsafe_private_named.1.unwrap(),
+            parent: self._fields.0.unwrap(),
+            root: self._fields.1.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/zone_stratos/repo/hydrate_record.rs b/crates/jacquard-api/src/zone_stratos/repo/hydrate_record.rs
index 84821667..a2edb01f 100644
--- a/crates/jacquard-api/src/zone_stratos/repo/hydrate_record.rs
+++ b/crates/jacquard-api/src/zone_stratos/repo/hydrate_record.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::types::string::{AtUri, Cid};
@@ -141,9 +144,9 @@ pub mod hydrate_record_state {
 
 /// Builder for constructing an instance of this type
 pub struct HydrateRecordBuilder<'a, S: hydrate_record_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> HydrateRecord<'a> {
@@ -157,9 +160,9 @@ impl<'a> HydrateRecordBuilder<'a, hydrate_record_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HydrateRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -167,12 +170,12 @@ impl<'a> HydrateRecordBuilder<'a, hydrate_record_state::Empty> {
 impl<'a, S: hydrate_record_state::State> HydrateRecordBuilder<'a, S> {
     /// Set the `cid` field (optional)
     pub fn cid(mut self, value: impl Into<Option<Cid<'a>>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cid` field to an Option value (optional)
     pub fn maybe_cid(mut self, value: Option<Cid<'a>>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -187,11 +190,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> HydrateRecordBuilder<'a, hydrate_record_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         HydrateRecordBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -204,8 +207,8 @@ where
     /// Build the final struct
     pub fn build(self) -> HydrateRecord<'a> {
         HydrateRecord {
-            cid: self.__unsafe_private_named.0,
-            uri: self.__unsafe_private_named.1.unwrap(),
+            cid: self._fields.0,
+            uri: self._fields.1.unwrap(),
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/zone_stratos/repo/hydrate_records.rs b/crates/jacquard-api/src/zone_stratos/repo/hydrate_records.rs
index 3b326dad..91ed7bb9 100644
--- a/crates/jacquard-api/src/zone_stratos/repo/hydrate_records.rs
+++ b/crates/jacquard-api/src/zone_stratos/repo/hydrate_records.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 
 #[allow(unused_imports)]
@@ -136,9 +139,9 @@ pub mod hydrate_records_state {
 
 /// Builder for constructing an instance of this type
 pub struct HydrateRecordsBuilder<'a, S: hydrate_records_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Vec<AtUri<'a>>>,),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Vec<AtUri<'a>>>,),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> HydrateRecords<'a> {
@@ -152,9 +155,9 @@ impl<'a> HydrateRecordsBuilder<'a, hydrate_records_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         HydrateRecordsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None,),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None,),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -169,11 +172,11 @@ where
         mut self,
         value: impl Into<Vec<AtUri<'a>>>,
     ) -> HydrateRecordsBuilder<'a, hydrate_records_state::SetUris<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         HydrateRecordsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -186,7 +189,7 @@ where
     /// Build the final struct
     pub fn build(self) -> HydrateRecords<'a> {
         HydrateRecords {
-            uris: self.__unsafe_private_named.0.unwrap(),
+            uris: self._fields.0.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -196,7 +199,7 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> HydrateRecords<'a> {
         HydrateRecords {
-            uris: self.__unsafe_private_named.0.unwrap(),
+            uris: self._fields.0.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -213,58 +216,58 @@ pub mod record_view_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Cid;
-        type Uri;
         type Value;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Cid = Unset;
-        type Uri = Unset;
         type Value = Unset;
+        type Uri = Unset;
     }
     ///State transition - sets the `cid` field to Set
     pub struct SetCid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetCid<S> {}
     impl<S: State> State for SetCid<S> {
         type Cid = Set<members::cid>;
-        type Uri = S::Uri;
-        type Value = S::Value;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetUri<S> {}
-    impl<S: State> State for SetUri<S> {
-        type Cid = S::Cid;
-        type Uri = Set<members::uri>;
         type Value = S::Value;
+        type Uri = S::Uri;
     }
     ///State transition - sets the `value` field to Set
     pub struct SetValue<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetValue<S> {}
     impl<S: State> State for SetValue<S> {
         type Cid = S::Cid;
-        type Uri = S::Uri;
         type Value = Set<members::value>;
+        type Uri = S::Uri;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetUri<S> {}
+    impl<S: State> State for SetUri<S> {
+        type Cid = S::Cid;
+        type Value = S::Value;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `cid` field
         pub struct cid(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `value` field
         pub struct value(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct RecordViewBuilder<'a, S: record_view_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Cid<'a>>, Option<AtUri<'a>>, Option<Data<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Cid<'a>>, Option<AtUri<'a>>, Option<Data<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> RecordView<'a> {
@@ -278,9 +281,9 @@ impl<'a> RecordViewBuilder<'a, record_view_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         RecordViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -295,11 +298,11 @@ where
         mut self,
         value: impl Into<Cid<'a>>,
     ) -> RecordViewBuilder<'a, record_view_state::SetCid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         RecordViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -314,11 +317,11 @@ where
         mut self,
         value: impl Into<AtUri<'a>>,
     ) -> RecordViewBuilder<'a, record_view_state::SetUri<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         RecordViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -333,11 +336,11 @@ where
         mut self,
         value: impl Into<Data<'a>>,
     ) -> RecordViewBuilder<'a, record_view_state::SetValue<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         RecordViewBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -346,15 +349,15 @@ impl<'a, S> RecordViewBuilder<'a, S>
 where
     S: record_view_state::State,
     S::Cid: record_view_state::IsSet,
-    S::Uri: record_view_state::IsSet,
     S::Value: record_view_state::IsSet,
+    S::Uri: record_view_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> RecordView<'a> {
         RecordView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -364,9 +367,9 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> RecordView<'a> {
         RecordView {
-            cid: self.__unsafe_private_named.0.unwrap(),
-            uri: self.__unsafe_private_named.1.unwrap(),
-            value: self.__unsafe_private_named.2.unwrap(),
+            cid: self._fields.0.unwrap(),
+            uri: self._fields.1.unwrap(),
+            value: self._fields.2.unwrap(),
             extra_data: Some(extra_data),
         }
     }
diff --git a/crates/jacquard-api/src/zone_stratos/repo/import_repo.rs b/crates/jacquard-api/src/zone_stratos/repo/import_repo.rs
index d844d8ce..37e487e3 100644
--- a/crates/jacquard-api/src/zone_stratos/repo/import_repo.rs
+++ b/crates/jacquard-api/src/zone_stratos/repo/import_repo.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
diff --git a/crates/jacquard-api/src/zone_stratos/sync/get_repo.rs b/crates/jacquard-api/src/zone_stratos/sync/get_repo.rs
index 2421863e..dc5c615c 100644
--- a/crates/jacquard-api/src/zone_stratos/sync/get_repo.rs
+++ b/crates/jacquard-api/src/zone_stratos/sync/get_repo.rs
@@ -5,6 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 use jacquard_common::deps::bytes::Bytes;
@@ -138,9 +139,9 @@ pub mod get_repo_state {
 
 /// Builder for constructing an instance of this type
 pub struct GetRepoBuilder<'a, S: get_repo_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<Did<'a>>, Option<Tid>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<Did<'a>>, Option<Tid>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> GetRepo<'a> {
@@ -154,9 +155,9 @@ impl<'a> GetRepoBuilder<'a, get_repo_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         GetRepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -171,11 +172,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> GetRepoBuilder<'a, get_repo_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         GetRepoBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -183,12 +184,12 @@ where
 impl<'a, S: get_repo_state::State> GetRepoBuilder<'a, S> {
     /// Set the `since` field (optional)
     pub fn since(mut self, value: impl Into<Option<Tid>>) -> Self {
-        self.__unsafe_private_named.1 = value.into();
+        self._fields.1 = value.into();
         self
     }
     /// Set the `since` field to an Option value (optional)
     pub fn maybe_since(mut self, value: Option<Tid>) -> Self {
-        self.__unsafe_private_named.1 = value;
+        self._fields.1 = value;
         self
     }
 }
@@ -201,8 +202,8 @@ where
     /// Build the final struct
     pub fn build(self) -> GetRepo<'a> {
         GetRepo {
-            did: self.__unsafe_private_named.0.unwrap(),
-            since: self.__unsafe_private_named.1,
+            did: self._fields.0.unwrap(),
+            since: self._fields.1,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/zone_stratos/sync/subscribe_records.rs b/crates/jacquard-api/src/zone_stratos/sync/subscribe_records.rs
index 65523ade..8b073679 100644
--- a/crates/jacquard-api/src/zone_stratos/sync/subscribe_records.rs
+++ b/crates/jacquard-api/src/zone_stratos/sync/subscribe_records.rs
@@ -5,7 +5,10 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
+#[allow(unused_imports)]
 use alloc::collections::BTreeMap;
+
+#[allow(unused_imports)]
 use core::marker::PhantomData;
 use jacquard_common::CowStr;
 
@@ -484,99 +487,99 @@ pub mod commit_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Seq;
-        type Time;
         type Ops;
-        type Did;
+        type Time;
         type Rev;
+        type Did;
+        type Seq;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Seq = Unset;
-        type Time = Unset;
         type Ops = Unset;
-        type Did = Unset;
+        type Time = Unset;
         type Rev = Unset;
+        type Did = Unset;
+        type Seq = Unset;
     }
-    ///State transition - sets the `seq` field to Set
-    pub struct SetSeq<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetSeq<S> {}
-    impl<S: State> State for SetSeq<S> {
-        type Seq = Set<members::seq>;
+    ///State transition - sets the `ops` field to Set
+    pub struct SetOps<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetOps<S> {}
+    impl<S: State> State for SetOps<S> {
+        type Ops = Set<members::ops>;
         type Time = S::Time;
-        type Ops = S::Ops;
-        type Did = S::Did;
         type Rev = S::Rev;
+        type Did = S::Did;
+        type Seq = S::Seq;
     }
     ///State transition - sets the `time` field to Set
     pub struct SetTime<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetTime<S> {}
     impl<S: State> State for SetTime<S> {
-        type Seq = S::Seq;
-        type Time = Set<members::time>;
         type Ops = S::Ops;
-        type Did = S::Did;
+        type Time = Set<members::time>;
         type Rev = S::Rev;
-    }
-    ///State transition - sets the `ops` field to Set
-    pub struct SetOps<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetOps<S> {}
-    impl<S: State> State for SetOps<S> {
+        type Did = S::Did;
         type Seq = S::Seq;
+    }
+    ///State transition - sets the `rev` field to Set
+    pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetRev<S> {}
+    impl<S: State> State for SetRev<S> {
+        type Ops = S::Ops;
         type Time = S::Time;
-        type Ops = Set<members::ops>;
+        type Rev = Set<members::rev>;
         type Did = S::Did;
-        type Rev = S::Rev;
+        type Seq = S::Seq;
     }
     ///State transition - sets the `did` field to Set
     pub struct SetDid<S: State = Empty>(PhantomData<fn() -> S>);
     impl<S: State> sealed::Sealed for SetDid<S> {}
     impl<S: State> State for SetDid<S> {
-        type Seq = S::Seq;
-        type Time = S::Time;
         type Ops = S::Ops;
-        type Did = Set<members::did>;
+        type Time = S::Time;
         type Rev = S::Rev;
-    }
-    ///State transition - sets the `rev` field to Set
-    pub struct SetRev<S: State = Empty>(PhantomData<fn() -> S>);
-    impl<S: State> sealed::Sealed for SetRev<S> {}
-    impl<S: State> State for SetRev<S> {
+        type Did = Set<members::did>;
         type Seq = S::Seq;
-        type Time = S::Time;
+    }
+    ///State transition - sets the `seq` field to Set
+    pub struct SetSeq<S: State = Empty>(PhantomData<fn() -> S>);
+    impl<S: State> sealed::Sealed for SetSeq<S> {}
+    impl<S: State> State for SetSeq<S> {
         type Ops = S::Ops;
+        type Time = S::Time;
+        type Rev = S::Rev;
         type Did = S::Did;
-        type Rev = Set<members::rev>;
+        type Seq = Set<members::seq>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `seq` field
-        pub struct seq(());
-        ///Marker type for the `time` field
-        pub struct time(());
         ///Marker type for the `ops` field
         pub struct ops(());
-        ///Marker type for the `did` field
-        pub struct did(());
+        ///Marker type for the `time` field
+        pub struct time(());
         ///Marker type for the `rev` field
         pub struct rev(());
+        ///Marker type for the `did` field
+        pub struct did(());
+        ///Marker type for the `seq` field
+        pub struct seq(());
     }
 }
 
 /// Builder for constructing an instance of this type
 pub struct CommitBuilder<'a, S: commit_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (
+    _state: PhantomData<fn() -> S>,
+    _fields: (
         Option<Did<'a>>,
         Option<Vec<subscribe_records::RecordOp<'a>>>,
         Option<Tid>,
         Option<i64>,
         Option<Datetime>,
     ),
-    _phantom: PhantomData<&'a ()>,
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Commit<'a> {
@@ -590,9 +593,9 @@ impl<'a> CommitBuilder<'a, commit_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -607,11 +610,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> CommitBuilder<'a, commit_state::SetDid<S>> {
-        self.__unsafe_private_named.0 = Option::Some(value.into());
+        self._fields.0 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -626,11 +629,11 @@ where
         mut self,
         value: impl Into<Vec<subscribe_records::RecordOp<'a>>>,
     ) -> CommitBuilder<'a, commit_state::SetOps<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -645,11 +648,11 @@ where
         mut self,
         value: impl Into<Tid>,
     ) -> CommitBuilder<'a, commit_state::SetRev<S>> {
-        self.__unsafe_private_named.2 = Option::Some(value.into());
+        self._fields.2 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -664,11 +667,11 @@ where
         mut self,
         value: impl Into<i64>,
     ) -> CommitBuilder<'a, commit_state::SetSeq<S>> {
-        self.__unsafe_private_named.3 = Option::Some(value.into());
+        self._fields.3 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -683,11 +686,11 @@ where
         mut self,
         value: impl Into<Datetime>,
     ) -> CommitBuilder<'a, commit_state::SetTime<S>> {
-        self.__unsafe_private_named.4 = Option::Some(value.into());
+        self._fields.4 = Option::Some(value.into());
         CommitBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -695,20 +698,20 @@ where
 impl<'a, S> CommitBuilder<'a, S>
 where
     S: commit_state::State,
-    S::Seq: commit_state::IsSet,
-    S::Time: commit_state::IsSet,
     S::Ops: commit_state::IsSet,
-    S::Did: commit_state::IsSet,
+    S::Time: commit_state::IsSet,
     S::Rev: commit_state::IsSet,
+    S::Did: commit_state::IsSet,
+    S::Seq: commit_state::IsSet,
 {
     /// Build the final struct
     pub fn build(self) -> Commit<'a> {
         Commit {
-            did: self.__unsafe_private_named.0.unwrap(),
-            ops: self.__unsafe_private_named.1.unwrap(),
-            rev: self.__unsafe_private_named.2.unwrap(),
-            seq: self.__unsafe_private_named.3.unwrap(),
-            time: self.__unsafe_private_named.4.unwrap(),
+            did: self._fields.0.unwrap(),
+            ops: self._fields.1.unwrap(),
+            rev: self._fields.2.unwrap(),
+            seq: self._fields.3.unwrap(),
+            time: self._fields.4.unwrap(),
             extra_data: Default::default(),
         }
     }
@@ -718,11 +721,11 @@ where
         extra_data: BTreeMap<jacquard_common::deps::smol_str::SmolStr, Data<'a>>,
     ) -> Commit<'a> {
         Commit {
-            did: self.__unsafe_private_named.0.unwrap(),
-            ops: self.__unsafe_private_named.1.unwrap(),
-            rev: self.__unsafe_private_named.2.unwrap(),
-            seq: self.__unsafe_private_named.3.unwrap(),
-            time: self.__unsafe_private_named.4.unwrap(),
+            did: self._fields.0.unwrap(),
+            ops: self._fields.1.unwrap(),
+            rev: self._fields.2.unwrap(),
+            seq: self._fields.3.unwrap(),
+            time: self._fields.4.unwrap(),
             extra_data: Some(extra_data),
         }
     }
@@ -987,9 +990,9 @@ pub mod subscribe_records_state {
 
 /// Builder for constructing an instance of this type
 pub struct SubscribeRecordsBuilder<'a, S: subscribe_records_state::State> {
-    _phantom_state: PhantomData<fn() -> S>,
-    __unsafe_private_named: (Option<i64>, Option<Did<'a>>, Option<CowStr<'a>>),
-    _phantom: PhantomData<&'a ()>,
+    _state: PhantomData<fn() -> S>,
+    _fields: (Option<i64>, Option<Did<'a>>, Option<CowStr<'a>>),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> SubscribeRecords<'a> {
@@ -1003,9 +1006,9 @@ impl<'a> SubscribeRecordsBuilder<'a, subscribe_records_state::Empty> {
     /// Create a new builder with all fields unset
     pub fn new() -> Self {
         SubscribeRecordsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: (None, None, None),
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: (None, None, None),
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1013,12 +1016,12 @@ impl<'a> SubscribeRecordsBuilder<'a, subscribe_records_state::Empty> {
 impl<'a, S: subscribe_records_state::State> SubscribeRecordsBuilder<'a, S> {
     /// Set the `cursor` field (optional)
     pub fn cursor(mut self, value: impl Into<Option<i64>>) -> Self {
-        self.__unsafe_private_named.0 = value.into();
+        self._fields.0 = value.into();
         self
     }
     /// Set the `cursor` field to an Option value (optional)
     pub fn maybe_cursor(mut self, value: Option<i64>) -> Self {
-        self.__unsafe_private_named.0 = value;
+        self._fields.0 = value;
         self
     }
 }
@@ -1033,11 +1036,11 @@ where
         mut self,
         value: impl Into<Did<'a>>,
     ) -> SubscribeRecordsBuilder<'a, subscribe_records_state::SetDid<S>> {
-        self.__unsafe_private_named.1 = Option::Some(value.into());
+        self._fields.1 = Option::Some(value.into());
         SubscribeRecordsBuilder {
-            _phantom_state: PhantomData,
-            __unsafe_private_named: self.__unsafe_private_named,
-            _phantom: PhantomData,
+            _state: PhantomData,
+            _fields: self._fields,
+            _lifetime: PhantomData,
         }
     }
 }
@@ -1045,12 +1048,12 @@ where
 impl<'a, S: subscribe_records_state::State> SubscribeRecordsBuilder<'a, S> {
     /// Set the `domain` field (optional)
     pub fn domain(mut self, value: impl Into<Option<CowStr<'a>>>) -> Self {
-        self.__unsafe_private_named.2 = value.into();
+        self._fields.2 = value.into();
         self
     }
     /// Set the `domain` field to an Option value (optional)
     pub fn maybe_domain(mut self, value: Option<CowStr<'a>>) -> Self {
-        self.__unsafe_private_named.2 = value;
+        self._fields.2 = value;
         self
     }
 }
@@ -1063,9 +1066,9 @@ where
     /// Build the final struct
     pub fn build(self) -> SubscribeRecords<'a> {
         SubscribeRecords {
-            cursor: self.__unsafe_private_named.0,
-            did: self.__unsafe_private_named.1.unwrap(),
-            domain: self.__unsafe_private_named.2,
+            cursor: self._fields.0,
+            did: self._fields.1.unwrap(),
+            domain: self._fields.2,
         }
     }
 }
\ No newline at end of file
diff --git a/crates/jacquard-lexicon/src/codegen/builder_gen/build_method.rs b/crates/jacquard-lexicon/src/codegen/builder_gen/build_method.rs
index 690a8958..fbbeb0e2 100644
--- a/crates/jacquard-lexicon/src/codegen/builder_gen/build_method.rs
+++ b/crates/jacquard-lexicon/src/codegen/builder_gen/build_method.rs
@@ -57,18 +57,21 @@ pub fn generate_build_method(
 
             if is_required {
                 // Required field: unwrap from Option (guaranteed Some by IsSet constraint).
-                quote! { #field_snake: self.__unsafe_private_named.#index.unwrap(), }
+                quote! { #field_snake: self._fields.#index.unwrap(), }
             } else {
                 // Optional field: apply schema default if present, otherwise pass through.
                 let field_name_str: &str = field_name.as_ref();
-                match schema.get_object_property(field_name_str).and_then(|p| schema_default_expr(p, resolved)) {
+                match schema
+                    .get_object_property(field_name_str)
+                    .and_then(|p| schema_default_expr(p, resolved))
+                {
                     Some(default_val) => {
                         quote! {
-                            #field_snake: self.__unsafe_private_named.#index.or_else(|| Some(#default_val)),
+                            #field_snake: self._fields.#index.or_else(|| Some(#default_val)),
                         }
                     }
                     None => {
-                        quote! { #field_snake: self.__unsafe_private_named.#index, }
+                        quote! { #field_snake: self._fields.#index, }
                     }
                 }
             }
diff --git a/crates/jacquard-lexicon/src/codegen/builder_gen/builder_struct.rs b/crates/jacquard-lexicon/src/codegen/builder_gen/builder_struct.rs
index af25fb22..17c9b416 100644
--- a/crates/jacquard-lexicon/src/codegen/builder_gen/builder_struct.rs
+++ b/crates/jacquard-lexicon/src/codegen/builder_gen/builder_struct.rs
@@ -39,7 +39,7 @@ pub fn generate_builder_struct(
     let phantom = resolved.phantom_data();
     let phantom_field = if has_lifetime {
         quote! {
-            _phantom: #phantom<&'a ()>,
+            _lifetime: #phantom<&'a ()>,
         }
     } else {
         quote! {}
@@ -58,8 +58,13 @@ pub fn generate_builder_struct(
     };
 
     // Generate Builder::new() constructor
-    let builder_constructor =
-        generate_builder_constructor(&builder_name, schema, has_lifetime, &state_mod_name, resolved);
+    let builder_constructor = generate_builder_constructor(
+        &builder_name,
+        schema,
+        has_lifetime,
+        &state_mod_name,
+        resolved,
+    );
 
     quote! {
         /// Builder for constructing an instance of this type
@@ -91,7 +96,13 @@ fn generate_field_declarations(
                 BuilderSchema::Object(obj) => {
                     let field_type = &obj.properties[field_name_str];
                     codegen
-                        .property_to_rust_type(nsid, type_name, field_name_str, field_type, &resolved)
+                        .property_to_rust_type(
+                            nsid,
+                            type_name,
+                            field_name_str,
+                            field_type,
+                            &resolved,
+                        )
                         .unwrap_or_else(|_| quote! { () })
                 }
                 BuilderSchema::Parameters(params) => {
@@ -113,8 +124,8 @@ fn generate_field_declarations(
         quote! {}
     } else {
         quote! {
-            _phantom_state: #phantom<fn() -> S>,
-            __unsafe_private_named: ( #(#field_types)* ),
+            _state: #phantom<fn() -> S>,
+            _fields: ( #(#field_types)* ),
         }
     }
 }
@@ -125,21 +136,21 @@ pub(super) fn get_params_rust_type(
     field_type: &crate::lexicon::LexXrpcParametersProperty<'static>,
     resolved: &crate::codegen::prettify::ResolvedImports,
 ) -> TokenStream {
-    use crate::lexicon::LexXrpcParametersProperty;
     use crate::codegen::prettify::CommonType;
+    use crate::lexicon::LexXrpcParametersProperty;
 
     match field_type {
         LexXrpcParametersProperty::Boolean(_) => quote! { bool },
         LexXrpcParametersProperty::Integer(_) => quote! { i64 },
         LexXrpcParametersProperty::String(s) => codegen.string_to_rust_type(s, resolved),
-        LexXrpcParametersProperty::Unknown(_) => {
-            resolved.type_tokens(&CommonType::Data)
-        }
+        LexXrpcParametersProperty::Unknown(_) => resolved.type_tokens(&CommonType::Data),
         LexXrpcParametersProperty::Array(arr) => {
             let item_type = match &arr.items {
                 crate::lexicon::LexPrimitiveArrayItem::Boolean(_) => quote! { bool },
                 crate::lexicon::LexPrimitiveArrayItem::Integer(_) => quote! { i64 },
-                crate::lexicon::LexPrimitiveArrayItem::String(s) => codegen.string_to_rust_type(s, resolved),
+                crate::lexicon::LexPrimitiveArrayItem::String(s) => {
+                    codegen.string_to_rust_type(s, resolved)
+                }
                 crate::lexicon::LexPrimitiveArrayItem::Unknown(_) => {
                     resolved.type_tokens(&CommonType::Data)
                 }
@@ -173,17 +184,17 @@ fn generate_builder_constructor(
     } else {
         (
             quote! {
-                _phantom_state: #phantom,
+                _state: #phantom,
             },
             quote! {
-                __unsafe_private_named: ( #(#none_values)* ),
+                _fields: ( #(#none_values)* ),
             },
         )
     };
 
     let phantom_lifetime = if has_lifetime {
         quote! {
-            _phantom: #phantom,
+            _lifetime: #phantom,
         }
     } else {
         quote! {}
diff --git a/crates/jacquard-lexicon/src/codegen/builder_gen/setters.rs b/crates/jacquard-lexicon/src/codegen/builder_gen/setters.rs
index 351fb2f0..5b4c12cf 100644
--- a/crates/jacquard-lexicon/src/codegen/builder_gen/setters.rs
+++ b/crates/jacquard-lexicon/src/codegen/builder_gen/setters.rs
@@ -101,7 +101,7 @@ fn generate_required_setter(
     };
 
     let phantom_lifetime = if has_lifetime {
-        quote! { _phantom: #phantom, }
+        quote! { _lifetime: #phantom, }
     } else {
         quote! {}
     };
@@ -119,10 +119,10 @@ fn generate_required_setter(
                 mut self,
                 value: impl Into<#rust_type>,
             ) -> #builder_name<#lifetime_param #state_mod_name::#transition_type<S>> {
-                self.__unsafe_private_named.#index = #option_some(value.into());
+                self._fields.#index = #option_some(value.into());
                 #builder_name {
-                    _phantom_state: #phantom,
-                    __unsafe_private_named: self.__unsafe_private_named,
+                    _state: #phantom,
+                    _fields: self._fields,
                     #phantom_lifetime
                 }
             }
@@ -166,13 +166,13 @@ fn generate_optional_setter(
         impl<#lifetime_param S: #state_mod_name::State> #builder_name<#lifetime_param S> {
             #[doc = #doc_field]
             pub fn #field_snake(mut self, value: impl Into<Option<#rust_type>>) -> Self {
-                self.__unsafe_private_named.#index = value.into();
+                self._fields.#index = value.into();
                 self
             }
 
             #[doc = #doc_maybe]
             pub fn #maybe_field_snake(mut self, value: Option<#rust_type>) -> Self {
-                self.__unsafe_private_named.#index = value;
+                self._fields.#index = value;
                 self
             }
         }
diff --git a/crates/jacquard-lexicon/src/codegen/builder_gen/tests.rs b/crates/jacquard-lexicon/src/codegen/builder_gen/tests.rs
index aa1ed489..1bc9c47e 100644
--- a/crates/jacquard-lexicon/src/codegen/builder_gen/tests.rs
+++ b/crates/jacquard-lexicon/src/codegen/builder_gen/tests.rs
@@ -212,9 +212,9 @@ fn test_build_method_generation() {
     assert!(code.contains("Collection") && code.contains("IsSet"));
 
     // Verify field extraction from tuple (fields ordered by BTreeMap key order)
-    assert!(code.contains("collection : self . __unsafe_private_named . 0 . unwrap ()"));
-    assert!(code.contains("repo : self . __unsafe_private_named . 1 . unwrap ()"));
-    assert!(code.contains("rkey : self . __unsafe_private_named . 2")); // optional, no unwrap
+    assert!(code.contains("collection : self . _fields . 0 . unwrap ()"));
+    assert!(code.contains("repo : self . _fields . 1 . unwrap ()"));
+    assert!(code.contains("rkey : self . _fields . 2")); // optional, no unwrap
 
     // Verify extra_data for LexObject
     assert!(code.contains("extra_data : Default :: default ()"));